Murky windows color tint, dungeon config tweaks (new-frontiers-14#1864)

* color * fix * fixes * osha --------- Co-authored-by: Dvir <[email protected]>
whatston3 · Aug 19, 2024 · 338790c · 338790c
1 parent 73c8c6e
commit 338790c
Show file tree

Hide file tree

Showing 14 changed files with 380 additions and 64 deletions.
diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -8996,7 +8996,7 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 1
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 213
     components:
@@ -9373,7 +9373,7 @@ entities:
     - type: Transform
       pos: 25.49259,25.48387
       parent: 1
-- proto: PlasmaReinforcedWindowDirectional
+- proto: PlasmaReinforcedWindowDirectionalDungeon
   entities:
   - uid: 1164
     components:
@@ -14359,14 +14359,14 @@ entities:
     - type: Transform
       pos: 9.5,12.5
       parent: 1
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 663
     components:
     - type: Transform
       pos: 11.5,44.5
       parent: 1
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1564
     components:
@@ -14388,7 +14388,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 31.5,3.5
       parent: 1
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 43
     components:
@@ -14485,7 +14485,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,46.5
       parent: 1
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 931
     components:
@@ -14547,7 +14547,7 @@ entities:
     - type: Transform
       pos: 14.5,44.5
       parent: 1
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 328
     components:

diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -6725,7 +6725,7 @@ entities:
     - type: Transform
       pos: 14.5,34.5
       parent: 1653
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 742
     components:
@@ -7000,7 +7000,7 @@ entities:
     - type: Transform
       pos: 33.42354,40.437122
       parent: 1653
-- proto: PlasmaReinforcedWindowDirectional
+- proto: PlasmaReinforcedWindowDirectionalDungeon
   entities:
   - uid: 645
     components:
@@ -10817,7 +10817,7 @@ entities:
     - type: Transform
       pos: 27.5,7.5
       parent: 1653
-- proto: Windoor
+- proto: WindoorDungeon
   entities:
   - uid: 636
     components:
@@ -10866,7 +10866,7 @@ entities:
     - type: Transform
       pos: 9.5,27.5
       parent: 1653
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 467
     components:
@@ -10946,7 +10946,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 33.5,3.5
       parent: 1653
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 632
     components:
@@ -10970,7 +10970,7 @@ entities:
     - type: Transform
       pos: 44.5,3.5
       parent: 1653
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 473
     components:
@@ -11153,7 +11153,7 @@ entities:
     - type: Transform
       pos: 2.5,8.5
       parent: 1653
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 446
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -8208,7 +8208,7 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 588
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 209
     components:
@@ -12808,7 +12808,7 @@ entities:
     - type: Transform
       pos: 16.5,24.5
       parent: 588
-- proto: WindoorAssemblySecure
+- proto: WindoorSecureSecurityLockedDungeon
   entities:
   - uid: 696
     components:
@@ -12827,7 +12827,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,25.5
       parent: 588
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 1761
     components:
@@ -12841,30 +12841,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,47.5
       parent: 588
-- proto: WindoorSecureBrigLocked
+- proto: WindoorSecureBrigLockedDungeon
   entities:
   - uid: 339
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,2.5
       parent: 588
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1569
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,45.5
       parent: 588
-- proto: WindoorSecureMedicalLocked
+- proto: WindoorSecureMedicalLockedDungeon
   entities:
   - uid: 1408
     components:
     - type: Transform
       pos: 11.5,44.5
       parent: 588
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorSecureSecurityLockedDungeon
   entities:
   - uid: 252
     components:
@@ -12913,7 +12913,7 @@ entities:
     - type: Transform
       pos: 21.5,27.5
       parent: 588
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 480
     components:
@@ -13024,7 +13024,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 588
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 936
     components:
@@ -13131,7 +13131,7 @@ entities:
     - type: Transform
       pos: 24.5,47.5
       parent: 588
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 97
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -8262,7 +8262,7 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 588
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 209
     components:
@@ -12968,15 +12968,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,25.5
       parent: 588
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 1837
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,4.5
       parent: 588
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureEngineeringLockedDungeon
   entities:
   - uid: 1569
     components:
@@ -12990,14 +12990,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 588
-- proto: WindoorSecureMedicalLocked
+- proto: WindoorSecureMedicalLockedDungeon
   entities:
   - uid: 1408
     components:
     - type: Transform
       pos: 11.5,44.5
       parent: 588
-- proto: WindoorSecureMercenaryLocked
+- proto: WindoorSecureMercenaryLockedDungeon
   entities:
   - uid: 252
     components:
@@ -13053,7 +13053,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 29.5,2.5
       parent: 588
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorSecureSecurityLockedDungeon
   entities:
   - uid: 1053
     components:
@@ -13066,7 +13066,7 @@ entities:
     - type: Transform
       pos: 21.5,27.5
       parent: 588
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 480
     components:
@@ -13172,7 +13172,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,44.5
       parent: 588
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 936
     components:
@@ -13279,7 +13279,7 @@ entities:
     - type: Transform
       pos: 24.5,47.5
       parent: 588
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 97
     components:

diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml
@@ -2755,7 +2755,7 @@ entities:
     - type: Transform
       pos: 36.5,26.5
       parent: 2
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 288
     components:
@@ -6506,7 +6506,7 @@ entities:
     - type: Transform
       pos: 39.5,32.5
       parent: 2
-- proto: WindowFrostedDirectional
+- proto: WindowFrostedDirectionalDungeon
   entities:
   - uid: 142
     components:

diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -8162,7 +8162,7 @@ entities:
     - type: Transform
       pos: 18.5,52.5
       parent: 1653
-- proto: Grille
+- proto: GrilleDungeon
   entities:
   - uid: 178
     components:
@@ -8993,7 +8993,7 @@ entities:
     - type: Transform
       pos: 19.5,32.5
       parent: 1653
-- proto: PlasmaReinforcedWindowDirectional
+- proto: PlasmaReinforcedWindowDirectionalDungeon
   entities:
   - uid: 6
     components:
@@ -9157,7 +9157,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 43.5,4.5
       parent: 1653
-- proto: PlasmaWindowDirectional
+- proto: PlasmaWindowDirectionalDungeon
   entities:
   - uid: 486
     components:
@@ -16016,7 +16016,7 @@ entities:
     - type: Transform
       pos: 18.551561,15.604378
       parent: 1653
-- proto: Windoor
+- proto: WindoorDungeon
   entities:
   - uid: 143
     components:
@@ -16029,7 +16029,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 1653
-- proto: WindoorPlasma
+- proto: WindoorPlasmaDungeon
   entities:
   - uid: 864
     components:
@@ -16153,7 +16153,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,39.5
       parent: 1653
-- proto: WindoorSecure
+- proto: WindoorSecureDungeon
   entities:
   - uid: 343
     components:
@@ -16207,7 +16207,7 @@ entities:
     - type: Transform
       pos: 5.5,15.5
       parent: 1653
-- proto: WindoorSecurePlasma
+- proto: WindoorSecurePlasmaDungeon
   entities:
   - uid: 699
     components:
@@ -16226,7 +16226,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,18.5
       parent: 1653
-- proto: WindowDirectional
+- proto: WindowDirectionalDungeon
   entities:
   - uid: 169
     components:
@@ -16267,7 +16267,7 @@ entities:
     - type: Transform
       pos: 0.5,1.5
       parent: 1653
-- proto: WindowReinforcedDirectional
+- proto: WindowReinforcedDirectionalDungeon
   entities:
   - uid: 319
     components: