structural damage rework / melee damage curve flattening (#22705)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 8a5b51d65f01a2a0eae2ab4e7068f7f99fcd2832..23ba87fd22ef5c9b357be3849b89b44593a78770 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -65,16 +65,6 @@
   categories:
   - UplinkWeapons
 
-- type: listing
-  id: UplinkFireAxeFlaming
-  name: uplink-fire-axe-flaming-name
-  description: uplink-fire-axe-flaming-desc
-  productEntity: FireAxeFlaming
-  cost:
-    Telecrystal: 10
-  categories:
-  - UplinkWeapons
-
 - type: listing
   id: UplinkGlovesNorthStar
   name: uplink-gloves-north-star-name
@@ -85,22 +75,6 @@
   categories:
   - UplinkWeapons
 
-- type: listing
-  id: UplinkEswordDouble
-  name: uplink-esword-double-name
-  description: uplink-esword-double-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword_double.rsi, state: icon }
-  productEntity: EnergySwordDouble
-  cost:
-    Telecrystal: 20 #(Originally 16)
-  categories:
-  - UplinkWeapons
-  conditions:
-    - !type:StoreWhitelistCondition
-      blacklist:
-        tags:
-          - NukeOpsUplink
-
 - type: listing
   id: UplinkDisposableTurret
   name: uplink-disposable-turret-name
@@ -551,7 +525,7 @@
     Telecrystal: 2
   categories:
   - UplinkUtility
-  
+
 # Implants
 
 - type: listing

diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml
index 5c731c401758bfaa34a1f4aa226b47f572ff8916..87168b481871ef463b757efc8fd577cb30b782e0 100644 (file)
--- a/Resources/Prototypes/Damage/containers.yml
+++ b/Resources/Prototypes/Damage/containers.yml
@@ -14,7 +14,15 @@
   supportedTypes:
     - Heat
     - Shock
-    - Structural # this probably should be in separate container
+
+- type: damageContainer
+  id: StructuralInorganic
+  supportedGroups:
+  - Brute
+  supportedTypes:
+  - Heat
+  - Shock
+  - Structural
 
 - type: damageContainer
   id: Silicon

diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index e4ad8517815470642cde391ef9c0bef1d19fc97d..16e23b306d2b689e5a09a13826f6a04c53c6f633 100644 (file)
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -9,6 +9,17 @@
     Blunt: 5
     Heat: 5
 
+- type: damageModifierSet
+  id: StructuralMetallic
+  coefficients:
+    Shock: 1.2
+  flatReductions:
+    Blunt: 25
+    Slash: 25
+    Piercing: 25
+    Heat: 25
+    Structural: 40
+
 - type: damageModifierSet
   id: PerforatedMetallic
   coefficients:
@@ -64,13 +75,15 @@
     Heat: 0.8
     Shock: 0 #glass is an insulator!
   flatReductions:
-    Blunt: 5
     Slash: 5
+    Piercing: 5
+    Heat: 5
+    Structural: 10
 
 - type: damageModifierSet
   id: RGlass
   coefficients:
-    Blunt: 1.0
+    Blunt: 0.5
     Slash: 0.3
     Piercing: 0.6
     Heat: 0.5
@@ -80,6 +93,7 @@
     Slash: 7
     Piercing: 5
     Heat: 5
+    Structural: 12.5
 
 - type: damageModifierSet
   id: Wood

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 54200f10e8e64664b12a63feeca2aada30ad8b7c..9eeefa29b39193962c3843ca2334d0ef13d67284 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -155,7 +155,6 @@
     damage:
       types:
         Blunt: 8
-        Structural: 3
   - type: Tool
     qualities:
       - Prying
@@ -337,7 +336,7 @@
     attackRate: 1.5
     damage:
       types:
-        Piercing: 8
+        Piercing: 10
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index a1a4f484faa64a6b9e2f6f9aba128d31535992b8..a02efc13f554f879e1c0c7a8f632a1a37fde7fdd 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -12,11 +12,13 @@
     damage:
       types:
         Blunt: 10
