From a5cda136727586c89851116fbbe733798dea4484 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sun, 28 May 2023 15:09:25 -0500 Subject: [PATCH] Tool damage rebalance (#16857) * minor melee rebalance * red crowbar 8 blunt > 7 blunt * oops * private dode is here to help! he's dodeier than ever * 12. the dime * DONKEY KONG * dodedujadj * dode is the word * soy jack --- .../Entities/Objects/Tools/cowtools.yml | 18 ++-- .../Entities/Objects/Tools/jaws_of_life.yml | 8 ++ .../Entities/Objects/Tools/toolbox.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 83 ++++++++++++------- .../Entities/Objects/Tools/welders.yml | 8 +- 5 files changed, 78 insertions(+), 41 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml index 211efabcad..0d62217f9f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml @@ -14,7 +14,8 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Pierce: 0 + attackRate: 2 - type: Tool qualities: - Cutting @@ -37,9 +38,10 @@ sprite: Objects/Tools/Cowtools/moodriver.rsi - type: ItemCooldown - type: MeleeWeapon + attackRate: 1.5 damage: types: - Piercing: 10 + Blunt: 0.1 #poke poke poke - type: Tool qualities: - Screwing @@ -60,9 +62,10 @@ sprite: Objects/Tools/Cowtools/wronch.rsi - type: ItemCooldown - type: MeleeWeapon + attackRate: 1.5 damage: types: - Blunt: 10 + Blunt: 0.1 - type: Tool qualities: - Anchoring @@ -85,7 +88,9 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Blunt: 1 + - type: StaminaDamageOnHit + damage: 5 #have you ever been hit with a plastic bat? that shit hurts - type: Tool qualities: - Prying @@ -159,6 +164,10 @@ state: cow_toolbox - type: Item sprite: Objects/Tools/Cowtools/cow_toolbox.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 4 - type: entity id: CowToolboxFilled @@ -176,4 +185,3 @@ - id: Cowelder - id: Milkalyzer -# I hate these fucking cowtools I hope the burn in hell -Swept diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index e59f67ed28..7991f8eb9e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -41,6 +41,10 @@ state: jaws_cutter useSound: /Audio/Items/jaws_cut.ogg changeSound: /Audio/Items/change_jaws.ogg + - type: MeleeWeapon + damage: + types: + Blunt: 10 - type: entity name: syndicate jaws of life @@ -71,3 +75,7 @@ state: syn_jaws_cutter useSound: /Audio/Items/jaws_cut.ogg changeSound: /Audio/Items/change_jaws.ogg + - type: MeleeWeapon + damage: + types: + Blunt: 14 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 1a345037b1..0996bbf4e9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -16,7 +16,7 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Blunt: 12 soundHit: path: "/Audio/Weapons/smash.ogg" - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index a27821ae09..00dae38cc2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -22,7 +22,10 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Piercing: 2 + attackRate: 2 #open and close that shit on their arm like hell! because you sure aren't doing any damage with this + soundHit: + path: "/Audio/Items/wirecutter.ogg" - type: Tool qualities: - Cutting @@ -64,10 +67,12 @@ sprite: Objects/Tools/screwdriver.rsi - type: ItemCooldown - type: MeleeWeapon - attackRate: 1.5 + attackRate: 1 damage: types: - Piercing: 7 + Piercing: 6 + soundHit: + path: "/Audio/Weapons/bladeslice.ogg" - type: Tool qualities: - Screwing @@ -106,7 +111,7 @@ attackRate: 1.5 damage: types: - Blunt: 6.5 + Blunt: 4.5 - type: Tool qualities: - Anchoring @@ -141,7 +146,8 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Blunt: 6 + Structural: 3 - type: Tool qualities: - Prying @@ -170,6 +176,11 @@ sprite: Objects/Tools/crowbar.rsi size: 10 heldPrefix: red + - type: MeleeWeapon + damage: + types: + Blunt: 8 #free man + Structural: 3 - type: entity name: multitool @@ -270,6 +281,8 @@ guides: - NetworkConfigurator +#Power tools +#Later on these should switch probably switch damage when changing the tool behavior. - type: entity name: power drill parent: BaseItem @@ -315,6 +328,13 @@ Plastic: 100 - type: StaticPrice price: 100 + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Piercing: 8 + soundHit: + path: "/Audio/Items/drill_hit.ogg" - type: entity name: RCD @@ -384,32 +404,6 @@ - type: StaticPrice price: 60 -- type: entity - name: shovel - parent: BaseItem - id: Shovel - description: A large tool for digging and moving dirt. - components: - - type: Tag - tags: - - Shovel - - type: Sprite - sprite: Objects/Tools/shovel.rsi - state: icon - - type: ItemCooldown - - type: MeleeWeapon - damage: - types: - Blunt: 10 - - type: Item - sprite: Objects/Tools/shovel.rsi - - type: PhysicalComposition - materialComposition: - Steel: 100 - Wood: 50 - - type: StaticPrice - price: 25 - - type: entity name: omnitool parent: BaseItem @@ -473,3 +467,30 @@ state: omnitool-pulsing changeSound: path: /Audio/Items/change_drill.ogg + +#Other +- type: entity + name: shovel + parent: BaseItem + id: Shovel + description: A large tool for digging and moving dirt. + components: + - type: Tag + tags: + - Shovel + - type: Sprite + sprite: Objects/Tools/shovel.rsi + state: icon + - type: ItemCooldown + - type: MeleeWeapon + damage: + types: + Blunt: 14 + - type: Item + sprite: Objects/Tools/shovel.rsi + - type: PhysicalComposition + materialComposition: + Steel: 100 + Wood: 50 + - type: StaticPrice + price: 25 diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 4a38583c84..2c512ddf05 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -33,7 +33,7 @@ - type: MeleeWeapon damage: types: - Blunt: 10 + Blunt: 5 #i mean... i GUESS you could use it like that - type: ItemStatus - type: RefillableSolution solution: Welder @@ -50,9 +50,9 @@ qualities: Welding - type: Welder litMeleeDamageBonus: - types: # When lit, negate standard melee damage and replace with heat - Heat: 10 - Blunt: -10 + types: + Heat: 8 + Blunt: -5 - type: PointLight netsync: false enabled: false