Work...

Simple-Station · Sep 20, 2024 · 2a6038d · 2a6038d
1 parent c1aef1b
commit 2a6038d
Show file tree

Hide file tree

Showing 24 changed files with 67 additions and 90 deletions.
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -110,7 +110,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// Total width of the angle for wide attacks.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Angle Angle = Angle.FromDegrees(45);
+    public Angle Angle = Angle.FromDegrees(60);
 
     [DataField, AutoNetworkedField]
     public EntProtoId Animation = "WeaponArcPunch";
@@ -129,10 +129,10 @@ public sealed partial class MeleeWeaponComponent : Component
     public bool SwingLeft;
 
     [DataField, AutoNetworkedField]
-    public float HeavyStaminaCost = 10f;
+    public float HeavyStaminaCost = 2.5f;
 
     [DataField, AutoNetworkedField]
-    public int MaxTargets = 1;
+    public int MaxTargets = 3;
 
     // Sounds
 

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -25,7 +25,7 @@
     bluntStaminaDamageFactor: 1.5
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     angle: 75
   - type: Item
     size: Normal
@@ -67,7 +67,7 @@
     bluntStaminaDamageFactor: 1.5
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     angle: 75
   - type: Item
     size: Normal
@@ -110,7 +110,7 @@
     bluntStaminaDamageFactor: 1.5
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 15
+    heavyStaminaCost: 10
     angle: 160
   - type: Wieldable
   - type: IncreaseDamageOnWield
@@ -234,7 +234,7 @@
     bluntStaminaDamageFactor: 2
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     angle: 75
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -630,12 +630,11 @@
     state: icon
   - type: MeleeWeapon
     attackRate: 1.5
-    range: 1.3
+    range: 1.5
     damage:
       types:
         Blunt: 0.1
     heavyDamageBaseModifier: 2
-    heavyStaminaCost: 5
     maxTargets: 8
     angle: 25
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -6,8 +6,8 @@
   components:
   - type: Sharp
   - type: MeleeWeapon
-    attackRate: 1.5
-    range: 1.3
+    attackRate: 1.4
+    range: 1.4
     damage:
       types:
         Slash: 4

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -46,8 +46,8 @@
         Blunt: 8
     heavyRateModifier: 0.8
     heavyDamageBaseModifier: 2
-    heavyStaminaCost: 15
-    maxTargets: 8
+    heavyStaminaCost: 7.5
+    maxTargets: 6
     soundHit:
       path: /Audio/Weapons/smash.ogg
   - type: Tool

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -50,7 +50,7 @@
     heavyRateModifier: 0.8
     heavyDamageBaseModifier: 1
     heavyStaminaCost: 5
-    maxTargets: 3
+    maxTargets: 4
   - type: Tag
     tags:
     - Book

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -21,7 +21,6 @@
     heavyRateModifier: 1
     heavyRangeModifier: 1
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 5
     angle: 100
   - type: Item
@@ -48,7 +47,6 @@
     heavyRateModifier: 0.9
     heavyRangeModifier: 1.25
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
   - type: Item
@@ -103,7 +101,7 @@
     wideAnimationRotation: 135
     swingLeft: true
     attackRate: 1.25
-    range: 1.25
+    range: 1.4
     damage:
       types:
         Slash: 10

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -16,7 +16,7 @@
     heavyRateModifier: 0.8
     heavyRangeModifier: 1.25
     heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     maxTargets: 2
     angle: 180
     soundHit:
@@ -64,7 +64,7 @@
       heavyRateModifier: 0.8
       heavyRangeModifier: 1.25
       heavyDamageBaseModifier: 1.25
-      heavyStaminaCost: 10
+      heavyStaminaCost: 7.5
       maxTargets: 2
       angle: 180
       soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -51,7 +51,7 @@
     - 1,1,1,1
   - type: MeleeWeapon
     attackRate: 0.75
-    range: 1.3
+    range: 1.4
     damage:
       types:
         Piercing: 8
@@ -87,7 +87,7 @@
     wideAnimationRotation: 90
     swingLeft: true
     attackRate: 1.25
-    range: 1.25
+    range: 1.4
     damage:
       types:
         Slash: 7.5
@@ -208,7 +208,8 @@
     heavyStaminaCost: 20
     maxTargets: 8
     angle: 20
-# ~~No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.~~ No, I'm going to saw through your bones.
+# --No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.--
+# No, I'm going to saw through your bones.
 
 - type: entity
   name: choppa
@@ -252,15 +253,15 @@
     storedRotation: 90
   - type: MeleeWeapon
     attackRate: 1.15
