From 44db6abfcf76126df07f7c9155da808a05bda781 Mon Sep 17 00:00:00 2001
From: Mr_Lop_Lop <sem3667@gmail.com>
Date: Wed, 25 Dec 2024 01:43:49 +0700
Subject: [PATCH] fix Pulowski Shelter (#765)

---
 .../Entities/Structures/Misc/shelter.yml      |  46 +++++++++---------
 ...helternewclosedoccupied.png => closed.png} | Bin
 .../Structures/Misc/shelternew.rsi/meta.json  |   4 +-
 .../{shelternewopen.png => open.png}          | Bin
 ...elterwornclosedoccupied.png => closed.png} | Bin
 .../Structures/Misc/shelterworn.rsi/meta.json |   4 +-
 .../{shelterwornopen.png => open.png}         | Bin
 7 files changed, 28 insertions(+), 26 deletions(-)
 rename Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/{shelternewclosedoccupied.png => closed.png} (100%)
 rename Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/{shelternewopen.png => open.png} (100%)
 rename Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/{shelterwornclosedoccupied.png => closed.png} (100%)
 rename Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/{shelterwornopen.png => open.png} (100%)

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/shelter.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/shelter.yml
index a5767ace4be..28e5cff1ec2 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/shelter.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/shelter.yml
@@ -11,8 +11,18 @@
     noRot: true
     sprite: _Nuclear14/Structures/Misc/shelternew.rsi
     layers:
-    - state: shelternewopen
-      map: ["base"]
+    - state: open
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Door
+    bumpOpen: false
+    clickOpen: true
+    closeTimeOne: 0.2
+    closeTimeTwo: 0.6
+    openTimeOne: 0.6
+    openTimeTwo: 0.2
+    openingAnimationTime: 1.3
+    closingAnimationTime: 1.3
+    occludes: false
   - type: InteractionOutline
   - type: Cryostorage
   - type: Physics
@@ -34,19 +44,10 @@
     visuals:
       enum.CryostorageVisuals.Full:
         base:
-          True: { state: shelternewclosedoccupied }
-          False: { state: shelternewopen }
+          True: { state: closed }
+          False: { state: open }
   - type: AnimationPlayer
-  - type: Door
-    bumpOpen: false
-    clickOpen: true
-    closeTimeOne: 0.2
-    closeTimeTwo: 0.6
-    openTimeOne: 0.6
-    openTimeTwo: 0.2
-    openingAnimationTime: 1.3
-    closingAnimationTime: 1.3
-    occludes: false
+
 
 - type: entity
   parent: N14PulowskiShelterNew
@@ -58,13 +59,8 @@
     noRot: true
     sprite: _Nuclear14/Structures/Misc/shelterworn.rsi
     layers:
-    - state: shelterwornopen
-  - type: GenericVisualizer
-    visuals:
-      enum.CryostorageVisuals.Full:
-        base:
-          True: { state: shelterwornclosedoccupied }
-          False: { state: shelterwornopen }
+    - state: open
+      map: ["enum.DoorVisualLayers.Base"]
   - type: Door
     bumpOpen: false
     clickOpen: true
@@ -74,4 +70,10 @@
     openTimeTwo: 0.2
     openingAnimationTime: 1.0
     closingAnimationTime: 1.6
-    occludes: false
\ No newline at end of file
+    occludes: false
+  - type: GenericVisualizer
+    visuals:
+      enum.CryostorageVisuals.Full:
+        base:
+          True: { state: closed }
+          False: { state: open }
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/shelternewclosedoccupied.png b/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/closed.png
similarity index 100%
rename from Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/shelternewclosedoccupied.png
rename to Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/closed.png
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/meta.json
index 4adcb028b92..116fd633d7a 100644
--- a/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/meta.json
+++ b/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/meta.json
@@ -40,10 +40,10 @@
         "name": "shelternewclosedempty"
       },
       {
-        "name": "shelternewclosedoccupied"
+        "name": "closed"
       },
       {
-        "name": "shelternewopen"
+        "name": "open"
       }
     ]
   }
\ No newline at end of file
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/shelternewopen.png b/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/open.png
similarity index 100%
rename from Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/shelternewopen.png
rename to Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/open.png
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/shelterwornclosedoccupied.png b/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/closed.png
similarity index 100%
rename from Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/shelterwornclosedoccupied.png
rename to Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/closed.png
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/meta.json
index e7296c05eda..21760ee8e22 100644
--- a/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/meta.json
+++ b/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/meta.json
@@ -44,10 +44,10 @@
         "name": "shelterwornclosedempty"
       },
       {
-        "name": "shelterwornclosedoccupied"
+        "name": "closed"
       },
       {
-        "name": "shelterwornopen"
+        "name": "open"
       }
     ]
   }
\ No newline at end of file
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/shelterwornopen.png b/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/open.png
similarity index 100%
rename from Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/shelterwornopen.png
rename to Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/open.png