Half Revert #31978 (#33160)

Hotfix
space-wizards · Nov 14, 2024 · f2b7743 · f2b7743
2 parents 197d9e6 + 21074bd
commit f2b7743
Show file tree

Hide file tree

Showing 14 changed files with 162 additions and 325 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
@@ -152,4 +152,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: clockworkWindowDiagonal
+    node: clockworkWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@@ -91,4 +91,4 @@
     - East
   - type: DamageVisuals
     damageOverlay:
-      sprite: Structures/Windows/cracks_diagonal.rsi
+      sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -152,4 +152,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: plasmaWindowDiagonal
+    node: plasmaWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -195,4 +195,4 @@
     doAfterDelay: 3
   - type: Damageable
     damageContainer: StructuralInorganic
-    damageModifierSet: RGlass
+    damageModifierSet: RGlass
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -159,4 +159,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: reinforcedWindowDiagonal
+    node: reinforcedWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -155,4 +155,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: reinforcedPlasmaWindowDiagonal
+    node: reinforcedPlasmaWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -152,4 +152,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: reinforcedUraniumWindowDiagonal
+    node: reinforcedUraniumWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -94,4 +94,4 @@
     - East
   - type: DamageVisuals
     damageOverlay:
-      sprite: Structures/Windows/cracks_diagonal.rsi
+      sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -147,4 +147,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: uraniumWindowDiagonal
+    node: uraniumWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -284,4 +284,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: windowDiagonal
+    node: windowDiagonal
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
@@ -4,63 +4,61 @@
   graph:
     - node: start
       edges:
-        - to: window # 50 hp
+        - to: plasmaWindow
           steps:
-            - material: Glass
+            - material: PlasmaGlass
               amount: 2
               doAfter: 2
 
-        - to: tintedWindow # 50 hp
+        - to: reinforcedWindow
           steps:
-            - material: Glass
+            - material: ReinforcedGlass
               amount: 2
-            - material: Plastic
+              doAfter: 2
+
+        - to: tintedWindow
+          steps:
+            - material: ReinforcedGlass
               amount: 2
               doAfter: 2
 
-        - to: plasmaWindow # 75 hp
+        - to: reinforcedPlasmaWindow
           steps:
-            - material: PlasmaGlass
+            - material: ReinforcedPlasmaGlass
               amount: 2
               doAfter: 3
 
-        - to: uraniumWindow # 75 hp
+        - to: uraniumWindow
           steps:
             - material: UraniumGlass
               amount: 2
-              doAfter: 3
+              doAfter: 2
 
-        - to: clockworkWindow # 75 hp reinforced damage mod
+        - to: reinforcedUraniumWindow
           steps:
-            - material: ClockworkGlass
+            - material: ReinforcedUraniumGlass
               amount: 2
               doAfter: 3
 
-        - to: reinforcedWindow # 75 hp reinforced damage mod
+        - to: window
           steps:
-            - material: ReinforcedGlass
+            - material: Glass
               amount: 2
               doAfter: 3
 
-        - to: reinforcedPlasmaWindow # 150 hp reinforced damage mod
+        - to: shuttleWindow
           steps:
-            - material: ReinforcedPlasmaGlass
+            - material: Plasteel
               amount: 2
-              doAfter: 4
-
-        - to: reinforcedUraniumWindow # 150 hp reinforced damage mod
-          steps:
-            - material: ReinforcedUraniumGlass
+            - material: ReinforcedGlass
               amount: 2
               doAfter: 4
-
-        - to: shuttleWindow # 500 hp reinforced damage mod (wow)
+        
+        - to: clockworkWindow
           steps:
-            - material: Plasteel
-              amount: 2
-            - material: ReinforcedGlass
+            - material: ClockworkGlass
               amount: 2
-              doAfter: 6
+              doAfter: 3
 
     - node: window
       entity: Window
@@ -76,81 +74,56 @@
               doAfter: 1
             - tool: Anchoring
               doAfter: 2