+        Structural: 5
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 8
+        Blunt: 5
+        Structural: 10
   - type: Item
     size: Normal
   - type: Tool

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
index bfddd764ca20865136648dc4af7d8c884c9eb2cd..dcead72ce64466bb63041e2d199b6cc8586d9792 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -27,9 +27,8 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Slash: 5
-        Blunt: 5
-        Structural: 20
+        Slash: 10
+        Structural: 10
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/chainsaw.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index d6622d93323c398d116e16951e53a37f59338523..db24d3e2cd00313ffe94f336d39701b01a7f0e5d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -37,7 +37,7 @@
     attackRate: 0.75
     damage:
       types:
-        Slash: 33
+        Slash: 16
   - type: Item
     size: Normal
   - type: Clothing
@@ -65,15 +65,15 @@
     damage:
       types:
         Blunt: 10
-        Slash: 20
-        Structural: 3
+        Slash: 10
+        Structural: 5
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 4
-        Slash: 12
-        Structural: 30
+        Blunt: 5
+        Slash: 5
+        Structural: 10
   - type: Item
     size: Ginormous
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 50e7b86d0d991913a861aff06fa731deefe9891b..5b06f09946c80904a3eaf3cd6692174b3919587d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -9,7 +9,7 @@
         types:
             Slash: 15
             Heat: 15
-            Structural: 4
+            Structural: 20
             Blunt: -4.5
     litDisarmMalus: 0.6
   - type: Sprite
@@ -66,8 +66,8 @@
     secret: true
     litDamageBonus:
         types:
-            Slash: 9
-            Heat: 9
+            Slash: 10
+            Heat: 10
             Blunt: -1
     litDisarmMalus: 0.4
     activateSound: !type:SoundPathSpecifier
@@ -149,8 +149,8 @@
     secret: true
     litDamageBonus:
         types:
-            Slash: 7.5
-            Heat: 7.5
+            Slash: 10
+            Heat: 12
             Blunt: -1
     litDisarmMalus: 0.6
   - type: Sprite
@@ -176,9 +176,9 @@
   - type: EnergySword
     litDamageBonus:
         types:
-            Slash: 17
-            Heat: 17
-            Structural: 20
+            Slash: 12
+            Heat: 12
+            Structural: 15
             Blunt: -4.5
     litDisarmMalus: 0.7
   - type: MeleeWeapon

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index efb85ec35e7bcfeb47a8a73c45da20fc25b1e871..0d882a66457cb25c18634ab30fc780d8c2366b5b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -19,15 +19,14 @@
       types:
         # axes are kinda like sharp hammers, you know?
         Blunt: 5
-        Slash: 13
-        Structural: 7
+        Slash: 10
+        Structural: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2.5
-        Slash: 10.5
-        Structural: 60
+        Slash: 10
+        Structural: 40
   - type: Item
     size: Ginormous
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
index ec9717ea22bf41ff74fac173245a898004ea0c2e..2380e19d79f8717a7b1119282c8680d667427a8f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
@@ -11,7 +11,7 @@
     wideAnimationRotation: -150
     damage:
       types:
-        Blunt: 3 #You'd be better off punching people
+        Blunt: 0
   - type: Item
     size: Small
     sprite: Objects/Weapons/Melee/gohei.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 5ab16c6712491f6549084bc4ca20c2bb10f32199..2bb1cfdd2ba587983f16dbdb06ed421d8b7e5fab 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -15,7 +15,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 12
+        Slash: 10
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite
@@ -62,7 +62,7 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 10
+        Slash: 13
   - type: Item
     size: Normal
     sprite: Objects/Weapons/Melee/cleaver.rsi
@@ -88,7 +88,7 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 10
+        Slash: 12
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 731c1911ddaa9f3a5af4e7ff98464c8771560658..ec4cd929d9928a4a5745c45b5a68aa22f1953c70 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -77,7 +77,7 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 6.5
+        Slash: 12
   - type: Tag
     tags:
     - Knife

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index b4b13accf0642940b2449e2e8154ae1d8cba2f3f..265e05061ac0d160a38bfd60e7831701dbf1654e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -16,8 +16,6 @@
     damage:
       groups:
         Brute: 5
-      types:
-        Structural: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
index 3a0eb0ab2c0bd97272df7af5ac09a22dfa32db95..51025f164562d826522d8d46bdefb33ae26aeebd 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -10,13 +10,13 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 14
-        Structural: 15
+        Blunt: 10
+        Structural: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
         Blunt: 10
