From 0dda564384ce2eb95876cf14dd3e91c0cd82772d Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Sun, 4 Apr 2021 15:20:41 +0200 Subject: [PATCH 1/6] Update sewer_and_fountain.logic --- sewer_and_fountain.logic | 114 +++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 11 deletions(-) diff --git a/sewer_and_fountain.logic b/sewer_and_fountain.logic index 8ee4ee4..48c38bd 100644 --- a/sewer_and_fountain.logic +++ b/sewer_and_fountain.logic @@ -1,12 +1,104 @@ area SewerAndFountain: - room FountainBigChest - room FountainEntrance - room FountainPacciHole - room FountainSmallChest - room FountainWaterfall - room SewerBigChest - room SewerCrossroads - room SewerDropIn - room SewerEast - room SewerEntrance - room SewerFrozenChest + room FountainBigChest: + node Main: + enemy Mulldozers + exit South + exit West + node PostFight: + chest Chest + entrance South + entrance West + Main -> PostFight: defeat Mulldozers + room FountainEntrance: + node Main: + door North + door South + door East + node HP: + chest HP + Main <-> HP: item Cape + room FountainPacciHole: + node Main: + door West + node North: + door North + North -> Main + Main -> North: item Cane + room FountainSmallChest: + node Main: + chest Chest + door Door + room FountainWaterfall: + node Main: + door South + node West: + door West + node East: + door East + East -> Main + Main <-> West: ( item Cape | item Flippers ) + room SewerBigChest: + node Main: + exit South + enemy Enemies + node Water: + chest WaterRupee + door SouthWater + node Chest: + chest Chest + Main <-> Chest: defeat Enemies + Main <-> Water: item Flippers + room SewerCrossroads: + node Main: + door North + door East + node Water: + exit WaterNorth + exit WaterEast + exit WaterWest + exit WaterSouth + Water <-> Main: item Flippers + Water <-> WaterEntrances: item Flippers + node WaterEntrances: + entrance WaterNorth + entrance WaterEast + entrance WaterWest + entrance WaterSouth + room SewerDropIn: + node Main: + door South + node Water: + door South + Main -> Water: item Flippers + room SewerEast: + node East: + door East + node West: + door West + East -> West: item GustJar + East <-> West: item Cape + East <-> Water: item Flippers + West -> Water: item Flippers + node Water: + exit WaterNorth + exit WaterWest + node WaterEntrances: + entrance WaterNorth + entrance WaterWest + room SewerEntrance: + node Water: + exit WaterNorth + exit WaterSouth + Water <-> WaterEntrances: item Flippers + node WaterEntrances: + entrance WaterNorth + entrance WaterSouth + room SewerFrozenChest: + node WaterEntry: + entrance Water + node WaterExit + exit Water + node MainChest: + chest Chest + WaterExit -> WaterEntry: item Flippers + WaterEntry -> MainChest: item Lantern From d606b0e8a5dfa40a76dfe780c2fca72eaa30d3ad Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Sun, 4 Apr 2021 15:22:15 +0200 Subject: [PATCH 2/6] Update sewer_and_fountain.logic --- sewer_and_fountain.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sewer_and_fountain.logic b/sewer_and_fountain.logic index 48c38bd..0ad9785 100644 --- a/sewer_and_fountain.logic +++ b/sewer_and_fountain.logic @@ -86,7 +86,7 @@ area SewerAndFountain: entrance WaterNorth entrance WaterWest room SewerEntrance: - node Water: + node Water: exit WaterNorth exit WaterSouth Water <-> WaterEntrances: item Flippers From b069055e06a88157b8611c95ef6d040520bc3aa8 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Sun, 4 Apr 2021 15:23:02 +0200 Subject: [PATCH 3/6] Update sewer_and_fountain.logic --- sewer_and_fountain.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sewer_and_fountain.logic b/sewer_and_fountain.logic index 0ad9785..18d288f 100644 --- a/sewer_and_fountain.logic +++ b/sewer_and_fountain.logic @@ -96,7 +96,7 @@ area SewerAndFountain: room SewerFrozenChest: node WaterEntry: entrance Water - node WaterExit + node WaterExit: exit Water node MainChest: chest Chest From 98294dd86dd76fcd5455bb637fb7f5aaf692c864 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Thu, 22 Apr 2021 12:52:55 +0200 Subject: [PATCH 4/6] Update sewer_and_fountain.logic Add missed enemies --- sewer_and_fountain.logic | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sewer_and_fountain.logic b/sewer_and_fountain.logic index 18d288f..b6c3dbb 100644 --- a/sewer_and_fountain.logic +++ b/sewer_and_fountain.logic @@ -14,12 +14,14 @@ area SewerAndFountain: door North door South door East + enemy Sluggulas node HP: chest HP Main <-> HP: item Cape room FountainPacciHole: node Main: door West + enemy Mulldozers node North: door North North -> Main @@ -52,6 +54,7 @@ area SewerAndFountain: node Main: door North door East + enemy Sluggulas node Water: exit WaterNorth exit WaterEast @@ -73,6 +76,7 @@ area SewerAndFountain: room SewerEast: node East: door East + enemy Sluggulas node West: door West East -> West: item GustJar From 18f1ede1617ef0d72abeb089e8afc8f04ad39c99 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sat, 1 May 2021 18:32:44 +0200 Subject: [PATCH 5/6] Update sewer_and_fountain.logic --- sewer_and_fountain.logic | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sewer_and_fountain.logic b/sewer_and_fountain.logic index b6c3dbb..f46aa5e 100644 --- a/sewer_and_fountain.logic +++ b/sewer_and_fountain.logic @@ -61,12 +61,12 @@ area SewerAndFountain: exit WaterWest exit WaterSouth Water <-> Main: item Flippers - Water <-> WaterEntrances: item Flippers node WaterEntrances: entrance WaterNorth entrance WaterEast entrance WaterWest entrance WaterSouth + Water <-> WaterEntrances: item Flippers room SewerDropIn: node Main: door South @@ -80,12 +80,12 @@ area SewerAndFountain: node West: door West East -> West: item GustJar - East <-> West: item Cape - East <-> Water: item Flippers - West -> Water: item Flippers + West -> East: item Cape node Water: exit WaterNorth exit WaterWest + East <-> Water: item Flippers + West -> Water: item Flippers node WaterEntrances: entrance WaterNorth entrance WaterWest @@ -93,10 +93,10 @@ area SewerAndFountain: node Water: exit WaterNorth exit WaterSouth - Water <-> WaterEntrances: item Flippers node WaterEntrances: entrance WaterNorth entrance WaterSouth + Water <-> WaterEntrances: item Flippers room SewerFrozenChest: node WaterEntry: entrance Water From ff904e6c0ce0740facce560b76cafc4241232159 Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 3 Nov 2024 17:02:46 +0100 Subject: [PATCH 6/6] Sewer and Fountain: Fixes Co-authored-By: Henny022 --- sewer_and_fountain.logic | 99 +++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/sewer_and_fountain.logic b/sewer_and_fountain.logic index f46aa5e..ccb95d4 100644 --- a/sewer_and_fountain.logic +++ b/sewer_and_fountain.logic @@ -1,15 +1,18 @@ area SewerAndFountain: room FountainBigChest: + node South: + door South + node West: + door West node Main: enemy Mulldozers - exit South - exit West - node PostFight: + node Chest: chest Chest - entrance South - entrance West - Main -> PostFight: defeat Mulldozers - room FountainEntrance: + Main -> Chest: defeat Mulldozers + Main <-> West: defeat Mulldozers + Main -> South: defeat Mulldozers + South -> Main + room FountainEntrance: # node Main: door North door South @@ -17,7 +20,14 @@ area SewerAndFountain: enemy Sluggulas node HP: chest HP + node Water: + target WaterNorth + node WaterEntrance: + warp WaterNorth Main <-> HP: item Cape + Water -> WaterEntrance: item Flippers + Main <-> Water: item Flippers + Water <-> HP: (item Flippers & (version NA | version JP)) room FountainPacciHole: node Main: door West @@ -29,7 +39,7 @@ area SewerAndFountain: room FountainSmallChest: node Main: chest Chest - door Door + door East room FountainWaterfall: node Main: door South @@ -37,71 +47,86 @@ area SewerAndFountain: door West node East: door East - East -> Main - Main <-> West: ( item Cape | item Flippers ) + node Water: + target WaterSouth + node WaterEntrance: + warp WaterSouth + East -> Main: defeat FountainBigChest.Mulldozers + Main <-> West: item Cape + Main -> Water: item Flippers + Water <-> West: item Flippers + Water -> WaterEntrance: item Flippers room SewerBigChest: node Main: - exit South + door South enemy Enemies node Water: chest WaterRupee - door SouthWater + warp SouthWater + node WaterEntrance + target SouthWater node Chest: chest Chest - Main <-> Chest: defeat Enemies - Main <-> Water: item Flippers + Main -> Chest: defeat Enemies + Main -> Water: item Flippers + WaterEntrance -> Water: item Flippers room SewerCrossroads: node Main: door North door East enemy Sluggulas node Water: - exit WaterNorth - exit WaterEast - exit WaterWest - exit WaterSouth + target WaterNorth + target WaterEast + target WaterWest + target WaterSouth Water <-> Main: item Flippers node WaterEntrances: - entrance WaterNorth - entrance WaterEast - entrance WaterWest - entrance WaterSouth + warp WaterNorth + warp WaterEast + warp WaterWest + warp WaterSouth Water <-> WaterEntrances: item Flippers room SewerDropIn: node Main: door South + target DropIn node Water: - door South + target WaterSouth + node WaterEntrance: + warp WaterSouth Main -> Water: item Flippers + Water -> WaterEntrance: item Flippers room SewerEast: node East: - door East + door North enemy Sluggulas node West: door West - East -> West: item GustJar - West -> East: item Cape + East -> West: (item GustJar | item Cape) + West -> East node Water: - exit WaterNorth - exit WaterWest + target WaterNorth + target WaterWest East <-> Water: item Flippers West -> Water: item Flippers node WaterEntrances: - entrance WaterNorth - entrance WaterWest + warp WaterNorth + warp WaterWest + Water -> WaterEntrances: item Flippers room SewerEntrance: node Water: - exit WaterNorth - exit WaterSouth + target WaterNorth + target WaterSouth node WaterEntrances: - entrance WaterNorth - entrance WaterSouth - Water <-> WaterEntrances: item Flippers + warp WaterNorth + warp WaterSouth + Water -> WaterEntrances: item Flippers room SewerFrozenChest: node WaterEntry: - entrance Water + warp Water node WaterExit: - exit Water + target Water node MainChest: chest Chest WaterExit -> WaterEntry: item Flippers