From: I.K <45953835+notquitehadouken@users.noreply.github.com> Date: Wed, 6 Mar 2024 01:40:03 +0000 (-0600) Subject: Update wideswing rotations (#25868) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=091332787e9344f4ca4d4dbda848bbe6ab63cdfc;p=space-station-14.git 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 7d91b7fbcc..391823dc52 100644 --- 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 86470ac804..0356f91916 100644 --- 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 62468b4615..884a5531e7 100644 --- 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 44d84118a4..ab6beb70af 100644 --- 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 799e2921e4..a42b2fa113 100644 --- 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 c21ab7f3aa..5f970da184 100644 --- 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 a54f19a8c2..58457ebb7f 100644 --- 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 7ae55be8e3..6dc78455ea 100644 --- 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 e8cb94c524..e896832e5f 100644 --- 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 286078ae87..ddd3592d49 100644 --- 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 14a31d269e..39809b31b6 100644 --- 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 f305eba369..bb8545d91f 100644 --- 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 dff367dc99..631e2a247e 100644 --- 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 b3693eac16..c56c322b74 100644 --- 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 810412be90..b5d597715a 100644 --- 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 51025f1645..e566f90968 100644 --- 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