Merge pull request #84 from machination-of-ruin/brutal-melee

Brutal Melee
machination-of-ruin · Nov 15, 2024 · 210a63b · 210a63b
2 parents 50b4f8d + 76e6311
commit 210a63b
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 43 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -49,7 +49,7 @@
     attackRate: 1.5
     damage:
       types:
-        Piercing: 5
+        Piercing: 7
 
 - type: entity
   parent: UtensilBasePlastic
@@ -84,7 +84,7 @@
     attackRate: 1.5
     damage:
       types:
-        Blunt: 1
+        Blunt: 6
   - type: Shovel
     speedModifier: 0.1 # you can try
 

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -117,10 +117,10 @@
         map: [ "light" ]
   - type: MeleeWeapon
     wideAnimationRotation: 90
-    attackRate: 0.8
+    attackRate: 1
     damage:
       types:
-        Blunt: 6.5
+        Blunt: 10
     bluntStaminaDamageFactor: 1.5
     #heavyRateModifier: 0.9
     #heavyStaminaCost: 5

diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -25,7 +25,7 @@
     range: 1.75
     damage:
       types:
-        Blunt: 9
+        Blunt: 12
     bluntStaminaDamageFactor: 2.0
     #heavyRateModifier: 0.8
     #heavyStaminaCost: 10

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -31,11 +31,11 @@
     - state: cutters-cutty-thingy
   - type: MeleeWeapon
     wideAnimationRotation: -90
-    attackRate: 0.9
+    attackRate: 1
     range: 1.6
     damage:
       types:
-        Blunt: 6.5
+        Blunt: 7
     #heavyRateModifier: 0.9
     #heavyDamageBaseModifier: 1.2
     #heavyStaminaCost: 5
@@ -110,7 +110,7 @@
     attackRate: 1.35
     damage:
       types:
-        Piercing: 6
+        Piercing: 8
     #heavyRateModifier: 0.75
     #heavyDamageBaseModifier: 1.5
     #heavyStaminaCost: 5
@@ -174,11 +174,11 @@
     animationRotation: 225
     wideAnimation: WeaponArcSlash
     wideAnimationRotation: 135
-    attackRate: 0.9
+    attackRate: 1.3
     range: 1.6
     damage:
       types:
-        Blunt: 6.5
+        Blunt: 9
     bluntStaminaDamageFactor: 1.5
     #heavyRateModifier: 0.75
     #heavyDamageBaseModifier: 1.75
@@ -242,7 +242,7 @@
     attackRate: 1.25
     damage:
       types:
-        Blunt: 6
+        Blunt: 10
     bluntStaminaDamageFactor: 2
     #heavyStaminaCost: 5
     soundHit:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -50,7 +50,7 @@
   - type: StaticPrice
     price: 500
   - type: MeleeWeapon # WD EDIT
-    attackRate: 0.5
+    attackRate: 0.8
     damage:
       types:
         Blunt: 8

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -15,8 +15,7 @@
     range: 1.6
     damage:
       types:
-        Blunt: 7.5
-        Structural: 5
+        Blunt: 10
     bluntStaminaDamageFactor: 2.0
     #heavyRateModifier: 0.5
     #heavyDamageBaseModifier: 1.75
@@ -28,8 +27,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 4
-        Structural: 10
+        Blunt: 10
   - type: Item
     size: Huge
     shape:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -23,7 +23,6 @@
         # axes are kinda like sharp hammers, you know?
         Blunt: 4
         Slash: 6
-        Structural: 10
     #heavyDamageBaseModifier: 1.0
     #heavyStaminaCost: 10
     angle: 60
@@ -33,9 +32,8 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2
-        Slash: 5
-        Structural: 40
+        Blunt: 5
+        Slash: 10
   - type: Item
     size: Ginormous
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -19,7 +19,7 @@
     range: 1.4
     damage:
       types:
-        Slash: 8
+        Slash: 12
     #heavyRateModifier: 0.8
     #heavyDamageBaseModifier: 1.2
     #heavyStaminaCost: 5
