feat(throwing): stat change pass

Changed a lot of stamina costs
angelofallars · Nov 22, 2024 · 89a366d · 89a366d
1 parent acdf2f9
commit 89a366d
Show file tree

Hide file tree

Showing 29 changed files with 85 additions and 19 deletions.
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
@@ -69,8 +69,8 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 9
-    staminaCost: 10
+        Blunt: 11
+    staminaCost: 12
 
 - type: entity
   id: BaseHead
@@ -107,7 +107,7 @@
     damage:
       types:
         Blunt: 7
-    staminaCost: 8
+    staminaCost: 7
 
 - type: entity
   id: BaseRightArm
@@ -123,7 +123,7 @@
     damage:
       types:
         Blunt: 7
-    staminaCost: 8
+    staminaCost: 7
 
 - type: entity
   id: BaseLeftHand

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml
@@ -28,6 +28,7 @@
     damage:
       types:
         Blunt: 2
+    staminaCost: 6
     soundHit:
       path: "/Audio/Weapons/click.ogg"
   - type: DamageOtherOnHit

diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -27,6 +27,7 @@
     damage:
       types:
         Blunt: 7
+    staminaCost: 5
     soundHit:
       collection: MetalThud
 

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -154,7 +154,7 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 15
+        Blunt: 16
     staminaCost: 40.0
     soundHit:
       collection: MetalThud

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -508,7 +508,7 @@
   parent: BasePDA
   id: CaptainPDA
   name: captain PDA
-  description: This PDA is heavier to hold.
+  description: Surprisingly no different from your PDA... Wait, it's a fair bit heavy to hold.
   components:
   - type: Pda
     id: CaptainIDCard
@@ -527,6 +527,9 @@
     damage:
       types:
         Blunt: 8
+    staminaCost: 5
+    soundHit:
+      collection: MetalThud
 
 - type: entity
   parent: BasePDA

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -28,6 +28,7 @@
     heavyStaminaCost: 7.5
     angle: 75
   - type: DamageOtherOnHit
+    staminaCost: 8
   - type: Item
     size: Normal
     sprite: Objects/Fun/Instruments/eguitar.rsi
@@ -71,6 +72,7 @@
     heavyStaminaCost: 7.5
     angle: 75
   - type: DamageOtherOnHit
+    staminaCost: 8
   - type: Item
     size: Normal
     sprite: Objects/Fun/Instruments/bassguitar.rsi
@@ -115,6 +117,7 @@
     heavyStaminaCost: 10
     angle: 160
   - type: DamageOtherOnHit
+    staminaCost: 8
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
@@ -198,6 +201,7 @@
     heavyStaminaCost: 10
     angle: 75
   - type: DamageOtherOnHit
+    staminaCost: 7
   - type: IncreaseDamageOnWield
     damage:
       types:
@@ -245,6 +249,7 @@
     heavyStaminaCost: 7.5
     angle: 75
   - type: DamageOtherOnHit
+    staminaCost: 8
 
 - type: entity
   parent: BaseHandheldInstrument

diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -51,10 +51,11 @@
       types:
         Piercing: 5
   - type: DamageOtherOnHit
+    staminaCost: 2.5
   - type: EmbeddableProjectile
     removalTime: 0.5
   - type: ThrowingAngle
-    angle: 18
+    angle: 180
 
 - type: entity
   parent: UtensilBasePlastic
@@ -91,6 +92,8 @@
       types:
         Blunt: 1
   - type: DamageOtherOnHit
+  - type: ThrowingAngle
+    angle: 180
   - type: Shovel
     speedModifier: 0.1 # you can try
 
@@ -150,5 +153,7 @@
       types:
         Blunt: 2
   - type: DamageOtherOnHit
+  - type: ThrowingAngle
+    angle: 180
   - type: Shovel
     speedModifier: 0.05 # nah
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -24,6 +24,7 @@
     maxTargets: 5
     angle: 100
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: ThrowingAngle
     angle: 135
   - type: Item
@@ -53,6 +54,7 @@
     maxTargets: 1
     angle: 20
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: Item
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     storedRotation: -90
@@ -80,6 +82,7 @@
     maxTargets: 1
     angle: 120
   - type: DamageOtherOnHit
+    staminaCost: 7
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: ThrowingAngle
@@ -117,7 +120,7 @@
     heavyDamageBaseModifier: 1.2
     heavyStaminaCost: 5
   - type: DamageOtherOnHit
-    staminaCost: 6
+    staminaCost: 6.5
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: ThrowingAngle
@@ -151,11 +154,7 @@
     soundHit:
       collection: MetalThud
   - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 5
