diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 5e82392b22..beefe7dcbf 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -40,18 +40,18 @@ - type: damageModifierSet id: Rock coefficients: - Structural: 4 + Structural: 5 Blunt: 0.5 Slash: 0.25 - Piercing: 0.75 - Heat: 0.9 + Piercing: 0.5 + Heat: 0.75 flatReductions: Blunt: 5 - type: damageModifierSet id: RockStrong coefficients: - Structural: 4 + Structural: 5 Blunt: 0.25 Slash: 0.1 Piercing: 0.25 diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml index 4043845575..8536486822 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml @@ -19,7 +19,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 120 + damage: 100 behaviors: - !type:DoActsBehavior acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 55e09014ec..1e25e1fee2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -415,7 +415,7 @@ damage: types: Blunt: 25 - Structural: 30 + Structural: 20 # Short lifespan - type: TimedDespawn lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index bee206723b..43714780b5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -43,7 +43,7 @@ capacity: 1 count: 1 - type: MeleeWeapon - attackRate: 0.75 + attackRate: 0.5 range: 1.75 wideAnimationRotation: -135 damage: @@ -61,7 +61,7 @@ types: Blunt: 2.5 Slash: 2.5 - Structural: 30 + Structural: 20 - type: GunRequiresWield - type: Item size: Ginormous @@ -106,8 +106,6 @@ components: - type: Sprite sprite: Objects/Weapons/Melee/crusher_glaive.rsi - - type: UseDelay - delay: 1.9 - type: LeechOnMarker leech: groups: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index eb0635c2f0..c7054144b4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -30,7 +30,7 @@ damage: types: Blunt: 5 - Structural: 30 + Structural: 20 - type: Item size: Normal shape: @@ -59,18 +59,16 @@ wideAnimationRotation: -90 soundHit: path: "/Audio/Items/drill_hit.ogg" - attackRate: 0.5 - range: 1.4 + attackRate: 1 + range: 1 damage: types: Blunt: 9 Slash: 3 - Structural: 12 - bluntStaminaDamageFactor: 4.0 + Structural: 20 heavyRateModifier: 1 heavyRangeModifier: 2 heavyDamageBaseModifier: 1 - heavyStaminaCost: 10 maxTargets: 3 angle: 20 diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index a8cb0b1cb8..0a2a2136e5 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -36,7 +36,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 120 + damage: 100 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -374,13 +374,9 @@ - type: Transform noRot: true - type: SoundOnGather - - type: Gatherable - whitelist: - tags: - - Pickaxe - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: RockStrong - type: Destructible thresholds: - trigger: