Rebalance melee weapons (#363)

* weapons rebalance * Update shield.yml * Update shield.yml --------- Co-authored-by: Ed <edwardxperia2000@gmail.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-07-30 22:43:09 +03:00
parent 7478e6b445
commit 909fa27450
11 changed files with 82 additions and 43 deletions
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml
@@ -20,7 +20,9 @@
    slots:
    - back
  - type: MeleeWeapon
-    attackRate: 0.8
+    angle: 120
+    attackRate: 0.7
+    range: 1.8
    wideAnimationRotation: 320
    wideAnimation: CP14WeaponArcSlash
    damage:
@@ -34,8 +36,10 @@
  - type: IncreaseDamageOnWield
    damage:
      types:
-        Blunt: 20
+        Blunt: 9
        Structural: 10
+  - type: StaminaDamageOnHit
+    damage: 10
  - type: Item
    size: Ginormous
  - type: ClothingSpeedModifier
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml
@@ -24,17 +24,21 @@
  - type: IncreaseDamageOnWield
    damage:
      types: 
-        Blunt: 8
+        Blunt: 5
  - type: MeleeWeapon
-    attackRate: 0.8
+    angle: 100
+    attackRate: 1.3
+    range: 1.5
    wideAnimationRotation: -30
    wideAnimation: CP14WeaponArcSlash
    damage:
      types:
-        Blunt: 12
+        Blunt: 5
    soundHit:
      collection: MetalThud
    cPAnimationLength: 0.3
    cPAnimationOffset: -1.3
+  - type: StaminaDamageOnHit
+    damage: 12
  - type: CP14Currency
    currency: 20
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
@@ -27,12 +27,13 @@
    layers:
    - state: icon
  - type: MeleeWeapon
+    angle: 60
    attackRate: 1.8
    wideAnimationRotation: 225
    wideAnimation: CP14WeaponArcSlash
    damage:
      types:
-        Slash: 5
+        Slash: 3
        Piercing: 3
    soundHit:
      collection: MetalThud
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
@@ -17,14 +17,14 @@
    layers:
    - state: icon
  - type: MeleeWeapon
-    attackRate: 1.4
-    range: 1.2
+    angle: 60
+    attackRate: 1.7
+    range: 1
    wideAnimationRotation: 225
    wideAnimation: CP14WeaponArcSlash
    damage:
      types:
-        Slash: 7
-        Piercing: 2
+        Slash: 6
    soundHit:
      collection: MetalThud
    cPAnimationLength: 0.25
@@ -34,12 +34,10 @@
  - type: DamageOtherOnHit
    damage:
      types:
-        Slash: 5
-        Piercing: 5
+        Slash: 12
  - type: DamageOnLand
    damage:
      types:
-        Slash: 5
-        Piercing: 5
+        Slash: 12
  - type: CP14Currency
    currency: 500
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
@@ -17,15 +17,18 @@
    layers:
    - state: icon
  - type: MeleeWeapon
-    attackRate: 1.2
+    attackRate: 1.7
+    range: 1
    wideAnimationRotation: 225
    wideAnimation: CP14WeaponArcSlash
    cPAnimationLength: 0.18
    damage:
      types:
-        Blunt: 10
+        Blunt: 5
    soundHit:
      collection: MetalThud
+  - type: StaminaDamageOnHit
+    damage: 4
  - type: DamageOtherOnHit
    damage:
      types:
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml
@@ -16,23 +16,19 @@
    - state: icon
  - type: Sharp
  - type: MeleeWeapon
-    attackRate: 0.7
+    angle: 100
+    attackRate: 0.9
+    range: 1.5
    wideAnimationRotation: 205
    wideAnimation: CP14WeaponArcSlash
    damage:
      types:
-        Blunt: 18
-        Piercing: 4
+        Blunt: 8
+        Piercing: 2
    soundHit:
      collection: MetalThud
    cPAnimationLength: 0.25
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 10
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 10
+  - type: StaminaDamageOnHit
+    damage: 6
  - type: CP14Currency
    currency: 500
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml
@@ -1,6 +1,9 @@
 - type: entity
  id: CP14BaseShield
-  parent: BaseItem
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponLight
+  - CP14BaseWeaponThrowable
  name: shield
  description: A wooden shield capable of withstanding multiple blows.
  components:
@@ -36,6 +39,32 @@
    breakOnMove: false
    slots:
    - back
+  - type: MeleeWeapon
+    angle: 0
+    range: 0.8
+    attackRate: 0.5
+    wideAnimationRotation: -30
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 3
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.3
+    cPAnimationOffset: -0.5
+  - type: MeleeThrowOnHit
+    lifetime: 0.05
+    speed: 3
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 6
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 6
+  - type: StaminaDamageOnHit
+    damage: 10
  - type: Damageable
    damageContainer: Shield
  - type: Destructible
@@ -57,9 +86,6 @@
              collection: MetalBreak
          - !type:SpawnEntitiesBehavior
            spawn:
-              SheetSteel:
-                min: 2
-                max: 2
-              SheetGlass:
-                min: 2
+              CP14WoodenPlanks1:
+                min: 1
                max: 2
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
@@ -26,14 +26,16 @@
    layers:
    - state: icon
  - type: MeleeWeapon
+    angle: 80
+    range: 1.1
    attackRate: 1.5
    wideAnimationRotation: 225
    wideAnimation: CP14WeaponArcSlash
    cPAnimationLength: 0.18
    damage:
      types:
-        Slash: 5
-        Piercing: 3
+        Slash: 4
+        Piercing: 2
    soundHit:
      collection: MetalThud
  - type: Tag
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml
@@ -17,12 +17,14 @@
    layers:
    - state: icon
  - type: MeleeWeapon
-    attackRate: 0.8
+    angle: 0
+    attackRate: 1.2
+    range: 1.2
    wideAnimationRotation: -115
    wideAnimation: CP14WeaponArcThrust
    damage:
      types:
-        Piercing: 19
+        Piercing: 8
    soundHit:
      collection: MetalThud
    cPAnimationLength: 0.25
@@ -35,8 +37,8 @@
  - type: DamageOtherOnHit
    damage:
      types:
-        Piercing: 20
+        Piercing: 18
  - type: DamageOnLand
    damage:
      types:
-        Piercing: 20
+        Piercing: 18
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml
@@ -25,13 +25,14 @@
    layers:
    - state: icon
  - type: MeleeWeapon
-    attackRate: 1.5
+    angle: 100
+    attackRate: 1.4
    wideAnimationRotation: 210
    wideAnimation: CP14WeaponArcSlash
    cPAnimationLength: 0.18
    damage:
      types:
-        Slash: 12
+        Slash: 9
    soundHit:
      collection: MetalThud
  - type: CP14SkillRequirement
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
@@ -20,7 +20,9 @@
    slots:
    - back
  - type: MeleeWeapon
+    angle: 120
    attackRate: 0.7
+    range: 1.8
    wideAnimationRotation: 205
    wideAnimation: CP14WeaponArcSlash
    damage:
@@ -35,8 +37,8 @@
  - type: IncreaseDamageOnWield
    damage:
      types:
-        Slash: 15
-        Blunt: 10
+        Slash: 7
+        Blunt: 2
        Structural: 3
  - type: Item
    size: Ginormous