-        - to: tintedWindow
-          steps:
-            - material: Plastic
-              amount: 2
-              doAfter: 0.5
-        - to: plasmaWindow
-          steps:
-            - material: Plasma
-              amount: 2
-              doAfter: 1
-        - to: uraniumWindow
-          steps:
-            - material: Uranium
-              amount: 2
-              doAfter: 1
-        - to: clockworkWindow
-          steps:
-            - material: Brass
-              amount: 2
-              doAfter: 2
-        - to: reinforcedWindow
-          steps:
-            - material: MetalRod
-              amount: 2
-              doAfter: 2
 
-    - node: tintedWindow
-      entity: TintedWindow
+    - node: reinforcedWindow
+      entity: ReinforcedWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetGlass1
-              amount: 2
-            - !type:SpawnPrototype
-              prototype: SheetPlastic1
+              prototype: SheetRGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Prying
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
             - tool: Screwing
               doAfter: 1
             - tool: Anchoring
               doAfter: 2
 
-    - node: plasmaWindow
-      entity: PlasmaWindow
+    - node: tintedWindow
+      entity: TintedWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetPGlass1
+              prototype: SheetRGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
             - tool: Screwing
-              doAfter: 2
+              doAfter: 1
             - tool: Prying
-              doAfter: 3
-            - tool: Screwing
               doAfter: 2
-            - tool: Anchoring
-              doAfter: 3
-        - to: reinforcedPlasmaWindow
-          steps:
-            - material: MetalRod
-              amount: 2
+            - tool: Screwing
               doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
 
-    - node: uraniumWindow
-      entity: UraniumWindow
+    - node: plasmaWindow
+      entity: PlasmaWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetUGlass1
+              prototype: SheetPGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
@@ -162,19 +135,14 @@
               doAfter: 2
             - tool: Anchoring
               doAfter: 3
-        - to: reinforcedUraniumWindow
-          steps:
-            - material: MetalRod
-              amount: 2
-              doAfter: 1
 
-    - node: clockworkWindow
-      entity: ClockworkWindow
+    - node: reinforcedPlasmaWindow
+      entity: ReinforcedPlasmaWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetClockworkGlass1
+              prototype: SheetRPGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
@@ -191,51 +159,32 @@
             - tool: Anchoring
               doAfter: 3
 
-    - node: reinforcedWindow
-      entity: ReinforcedWindow
+    - node: uraniumWindow
+      entity: UraniumWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetRGlass1
+              prototype: SheetUGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
-            - tool: Welding
-              doAfter: 5
             - tool: Screwing
-              doAfter: 1
-            - tool: Prying
               doAfter: 2
-            - tool: Welding
-              doAfter: 5
+            - tool: Prying
+              doAfter: 3
             - tool: Screwing
-              doAfter: 1
-            - tool: Anchoring
               doAfter: 2
-        - to: reinforcedPlasmaWindow
-          steps:
-            - material: Plasma
-              amount: 2
-              doAfter: 1
-        - to: reinforcedUraniumWindow
-          steps:
-            - material: Uranium
-              amount: 2
-              doAfter: 1
-        - to: shuttleWindow
-          steps:
-            - material: Plasteel
-              amount: 2
+            - tool: Anchoring
               doAfter: 3
 
-    - node: reinforcedPlasmaWindow
-      entity: ReinforcedPlasmaWindow
+    - node: reinforcedUraniumWindow
+      entity: ReinforcedUraniumWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetRPGlass1
+              prototype: SheetRUGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
@@ -252,13 +201,13 @@
             - tool: Anchoring
               doAfter: 3
 
-    - node: reinforcedUraniumWindow
-      entity: ReinforcedUraniumWindow
+    - node: clockworkWindow
+      entity: ClockworkWindow
       edges:
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SheetRUGlass1
+              prototype: SheetClockworkGlass1
               amount: 2
             - !type:DeleteEntity {}
           steps:
@@ -304,4 +253,4 @@
             - tool: Welding
               doAfter: 4
             - tool: Anchoring
-              doAfter: 1
+              doAfter: 1