windoors work #Dab

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -110,7 +110,7 @@
       fixtures:
       - shape:
           !type:PhysShapeRect
-          bounds: "0.49,-0.49,-0.49,-0.2" # don't want this colliding with walls or they won't close
+          bounds: "-0.2,-0.49,-0.49,0.49" # don't want this colliding with walls or they won't close
         mask:
           - MobImpassable
         layer:

Resources/Prototypes/Entities/Structures/Doors/windoor.yml

@@ -1,45 +1,11 @@
 - type: entity
-  id: WindoorLeft
+  id: Windoor
   parent: BaseWindoor
   name: windoor
   description: It's a window and a sliding door. Wow!
-  suffix: Left
-  components:
-  - type: Sprite
-    state: left
 
 - type: entity
-  id: WindoorRight
-  parent: BaseWindoor
-  name: windoor
-  description: It's a window and a sliding door. Wow! This one is flipped 180 degrees.
-  suffix: Right
-  components:
-  - type: Sprite
-    state: right
-
-- type: entity
-  id: WindoorLeftSecure
+  id: WindoorSecure
   parent: BaseSecureWindoor
   name: secure windoor
   description: It's a sturdy window and a sliding door. Wow!
-  suffix: Left
-  components:
-  - type: Sprite
-    netsync: false
-    drawdepth: Mobs
-    sprite: Structures/Doors/windoor.rsi
-    state: left_secure
-
-- type: entity
-  id: WindoorRightSecure
-  parent: BaseSecureWindoor
-  name: secure windoor
-  description: It's a sturdy window and a sliding door. Wow! This one is flipped 180 degrees.
-  suffix: Right
-  components:
-  - type: Sprite
-    netsync: false
-    drawdepth: Mobs
-    sprite: Structures/Doors/windoor.rsi
-    state: right_secure

Resources/Prototypes/Entities/Structures/Windoors/base.yml

@@ -6,24 +6,45 @@
     mode: SnapgridCenter
   components:
   - type: InteractionOutline
+  - type: Airlock
+  - type: Door
+  - type: Wires
+    BoardName: "Windoor Control"
+    LayoutId: Airlock
+  - type: UserInterface
+    interfaces:
+    - key: enum.WiresUiKey.Key
+      type: WiresBoundUserInterface
   - type: Physics
     fixtures:
     - shape:
         !type:PhysShapeAabb
-        bounds: "-0.49,-0.49,0.49,0.49"
+        bounds: "-0.2,-0.49,-0.49,0.49"
       mass: 50
-      mask:
-      - MobImpassable
       layer:
-      - Opaque
       - Impassable
       - MobImpassable
       - VaultImpassable
       - SmallImpassable
+      mask:
+      - VaultImpassable
   - type: Sprite
     netsync: false
-    drawdepth: Mobs
-    sprite: Structures/Doors/windoor.rsi
+    drawdepth: FloorObjects
+    sprite: Structures/Doors/Windoors/glass.rsi
+    layers:
+    - state: closed
+      map: [ "enum.DoorVisualLayers.Base" ]
+    - state: closed_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+    - state: welded
+      map: [ "enum.DoorVisualLayers.BaseWelded" ]
+    - state: bolted_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: panel_open
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
   - type: ApcPowerReceiver
   - type: Damageable
     resistances: glassResistances
@@ -40,12 +61,28 @@
             max: 2
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Appearance
+    visuals:
+      - type: AirlockVisualizer
+        open_sound: /Audio/Machines/airlock_open.ogg
+        close_sound: /Audio/Machines/airlock_close.ogg
+        deny_sound: /Audio/Machines/airlock_deny.ogg
+        hasMaintenancePanel: false
+        openCloseUnlit: false
+        delay: 0.7
 
 - type: entity
   id: BaseSecureWindoor
   parent: BaseWindoor
   abstract: true
   components:
+  - type: Airtight
+    fixVacuum: true
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/secure.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -64,3 +101,11 @@
             max: 3
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+
+# "0.49,-0.49,-0.49,-0.2"
+# to:
+# (-0.2, -0.49), (-0.2, 0.49), (-0.49, 0.49), (-0.49, -0.49)
+# what i want is:
+# (0.49, -0.49), (0.49, -0.2), (-0.49, -0.2), (-0.49, -0.49)
+# which is:
+# "-0.2,-0.49,-0.49,0.49"

Resources/Textures/Structures/Doors/Windoors/glass.rsi/meta.json

@@ -0,0 +1,21 @@
+{
+    "name":1,
+    "size": {"x":32,"y":32},
+    "states":
+    [
+        {"name":"assembly2","directions":4,"delays":[[0.3,0.3],[0.3,0.3],[0.3,0.3],[0.3,0.3]]},
+        {"name":"assembly1","directions":4},
+        {"name":"closed","directions":4},
+        {"name":"closing","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},
+        {"name":"open","directions":4},
+        {"name":"opening","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},
+        {"name":"deny_unlit","directions":4,"delays":[[0.1,0.2,0.1],[0.1,0.2,0.1],[0.1,0.2,0.1],[0.1,0.2,0.1]]},
+        {"name":"spark","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1]]},
+        {"name":"closed_unlit","directions":4},
+        {"name":"panel_open","directions":4},
+        {"name":"welded","directions":4},
+        {"name":"bolted_unlit","directions":4}
+    ],
+    "license":"CC BY-SA-3.0",
+    "copyright":"https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi"
+}

Resources/Textures/Structures/Doors/Windoors/secure.rsi/meta.json

@@ -0,0 +1,21 @@
+{
+    "name":1,
+    "size": {"x":32,"y":32},
+    "states":
+    [
+        {"name":"assembly2","directions":4,"delays":[[0.3,0.3],[0.3,0.3],[0.3,0.3],[0.3,0.3]]},
+        {"name":"assembly1","directions":4},
+        {"name":"closed","directions":4},
+        {"name":"closing","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},
+        {"name":"open","directions":4},
+        {"name":"opening","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},
+        {"name":"deny_unlit","directions":4,"delays":[[0.1,0.2,0.1],[0.1,0.2,0.1],[0.1,0.2,0.1],[0.1,0.2,0.1]]},
+        {"name":"spark","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1,0.1]]},
+        {"name":"closed_unlit","directions":4},
+        {"name":"panel_open","directions":4},
+        {"name":"welded","directions":4},
+        {"name":"bolted_unlit","directions":4}
+    ],
+    "license":"CC BY-SA-3.0",
+    "copyright":"https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi"
+}

Resources/Textures/Structures/Doors/windoor.rsi/meta.json

@@ -1 +0,0 @@
-{"name":1,"size":{"x":32,"y":32},"states":[{"name":"left_assembly2","directions":4,"delays":[[3,3],[3,3],[3,3],[3,3]]},{"name":"left_assembly1","directions":4},{"name":"left","directions":4},{"name":"left_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_open","directions":4},{"name":"left_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_deny","directions":4,"delays":[[1,2,1],[1,2,1],[1,2,1],[1,2,1]]},{"name":"left_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]},{"name":"right_assembly2","directions":4,"delays":[[3,3],[3,3],[3,3],[3,3]]},{"name":"right_assembly1","directions":4},{"name":"right","directions":4},{"name":"right_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_open","directions":4},{"name":"right_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_deny","directions":4,"delays":[[1,2,1],[1,2,1],[1,2,1],[1,2,1]]},{"name":"right_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]},{"name":"left_secure_assembly2","directions":4,"delays":[[3,3,3],[3,3,3],[3,3,3],[3,3,3]]},{"name":"left_secure_assembly1","directions":4},{"name":"left_secure","directions":4},{"name":"left_secure_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_secure_open","directions":4},{"name":"left_secure_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"left_secure_deny","directions":4,"delays":[[1,1,1],[1,1,1],[1,1,1],[1,1,1]]},{"name":"left_secure_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]},{"name":"right_secure_assembly2","directions":4,"delays":[[3,3,3],[3,3,3],[3,3,3],[3,3,3]]},{"name":"right_secure_assembly1","directions":4},{"name":"right_secure","directions":4},{"name":"right_secure_closing","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_secure_open","directions":4},{"name":"right_secure_opening","directions":4,"delays":[[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2],[2,1,1,1,1,1,2]]},{"name":"right_secure_deny","directions":4,"delays":[[1,1,1],[1,1,1],[1,1,1],[1,1,1]]},{"name":"right_secure_spark","directions":4,"delays":[[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1],[1,1,1,1,1,1]]}],"license":"CC BY-SA-3.0","copyright":"https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi"}