Add coin rooms, button rooms, and more! (#173)

Co-authored-by: artiwr <[email protected]> Co-authored-by: Pandora <[email protected]>
rhelmot · Nov 11, 2024 · 12f8f1e · 12f8f1e
1 parent 5023d41
commit 12f8f1e
Show file tree

Hide file tree

Showing 9 changed files with 878 additions and 96 deletions.
diff --git a/Randomizer/Config/Celeste/1-ForsakenCity.rando.yaml b/Randomizer/Config/Celeste/1-ForsakenCity.rando.yaml
@@ -1239,7 +1239,10 @@ BSide:
     InternalEdges:
     - Split: LeftToRight
       ReqOut:
-        Dashes: one
+        Or:
+        - Dashes: one
+        - Dashes: zero
+          Difficulty: perfect # yea gl with that
       ReqIn:
         Or:
         - Dashes: one

diff --git a/Randomizer/Config/Celeste/2-OldSite.rando.yaml b/Randomizer/Config/Celeste/2-OldSite.rando.yaml
@@ -274,10 +274,10 @@ ASide:
     Holes:
     - Side: Up
       Idx: 0
-      Kind: out
+      Kind: inout
     - Side: Down
       Idx: 0
-      Kind: in
+      Kind: inout
     InternalEdges:
     - Split: BottomToTop
       ReqBoth:
@@ -288,21 +288,64 @@ ASide:
         Add: true
         X: 32
         Y: 40
+    - Name: "randomizer/ActivateSwitches"
+      Update:
+        Add: true
+        X: 24
+        Y: 0
+        Width: 32
+        Height: 40
+        Values:
+            type: "touchswitch"
+    - ID: 0
+      Name: jumpThru
+      Update:
+        Width: 16
+    - Decal: "bg"
+      X: 292
+      Y: 156
+      Update:
+        Remove: true
   - Room: "7"
     Holes:
     - Side: Up
       Idx: 0
-      Kind: out
+      Kind: inout
     - Side: Down
       Idx: 0
-      Kind: in
+      Kind: inout
     InternalEdges:
     - Split: BottomToTop
-      ReqBoth:
+      ReqOut:
         Or:
           - Dashes: one
           - Dashes: zero
             Difficulty: master
+      ReqIn:
+        Dashes: zero
+    Tweaks:
+    - Name: "randomizer/ActivateSwitches"
+      Update:
+        Add: true
+        X: 280
+        Y: 0
+        Width: 24
+        Height: 32
+        Values:
+            type: "touchswitch"
+    - Name: "spawn"
+      Update:
+        Add: true
+        X: 288
+        Y: 16
+    - ID: 0
+      Name: "jumpThru"
+      Update:
+        Width: 16
+    - Name: "switchGate"
+      ID: 8
+      Update:
+        Y: 16
   - Room: "8"
     Holes:
     - Side: Up
@@ -394,12 +437,15 @@ ASide:
           Dashes: one
       - Side: Down
         Idx: 1
-        Kind: out
+        Kind: inout
         ReqOut:
           Or:
           - Dashes: one
           - Dashes: zero
             Difficulty: hard
+        ReqIn:
+          Dashes: one
+          Difficulty: hard
     - Room: "outside"
       Holes:
       - Side: Up
@@ -446,6 +492,15 @@ ASide:
         Values:
           cameraX: 0.0
           cameraY: 1.0
+    - Name: "randomizer/ActivateSwitches"
+      Update:
+        Add: true
+        X: 488
+        Y: 288
+        Width: 24
+        Height: 32
+        Values:
+            type: "touchswitch"
   - Room: "9b"
     Holes:
     - Side: Down
@@ -1400,18 +1455,33 @@ BSide:
     Holes:
     - Side: Up
       Idx: 0
-      Kind: out
+      Kind: inout
       ReqOut:
         Dashes: one
+      ReqIn:
+        Dashes: zero
     - Side: Down
       Idx: 0
-      Kind: in
+      Kind: inout
     Tweaks:
     - Name: "spawn"
       Update:
         Add: true
         X: 296
         Y: 24
+    - Name: "randomizer/ActivateSwitches"
+      Update:
+        Add: true
+        X: 280
+        Y: 0
+        Width: 24
+        Height: 96
+        Values:
+            type: "touchswitch"
+    - ID: 1
+      Name: jumpThru
+      Update:
+        Width: 16
   - Room: "04"
     Holes:
     - Side: Up
@@ -1468,18 +1538,38 @@ BSide:
     Holes:
     - Side: Right
       Idx: 0
-      Kind: out
+      Kind: inout
       ReqOut:
         Dashes: one
+      ReqIn:
+        Dashes: one
     - Side: Down
       Idx: 0
-      Kind: in
+      Kind: inout
     Tweaks:
     - Name: "spawn"
       Update:
         Add: true
         X: 328
         Y: 184
+    - Name: "randomizer/ActivateSwitches"
+      Update:
+        Add: true
+        X: 304
+        Y: 152
+        Width: 32
+        Height: 32
+        Values:
+            type: "touchswitch"
+    - ID: 0
+      Name: jumpThru
+      Update:
+        Width: 16
+    - Name: "spawn"
+      X: 40
+      Y: 176
+      Update:
+        X: 24
   - Room: "07"
     Holes:
     - Side: Up
@@ -1555,9 +1645,14 @@ BSide:
     Holes:
     - Side: Up
       Idx: 0
-      Kind: out
+      Kind: inout
       ReqOut:
         Dashes: one
+      ReqIn:
+        Or:
+          - Dashes: one
+            Difficulty: hard
+          - Dashes: two
     - Side: Left
       Idx: 0
       Kind: inout
@@ -1567,6 +1662,15 @@ BSide:
         Add: true
         X: 296
         Y: 24
+    - Name: "randomizer/ActivateSwitches"
+      Update:
+        Add: true
+        X: 272 
+        Y: 0
+        Width: 32
+        Height: 96
+        Values:
+            type: "touchswitch"
   - Room: "11"
     Holes:
     - Side: Up