From 43384c112599ccbcac1de171b20a60b139ae2d19 Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 22 Apr 2024 20:36:54 +0300 Subject: [PATCH] weapon rebalance + weapons equipping on move --- .../Clothing/Components/ClothingComponent.cs | 3 +++ Content.Shared/Inventory/InventorySystem.Equip.cs | 4 ++-- .../Entities/Objects/Weapons/Melee/dagger.yml | 3 ++- .../Objects/Weapons/Melee/handheldAxe.yml | 4 ++-- .../Objects/Weapons/Melee/lightHammer.yml | 2 +- .../_CP14/Entities/Objects/Weapons/Melee/mace.yml | 15 ++++++++++++--- .../Entities/Objects/Weapons/Melee/sickle.yml | 5 +++-- .../Entities/Objects/Weapons/Melee/spear.yml | 4 ++-- .../Objects/Weapons/Melee/twoHandedSword.yml | 3 ++- 9 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs index 6d7226e767..371217a785 100644 --- a/Content.Shared/Clothing/Components/ClothingComponent.cs +++ b/Content.Shared/Clothing/Components/ClothingComponent.cs @@ -76,6 +76,9 @@ public sealed partial class ClothingComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite)] public TimeSpan UnequipDelay = TimeSpan.Zero; + + [DataField] + public bool BreakOnMove = true; //CrystallPunk weapon unequipping on move } [Serializable, NetSerializable] diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs index 7c9279df20..017932234e 100644 --- a/Content.Shared/Inventory/InventorySystem.Equip.cs +++ b/Content.Shared/Inventory/InventorySystem.Equip.cs @@ -168,7 +168,7 @@ public abstract partial class InventorySystem { BlockDuplicate = true, BreakOnHandChange = true, - BreakOnMove = true, + BreakOnMove = clothing.BreakOnMove, //CrystallPunk weapon unequipping on move CancelDuplicate = true, RequireCanInteract = true, NeedHand = true @@ -413,7 +413,7 @@ public abstract partial class InventorySystem { BlockDuplicate = true, BreakOnHandChange = true, - BreakOnMove = true, + BreakOnMove = clothing.BreakOnMove, //CrystallPunk weapon unequipping on move CancelDuplicate = true, RequireCanInteract = true, NeedHand = true diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml index 60ef7ac66c..d9099f023e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml @@ -19,6 +19,7 @@ unequipDelay: 0.25 sprite: _CP14/Objects/Weapons/Melee/Dagger/dagger.rsi quickEquip: false + breakOnMove: false slots: - belt - type: Sprite @@ -32,7 +33,7 @@ damage: types: Slash: 5 - Piercing: 5 + Piercing: 3 soundHit: collection: MetalThud cPAnimationLength: 0.15 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml index 2229934a50..a8d432d882 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml @@ -23,8 +23,8 @@ wideAnimation: CP14WeaponArcSlash damage: types: - Slash: 10 - Piercing: 5 + Slash: 7 + Piercing: 2 soundHit: collection: MetalThud cPAnimationLength: 0.25 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml index a76dab20eb..f38193a211 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml @@ -17,7 +17,7 @@ layers: - state: icon - type: MeleeWeapon - attackRate: 1.5 + attackRate: 1.2 wideAnimationRotation: 225 wideAnimation: CP14WeaponArcSlash cPAnimationLength: 0.18 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml index c3c5525856..ec4402b706 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml @@ -3,6 +3,7 @@ parent: - BaseItem - CP14BaseWeaponDestructible + - CP14BaseWeaponThrowable name: mace description: A heavy piece of metal on a long stick. What could be simpler than that? components: @@ -19,8 +20,16 @@ wideAnimation: CP14WeaponArcSlash damage: types: - Blunt: 25 - Piercing: 5 + Blunt: 18 + Piercing: 4 soundHit: collection: MetalThud - cPAnimationLength: 0.25 \ No newline at end of file + cPAnimationLength: 0.25 + - type: DamageOtherOnHit + damage: + types: + Blunt: 10 + - type: DamageOnLand + damage: + types: + Blunt: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml index ea02cd44d2..d3c9a9334c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml @@ -18,6 +18,7 @@ unequipDelay: 0.45 sprite: _CP14/Objects/Weapons/Melee/Sickle/sickle.rsi quickEquip: false + breakOnMove: false slots: - belt - type: Sprite @@ -31,7 +32,7 @@ cPAnimationLength: 0.18 damage: types: - Slash: 8 - Piercing: 4 + Slash: 5 + Piercing: 3 soundHit: collection: MetalThud \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml index 1c1e8cf9f1..66e7daa0c6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml @@ -17,12 +17,12 @@ layers: - state: icon - type: MeleeWeapon - attackRate: 1 + attackRate: 0.8 wideAnimationRotation: -115 wideAnimation: CP14WeaponArcThrust damage: types: - Piercing: 24 + Piercing: 19 soundHit: collection: MetalThud cPAnimationLength: 0.25 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index 1acc47829e..2cefa0700e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -16,13 +16,14 @@ unequipDelay: 1 sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi quickEquip: false + breakOnMove: false slots: - back - type: Icon sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword32.rsi state: icon - type: MeleeWeapon - attackRate: 0.5 + attackRate: 0.7 wideAnimationRotation: 205 wideAnimation: CP14WeaponArcSlash damage: