From f0d05bf6b7c36b374e1ad2a2caf95298084d5a32 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 18 Apr 2021 19:05:38 +0200 Subject: [PATCH 01/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 469 +++++++++++++++++++++++++---- 1 file changed, 411 insertions(+), 58 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 2ee3579..266c03a 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -1,59 +1,412 @@ area DarkHyruleCastle: - room B1BigChest - room B1EastCannons - room B1EastUpperPath - room B1Firebar - room B1JailStairs - room B1KeatonBombWall - room B1MinishPortal - room B1PostqhroneStairs - room B1PreThroneStairs - room B1ShrineEntry - room B1ThroneStairs - room B1WestLockedDoor - room B2Jail - room B2MinishDrop - room B2Staircase - room F1BigKeyChest - room F1BigKeyDoor - room F1DarkKnight - room F1EastEntry - room F1NortheastBigDoor - room F1NortheastHologhini - room F1NortheastLanternTrial - room F1NortheastTower - room F1NorthwestArrowTrial - room F1NorthwestBigDoor - room F1NorthwestTower - room F1SouthCloneEntry - room F1SoutheastBigDoor - room F1SoutheastCloneSwitches - room F1SoutheastTower - room F1SouthwestBigDoor - room F1SouthwestHologhini - room F1SouthwestPathPuzzle - room F1SouthwestTower - room F1SparkRoom - room F1WestSwitchDoor - room F2KeatonPath - room F2NortheastTower - room F2NorthwestTower - room F2SoutheastTower - room F2SouthwestTower - room F2TripleDarknut - room GFCloneBlade - room GFFrontEntrance - room GFNortheastPath - room GFNortheastTower - room GFNorthwestPath - room GFPathPuzzle - room GFPostThrone - room GFPreThrone - room GFSouthPath - room GFSoutheastPath - room GFSoutheastTower - room GFSouthwestPath - room GFSouthwestTower - room GFSouthwestTower - room GFThrone - room GFWestCannons + room B1BigChest: + node North: + door North + node East: + door East + door EastStair + node West: + chest Chest + door West + door WestStair + West -> North + East -> West + room B1EastCannons: + node Main: + door South + enemy Cannons + node North: + door North + Main <-> North: defeat Cannons + room B1EastUpperPath: + node Lower: + door West + node Upper: + door North + door South + Upper -> Lower + room B1Firebar: + node Main: + door North + door South + entrance Hole + node MainMinish: + door NorthMinish + door SouthMinish + entrance HoleMinish + room B1JailStairs: + node East: + door East + node Main: + door StairDown + door South + Main <-> East: item BombBag + room B1KeatonBombWall: + node Main: + door South + node West: + door West + Main <-> West: item BombBag + room B1MinishPortal: + node East: + door East + node North: + door North + East <-> North: item BombBag + node West: + door West + node WestMinish: + door WestMinish + West -> WestMinish: item CanTurnMinish + WestMinish -> West: item CanGrow + room B1PostThroneStairs: + node Main: + door Stair + door West + room B1PreThroneStairs: + node Main: + door Stair + door South + room B1ShrineEntry: + node Main: + door East + door North + door South + door West + room B1ThroneStairs: + node Main: + door Stair + door East + room B1WestLockedDoor: + node Main: + door East + door North + door South + room B2Jail: + node MainMinish: + door MinishHole + door WestMinish + flag DoorsUnlocked + node Main: + door West + node King: + chest King + Main <-> King: flag DoorsUnlocked + room B2MinishDrop: + node Main: + exit Hole + door North + node MainMinish: + exit HoleMinish + door NorthMinish + room B2Staircase: + node Main: + door Stair + door East + door South + node MainMinish: + door EastMinish + door SouthMinish + door EastMinishHole + room F1BigKeyChest: + node Main: + door South + node Chest: + chest Chest + Main <-> Chest: ( item CanSplit4 | flag BlocksUnlocked) + room F1BigKeyDoor: + node Main + exit Portal + enemy ChainSoldier + node PostFight + entrance Portal + node North: + door North + node East: + door East + node West: + door West + Main <-> PostFight: defeat ChainSoldier + Main <-> East: defeat ChainSoldier + Main <-> West: defeat ChainSoldier + Main <-> North: flag DoorUnlocked + room F1DarkKnight: + node Fight: + exit North + exit South + exit Portal + enemy Darknut + node PostFight: + entrance North + entrance South + entrance Portal + Fight -> PostFight: defeat Darknut + room F1EastEntry: + node North: + door North + node South: + door South + North -> South: item Cape + node NorthEast: + door NorthEast + node SouthEast: + door SouthEast + NorthEast -> SouthEast: item CanSplit4 + room F1NortheastBigDoor: + node Main: + door South + door West + node Fight: + enemy Darknut + node PostFight: + door North + Main -> Fight: flag DarknutsSpawned + Main <-> PostFight: defeat Darknut + room F1NortheastHologhini: + node Fight: + enemy Ghini + exit South + exit East + node PostFight: + entrance south + entrance East + Fight -> PostFight: defeat Ghini + room F1NortheastLanternTrial: + node Main: + door South + node North: + door North + Main <-> North: flag LanternsLit + room F1NortheastTower: + node East: + door StairDown + door South + node West: + door West + door StairDown + enemy Spark + room F1NorthwestArrowTrial: + node Main: + door South + node West: + door West + Main <-> West: flag TargetsShot + room F1NorthwestBigDoor: + node Main: + door South + door East + node Fight: + enemy Darknut + node PostFight: + door North + Main -> Fight: flag DarknutsSpawned + Main <-> PostFight: defeat Darknut + room F1NorthwestTower: + node MainEast: + door East + door Hole + entrance South + entrance hole + node MainNorth: + door StairUp + door StairDown + exit South + MainNorth -> MainEast + room F1SouthCloneEntry: + node Main: + door South + node North: + door North + Main <-> North: flag SwitchesActivated + room F1SoutheastBigDoor: + node Main: + door West + node Fight: + enemy Darknut + node PostFight: + door South + Main -> Fight: flag DarknutsSpawned + Main <-> PostFight: defeat Darknut + room F1SoutheastCloneSwitches: + node Main: + door North + node East: + door East + Main <-> East: flag SwitchesActivated + room F1SoutheastTower: + node North: + door West + door StairDown + door StairUp + entrance Hole + node South: + door South + room F1SouthwestBigDoor: + node Main: + door North + door East + node Fight: + enemy Darknut + node PostFight: + door South + Main -> Fight: flag DarknutsSpawned + Main <-> PostFight: defeat Darknut + room F1SouthwestHologhini: + node Main: + door North + enemy Ghini + node South: + door South + Main <-> South: defeat Ghini + room F1SouthwestPathPuzzle: + node Main: + door North + flag PuzzleCompleted + node South: + door South + North <-> South: flag PuzzleCompleted + room F1SouthwestTower: + node Main: + door StairUp + door StairDown + door South + room F1SparkRoom: + node Main: + door East + door North + door West + enemy Sparks + room F1WestSwitchDoor: + node South: + door South + node North: + door North + South <-> North: ( item BombBag & item Cape & ( item Bow | item Boomerang ) ) + room F2KeatonPath: + node Main: + door South + exit North + enemy Keatons + node NorthEntrance: + entrance North + Main -> NorthEntrance: item CanSplit4 + room F2NortheastTower: + node Main: + chest Chest + room F2NorthwestTower: + node Main: + chest Chest + room F2SoutheastTower: + node Main: + chest Chest + room F2SouthwestTower: + node Main: + chest Chest + room F2TripleDarknut: + node Main: + exit South + exit North + enemy Darknuts + node PostFight: + entrance North + Main -> PostFight: defeat Darknuts + node VaatiFight: + exit Roof + enemy Vaati + node PostVaatiFight: + entrance Warp + VaatiFight -> PostVaatiFight: defeat Vaati + room GFCloneBlade: + node North: + door North + node Chest: + chest Chest + node South: + door South + North -> Chest: item CanSplit4 + North -> South + room GFFrontEntrance: + node Main: + door North + exit East + door West + door South + exit RedPortal + exit BluePortal + node RedPortal: + entrance RedPortal + node BluePortal: + entrance BluePortal + Main -> RedPortal: flag RedPortal + Main -> BluePortal: flag BluePortal + node EastStair: + entrance East + Main -> EastStair: flag DoorUnlocked + room GFNortheastPath: + node Main: + door South + door West + room GFNortheastTower: + node Main: + door StairUp + door West + room GFNorthwestPath: + node Main: + door East + door South + room GFPathPuzzle: + node Main: + door West + flag PuzzleCompleted + node East: + door East + Main <-> East: flag PuzzleCompleted + room GFPostThrone: + node East: + door Stair + door East + node West: + door West + chest Chest + room GFPreThrone: + node Main: + door Stair + door North + room GFSouthPath: + node Main: + door South + door East + door West + room GFSoutheastPath: + node Main: + door North + door West + room GFSoutheastTower: + node Main: + door StairUp + exit RoofHole + room GFSouthwestPath: + node Main: + door North + door East + room GFSouthwestTower: + node Main: + door StairUp + room GFThrone: + node Fight: + exit Stair + exit East + exit West + enemy Darknut + node PostFight: + entrance Stair + entrance East + entrance West + Fight -> PostFight: defeat Darknut + room GFWestCannons: + node Main: + door South + enemy Cannons + node North: + door North + Main <-> North: defeat Cannons \ No newline at end of file From b1906d044fe1438b5bf082d311832b92fa965797 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 18 Apr 2021 19:07:53 +0200 Subject: [PATCH 02/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 266c03a..cb424a4 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -115,10 +115,10 @@ area DarkHyruleCastle: chest Chest Main <-> Chest: ( item CanSplit4 | flag BlocksUnlocked) room F1BigKeyDoor: - node Main + node Main: exit Portal enemy ChainSoldier - node PostFight + node PostFight: entrance Portal node North: door North From 97f96794f7f9a7c209babcab78a5985066a7e736 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 18 Apr 2021 19:09:03 +0200 Subject: [PATCH 03/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index cb424a4..18cd629 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -168,7 +168,7 @@ area DarkHyruleCastle: exit South exit East node PostFight: - entrance south + entrance South entrance East Fight -> PostFight: defeat Ghini room F1NortheastLanternTrial: From b27ace1b3a73dcdf09381723e48ff0a9c0031351 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 18 Apr 2021 19:10:10 +0200 Subject: [PATCH 04/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 18cd629..6ed6528 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -204,9 +204,8 @@ area DarkHyruleCastle: room F1NorthwestTower: node MainEast: door East - door Hole entrance South - entrance hole + entrance Hole node MainNorth: door StairUp door StairDown From 7868791d62c9dd9a9b1ab2f92fa457802cad644a Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 21 Apr 2021 15:25:23 +0200 Subject: [PATCH 05/15] Update dark_hyrule_castle.logic add lock syntax for locked doors --- tmc/logic/dark_hyrule_castle.logic | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 6ed6528..f61bb71 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -111,9 +111,13 @@ area DarkHyruleCastle: room F1BigKeyChest: node Main: door South + lock Block1 + lock Block2 + lock Block3 + lock Block4 node Chest: chest Chest - Main <-> Chest: ( item CanSplit4 | flag BlocksUnlocked) + Main <-> Chest: ( open Block1 & open Block2 & open Block3 & open Block4 ) room F1BigKeyDoor: node Main: exit Portal @@ -330,6 +334,7 @@ area DarkHyruleCastle: exit East door West door South + lock EastDoor exit RedPortal exit BluePortal node RedPortal: @@ -340,7 +345,7 @@ area DarkHyruleCastle: Main -> BluePortal: flag BluePortal node EastStair: entrance East - Main -> EastStair: flag DoorUnlocked + Main -> EastStair: open EastDoor room GFNortheastPath: node Main: door South From 2531642fc1804f6a1e7d04a8d6b22251e863a752 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 21 Apr 2021 15:27:00 +0200 Subject: [PATCH 06/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index f61bb71..8b687c9 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -122,6 +122,7 @@ area DarkHyruleCastle: node Main: exit Portal enemy ChainSoldier + lock BigKeyDoor node PostFight: entrance Portal node North: @@ -133,7 +134,7 @@ area DarkHyruleCastle: Main <-> PostFight: defeat ChainSoldier Main <-> East: defeat ChainSoldier Main <-> West: defeat ChainSoldier - Main <-> North: flag DoorUnlocked + Main <-> North: open BigKeyDoor room F1DarkKnight: node Fight: exit North From 228e7cb096a423e39de64b1fad7c12e36430f712 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 21 Apr 2021 16:27:46 +0200 Subject: [PATCH 07/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 8b687c9..7d3bc33 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -125,8 +125,11 @@ area DarkHyruleCastle: lock BigKeyDoor node PostFight: entrance Portal - node North: - door North + node NorthExit: + exit North + node NorthEntrance: + entrance North + flag BigKeyDoorOpen node East: door East node West: @@ -134,7 +137,8 @@ area DarkHyruleCastle: Main <-> PostFight: defeat ChainSoldier Main <-> East: defeat ChainSoldier Main <-> West: defeat ChainSoldier - Main <-> North: open BigKeyDoor + NorthExit -> Main: flag BigKeyDoorOpen + Main -> NorthEntrance: flag BigKeyDoorOpen room F1DarkKnight: node Fight: exit North From 0b07ea9d93518f398d620468e76517c6783491c4 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sat, 1 May 2021 12:01:17 +0200 Subject: [PATCH 08/15] Update dark_hyrule_castle.logic Fixed a node name --- tmc/logic/dark_hyrule_castle.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 7d3bc33..2a88ec2 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -267,7 +267,7 @@ area DarkHyruleCastle: door South Main <-> South: defeat Ghini room F1SouthwestPathPuzzle: - node Main: + node North: door North flag PuzzleCompleted node South: From 8fbd594faf1799f3651e3e28209abd731a0bbf96 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 19 May 2021 16:47:58 +0200 Subject: [PATCH 09/15] bob-omb logic --- tmc/logic/dark_hyrule_castle.logic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 2a88ec2..485ebd4 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -40,19 +40,19 @@ area DarkHyruleCastle: node Main: door StairDown door South - Main <-> East: item BombBag + Main <-> East: ( item BombBag | state HasExplosive ) room B1KeatonBombWall: node Main: door South node West: door West - Main <-> West: item BombBag + Main <-> West: ( item BombBag | state HasExplosive ) room B1MinishPortal: node East: door East node North: door North - East <-> North: item BombBag + East <-> North: ( item BombBag | state HasExplosive ) node West: door West node WestMinish: @@ -289,7 +289,7 @@ area DarkHyruleCastle: door South node North: door North - South <-> North: ( item BombBag & item Cape & ( item Bow | item Boomerang ) ) + South <-> North: ( ( item BombBag | state HasExplosive ) & item Cape & ( item Bow | item Boomerang ) ) room F2KeatonPath: node Main: door South From 69f5eea25675d213a6bd2e448198213e44f8eea1 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Fri, 28 Jan 2022 17:44:37 +0100 Subject: [PATCH 10/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 485ebd4..88cdaf0 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -138,7 +138,7 @@ area DarkHyruleCastle: Main <-> East: defeat ChainSoldier Main <-> West: defeat ChainSoldier NorthExit -> Main: flag BigKeyDoorOpen - Main -> NorthEntrance: flag BigKeyDoorOpen + Main -> NorthEntrance: item DHCBigKey room F1DarkKnight: node Fight: exit North @@ -418,4 +418,4 @@ area DarkHyruleCastle: enemy Cannons node North: door North - Main <-> North: defeat Cannons \ No newline at end of file + Main <-> North: defeat Cannons From f20ba9d850dd0d88b146e011fd9f549212b62327 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 15 Oct 2023 13:12:40 +0200 Subject: [PATCH 11/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 88cdaf0..32226ff 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -86,7 +86,7 @@ area DarkHyruleCastle: node MainMinish: door MinishHole door WestMinish - flag DoorsUnlocked + set DoorsUnlocked node Main: door West node King: @@ -129,7 +129,7 @@ area DarkHyruleCastle: exit North node NorthEntrance: entrance North - flag BigKeyDoorOpen + set BigKeyDoorOpen node East: door East node West: @@ -269,7 +269,7 @@ area DarkHyruleCastle: room F1SouthwestPathPuzzle: node North: door North - flag PuzzleCompleted + set PuzzleCompleted node South: door South North <-> South: flag PuzzleCompleted @@ -366,7 +366,7 @@ area DarkHyruleCastle: room GFPathPuzzle: node Main: door West - flag PuzzleCompleted + set PuzzleCompleted node East: door East Main <-> East: flag PuzzleCompleted From 06498e1221785f1ffef7645852b9ea9e1174b2cb Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 15 Oct 2023 17:19:56 +0200 Subject: [PATCH 12/15] Changed exit/entrance to target/warp Could not validate because lock is not implemented --- tmc/logic/dark_hyrule_castle.logic | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index 32226ff..b53c470 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -29,11 +29,11 @@ area DarkHyruleCastle: node Main: door North door South - entrance Hole + warp Hole node MainMinish: door NorthMinish door SouthMinish - entrance HoleMinish + warp HoleMinish room B1JailStairs: node East: door East @@ -94,10 +94,10 @@ area DarkHyruleCastle: Main <-> King: flag DoorsUnlocked room B2MinishDrop: node Main: - exit Hole + target Hole door North node MainMinish: - exit HoleMinish + target HoleMinish door NorthMinish room B2Staircase: node Main: @@ -120,15 +120,15 @@ area DarkHyruleCastle: Main <-> Chest: ( open Block1 & open Block2 & open Block3 & open Block4 ) room F1BigKeyDoor: node Main: - exit Portal + target Portal enemy ChainSoldier lock BigKeyDoor node PostFight: - entrance Portal + warp Portal node NorthExit: - exit North + target North node NorthEntrance: - entrance North + warp North set BigKeyDoorOpen node East: door East @@ -141,14 +141,14 @@ area DarkHyruleCastle: Main -> NorthEntrance: item DHCBigKey room F1DarkKnight: node Fight: - exit North - exit South - exit Portal + target North + target South + target Portal enemy Darknut node PostFight: - entrance North - entrance South - entrance Portal + warp North + warp South + warp Portal Fight -> PostFight: defeat Darknut room F1EastEntry: node North: @@ -174,11 +174,11 @@ area DarkHyruleCastle: room F1NortheastHologhini: node Fight: enemy Ghini - exit South - exit East + target South + target East node PostFight: - entrance South - entrance East + warp South + warp East Fight -> PostFight: defeat Ghini room F1NortheastLanternTrial: node Main: @@ -213,12 +213,12 @@ area DarkHyruleCastle: room F1NorthwestTower: node MainEast: door East - entrance South - entrance Hole + warp South + warp Hole node MainNorth: door StairUp door StairDown - exit South + target South MainNorth -> MainEast room F1SouthCloneEntry: node Main: @@ -246,7 +246,7 @@ area DarkHyruleCastle: door West door StairDown door StairUp - entrance Hole + warp Hole node South: door South room F1SouthwestBigDoor: @@ -293,10 +293,10 @@ area DarkHyruleCastle: room F2KeatonPath: node Main: door South - exit North + target North enemy Keatons node NorthEntrance: - entrance North + warp North Main -> NorthEntrance: item CanSplit4 room F2NortheastTower: node Main: @@ -312,17 +312,17 @@ area DarkHyruleCastle: chest Chest room F2TripleDarknut: node Main: - exit South - exit North + target South + target North enemy Darknuts node PostFight: - entrance North + warp North Main -> PostFight: defeat Darknuts node VaatiFight: - exit Roof + target Roof enemy Vaati node PostVaatiFight: - entrance Warp + warp Warp VaatiFight -> PostVaatiFight: defeat Vaati room GFCloneBlade: node North: @@ -336,20 +336,20 @@ area DarkHyruleCastle: room GFFrontEntrance: node Main: door North - exit East + target East door West door South lock EastDoor - exit RedPortal - exit BluePortal + target RedPortal + target BluePortal node RedPortal: - entrance RedPortal + warp RedPortal node BluePortal: - entrance BluePortal + warp BluePortal Main -> RedPortal: flag RedPortal Main -> BluePortal: flag BluePortal node EastStair: - entrance East + warp East Main -> EastStair: open EastDoor room GFNortheastPath: node Main: @@ -393,7 +393,7 @@ area DarkHyruleCastle: room GFSoutheastTower: node Main: door StairUp - exit RoofHole + target RoofHole room GFSouthwestPath: node Main: door North @@ -403,14 +403,14 @@ area DarkHyruleCastle: door StairUp room GFThrone: node Fight: - exit Stair - exit East - exit West + target Stair + target East + target West enemy Darknut node PostFight: - entrance Stair - entrance East - entrance West + warp Stair + warp East + warp West Fight -> PostFight: defeat Darknut room GFWestCannons: node Main: From b1ea8888a8ee235a6b8f7228cd45d05f8dc8b1d7 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Sun, 15 Oct 2023 19:47:29 +0200 Subject: [PATCH 13/15] Update dark_hyrule_castle.logic --- tmc/logic/dark_hyrule_castle.logic | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index b53c470..df9ed28 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -17,7 +17,7 @@ area DarkHyruleCastle: enemy Cannons node North: door North - Main <-> North: defeat Cannons + Main <-> North: kill Cannons room B1EastUpperPath: node Lower: door West @@ -134,9 +134,9 @@ area DarkHyruleCastle: door East node West: door West - Main <-> PostFight: defeat ChainSoldier - Main <-> East: defeat ChainSoldier - Main <-> West: defeat ChainSoldier + Main <-> PostFight: kill ChainSoldier + Main <-> East: kill ChainSoldier + Main <-> West: kill ChainSoldier NorthExit -> Main: flag BigKeyDoorOpen Main -> NorthEntrance: item DHCBigKey room F1DarkKnight: @@ -149,7 +149,7 @@ area DarkHyruleCastle: warp North warp South warp Portal - Fight -> PostFight: defeat Darknut + Fight -> PostFight: kill Darknut room F1EastEntry: node North: door North @@ -170,7 +170,7 @@ area DarkHyruleCastle: node PostFight: door North Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: defeat Darknut + Main <-> PostFight: kill Darknut room F1NortheastHologhini: node Fight: enemy Ghini @@ -179,7 +179,7 @@ area DarkHyruleCastle: node PostFight: warp South warp East - Fight -> PostFight: defeat Ghini + Fight -> PostFight: kill Ghini room F1NortheastLanternTrial: node Main: door South @@ -209,7 +209,7 @@ area DarkHyruleCastle: node PostFight: door North Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: defeat Darknut + Main <-> PostFight: kill Darknut room F1NorthwestTower: node MainEast: door East @@ -234,7 +234,7 @@ area DarkHyruleCastle: node PostFight: door South Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: defeat Darknut + Main <-> PostFight: kill Darknut room F1SoutheastCloneSwitches: node Main: door North @@ -258,14 +258,14 @@ area DarkHyruleCastle: node PostFight: door South Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: defeat Darknut + Main <-> PostFight: kill Darknut room F1SouthwestHologhini: node Main: door North enemy Ghini node South: door South - Main <-> South: defeat Ghini + Main <-> South: kill Ghini room F1SouthwestPathPuzzle: node North: door North @@ -317,13 +317,13 @@ area DarkHyruleCastle: enemy Darknuts node PostFight: warp North - Main -> PostFight: defeat Darknuts + Main -> PostFight: kill Darknuts node VaatiFight: target Roof enemy Vaati node PostVaatiFight: warp Warp - VaatiFight -> PostVaatiFight: defeat Vaati + VaatiFight -> PostVaatiFight: kill Vaati room GFCloneBlade: node North: door North @@ -411,11 +411,11 @@ area DarkHyruleCastle: warp Stair warp East warp West - Fight -> PostFight: defeat Darknut + Fight -> PostFight: kill Darknut room GFWestCannons: node Main: door South enemy Cannons node North: door North - Main <-> North: defeat Cannons + Main <-> North: kill Cannons From 508a13ac782b04dc10192e4c23c6eec24b95a579 Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 27 Oct 2024 17:07:38 +0100 Subject: [PATCH 14/15] DHC: fixes Co-authored-By: Henny022 --- tmc/logic/dark_hyrule_castle.logic | 272 +++++++++++++++++++++-------- 1 file changed, 196 insertions(+), 76 deletions(-) diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic index df9ed28..effd7d7 100644 --- a/tmc/logic/dark_hyrule_castle.logic +++ b/tmc/logic/dark_hyrule_castle.logic @@ -3,21 +3,23 @@ area DarkHyruleCastle: node North: door North node East: - door East + door NorthEast door EastStair node West: chest Chest - door West + door NorthWest door WestStair West -> North East -> West + node WestMinish: + door NorthMinish room B1EastCannons: node Main: door South - enemy Cannons node North: door North - Main <-> North: kill Cannons + Main <-> North: flag Cannons + Main -> ExplodeCannons: (helper CanSplit4 | (((trick Bombing | (item RemoteBombs & trick RemoteBombing)) & item BombBag) & item Sword) | (trick TwoClones & helper CanSplit3) | (trick PossiblyImpossibleOneClone & helper CanSplit2)) # no idea if red sword is possible room B1EastUpperPath: node Lower: door West @@ -37,28 +39,47 @@ area DarkHyruleCastle: room B1JailStairs: node East: door East + node BombWall: + set WallBombed node Main: door StairDown door South - Main <-> East: ( item BombBag | state HasExplosive ) + Main -> BombWall: ( item BombBag | state HasExplosive ) + Main <-> East: flag WallBombed + node EastMinish: + door EastMinish + node MainMinish: + door SouthMinish + EastMinish <-> MainMinish: flag WallBombed room B1KeatonBombWall: node Main: door South node West: door West - Main <-> West: ( item BombBag | state HasExplosive ) + node BombWall: + set WallBombed + Main <-> West: flag WallBombed + Main -> BombWall: ( item BombBag | state HasExplosive ) room B1MinishPortal: node East: door East node North: door North - East <-> North: ( item BombBag | state HasExplosive ) + node EastBomb: + set B1KeatonBombWall.WallBombed + East <-> North: flag B1KeatonBombWall.WallBombed node West: door West node WestMinish: door WestMinish - West -> WestMinish: item CanTurnMinish - WestMinish -> West: item CanGrow + node WestMain + node WestMainMinish + node WestBomb: + set B1JailStairs.WallBombed + West <-> WestMain: flag B1JailStairs.WallBombed + WestMinish <-> WestMainMinish: flag B1JailStairs.WallBombed + WestMain -> WestMainMinish: helper CanTurnMinish + WestMainMinish -> WestMain: helper CanGrow room B1PostThroneStairs: node Main: door Stair @@ -81,17 +102,32 @@ area DarkHyruleCastle: node Main: door East door North + lock Door + node South: door South + Main <-> South: open Door + node MainMinish: + door NorthMinish + node SouthMinish: + door SouthMinish + MainMinish <-> SouthMinish: open Door room B2Jail: node MainMinish: - door MinishHole door WestMinish - set DoorsUnlocked node Main: door West node King: chest King - Main <-> King: flag DoorsUnlocked + node KingJail + node PortalJail: + set DoorsUnlocked + node PortalJailMinish: + door MinishHole + PortalJailMinish -> PortalJail: helper CanGrow + PortalJail -> PortalJailMinish: helper CanTurnMinish + Main <-> PortalJail: flag DoorsUnlocked + Main <-> KingJail: flag DoorsUnlocked + KingJail -> King: ( item FourSword & helper CanSpin ) room B2MinishDrop: node Main: target Hole @@ -117,39 +153,45 @@ area DarkHyruleCastle: lock Block4 node Chest: chest Chest - Main <-> Chest: ( open Block1 & open Block2 & open Block3 & open Block4 ) + Main -> Chest: ( open Block1 & open Block2 & open Block3 & open Block4 & helper CanSplit4 ) room F1BigKeyDoor: node Main: target Portal enemy ChainSoldier - lock BigKeyDoor + node OpenBigKeyDoor: + set BigKeyDoorOpen node PostFight: + set GFFrontEntrance.RedPortal + node RedPortal: warp Portal node NorthExit: target North node NorthEntrance: warp North - set BigKeyDoorOpen node East: door East node West: door West Main <-> PostFight: kill ChainSoldier + Main -> RedPortal: flag GFFrontEntrance.RedPortal Main <-> East: kill ChainSoldier Main <-> West: kill ChainSoldier NorthExit -> Main: flag BigKeyDoorOpen - Main -> NorthEntrance: item DHCBigKey + Main -> NorthEntrance: flag BigKeyDoorOpen + Main -> OpenBigKeyDoor: item DHCBigKey room F1DarkKnight: - node Fight: - target North - target South + node North: + door North + node South: + door South + node Main: target Portal enemy Darknut - node PostFight: - warp North - warp South + node BluePortal: warp Portal - Fight -> PostFight: kill Darknut + Main -> South: kill Darknut + Main -> North: kill Darknut + Main -> BluePortal: flag GFFrontEntrance.BluePortal room F1EastEntry: node North: door North @@ -157,114 +199,151 @@ area DarkHyruleCastle: door South North -> South: item Cape node NorthEast: - door NorthEast + door EastNorth node SouthEast: - door SouthEast - NorthEast -> SouthEast: item CanSplit4 + door EastSouth + NorthEast -> SouthEast: helper CanSplit4 room F1NortheastBigDoor: - node Main: + node Main: # if you get here after having killed a darknut, without being able to kill a darknut, that's a you problem :P door South door West node Fight: enemy Darknut - node PostFight: + node North: door North - Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: kill Darknut + Main -> Fight: kill F1DarkKnight.Darknut + Main -> North: kill Darknut + North -> Main room F1NortheastHologhini: - node Fight: + node East: + door East + node Main: enemy Ghini - target South - target East - node PostFight: - warp South - warp East - Fight -> PostFight: kill Ghini + door South + Main <-> East: kill Ghini room F1NortheastLanternTrial: node Main: door South node North: door North + node LightLanters: + set LanternsLit Main <-> North: flag LanternsLit + Main -> LightLanters: item Lantern room F1NortheastTower: node East: door StairDown door South node West: door West - door StairDown - enemy Spark + node WestMain: + door StairUp + WestMain <-> West: kill F1NortheastHologhini.Ghini room F1NorthwestArrowTrial: node Main: door South node West: door West + node Shootout: + set TargetsShot Main <-> West: flag TargetsShot + Main -> Shootout: ( item Bow | item LightArrows ) room F1NorthwestBigDoor: - node Main: + node Main: # if you get here after having killed a darknut, without being able to kill a darknut, that's a you problem :P door South door East node Fight: enemy Darknut - node PostFight: + node North: door North - Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: kill Darknut + Main -> Fight: kill F1DarkKnight.Darknut + Main -> North: kill Darknut + North -> Main room F1NorthwestTower: - node MainEast: + node EastRocksNotPushed: door East - warp South + node EastSouthRocksPushed: + warp East warp Hole - node MainNorth: - door StairUp - door StairDown + node SouthWarp: + warp South + EastRocksNotPushed -> EastSouthRocksPushed + EastSouthRocksPushed -> SouthWarp: flag Button + node MainRocksNotPushed: target South - MainNorth -> MainEast + door StairsUp + door StairsDown + warp Hole + set Button + node MainRocksPushed: + warp StairsUp + warp StairsDown + warp East + warp Hole + set Button + MainRocksNotPushed -> MainRocksPushed + MainRocksNotPushed -> SouthWarp: flag Button + MainRocksPushed -> SouthWarp: flag Button room F1SouthCloneEntry: node Main: door South node North: door North - Main <-> North: flag SwitchesActivated + Main -> North: flag SwitchesActivated + North -> Main + node Switches: + set SwitchesActivated + Main -> Switches: ( helper CanSpin | ( item BombBag & ( trick Swordless | item Sword )) | helper CanSplit3 | helper CanSplit4 ) room F1SoutheastBigDoor: - node Main: + node Main: # if you get here after having killed a darknut, without being able to kill a darknut, that's a you problem :P + door North door West node Fight: enemy Darknut - node PostFight: + node South: door South - Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: kill Darknut + Main -> Fight: kill F1DarkKnight.Darknut + Main -> South: kill Darknut + South -> Main room F1SoutheastCloneSwitches: node Main: door North node East: door East Main <-> East: flag SwitchesActivated + node Switches: + set SwitchesActivated + Main -> Switches: (helper CanSpin | (item BombBag & (trick Swordless | item Sword)) | (item RemoteBombs & item Sword) | helper CanSplit2 | helper CanSplit3 | helper CanSplit4) room F1SoutheastTower: node North: door West door StairDown - door StairUp + target StairUp warp Hole + set Button + node StairUp: + warp StairUp node South: door South + North -> StairUp: flag Button room F1SouthwestBigDoor: - node Main: + node Main: # if you get here after having killed a darknut, without being able to kill a darknut, that's a you problem :P door North door East node Fight: enemy Darknut - node PostFight: + node South: door South - Main -> Fight: flag DarknutsSpawned - Main <-> PostFight: kill Darknut + Main -> Fight: kill F1DarkKnight.Darknut + Main -> South: kill Darknut + South -> Main room F1SouthwestHologhini: node Main: door North enemy Ghini + target South node South: - door South + warp South Main <-> South: kill Ghini room F1SouthwestPathPuzzle: node North: @@ -289,32 +368,56 @@ area DarkHyruleCastle: door South node North: door North - South <-> North: ( ( item BombBag | state HasExplosive ) & item Cape & ( item Bow | item Boomerang ) ) + node Middle + node Upper + node Switches: + set EastSwitch + set WestSwitch + node BombRocks: + set EastRock + set CenterRock + set WestRock + node Enemies: + enemy Bobombs + South <-> Upper: item Cape + Middle -> BombRocks: ( item BombBag | hasExplosive ) + South -> BombRocks: ( item BombBag | hasExplosive | ( item GustJar & providesExplosive Bobombs )) + South -> Enemies + Enemies -> South: ( loseExplosive | trick RunInThereAndGrabABomb ) + Upper -> Switches: helper HasProjectileDamage + North <-> Middle: ( flag EastSwitch & flag WestSwitch ) + South <-> Middle: ( flag EastRock | flag CenterRock | flag WestRock ) room F2KeatonPath: node Main: door South - target North enemy Keatons - node NorthEntrance: - warp North - Main -> NorthEntrance: item CanSplit4 + node North: + door North + Main -> North: item CanSplit4 + North -> Main room F2NortheastTower: node Main: + door Stairs chest Chest room F2NorthwestTower: node Main: + door Stairs chest Chest room F2SoutheastTower: node Main: + node Stairs chest Chest room F2SouthwestTower: node Main: + door Stairs chest Chest room F2TripleDarknut: node Main: - target South target North enemy Darknuts + node South: + door South + South -> Main node PostFight: warp North Main -> PostFight: kill Darknuts @@ -327,11 +430,14 @@ area DarkHyruleCastle: room GFCloneBlade: node North: door North + node SpawnChest: + set Chest node Chest: chest Chest node South: door South - North -> Chest: item CanSplit4 + North -> SpawnChest: ( item CanSplit4 | ( trick ButtonShuffling & ( item CanSplit3 | item CanSplit2 ))) + North -> Chest: flag Chest North -> South room GFFrontEntrance: node Main: @@ -342,6 +448,7 @@ area DarkHyruleCastle: lock EastDoor target RedPortal target BluePortal + target Floormaster node RedPortal: warp RedPortal node BluePortal: @@ -359,10 +466,15 @@ area DarkHyruleCastle: node Main: door StairUp door West + room GFNorthwestTower: + node Main: + door StairUp + target RoofHole room GFNorthwestPath: node Main: door East door South + enemy Floormaster room GFPathPuzzle: node Main: door West @@ -402,20 +514,28 @@ area DarkHyruleCastle: node Main: door StairUp room GFThrone: - node Fight: + node South: + door South + node East: + door East + node Main: target Stair - target East - target West enemy Darknut - node PostFight: + node StairsDown: warp Stair - warp East - warp West - Fight -> PostFight: kill Darknut + node ThronePush: + set ThronePushed + Main -> ThronePush: kill Darknut + Main -> StairsDown: flag ThronePushed + South -> Main + East <-> Main: kill Darknut + Main -> South: kill Darknut room GFWestCannons: node Main: door South - enemy Cannons + node ExplodeCannons: + set CannonsGone node North: door North - Main <-> North: kill Cannons + Main -> ExplodeCannons: (helper CanSplit4 | (((trick Bombing | (item RemoteBombs & trick RemoteBombing)) & item BombBag) & item Sword) | (trick TwoClones & helper CanSplit3) | (trick PossiblyImpossibleOneClone & helper CanSplit2)) # no idea if red sword is possible + Main <-> North: flag CannonsGone From 7392841ef4d2c29ff960b679bf83313f46661a9b Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 27 Oct 2024 17:09:22 +0100 Subject: [PATCH 15/15] DHC: add missing descriptors Co-authored-By: Henny022 --- tmc/module.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tmc/module.yaml b/tmc/module.yaml index fca40a1..cc2c465 100644 --- a/tmc/module.yaml +++ b/tmc/module.yaml @@ -27,6 +27,16 @@ provides: stateful: true type: truthy export: edge + loseExplosive: + arguments: [] + stateful: true + type: truthy + export: edge + providesExplosive: + arguments: ["scoped"] + stateful: false + type: truthy + export: edge canPlugHoles: arguments: [] stateful: true