Refactors radiation (#2009)

* Work on refactoring radiation. * mmmm grayons * fixes * Now you can specify whether the pulse will decay or not * whoops * Move IRadiationAct to shared, make DamageableComponent implement it instead and add metallic resistances to walls * General improvements, send draw and decay with state. Rename DPS to RadsPerSecond * E N T I T Y C O O R D I N A T E S * Entity coordinates goood * Remove unused using statements * resistances: metallicResistances * - type: Breakable moment Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-21 01:49:40 +02:00
parent 2927ab5cd1
commit 6ec2939f15
37 changed files with 250 additions and 123 deletions
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
@@ -61,6 +61,7 @@
    offset: Center
  - type: Destructible
    deadThreshold: 500
+    resistances: metallicResistances
  placement:
    mode: SnapgridCenter

--- a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
@@ -19,6 +19,7 @@
  - type: Pullable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  name: bar stool
@@ -52,6 +53,7 @@
  - type: Pullable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  name: dark office chair
@@ -87,6 +89,7 @@
  - type: Pullable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  parent: Chair
@@ -135,5 +138,6 @@
    rotation: -90
  - type: Destructible
    deadThreshold: 75
+    resistances: metallicResistances
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
@@ -19,6 +19,7 @@
     offset: Center
   - type: Destructible
     deadThreshold: 50
+     resistances: metallicResistances
   - type: UserInterface
     interfaces:
     - key: enum.InstrumentUiKey.Key
--- a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
@@ -15,6 +15,7 @@
  - type: InteractionOutline
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Physics
  - type: ShuttleController
  - type: Strap
--- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
@@ -12,6 +12,7 @@
  - type: Sprite
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: PipeVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
@@ -21,6 +21,7 @@
      pumpRSI: Constructible/Atmos/pressurepump.rsi
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
@@ -23,6 +23,7 @@
      siphonRSI: Constructible/Atmos/scrubber.rsi
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances

 - type: entity
  parent: ScrubberBase
--- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: Table
  name: "table"
-  description: A square piece of metal standing on four metal legs. 
+  description: A square piece of metal standing on four metal legs.
  components:
  - type: Clickable
  - type: InteractionOutline
@@ -25,6 +25,7 @@
  - type: Climbable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances
    spawnOnDestroy: SteelSheet1

 - type: entity
@@ -54,4 +55,5 @@
  - type: Climbable
  - type: Destructible
    deadThreshold: 15
+    resistances: metallicResistances
    spawnOnDestroy: WoodPlank
--- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
@@ -22,6 +22,7 @@
    - type: VentVisualizer
      ventRSI: Constructible/Atmos/vent.rsi
  - type: Destructible
+    resistances: metallicResistances
    thresholdvalue: 100

 - type: entity
--- a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
@@ -18,6 +18,7 @@
    mode: CardinalFlags
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances
  - type: SubFloorHide

 - type: entity
@@ -39,6 +40,7 @@
    wireDroppedOnCutPrototype: HVWireStack1
    wireType: HighVoltage
  - type: Destructible
+    resistances: metallicResistances
    spawnondestroy: HVWireStack1

 - type: entity
@@ -61,6 +63,7 @@
    wireDroppedOnCutPrototype: MVWireStack1
    wireType: MediumVoltage
  - type: Destructible
+    resistances: metallicResistances
    spawnondestroy: MVWireStack1

 - type: entity
@@ -85,4 +88,5 @@
    wireDroppedOnCutPrototype: ApcExtensionCableStack1
    wireType: Apc
  - type: Destructible
+    resistances: metallicResistances
    spawnondestroy: ApcExtensionCableStack1
--- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
@@ -22,6 +22,7 @@
      - SmallImpassable
  - type: Destructible
    maxHP: 500
+    resistances: metallicResistances
  - type: SnapGrid
    offset: Center
  - type: Anchorable
@@ -41,4 +42,4 @@
      nodeGroupID: HVPower
  - type: PowerReceiver
  - type: PowerSupplier
-    supplyRate: 0
+    supplyRate: 0
--- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
@@ -23,6 +23,7 @@
      - SmallImpassable
  - type: Destructible
    maxHP: 500
+    resistances: metallicResistances
    spawnondestroy: AMEPart
  - type: SnapGrid
    offset: Center
@@ -43,4 +44,4 @@
    color: "#00AAFF"
  - type: Appearance
    visuals:
-    - type: AMEVisualizer
+    - type: AMEVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
@@ -35,6 +35,7 @@
      cloningTime: 10.0
    - type: Destructible
      deadThreshold: 100
+      resistances: metallicResistances
    - type: Appearance
      visuals:
        - type: CloningPodVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
@@ -30,6 +30,7 @@
    drawRate: 50
  - type: Breakable
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Anchorable

 - type: entity
--- a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
@@ -30,6 +30,7 @@
  - type: InteractionOutline
  - type: Breakable
    deadThreshold: 150
+    resistances: metallicResistances
  - type: GravityGenerator
  - type: UserInterface
    interfaces:
--- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
@@ -35,6 +35,7 @@
  - type: MedicalScanner
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: MedicalScannerVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -188,3 +188,4 @@
    offset: Center
  - type: Breakable
    deadThreshold: 100
+    resistances: metallicResistances
--- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
@@ -32,6 +32,7 @@
    offset: Center
  - type: Breakable
    deadThreshold: 50
+    resistances: metallicResistances
  - type: UserInterface
    interfaces:
    - key: enum.VendingMachineUiKey.Key
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
@@ -43,6 +43,7 @@
  - type: PlaceableSurface
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: StorageVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml
@@ -27,6 +27,7 @@
    Anchored: false
  - type: Destructible
    deadThreshold: 10
+    resistances: metallicResistances
  - type: SolutionContainer
    maxVol: 1500
    caps: RemoveFrom
--- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
@@ -38,6 +38,8 @@
  - type: PlaceableSurface
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
+
  - type: Appearance
    visuals:
    - type: StorageVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
@@ -18,6 +18,7 @@
      layer: [MobMask]
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Occluder
    sizeX: 32
    sizeY: 32
--- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
@@ -16,6 +16,7 @@
      layer: [MobMask, Opaque]
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances
    spawnOnDestroy: SteelSheet1
  - type: SnapGrid
    offset: Edge
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
@@ -40,6 +40,7 @@
  - type: PowerReceiver
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  name: small light
@@ -61,3 +62,4 @@
  - type: PowerReceiver
  - type: Destructible
    deadThreshold: 25
+    resistances: metallicResistances
--- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
@@ -26,6 +26,7 @@
      - SmallImpassable
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: SnapGrid
    offset: Center
  - type: Climbable
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
@@ -10,6 +10,7 @@
    - !type:PhysShapeAabb
  - type: Destructible
    thresholdvalue: 5
+    resistances: metallicResistances
  - type: Sprite
    drawdepth: WallTops
    sprite: Constructible/Misc/decals.rsi
--- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
@@ -28,6 +28,7 @@
  - type: Destructible
    deadThreshold: 500
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: Occluder
    sizeX: 32
    sizeY: 32
@@ -51,6 +52,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: brick
@@ -67,6 +69,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: clock
@@ -83,6 +86,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: clown
@@ -100,6 +104,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: cult
@@ -116,6 +121,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: debug
@@ -132,6 +138,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: diamond
@@ -149,6 +156,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: gold
@@ -165,6 +173,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: ice
@@ -181,6 +190,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: metal
@@ -197,6 +207,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: plasma
@@ -213,6 +224,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: plastic
@@ -231,6 +243,7 @@
  - type: Destructible
    deadThreshold: 600
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: ReinforcedWall
    key: walls
    base: solid
@@ -249,6 +262,7 @@
  - type: Destructible
    deadThreshold: 1000
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: riveted
@@ -265,6 +279,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: sandstone
@@ -281,6 +296,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: silver
@@ -299,6 +315,7 @@
    deadThreshold: 300
    spawnOnDestroy: Girder
    destroySound: /Audio/Effects/metalbreak.ogg
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: solid
@@ -315,6 +332,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: uranium
@@ -331,6 +349,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: wood
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
@@ -29,6 +29,7 @@
      - SmallImpassable
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: SnapGrid
    offset: Center
  - type: Airtight
--- a/Resources/Prototypes/Entities/Constructible/disposal.yml
+++ b/Resources/Prototypes/Entities/Constructible/disposal.yml
@@ -14,6 +14,7 @@
    offset: Center
  - type: Anchorable
  - type: Breakable
+    resistances: metallicResistances
  - type: Rotatable
  - type: Pullable

@@ -139,6 +140,7 @@
  - type: Anchorable
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: DisposalUnitVisualizer