From 2b0fa46857792f7f11961a1c98c83c8a351269ce Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:13:35 +0300 Subject: [PATCH] david balance pass (#712) --- Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml | 4 ++-- Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml | 4 ++-- Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml | 4 ++-- Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml | 2 +- Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml | 4 ++-- Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml | 7 ++----- Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml | 3 +-- Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml | 4 ++-- Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml | 4 ++-- 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml index 7bae56180e..24984a42ac 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml @@ -38,9 +38,9 @@ id: BaseBladeMithril modifiers: - !type:EditDamageableModifier - multiplier: 1 + multiplier: 0.80 - !type:EditSharpened - sharpnessDamageMultiplier: 1 + sharpnessDamageMultiplier: 0.80 - !type:EditMeleeWeapon damageMultiplier: 1.25 - !type:EditIncreaseDamageOnWield diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml index a5be7ae5ab..b6dcee4305 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml @@ -19,10 +19,10 @@ offset: -0.15,-0.15 removalTime: 0.5 - !type:EditMeleeWeapon - attackRateMultiplier: 1.4 + attackRateMultiplier: 1.5 bonusDamage: types: - Slash: 3 + Slash: 4 Piercing: 3 - !type:EditItem newSize: Normal diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml index 1f0673452a..6e47ec3c28 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml @@ -13,8 +13,8 @@ attackRateMultiplier: 0.85 bonusDamage: types: - Blunt: 4 - Piercing: 1 + Blunt: 5 + Piercing: 2 - !type:EditIncreaseDamageOnWield bonusDamage: types: diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml index f184684c6b..b45c875f1d 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml @@ -11,7 +11,7 @@ bonusDamage: types: Piercing: 4 - Structural: 10 + Structural: 14 - !type:EditItem newSize: Normal adjustShape: 1, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml index d84aabe0cc..8631282876 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml @@ -21,10 +21,10 @@ resetOnHandSelected: true # Disable fast swap bonusRange: 0.2 angleMultiplier: 0 - attackRateMultiplier: 1.5 + attackRateMultiplier: 1.4 bonusDamage: types: - Piercing: 14 + Piercing: 16 - !type:EditItem newSize: Large adjustShape: 0, 2 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml index da921b5e11..fd624ae079 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml @@ -17,20 +17,17 @@ angleMultiplier: 1.2 bonusDamage: types: - Slash: 3 + Slash: 2 Blunt: 3 - !type:EditIncreaseDamageOnWield bonusDamage: types: - Slash: 3 + Slash: 1 Blunt: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde - type: modularPart id: BladeIronShovel diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml index 84c0636f53..636459ba60 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml @@ -10,11 +10,10 @@ - BaseWeaponSharp #components: TODO Add gathering tag - !type:EditMeleeWeapon - attackRateMultiplier: 1.4 + attackRateMultiplier: 1.5 bonusDamage: types: Slash: 4 - Piercing: 1 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml index 3b515781f0..dd4b2163d9 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml @@ -17,7 +17,7 @@ - type: DamageOtherOnHit damage: types: - Piercing: 15 + Piercing: 23 - type: ThrowingAngle angle: 135 - type: EmbeddableProjectile @@ -28,7 +28,7 @@ angleMultiplier: 0 bonusDamage: types: - Piercing: 7 + Piercing: 8 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml index dc932f52d3..2393aebeb9 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml @@ -13,7 +13,7 @@ - !type:AddComponents components: - type: CP14SkillRequirement - fuckupChance: 0.5 + fuckupChance: 0.3 requiredSkills: - Warcraft - !type:EditMeleeWeapon @@ -22,7 +22,7 @@ angleMultiplier: 1.2 bonusDamage: types: - Slash: 8 + Slash: 9 Piercing: 5 - !type:EditIncreaseDamageOnWield bonusDamage: