Update wideswing rotations (#25868)

* Added appropriate wideAnimationRotation fields to items that needed it

* Modified some wideAnimationRotation

diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 7d91b7fbccc101b7f021ac88b9d62f49a3dcd213..391823dc52f8aca9ea0b3113e532b6339d54911f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -28,6 +28,7 @@
     sprite: Objects/Fun/Darts/dart_red.rsi
     state: icon
   - type: MeleeWeapon
+    wideAnimationRotation: -45
     damage:
       types:
         Piercing: 2

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 86470ac804492df111fb4c7ac0ff070f10a13853..0356f919160e0c976853a7a3f174e0a9869174cb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -29,6 +29,7 @@
   - type: UseDelay
     delay: 1.0
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     soundHit:
       collection: ToySqueak
     damage:
@@ -928,6 +929,7 @@
     attackRate: 1.5
     angle: 0
     animation: WeaponArcThrust
+    wideAnimationRotation: 90
     damage:
       types:
         Blunt: 0

diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 62468b46150f9c3a14b5c4cb43cccabf808005e6..884a5531e7f786ce931d509a1fa0a5cf22f1bb00 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -19,6 +19,7 @@
           shard3: ""
   - type: SpaceGarbage
   - type: MeleeWeapon
+    wideAnimationRotation: -22.5
     attackRate: 1.5
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 44d84118a4b8e9781ffb3fb8bbe610100a8a8d95..ab6beb70af13df14bc338b5e55afa9137a039d93 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -294,6 +294,7 @@
       layers:
         - state: book2
     - type: MeleeWeapon
+      wideAnimationRotation: 180
       damage:
         types:
           Blunt: 6
@@ -311,6 +312,7 @@
       layers:
         - state: book2
     - type: MeleeWeapon
+      wideAnimationRotation: 180
       damage:
         types:
           Blunt: 6

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 799e2921e49fbd53227621bf9c2e44add2c34076..a42b2fa1139d13ece3433c8481a7a0d808507595 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -163,6 +163,7 @@
   - type: AutoRecharge
     rechargeDuration: 30
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 0 # melee weapon to allow flashing individual targets

diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index c21ab7f3aa8d7eb4ab379b5f7a7b66e8eecc34eb..5f970da1840d5342cc7d8376fbcdfd6c87190c5f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -17,6 +17,7 @@
     tags:
     - Handcuffs
   - type: MeleeWeapon
+    wideAnimationRotation: 90
     resetOnHandSelected: false
     animation: WeaponArcDisarm
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index a54f19a8c2ae331adbb7f1bf375e223f2bfbb47f..58457ebb7fa13275ef4bb605af02df410b088073 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -670,6 +670,7 @@
     - key: enum.StorageUiKey.Key
       type: StorageBoundUserInterface
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 10

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 7ae55be8e321abe22f3687a41ac36d096946fb97..6dc78455ea52ffacbbfb9b7de62638368282c964 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -75,6 +75,8 @@
     sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     storedRotation: 90
   - type: MeleeWeapon
+    wideAnimationRotation: 90
+    swingLeft: true
     attackRate: 1.5
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index e8cb94c52470e7c8952af0e0f542cf66afe73398..e896832e5f2b0ce8ea4742879fd12025aaf7b355 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -16,10 +16,10 @@
     - key: enum.MagicMirrorUiKey.Key
       type: MagicMirrorBoundUserInterface
   - type: MeleeWeapon
-    wideAnimationRotation: -90
+    wideAnimationRotation: -135
     attackRate: 1
     damage:
       types:
         Piercing: 6
     soundHit:
-      path: "/Audio/Weapons/bladeslice.ogg"
\ No newline at end of file
+      path: "/Audio/Weapons/bladeslice.ogg"

diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index 286078ae87f917010706040d7391b6b8df18c84f..ddd3592d49f5b794937efd896db846ed2017af21 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -11,6 +11,7 @@
     sprite: Objects/Tools/Cowtools/haycutters.rsi
     state: haycutters
   - type: MeleeWeapon
+    wideAnimationRotation: -90
     damage:
       types:
         Pierce: 0

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 14a31d269ee137753a78a6a046a0712d15ed03f3..39809b31b6862a6fc731bb55cfc9836aab35bf8e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -107,6 +107,7 @@
         visible: false
         map: [ "light" ]
   - type: MeleeWeapon
+    wideAnimationRotation: 90
     damage:
       types:
         Blunt: 10

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index f305eba369ce672c7df895300494acc9ca886d5d..bb8545d91ff9fb1b25e78c985931340382fc9001 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -43,6 +43,7 @@
         useSound: /Audio/Items/jaws_cut.ogg
         changeSound: /Audio/Items/change_jaws.ogg
   - type: MeleeWeapon
+    wideAnimationRotation: 90
     damage:
       types:
         Blunt: 10

diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index dff367dc99f4fd2d9eff0c94f92c960aadb0b5e6..631e2a247eac2f668108e2d21bce1b7a12a01cfa 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -74,6 +74,7 @@
           Quantity: 8
         maxVol: 8 #uses less fuel than a welder, so this isnt as bad as it looks
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 0
@@ -191,6 +192,7 @@
       - state: zippo-inhand-right-flame
         shader: unshaded
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 1 # does a little bit of damage on hit when off

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index b3693eac165ff567dadde4c2e0cafe5ec68eea4d..c56c322b744a3396c499f158720368b6b4310d39 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -488,7 +488,7 @@
     sprite: Objects/Tools/shovel.rsi
     state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: 45
     damage:
       types:
         Blunt: 14

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 810412be907af315e4aa2d16fe44add9e566c846..b5d597715aa9d039be058cd24c2dee32e64910c4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -59,7 +59,7 @@
     sprite: Objects/Weapons/Melee/cleaver.rsi
     state: butch
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: -115
     attackRate: 1.5
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
index 51025f164562d826522d8d46bdefb33ae26aeebd..e566f90968e83e5ccfc94dced2cc5a475bb64b43 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -8,6 +8,7 @@
     sprite: Objects/Weapons/Melee/sledgehammer.rsi
     state: icon
   - type: MeleeWeapon
+    wideAnimationRotation: -135
     damage:
       types:
         Blunt: 10