diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 6dd29df3ef..83e4cfc4f9 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -45,9 +45,20 @@ - type: damageModifierSet id: Glass coefficients: - Blunt: 0.5 + Blunt: 1 Slash: 0.5 - Piercing: 1.5 + Piercing: 1.1 + Heat: 0 + Shock: 0 + flatReductions: + Blunt: 5 + +- type: damageModifierSet + id: RGlass + coefficients: + Blunt: 0.8 + Slash: 0.5 + Piercing: 0.7 Heat: 0 Shock: 0 flatReductions: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 7969d80903..b595555a04 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -23,7 +23,7 @@ types: Piercing: 15 - type: Clothing - size: 24 + size: 40 sprite: Objects/Weapons/Melee/spear.rsi QuickEquip: false Slots: @@ -48,6 +48,34 @@ modifiers: flatReductions: Piercing: -7 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 #excess damage avoids cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 5 - type: MeleeWeaponAnimation id: spear diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml index 73ce3d238d..ee47ebdcaa 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -10,7 +10,7 @@ sprite: Structures/Windows/plasma_window.rsi - type: Damageable damageContainer: Inorganic - damageModifierSet: Glass + damageModifierSet: RGlass - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index a18bd7349b..7d4418eda1 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -11,6 +11,9 @@ - type: Repairable fuelCost: 10 doAfterDelay: 2 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: RGlass - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml index b848c99e99..8cfc849614 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml @@ -10,7 +10,7 @@ sprite: Structures/Windows/reinforced_plasma_window.rsi - type: Damageable damageContainer: Inorganic - damageModifierSet: Glass + damageModifierSet: RGlass - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml index 6d33574191..eb4f5767e8 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml @@ -6,12 +6,17 @@ edges: - to: spear steps: - - material: Steel + - material: MetalRod amount: 2 doAfter: 2 - - material: Glass + - material: Cable amount: 2 - doAfter: 2 - + doAfter: 1 + - prototype: ShardGlass + name: Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 - node: spear entity: Spear