@@ -59,9 +59,12 @@
     state: icon
   - type: Item
     sprite: Objects/Weapons/Melee/kitchen_knife.rsi
-  - type: GuideHelp
-    guides:
-    - Chef
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 12
 
 - type: entity
   name: butcher's cleaver
@@ -80,14 +83,16 @@
     attackRate: 1
     damage:
       types:
-        Slash: 8
-        Blunt: 1
+        Slash: 20
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
-  - type: GuideHelp
-    guides:
-    - Chef
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 20
 
 - type: entity
   name: combat knife
@@ -103,17 +108,17 @@
     sprite: Objects/Weapons/Melee/combat_knife.rsi
     state: icon
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1.25
     range: 1.4
     damage:
       types:
-        Slash: 9
+        Slash: 15
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit
     damage:
       types:
-        Slash: 9
+        Slash: 15
   - type: Item
     sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
@@ -130,10 +135,14 @@
     state: icon
   - type: MeleeWeapon
     attackRate: 1.25
-    range: 1.5
+    range: 1.4
+    damage:
+      types:
+        Slash: 14
+  - type: DamageOtherOnHit
     damage:
       types:
-        Slash: 8
+        Slash: 14
   - type: Item
     sprite: Objects/Weapons/Melee/survival_knife.rsi
 
@@ -155,7 +164,7 @@
     range: 1.75
     damage:
       types:
-        Slash: 10
+        Slash: 18
   - type: Item
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
@@ -178,7 +187,7 @@
     attackRate: 1.2
     damage:
       types:
-        Slash: 5
+        Slash: 10
   - type: DamageOtherOnHit
     damage:
       types:
@@ -223,7 +232,7 @@
     range: 0.75
     damage:
       types:
-        Slash: 5.5
+        Slash: 10
   - type: Item
     sprite: Objects/Weapons/Melee/shiv.rsi
   - type: DisarmMalus

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -21,8 +21,8 @@
         volume: -3
     damage:
       types:
-        Blunt: 6
-        Pierce: 3
+        Blunt: 8
+        Pierce: 2
     bluntStaminaDamageFactor: 2.0
     #heavyDamageBaseModifier: 1.75
     #heavyStaminaCost: 5
@@ -32,8 +32,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 5
-        Structural: 30
+        Pierce: 10
   - type: Item
     size: Normal
     shape:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -17,7 +17,7 @@
     range: 1.75
     damage:
       types:
-        Blunt: 6
+        Blunt: 10
         Structural: 10
     bluntStaminaDamageFactor: 2.0
     #heavyRateModifier: 0.75
@@ -31,7 +31,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 34
+        Blunt: 20
         Structural: 20
   - type: Item
     size: Ginormous
diff --git a/Resources/Prototypes/_ERRORGATE/LootManager/LootEntries/melee_weapons.yml b/Resources/Prototypes/_ERRORGATE/LootManager/LootEntries/melee_weapons.yml
@@ -27,6 +27,12 @@
   rarityTiers: [2]
   locations: [Living, Industial, Prison]
 
+- type: lootEntry
+  id: FireAxe
+  rarityTiers: [2, 3]
+  locations: [Industial]
+
+
 # Rarity 3
 
 - type: lootEntry

diff --git a/Resources/Prototypes/_ERRORGATE/LootManager/globalloottable.yml b/Resources/Prototypes/_ERRORGATE/LootManager/globalloottable.yml
@@ -128,6 +128,7 @@
     Machete: 1
     Truncheon: 1
     Sledgehammer: 1
+    FireAxe: 1
 
     # Utility & Tools
     Fork: 2

diff --git a/Resources/Prototypes/_ERRORGATE/LootManager/kuznetsk.yml b/Resources/Prototypes/_ERRORGATE/LootManager/kuznetsk.yml
@@ -88,6 +88,7 @@
     Machete: 1
     Truncheon: 1
     Sledgehammer: 1
+    FireAxe: 1
 
     # Utility & Tools
     Fork: 2