Corrected Tail Whip's sound to play on the actor rather than the target

CHANGELOG.md

@@ -59,6 +59,7 @@
 - Updated various recipes to display in Recipe Groups within the Recipe Book
 - Updated most recipes to display more logically/consistently within the Recipe Book's categories
 - Make ride rotations less jittery in multiplayer.
+- Adjusted the timing and volume of sounds for Close Combat, Swords Dance and Aerial Ace
 
 ### Fixes
 - Correctly grants "They're Minerals!" advancement when planting a type gem
@@ -81,6 +82,7 @@
 - Fixed Diglett line not having their faint animations
 - Fixed Kingambit moving its legs while walking
 - Various Structure fixes
+- Tail Whip's sound now correctly plays on the Pokémon performing the move, rather than its target
 
 ### Developer
 

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/swordsdance/swordsdance_actor.particle.json

@@ -46,11 +46,6 @@
 					"effect": "cobblemon:swordsdance_sword3",
 					"type": "emitter_bound"
 				}
-			},
-			"event_sound": {
-				"sound_effect": {
-					"event_name": "cobblemon:move.swordsdance.actor"
-				}
 			}
 		},
 		"components": {
@@ -61,7 +56,7 @@
 				"active_time": 2.5
 			},
 			"minecraft:emitter_lifetime_events": {
-				"creation_event": ["event_sword2", "event_sword3", "event_sword4", "event_sound"]
+				"creation_event": ["event_sword2", "event_sword3", "event_sword4"]
 			},
 			"minecraft:emitter_shape_point": {},
 			"minecraft:particle_lifetime_expression": {

common/src/main/resources/assets/cobblemon/sounds.json

@@ -1194,7 +1194,7 @@
     "sounds": [ { "name": "cobblemon:move/confusion/confusion_target", "volume": 0.8 } ]
   },
   "move.swordsdance.actor": {
-    "sounds": [ { "name": "cobblemon:move/swordsdance/swordsdance_actor", "volume": 0.8 } ]
+    "sounds": [ { "name": "cobblemon:move/swordsdance/swordsdance_actor", "volume": 0.6 } ]
   },
   "move.thunderwave.actor": {
     "sounds": [ { "name": "cobblemon:move/thunderwave/thunderwave_actor", "volume": 0.8 } ]
@@ -1325,13 +1325,13 @@
     "sounds": [ { "name": "cobblemon:move/bulletpunch/bulletpunch_target", "volume": 0.8 } ]
   },
   "move.closecombat.actor_1": {
-    "sounds": [ { "name": "cobblemon:move/closecombat/closecombat_actor_1", "volume": 0.8 } ]
+    "sounds": [ { "name": "cobblemon:move/closecombat/closecombat_actor_1", "volume": 0.6 } ]
   },
   "move.closecombat.actor_2": {
-    "sounds": [ { "name": "cobblemon:move/closecombat/closecombat_actor_2", "volume": 0.8 } ]
+    "sounds": [ { "name": "cobblemon:move/closecombat/closecombat_actor_2", "volume": 0.4 } ]
   },
   "move.closecombat.target": {
-    "sounds": [ { "name": "cobblemon:move/closecombat/closecombat_target", "volume": 0.8 } ]
+    "sounds": [ { "name": "cobblemon:move/closecombat/closecombat_target", "volume": 1.0 } ]
   },
   "move.gust.actor": {
     "sounds": [ { "name": "cobblemon:move/gust/gust_actor", "volume": 0.8 } ]

common/src/main/resources/data/cobblemon/action_effects/moves/aerialace.json

@@ -18,7 +18,7 @@
     },
     {
       "type": "pause",
-      "pause": 0.7
+      "pause": 0.6
     },
     {
       "type": "entity_molang",
@@ -29,7 +29,7 @@
     },
     {
       "type": "pause",
-      "pause": 0.45
+      "pause": 0.55
     },
     {
       "type": "entity_particles",
@@ -58,7 +58,7 @@
     },
     {
       "type": "pause",
-      "pause": 0.4
+      "pause": 0.3
     },
     {
       "type": "entity_molang",
@@ -67,7 +67,7 @@
     },
     {
       "type": "pause",
-      "pause": 1.2
+      "pause": 1.3
     }
   ]
 }

common/src/main/resources/data/cobblemon/action_effects/moves/closecombat.json

@@ -73,7 +73,7 @@
     },
     {
       "type": "pause",
-      "pause": 0.7
+      "pause": 0.6
     },
     {
       "type": "entity_molang",
@@ -84,7 +84,7 @@
     },
     {
       "type": "pause",
-      "pause": 0.05
+      "pause": 0.15
     },
     {
       "type": "animation",

common/src/main/resources/data/cobblemon/action_effects/moves/swordsdance.json

@@ -9,6 +9,11 @@
       "animation": ["swordsdance", "dancer", "status"],
       "delay": 0.1
     },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.swordsdance.actor');"]
+    },
     {
       "type": "entity_particles",
       "effect": "cobblemon:swordsdance_actor",

common/src/main/resources/data/cobblemon/action_effects/moves/tailwhip.json

@@ -15,7 +15,7 @@
     },
     {
       "type": "entity_molang",
-      "entityCondition": "q.entity.is_user == false",
+      "entityCondition": "q.entity.is_user == true",
       "expressions": ["q.sound('move.tailwhip.actor');"]
     },
     {