Polish melee effects (#11653)

* Polish melee effects

* adjustments

* Animation changes

* Fix fist

Resources/Prototypes/Entities/Effects/weapon_arc.yml

@@ -11,8 +11,22 @@
     - type: EffectVisuals
     - type: WeaponArcVisuals
 
-# TODO: Camera recoil (try it as a shake, i.e. zoom out and then rotate slightly maybe)
-# See https://github.com/gasgiant/Camera-Shake
+- type: entity
+  # Plays the state animation then disappears with no fade or swing
+  id: WeaponArcAnimated
+  noSpawn: true
+  components:
+    - type: Sprite
+      sprite: Effects/arcs.rsi
+      state: disarm
+      netsync: false
+      drawdepth: Effects
+    - type: EffectVisuals
+    - type: WeaponArcVisuals
+      fadeOut: false
+
+
+# Uses TimedDespawn instead of EffectVisuals because auto animation is easier but doesn't raise an animation complete event.
 
 - type: entity
   id: WeaponArcThrust
@@ -22,8 +36,6 @@
     - type: WeaponArcVisuals
       animation: Thrust
 
-  # TODO: Hold for 0.1, thrust out n distance, then fade out
-
 - type: entity
   id: WeaponArcSlash
   parent: WeaponArcStatic
@@ -38,24 +50,36 @@
   parent: WeaponArcStatic
   noSpawn: true
   components:
+    - type: WeaponArcVisuals
+      fadeOut: false
     - type: Sprite
       state: bite
+    - type: TimedDespawn
+      lifetime: 0.399
 
 - type: entity
   id: WeaponArcClaw
   parent: WeaponArcStatic
   noSpawn: true
   components:
+    - type: WeaponArcVisuals
+      fadeOut: false
     - type: Sprite
       state: claw
+    - type: TimedDespawn
+      lifetime: 0.399
 
 - type: entity
   id: WeaponArcDisarm
-  parent: WeaponArcStatic
+  parent: WeaponArcAnimated
   noSpawn: true
   components:
+    - type: WeaponArcVisuals
+      fadeOut: false
     - type: Sprite
       state: disarm
+    - type: TimedDespawn
+      lifetime: 0.299
 
 - type: entity
   id: WeaponArcFist
@@ -64,3 +88,39 @@
   components:
     - type: Sprite
       state: fist
+
+- type: entity
+  id: WeaponArcPunch
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: WeaponArcVisuals
+      fadeOut: false
+    - type: Sprite
+      state: punch
+    - type: TimedDespawn
+      lifetime: 0.499
+
+- type: entity
+  id: WeaponArcKick
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: WeaponArcVisuals
+      fadeOut: false
+    - type: Sprite
+      state: kick
+    - type: TimedDespawn
+      lifetime: 0.299
+
+- type: entity
+  id: WeaponArcSmash
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: WeaponArcVisuals
+      fadeOut: false
+    - type: Sprite
+      state: smash
+    - type: TimedDespawn
+      lifetime: 0.299

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -72,7 +72,7 @@
     angle: 0
     soundHit:
      collection: AlienClaw
-    animation: WeaponArcClaw
+    animation: WeaponArcBite
     damage:
       groups:
         Brute: 12

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml

@@ -27,7 +27,7 @@
     soundHit:
       path: /Audio/Weapons/pierce.ogg
     angle: 30
-    animation: WeaponArcFist
+    animation: WeaponArcPunch
     damage:
       types:
         Piercing: 5