-        Slash: 3
-    staminaCost: 6
+    staminaCost: 5
   - type: ThrowingAngle
     angle: 45
   - type: Item

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -25,6 +25,7 @@
     damage:
       types:
         Blunt: 6
+    staminaCost: 8
   - type: Spillable
     solution: absorbed
   - type: Wieldable
@@ -80,6 +81,7 @@
       damage:
         types:
           Blunt: 6
+      staminaCost: 8
     - type: Spillable
       solution: absorbed
     - type: Wieldable

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -45,7 +45,7 @@
     - type: DamageOtherOnHit
       damage:
         types:
-          Blunt: 15
+          Blunt: 16
       staminaCost: 27
       soundHit:
         path: /Audio/Weapons/smash.ogg

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -121,6 +121,7 @@
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: EmbeddableProjectile
   - type: ThrowingAngle
     angle: 90

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -21,7 +21,10 @@
     soundSwing:
       path: /Audio/Weapons/punchmiss.ogg
   - type: DamageOtherOnHit
-    staminaCost: 10
+    damage:
+      types:
+        Blunt: 11
+    staminaCost: 15
   - type: Item
     size: Normal
   - type: Damageable

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -63,6 +63,7 @@
     soundHit:
       collection: MetalThud
   - type: DamageOtherOnHit
+    staminaCost: 4
   - type: Item
     sprite: Objects/Tools/flashlight.rsi
     storedRotation: -90

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -59,6 +59,9 @@
     soundHit:
       collection: MetalThud
   - type: DamageOtherOnHit
+    staminaCost: 7
+  - type: ThrowingAngle
+    angle: 90
   - type: ReverseEngineering # Delta
     difficulty: 3
     recipes:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -36,7 +36,7 @@
     damage:
       types:
         Blunt: 12
-    staminaCost: 12
+    staminaCost: 12.5
   - type: Tag
     tags:
     - Toolbox

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -29,6 +29,7 @@
         Blunt: 4
         Structural: 10
   - type: DamageOtherOnHit
+    staminaCost: 10
   - type: Item
     size: Normal
   - type: Tool

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -19,7 +19,10 @@
     heavyDamageBaseModifier: 1.2
     heavyStaminaCost: 5
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: EmbeddableProjectile
+  - type: ThrowingAngle
+    angle: 225
   - type: Item
     size: Normal
   - type: Clothing
@@ -50,7 +53,10 @@
     maxTargets: 6
     angle: 90
   - type: DamageOtherOnHit
+    staminaCost: 8
   - type: EmbeddableProjectile
+  - type: ThrowingAngle
+    angle: 225
   - type: Item
     size: Normal
   - type: Clothing
@@ -88,7 +94,10 @@
     soundHit:
       collection: MetalThud
   - type: DamageOtherOnHit
+    staminaCost: 9
   - type: EmbeddableProjectile
+  - type: ThrowingAngle
+    angle: 225
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -54,6 +54,7 @@
       types:
         Blunt: 4.5
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: Item
     size: Small
     sprite: DeltaV/Objects/Weapons/Melee/e_sword.rsi # Delta-V
@@ -155,6 +156,7 @@
     damage:
       types:
         Piercing: 3
+    staminaCost: 3.5
   - type: EmbeddableProjectile
     offset: 0.3,0.0
     removalTime: 0.0

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
@@ -19,6 +19,8 @@
     soundHit:
       collection: ExplosionSmall
   - type: DamageOtherOnHit
+    soundHit:
+      collection: MetalThud # A throw won't knock them back so it's just a normal thud
   - type: MeleeRequiresWield # You can't hit a home run with one hand, jimbo.
   - type: MeleeThrowOnHit
     speed: 30

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -76,7 +76,7 @@
         Slash: 8
         Blunt: 1
   - type: DamageOtherOnHit
-    staminaCost: 6
+    staminaCost: 7.5
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
@@ -161,7 +161,7 @@
       types:
         Slash: 5
   - type: DamageOtherOnHit
-    staminaCost: 6
+    staminaCost: 5
   - type: EmbeddableProjectile
   - type: Sprite
     sprite: Clothing/Head/Hats/greyflatcap.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -97,6 +97,7 @@
     maxTargets: 2
     angle: 20
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: EmbeddableProjectile
   - type: ThrowingAngle
     angle: 225

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -27,6 +27,7 @@
     maxTargets: 5
     angle: 80
   - type: DamageOtherOnHit
+    staminaCost: 5
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
@@ -74,6 +75,7 @@
     heavyDamageBaseModifier: 1
     angle: 20
   - type: DamageOtherOnHit
+    staminaCost: 8
   - type: ThrowingAngle
     angle: 270
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -24,6 +24,7 @@
     soundHit:
       collection: MetalThud
   - type: DamageOtherOnHit
+    staminaCost: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage: