weapon rebalance + weapons equipping on move

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]

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

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

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

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

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
+    cPAnimationLength: 0.25
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 10
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 10

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

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

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: