From 5c04a104838fc748343b870777fb036ba3f6e60a Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Wed, 31 Mar 2021 13:38:10 +0200 Subject: [PATCH 01/16] Add Eastern Hills --- hyrule_field.logic | 60 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 3be2315..81e9ea4 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -1,11 +1,63 @@ area HyruleField: - room EastHillsNorth - room EastHillsMid - room EastHillsSouth + room EastHillsNorth: + node West: + door West + ennemy WestAcroBandits + door South + node WestFusionChest: + chest WestFusionChest + node GoldenRopeFusion: + ennemy GoldenRope + node MainEast: + door FarmersHouse + door SouthEast + ennemy EastAcroBandits + ennemy octorocs + node WoodsFairyLedge: + door NorthEast + node FarmersDiggingCave: + door DiggingCave + West -> WestFusionChest : flag WestFusionChest + West -> GoldenRopeFusion: flag GoldenRopeFusion + West <-> East : item BombBag + East -> WoodsFairyLedge: item PacciCane + WoodsFairyLedge -> East + East -> FarmersDiggingCave: item MoleMitts + # If we use warps, you don't need mitts to exit the cave. + FarmersDiggingCave -> East + room EastHillsMid: + node Main: + door North + ennemy Peahats + ennemy SpinyBeetles + door SouthEast + door SouthWest + node Beanstalk: + door Beanstalk + node BombableCaveEntrance: + door CaveEntrance + Main <-> Beanstalk : flag Beanstalk + # You don't need to bomb the entrance to exit the cave, so one-way only ? unsure + Main -> BombableCaveEntrance : item BombBag + BombableCaveEntrance -> Main + room EastHillsSouth: + node NorthWest: + door NorthWest + node West + node MinishHouse: + door MinishHouse + node East: + door NorthEast + door SouthEast + ennemy SpinyBeetles + NorthWest <-> West : item BombBag + # Can be used to check for Ezlo + West <-> MinishHouse : flag CanTurnMinish + East <-> West room LonLon room North room South room Trillby room WestWoodsNorth room WestWoodsMid - room WestWoodsSouth \ No newline at end of file + room WestWoodsSouth From 9c2c35a499f043fde550b4dcd519d30b6db6cbed Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Wed, 31 Mar 2021 13:40:06 +0200 Subject: [PATCH 02/16] fix typo --- hyrule_field.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 81e9ea4..ba467cf 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -12,7 +12,7 @@ area HyruleField: door FarmersHouse door SouthEast ennemy EastAcroBandits - ennemy octorocs + ennemy Octorocs node WoodsFairyLedge: door NorthEast node FarmersDiggingCave: From a445fe0ac29582db184e797b755770a8b256379b Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Wed, 31 Mar 2021 18:47:29 +0200 Subject: [PATCH 03/16] Hills FeedBack + Add Lon Lon --- hyrule_field.logic | 106 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 12 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index ba467cf..d4a8877 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -2,24 +2,28 @@ area HyruleField: room EastHillsNorth: node West: door West - ennemy WestAcroBandits + enemy WestAcroBandits door South node WestFusionChest: chest WestFusionChest node GoldenRopeFusion: - ennemy GoldenRope + enemy GoldenRope node MainEast: door FarmersHouse door SouthEast - ennemy EastAcroBandits - ennemy Octorocs + enemy EastAcroBanditsAndOctorocs node WoodsFairyLedge: door NorthEast node FarmersDiggingCave: door DiggingCave + node BombableBlocks: + flag BombableBlocks + West -> WestFusionChest : flag WestFusionChest West -> GoldenRopeFusion: flag GoldenRopeFusion - West <-> East : item BombBag + West <-> East: flag BombableBlocks + West -> BombableBlocks: item BombBag + East -> BombableBlocks: item BombBag East -> WoodsFairyLedge: item PacciCane WoodsFairyLedge -> East East -> FarmersDiggingCave: item MoleMitts @@ -28,8 +32,7 @@ area HyruleField: room EastHillsMid: node Main: door North - ennemy Peahats - ennemy SpinyBeetles + enemy PeahatsAndSpinyBeetles door SouthEast door SouthWest node Beanstalk: @@ -48,13 +51,92 @@ area HyruleField: door MinishHouse node East: door NorthEast - door SouthEast - ennemy SpinyBeetles - NorthWest <-> West : item BombBag + door East + enemy SpinyBeetles + node BombableBlocks: + flag BombableBlocks + + NorthWest <-> West: flag BombableBlocks + NorthWest -> BombableBlocks: item BombBag + West -> BombableBlocks: item BombBag # Can be used to check for Ezlo - West <-> MinishHouse : flag CanTurnMinish + West <-> MinishHouse: flag CanTurnMinish East <-> West - room LonLon + room LonLon: + node VeilFallsEast: + door VeilFallsEast + node VeilFallsWest: + door VeilFallsWest + node VeiFallsFusionChest: + chest VeilFallsFusionChest + node West: + door NorthWest + enemy AcroBandits + enemy Octorocs + door South + node TownAccess: + door SouthWest + node LeftRanchDoor: + door LeftRanchDoor + node MinishLeftRanchDoor: + door MinishLeftRanchDoor + node GoronCave: + flag GoronCaveBoulder + door GoronCave + node SouthEast: + door SouthEast + flag SouthEastBoulder + node MiddleEast: + door MiddleEast + node Center: + door RightFarmDoor + door Cave + door NorthEast + flag NorthBoulder + enemy Octorocs + node MinishCenter: + door MinishPath + door MinishRightRanchDoor + node PondFusion: + door PondFusion + node NorthLedge + node MinishCrack: + door MinishCrack + node CenterLedge: + chest ObscureDiggingSpot + node NorthFreestanding: + chest Freestanding + node NorthDiggingCave: + door NorthDiggingCave + + VeilFallsEast -> VeilFallsFusionChest: flag VeilFallsFusionChest + West <-> TownAccess: item BombBag + West -> VeilFallsWest: item PacciCane + VeilFallsWest -> West + West -> LeftRanchDoor: item LonLonKey + LeftRanchDoor -> West + West <-> MinishLeftRanchDoor : flag CanTurnMinish + # Not checking if we have ezlo to get into the tornados bc it works without him + West -> GoronCave: (flag GoronCaveBoulder | item RocsCape) + GoronCave -> West + West -> SouthEast: (flag SouthEastBoulder | item RocsCape) + SouthEast -> West + SouthEast <-> GoronCave + Center -> West + West -> Center: (flag NorthBoulder) + Center -> MiddleEast: (item RocsCape | item Flippers) + MiddleEast -> Center: (item RocsCape) + Center -> MinishCenter: (item PegasusBoots | flag CanTurnMinish) + MinishCenter -> Center: (flag CanTurnMinish) + # Assume this entrance/exit won't be randomized if no fusions + Center <-> PondFusion: (flag PondFusion) + Center -> NorthLedge: (item RocsCape | item PacciCane ) + NorthLedge -> Center + NorthLedge -> MiddleEast + NorthLedge <-> MinishCrack: (flag CanTurnMinish) + NorthLedge -> CenterLedge: (flag ObscureSpots & item MoleMitts) + NorthFreestanding -> NorthDiggingCave: (item MoleMitts) + NorthDiggingCave -> NorthFreestanding room North room South room Trillby From f258751fbd9a4d2d762a7953a7eba3490b88b2a7 Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Wed, 31 Mar 2021 18:52:55 +0200 Subject: [PATCH 04/16] Only need one enemy --- hyrule_field.logic | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index d4a8877..d666c54 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -71,8 +71,7 @@ area HyruleField: chest VeilFallsFusionChest node West: door NorthWest - enemy AcroBandits - enemy Octorocs + enemy AcroBanditsAndOctorocs door South node TownAccess: door SouthWest From be8ac542239c14c583d28c4786214908f25d6ea1 Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Thu, 1 Apr 2021 21:00:40 +0200 Subject: [PATCH 05/16] Add North Hyrule Field + Fix No fusions Entrnando --- hyrule_field.logic | 85 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index d666c54..3e6c43d 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -127,8 +127,8 @@ area HyruleField: MiddleEast -> Center: (item RocsCape) Center -> MinishCenter: (item PegasusBoots | flag CanTurnMinish) MinishCenter -> Center: (flag CanTurnMinish) - # Assume this entrance/exit won't be randomized if no fusions - Center <-> PondFusion: (flag PondFusion) + Center -> PondFusion: (flag PondFusion) + PondFusion -> Center Center -> NorthLedge: (item RocsCape | item PacciCane ) NorthLedge -> Center NorthLedge -> MiddleEast @@ -136,7 +136,86 @@ area HyruleField: NorthLedge -> CenterLedge: (flag ObscureSpots & item MoleMitts) NorthFreestanding -> NorthDiggingCave: (item MoleMitts) NorthDiggingCave -> NorthFreestanding - room North + room North: + node Main: + door South + door North + enemy OctorcsAndCrows + node NWTingleTree: + door NWTingleTree + node NWTingleTree: + door NETingleTree + node SWTingleTree: + door SWTingleTree + node SETingleTree: + door SETingleTree + node CenterTingleTree: + door CenterTingleTree + node FairyFountain: + door FairyFountain + node RightBombableRocks: + flag RightBombableRocks + node NorthEast: + door NorthEast + node WaterFallEntrance: + door WaterFallEntrance + node SouthWest: + door SouthWest + enemy Keaton + node SouthCave: + door SouthCave + node LeftBombableBlocks: + flag LeftBombableBlocks + node NorthCave: + door NorthLadder + door MiddleCave + node NorthWestWater: + door NorthWestWater + node NorthWestGraveyard: + door NorthWestGraveyard + ennemy GraveyardOctorocs + node NorthWestChestFusion: + chest NorthWestChestFusion + node MinishCrackBoulder: + flag MinishCrackBoulder + node MinishCrack: + door MinishCrack + + Main -> NWTingleTree: flag NWTingleTree + NWTingleTree -> Main + Main -> NETingleTree: flag NETingleTree + NETingleTree -> Main + Main -> SWTingleTree: flag SWTingleTree + SWTingleTree -> Main + Main -> SETingleTree: flag SETingleTree + SETingleTree -> Main + Main -> CenterTingleTree: flag CenterTingleTree + CenterTingleTree -> Main + Main -> FairyFountain: flag FairyFountain + FairyFountain -> Main + Main -> RightBombableRocks: item BombBag + NorthEast -> RightBombableRocks: item BombBag + Main <-> NorthEast: flag RightBombableRocks + Main -> WaterFallEntrance: (flag WaterFallFusion | (item Flippers | item RocsCape )) + Main -> SouthWest: (item Flippers | item RocsCape) + # No flag for the bridge bc it resets in rando + SouthWest -> Main: (item Flippers | item RocsCape | (item PacciCane & item SmithSword)) + SouthWest -> WaterFallEntrance: (flag WaterFallFusion | (item Flippers | item RocsCape )) + WaterFallEntrance -> SouthWest: item Flippers + WaterFallEntrance -> SouthCave: item Flippers + # Possible with cape only, but a bit hard + SouthCave -> WaterFallEntrance: (item Flippers | item RocsCape) + Main -> LeftBombableBlocks: item BombBag + NorthCave -> LeftBombableBlocks: item BombBag + Main <-> NorthCave: (flag LeftBombableBlocks) + NorthCave <-> NorthWest: item Flippers + NorthWestGraveyard -> SouthWest + NorthWestGraveyard -> NorthWestChestFusion: (flag NorthWestChestFusion) + # With Entrando you could access the lever (and the bridge that way) + NorthWestGraveyard -> Main: item SmithSword + Main -> MinishCrackBoulder: (item SmithSword | item FlameLantern | item LightArrows | item BombBag | item GustJar) + # Need to have removed the boulder to exit the cave + Main <-> MinishCrack: (flag MinishCrackBoulder | flag CanTurnMinish) room South room Trillby room WestWoodsNorth From 586e61a362c43418d8bd7815b698058eda50d89f Mon Sep 17 00:00:00 2001 From: Guillaume RYCKAERT Date: Fri, 2 Apr 2021 13:02:42 +0200 Subject: [PATCH 06/16] Add missing obsure sport + South Hyrule Field --- hyrule_field.logic | 57 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 3e6c43d..f54dfc8 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -180,6 +180,8 @@ area HyruleField: flag MinishCrackBoulder node MinishCrack: door MinishCrack + node ObscureSpot: + chest ObscureDigRupee Main -> NWTingleTree: flag NWTingleTree NWTingleTree -> Main @@ -215,8 +217,61 @@ area HyruleField: NorthWestGraveyard -> Main: item SmithSword Main -> MinishCrackBoulder: (item SmithSword | item FlameLantern | item LightArrows | item BombBag | item GustJar) # Need to have removed the boulder to exit the cave - Main <-> MinishCrack: (flag MinishCrackBoulder | flag CanTurnMinish) + Main -> MinishCrack: (flag MinishCrackBoulder & flag CanTurnMinish & item PegasusBoots) + MinishCrack -> Main: (flag MinishCrackBoulder & flag CanTurnMinish) + Main -> ObscureSpot: (item MoleMitts & flag ObscureSpots ) + room South + node Main: + door North + enemy MainOctorocs + door LinksHouse + node WindTribeWarpFusion: + door WindTribeWarpFusion + node FairyFountain: + door FairyFountain + node NorthWest: + door West + enemy NorthWestOctorocs + node RupeePondFusion: + door RupeePondFusion + node East: + door East + enemy EastOctorocs + flag WindCrest + # Splitting this for vanilla fusions + node TingleLedge + node Tingle: + chest Tingle + node EastTreeFusion: + door EastTreeFusion + node EastChestFusion: + chest EastChestFusion + node SouthWest: + enemy SouthWestOctorocs + node SouthWestMinish: + door MinishHouse + node MinishWaterHole + door MinishWaterHole + + Main <-> WindTribeWarpFusion: flag WindTribeWarpFusion + Main -> FairyFountain: item BombBag + FairyFountain -> Main + Main <-> NorthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows | item Flippers | item RocsCape) + Main -> RupeePondFusion: (flag RupeePondFusion) + RupeePondFusion -> Main + Main <-> East: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) + East -> TingleLedge: item PacciCane + TingleLedge -> East + TingleLedge -> Tingle: item TingleTrophee + East -> EastTreeFusion: flag EastTreeFusion + EastTreeFusion -> East + East -> EastChestFusion: flag EastChestFusion + Main <-> SouthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) + SouthWest -> SouthWestMinish: (flag CanTurnMinish & item PegasusBoots) + SouthWestMinish -> SouthWest: flag CanTurnMinish + SouthWestMinish <-> MinishWaterHole: item Flippers + room Trillby room WestWoodsNorth room WestWoodsMid From f2ddcd52969dbf7c3186d2e08d690b5c2b759627 Mon Sep 17 00:00:00 2001 From: Guillaume RYCKAERT Date: Fri, 2 Apr 2021 13:15:12 +0200 Subject: [PATCH 07/16] Fix misisng : --- hyrule_field.logic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index f54dfc8..14b5bde 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -221,7 +221,7 @@ area HyruleField: MinishCrack -> Main: (flag MinishCrackBoulder & flag CanTurnMinish) Main -> ObscureSpot: (item MoleMitts & flag ObscureSpots ) - room South + room South: node Main: door North enemy MainOctorocs @@ -251,7 +251,7 @@ area HyruleField: enemy SouthWestOctorocs node SouthWestMinish: door MinishHouse - node MinishWaterHole + node MinishWaterHole: door MinishWaterHole Main <-> WindTribeWarpFusion: flag WindTribeWarpFusion From 9e04609204db4739c386bec8aae6b92b18699630 Mon Sep 17 00:00:00 2001 From: Guillaume RYCKAERT Date: Fri, 2 Apr 2021 13:37:30 +0200 Subject: [PATCH 08/16] Tilby --- hyrule_field.logic | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 14b5bde..de79bd7 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -272,7 +272,58 @@ area HyruleField: SouthWestMinish -> SouthWest: flag CanTurnMinish SouthWestMinish <-> MinishWaterHole: item Flippers - room Trillby + room Trilby: + node Top: + door SouthEast + ennemy OctorocsAndKeatons + door NorthEast + door West + door TopLadder + node NorthChestFusion: + chest NorthChestFusion + node MidChestFusion: + chest MidChestFusion + node LeftDiggingCave: + door LeftDiggingCave + node RightDiggingCave: + door RightDiggingCave + node KnuckleLedge: + door DiggingCaveLadder + node MinishKnuckleLedge: + door MinishHouse + node GraveyardLedge: + door North + node Bottom: + enemy BlueOctorocsMoblinsAndKeatons + door BottomLadder + door PercyTreeHouse + door South + flag BoulderShortCut + node RupeePondFusion + door RupeePondFusion + node BombableCave + door BombableCave + node FairyFountain + door FairyFountain + + + Top -> NorthChestFusion: flag NorthChestFusion + Top -> MidChestFusion: flag MidChestFusion + Top -> LeftDiggingCave: item MoleMitts + LeftDiggingCave -> Top + Top -> RightDiggingCave: (flag RightDiggingCaveFusion & item MoleMitts & (item Flippers | item RocsCape )) + RightDiggingCave -> Top ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) + KnuckleLedge <-> MinishKnuckleLedge: flag CanTurnMinish + KnuckleLedge -> Top: item Flippers + GraveyardLedge -> Top + Top <-> Bottom: flag BoulderShortCut + Bottom -> RupeePondFusion: flag RupeePondFusion + RupeePondFusion -> Bottom + Bottom -> BombableCave: item BombBag + BombableCave -> Bottom + Bottom -> FairyFountain: item BombBag + FairyFountain -> Bottom + room WestWoodsNorth room WestWoodsMid room WestWoodsSouth From 94576510c38a53f188df7e4014e82257e98dba34 Mon Sep 17 00:00:00 2001 From: Guillaume RYCKAERT Date: Fri, 2 Apr 2021 13:49:22 +0200 Subject: [PATCH 09/16] North Western Woods + Fixes --- hyrule_field.logic | 55 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index de79bd7..b7db29c 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -101,6 +101,7 @@ area HyruleField: node NorthLedge node MinishCrack: door MinishCrack + #Tag this as obsucre node CenterLedge: chest ObscureDiggingSpot node NorthFreestanding: @@ -133,7 +134,7 @@ area HyruleField: NorthLedge -> Center NorthLedge -> MiddleEast NorthLedge <-> MinishCrack: (flag CanTurnMinish) - NorthLedge -> CenterLedge: (flag ObscureSpots & item MoleMitts) + NorthLedge -> CenterLedge: item MoleMitts NorthFreestanding -> NorthDiggingCave: (item MoleMitts) NorthDiggingCave -> NorthFreestanding room North: @@ -180,6 +181,7 @@ area HyruleField: flag MinishCrackBoulder node MinishCrack: door MinishCrack + #Tag this as obsucre node ObscureSpot: chest ObscureDigRupee @@ -219,7 +221,7 @@ area HyruleField: # Need to have removed the boulder to exit the cave Main -> MinishCrack: (flag MinishCrackBoulder & flag CanTurnMinish & item PegasusBoots) MinishCrack -> Main: (flag MinishCrackBoulder & flag CanTurnMinish) - Main -> ObscureSpot: (item MoleMitts & flag ObscureSpots ) + Main -> ObscureSpot: item MoleMitts room South: node Main: @@ -298,25 +300,24 @@ area HyruleField: door BottomLadder door PercyTreeHouse door South - flag BoulderShortCut - node RupeePondFusion + flag BoulderShortcut + node RupeePondFusion: door RupeePondFusion - node BombableCave + node BombableCave: door BombableCave - node FairyFountain + node FairyFountain: door FairyFountain - Top -> NorthChestFusion: flag NorthChestFusion Top -> MidChestFusion: flag MidChestFusion Top -> LeftDiggingCave: item MoleMitts LeftDiggingCave -> Top Top -> RightDiggingCave: (flag RightDiggingCaveFusion & item MoleMitts & (item Flippers | item RocsCape )) - RightDiggingCave -> Top ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) + RightDiggingCave -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) KnuckleLedge <-> MinishKnuckleLedge: flag CanTurnMinish KnuckleLedge -> Top: item Flippers GraveyardLedge -> Top - Top <-> Bottom: flag BoulderShortCut + Top <-> Bottom: flag BoulderShortcut Bottom -> RupeePondFusion: flag RupeePondFusion RupeePondFusion -> Bottom Bottom -> BombableCave: item BombBag @@ -324,6 +325,40 @@ area HyruleField: Bottom -> FairyFountain: item BombBag FairyFountain -> Bottom - room WestWoodsNorth + room WestWoodsNorth: + node Main: + enemy CrowsBlueOctorocsKeatonsAndMoblins + door North + door West + door SouthWest + flag BoulderShortcut + node East: + door East + node MiddleChestFusion: + chest MiddleChestFusion + node WestTreeFusion: + door WestTreeFusion + node SouthWestTreeFusion: + door SouthWestFusion + node NorthWestTreeFusion + #Tag this as obsucre + node NorthWestObscure: + chest DigSpot1 + chest DigSpot2 + chest DigSpot3 + chest DigSpot4 + chest DigSpot5 + chest DigSpot6 + + Main <-> East: flag BoulderShortcut + Main -> MiddleChestFusion: flag MiddleChestFusion + Main -> WestTreeFusion: flag WestTreeFusion + WestTreeFusion -> Main + Main <-> SouthWestTreeFusion: flag SouthWestTreeFusion + Main <-> NorthWestTreeFusion: flag NorthWestTreeFusion + NorthWestTreeFusion -> NorthWestObscure: item MoleMitts + + + room WestWoodsMid room WestWoodsSouth From 9c3681347b33043cdc25bf073f06aa05e6280c3d Mon Sep 17 00:00:00 2001 From: Guillaume RYCKAERT Date: Fri, 2 Apr 2021 13:55:36 +0200 Subject: [PATCH 10/16] Forgot this was in North WW --- hyrule_field.logic | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index b7db29c..4b0aeb0 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -330,7 +330,7 @@ area HyruleField: enemy CrowsBlueOctorocsKeatonsAndMoblins door North door West - door SouthWest + door SouthMid flag BoulderShortcut node East: door East @@ -343,12 +343,19 @@ area HyruleField: node NorthWestTreeFusion #Tag this as obsucre node NorthWestObscure: - chest DigSpot1 - chest DigSpot2 - chest DigSpot3 - chest DigSpot4 - chest DigSpot5 - chest DigSpot6 + chest NorthWestDigSpot1 + chest NorthWestDigSpot2 + chest NorthWestDigSpot3 + chest NorthWestDigSpot4 + chest NorthWestDigSpot5 + chest NorthWestDigSpot6 + node SouthEast: + door SouthEast + node SouthEastTreeFusion + #Tag this as obsucre + node SouthEastObsucre: + chest SouthWestDigSpot1 + chest SouthWestDigSpot2 Main <-> East: flag BoulderShortcut Main -> MiddleChestFusion: flag MiddleChestFusion @@ -357,6 +364,8 @@ area HyruleField: Main <-> SouthWestTreeFusion: flag SouthWestTreeFusion Main <-> NorthWestTreeFusion: flag NorthWestTreeFusion NorthWestTreeFusion -> NorthWestObscure: item MoleMitts + SouthEast <-> SouthEastTreeFusion: flag SouthEastTreeFusion + SouthEastTreeFusion -> SouthEastObsucre: item MoleMitts From 980f32321e7a712c3b5d3d2a1134cb89318c9480 Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Mon, 12 Apr 2021 23:12:42 +0200 Subject: [PATCH 11/16] Decouple entrances + Add Zeffa --- hyrule_field.logic | 240 +++++++++++++++++++++++++++++---------------- 1 file changed, 156 insertions(+), 84 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 4b0aeb0..29860e2 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -1,9 +1,12 @@ area HyruleField: + room EastHillsNorth: + node West: door West enemy WestAcroBandits door South + exit Virtual.Zeffa.FluteAway node WestFusionChest: chest WestFusionChest node GoldenRopeFusion: @@ -12,14 +15,17 @@ area HyruleField: door FarmersHouse door SouthEast enemy EastAcroBanditsAndOctorocs + entrance DiggingCaveEntrance + exit Virtual.Zeffa.FluteAway node WoodsFairyLedge: door NorthEast + exit Virtual.Zeffa.FluteAway node FarmersDiggingCave: - door DiggingCave + exit DiggingCaveExit node BombableBlocks: flag BombableBlocks - West -> WestFusionChest : flag WestFusionChest + West -> WestFusionChest: flag WestFusionChest West -> GoldenRopeFusion: flag GoldenRopeFusion West <-> East: flag BombableBlocks West -> BombableBlocks: item BombBag @@ -27,32 +33,45 @@ area HyruleField: East -> WoodsFairyLedge: item PacciCane WoodsFairyLedge -> East East -> FarmersDiggingCave: item MoleMitts - # If we use warps, you don't need mitts to exit the cave. - FarmersDiggingCave -> East + + room EastHillsMid: + node Main: door North enemy PeahatsAndSpinyBeetles door SouthEast door SouthWest + exit Virtual.Zeffa.FluteAway + entrance CaveEntrance node Beanstalk: door Beanstalk - node BombableCaveEntrance: - door CaveEntrance - Main <-> Beanstalk : flag Beanstalk - # You don't need to bomb the entrance to exit the cave, so one-way only ? unsure - Main -> BombableCaveEntrance : item BombBag - BombableCaveEntrance -> Main + exit Virtual.Zeffa.FluteAway + node CaveExit: + exit CaveExit + node BombableCave: + flag BombableCave + + Main <-> Beanstalk: flag Beanstalk + Main -> BombableCave: item BombBag + Main -> CaveExit: flag BombableCave + + room EastHillsSouth: + node NorthWest: door NorthWest - node West + exit Virtual.Zeffa.FluteAway + node West: + exit Virtual.Zeffa.FluteAway node MinishHouse: door MinishHouse + exit Virtual.Zeffa.FluteAway node East: door NorthEast door East enemy SpinyBeetles + exit Virtual.Zeffa.FluteAway node BombableBlocks: flag BombableBlocks @@ -60,45 +79,63 @@ area HyruleField: NorthWest -> BombableBlocks: item BombBag West -> BombableBlocks: item BombBag # Can be used to check for Ezlo - West <-> MinishHouse: flag CanTurnMinish + West <-> MinishHouse: item CanTurnMinish East <-> West + + room LonLon: + node VeilFallsEast: door VeilFallsEast + exit Virtual.Zeffa.FluteAway node VeilFallsWest: door VeilFallsWest + exit Virtual.Zeffa.FluteAway node VeiFallsFusionChest: chest VeilFallsFusionChest node West: door NorthWest enemy AcroBanditsAndOctorocs door South + entrance LeftRanchDoorEntrance + exit Virtual.Zeffa.FluteAway node TownAccess: door SouthWest - node LeftRanchDoor: - door LeftRanchDoor + exit Virtual.Zeffa.FluteAway + node LeftRanchDoorExit: + exit LeftRanchDoorExit + exit Virtual.Zeffa.FluteAway + node OpenLeftRanchDoor: + flag OpenLeftRanchDoor node MinishLeftRanchDoor: door MinishLeftRanchDoor node GoronCave: flag GoronCaveBoulder door GoronCave + exit Virtual.Zeffa.FluteAway node SouthEast: door SouthEast flag SouthEastBoulder + exit Virtual.Zeffa.FluteAway node MiddleEast: door MiddleEast + exit Virtual.Zeffa.FluteAway node Center: door RightFarmDoor door Cave door NorthEast flag NorthBoulder enemy Octorocs + entrance PondFusionEntrance + exit Virtual.Zeffa.FluteAway node MinishCenter: door MinishPath door MinishRightRanchDoor - node PondFusion: - door PondFusion - node NorthLedge + node PondFusionExit: + exit PondFusionExit + exit Virtual.Zeffa.FluteAway + node NorthLedge: + exit Virtual.Zeffa.FluteAway node MinishCrack: door MinishCrack #Tag this as obsucre @@ -106,15 +143,18 @@ area HyruleField: chest ObscureDiggingSpot node NorthFreestanding: chest Freestanding - node NorthDiggingCave: - door NorthDiggingCave + entrance NorthDiggingCaveEntrance + exit Virtual.Zeffa.FluteAway + node NorthDiggingCaveExit: + exit NorthDiggingCaveExit + exit Virtual.Zeffa.FluteAway VeilFallsEast -> VeilFallsFusionChest: flag VeilFallsFusionChest West <-> TownAccess: item BombBag West -> VeilFallsWest: item PacciCane VeilFallsWest -> West - West -> LeftRanchDoor: item LonLonKey - LeftRanchDoor -> West + West -> OpenLeftRanchDoor: item LonLonKey + West -> LeftRanchDoorExit: flag OpenLeftRanchDoor West <-> MinishLeftRanchDoor : flag CanTurnMinish # Not checking if we have ezlo to get into the tornados bc it works without him West -> GoronCave: (flag GoronCaveBoulder | item RocsCape) @@ -128,52 +168,67 @@ area HyruleField: MiddleEast -> Center: (item RocsCape) Center -> MinishCenter: (item PegasusBoots | flag CanTurnMinish) MinishCenter -> Center: (flag CanTurnMinish) - Center -> PondFusion: (flag PondFusion) - PondFusion -> Center + Center -> PondFusionExit: (flag PondFusion) Center -> NorthLedge: (item RocsCape | item PacciCane ) NorthLedge -> Center NorthLedge -> MiddleEast NorthLedge <-> MinishCrack: (flag CanTurnMinish) NorthLedge -> CenterLedge: item MoleMitts - NorthFreestanding -> NorthDiggingCave: (item MoleMitts) - NorthDiggingCave -> NorthFreestanding + NorthFreestanding -> NorthDiggingCaveExit: (item MoleMitts) + + room North: + node Main: door South door North enemy OctorcsAndCrows - node NWTingleTree: - door NWTingleTree - node NWTingleTree: - door NETingleTree - node SWTingleTree: - door SWTingleTree - node SETingleTree: - door SETingleTree - node CenterTingleTree: - door CenterTingleTree - node FairyFountain: - door FairyFountain + entrance NWTingleTreeEntrance + entrance NETingleTreeEntrance + entrance SWTingleTreeEntrance + entrance SETingleTreeEntrance + entrance CenterTingleTreeEntrance + entrance FairyFountainEntrance + exit Virtual.Zeffa.FluteAway + node NWTingleTreeExit: + exit NWTingleTreeExit + node NETingleTreeExit: + exit NETingleTreeExit + node SWTingleTreeExit: + exit SWTingleTreeExit + node SETingleTreeExit: + exit SETingleTreeExit + node CenterTingleTreeExit: + exit CenterTingleTreeExit + node FairyFountainExit: + exit FairyFountainEntrance node RightBombableRocks: flag RightBombableRocks node NorthEast: door NorthEast + exit Virtual.Zeffa.FluteAway node WaterFallEntrance: door WaterFallEntrance + exit Virtual.Zeffa.FluteAway node SouthWest: door SouthWest enemy Keaton + exit Virtual.Zeffa.FluteAway node SouthCave: door SouthCave + exit Virtual.Zeffa.FluteAway node LeftBombableBlocks: flag LeftBombableBlocks node NorthCave: door NorthLadder door MiddleCave + exit Virtual.Zeffa.FluteAway node NorthWestWater: door NorthWestWater + exit Virtual.Zeffa.FluteAway node NorthWestGraveyard: door NorthWestGraveyard + exit Virtual.Zeffa.FluteAway ennemy GraveyardOctorocs node NorthWestChestFusion: chest NorthWestChestFusion @@ -185,18 +240,12 @@ area HyruleField: node ObscureSpot: chest ObscureDigRupee - Main -> NWTingleTree: flag NWTingleTree - NWTingleTree -> Main - Main -> NETingleTree: flag NETingleTree - NETingleTree -> Main - Main -> SWTingleTree: flag SWTingleTree - SWTingleTree -> Main - Main -> SETingleTree: flag SETingleTree - SETingleTree -> Main - Main -> CenterTingleTree: flag CenterTingleTree - CenterTingleTree -> Main - Main -> FairyFountain: flag FairyFountain - FairyFountain -> Main + Main -> NWTingleTreeExit: flag NWTingleTree + Main -> NETingleTreeExit: flag NETingleTree + Main -> SWTingleTreeExit: flag SWTingleTree + Main -> SETingleTreeExit: flag SETingleTree + Main -> CenterTingleTreeExit: flag CenterTingleTree + Main -> FairyFountainExit: flag FairyFountain Main -> RightBombableRocks: item BombBag NorthEast -> RightBombableRocks: item BombBag Main <-> NorthEast: flag RightBombableRocks @@ -223,72 +272,88 @@ area HyruleField: MinishCrack -> Main: (flag MinishCrackBoulder & flag CanTurnMinish) Main -> ObscureSpot: item MoleMitts + room South: + node Main: door North enemy MainOctorocs door LinksHouse + entrance FairyFountainEntrance + exit Virtual.Zeffa.FluteAway node WindTribeWarpFusion: door WindTribeWarpFusion - node FairyFountain: - door FairyFountain + node FairyFountainExit: + exit FairyFountainExit + node FairyFountainBombableWall: + flag FairyFountainBombableWall node NorthWest: door West enemy NorthWestOctorocs - node RupeePondFusion: - door RupeePondFusion + entrance RupeePondFusionEntrance + exit Virtual.Zeffa.FluteAway + node RupeePondFusionExit: + exit RupeePondFusionExit node East: door East enemy EastOctorocs - flag WindCrest + entrance EastTreeFusionEntrance + exit Virtual.Zeffa.FluteAway + entrance Crest + flag Virtual.Zeffa.SouthernHyruleFieldCrest # Splitting this for vanilla fusions - node TingleLedge + node TingleLedge: + exit Virtual.Zeffa.FluteAway node Tingle: chest Tingle - node EastTreeFusion: - door EastTreeFusion + node EastTreeFusionExit: + exit EastTreeFusionExit node EastChestFusion: chest EastChestFusion node SouthWest: enemy SouthWestOctorocs + exit Virtual.Zeffa.FluteAway node SouthWestMinish: door MinishHouse node MinishWaterHole: door MinishWaterHole Main <-> WindTribeWarpFusion: flag WindTribeWarpFusion - Main -> FairyFountain: item BombBag - FairyFountain -> Main + Main -> FairyFountainBombableWall: item BombBag + Main -> FairyFountainExit: flag FairyFountainBombableWall Main <-> NorthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows | item Flippers | item RocsCape) - Main -> RupeePondFusion: (flag RupeePondFusion) - RupeePondFusion -> Main + Main -> RupeePondFusionExit: (flag RupeePondFusion) Main <-> East: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) East -> TingleLedge: item PacciCane TingleLedge -> East TingleLedge -> Tingle: item TingleTrophee - East -> EastTreeFusion: flag EastTreeFusion - EastTreeFusion -> East + East -> EastTreeFusionExit: flag EastTreeFusion East -> EastChestFusion: flag EastChestFusion Main <-> SouthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) SouthWest -> SouthWestMinish: (flag CanTurnMinish & item PegasusBoots) SouthWestMinish -> SouthWest: flag CanTurnMinish SouthWestMinish <-> MinishWaterHole: item Flippers + room Trilby: + node Top: door SouthEast ennemy OctorocsAndKeatons door NorthEast door West door TopLadder + entrance LeftDiggingCaveEntrance node NorthChestFusion: chest NorthChestFusion node MidChestFusion: chest MidChestFusion - node LeftDiggingCave: - door LeftDiggingCave - node RightDiggingCave: - door RightDiggingCave + node LeftDiggingCaveExit: + exit LeftDiggingCaveExit + node RightDiggingCaveFusion: + entrance RightDiggingCaveEntrance + node RightDiggingCaveExit: + exit RightDiggingCaveExit node KnuckleLedge: door DiggingCaveLadder node MinishKnuckleLedge: @@ -301,31 +366,39 @@ area HyruleField: door PercyTreeHouse door South flag BoulderShortcut - node RupeePondFusion: - door RupeePondFusion - node BombableCave: - door BombableCave - node FairyFountain: - door FairyFountain + entrance RupeePondFusionEntrance + entrance BombableCaveEntrance + entrance FairyFountainEntrance + node RupeePondFusionExit: + exit RupeePondFusionExit + node BombableCaveExit: + exit BombableCaveExit + node BombableCaveWall: + flag BombableCaveWall + node FairyFountainExit: + exit FairyFountainExit + node FairyFountainWall: + flag FairyFountainWall Top -> NorthChestFusion: flag NorthChestFusion Top -> MidChestFusion: flag MidChestFusion - Top -> LeftDiggingCave: item MoleMitts - LeftDiggingCave -> Top - Top -> RightDiggingCave: (flag RightDiggingCaveFusion & item MoleMitts & (item Flippers | item RocsCape )) - RightDiggingCave -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) + Top -> LeftDiggingCaveExit: item MoleMitts + Top -> RightDiggingCaveFusion: (item Flippers | item RocsCape ) + RightDiggingCaveFusion -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) + RightDiggingCaveFusion -> RightDiggingCaveExit: (item MoleMitts & flag RightDiggingCaveFusion) KnuckleLedge <-> MinishKnuckleLedge: flag CanTurnMinish KnuckleLedge -> Top: item Flippers GraveyardLedge -> Top Top <-> Bottom: flag BoulderShortcut - Bottom -> RupeePondFusion: flag RupeePondFusion - RupeePondFusion -> Bottom - Bottom -> BombableCave: item BombBag - BombableCave -> Bottom - Bottom -> FairyFountain: item BombBag - FairyFountain -> Bottom + Bottom -> RupeePondFusionExit: flag RupeePondFusion + Bottom -> BombableCaveWall: item BombBag + Bottom -> BombableCaveExit: flag BombableCaveWall + Bottom -> FairyFountainWall: item BombBag + Bottom -> FairyFountainExit: flag FairyFountainWall + room WestWoodsNorth: + node Main: enemy CrowsBlueOctorocsKeatonsAndMoblins door North @@ -368,6 +441,5 @@ area HyruleField: SouthEastTreeFusion -> SouthEastObsucre: item MoleMitts - room WestWoodsMid room WestWoodsSouth From 5e220033970d636880f4611a0bb6a59864235fa5 Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Mon, 12 Apr 2021 23:43:26 +0200 Subject: [PATCH 12/16] Decouple Minish Chceks + Remaining Western Woods rooms + some more Zeffa --- hyrule_field.logic | 76 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 59 insertions(+), 17 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 29860e2..b8a7df6 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -79,7 +79,8 @@ area HyruleField: NorthWest -> BombableBlocks: item BombBag West -> BombableBlocks: item BombBag # Can be used to check for Ezlo - West <-> MinishHouse: item CanTurnMinish + West -> MinishHouse: item CanTurnMinish + MinishHouse -> West: item CanGrow East <-> West @@ -155,7 +156,8 @@ area HyruleField: VeilFallsWest -> West West -> OpenLeftRanchDoor: item LonLonKey West -> LeftRanchDoorExit: flag OpenLeftRanchDoor - West <-> MinishLeftRanchDoor : flag CanTurnMinish + West -> MinishLeftRanchDoor: item CanTurnMinish + MinishLeftRanchDoor -> West: item CanGrow # Not checking if we have ezlo to get into the tornados bc it works without him West -> GoronCave: (flag GoronCaveBoulder | item RocsCape) GoronCave -> West @@ -166,15 +168,16 @@ area HyruleField: West -> Center: (flag NorthBoulder) Center -> MiddleEast: (item RocsCape | item Flippers) MiddleEast -> Center: (item RocsCape) - Center -> MinishCenter: (item PegasusBoots | flag CanTurnMinish) - MinishCenter -> Center: (flag CanTurnMinish) + Center -> MinishCenter: (item PegasusBoots | item CanTurnMinish) + MinishCenter -> Center: (item CanGrow) Center -> PondFusionExit: (flag PondFusion) Center -> NorthLedge: (item RocsCape | item PacciCane ) NorthLedge -> Center NorthLedge -> MiddleEast - NorthLedge <-> MinishCrack: (flag CanTurnMinish) + NorthLedge -> MinishCrack: item CanTurnMinish + MinishCrack -> NorthLedge: item CanGrow NorthLedge -> CenterLedge: item MoleMitts - NorthFreestanding -> NorthDiggingCaveExit: (item MoleMitts) + NorthFreestanding -> NorthDiggingCaveExit: item MoleMitts room North: @@ -268,8 +271,8 @@ area HyruleField: NorthWestGraveyard -> Main: item SmithSword Main -> MinishCrackBoulder: (item SmithSword | item FlameLantern | item LightArrows | item BombBag | item GustJar) # Need to have removed the boulder to exit the cave - Main -> MinishCrack: (flag MinishCrackBoulder & flag CanTurnMinish & item PegasusBoots) - MinishCrack -> Main: (flag MinishCrackBoulder & flag CanTurnMinish) + Main -> MinishCrack: (flag MinishCrackBoulder & item CanTurnMinish & item PegasusBoots) + MinishCrack -> Main: (flag MinishCrackBoulder & item CanGrow) Main -> ObscureSpot: item MoleMitts @@ -330,8 +333,8 @@ area HyruleField: East -> EastTreeFusionExit: flag EastTreeFusion East -> EastChestFusion: flag EastChestFusion Main <-> SouthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) - SouthWest -> SouthWestMinish: (flag CanTurnMinish & item PegasusBoots) - SouthWestMinish -> SouthWest: flag CanTurnMinish + SouthWest -> SouthWestMinish: (item CanTurnMinish & item PegasusBoots) + SouthWestMinish -> SouthWest: item CanGrow SouthWestMinish <-> MinishWaterHole: item Flippers @@ -344,6 +347,7 @@ area HyruleField: door West door TopLadder entrance LeftDiggingCaveEntrance + exit Virtual.Zeffa.FluteAway node NorthChestFusion: chest NorthChestFusion node MidChestFusion: @@ -356,10 +360,12 @@ area HyruleField: exit RightDiggingCaveExit node KnuckleLedge: door DiggingCaveLadder + exit Virtual.Zeffa.FluteAway node MinishKnuckleLedge: door MinishHouse node GraveyardLedge: door North + exit Virtual.Zeffa.FluteAway node Bottom: enemy BlueOctorocsMoblinsAndKeatons door BottomLadder @@ -369,6 +375,7 @@ area HyruleField: entrance RupeePondFusionEntrance entrance BombableCaveEntrance entrance FairyFountainEntrance + exit Virtual.Zeffa.FluteAway node RupeePondFusionExit: exit RupeePondFusionExit node BombableCaveExit: @@ -386,7 +393,8 @@ area HyruleField: Top -> RightDiggingCaveFusion: (item Flippers | item RocsCape ) RightDiggingCaveFusion -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) RightDiggingCaveFusion -> RightDiggingCaveExit: (item MoleMitts & flag RightDiggingCaveFusion) - KnuckleLedge <-> MinishKnuckleLedge: flag CanTurnMinish + KnuckleLedge -> MinishKnuckleLedge: item CanTurnMinish + MinishKnuckleLedge -> KnuckleLedge: item CanGrow KnuckleLedge -> Top: item Flippers GraveyardLedge -> Top Top <-> Bottom: flag BoulderShortcut @@ -405,12 +413,15 @@ area HyruleField: door West door SouthMid flag BoulderShortcut + entrance WestTreeFusionEntrance + exit Virtual.Zeffa.FluteAway node East: door East + exit Virtual.Zeffa.FluteAway node MiddleChestFusion: chest MiddleChestFusion - node WestTreeFusion: - door WestTreeFusion + node WestTreeFusionExit: + exit WestTreeFusionExit node SouthWestTreeFusion: door SouthWestFusion node NorthWestTreeFusion @@ -424,6 +435,7 @@ area HyruleField: chest NorthWestDigSpot6 node SouthEast: door SouthEast + exit Virtual.Zeffa.FluteAway node SouthEastTreeFusion #Tag this as obsucre node SouthEastObsucre: @@ -432,8 +444,7 @@ area HyruleField: Main <-> East: flag BoulderShortcut Main -> MiddleChestFusion: flag MiddleChestFusion - Main -> WestTreeFusion: flag WestTreeFusion - WestTreeFusion -> Main + Main -> WestTreeFusionExit: flag WestTreeFusion Main <-> SouthWestTreeFusion: flag SouthWestTreeFusion Main <-> NorthWestTreeFusion: flag NorthWestTreeFusion NorthWestTreeFusion -> NorthWestObscure: item MoleMitts @@ -441,5 +452,36 @@ area HyruleField: SouthEastTreeFusion -> SouthEastObsucre: item MoleMitts - room WestWoodsMid - room WestWoodsSouth + room WestWoodsMid: + node West: + door NorthWest + door PercyHouse + exit Virtual.Zeffa.FluteAway + node East: + door NorthMiddle + door NortEast + enemy Moblins + door SouthMiddle + door SouthEast + exit Virtual.Zeffa.FluteAway + node GoldenOctorocFusion: + enemy GoldenOcotorocFusion + + East -> GoldenOcotorocFusion: flag GoldenOctorocFusion + + + room WestWoodsSouth: + + node Main: + door NorthMiddle + door NorthEast + enemy Moblins + exit Virtual.Zeffa.FluteAway + node Beanstalk: + door Beanstalk + node MinishMain: + door MinishHouse + + Main <-> Beanstalk: flag Beanstalk + Main -> MinishMain: item CanTurnMinish + MinishMain -> Main: item CanGrow From e2e2400f9e29dcb76cc75ff2f9f4ac1159d156ea Mon Sep 17 00:00:00 2001 From: "ryckaert.guillaume@neuf.fr" Date: Thu, 29 Apr 2021 21:00:15 +0200 Subject: [PATCH 13/16] Fix syntax and spacing with shuffler --- hyrule_field.logic | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index b8a7df6..23bcd5b 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -1,7 +1,5 @@ area HyruleField: - room EastHillsNorth: - node West: door West enemy WestAcroBandits @@ -11,7 +9,7 @@ area HyruleField: chest WestFusionChest node GoldenRopeFusion: enemy GoldenRope - node MainEast: + node East: door FarmersHouse door SouthEast enemy EastAcroBanditsAndOctorocs @@ -92,7 +90,7 @@ area HyruleField: node VeilFallsWest: door VeilFallsWest exit Virtual.Zeffa.FluteAway - node VeiFallsFusionChest: + node VeilFallsFusionChest: chest VeilFallsFusionChest node West: door NorthWest @@ -264,7 +262,7 @@ area HyruleField: Main -> LeftBombableBlocks: item BombBag NorthCave -> LeftBombableBlocks: item BombBag Main <-> NorthCave: (flag LeftBombableBlocks) - NorthCave <-> NorthWest: item Flippers + NorthCave <-> NorthEast: item Flippers NorthWestGraveyard -> SouthWest NorthWestGraveyard -> NorthWestChestFusion: (flag NorthWestChestFusion) # With Entrando you could access the lever (and the bridge that way) @@ -339,7 +337,6 @@ area HyruleField: room Trilby: - node Top: door SouthEast ennemy OctorocsAndKeatons @@ -386,23 +383,22 @@ area HyruleField: exit FairyFountainExit node FairyFountainWall: flag FairyFountainWall - - Top -> NorthChestFusion: flag NorthChestFusion - Top -> MidChestFusion: flag MidChestFusion - Top -> LeftDiggingCaveExit: item MoleMitts - Top -> RightDiggingCaveFusion: (item Flippers | item RocsCape ) - RightDiggingCaveFusion -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) - RightDiggingCaveFusion -> RightDiggingCaveExit: (item MoleMitts & flag RightDiggingCaveFusion) - KnuckleLedge -> MinishKnuckleLedge: item CanTurnMinish - MinishKnuckleLedge -> KnuckleLedge: item CanGrow - KnuckleLedge -> Top: item Flippers - GraveyardLedge -> Top - Top <-> Bottom: flag BoulderShortcut - Bottom -> RupeePondFusionExit: flag RupeePondFusion - Bottom -> BombableCaveWall: item BombBag - Bottom -> BombableCaveExit: flag BombableCaveWall - Bottom -> FairyFountainWall: item BombBag - Bottom -> FairyFountainExit: flag FairyFountainWall + Top -> NorthChestFusion: flag NorthChestFusion + Top -> MidChestFusion: flag MidChestFusion + Top -> LeftDiggingCaveExit: item MoleMitts + Top -> RightDiggingCaveFusion: (item Flippers | item RocsCape ) + RightDiggingCaveFusion -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) + RightDiggingCaveFusion -> RightDiggingCaveExit: (item MoleMitts & flag RightDiggingCaveFusion) + KnuckleLedge -> MinishKnuckleLedge: item CanTurnMinish + MinishKnuckleLedge -> KnuckleLedge: item CanGrow + KnuckleLedge -> Top: item Flippers + GraveyardLedge -> Top + Top <-> Bottom: flag BoulderShortcut + Bottom -> RupeePondFusionExit: flag RupeePondFusion + Bottom -> BombableCaveWall: item BombBag + Bottom -> BombableCaveExit: flag BombableCaveWall + Bottom -> FairyFountainWall: item BombBag + Bottom -> FairyFountainExit: flag FairyFountainWall room WestWoodsNorth: @@ -464,7 +460,7 @@ area HyruleField: door SouthMiddle door SouthEast exit Virtual.Zeffa.FluteAway - node GoldenOctorocFusion: + node GoldenOcotorocFusion: enemy GoldenOcotorocFusion East -> GoldenOcotorocFusion: flag GoldenOctorocFusion From 83bc8aa3c5150a26bef84e9a7e71a78fcefe0d6b Mon Sep 17 00:00:00 2001 From: Rylux Date: Fri, 14 May 2021 15:48:38 +0200 Subject: [PATCH 14/16] Fix LonLon --- hyrule_field.logic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 23bcd5b..5229bc7 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -161,7 +161,7 @@ area HyruleField: GoronCave -> West West -> SouthEast: (flag SouthEastBoulder | item RocsCape) SouthEast -> West - SouthEast <-> GoronCave + SouthEast -> GoronCave Center -> West West -> Center: (flag NorthBoulder) Center -> MiddleEast: (item RocsCape | item Flippers) @@ -176,6 +176,7 @@ area HyruleField: MinishCrack -> NorthLedge: item CanGrow NorthLedge -> CenterLedge: item MoleMitts NorthFreestanding -> NorthDiggingCaveExit: item MoleMitts + CenterLedge -> Center room North: From 79bd2ace0d0f385a22c15f5839ff0b83e4ea2c3d Mon Sep 17 00:00:00 2001 From: Rylux Date: Fri, 23 Jul 2021 18:53:40 +0200 Subject: [PATCH 15/16] Swap Entrances/Exits --- hyrule_field.logic | 247 +++++++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 123 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index 23bcd5b..d48dd05 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -4,7 +4,7 @@ area HyruleField: door West enemy WestAcroBandits door South - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node WestFusionChest: chest WestFusionChest node GoldenRopeFusion: @@ -13,13 +13,13 @@ area HyruleField: door FarmersHouse door SouthEast enemy EastAcroBanditsAndOctorocs - entrance DiggingCaveEntrance - exit Virtual.Zeffa.FluteAway + exit DiggingCaveExit + entrance Virtual.Zeffa.FluteAway node WoodsFairyLedge: door NorthEast - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node FarmersDiggingCave: - exit DiggingCaveExit + entrance DiggingCaveEntrance node BombableBlocks: flag BombableBlocks @@ -40,36 +40,36 @@ area HyruleField: enemy PeahatsAndSpinyBeetles door SouthEast door SouthWest - exit Virtual.Zeffa.FluteAway - entrance CaveEntrance + entrance Virtual.Zeffa.FluteAway + exit CaveExit node Beanstalk: door Beanstalk - exit Virtual.Zeffa.FluteAway - node CaveExit: - exit CaveExit + entrance Virtual.Zeffa.FluteAway + node CaveEntrance: + entrance CaveEntrance node BombableCave: flag BombableCave Main <-> Beanstalk: flag Beanstalk Main -> BombableCave: item BombBag - Main -> CaveExit: flag BombableCave + Main -> CaveEntrance: flag BombableCave room EastHillsSouth: node NorthWest: door NorthWest - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node West: - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node MinishHouse: door MinishHouse - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node East: door NorthEast door East enemy SpinyBeetles - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node BombableBlocks: flag BombableBlocks @@ -86,24 +86,24 @@ area HyruleField: node VeilFallsEast: door VeilFallsEast - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node VeilFallsWest: door VeilFallsWest - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node VeilFallsFusionChest: chest VeilFallsFusionChest node West: door NorthWest enemy AcroBanditsAndOctorocs door South - entrance LeftRanchDoorEntrance - exit Virtual.Zeffa.FluteAway + exit LeftRanchDoorExit + entrance Virtual.Zeffa.FluteAway node TownAccess: door SouthWest - exit Virtual.Zeffa.FluteAway - node LeftRanchDoorExit: - exit LeftRanchDoorExit - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway + node LeftRanchDoorEntrance: + entrance LeftRanchDoorEntrance + entrance Virtual.Zeffa.FluteAway node OpenLeftRanchDoor: flag OpenLeftRanchDoor node MinishLeftRanchDoor: @@ -111,30 +111,30 @@ area HyruleField: node GoronCave: flag GoronCaveBoulder door GoronCave - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node SouthEast: door SouthEast flag SouthEastBoulder - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node MiddleEast: door MiddleEast - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node Center: door RightFarmDoor door Cave door NorthEast flag NorthBoulder enemy Octorocs - entrance PondFusionEntrance - exit Virtual.Zeffa.FluteAway + exit PondFusionExit + entrance Virtual.Zeffa.FluteAway node MinishCenter: door MinishPath door MinishRightRanchDoor - node PondFusionExit: - exit PondFusionExit - exit Virtual.Zeffa.FluteAway + node PondFusionEntrance: + entrance PondFusionEntrance + entrance Virtual.Zeffa.FluteAway node NorthLedge: - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node MinishCrack: door MinishCrack #Tag this as obsucre @@ -142,18 +142,18 @@ area HyruleField: chest ObscureDiggingSpot node NorthFreestanding: chest Freestanding - entrance NorthDiggingCaveEntrance - exit Virtual.Zeffa.FluteAway - node NorthDiggingCaveExit: exit NorthDiggingCaveExit - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway + node NorthDiggingCaveEntrance: + entrance NorthDiggingCaveEntrance + entrance Virtual.Zeffa.FluteAway VeilFallsEast -> VeilFallsFusionChest: flag VeilFallsFusionChest West <-> TownAccess: item BombBag West -> VeilFallsWest: item PacciCane VeilFallsWest -> West West -> OpenLeftRanchDoor: item LonLonKey - West -> LeftRanchDoorExit: flag OpenLeftRanchDoor + West -> LeftRanchDoorEntrance: flag OpenLeftRanchDoor West -> MinishLeftRanchDoor: item CanTurnMinish MinishLeftRanchDoor -> West: item CanGrow # Not checking if we have ezlo to get into the tornados bc it works without him @@ -161,21 +161,22 @@ area HyruleField: GoronCave -> West West -> SouthEast: (flag SouthEastBoulder | item RocsCape) SouthEast -> West - SouthEast <-> GoronCave + SouthEast -> GoronCave Center -> West West -> Center: (flag NorthBoulder) Center -> MiddleEast: (item RocsCape | item Flippers) MiddleEast -> Center: (item RocsCape) Center -> MinishCenter: (item PegasusBoots | item CanTurnMinish) MinishCenter -> Center: (item CanGrow) - Center -> PondFusionExit: (flag PondFusion) + Center -> PondFusionEntrance: (flag PondFusion) Center -> NorthLedge: (item RocsCape | item PacciCane ) NorthLedge -> Center NorthLedge -> MiddleEast NorthLedge -> MinishCrack: item CanTurnMinish MinishCrack -> NorthLedge: item CanGrow NorthLedge -> CenterLedge: item MoleMitts - NorthFreestanding -> NorthDiggingCaveExit: item MoleMitts + NorthFreestanding -> NorthDiggingCaveEntrance: item MoleMitts + CenterLedge -> Center room North: @@ -184,52 +185,52 @@ area HyruleField: door South door North enemy OctorcsAndCrows - entrance NWTingleTreeEntrance - entrance NETingleTreeEntrance - entrance SWTingleTreeEntrance - entrance SETingleTreeEntrance - entrance CenterTingleTreeEntrance - entrance FairyFountainEntrance - exit Virtual.Zeffa.FluteAway - node NWTingleTreeExit: exit NWTingleTreeExit - node NETingleTreeExit: exit NETingleTreeExit - node SWTingleTreeExit: exit SWTingleTreeExit - node SETingleTreeExit: exit SETingleTreeExit - node CenterTingleTreeExit: exit CenterTingleTreeExit - node FairyFountainExit: - exit FairyFountainEntrance + exit FairyFountainExit + entrance Virtual.Zeffa.FluteAway + node NWTingleTreeEntrance: + entrance NWTingleTreeEntrance + node NETingleTreeEntrance: + entrance NETingleTreeEntrance + node SWTingleTreeEntrance: + entrance SWTingleTreeEntrance + node SETingleTreeEntrance: + entrance SETingleTreeEntrance + node CenterTingleTreeEntrance: + entrance CenterTingleTreeEntrance + node FairyFountainEntrance: + entrance FairyFountainExit node RightBombableRocks: flag RightBombableRocks node NorthEast: door NorthEast - exit Virtual.Zeffa.FluteAway - node WaterFallEntrance: - door WaterFallEntrance - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway + node WaterFallExit: + door WaterFallExit + entrance Virtual.Zeffa.FluteAway node SouthWest: door SouthWest enemy Keaton - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node SouthCave: door SouthCave - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node LeftBombableBlocks: flag LeftBombableBlocks node NorthCave: door NorthLadder door MiddleCave - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node NorthWestWater: door NorthWestWater - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node NorthWestGraveyard: door NorthWestGraveyard - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway ennemy GraveyardOctorocs node NorthWestChestFusion: chest NorthWestChestFusion @@ -241,24 +242,24 @@ area HyruleField: node ObscureSpot: chest ObscureDigRupee - Main -> NWTingleTreeExit: flag NWTingleTree - Main -> NETingleTreeExit: flag NETingleTree - Main -> SWTingleTreeExit: flag SWTingleTree - Main -> SETingleTreeExit: flag SETingleTree - Main -> CenterTingleTreeExit: flag CenterTingleTree - Main -> FairyFountainExit: flag FairyFountain + Main -> NWTingleTreeEntrance: flag NWTingleTree + Main -> NETingleTreeEntrance: flag NETingleTree + Main -> SWTingleTreeEntrance: flag SWTingleTree + Main -> SETingleTreeEntrance: flag SETingleTree + Main -> CenterTingleTreeEntrance: flag CenterTingleTree + Main -> FairyFountainEntrance: flag FairyFountain Main -> RightBombableRocks: item BombBag NorthEast -> RightBombableRocks: item BombBag Main <-> NorthEast: flag RightBombableRocks - Main -> WaterFallEntrance: (flag WaterFallFusion | (item Flippers | item RocsCape )) + Main -> WaterFallExit: (flag WaterFallFusion | (item Flippers | item RocsCape )) Main -> SouthWest: (item Flippers | item RocsCape) # No flag for the bridge bc it resets in rando SouthWest -> Main: (item Flippers | item RocsCape | (item PacciCane & item SmithSword)) - SouthWest -> WaterFallEntrance: (flag WaterFallFusion | (item Flippers | item RocsCape )) - WaterFallEntrance -> SouthWest: item Flippers - WaterFallEntrance -> SouthCave: item Flippers + SouthWest -> WaterFallExit: (flag WaterFallFusion | (item Flippers | item RocsCape )) + WaterFallExit -> SouthWest: item Flippers + WaterFallExit -> SouthCave: item Flippers # Possible with cape only, but a bit hard - SouthCave -> WaterFallEntrance: (item Flippers | item RocsCape) + SouthCave -> WaterFallExit: (item Flippers | item RocsCape) Main -> LeftBombableBlocks: item BombBag NorthCave -> LeftBombableBlocks: item BombBag Main <-> NorthCave: (flag LeftBombableBlocks) @@ -268,7 +269,7 @@ area HyruleField: # With Entrando you could access the lever (and the bridge that way) NorthWestGraveyard -> Main: item SmithSword Main -> MinishCrackBoulder: (item SmithSword | item FlameLantern | item LightArrows | item BombBag | item GustJar) - # Need to have removed the boulder to exit the cave + # Need to have removed the boulder to entrance the cave Main -> MinishCrack: (flag MinishCrackBoulder & item CanTurnMinish & item PegasusBoots) MinishCrack -> Main: (flag MinishCrackBoulder & item CanGrow) Main -> ObscureSpot: item MoleMitts @@ -280,40 +281,40 @@ area HyruleField: door North enemy MainOctorocs door LinksHouse - entrance FairyFountainEntrance - exit Virtual.Zeffa.FluteAway + exit FairyFountainExit + entrance Virtual.Zeffa.FluteAway node WindTribeWarpFusion: door WindTribeWarpFusion - node FairyFountainExit: - exit FairyFountainExit + node FairyFountainEntrance: + entrance FairyFountainEntrance node FairyFountainBombableWall: flag FairyFountainBombableWall node NorthWest: door West enemy NorthWestOctorocs - entrance RupeePondFusionEntrance - exit Virtual.Zeffa.FluteAway - node RupeePondFusionExit: exit RupeePondFusionExit + entrance Virtual.Zeffa.FluteAway + node RupeePondFusionEntrance: + entrance RupeePondFusionEntrance node East: door East enemy EastOctorocs - entrance EastTreeFusionEntrance - exit Virtual.Zeffa.FluteAway - entrance Crest + exit EastTreeFusionExit + entrance Virtual.Zeffa.FluteAway + exit Crest flag Virtual.Zeffa.SouthernHyruleFieldCrest # Splitting this for vanilla fusions node TingleLedge: - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node Tingle: chest Tingle - node EastTreeFusionExit: - exit EastTreeFusionExit + node EastTreeFusionEntrance: + entrance EastTreeFusionEntrance node EastChestFusion: chest EastChestFusion node SouthWest: enemy SouthWestOctorocs - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node SouthWestMinish: door MinishHouse node MinishWaterHole: @@ -321,14 +322,14 @@ area HyruleField: Main <-> WindTribeWarpFusion: flag WindTribeWarpFusion Main -> FairyFountainBombableWall: item BombBag - Main -> FairyFountainExit: flag FairyFountainBombableWall + Main -> FairyFountainEntrance: flag FairyFountainBombableWall Main <-> NorthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows | item Flippers | item RocsCape) - Main -> RupeePondFusionExit: (flag RupeePondFusion) + Main -> RupeePondFusionEntrance: (flag RupeePondFusion) Main <-> East: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) East -> TingleLedge: item PacciCane TingleLedge -> East TingleLedge -> Tingle: item TingleTrophee - East -> EastTreeFusionExit: flag EastTreeFusion + East -> EastTreeFusionEntrance: flag EastTreeFusion East -> EastChestFusion: flag EastChestFusion Main <-> SouthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) SouthWest -> SouthWestMinish: (item CanTurnMinish & item PegasusBoots) @@ -343,62 +344,62 @@ area HyruleField: door NorthEast door West door TopLadder - entrance LeftDiggingCaveEntrance - exit Virtual.Zeffa.FluteAway + exit LeftDiggingCaveExit + entrance Virtual.Zeffa.FluteAway node NorthChestFusion: chest NorthChestFusion node MidChestFusion: chest MidChestFusion - node LeftDiggingCaveExit: - exit LeftDiggingCaveExit + node LeftDiggingCaveEntrance: + entrance LeftDiggingCaveEntrance node RightDiggingCaveFusion: - entrance RightDiggingCaveEntrance - node RightDiggingCaveExit: exit RightDiggingCaveExit + node RightDiggingCaveEntrance: + entrance RightDiggingCaveEntrance node KnuckleLedge: door DiggingCaveLadder - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node MinishKnuckleLedge: door MinishHouse node GraveyardLedge: door North - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node Bottom: enemy BlueOctorocsMoblinsAndKeatons door BottomLadder door PercyTreeHouse door South flag BoulderShortcut - entrance RupeePondFusionEntrance - entrance BombableCaveEntrance - entrance FairyFountainEntrance - exit Virtual.Zeffa.FluteAway - node RupeePondFusionExit: exit RupeePondFusionExit - node BombableCaveExit: exit BombableCaveExit + exit FairyFountainExit + entrance Virtual.Zeffa.FluteAway + node RupeePondFusionEntrance: + entrance RupeePondFusionEntrance + node BombableCaveEntrance: + entrance BombableCaveEntrance node BombableCaveWall: flag BombableCaveWall - node FairyFountainExit: - exit FairyFountainExit + node FairyFountainEntrance: + entrance FairyFountainEntrance node FairyFountainWall: flag FairyFountainWall Top -> NorthChestFusion: flag NorthChestFusion Top -> MidChestFusion: flag MidChestFusion - Top -> LeftDiggingCaveExit: item MoleMitts + Top -> LeftDiggingCaveEntrance: item MoleMitts Top -> RightDiggingCaveFusion: (item Flippers | item RocsCape ) RightDiggingCaveFusion -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) - RightDiggingCaveFusion -> RightDiggingCaveExit: (item MoleMitts & flag RightDiggingCaveFusion) + RightDiggingCaveFusion -> RightDiggingCaveEntrance: (item MoleMitts & flag RightDiggingCaveFusion) KnuckleLedge -> MinishKnuckleLedge: item CanTurnMinish MinishKnuckleLedge -> KnuckleLedge: item CanGrow KnuckleLedge -> Top: item Flippers GraveyardLedge -> Top Top <-> Bottom: flag BoulderShortcut - Bottom -> RupeePondFusionExit: flag RupeePondFusion + Bottom -> RupeePondFusionEntrance: flag RupeePondFusion Bottom -> BombableCaveWall: item BombBag - Bottom -> BombableCaveExit: flag BombableCaveWall + Bottom -> BombableCaveEntrance: flag BombableCaveWall Bottom -> FairyFountainWall: item BombBag - Bottom -> FairyFountainExit: flag FairyFountainWall + Bottom -> FairyFountainEntrance: flag FairyFountainWall room WestWoodsNorth: @@ -409,15 +410,15 @@ area HyruleField: door West door SouthMid flag BoulderShortcut - entrance WestTreeFusionEntrance - exit Virtual.Zeffa.FluteAway + exit WestTreeFusionExit + entrance Virtual.Zeffa.FluteAway node East: door East - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node MiddleChestFusion: chest MiddleChestFusion - node WestTreeFusionExit: - exit WestTreeFusionExit + node WestTreeFusionEntrance: + entrance WestTreeFusionEntrance node SouthWestTreeFusion: door SouthWestFusion node NorthWestTreeFusion @@ -431,7 +432,7 @@ area HyruleField: chest NorthWestDigSpot6 node SouthEast: door SouthEast - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node SouthEastTreeFusion #Tag this as obsucre node SouthEastObsucre: @@ -440,7 +441,7 @@ area HyruleField: Main <-> East: flag BoulderShortcut Main -> MiddleChestFusion: flag MiddleChestFusion - Main -> WestTreeFusionExit: flag WestTreeFusion + Main -> WestTreeFusionEntrance: flag WestTreeFusion Main <-> SouthWestTreeFusion: flag SouthWestTreeFusion Main <-> NorthWestTreeFusion: flag NorthWestTreeFusion NorthWestTreeFusion -> NorthWestObscure: item MoleMitts @@ -452,14 +453,14 @@ area HyruleField: node West: door NorthWest door PercyHouse - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node East: door NorthMiddle door NortEast enemy Moblins door SouthMiddle door SouthEast - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node GoldenOcotorocFusion: enemy GoldenOcotorocFusion @@ -472,7 +473,7 @@ area HyruleField: door NorthMiddle door NorthEast enemy Moblins - exit Virtual.Zeffa.FluteAway + entrance Virtual.Zeffa.FluteAway node Beanstalk: door Beanstalk node MinishMain: From a2180e54a5ecd24cabe65a0f5ce8b67fdae22476 Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 17 Nov 2024 17:56:51 +0100 Subject: [PATCH 16/16] Hyrule Field: Fixes Co-authored-By: Henny022 --- hyrule_field.logic | 767 +++++++++++++++++++++++++++------------------ 1 file changed, 454 insertions(+), 313 deletions(-) diff --git a/hyrule_field.logic b/hyrule_field.logic index d48dd05..24ad98b 100644 --- a/hyrule_field.logic +++ b/hyrule_field.logic @@ -4,481 +4,622 @@ area HyruleField: door West enemy WestAcroBandits door South - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + node WestFusionChest: chest WestFusionChest + West -> WestFusionChest: fusion Chest + node GoldenRopeFusion: enemy GoldenRope + West -> GoldenRopeFusion: flag GoldenRopeFusion + node East: door FarmersHouse - door SouthEast + door EastSouth + door North enemy EastAcroBanditsAndOctorocs - exit DiggingCaveExit - entrance Virtual.Zeffa.FluteAway - node WoodsFairyLedge: - door NorthEast - entrance Virtual.Zeffa.FluteAway - node FarmersDiggingCave: - entrance DiggingCaveEntrance - node BombableBlocks: - flag BombableBlocks + warp Virtual.Zeffa.FluteAway - West -> WestFusionChest: flag WestFusionChest - West -> GoldenRopeFusion: flag GoldenRopeFusion - West <-> East: flag BombableBlocks - West -> BombableBlocks: item BombBag - East -> BombableBlocks: item BombBag - East -> WoodsFairyLedge: item PacciCane + node EastFarmers: + npc Eenie + npc Meenie + East -> EastFarmers: flag WestWoodsNorth.VaatiTakeover + + node WoodsFairyLedge: + door EastNorth + warp Virtual.Zeffa.FluteAway WoodsFairyLedge -> East + East -> WoodsFairyLedge: item Cane + + node FarmersDiggingCave: + door DiggingCaveExit + FarmersDiggingCave -> East East -> FarmersDiggingCave: item MoleMitts + node BombableBlocks: + set BombableBlocks + West -> BombableBlocks: ( item BombBag | hasExplosive ) + East -> BombableBlocks: ( item BombBag | hasExplosive ) + West <-> East: ( flag BombableBlockOne | ( flag BombableBlockTwo & flag BombableBlockThree ) | flag BombableBlockFour ) room EastHillsMid: - node Main: door North enemy PeahatsAndSpinyBeetles door SouthEast door SouthWest - entrance Virtual.Zeffa.FluteAway - exit CaveExit - node Beanstalk: - door Beanstalk - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + target CaveExit node CaveEntrance: - entrance CaveEntrance + warp CaveEntrance node BombableCave: - flag BombableCave - - Main <-> Beanstalk: flag Beanstalk - Main -> BombableCave: item BombBag + set BombableCave + Main -> BombableCave: ( item BombBag | hasExplosive ) Main -> CaveEntrance: flag BombableCave + node Beanstalk: + warp Beanstalk + node BeanstalkDown: + target Beanstalk + Main <-> Beanstalk: fusion Beanstalk + BeanstalkDown -> Beanstalk: fusion Beanstalk room EastHillsSouth: - node NorthWest: door NorthWest - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway node West: - entrance Virtual.Zeffa.FluteAway - node MinishHouse: + warp Virtual.Zeffa.FluteAway + + node BombableBlocks: + set BombableBlockOne + set BombableBlockTwo + NorthWest <-> West: ( flag BombableBlockOne | flag BombableBlockTwo ) + NorthWest -> BombableBlocks: item BombBag + West -> BombableBlocks: item BombBag + + node WestMinish: door MinishHouse - entrance Virtual.Zeffa.FluteAway + West -> MinishHouse: helper CanTurnMinish + MinishHouse -> West: helper CanGrow + node East: door NorthEast door East enemy SpinyBeetles - entrance Virtual.Zeffa.FluteAway - node BombableBlocks: - flag BombableBlocks - - NorthWest <-> West: flag BombableBlocks - NorthWest -> BombableBlocks: item BombBag - West -> BombableBlocks: item BombBag - # Can be used to check for Ezlo - West -> MinishHouse: item CanTurnMinish - MinishHouse -> West: item CanGrow + warp Virtual.Zeffa.FluteAway East <-> West - room LonLon: + node West: + door WestNorth + enemy AcroBanditsAndOctorocs + door South + target LeftRanchDoorExit + warp Virtual.Zeffa.FluteAway + + node WestMinish: + target MinishLeftRanchDoor + West -> WestMinish: item CanTurnMinish + WestMinish -> West: item CanGrow + + node MinishEastRanchDoor: + warp MinishEastRanchDoor + WestMinish -> MinishLeftRanchDoor: ( ool | flag TownMinishHouses.Rem.FetchQuestStarted ) # ool since she doesn't start to stand there until earth element + node Malon: + npc Malon + West -> Malon: ool # malon leaves + + node WestRanchDoorEntrance: + warp WestRanchDoorEntrance + warp Virtual.Zeffa.FluteAway + node OpenWestRanchDoor: + set OpenWestRanchDoor + West -> WestRanchDoorEntrance: flag OpenWestRanchDoor + node Talon: + npc Talon + Talon -> OpenWestRanchDoor: item LonLonKey + West -> Talon: flag TownMinishHouses.Rem.FetchQuestStarted node VeilFallsEast: - door VeilFallsEast - entrance Virtual.Zeffa.FluteAway - node VeilFallsWest: - door VeilFallsWest - entrance Virtual.Zeffa.FluteAway + door NorthEast + warp Virtual.Zeffa.FluteAway node VeilFallsFusionChest: chest VeilFallsFusionChest - node West: + VeilFallsEast -> VeilFallsFusionChest: fusion VeilFallsChest + + node VeilFallsWest: door NorthWest - enemy AcroBanditsAndOctorocs - door South - exit LeftRanchDoorExit - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + West -> VeilFallsWest: item Cane + VeilFallsWest -> West + node TownAccess: - door SouthWest - entrance Virtual.Zeffa.FluteAway - node LeftRanchDoorEntrance: - entrance LeftRanchDoorEntrance - entrance Virtual.Zeffa.FluteAway - node OpenLeftRanchDoor: - flag OpenLeftRanchDoor - node MinishLeftRanchDoor: - door MinishLeftRanchDoor + door WestSouth + warp Virtual.Zeffa.FluteAway + node TownAccessBombRocks: + set BombableBlockOne + set BombableBlockTwo + set BombableBlockThree + set BombableBlockFour + West -> TownAccessBombRocks: ( item BombBag | hasExplosive ) + TownAccess -> TownAccessBombRocks: ( item BombBag | hasExplosive ) + West <-> TownAccess: ( flag BombableBlockOne | flag BombableBlockTwo | flag BombableBlockThree | flag BombableBlockFour ) + node GoronCave: - flag GoronCaveBoulder + set GoronCaveBoulder door GoronCave - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + West -> GoronCave: ( flag GoronCaveBoulder | item Cape) + GoronCave -> West: flag GoronCaveBoulder + node Goron: + npc Goron + GoronCave -> Goron: ool + node SouthEast: - door SouthEast - flag SouthEastBoulder - entrance Virtual.Zeffa.FluteAway - node MiddleEast: - door MiddleEast - entrance Virtual.Zeffa.FluteAway + door EastSouth + set SouthEastBoulder + warp Virtual.Zeffa.FluteAway + West -> SouthEast: ( flag SouthEastBoulder | item Cape ) + SouthEast -> West + SouthEast -> GoronCave + node Center: door RightFarmDoor door Cave - door NorthEast - flag NorthBoulder + door EastNorth + set NorthBoulder enemy Octorocs - exit PondFusionExit - entrance Virtual.Zeffa.FluteAway + target PondFusionExit + warp Virtual.Zeffa.FluteAway + West <-> Center: flag NorthBoulder + + node CenterLedge: + door Ladder + CenterLedge -> Center + node Ankle: + npc Ankle + CenterLedge -> Ankle: ( flag WestWoodsNorth.VaatiTakeover & flag South.TalkedToTingle ) + node MinishCenter: door MinishPath door MinishRightRanchDoor + node TreePortal: + set TreePortal + Center -> TreePortal: item PegasusBoots + Center -> MinishCenter: ( helper CanTurnMinish & flag TreePortal ) + MinishCenter -> Center: item CanGrow + node PondFusionEntrance: - entrance PondFusionEntrance - entrance Virtual.Zeffa.FluteAway - node NorthLedge: - entrance Virtual.Zeffa.FluteAway - node MinishCrack: - door MinishCrack - #Tag this as obsucre - node CenterLedge: - chest ObscureDiggingSpot - node NorthFreestanding: - chest Freestanding - exit NorthDiggingCaveExit - entrance Virtual.Zeffa.FluteAway - node NorthDiggingCaveEntrance: - entrance NorthDiggingCaveEntrance - entrance Virtual.Zeffa.FluteAway + warp PondFusionEntrance + Center -> PondFusionEntrance: fusion Pond - VeilFallsEast -> VeilFallsFusionChest: flag VeilFallsFusionChest - West <-> TownAccess: item BombBag - West -> VeilFallsWest: item PacciCane - VeilFallsWest -> West - West -> OpenLeftRanchDoor: item LonLonKey - West -> LeftRanchDoorEntrance: flag OpenLeftRanchDoor - West -> MinishLeftRanchDoor: item CanTurnMinish - MinishLeftRanchDoor -> West: item CanGrow - # Not checking if we have ezlo to get into the tornados bc it works without him - West -> GoronCave: (flag GoronCaveBoulder | item RocsCape) - GoronCave -> West - West -> SouthEast: (flag SouthEastBoulder | item RocsCape) - SouthEast -> West - SouthEast -> GoronCave - Center -> West - West -> Center: (flag NorthBoulder) + node MiddleEast: + door EastMiddle + warp Virtual.Zeffa.FluteAway Center -> MiddleEast: (item RocsCape | item Flippers) - MiddleEast -> Center: (item RocsCape) - Center -> MinishCenter: (item PegasusBoots | item CanTurnMinish) - MinishCenter -> Center: (item CanGrow) - Center -> PondFusionEntrance: (flag PondFusion) - Center -> NorthLedge: (item RocsCape | item PacciCane ) + MiddleEast -> Center: item RocsCape + + node NorthLedge: + warp Virtual.Zeffa.FluteAway NorthLedge -> Center NorthLedge -> MiddleEast - NorthLedge -> MinishCrack: item CanTurnMinish - MinishCrack -> NorthLedge: item CanGrow - NorthLedge -> CenterLedge: item MoleMitts - NorthFreestanding -> NorthDiggingCaveEntrance: item MoleMitts - CenterLedge -> Center + Center -> NorthLedge: ( item Cape | item Cane ) + node CenterLedgeDigSpot: + chest DiggingSpot + NorthLedge -> CenterLedgeDigSpot: item MoleMitts - room North: + node NorthLedgeMinish: + door MinishCrack + NorthLedge -> NorthLedgeMinish: helper CanTurnMinish + NorthLedgeMinish -> NorthLedge: helper CanGrow + + node NorthDiggingCaveEntrance: + chest Freestanding + door NorthDiggingCaveEntrance + warp Virtual.Zeffa.FluteAway + room North: node Main: door South door North enemy OctorcsAndCrows - exit NWTingleTreeExit - exit NETingleTreeExit - exit SWTingleTreeExit - exit SETingleTreeExit - exit CenterTingleTreeExit - exit FairyFountainExit - entrance Virtual.Zeffa.FluteAway + target NWTingleTree + target NETingleTree + target SWTingleTree + target SETingleTree + target CenterTingleTree + target FairyFountain + warp Virtual.Zeffa.FluteAway node NWTingleTreeEntrance: - entrance NWTingleTreeEntrance + warp NWTingleTree node NETingleTreeEntrance: - entrance NETingleTreeEntrance + warp NETingleTree node SWTingleTreeEntrance: - entrance SWTingleTreeEntrance - node SETingleTreeEntrance: - entrance SETingleTreeEntrance - node CenterTingleTreeEntrance: - entrance CenterTingleTreeEntrance + warp SWTingleTree + node SETingleTree: + warp SETingleTree + node CenterTingleTree: + warp CenterTingleTree node FairyFountainEntrance: - entrance FairyFountainExit - node RightBombableRocks: - flag RightBombableRocks + warp FairyFountain + Main -> NWTingleTreeEntrance: fusion NWTingleTree + Main -> NETingleTreeEntrance: fusion NETingleTree + Main -> SWTingleTreeEntrance: fusion SWTingleTree + Main -> SETingleTreeEntrance: fusion SETingleTree + Main -> CenterTingleTreeEntrance: flag Caves.MagicBoomerang.AllTorches + Main -> FairyFountainEntrance: fusion FairyFountain + + node EastBombableRocks: + set EastBombableRockOne + set EastBombableRockTwo node NorthEast: door NorthEast - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + Main -> RightBombableRocks: ( item BombBag | hasExplosive) + NorthEast -> RightBombableRocks: ( item BombBag | hasExplosive ) + Main <-> NorthEast: flag RightBombableRocks + + node MainMinish + MainMinish -> Main: helper CanGrow + Main -> MainMinish: ( helper CanTurnMinish & flag TreePortal ) + node TreePortal: + set TreePortal + Main -> TreePortal: item PegasusBoots + node MinishCrackBoulder: + set MinishCrackBoulder + Main -> MinishCrackBoulder: (helper AnySword | item FlameLantern | item LightArrows | item BombBag | hasExplosive | item GustJar) + node MinishCrack: + warp MinishCrack + node MinishCrackExit: + target MinishCrack + MainMinish -> MinishCrack: flag MinishCrackBoulder + MinishCrackExit -> MainMinish: flag MinishCrackBoulder + node WaterFallExit: - door WaterFallExit - entrance Virtual.Zeffa.FluteAway + target WaterFall + node WaterFall: + warp WaterFall + WestWater -> WaterFall: (fusion WaterFall & item Flippers) + Main -> WaterFall: (fusion WaterFall & item Cape) + SouthWest -> WaterFall: (fusion WaterFall & item Cape) + + WestWater <-> SouthWestWater: ool # if you don't spawn the bridge you can swim between them + node SouthWest: - door SouthWest + door WestSouth enemy Keaton - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + Main <-> SouthWest: (flag Bridge | item RocsCape) + Main -> SouthWestWater: item Flippers + SouthWest <-> SouthWestWater: item Flippers + SouthWest -> WestWater: item Flippers + node SouthCave: door SouthCave entrance Virtual.Zeffa.FluteAway - node LeftBombableBlocks: - flag LeftBombableBlocks - node NorthCave: - door NorthLadder - door MiddleCave - entrance Virtual.Zeffa.FluteAway - node NorthWestWater: - door NorthWestWater - entrance Virtual.Zeffa.FluteAway - node NorthWestGraveyard: - door NorthWestGraveyard - entrance Virtual.Zeffa.FluteAway - ennemy GraveyardOctorocs + WestWater <-> SouthCave: item Flippers + SouthCave <-> SouthWest: item Cape + + node WestLedge + node BridgeSwitch: + set Bridge + WestLedge -> BridgeSwitch: helper AnySword + WestLedge -> SouthWest + SouthWest -> WestLedge: item Cane + + node NorthWest: + door WestNorth + door WestLadder + warp Virtual.Zeffa.FluteAway + enemy GraveyardOctorocs + NorthWest -> WestLedge + NorthWest -> NorthWater: item Flippers + node NorthWestChestFusion: chest NorthWestChestFusion - node MinishCrackBoulder: - flag MinishCrackBoulder - node MinishCrack: - door MinishCrack - #Tag this as obsucre - node ObscureSpot: - chest ObscureDigRupee - - Main -> NWTingleTreeEntrance: flag NWTingleTree - Main -> NETingleTreeEntrance: flag NETingleTree - Main -> SWTingleTreeEntrance: flag SWTingleTree - Main -> SETingleTreeEntrance: flag SETingleTree - Main -> CenterTingleTreeEntrance: flag CenterTingleTree - Main -> FairyFountainEntrance: flag FairyFountain - Main -> RightBombableRocks: item BombBag - NorthEast -> RightBombableRocks: item BombBag - Main <-> NorthEast: flag RightBombableRocks - Main -> WaterFallExit: (flag WaterFallFusion | (item Flippers | item RocsCape )) - Main -> SouthWest: (item Flippers | item RocsCape) - # No flag for the bridge bc it resets in rando - SouthWest -> Main: (item Flippers | item RocsCape | (item PacciCane & item SmithSword)) - SouthWest -> WaterFallExit: (flag WaterFallFusion | (item Flippers | item RocsCape )) - WaterFallExit -> SouthWest: item Flippers - WaterFallExit -> SouthCave: item Flippers - # Possible with cape only, but a bit hard - SouthCave -> WaterFallExit: (item Flippers | item RocsCape) - Main -> LeftBombableBlocks: item BombBag - NorthCave -> LeftBombableBlocks: item BombBag - Main <-> NorthCave: (flag LeftBombableBlocks) - NorthCave <-> NorthEast: item Flippers - NorthWestGraveyard -> SouthWest - NorthWestGraveyard -> NorthWestChestFusion: (flag NorthWestChestFusion) - # With Entrando you could access the lever (and the bridge that way) - NorthWestGraveyard -> Main: item SmithSword - Main -> MinishCrackBoulder: (item SmithSword | item FlameLantern | item LightArrows | item BombBag | item GustJar) - # Need to have removed the boulder to entrance the cave - Main -> MinishCrack: (flag MinishCrackBoulder & item CanTurnMinish & item PegasusBoots) - MinishCrack -> Main: (flag MinishCrackBoulder & item CanGrow) - Main -> ObscureSpot: item MoleMitts + NorthWest -> NorthWestChestFusion: fusion Chest + + node NorthCave: + door WestCaveEastLadder + door MiddleCave + warp Virtual.Zeffa.FluteAway + node WestBombableBlock: + set WestBombableBlock + NorthCave -> WestBombableBlock: ( item BombBag | hasExplosive) + Main -> WestBombableBlock: ( item BombBag | hasExplosive) + NorthCave <-> Main: flag WestBombableBlock + node NorthWestWater: + target MoatEast + target MoatWest + node Moat: + warp MoatEast + warp MoatWest + NorthWestWater -> Moat: item Flippers + NorthWestWater <-> NorthCave: item Flippers + + node DigSpot: + chest DigRupee + Main -> DigSpot: item MoleMitts room South: - node Main: door North - enemy MainOctorocs door LinksHouse - exit FairyFountainExit - entrance Virtual.Zeffa.FluteAway - node WindTribeWarpFusion: - door WindTribeWarpFusion + enemy MainOctorocs + target FairyFountainExit + target WindTribeWarpFusion + warp Virtual.Zeffa.FluteAway + node FairyFountainEntrance: - entrance FairyFountainEntrance + warp FairyFountainEntrance node FairyFountainBombableWall: - flag FairyFountainBombableWall + set FairyFountainBombableWall + Main -> FairyFountainBombableWall: ( item BombBag | hasExplosive ) + Main -> FairyFountainEntrance: flag FairyFountainBombableWall + + node WindTribeWarpFusion: + warp WindTribeWarpFusion + Main -> WindTribeWarpFusion: fusion WindTribeWarp + node NorthWest: door West enemy NorthWestOctorocs - exit RupeePondFusionExit - entrance Virtual.Zeffa.FluteAway + target RupeePondFusionExit + warp Virtual.Zeffa.FluteAway + node NorthWestTrees: + set NorthWestTreeOne + set NorthWestTreeTwo + set NorthWestTreeThree + Main <-> NorthWest: (flag NorthWestTreeOne | flag NorthWestTreeTwo | flag NorthWestTreeThree | item Cape) + Main -> NorthWestTrees: ( helper AnySword | item FlameLantern | item BombBag | item LightArrows | hasExplosive ) + NorthWest -> NorthWestTrees: ( helper AnySword | item FlameLantern | item BombBag | item LightArrows | hasExplosive ) + Main <-> Water: item Flippers + NorthWest <-> Water: item Flippers + node RupeePondFusionEntrance: - entrance RupeePondFusionEntrance + warp RupeePondFusionEntrance + Main -> RupeePondFusionEntrance: fusion RupeePond + node East: door East enemy EastOctorocs - exit EastTreeFusionExit - entrance Virtual.Zeffa.FluteAway - exit Crest - flag Virtual.Zeffa.SouthernHyruleFieldCrest - # Splitting this for vanilla fusions + target EastTreeFusionExit + warp Virtual.Zeffa.FluteAway + target Crest + set Virtual.Zeffa.SouthernHyruleFieldCrest + node EastTrees: + set NorthEastTreeOne + set NorthEastTreeTwo + set NorthEastTreeThree + set NorthEastTreeFour + set SouthEastTreeOne + set SouthEastTreeTwo + set SouthEastTreeThree + Main -> EastTrees: ( helper AnySword | item FlameLantern | item BombBag | item LightArrows | hasExplosive ) + East -> EastTrees: ( helper AnySword | item FlameLantern | item BombBag | item LightArrows | hasExplosive ) + Main <-> East: ( flag NorthEastTreeOne | flag NorthEastTreeTwo | ( flag NorthEastTreeThree & flag NorthEastTreeFour ) | flag SouthEastTreeOne | flag SouthEastTreeTwo | flag SouthEastTreeThree ) + node TingleLedge: - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway node Tingle: + npc Tingle + set TalkedToTingle + node TingleReward: chest Tingle + TingleLedge -> East + East -> TingleLedge: item Cane + TingleLedge -> Tingle: flag WestWoodsNorth.VaatiTakeover + Tingle -> TingleReward: helper AllFusions + node EastTreeFusionEntrance: - entrance EastTreeFusionEntrance + warp EastTreeFusionEntrance + East -> EastTreeFusionEntrance: fusion EastTree + node EastChestFusion: chest EastChestFusion + East -> EastChestFusion: fusion EastChest + node SouthWest: enemy SouthWestOctorocs - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + node SouthWestTrees: + set SouthWestTreeOne + set SouthWestTreeTwo + set SouthWestTreeThree + Main -> SouthWestTrees: (helper AnySword | item FlameLantern | item BombBag | item LightArrows | hasExplosive) + SouthWest -> SouthWestTrees: (helper AnySword | item FlameLantern | item BombBag | item LightArrows | hasExplosive) + Main <-> SouthWest: ( flag SouthWestTreeOne | flag SouthWestTreeTwo | flag SouthWestTreeThree ) + SouthWest -> Water: item Flippers + + node PortalTree: + set PortalTree + SouthWest -> PortalTree: item PegasusBoots node SouthWestMinish: door MinishHouse - node MinishWaterHole: - door MinishWaterHole - - Main <-> WindTribeWarpFusion: flag WindTribeWarpFusion - Main -> FairyFountainBombableWall: item BombBag - Main -> FairyFountainEntrance: flag FairyFountainBombableWall - Main <-> NorthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows | item Flippers | item RocsCape) - Main -> RupeePondFusionEntrance: (flag RupeePondFusion) - Main <-> East: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) - East -> TingleLedge: item PacciCane - TingleLedge -> East - TingleLedge -> Tingle: item TingleTrophee - East -> EastTreeFusionEntrance: flag EastTreeFusion - East -> EastChestFusion: flag EastChestFusion - Main <-> SouthWest: (item SmithSword | item FlameLantern | item BombBag | item LightArrows) - SouthWest -> SouthWestMinish: (item CanTurnMinish & item PegasusBoots) - SouthWestMinish -> SouthWest: item CanGrow - SouthWestMinish <-> MinishWaterHole: item Flippers + SouthWest -> SouthWestMinish: (helper CanTurnMinish & flag PortalTree) + SouthWestMinish -> SouthWest: helper CanGrow + node MinishWater: + target MinishWaterHole + SouthWestMinish <-> MinishWater: item Flippers + node MinishWaterHole: + warp MinishWaterHole + MinishWater -> MinishWaterHole: item Flippers room Trilby: - node Top: - door SouthEast - ennemy OctorocsAndKeatons - door NorthEast + node Main: + door EastNorth + door EastSouth door West + ennemy OctorocsAndKeatons door TopLadder - exit LeftDiggingCaveExit - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + + node GraveyardLedge: + door North + warp Virtual.Zeffa.FluteAway + GraveyardLedge -> Main + node NorthChestFusion: chest NorthChestFusion + Main -> NorthChestFusion: fusion NorthChest + node MidChestFusion: chest MidChestFusion - node LeftDiggingCaveEntrance: - entrance LeftDiggingCaveEntrance - node RightDiggingCaveFusion: - exit RightDiggingCaveExit - node RightDiggingCaveEntrance: - entrance RightDiggingCaveEntrance + Main -> MidChestFusion: fusion MidChest + + node WestDiggingCaveEntrance: + door WestDiggingCaveEntrance + Main -> WestDiggingCaveEntrance: item MoleMitts + WestDiggingCaveEntrance -> Main + + node EastDiggingCaveExit: + target EastDiggingCave + node EastDiggingCaveEntrance: + warp EastDiggingCave + EastDiggingCaveExit -> EastDiggingCaveEntrance: fusion EastDiggingCave # the door is open if you come out of it + node EastDiggingCaveFusion + EastDiggingCaveExit -> EastDiggingCaveFusion: fusion EastDiggingCave + EastDiggingCaveFusion -> EastDiggingCaveEntrance: item MoleMitts + EastDiggingCaveExit -> Water: item Flippers + EastDiggingCaveFusion <-> Water: ( item Flippers & fusion EastDiggingCave ) + Main <-> Water: item Flippers + Main <-> EastDiggingCaveFusion: ( item Cape & fusion EastDiggingCave ) + node KnuckleLedge: door DiggingCaveLadder - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + KnuckleLedge -> Water: item Flippers + node Knuckle: + npc Knuckle + KnuckleLedge -> Knuckle: ( flag WestWoodsNorth.VaatiTakeover & flag South.TalkedToTingle ) + node MinishKnuckleLedge: door MinishHouse - node GraveyardLedge: - door North - entrance Virtual.Zeffa.FluteAway - node Bottom: + KnuckleLedge -> MinishKnuckleLedge: item CanTurnMinish + MinishKnuckleLedge -> KnuckleLedge: item CanGrow + + node South: enemy BlueOctorocsMoblinsAndKeatons door BottomLadder door PercyTreeHouse door South - flag BoulderShortcut - exit RupeePondFusionExit - exit BombableCaveExit - exit FairyFountainExit - entrance Virtual.Zeffa.FluteAway - node RupeePondFusionEntrance: - entrance RupeePondFusionEntrance - node BombableCaveEntrance: - entrance BombableCaveEntrance - node BombableCaveWall: - flag BombableCaveWall - node FairyFountainEntrance: - entrance FairyFountainEntrance - node FairyFountainWall: - flag FairyFountainWall - Top -> NorthChestFusion: flag NorthChestFusion - Top -> MidChestFusion: flag MidChestFusion - Top -> LeftDiggingCaveEntrance: item MoleMitts - Top -> RightDiggingCaveFusion: (item Flippers | item RocsCape ) - RightDiggingCaveFusion -> Top: ((flag RightDiggingCaveFusion & item RocsCape) | item Fippers) - RightDiggingCaveFusion -> RightDiggingCaveEntrance: (item MoleMitts & flag RightDiggingCaveFusion) - KnuckleLedge -> MinishKnuckleLedge: item CanTurnMinish - MinishKnuckleLedge -> KnuckleLedge: item CanGrow - KnuckleLedge -> Top: item Flippers - GraveyardLedge -> Top - Top <-> Bottom: flag BoulderShortcut - Bottom -> RupeePondFusionEntrance: flag RupeePondFusion - Bottom -> BombableCaveWall: item BombBag - Bottom -> BombableCaveEntrance: flag BombableCaveWall - Bottom -> FairyFountainWall: item BombBag - Bottom -> FairyFountainEntrance: flag FairyFountainWall - + set BoulderShortcut + target RupeePondFusionExit + target WestBombableCave + target EastBombableCave + warp Virtual.Zeffa.FluteAway + Main <-> South: flag BoulderShortcut + + node RupeePondFusion: + warp RupeePondFusionEntrance + South -> RupeePondFusion: fusion RupeePond + + node EastBombableCaveWall: + set EastBombableCaveWall + node WestBombableCaveWall: + set WestBombableCaveWall + node EastBombableCaveEntrance: + warp EastBombableCave + node WestBombableCaveEntrance: + warp WestBombableCave + South -> EastBombableCaveWall: (item BombBag | hasExplosive) + South -> WestBombableCaveWall: (item BombBag | hasExplosive) + South -> EastBombableCaveEntrance: flag EastBombableCaveWall + South -> WestBombableCaveEntrance: flag WestBombableCaveWall room WestWoodsNorth: - node Main: enemy CrowsBlueOctorocsKeatonsAndMoblins door North door West - door SouthMid - flag BoulderShortcut - exit WestTreeFusionExit - entrance Virtual.Zeffa.FluteAway + door SouthMiddle + set BoulderShortcut + target WestTreeFusion + set Sign + warp Virtual.Zeffa.FluteAway + + node VaatiTakeoverCutscene: + set VaatiTakeover + Main -> VaatiTakeoverCutscene: ( item RedSword & defeat Gleerock.Main.Gleerock ) + node East: door East - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + Main <-> East: flag BoulderShortcut + node MiddleChestFusion: chest MiddleChestFusion + Main -> MiddleChestFusion: fusion MiddleChestTree + node WestTreeFusionEntrance: - entrance WestTreeFusionEntrance - node SouthWestTreeFusion: - door SouthWestFusion + warp WestTreeFusion + Main -> WestTreeFusionEntrance: fusion WestTree + + node SouthWest: + door SouthWest + Main <-> SouthWest: fusion SouthWestTree + node NorthWestTreeFusion #Tag this as obsucre - node NorthWestObscure: + node NorthWestDigSpots: chest NorthWestDigSpot1 chest NorthWestDigSpot2 chest NorthWestDigSpot3 chest NorthWestDigSpot4 chest NorthWestDigSpot5 chest NorthWestDigSpot6 + Main -> NorthWestDigSpots: ( fusion NorthWestTree & item MoleMitts) + node SouthEast: door SouthEast - entrance Virtual.Zeffa.FluteAway - node SouthEastTreeFusion - #Tag this as obsucre - node SouthEastObsucre: + warp Virtual.Zeffa.FluteAway + node SouthEastDigSpots: chest SouthWestDigSpot1 chest SouthWestDigSpot2 - - Main <-> East: flag BoulderShortcut - Main -> MiddleChestFusion: flag MiddleChestFusion - Main -> WestTreeFusionEntrance: flag WestTreeFusion - Main <-> SouthWestTreeFusion: flag SouthWestTreeFusion - Main <-> NorthWestTreeFusion: flag NorthWestTreeFusion - NorthWestTreeFusion -> NorthWestObscure: item MoleMitts - SouthEast <-> SouthEastTreeFusion: flag SouthEastTreeFusion - SouthEastTreeFusion -> SouthEastObsucre: item MoleMitts + SouthEast -> SouthEastDigSpots: ( fusion SouthEastTree & item MoleMitts ) room WestWoodsMid: node West: door NorthWest door PercyHouse - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + node Percy: + npc Percy + West -> Percy: ool # Percy goes away + node East: door NorthMiddle door NortEast enemy Moblins - door SouthMiddle + door SouthWest door SouthEast - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + node GoldenOcotorocFusion: enemy GoldenOcotorocFusion - - East -> GoldenOcotorocFusion: flag GoldenOctorocFusion - + East -> GoldenOcotorocFusion: fusion GoldenOctoroc room WestWoodsSouth: - node Main: - door NorthMiddle + door NorthWest door NorthEast enemy Moblins - entrance Virtual.Zeffa.FluteAway + warp Virtual.Zeffa.FluteAway + node Beanstalk: - door Beanstalk + target Beanstalk + node Climb: + warp Beanstalk + Main <-> Beanstalk: fusion Beanstalk + Beanstalk -> Climb: fusion Beanstalk + node MinishMain: door MinishHouse - - Main <-> Beanstalk: flag Beanstalk Main -> MinishMain: item CanTurnMinish MinishMain -> Main: item CanGrow