From 934c1e44a6934b35df73aa367a296f59d342b6a7 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Mon, 5 Aug 2024 21:00:40 +0300 Subject: [PATCH] second rebalance (#390) Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Objects/Weapons/Melee/battleHammer.yml | 4 ++-- .../Objects/Weapons/Melee/battleStaff.yml | 8 +++---- .../Objects/Weapons/Melee/twoHandedSword.yml | 22 ++++++++++++++++++- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml index 827940c01b..a0df8fe71c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml @@ -22,7 +22,7 @@ - type: MeleeWeapon angle: 120 attackRate: 0.7 - range: 1.8 + range: 1.6 wideAnimationRotation: 320 wideAnimation: CP14WeaponArcSlash damage: @@ -36,7 +36,7 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 9 + Blunt: 8 Structural: 10 - type: StaminaDamageOnHit damage: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml index 9340bed45c..730e6cf724 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml @@ -24,21 +24,21 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 5 + Blunt: 4 - type: MeleeWeapon angle: 100 attackRate: 1.3 - range: 1.5 + range: 1.3 wideAnimationRotation: -30 wideAnimation: CP14WeaponArcSlash damage: types: - Blunt: 5 + Blunt: 4 soundHit: collection: MetalThud cPAnimationLength: 0.3 cPAnimationOffset: -1.3 - type: StaminaDamageOnHit - damage: 12 + damage: 9 - type: CP14Currency currency: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index a9a0903617..24d4ab31c9 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -66,4 +66,24 @@ sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi - type: Tag tags: - - CP14HerbalGathering \ No newline at end of file + - CP14HerbalGathering + - type: MeleeWeapon + angle: 110 + attackRate: 0.6 + range: 1.4 + wideAnimationRotation: 205 + wideAnimation: CP14WeaponArcSlash + damage: + types: + Slash: 4 + Blunt: 3 + soundHit: + collection: MetalThud + cPAnimationLength: 0.6 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Slash: 6 + - type: CP14Currency + currency: 2000