Rebalances + fixes of weapons (#129)

* Rebalances + fixes of weapons

* movedlinessword

* movedlinesspear

* 123321

---------

Co-authored-by: 123 <123>

Resources/Prototypes/Civ14/Entities/Objects/Weapons/spears.yml

@@ -11,7 +11,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 44
+          Piercing: 19
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -29,11 +29,15 @@
     - type: Sprite
       sprite: Civ14/Weapons/dory.rsi
     - type: MeleeWeapon
+      range: 1.8
+      attackRate: 0.8
       damage:
         types:
-          Slash: 47
+          Piercing: 16
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: STWeight
+      self: 16        
     - type: Item
       sprite: Civ14/Weapons/dory.rsi
     - type: DisarmMalus
@@ -49,11 +53,15 @@
     - type: Sprite
       sprite: Civ14/Weapons/sarissa.rsi
     - type: MeleeWeapon
+      attackRate: 0.6
+      range: 2.1
       damage:
         types:
-          Slash: 47
+          Piercing: 16
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: STWeight
+      self: 16        
     - type: Item
       sprite: Civ14/Weapons/sarissa.rsi
     - type: DisarmMalus
@@ -72,9 +80,11 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 47
+          Piercing: 15   
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: STWeight
+      self: 12     
     - type: Item
       sprite: Civ14/Weapons/pike.rsi
     - type: DisarmMalus
@@ -92,11 +102,18 @@
     - type: Sprite
       sprite: Civ14/Weapons/naginata.rsi
     - type: MeleeWeapon
+      range: 1.6
       damage:
         types:
-          Slash: 47
+          Slash: 1
+          Piercing: 13
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: IncreaseDamageOnWield
+      damage: 
+        types:
+          Piercing: 5
+          Slash: 2
     - type: Item
       sprite: Civ14/Weapons/naginata.rsi
     - type: DisarmMalus
@@ -114,7 +131,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 44
+          Slash: 8
+          Piercing: 13
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item

Resources/Prototypes/Civ14/Entities/Objects/Weapons/stone_age.yml

@@ -8,10 +8,12 @@
       sprite: Civ14/Objects/StoneAge/club.rsi
       state: icon
     - type: MeleeWeapon
+      attackRate: 0.7
       wideAnimationRotation: -135
+      range: 1.1
       damage:
         types:
-          Blunt: 20
+          Blunt: 19
       soundHit:
         collection: MetalThud
       bluntStaminaDamageFactor: 1.5

Resources/Prototypes/Civ14/Entities/Objects/Weapons/swords.yml

@@ -89,7 +89,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 33
+          Slash: 39
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -107,7 +107,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 44
+          Slash: 12
+          Piercing: 24
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -125,7 +126,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 50
+          Slash: 32
+          Piercing: 8
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -143,7 +145,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 6
+          Slash: 33
+          Piercing: 5
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -161,7 +164,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 6
+          Slash: 31
+          Piercing: 7
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -179,7 +183,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 50
+          Slash: 22
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -199,7 +203,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 50
+          Slash: 19
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -251,9 +255,11 @@
     - type: Sprite
       sprite: Civ14/Weapons/longquan.rsi
     - type: MeleeWeapon
+      attackRate: 1.1
       damage:
         types:
-          Slash: 39
+          Slash: 30
+          Piercing: 10
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -271,7 +277,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 44
+          Slash: 29
+          Piercing: 4
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -287,9 +294,11 @@
     - type: Sprite
       sprite: Civ14/Weapons/sabre.rsi
     - type: MeleeWeapon
+      attackRate: 1.5
       damage:
         types:
-          Slash: 41
+          Slash: 37
+          Piercing: 5
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -305,11 +314,17 @@
     - type: Sprite
       sprite: Civ14/Weapons/longsword.rsi
     - type: MeleeWeapon
-      damage:
+      damage: 
         types:
-          Slash: 55
+          Slash: 38
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: Wieldable
+    - type: IncreaseDamageOnWield 
+      damage:
+        types:
+          Piercing: 5
+          Slash: 2
     - type: Item
       sprite: Civ14/Weapons/longsword.rsi
     - type: DisarmMalus
@@ -325,9 +340,15 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 105
+          Slash: 35
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: Wieldable
+    - type: IncreaseDamageOnWield 
+      damage:
+        types:
+          Piercing: 8
+          Slash: 13
     - type: Item
       sprite: Civ14/Weapons/zweihander.rsi
     - type: DisarmMalus
@@ -343,9 +364,15 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 99
+          Slash: 32
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: Wieldable
+    - type: IncreaseDamageOnWield 
+      damage:
+        types:
+          Piercing: 8
+          Slash: 13
     - type: Item
       sprite: Civ14/Weapons/claymore.rsi
     - type: DisarmMalus
@@ -361,9 +388,11 @@
     - type: Sprite
       sprite: Civ14/Weapons/rapier.rsi
     - type: MeleeWeapon
+      attackRate: 1.7
       damage:
         types:
-          Slash: 36
+          Slash: 15
+          Piercing: 24
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -381,9 +410,15 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 121
+          Slash: 36     
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
+    - type: Wieldable
+    - type: IncreaseDamageOnWield 
+      damage:
+        types:
+          Piercing: 2
+          Slash: 15 
     - type: Item
       sprite: Civ14/Weapons/broadsword.rsi
     - type: DisarmMalus
@@ -399,7 +434,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 33
+          Slash: 18
+          Piercing: 18
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -415,9 +451,11 @@
     - type: Sprite
       sprite: Civ14/Weapons/gaelic_short.rsi
     - type: MeleeWeapon
+      attackRate: 1.3
       damage:
         types:
-          Slash: 33
+          Slash: 16
+          Piercing: 16
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -435,7 +473,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 41
+          Slash: 43
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -451,9 +489,11 @@
     - type: Sprite
       sprite: Civ14/Weapons/gladius.rsi
     - type: MeleeWeapon
+      attackRate: 1.2
       damage:
         types:
-          Slash: 41
+          Slash: 23
+          Piercing: 15
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -473,7 +513,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 55
+          Slash: 34
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -493,7 +533,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 55
+          Slash: 34
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -511,7 +551,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 39
+          Slash: 23
+          Piercing: 22
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -531,7 +572,8 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 41
+          Slash: 21
+          Piercing: 20
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
@@ -569,7 +611,7 @@
     - type: MeleeWeapon
       damage:
         types:
-          Slash: 55
+          Slash: 42
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item