-        Structural: 60
+        Structural: 10
   - type: Item
     size: Large

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 9bd9d6c12fe664991ab7be17e69e1a3e2279dec8..35fc33ec664ed21b4d674e56e27b0b98a143bbca 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -45,7 +45,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 25
+        Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -101,7 +101,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 20
+        Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -124,7 +124,7 @@
     attackRate: 0.75
     damage:
       types:
-        Slash: 33
+        Slash: 20
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index a6ca726967f48e059432e0a50dabcaa72b523681..5247abd9972fb3acafcfe98dc6e21cdf22ed6266 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -107,8 +107,8 @@
     resistance: 3
   - type: Occluder
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
index 9054be67d0fddb33e27ad035d0dd909ede090471..2ed1c60d37bbd658a409996378f4791fbd23ec63 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -82,8 +82,8 @@
     fixVacuum: true\r
   - type: Occluder\r
   - type: Damageable\r
-    damageContainer: Inorganic\r
-    damageModifierSet: Metallic\r
+    damageContainer: StructuralInorganic\r
+    damageModifierSet: StrongMetallic\r
   - type: Destructible\r
     thresholds:\r
     - trigger:\r

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
index 37ad6e3aede9cc8da9290f0fcc30c9894b34e92c..1673ccd0cb2c93d9d801a73899452190a461ecab 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -25,7 +25,7 @@
   - type: RadiationBlocker
     resistance: 8
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: StrongMetallic
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index a93e224d1f206259a4928fcd7f6317f0502921bd..876e4d0ef4d36e4d53c890721df890e0382e676f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -62,8 +62,8 @@
   - type: RadiationBlocker
     resistance: 2
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StrongMetallic
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index bb656367166949ea9c8e0de191edb631bf5ba871..935fedc219e4ae1b8a3aa982870cc45350b7d5c9 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -56,8 +56,8 @@
     placeCentered: true
     isPlaceable: false
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index bf8003255f22d90b00fb03a995ffe267494aad04..4a101aab733bb5085d4c425b5af3380a2b0248c9 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -101,8 +101,8 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 96bc6bee19f18c7dc822ba647e1465148c9beee7..7df55f31136c6f66e5bad1b7e6d6ad386bd0d1b0 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -28,8 +28,8 @@
   - type: PlacementReplacement
     key: walls
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Physics
     bodyType: Static
   - type: Fixtures
@@ -506,13 +506,13 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 1200 #excess damage (nuke?). avoid computational cost of spawning entities.
+        damage: 600
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
     - trigger:
         !type:DamageTrigger
-        damage: 600
+        damage: 400
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -677,7 +677,7 @@
     state: state0
   - type: Damageable
     damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallic
   - type: Physics
     bodyType: Static
   - type: Reflect
@@ -795,13 +795,13 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 600
+        damage: 400
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
     - trigger:
         !type:DamageTrigger
-        damage: 300
+        damage: 200
       behaviors:
       - !type:PlaySoundBehavior
         sound:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
index 4dcc1c5fcc801f958313458802b15d8a67a7476f..286cb895daac5782f126895ef137a55f971dc51d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@@ -12,19 +12,19 @@
     fuelCost: 15
     doAfterDelay: 3
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 1000
+        damage: 200
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 500
+        damage: 100
       behaviors:
       - !type:PlaySoundBehavior
         sound:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index 99e482ce7de1f735cee296d17e1659ca9c74118a..4e128c46e14d21b6bedaf69190e7de95e4533036 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -9,13 +9,19 @@
   - type: Icon
     sprite: Structures/Windows/plasma_window.rsi
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 200
+        damage: 120
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
       behaviors:
       - !type:PlaySoundBehavior
         sound:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index c049aaf6df239b44d81313aaeff35aad5783782b..a4d423acfec5fef1d9aa03b8abdea85616c4cb19 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -12,19 +12,19 @@
     fuelCost: 10
     doAfterDelay: 2
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 300 #excess damage (nuke?). Avoid computational cost of spawning entities.
+        damage: 150
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 75
       behaviors:
       - !type:PlaySoundBehavior
         sound:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index 8cbcab46611bdb48ecc363c2e8d76d8816293fe6..97f77b8d8f88a9d31494142f6b6159544fa99bea 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -9,7 +9,7 @@
   - type: Icon
     sprite: Structures/Windows/reinforced_plasma_window.rsi
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: RadiationBlocker
     resistance: 4
