From be3a71b4e2df887d1b85677c07cb65886d625f22 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 18 Apr 2021 19:52:37 +0200 Subject: [PATCH 1/9] Update fortress_of_winds.logic --- fortress_of_winds.logic | 252 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 229 insertions(+), 23 deletions(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index ad6d18e..fe03264 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -1,24 +1,230 @@ area FortressOfWinds: - room F1BladeSpin - room F1CentralRoom - room F1CloneButtons - room F1Darknut - room F1DropIn - room F1EastMinishHole - room F1EastStairs - room F1EyeBridge - room F1EyeDoor - room F1MinishPortal - room F1Split - room F1West - room F1WestStairs - room F2CenterKeyPull - room F2East - room F2EyegoreButtons - room F2MazaalRoom - room F2PreMazaal - room F2West - room GFCenterStairs - room GFEastStairs - room GFMinishHP - room GFWizrobes + room F1BladeSpin: + node North: + door North + flag DoorOpen + node South: + door South + North <-> South: flag DoorOpen + room F1CentralRoom: + node North: + chest Chest + node NorthEast: + door NorthEast + North <-> NorthEast: flag EastDoorUnlocked + node NorthWest: + door NorthWest + North <-> NorthWest: flag WestDoorUnlocked + node Main: + door Stair + door South + enemy Eyegores + North -> Main + Main -> North: defeat Eyegores + node East: + door East + East -> North + node West: + door West + West -> North + room F1CloneButtons: + node Main: + door West + node Key: + chest Key + node South: + door South + Main <-> South: flag DoorUnlocked + node MainMinish: + door WestMinish + node SouthMinish: + door SouthMinish + MainMinish <-> SouthMinish: flag DoorUnlocked + room F1Darknut: + node Main: + exit East + exit South + enemy Darknut + node PostFight: + entrance East + entrance South + Main -> PostFight: defeat Darknut + room F1DropIn: + node UpperMinish: + door NorthMinish + door NorthWestMinish + node LowerMinish: + door WestMinish + node Upper: + door North + door NorthWest + node Lower: + door Wes + door South + node East: + exit RoofHole + East -> Lower + room F1EastMinishHole: + node Main: + door East + door UpperEast + door West + node UpperMinish: + door UpperEastMinish + door NorthMinish + door WestMinish + node LowerMinish: + door EastMinish + UpperMinish -> LowerMinish + LowerMinish -> Main: item CanGrow + Main -> LowerMinish: item CanTurnMinish + room F1EastStairs: + node Main: + door North + exit RoofHole + entrance Hole + chest EastChest + chest WestChest + node South: + door South + Main <-> South: flag DoorOpen + room F1EyeBridge: + node East: + door East + node West: + door West + East <-> West: ( item Cape | flag TargetsHit ) + room F1EyeDoor: + node Upper: + door NorthEast + door NorthWest + node North: + door North + Upper <-> North: item BombBag + node SouthWest: + door SouthWest + node South: + door South + South <-> SouthWest: flag TargetShot + room F1MinishPortal: + node Main: + door East + door West + enemy WallMaster + node MainMinish: + door EastMinish + door WestMinish + Main -> MainMinish: ( defeat WallMaster & item CanTurnMinish ) + MainMinish -> Main: ( defeat WallMaster & item CanGrow ) + room F1Split: + node SouthEast: + door SouthEast + node East: + door East + SouthEast -> East + node SouthWest: + door SouthWest + node West: + door West + SouthWest -> West + room F1West: + node Upper: + door North + door NorthEast + node Main: + exit South + exit SouthEast + enemy Enemies + node PostFight: + entrance South + entrance SouthEast + Main -> PostFight: defeat Enemies + room F1WestStairs: + node Main: + door North + entrance Hole + exit RoofHole + door StairDown + room F2CenterKeyPull: + node Main: + entrance Hole + door West + node MainWest: + flag KeyDropped + Main <-> East: ( item Cape | item CanSplit2 ) + node East: + door South + node EastBigDoor: + door North + East <-> EastBigDoor flag DoorUnlocked + room F2East: + node East: + door SouthEast + node NorthEast: + entrance EastHoles + East -> NorthEast: flag DoorUnlocked + node West: + door SouthWest + entrance WestHole + node WestMinish: + entrance MinishHole + flag KeyDropped + room F2EyegoreButtons: + node Main: + door South + enemy Eyegores + node Chest: + chest Chest + Main <-> Chest: defeat Eyegores + room F2MazaalRoom: + node Main: + exit South + enemy Mazaal + node PostFight: + door North + chest HP + entrance South + Main <-> PostFight: defeat Mazaal + room F2PreMazaal: + node Main: + door South + door North + room F2West: + node Main: + door South + node North: + door North + node East: + door East + Main <-> East: flag TargetsShot + Main <-> North: flag TargetsShot + room GFCenterStairs: + node Main: + door North + door South + room GFEastStairs: + node Main: + door North + door South + room GFMinishHP: + node Main: + chest Chest + node MainMinish: + door WestMinish + node South: + door South + Main -> South + Main -> MainMinish: item CanTurnMinish + MainMinish -> Main: item CanGrow + room GFWestStairs: + node Main: + door North + door South + room GFWizrobes: + node Main: + exit South + enemy Wizrobes + node PostFight: + entrance South + chest Chest + Main -> PostFight: defeat Wizrobes \ No newline at end of file From 55a2187da4bc4090c3c6fb2812c113fc13984ff9 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 18 Apr 2021 19:53:45 +0200 Subject: [PATCH 2/9] Update fortress_of_winds.logic --- fortress_of_winds.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index fe03264..c97e043 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -156,7 +156,7 @@ area FortressOfWinds: door South node EastBigDoor: door North - East <-> EastBigDoor flag DoorUnlocked + East <-> EastBigDoor: flag DoorUnlocked room F2East: node East: door SouthEast From db1b20d8de55119156e6f9cc1988e52b2f0d2af1 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 21 Apr 2021 15:49:35 +0200 Subject: [PATCH 3/9] Update fortress_of_winds.logic --- fortress_of_winds.logic | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index c97e043..432f7ac 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -9,12 +9,14 @@ area FortressOfWinds: room F1CentralRoom: node North: chest Chest + lock EastDoor + lock WestDoor node NorthEast: door NorthEast - North <-> NorthEast: flag EastDoorUnlocked + North <-> NorthEast: open EastDoor node NorthWest: door NorthWest - North <-> NorthWest: flag WestDoorUnlocked + North <-> NorthWest: open WestDoor node Main: door Stair door South @@ -30,16 +32,17 @@ area FortressOfWinds: room F1CloneButtons: node Main: door West + lock Door node Key: chest Key node South: door South - Main <-> South: flag DoorUnlocked + Main <-> South: open Door node MainMinish: door WestMinish node SouthMinish: door SouthMinish - MainMinish <-> SouthMinish: flag DoorUnlocked + MainMinish <-> SouthMinish: open Door room F1Darknut: node Main: exit East @@ -83,6 +86,7 @@ area FortressOfWinds: door North exit RoofHole entrance Hole + flag DoorOpen chest EastChest chest WestChest node South: @@ -154,15 +158,17 @@ area FortressOfWinds: Main <-> East: ( item Cape | item CanSplit2 ) node East: door South + lock Door node EastBigDoor: door North - East <-> EastBigDoor: flag DoorUnlocked + East <-> EastBigDoor: open Door room F2East: node East: door SouthEast + lock SouthEastDoor node NorthEast: entrance EastHoles - East -> NorthEast: flag DoorUnlocked + East -> NorthEast: open SouthEastDoor node West: door SouthWest entrance WestHole From 4294b66da46cb51c998a440c4d0e7fda5451693f Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 21 Apr 2021 16:13:56 +0200 Subject: [PATCH 4/9] Update fortress_of_winds.logic --- fortress_of_winds.logic | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index 432f7ac..9667ba1 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -158,10 +158,12 @@ area FortressOfWinds: Main <-> East: ( item Cape | item CanSplit2 ) node East: door South - lock Door - node EastBigDoor: - door North - East <-> EastBigDoor: open Door + node EastBigDoorEntrance: + entrance North + node EastBigDoorExit: + exit North + East -> EastBigDoorEntrance: flag BigDoorUnlocked + EastBigDoorExit -> East: flag BigDoorUnlocked room F2East: node East: door SouthEast From b9bbc957d5906c0761c95fcc904d105a721ccdf5 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sat, 1 May 2021 12:26:30 +0200 Subject: [PATCH 5/9] Update fortress_of_winds.logic --- fortress_of_winds.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index 9667ba1..4615507 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -155,9 +155,9 @@ area FortressOfWinds: door West node MainWest: flag KeyDropped - Main <-> East: ( item Cape | item CanSplit2 ) node East: door South + Main <-> East: ( item Cape | item CanSplit2 ) node EastBigDoorEntrance: entrance North node EastBigDoorExit: From ca438b362f3c29adc8d45184729a3f6a6e02323a Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 19 May 2021 16:46:26 +0200 Subject: [PATCH 6/9] Bob-omb logic --- fortress_of_winds.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index 4615507..59f0ab4 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -104,7 +104,7 @@ area FortressOfWinds: door NorthWest node North: door North - Upper <-> North: item BombBag + Upper <-> North: ( item Cape | flag TargetsHit ) node SouthWest: door SouthWest node South: From b1bc33810b3788d4ccd81d3cbb253b02349aa40a Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Fri, 28 Jan 2022 17:43:42 +0100 Subject: [PATCH 7/9] Update fortress_of_winds.logic --- fortress_of_winds.logic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index 59f0ab4..97c0323 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -162,7 +162,7 @@ area FortressOfWinds: entrance North node EastBigDoorExit: exit North - East -> EastBigDoorEntrance: flag BigDoorUnlocked + East -> EastBigDoorEntrance: item FoWBigKey EastBigDoorExit -> East: flag BigDoorUnlocked room F2East: node East: @@ -235,4 +235,4 @@ area FortressOfWinds: node PostFight: entrance South chest Chest - Main -> PostFight: defeat Wizrobes \ No newline at end of file + Main -> PostFight: defeat Wizrobes From a661336f724617bc62976cc12ea8062a84b10377 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 15 Oct 2023 13:08:24 +0200 Subject: [PATCH 8/9] change flag to set in nodes --- fortress_of_winds.logic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index 97c0323..42958bf 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -2,7 +2,7 @@ area FortressOfWinds: room F1BladeSpin: node North: door North - flag DoorOpen + set DoorOpen node South: door South North <-> South: flag DoorOpen @@ -86,7 +86,7 @@ area FortressOfWinds: door North exit RoofHole entrance Hole - flag DoorOpen + set DoorOpen chest EastChest chest WestChest node South: @@ -154,7 +154,7 @@ area FortressOfWinds: entrance Hole door West node MainWest: - flag KeyDropped + set KeyDropped node East: door South Main <-> East: ( item Cape | item CanSplit2 ) @@ -176,7 +176,7 @@ area FortressOfWinds: entrance WestHole node WestMinish: entrance MinishHole - flag KeyDropped + set KeyDropped room F2EyegoreButtons: node Main: door South From 49c380eaa206eeb19869589cd041cd87858ce9b8 Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 29 Sep 2024 16:41:58 +0200 Subject: [PATCH 9/9] FoW: Fixes Co-authored-By: Henny022 --- fortress_of_winds.logic | 218 +++++++++++++++++++++++++++++----------- 1 file changed, 157 insertions(+), 61 deletions(-) diff --git a/fortress_of_winds.logic b/fortress_of_winds.logic index 42958bf..eb827f2 100644 --- a/fortress_of_winds.logic +++ b/fortress_of_winds.logic @@ -22,9 +22,11 @@ area FortressOfWinds: door South enemy Eyegores North -> Main - Main -> North: defeat Eyegores + Main -> North: ( item Bow | item LightArrows ) node East: door East + node EastMinish: + door EastMinish East -> North node West: door West @@ -35,6 +37,8 @@ area FortressOfWinds: lock Door node Key: chest Key + node DropKey: + set KeyDropped node South: door South Main <-> South: open Door @@ -43,37 +47,50 @@ area FortressOfWinds: node SouthMinish: door SouthMinish MainMinish <-> SouthMinish: open Door + Main -> DropKey: ( helper CanClone2 | ( helper CanClone3 & trick CloneSlide )) + Main -> Key: flag KeyDropped room F1Darknut: + node East: + door East + node South: + door South node Main: - exit East - exit South enemy Darknut + target BlueWarp node PostFight: - entrance East - entrance South - Main -> PostFight: defeat Darknut + set GFCenterStairs.BlueWarp + node BlueWarp: + warp BlueWarp + Main -> PostFight: kill Darknut + Main -> BlueWarp: GFCenterStairs.BlueWarp + South -> Main + East -> Main + Main -> South: kill Darknut + Main -> East: kill Darknut room F1DropIn: node UpperMinish: door NorthMinish - door NorthWestMinish + door WestNorthMinish node LowerMinish: door WestMinish node Upper: door North - door NorthWest + door WestNorth node Lower: - door Wes + door West door South node East: - exit RoofHole + target RoofHoleEast + target RoofHoleWest + chest BigChest East -> Lower room F1EastMinishHole: node Main: door East - door UpperEast + door EastNorth door West node UpperMinish: - door UpperEastMinish + door EastNorthMinish door NorthMinish door WestMinish node LowerMinish: @@ -84,115 +101,168 @@ area FortressOfWinds: room F1EastStairs: node Main: door North - exit RoofHole - entrance Hole set DoorOpen chest EastChest chest WestChest + target South + node DropDown + target RoofHole + warp Hole + node DropDownMinish + target RoofMinishHole + warp MinishHole node South: - door South - Main <-> South: flag DoorOpen + warp South + Main -> South: flag DoorOpen + Main -> DropDown room F1EyeBridge: node East: + enemy Wallmaster door East node West: door West - East <-> West: ( item Cape | flag TargetsHit ) + East <-> West: flag TargetsHit + node Targets: + set TargetsHit + East -> Targets: ( item Bow | item LightArrows ) + West -> Targets: ( item Bow | item LightArrows ) room F1EyeDoor: node Upper: - door NorthEast - door NorthWest + door EastNorth + door EastWest + target North node North: - door North - Upper <-> North: ( item Cape | flag TargetsHit ) + warp North + Upper -> North: flag BombedWall + node BombWall: + set BombedWall + Upper -> BombWall: ( item BombBag | hasExplosive ) node SouthWest: door SouthWest node South: door South South <-> SouthWest: flag TargetShot + node Target: + set TargetShot + South -> Target: ( item Bow | item LightArrow ) room F1MinishPortal: node Main: door East door West - enemy WallMaster + enemy Floormaster node MainMinish: door EastMinish door WestMinish - Main -> MainMinish: ( defeat WallMaster & item CanTurnMinish ) - MainMinish -> Main: ( defeat WallMaster & item CanGrow ) + Main -> MainMinish: ( kill WallMaster & item CanTurnMinish ) + MainMinish -> Main: ( kill WallMaster & item CanGrow ) room F1Split: node SouthEast: door SouthEast node East: + lock F1CentralRoom.EastDoor + node NorthEast: door East - SouthEast -> East + node NorthEastMinish: + door EastMinish + SouthEast <-> East: open F1CentralRoom.EastDoor + East -> NorthEast node SouthWest: door SouthWest node West: door West - SouthWest -> West + lock F1CentralRoom.WestDoor + SouthWest <-> West: open F1CentralRoom.WestDoor room F1West: node Upper: door North - door NorthEast + door EastNorth + node East: + door EastSouth node Main: - exit South - exit SouthEast + target South enemy Enemies - node PostFight: - entrance South - entrance SouthEast - Main -> PostFight: defeat Enemies + node South: + warp South + Main -> South: kill Enemies + East -> Main + Main -> East: kill Enemies room F1WestStairs: node Main: door North - entrance Hole - exit RoofHole door StairDown + node DropDown + target RoofHole + warp Hole + Main -> DropDown room F2CenterKeyPull: node Main: - entrance Hole + warp Hole door West - node MainWest: + node MainEast: set KeyDropped + Main <-> MainEast: ( item Cape | item CanSplit2 | ( trick CloneSlide & ( item CanSplit 3 | item CanSplit4 ))) node East: door South - Main <-> East: ( item Cape | item CanSplit2 ) - node EastBigDoorEntrance: - entrance North - node EastBigDoorExit: - exit North - East -> EastBigDoorEntrance: item FoWBigKey - EastBigDoorExit -> East: flag BigDoorUnlocked + target RedWarp + set GFCenterStairs.RedWarp + node RedWarp: + warp RedWarp + East -> RedWarp: flag GFCenterStairs.RedWarp + node EastOpenBigDoor: + set BigDoor + node EastNorth: + door North + East -> EastOpenBigDoor: item FoWBigKey + EastNorth <-> East: flag BigDoor room F2East: node East: door SouthEast lock SouthEastDoor node NorthEast: - entrance EastHoles - East -> NorthEast: open SouthEastDoor - node West: + warp EastEastHole + warp EastWestHole + East <-> NorthEast: open SouthEastDoor + node Main: door SouthWest - entrance WestHole - node WestMinish: - entrance MinishHole + warp WestHole + node MainMinish: + door Armos + warp MinishHole + node WestOpenDoor: + set WestDoor + Main -> WestOpenDoor: ( helper CanClone2 | helper CanClone3 | helper CanClone4 ) + node NorthWest + node NorthWestMinish + Main <-> NorthWest: flag WestDoor + NorthWest -> NorthWestMinish: item CanTurnMinish + NorthWestMinish -> NorthWest: item CanGrow + NorthWestMinish <-> MainMinish: flag OpenDoor + node West + MainMinish -> West: item CanGrow + West -> MainMinish: item CanTurnMinish + node MainKeyDropped: set KeyDropped + Main -> MainKeyDropped: flag ArmosInteriors.Armos9.Active + West -> Main room F2EyegoreButtons: node Main: door South - enemy Eyegores node Chest: chest Chest - Main <-> Chest: defeat Eyegores + node Fight: + enemy Eyegores + Main -> Chest: defeat Eyegores + Main -> Fight: ( helper CanClone2 | helper CanClone3 | helper CanClone4 ) room F2MazaalRoom: node Main: - exit South + target South + target North enemy Mazaal node PostFight: - door North + warp North chest HP - entrance South - Main <-> PostFight: defeat Mazaal + warp South + Main -> PostFight: defeat Mazaal room F2PreMazaal: node Main: door South @@ -204,16 +274,36 @@ area FortressOfWinds: door North node East: door East - Main <-> East: flag TargetsShot - Main <-> North: flag TargetsShot + Main <-> East: flag EastTargetsShot + Main <-> North: flag NorthTargetsShot + node Targets: + set EastTargetsShot + set NorthTargetsShot + Main -> Targets: ( item Bow | item LightArrows ) room GFCenterStairs: node Main: door North door South + target RedWarp + target BlueWarp + target Wallmaster + node RedWarp: + warp RedWarp + node BlueWarp: + warp BlueWarp + Main -> RedWarp: flag RedWarp + Main -> BlueWarp: flag BlueWarp room GFEastStairs: node Main: door North door South + target DropDown + node MainMinish: + target DropDownMinish + door EastMinish + node Key: + chest Key + Main -> Key: F2East.KeyDropped room GFMinishHP: node Main: chest Chest @@ -228,11 +318,17 @@ area FortressOfWinds: node Main: door North door South + target DropDown + node Key: + chest Key + Main -> Key: F2CenterKeyPull.KeyDropped room GFWizrobes: node Main: - exit South enemy Wizrobes node PostFight: - entrance South chest Chest - Main -> PostFight: defeat Wizrobes + node South: + door South + South -> Main + Main -> South: kill Wizrobes + Main -> PostFight: kill Wizrobes