fix Pulowski Shelter (#765)

Vault-Overseers · Dec 24, 2024 · 44db6ab · 44db6ab
1 parent ee2df18
commit 44db6ab
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git 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
+    occludes: false
+  - type: GenericVisualizer
+    visuals:
+      enum.CryostorageVisuals.Full:
+        base:
+          True: { state: closed }
+          False: { state: open }
diff --git a/...elternew.rsi/shelternewclosedoccupied.png → ...Structures/Misc/shelternew.rsi/closed.png b/...elternew.rsi/shelternewclosedoccupied.png → ...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
@@ -40,10 +40,10 @@
         "name": "shelternewclosedempty"
       },
       {
-        "name": "shelternewclosedoccupied"
+        "name": "closed"
       },
       {
-        "name": "shelternewopen"
+        "name": "open"
       }
     ]
   }
diff --git a/...es/Misc/shelternew.rsi/shelternewopen.png → ...4/Structures/Misc/shelternew.rsi/open.png b/...es/Misc/shelternew.rsi/shelternewopen.png → ...4/Structures/Misc/shelternew.rsi/open.png
diff --git a/...terworn.rsi/shelterwornclosedoccupied.png → ...tructures/Misc/shelterworn.rsi/closed.png b/...terworn.rsi/shelterwornclosedoccupied.png → ...tructures/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
@@ -44,10 +44,10 @@
         "name": "shelterwornclosedempty"
       },
       {
-        "name": "shelterwornclosedoccupied"
+        "name": "closed"
       },
       {
-        "name": "shelterwornopen"
+        "name": "open"
       }
     ]
   }
diff --git a/.../Misc/shelterworn.rsi/shelterwornopen.png → .../Structures/Misc/shelterworn.rsi/open.png b/.../Misc/shelterworn.rsi/shelterwornopen.png → .../Structures/Misc/shelterworn.rsi/open.png