diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml index a73e45afe2..1c056345f0 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml @@ -18,10 +18,10 @@ Blunt: 5 Structural: 3 - type: MeleeWeapon - resetOnHandSelected: false + resetOnHandSelected: true autoAttack: true attackRate: 2 - range: 1.5 + range: 1 angle: 60 wideAnimationRotation: -90 damage: @@ -61,4 +61,4 @@ - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 10 - CP14Iron: 10 \ No newline at end of file + CP14Iron: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml index 97687d97e8..5e44af412d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml @@ -99,7 +99,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 80 behaviors: - !type:PlaySoundBehavior sound: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml index 7bec8fdccf..a2d52e5a2d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml @@ -57,7 +57,7 @@ - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 10 - CP14Iron: 10 + CP14Iron: 5 - type: entity parent: CP14BaseWeaponDagger @@ -85,4 +85,4 @@ - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 10 - CP14Iron: 10 \ No newline at end of file + CP14Iron: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml index 9b5e9b58f6..dd767ef7da 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml @@ -87,5 +87,5 @@ state: icon - type: PhysicalComposition materialComposition: - CP14WoodenPlanks: 20 - CP14Iron: 20 \ No newline at end of file + CP14WoodenPlanks: 30 + CP14Iron: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml index eab1818b01..235eaa9db9 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml @@ -27,7 +27,7 @@ wideAnimationRotation: -90 damage: types: - Piercing: 5 + Piercing: 8 animation: CP14WeaponArcThrust wideAnimation: CP14WeaponArcThrust soundHit: @@ -42,7 +42,7 @@ minDistance: 2.25 bonusDamage: types: - Piercing: 5 + Piercing: 6 - type: Wieldable - type: Clothing slots: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index 731377e4c1..72265e0416 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -11,7 +11,7 @@ - type: Item size: Ginormous - type: MeleeWeapon - attackRate: 0.5 + attackRate: 0.6 range: 1.6 angle: 170 #Bigger in 2 times wideAnimationRotation: -90 @@ -52,4 +52,4 @@ - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 10 - CP14Iron: 30 \ No newline at end of file + CP14Iron: 30 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml index c406f82118..59b5e24d8e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml @@ -11,7 +11,7 @@ - type: Item size: Ginormous - type: MeleeWeapon - attackRate: 0.5 + attackRate: 0.6 range: 1.6 angle: 170 #Bigger in 2 times wideAnimationRotation: -90 @@ -29,7 +29,7 @@ types: Slash: 15 - type: CP14MeleeWeaponStaminaCost - stamina: 15 + stamina: 10 - type: Wieldable - type: Clothing slots: @@ -50,4 +50,4 @@ - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 20 - CP14Iron: 20 \ No newline at end of file + CP14Iron: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml index 8dcd03d314..7261c5f999 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml @@ -10,7 +10,7 @@ size: Ginormous - type: MeleeWeapon clickDamageModifier: 0.1 - attackRate: 0.5 + attackRate: 0.6 range: 1.6 angle: 170 #Bigger in 2 times wideAnimationRotation: -90 @@ -49,4 +49,4 @@ - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 20 - CP14Iron: 20 \ No newline at end of file + CP14Iron: 20 diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 691105bcee..d3ae2efba8 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -162,6 +162,7 @@ - CP14ClothingEyesMonocle - CP14ClothingEyesGlasses - CP14ClothingEyesEyePatch + - type: loadout id: CP14ClothingEyesMonocle equipment: diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 88de669592..b75ebd48ab 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -6,7 +6,7 @@ requirements: - !type:StackResource stack: CP14WoodenPlanks - count: 2 + count: 3 - !type:StackResource stack: CP14IronBar count: 2