From 279d0660ca5f7d3cc9991e6e91059dbd46f96f8e Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 22:58:34 +0300
Subject: [PATCH] Windows and glass airlocks in expeditions (and only there)
 block lasers (#1849)

* Windows and glass airlocks block lasers

* grilles

* descr

* cleanup

* comments

* dungeon templates yml swap

* dungeon_configs.yml comments

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
---
 Resources/Maps/_NF/Dungeon/cave_factory.yml   |  10 +-
 Resources/Maps/_NF/Dungeon/experiment.yml     |   4 +-
 Resources/Maps/_NF/Dungeon/haunted.yml        |   4 +-
 Resources/Maps/_NF/Dungeon/lava_brig.yml      |   6 +-
 Resources/Maps/_NF/Dungeon/lava_mercenary.yml |   4 +-
 Resources/Maps/_NF/Dungeon/mineshaft.yml      |   2 +-
 .../Maps/_NF/Dungeon/salvage_outpost.yml      |   4 +-
 Resources/Maps/_NF/Dungeon/snowy_labs.yml     |   6 +-
 Resources/Maps/_NF/Dungeon/virology_lab.yml   |   8 +-
 .../Prototypes/Procedural/dungeon_configs.yml |  10 +-
 .../Entities/Structures/Dungeon/airlocks.yml  | 133 ++++++++++++++++++
 .../Entities/Structures/Dungeon/grille.yml    |  15 ++
 .../Entities/Structures/Dungeon/windows.yml   |  82 +++++++++++
 .../_NF/Procedural/dungeon_configs.yml        |  16 +--
 14 files changed, 267 insertions(+), 37 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml

diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
index 4b695adca81..ad4ee2168f1 100644
--- a/Resources/Maps/_NF/Dungeon/cave_factory.yml
+++ b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -3143,7 +3143,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 1
-- proto: AirlockEngineeringGlassLocked
+- proto: AirlockEngineeringGlassLockedDungeon
   entities:
   - uid: 1949
     components:
@@ -3182,7 +3182,7 @@ entities:
     - type: Transform
       pos: 27.5,46.5
       parent: 1
-- proto: AirlockMaintGlassLocked
+- proto: AirlockMaintGlassLockedDungeon
   entities:
   - uid: 754
     components:
@@ -11043,7 +11043,7 @@ entities:
     - type: Transform
       pos: 20.5,47.5
       parent: 1
-- proto: ReinforcedPlasmaWindow
+- proto: ReinforcedPlasmaWindowDungeon
   entities:
   - uid: 1378
     components:
@@ -11069,7 +11069,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 32.5,21.5
       parent: 1
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 409
     components:
@@ -14380,7 +14380,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 1
-- proto: Window
+- proto: WindowDungeon
   entities:
   - uid: 253
     components:
diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
index a0a3694f23c..a7aa1a0decc 100644
--- a/Resources/Maps/_NF/Dungeon/experiment.yml
+++ b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -2255,7 +2255,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockScienceGlassLocked
+- proto: AirlockScienceGlassLockedDungeon
   entities:
   - uid: 741
     components:
@@ -8077,7 +8077,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,24.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 739
     components:
diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
index 538de449ad2..210b7f4864b 100644
--- a/Resources/Maps/_NF/Dungeon/haunted.yml
+++ b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -362,7 +362,7 @@ entities:
     - type: Transform
       pos: 11.5,43.5
       parent: 1653
-- proto: AirlockMiningGlassLocked
+- proto: AirlockMiningGlassLockedDungeon
   entities:
   - uid: 492
     components:
@@ -1592,7 +1592,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 155
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
index b03f914aee4..de7e1ab96dc 100644
--- a/Resources/Maps/_NF/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -2688,7 +2688,7 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridPathfinding
-- proto: AirlockBrigGlassLocked
+- proto: AirlockBrigGlassLockedDungeon
   entities:
   - uid: 1245
     components:
@@ -2712,7 +2712,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 588
-- proto: AirlockSecurityGlassLocked
+- proto: AirlockSecurityGlassLockedDungeon
   entities:
   - uid: 1579
     components:
@@ -10052,7 +10052,7 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 588
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 214
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
index bfd75e30333..d14ec6493ab 100644
--- a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -2757,7 +2757,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 588
-- proto: AirlockMercenaryGlassLocked
+- proto: AirlockMercenaryGlassLockedDungeon
   entities:
   - uid: 254
     components:
@@ -10049,7 +10049,7 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 588
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 214
     components:
diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml
index 6cdd1b1a18e..17fcf040469 100644
--- a/Resources/Maps/_NF/Dungeon/mineshaft.yml
+++ b/Resources/Maps/_NF/Dungeon/mineshaft.yml
@@ -3131,7 +3131,7 @@ entities:
     - type: Transform
       pos: 40.5,7.5
       parent: 2
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 102
     components:
diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
index 8421f296868..8007bdae116 100644
--- a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
+++ b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -1965,7 +1965,7 @@ entities:
     - type: Transform
       pos: 44.5,39.5
       parent: 1653
-- proto: AirlockMiningGlass
+- proto: AirlockMiningGlassDungeon
   entities:
   - uid: 22
     components:
@@ -8770,7 +8770,7 @@ entities:
     - type: Transform
       pos: 9.5,40.5
       parent: 1653
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 146
     components:
diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
index ac88663a5d8..453f74ff2fb 100644
--- a/Resources/Maps/_NF/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -2907,7 +2907,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockHydroGlassLocked
+- proto: AirlockHydroGlassLockedDungeon
   entities:
   - uid: 10
     components:
@@ -11088,7 +11088,7 @@ entities:
     - type: Transform
       pos: 17.5,47.5
       parent: 1653
-- proto: ReinforcedUraniumWindow
+- proto: ReinforcedUraniumWindowDungeon
   entities:
   - uid: 289
     components:
@@ -11130,7 +11130,7 @@ entities:
     - type: Transform
       pos: 3.5,13.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 104
     components:
diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
index 64ea78c721a..cc35e158396 100644
--- a/Resources/Maps/_NF/Dungeon/virology_lab.yml
+++ b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -2637,7 +2637,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockVirologyGlass
+- proto: AirlockVirologyGlassDungeon
   entities:
   - uid: 1472
     components:
@@ -2669,7 +2669,7 @@ entities:
     - type: Transform
       pos: 3.5,3.5
       parent: 1653
-- proto: AirlockVirologyGlassLocked
+- proto: AirlockVirologyGlassLockedDungeon
   entities:
   - uid: 115
     components:
@@ -9876,14 +9876,14 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 1653
-- proto: ReinforcedPlasmaWindow
+- proto: ReinforcedPlasmaWindowDungeon
   entities:
   - uid: 533
     components:
     - type: Transform
       pos: 29.5,38.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 395
     components:
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 89715bc9400..1c96ee62557 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -194,20 +194,20 @@
   id: BaseAirlock
   entries:
   - id: CableApcExtension
-  - id: AirlockGlass
+  - id: AirlockGlassDungeon # Frontier: AirlockGlass<AirlockGlassDungeon
 
 - type: entitySpawnEntry
   id: BaseWindow
   entries:
-  - id: Grille
-  - id: Window
+  - id: GrilleDungeon # Frontier: Grille<GrilleDungeon
+  - id: WindowDungeon # Frontier: Window<WindowDungeon
 
 # Lava brig
 - type: entitySpawnEntry
   id: LavaBrigEntrance
   entries:
   - id: CableApcExtension
-  - id: AirlockSecurityGlass # Frontier AirlockSecurityGlassLocked<AirlockSecurityGlass
+  - id: AirlockSecurityGlassDungeon # Frontier: AirlockSecurityGlassLocked<AirlockSecurityGlassDungeon
 
 # Mineshaft
 - type: entitySpawnEntry
@@ -265,7 +265,7 @@
   id: SnowyLabsEntrance
   entries:
   - id: CableApcExtension
-  - id: AirlockFreezer # Frontier - AirlockFreezerHydroponicsLocked<AirlockFreezer
+  - id: AirlockFreezer # Frontier: AirlockFreezerHydroponicsLocked<AirlockFreezer
 
 - type: entitySpawnEntry
   id: SnowyLabsWalls
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
new file mode 100644
index 00000000000..5c1ebdb6ee1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
@@ -0,0 +1,133 @@
+# Special glass airlocks for dungeons that block lasers
+# Base
+- type: entity
+  id: AirlockGlassMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: An airlock with murky glass windows, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - AirlockLayer # Blocks lasers, but not LoS
+
+# Basic airlock
+- type: entity
+  id: AirlockGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockGlass
+  noSpawn: true
+
+# Maint airlock
+- type: entity
+  id: AirlockMaintGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMaintGlassLocked
+  noSpawn: true
+
+# Engineering airlocks
+- type: entity
+  id: AirlockEngineeringGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockEngineeringGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockEngineeringGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockEngineeringGlassLocked
+  noSpawn: true
+
+# Security airlocks
+- type: entity
+  id: AirlockSecurityGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockSecurityGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockSecurityGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockSecurityGlassLocked
+  noSpawn: true
+
+- type: entity
+  id: AirlockBrigGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockBrigGlassLocked
+  noSpawn: true
+
+# Mining airlocks
+- type: entity
+  id: AirlockMiningGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMiningGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockMiningGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMiningGlassLocked
+  noSpawn: true
+
+# Virology airlocks
+- type: entity
+  id: AirlockVirologyGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockVirologyGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockVirologyGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockVirologyGlassLocked
+  noSpawn: true
+
+# Mercenary airlocks
+- type: entity
+  id: AirlockMercenaryGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMercenaryGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockMercenaryGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMercenaryGlassLocked
+  noSpawn: true
+
+# Science airlock
+- type: entity
+  id: AirlockScienceGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockScienceGlassLocked
+  noSpawn: true
+
+# Hydroponics ailock
+- type: entity
+  id: AirlockHydroGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockHydroGlassLocked
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
new file mode 100644
index 00000000000..0371c11c4b1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
@@ -0,0 +1,15 @@
+# Special grilles for dungeons that block lasers
+- type: entity
+  id: GrilleDungeon
+  parent: Grille
+  noSpawn: true
+  suffix: DO NOT MAP, Dungeon only
+  components:
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.5,-0.5,0.5,0.5"
+          layer:
+          - WallLayer # Blocks lasers, but not LoS
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
new file mode 100644
index 00000000000..32b86cf2e6e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
@@ -0,0 +1,82 @@
+# Special windows for dungeons that block lasers
+# Base
+- type: entity
+  id: WindowMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: A murky glass window, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb {}
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer # Blocks lasers, but not LoS
+
+# Common window
+- type: entity
+  id: WindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - Window
+  noSpawn: true
+
+# Reinforced window
+- type: entity
+  id: ReinforcedWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedWindow
+  noSpawn: true
+
+# Mining window
+- type: entity
+  id: MiningWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - MiningWindow
+  noSpawn: true
+  components:
+  - type: Destructible # Made it as durable as common window
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+# Plasma window
+- type: entity
+  id: PlasmaWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - PlasmaWindow
+  noSpawn: true
+
+# Plasma reinforced window
+- type: entity
+  id: ReinforcedPlasmaWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedPlasmaWindow
+  noSpawn: true
+
+# Uranium reinforced window
+- type: entity
+  id: ReinforcedUraniumWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedUraniumWindow
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
index 50d0a6c8de5..181a8cc8a8f 100644
--- a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
@@ -68,13 +68,13 @@
   id: BaseAirlockNF
   entries:
   - id: CableApcExtension
-  - id: AirlockGlass
+  - id: AirlockGlassDungeon
 
 - type: entitySpawnEntry
   id: BaseWindowNF
   entries:
-  - id: Grille
-  - id: Window
+  - id: GrilleDungeon
+  - id: WindowDungeon
 
 - type: entitySpawnEntry
   id: BaseWallMountsNF
@@ -219,7 +219,7 @@
   id: MercenaryAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockMercenaryGlass
+    - id: AirlockMercenaryGlassDungeon
 
 - type: entitySpawnEntry
   id: LavaMercenaryWallMountsNF
@@ -272,7 +272,7 @@
   id: VirologyAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockVirologyGlass
+    - id: AirlockVirologyGlassDungeon
 
 # SalvageOutpost prototypes
 - type: dungeonConfig
@@ -316,10 +316,10 @@
   id: MiningAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockMiningGlass
+    - id: AirlockMiningGlassDungeon
 
 - type: entitySpawnEntry
   id: MiningWindowNF
   entries:
-    - id: Grille
-    - id: MiningWindow
+    - id: GrilleDungeon
+    - id: MiningWindowDungeon