Stun baton precise attack thrust animation (#34693)

use weaponarcthrust instead of wide swing on single attack (cherry picked from commit c71a995555d48cb6355e79103418e965207d08f6)
2026-04-16 21:17:39 +03:00 · 2025-01-28 21:55:08 +03:00
parent 60cf08459d
commit f3eed8583f
1 changed files with 105 additions and 101 deletions
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -9,9 +9,6 @@
    layers:
    - state: stunbaton_off
      map: [ "enum.ToggleVisuals.Layer" ]
-  - type: Tag
-    tags:
-    - Stunbaton
  - type: Stunbaton
    energyPerUse: 50
  - type: ItemToggle
@@ -32,15 +29,17 @@
    activatedDamage:
      types:
        Blunt: 0
-  - type: ItemToggleDamageOtherOnHit
  - type: MeleeWeapon
-    animationRotation: 135 # WWDP
+    wideAnimationRotation: -135
    damage:
      types:
        Blunt: 7
    bluntStaminaDamageFactor: 2.0
-    canHeavyAttack: false # WD EDIT
-    attackRate: 1 # WD EDIT
+    # WD EDIT START
+    animationRotation: 135
+    canHeavyAttack: false
+    attackRate: 1
+    # WD EDIT END
  - type: DamageOtherOnHit
  - type: StaminaDamageOnHit # Stunmeta
    damage: 15
@@ -52,8 +51,9 @@
    sound: /Audio/Weapons/egloves.ogg
  - type: LandAtCursor # it deals stamina damage when thrown
  - type: Battery
-    maxCharge: 750 # WD EDIT
-    startingCharge: 750 # WD EDIT
+    maxCharge: 750 # WD EDIT: 1000 -> 750
+    startingCharge: 750 # WD EDIT: 1000 -> 750
+  - type: UseDelay
  - type: Item
    heldPrefix: off
    size: Normal
@@ -63,11 +63,11 @@
    slots:
    - Belt
  - type: DisarmMalus
-    malus: 0.8 # WWDP
+    malus: 0.8 # WD EDIT: 0.225 -> 0.8
  - type: Appearance
  - type: GenericVisualizer
    visuals:
-      enum.ToggleVisuals.Toggled:
+     enum.ToggleVisuals.Toggled:
        enum.ToggleVisuals.Layer:
          True: {state: stunbaton_on}
          False: {state: stunbaton_off}
@@ -94,9 +94,14 @@
    guides:
    - Security
    - Antagonists
+  - type: ItemToggleDamageOtherOnHit
+  - type: Tag
+    tags:
+    - Stunbaton
  - type: MartialArtBlocked # Goobstation - Martial Arts
    form: CorporateJudo # Goobstation - Martial Arts

+
 - type: entity
  name: truncheon
  parent: [BaseItem, BaseRestrictedContraband]
@@ -107,7 +112,6 @@
    sprite: Objects/Weapons/Melee/truncheon.rsi
    state: icon
  - type: MeleeWeapon
-    animationRotation: -45 # WWDP
    wideAnimationRotation: -135
    attackRate: 1.2
    damage:
@@ -116,8 +120,7 @@
    soundHit:
      collection: MetalThud
    bluntStaminaDamageFactor: 3
-  - type: DamageOtherOnHit
-    staminaCost: 9
+    animationRotation: -45 # WD EDIT
  - type: Item
    size: Normal
  - type: Tag
@@ -129,7 +132,7 @@
    slots:
    - Belt
  - type: DisarmMalus
-    malus: 0.8 # WWDP
+    malus: 0.8 # WD EDIT: 0.225 -> 0.8
  - type: Appearance
  - type: StaticPrice
    price: 80
@@ -137,6 +140,8 @@
    guides:
    - Security
    - Antagonists
+  - type: DamageOtherOnHit
+    staminaCost: 9

 - type: entity
  name: flash
@@ -144,50 +149,49 @@
  id: Flash
  description: An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out.
  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/flash.rsi
-    layers:
-    - state: flash
-      map: [ "enum.FlashVisuals.BaseLayer" ]
-    - state: flashing
-      map: [ "enum.FlashVisuals.LightLayer" ]
-      visible: false
-      shader: unshaded
-  - type: Flash
-  - type: LimitedCharges
-    maxCharges: 5
-    charges: 5
-  - type: MeleeWeapon
-    canBeBlocked: false # WD EDIT
-    wideAnimationRotation: 180
-    damage:
-      types:
-        Blunt: 0 # melee weapon to allow flashing individual targets
-    angle: 10
-  - type: Item
-    size: Small
-    sprite: Objects/Weapons/Melee/flash.rsi
-  #    - type: DynamicPrice
-  #      price: 40
-  - type: ReverseEngineering # Nyano
-    recipes:
-    - Flash
-  - type: StaticPrice
-    price: 40
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.FlashVisuals.Burnt:
-        enum.FlashVisuals.BaseLayer:
-          True: {state: burnt}
-      enum.FlashVisuals.Flashing:
-        enum.FlashVisuals.LightLayer:
-          True: {visible: true}
-          False: {visible: false}
-  - type: GuideHelp
-    guides:
-    - Security
-    - Antagonists
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/flash.rsi
+      layers:
+      - state: flash
+        map: [ "enum.FlashVisuals.BaseLayer" ]
+      - state: flashing
+        map: [ "enum.FlashVisuals.LightLayer" ]
+        visible: false
+        shader: unshaded
+    - type: Flash
+    - type: LimitedCharges
+      maxCharges: 5
+      charges: 5
+    - type: MeleeWeapon
+      wideAnimationRotation: 180
+      damage:
+        types:
+          Blunt: 0 # melee weapon to allow flashing individual targets
+      angle: 10
+      canBeBlocked: false # WD EDIT
+    - type: Item
+      size: Small
+      sprite: Objects/Weapons/Melee/flash.rsi
+    - type: UseDelay
+    - type: StaticPrice
+      price: 40
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.FlashVisuals.Burnt:
+          enum.FlashVisuals.BaseLayer:
+            True: {state: burnt}
+        enum.FlashVisuals.Flashing:
+          enum.FlashVisuals.LightLayer:
+            True: {visible: true}
+            False: {visible: false}
+    - type: GuideHelp
+      guides:
+      - Security
+      - Antagonists
+    - type: ReverseEngineering # Nyano
+      recipes:
+      - Flash

 - type: entity
  name: flash
@@ -195,9 +199,9 @@
  suffix: 2 charges
  id: SciFlash
  components:
-  - type: LimitedCharges
-    maxCharges: 2
-    charges: 2
+    - type: LimitedCharges
+      maxCharges: 2
+      charges: 2

 - type: entity
  name: portable flasher
@@ -205,42 +209,42 @@
  id: PortableFlasher
  description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only.
  components:
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Weapons/flash.ogg
-  - type: FlashOnTrigger
-    range: 3
-  - type: TriggerOnProximity
-    enabled: true
-    cooldown: 5
-    shape:
-      !type:PhysShapeCircle
-      radius: 2
-    repeating: true
-  - type: Sprite
-    sprite: Objects/Weapons/pflash.rsi
-    layers:
-    - state: "off"
-      map: ["enum.ProximityTriggerVisualLayers.Base"]
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.15,-0.3,0.15,0.3"
-        mask:
-        - MachineMask
-        layer:
-        - MachineLayer
-        density: 380
-  - type: Appearance
-  - type: AnimationPlayer
-  - type: PointLight
-    energy: 2.0
-    radius: 0
-    softness: 0
-    enabled: true
-  - type: GuideHelp
-    guides:
-    - Security
-    - Antagonists
+    - type: EmitSoundOnTrigger
+      sound:
+        path: /Audio/Weapons/flash.ogg
+    - type: FlashOnTrigger
+      range: 3
+    - type: TriggerOnProximity
+      enabled: true
+      cooldown: 5
+      shape:
+        !type:PhysShapeCircle
+          radius: 2
+      repeating: true
+    - type: Sprite
+      sprite: Objects/Weapons/pflash.rsi
+      layers:
+        - state: "off"
+          map: ["enum.ProximityTriggerVisualLayers.Base"]
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.15,-0.3,0.15,0.3"
+          mask:
+          - MachineMask
+          layer:
+          - MachineLayer
+          density: 380
+    - type: Appearance
+    - type: AnimationPlayer
+    - type: PointLight
+      energy: 2.0
+      radius: 0
+      softness: 0
+      enabled: true
+    - type: GuideHelp
+      guides:
+      - Security
+      - Antagonists