From 12f8f1e92396ae7d5c8148d8b766e1e81545e297 Mon Sep 17 00:00:00 2001 From: Jeremy Vidaurri Date: Mon, 11 Nov 2024 10:39:57 -0600 Subject: [PATCH] Add coin rooms, button rooms, and more! (#173) Co-authored-by: artiwr <115380345+artiwr@users.noreply.github.com> Co-authored-by: Pandora <131298865+Pandorafoxxx@users.noreply.github.com> --- .../Config/Celeste/1-ForsakenCity.rando.yaml | 5 +- .../Config/Celeste/2-OldSite.rando.yaml | 126 ++++++++- .../Celeste/3-CelestialResort.rando.yaml | 132 +++++++-- .../Config/Celeste/4-GoldenRidge.rando.yaml | 51 +++- .../Config/Celeste/5-MirrorTemple.rando.yaml | 254 ++++++++++++++++-- .../Config/Celeste/6-Reflection.rando.yaml | 31 ++- Randomizer/Config/Celeste/7-Summit.rando.yaml | 100 ++++++- Randomizer/Config/Celeste/9-Core.rando.yaml | 41 ++- .../Config/Celeste/LostLevels.rando.yaml | 234 ++++++++++++++-- 9 files changed, 878 insertions(+), 96 deletions(-) diff --git a/Randomizer/Config/Celeste/1-ForsakenCity.rando.yaml b/Randomizer/Config/Celeste/1-ForsakenCity.rando.yaml index 7d9275c7..e3bca45e 100644 --- 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 index 1c6f2e9b..3de42a08 100644 --- 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 diff --git a/Randomizer/Config/Celeste/3-CelestialResort.rando.yaml b/Randomizer/Config/Celeste/3-CelestialResort.rando.yaml index 020fb77b..45153fd5 100644 --- a/Randomizer/Config/Celeste/3-CelestialResort.rando.yaml +++ b/Randomizer/Config/Celeste/3-CelestialResort.rando.yaml @@ -73,8 +73,11 @@ ASide: InternalEdges: - Collectable: 0 ReqBoth: - Dashes: one - Difficulty: hard + Or: + - Dashes: one + Difficulty: hard + - Dashes: zero + Difficulty: perfect # aRTiA viable Tweaks: - Name: "cameraOffsetTrigger" Update: @@ -691,15 +694,36 @@ ASide: Holes: - Side: Left Idx: 0 - Kind: in + Kind: inout - Side: Down Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: one - Dashes: zero Difficulty: expert + ReqIn: + Or: + - Dashes: one + Difficulty: master + - Dashes: two + Difficulty: master + Tweaks: + - Name: "spawn" + Update: + Add: true + X: 304 + Y: 152 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 280 + Y: 120 + Width: 32 + Height: 64 + Values: + type: "touchswitch" - Room: "08-b" # key loop 4 Holes: - Side: Up @@ -904,18 +928,29 @@ ASide: Kind: inout - Side: Down Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: zero Flag: boxes:unset - Dashes: one Flag: towels:unset + ReqIn: + Dashes: zero Tweaks: - ID: 29 Name: "exitBlock" Update: Remove: true + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 72 + Y: 160 + Width: 32 + Height: 24 + Values: + type: "touchswitch" - Room: "11-y" # chest 3 Holes: - Side: Up @@ -1349,11 +1384,11 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: in + Kind: inout - Side: Left Idx: 0 - Kind: out - ReqOut: + Kind: inout + ReqBoth: Or: - Dashes: one - Dashes: zero @@ -1371,6 +1406,15 @@ ASide: Add: true X: 8 Y: 32 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 0 + Y: 8 + Width: 16 + Height: 24 + Values: + type: "touchswitch" - Room: "06-d" # shaft 3 Holes: - Side: Right @@ -1433,8 +1477,11 @@ ASide: Dashes: one Difficulty: expert ReqIn: - Dashes: two - Difficulty: master + Or: + - Dashes: two + Difficulty: master + - Dashes: one + Difficulty: perfect - To: "right" ReqBoth: Dashes: one @@ -1755,12 +1802,17 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: one - Dashes: zero Difficulty: expert + ReqIn: + Or: + - Dashes: one + - Dashes: zero + Difficulty: master - Side: Left Idx: 0 Kind: inout @@ -1776,6 +1828,40 @@ ASide: - ID: 2 # remove invisible barrier Update: Remove: true + - Name: "spawn" + Update: + Add: true + X: 960 + Y: 160 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 936 + Y: 136 + Width: 40 + Height: 24 + Values: + type: "touchswitch" + - Name: "cameraOffsetTrigger" + Update: + Add: true + X: 936 + Y: 136 + Width: 40 + Height: 24 + Values: + cameraX: -1.2 + cameraY: 0 + - Name: "cameraOffsetTrigger" + Update: + Add: true + X: 0 + Y: 0 + Width: 64 + Height: 160 + Values: + cameraX: 1.2 + cameraY: 0 - Room: "roof04" # interior Holes: - Side: Right @@ -2588,12 +2674,17 @@ BSide: Kind: None - Side: Down Idx: 1 - Kind: out + Kind: inout ReqOut: - Or: - - Dashes: one - - Dashes: zero - Difficulty: master + Or: + - Dashes: one + - Dashes: zero + Difficulty: master + ReqIn: + Or: + - Dashes: one + - Dashes: zero + Difficulty: hard - Side: Down Idx: 2 Kind: None @@ -2606,6 +2697,15 @@ BSide: Add: true X: 448 Y: 176 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 424 + Y: 144 + Width: 32 + Height: 40 + Values: + type: "touchswitch" - Room: "end" ReqEnd: Dashes: one diff --git a/Randomizer/Config/Celeste/4-GoldenRidge.rando.yaml b/Randomizer/Config/Celeste/4-GoldenRidge.rando.yaml index c89f78be..634a2b5a 100644 --- a/Randomizer/Config/Celeste/4-GoldenRidge.rando.yaml +++ b/Randomizer/Config/Celeste/4-GoldenRidge.rando.yaml @@ -267,6 +267,8 @@ ASide: - To: "Right" ReqOut: Dashes: one + ReqIn: + Dashes: zero Subrooms: - Room: "Right" Holes: @@ -277,6 +279,16 @@ ASide: - Collectable: 0 ReqBoth: Dashes: one + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 272 + Y: 16 + Width: 48 + Height: 112 + Values: + type: "touchswitch" - Room: "a-08" Holes: - Side: Left @@ -1345,6 +1357,9 @@ ASide: - To: "right" ReqOut: Dashes: zero + ReqIn: + Dashes: zero + Difficulty: Master Subrooms: - Room: "right" Holes: @@ -1357,6 +1372,20 @@ ASide: - Side: Up Idx: 1 Kind: unknown + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 344 + Y: 64 + Width: 32 + Height: 24 + Values: + type: "touchswitch" + - ID: 13 + Name: jumpThru + Update: + Remove: true - Room: "d-03" Holes: - Side: Right @@ -1846,12 +1875,17 @@ BSide: Holes: - Side: Up Idx: 1 - Kind: out + Kind: inout ReqOut: Or: - Dashes: one - Dashes: zero Difficulty: perfect # cornerslip roulette. + ReqIn: + Or: + - Dashes: one + - Dashes: zero + Difficulty: expert - Side: Down Idx: 0 Kind: inout @@ -1859,8 +1893,21 @@ BSide: - Name: "jumpThru" ID: 0 Update: - X: 24 Width: 16 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 376 + Y: 0 + Width: 24 + Height: 40 + Values: + type: "touchswitch" + - Name: "spawn" + Update: + Add: true + X: 382 + Y: 40 - Room: "b-04" Holes: - Side: Right diff --git a/Randomizer/Config/Celeste/5-MirrorTemple.rando.yaml b/Randomizer/Config/Celeste/5-MirrorTemple.rando.yaml index 3b6d07db..b8ae9f3d 100644 --- a/Randomizer/Config/Celeste/5-MirrorTemple.rando.yaml +++ b/Randomizer/Config/Celeste/5-MirrorTemple.rando.yaml @@ -41,10 +41,24 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout + ReqIn: + Dashes: two + Difficulty: hard - Side: Left Idx: 0 Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 464 + Y: 72 + Width: 16 + Height: 40 + Values: + type: "button" + entID: 16 - Room: "a-01" Hub: true Holes: @@ -285,7 +299,10 @@ ASide: ReqOut: Dashes: zero ReqIn: - Dashes: one + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect - Room: "a-11" Holes: - Side: Right @@ -426,7 +443,10 @@ ASide: Idx: 0 Kind: inout ReqOut: - Dashes: one + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect - Side: Left Idx: 0 Kind: inout @@ -703,10 +723,17 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one Difficulty: hard + ReqIn: + Or: + - Dashes: zero + Difficulty: hard + - Dashes: one + Difficulty: hard + - Dashes: two - Side: Left Idx: 0 Kind: inout @@ -725,6 +752,17 @@ ASide: - Side: Down Idx: 1 Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 304 + Y: 288 + Width: 16 + Height: 40 + Values: + type: "button" + entID: 15 - Room: "b-12" Holes: - Side: Up @@ -746,12 +784,23 @@ ASide: Dashes: one - Side: Right Idx: 1 - Kind: out + Kind: inout ReqOut: Dashes: one - Side: Left Idx: 0 Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 304 + Y: 200 + Width: 216 + Height: 32 + Values: + type: "button" + entID: 56 - Room: "b-17" # TODO: seeded berry Holes: - Side: Right @@ -891,7 +940,10 @@ ASide: Remove: true - Room: "b-15" ReqEnd: - Dashes: one + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect Holes: - Side: Left Idx: 0 @@ -1029,12 +1081,27 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one - Side: Left Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "templeGate" + ID: 122 + Update: + Remove: true + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 328 + Y: 16 + Width: 48 + Height: 32 + Values: + type: "button" + entID: 124 - Room: "c-08" Holes: - Side: Right @@ -1066,26 +1133,64 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout - Side: Left Idx: 0 Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 304 + Y: 16 + Width: 16 + Height: 32 + Values: + type: "touchswitch" - Room: "c-12" Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout - Side: Left Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 304 + Y: 16 + Width: 16 + Height: 32 + Values: + type: "touchswitch" + - Name: "templeGate" + ID: 145 + Update: + Remove: true - Room: "c-07" Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout - Side: Left Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 456 + Y: 72 + Width: 16 + Height: 40 + Values: + type: "touchswitch" + - Name: "templeGate" + ID: 98 + Update: + Remove: true - Room: "c-11" Holes: - Side: Right @@ -1103,24 +1208,43 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout - Side: Left Idx: 0 Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 304 + Y: 16 + Width: 16 + Height: 32 + Values: + type: "touchswitch" - Room: "c-13" Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout - Side: Left Idx: 0 - Kind: in + Kind: inout Tweaks: - Name: "spawn" Update: Add: true X: 200 Y: 16 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 176 + Y: 0 + Width: 32 + Height: 16 + Values: + type: "touchswitch" - Room: "d-00" # god this room is a mess Hub: true Holes: @@ -1231,15 +1355,32 @@ ASide: Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: one - Dashes: zero Difficulty: hard + ReqIn: + Dashes: zero - Side: Right Idx: 0 Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 40 + Y: 0 + Width: 32 + Height: 88 + Values: + type: "touchswitch" + - Name: "spawn" + Update: + Add: true + X: 48 + Y: 24 - Room: "d-04" Hub: true Holes: @@ -1458,7 +1599,17 @@ ASide: Kind: inout - Side: Left Idx: 0 - Kind: out + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 0 + Y: 64 + Width: 24 + Height: 32 + Values: + type: "touchswitch" - Room: "d-09" Holes: - Side: Right @@ -1621,12 +1772,28 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Difficulty: normal + ReqIn: + Dashes: zero - Side: Down Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 344 + Y: 72 + Width: 24 + Height: 40 + Values: + type: "touchswitch" + - Name: "jumpThru" + ID: 293 + Update: + Width: 16 - Room: "e-00" Holes: - Side: Right @@ -1760,7 +1927,7 @@ BSide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: one @@ -1778,6 +1945,17 @@ BSide: - Side: Down Idx: 2 Kind: none + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 304 + Y: 32 + Width: 16 + Height: 32 + Values: + type: "button" + entID: 29 - Room: "a-01" Holes: - Side: Right @@ -2036,9 +2214,14 @@ BSide: - Dashes: two - Side: Left Idx: 0 - Kind: out # TODO: can enter if switch pressed + Kind: inout ReqOut: Dashes: one + ReqIn: + Or: + - Dashes: one + Difficulty: hard + - Dashes: two InternalEdges: - To: "right" ReqIn: @@ -2079,6 +2262,16 @@ BSide: Values: cameraX: 1.0 cameraY: 0.0 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 0 + Y: 96 + Width: 24 + Height: 32 + Values: + type: "button" + entID: 290 - Room: "b-04" Holes: - Side: Left @@ -2162,7 +2355,7 @@ BSide: Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: two @@ -2182,6 +2375,21 @@ BSide: Y: 136 Update: Default: true + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 32 + Y: 0 + Width: 32 + Height: 48 + Values: + type: "button" + entID: 231 + - Name: "spawn" + Update: + Add: true + X: 40 + Y: 48 - Room: "b-09" Holes: - Side: Down diff --git a/Randomizer/Config/Celeste/6-Reflection.rando.yaml b/Randomizer/Config/Celeste/6-Reflection.rando.yaml index f310b960..9fb95d52 100644 --- a/Randomizer/Config/Celeste/6-Reflection.rando.yaml +++ b/Randomizer/Config/Celeste/6-Reflection.rando.yaml @@ -1779,12 +1779,31 @@ BSide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Or: + - Dashes: two + - Dashes: one + Difficulty: expert - Side: Down Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 608 + Y: 72 + Width: 24 + Height: 32 + Values: + type: "touchswitch" + - ID: 228 + Name: jumpThru + Update: + Width: 16 - Room: "a-04" Holes: - Side: Right @@ -1982,9 +2001,15 @@ BSide: Kind: inout ReqOut: Dashes: one + ReqIn: + Or: + - Dashes: two + Difficulty: perfect + - Dashes: one + Difficulty: perfect - Side: Left Idx: 0 - Kind: in + Kind: inout - Side: Down Idx: 0 Kind: none diff --git a/Randomizer/Config/Celeste/7-Summit.rando.yaml b/Randomizer/Config/Celeste/7-Summit.rando.yaml index d293a498..92c0142f 100644 --- a/Randomizer/Config/Celeste/7-Summit.rando.yaml +++ b/Randomizer/Config/Celeste/7-Summit.rando.yaml @@ -647,18 +647,34 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Dashes: zero - Side: Left Idx: 0 Kind: in - Side: Down Idx: 0 - Kind: in + Kind: inout - Side: Down Idx: 1 Kind: none + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 344 + Y: 16 + Width: 24 + Height: 32 + Values: + type: "touchswitch" + - ID: 74 + Name: jumpThru + Update: + Width: 16 - Room: "b-06" Holes: - Side: Right @@ -1371,15 +1387,22 @@ ASide: - Dashes: one Difficulty: hard - Dashes: two + - Dashes: zero + Difficulty: perfect ReqIn: Dashes: zero - Room: "d-02" Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: - Dashes: one + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect + ReqIn: + Dashes: zero - Side: Left Idx: 0 Kind: inout @@ -1389,6 +1412,15 @@ ASide: Add: true X: 304 Y: 128 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 288 + Y: 104 + Width: 32 + Height: 24 + Values: + type: "touchswitch" - Room: "d-03" Holes: - Side: Up @@ -2868,15 +2900,36 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: two - Side: Left Idx: 0 - Kind: in + Kind: inout - Side: Down Idx: 0 Kind: none + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 360 + Y: 32 + Width: 24 + Height: 32 + Values: + type: "button" + entID: 890 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 144 + Y: 96 + Width: 32 + Height: 32 + Values: + type: "button" + entID: 869 - Room: "f-08c" Holes: - Side: Left @@ -3271,7 +3324,12 @@ ASide: Dashes: one InternalEdges: - To: "left" - ReqBoth: + ReqOut: + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect + ReqIn: Dashes: one Subrooms: - Room: "left" @@ -3485,7 +3543,10 @@ BSide: Kind: out Launch: 19 ReqOut: - Dashes: two + Or: + - Dashes: two + - Dashes: one + Difficulty: perfect - Side: Left Idx: 1 Kind: inout @@ -3941,15 +4002,30 @@ BSide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout + - Side: Left + Idx: 0 + Kind: inout + InternalEdges: + - Split: LeftToRight ReqOut: Or: - Dashes: two - Dashes: one Difficulty: hard - - Side: Left - Idx: 0 - Kind: inout + ReqIn: + Dashes: two + Difficulty: expert + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 496 + Y: 56 + Width: 128 + Height: 96 + Values: + type: "touchswitch" - Room: "d-03" Holes: - Side: Up diff --git a/Randomizer/Config/Celeste/9-Core.rando.yaml b/Randomizer/Config/Celeste/9-Core.rando.yaml index 8edb1cea..3d45541e 100644 --- a/Randomizer/Config/Celeste/9-Core.rando.yaml +++ b/Randomizer/Config/Celeste/9-Core.rando.yaml @@ -294,7 +294,10 @@ ASide: InternalEdges: - To: Right ReqOut: - Dashes: one + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect ReqIn: Or: - Dashes: two @@ -336,7 +339,7 @@ ASide: persistent: "false" - Room: "b-05" Core: - All: cold + All: cold # TODO: HELP Holes: - Side: Down Idx: 0 @@ -349,6 +352,20 @@ ASide: - Side: Down Idx: 1 Kind: in + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 40 + Y: 168 + Width: 32 + Height: 16 + Values: + type: "touchswitch" + - ID: 145 + Name: jumpThru + Update: + Width: 16 - Room: "b-06" # TODO: Add fire/ice toggle in second version of room Core: All: none # this is more fun as the barely-possible collectable in none-mode @@ -1427,15 +1444,31 @@ BSide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Or: - Dashes: one Difficulty: hard - Dashes: two + ReqIn: + Or: + - Dashes: two + Difficulty: hard + - Dashes: one + Difficulty: expert - Side: Left Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 880 + Y: 24 + Width: 32 + Height: 32 + Values: + type: "touchswitch" - Room: "b-03" Core: All: cold diff --git a/Randomizer/Config/Celeste/LostLevels.rando.yaml b/Randomizer/Config/Celeste/LostLevels.rando.yaml index 1d398eb9..ea0b72b7 100644 --- a/Randomizer/Config/Celeste/LostLevels.rando.yaml +++ b/Randomizer/Config/Celeste/LostLevels.rando.yaml @@ -245,9 +245,11 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Dashes: one - Side: Left Idx: 0 Kind: inout @@ -257,6 +259,16 @@ ASide: - Side: Up Idx: 0 Kind: none + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 296 + Y: 48 + Width: 24 + Height: 24 + Values: + type: "touchswitch" - Room: "b-03" Holes: - Side: Right @@ -282,9 +294,11 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Dashes: zero - Side: Left Idx: 0 Kind: inout @@ -294,6 +308,16 @@ ASide: - Side: Up Idx: 0 Kind: none + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 288 + Y: 16 + Width: 32 + Height: 16 + Values: + type: "touchswitch" - Room: "b-05" Holes: - Side: Right @@ -345,10 +369,10 @@ ASide: Dashes: one ReqIn: Or: - - Dashes: two - Difficulty: expert - - Dashes: one - Flag: poweroff:set + - Dashes: two + Difficulty: expert + - Dashes: one + Difficulty: perfect - Room: "c-00" Holes: - Side: Left @@ -829,13 +853,52 @@ ASide: Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Dashes: zero - Side: Down Idx: 0 - Kind: in + Kind: inout Launch: -1 + Tweaks: + - Name: "spawn" + Update: + Add: true + X: 280 + Y: 16 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 272 + Y: 0 + Width: 16 + Height: 24 + Values: + type: "touchswitch" + - ID: 920 + Name: exitBlock + Update: + Remove: true + - ID: 614 + Name: jumpThru + Update: + Remove: true + - ID: 756 + Name: jumpThru + Update: + Remove: true + - Decal: bg + X: 136 + Y: 352 + Update: + Remove: true + - Decal: bg + X: 148 + Y: 352 + Update: + Remove: true - Room: "e-00b" Holes: - Side: Up @@ -923,16 +986,33 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Dashes: two + Difficulty: master - Side: Down Idx: 0 - Kind: in + Kind: inout Launch: -1 - Side: Down Idx: 1 Kind: None + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 720 + Y: 40 + Width: 24 + Height: 32 + Values: + type: "touchswitch" + - Name: "jumpThru" + ID: 780 + Update: + Remove: true - Room: "e-03" Holes: - Side: Right @@ -1006,15 +1086,27 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one + ReqIn: + Dashes: one - Side: Left Idx: 0 Kind: inout - Side: Up Idx: 1 Kind: None + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 320 + Y: 8 + Width: 72 + Height: 48 + Values: + type: "touchswitch" - Room: "e-05b" Holes: - Side: Right @@ -1075,6 +1167,19 @@ ASide: - Dashes: one - Dashes: zero Difficulty: expert + ReqIn: + Dashes: two + Difficulty: master + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 840 + Y: 64 + Width: 40 + Height: 32 + Values: + type: "touchswitch" - Room: "e-07" Holes: - Side: Right @@ -1377,16 +1482,33 @@ ASide: Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one Difficulty: hard + ReqIn: + Dashes: one - Side: Left Idx: 0 Kind: inout - Side: Down Idx: 0 Kind: None # TODO when we can edit the tilemap this can become an unknown hole + Tweaks: + - Name: "spawn" + Update: + Add: true + X: 184 + Y: 16 + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 176 + Y: 0 + Width: 16 + Height: 24 + Values: + type: "touchswitch" - Room: "g-00" Holes: - Side: Up @@ -1427,13 +1549,38 @@ ASide: Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one Difficulty: hard + ReqIn: + Dashes: zero - Side: Down Idx: 0 - Kind: in + Kind: inout + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 16 + Y: 0 + Width: 24 + Height: 24 + Values: + type: "touchswitch" + - ID: 145 + Name: jumpThru + Update: + Remove: true + - ID: 144 + Name: jumpThru + Update: + Remove: true + - Name: "spawn" + Update: + Add: true + X: 24 + Y: 24 - Room: "g-02" Holes: - Side: Up @@ -1750,12 +1897,30 @@ ASide: Holes: - Side: Up Idx: 0 - Kind: out + Kind: inout ReqOut: - Dashes: one + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect - Side: Down Idx: 0 - Kind: in + Kind: inout + Tweaks: + - ID: 1523 + Name: jumpThru + Update: + Remove: true + - Name: "spawn" + X: 40 + Y: 712 + Update: + X: 56 + - Name: "spawn" + Update: + Add: true + X: 216 + Y: 40 - Room: "h-07" Holes: - Side: Left @@ -2004,12 +2169,17 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: - Or: - - Dashes: one - - Dashes: zero - Difficulty: perfect + Or: + - Dashes: one + - Dashes: zero + Difficulty: perfect + ReqIn: + Or: + - Dashes: two + - Dashes: one + Difficulty: expert ExtraSpace: - X: 44264 Y: -8656 @@ -2024,6 +2194,16 @@ ASide: - Side: Up Idx: 0 Kind: None + Tweaks: + - Name: "randomizer/ActivateSwitches" + Update: + Add: true + X: 576 + Y: 88 + Width: 32 + Height: 40 + Values: + type: "touchswitch" - Room: "i-05" Holes: - Side: Right @@ -2406,13 +2586,19 @@ ASide: Holes: - Side: Right Idx: 0 - Kind: out + Kind: inout ReqOut: Dashes: one Difficulty: hard - Side: Left Idx: 0 - Kind: in + Kind: inout + ReqOut: + Or: + - Dashes: two + Difficulty: perfect + - Dashes: one + Difficulty: perfect - Side: Down Idx: 0 Kind: none