-    range: 1.4
+    range: 1.5
     bluntStaminaDamageFactor: 3.0
     damage:
       types:
         Blunt: 4.5
         Slash: 5.5
     heavyRateModifier: 0.5
     heavyDamageBaseModifier: 1
-    heavyStaminaCost: 15
+    heavyStaminaCost: 10
     maxTargets: 8
     angle: 360
     soundHit:
@@ -282,16 +283,16 @@
     heldPrefix: advanced
     storedRotation: 90
   - type: MeleeWeapon
-    attackRate: 1.25
-    range: 1.4
+    attackRate: 1.15
+    range: 1.5
     bluntStaminaDamageFactor: 5.0
     damage:
       types:
         Blunt: 4.5
         Slash: 7.5
     heavyRateModifier: 0.5
     heavyDamageBaseModifier: 1
-    heavyStaminaCost: 15
+    heavyStaminaCost: 10
     maxTargets: 8
     angle: 360
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -120,9 +120,8 @@
     damage:
       types:
         Blunt: 6.5
-    bluntStaminaDamageFactor: 1.5
+    bluntStaminaDamageFactor: 2
     heavyRateModifier: 0.9
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -41,9 +41,9 @@
     bluntStaminaDamageFactor: 2.5
     heavyRateModifier: 0.8
     heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 15
-    maxTargets: 1
-    angle: 140
+    heavyStaminaCost: 10
+    maxTargets: 3
+    angle: 100
   - type: PhysicalComposition
     materialComposition:
       Steel: 185

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -44,16 +44,16 @@
         changeSound: /Audio/Items/change_jaws.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 90
-    attackRate: 0.75
-    range: 1.75
+    attackRate: 0.85
+    range: 1.65
     damage:
       types:
         Blunt: 10
         Slash: 2
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.8
     heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 10
+    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -28,7 +28,7 @@
         Blunt: 9
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.8
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     angle: 80.5
     soundHit:
       path: "/Audio/Weapons/smash.ogg"

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -38,9 +38,7 @@
         Blunt: 6.5
     heavyRateModifier: 0.9
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 4
-    angle: 60
     soundHit:
       path: "/Audio/Items/wirecutter.ogg"
   - type: Tool
@@ -103,7 +101,6 @@
         Piercing: 6
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:
@@ -165,7 +162,6 @@
     bluntStaminaDamageFactor: 1.5
     heavyRateModifier: 0.75
     heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 5
     angle: 100
     soundHit:
       collection: MetalThud
@@ -279,7 +275,6 @@
         Shock: 2
     heavyRateModifier: 0.9
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
   - type: Item
@@ -424,7 +419,6 @@
         Piercing: 8
     heavyRateModifier: 0.9
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 5
     maxTargets: 1
     angle: 20
     soundHit:
@@ -641,14 +635,14 @@
   - type: MeleeWeapon
     wideAnimationRotation: 45
     attackRate: 0.8
-    range: 2.0
+    range: 1.75
     damage:
       types:
         Blunt: 8
     bluntStaminaDamageFactor: 1.5
     heavyRateModifier: 0.9
     heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     angle: 100
     soundHit:
       collection: MetalThud
@@ -696,8 +690,7 @@
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.8
     heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 5
-    maxTargets: 1
+    maxTargets: 2
     angle: 20
     soundHit:
       collection: MetalThud

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -17,7 +17,7 @@
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.5
     heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 15
+    heavyStaminaCost: 10
     maxTargets: 2
     angle: 120
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -11,7 +11,7 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1.25
-    range: 1.4
+    range: 1.5
     damage:
       types:
         Slash: 8
@@ -39,12 +39,12 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 0.75
-    range: 1.75
+    range: 1.65
     damage:
       types:
         Slash: 12
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     maxTargets: 6
     angle: 90
   - type: Item
@@ -70,7 +70,7 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
-    attackRate: 0.75
+    attackRate: 0.85
     range: 1.75
     damage:
       types:
@@ -79,7 +79,7 @@
         Structural: 5
     heavyRateModifier: 0.9
     heavyDamageBaseModifier: 1.2
-    heavyStaminaCost: 10
+    heavyStaminaCost: 7.5
     angle: 100
     soundHit:
       collection: MetalThud

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/home_run_bat.yml
@@ -14,8 +14,7 @@
     bluntStaminaDamageFactor: 2.0
     heavyRateModifier: 0.5
     heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 25
-    maxTargets: 2
+    heavyStaminaCost: 15
     angle: 120
     soundHit:
       collection: ExplosionSmall