@@ -17,13 +17,13 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 1000
+        damage: 200
       behaviors: #excess damage, don't spawn entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 600
+        damage: 100
       behaviors:
       - !type:PlaySoundBehavior
         sound:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index 17ca85ba306d640d6cd187c852e19e8dd13e9a12..00aeade04c10cefc63b8fc095b55cdf179ae9102 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -9,19 +9,19 @@
   - type: Icon
     sprite: Structures/Windows/reinforced_uranium_window.rsi
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 1500
-      behaviors: #excess damage, don't spawn entities.
+        damage: 200
+      behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 850
+        damage: 100
       behaviors:
       - !type:PlaySoundBehavior
         sound:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index 8d7d1c8180e674dfe81475f163363941b3f55102..7522d5b6e90c96a835ebde025e4c5b82fc62aaa2 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -12,7 +12,7 @@
     fuelCost: 15
     doAfterDelay: 3
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: Destructible
     thresholds:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index 74092f3dbd6bd3d2adf4e455c491b0533259d005..b4801e3a28078561b81c9d402de526fd704b7f7e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -10,13 +10,19 @@
     sprite: Structures/Windows/uranium_window.rsi
     state: full
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: RGlass
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 400
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -84,4 +90,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: uraniumWindowDiagonal
\ No newline at end of file
+    node: uraniumWindowDiagonal

diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index 0efe2319159a458f9a8237f9c61dde73fde253a0..3192c7260677ae11a4c465dc1e6894f617ec82c8 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -38,7 +38,7 @@
         layer:
         - GlassLayer
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Glass
   - type: ExaminableDamage
     messages: WindowMessages
@@ -47,7 +47,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]

diff --git a/Resources/Prototypes/Entities/Structures/barricades.yml b/Resources/Prototypes/Entities/Structures/barricades.yml
index 8cdd1c47860fe3dcd2f39ac88a99df75eae40d10..050498cdaa2981cd0134c7a21f711060accd4c9e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/barricades.yml
@@ -28,7 +28,7 @@
         - WallLayer
   - type: Damageable
     damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:
@@ -43,7 +43,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: AtmosExposed
-  
+
 #Regular Barricade
 - type: entity
   id: Barricade
@@ -108,4 +108,4 @@
   - type: Appearance
   - type: FireVisuals
     sprite: Effects/fire.rsi
-    normalState: 1
\ No newline at end of file
+    normalState: 1

diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index 1f2aaa216f951bd5f7563fe613c1ae1fddc9ded6..8c53daf3b60db502759b242bdc0d18fa2a5dc39c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -27,7 +27,7 @@
         layer:
         - MidImpassable
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Metallic
   - type: Destructible
     thresholds:

diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index 6af2b4a39880bb58fb6c713a8a28f02c68aaca04..ff0c78d86e7a384faebe464f13ecd48ceb6223ba 100644 (file)
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -93,7 +93,7 @@
       Heat: 12
       Blunt: 12
       Piercing: 12
-      Structural: 40
+      Structural: 30
   tileBreakChance: [ 0, 0.5, 1 ]
   tileBreakIntensity: [ 1, 5, 10 ]
   tileBreakRerollReduction: 3
@@ -109,7 +109,7 @@
       Heat: 15
       Blunt: 15
       Piercing: 6
-      Structural: 15
+      Structural: 40
   tileBreakChance: [ 0.75, 0.95, 1 ]
   tileBreakIntensity: [ 1, 10, 15 ]
   tileBreakRerollReduction: 30

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 69400c986f27d55be94b02b43e488d2cb92d4fb0..4a2843bf24d37c0f9ed9c7407afa3f73067a5cc6 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1150,4 +1150,4 @@
   id:  boots
 
 - type: Tag
-  id: CleansForensics
\ No newline at end of file
+  id: CleansForensics