Generalize ResistanceSets into DamageModifierSets (#4619)

* generalize ResistanceSets into DamageModifierSets * remove unneeded test prototype
2021-09-15 15:51:13 -07:00
parent cd6c2bb373
commit cc52ebb9b5
57 changed files with 131 additions and 112 deletions
--- a/Resources/Prototypes/Damage/resistance_sets.yml
+++ b/Resources/Prototypes/Damage/resistance_sets.yml
@@ -1,4 +1,4 @@
- type: resistanceSet
+- type: damageModifierSet
  id: Metallic
  coefficients:
    Blunt: 0.7
@@ -8,7 +8,7 @@
  flatReductions:
    Blunt: 5

- type: resistanceSet
+- type: damageModifierSet
  id: Inflatable
  coefficients:
    Blunt: 0.5
@@ -18,7 +18,7 @@
  flatReductions:
    Blunt: 5

- type: resistanceSet
+- type: damageModifierSet
  id: Glass
  coefficients:
    Blunt: 0.5
@@ -27,4 +27,4 @@
    Heat: 0
    Shock: 0
  flatReductions:
-    Blunt: 5
+    Blunt: 5
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -126,7 +126,7 @@
  - type: Airtight
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -31,7 +31,7 @@
    isOpen: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Glass
+    damageModifierSet: Glass
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -108,7 +108,7 @@
  - type: Anchorable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -141,7 +141,7 @@
  - type: Anchorable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -22,7 +22,7 @@
      - SmallImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Inflatable
+    damageModifierSet: Inflatable
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -27,10 +27,10 @@
  - type: Lock
    locked: false
    lockOnClick: true # toggle lock just by clicking on barrier
-  - type: DeployableBarrier     
+  - type: DeployableBarrier
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -46,7 +46,7 @@
      fillBaseName: beaker
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Glass
+    damageModifierSet: Glass
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
@@ -30,7 +30,7 @@
  - type: Pullable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -27,7 +27,7 @@
    anchored: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
@@ -65,7 +65,7 @@
  - type: Occluder
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -7,7 +7,7 @@
    - type: InteractionOutline
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -13,7 +13,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -25,7 +25,7 @@
  - type: Rotatable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
@@ -39,7 +39,7 @@
  - type: ApcPowerReceiver
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Glass
+    damageModifierSet: Glass
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml
@@ -7,7 +7,7 @@
  components:
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: PlaceableSurface
  - type: Sprite
    netsync: false
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -10,7 +10,7 @@
    sprite: Structures/Furniture/Tables/frame.rsi
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -43,7 +43,7 @@
    sprite: Structures/Furniture/Tables/generic.rsi
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -25,7 +25,7 @@
    rotation: -90
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml
@@ -13,7 +13,7 @@
    sprite: Structures/Furniture/instruments.rsi
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml
@@ -25,7 +25,7 @@
  - type: Pullable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -29,7 +29,7 @@
    state: 0
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base.yml
@@ -19,7 +19,7 @@
      - MobMask
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -33,7 +33,7 @@
      - MobImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -32,7 +32,7 @@
      node: missingWires
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
@@ -80,7 +80,7 @@
      node: machineFrame
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -13,7 +13,7 @@
      anchored: true
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -13,7 +13,7 @@
    anchored: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Anchorable
  - type: Rotatable
  - type: Pullable
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -17,7 +17,7 @@
  - type: Anchorable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -46,7 +46,7 @@
        nodeGroupID: MVPower
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -26,7 +26,7 @@
      - SmallImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -112,7 +112,7 @@
      - SmallImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -40,7 +40,7 @@
    anchored: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -81,7 +81,7 @@
    anchored: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -127,7 +127,7 @@
    anchored: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -22,7 +22,7 @@
      anchored: true
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -20,7 +20,7 @@
    drawdepth: BelowFloor
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -39,7 +39,7 @@
    drawRate: 50
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -43,7 +43,7 @@
              acts: [ "Destruction" ]
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: Physics
      bodyType: Dynamic
      fixtures:
@@ -364,7 +364,7 @@
          acts: [ "Destruction" ]
    - type: Damageable
      damageContainer: Inorganic
-      resistanceSet: Metallic
+      damageModifierSet: Metallic
    - type: InteractionOutline
    - type: Sprite
      sprite: Structures/Storage/canister.rsi
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
@@ -41,7 +41,7 @@
    placeCentered: true
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
@@ -36,7 +36,7 @@
  - type: PlaceableSurface
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -531,7 +531,7 @@
      state_closed: livestockcrate_door
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
@@ -25,7 +25,7 @@
      - SmallImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -27,7 +27,7 @@
  - type: Anchorable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
@@ -13,7 +13,7 @@
        !type:PhysShapeAabb {}
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -36,7 +36,7 @@
        type: SignalPortSelectorBoundUserInterface
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -11,7 +11,7 @@
    state: 0
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
@@ -25,7 +25,7 @@
    - ExplosivePassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/base.yml
@@ -19,7 +19,7 @@
    state: full
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Physics
    bodyType: Static
    fixtures:
--- a/Resources/Prototypes/Entities/Structures/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -29,7 +29,7 @@
    - ExplosivePassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/low.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/low.yml
@@ -16,7 +16,7 @@
    state: metal
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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
-    resistanceSet: Glass
+    damageModifierSet: Glass
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -31,7 +31,7 @@
      - VaultImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Glass
+    damageModifierSet: Glass
  - type: Repairable
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -20,7 +20,7 @@
    drawdepth: FloorObjects
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -12,7 +12,7 @@
    state: spike
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -26,7 +26,7 @@
      - SmallImpassable
  - type: Damageable
    damageContainer: Inorganic
-    resistanceSet: Metallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger: