From 506c60ac9b61375c32743429e29f848495d4a6a7 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 31 Mar 2021 11:57:31 -0400 Subject: [PATCH 1/7] Filled out crenel_caves.logic --- crenel_caves.logic | 135 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 118 insertions(+), 17 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index 6e3e984..c7ab9f6 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -1,17 +1,118 @@ -area CrenelCaves: - room BlocksChest - room BlocksPuzzle - room BlocksBomb - room FloodBlock - room FountHP - room FountRupee - room GraybladeEntrance - room Guru - room HelmaHall - room MushroomGap - room RockPush - room ScrubBomb - room ScrubGrip - room ScrubHint - room SwitchBridge - room PotCircle \ No newline at end of file +area CrenelCaves: + room BlocksChest: + node BlocksChest: + door Staircase + door Doorway + enemy RedChus + chest BlocksChest + room BlocksPuzzle: + node BlocksPuzzle: + door Ladder + door Doorway + enemy Helmasaurs + node MushroomGapSouth: + door Doorway + enemy Helmasaur + node MushroomGapNorth: + door Staircase + enemy Helmasaur + MushroomGapNorth <-> MushroomGapSouth: (item GustJar | item Cape | item LightArrows) + room BlocksBomb: + node PreBombBlocks: + door PreBombBlocks + enemy SilverChu + enemy RedChu + node PostBombBlocks: + door PostBombBlocks + enemy SilverChu + PreBombBlocks -> PostBombBlocks: item BombBag + room FloodBlock: #This is the room w/ 2 chests and a HP on the very left side of crenel right? + node FloodBlockEntrance: + door FloodBlock + node FloodBlockChests: + chest LeftFloodBlockChest + chest RightFloodBlockChest + FloodBlockEntrance -> FloodBlockChests: (item BombBag | item Cape) + node FloodBlockHP: + chest HearPiece + FloodBlockEntrance -> FloodBlockHP: (item BombBag | item Cape | item Flippers) + room FountHP: + node FountHP: + door FountHP + chest HeartPiece + room FountRupee: + node FountRupee: + door FountRupee + node FountRupeeItems: + chest LeftRupee + chest CenterRupee + chest RightRupee + FountRupee -> FountRupeeItems: setting Rupeemania + room GraybladeEntrance: + node GraybladeEntrance: + door Entrance + node Switches: + flag Switches + #Completely guessing here on the actual item names/syntax + GraybladeEntrance -> Switches: (item SpinAttack & (item RedSword | item BlueSword | item FourSword)) + node SwitchDoor: + door SwitchDoor + Switches <-> SwitchDoor + GraybladeEntrance -> SwitchDoor: flag SwitchesPressed + room Guru: + node Guru: + door Guru + room HelmaHall: + node HelmaHall: + door Staircase + door Doorway + enemy Helmasaurs + room MushroomGap: + node MushroomGap: + door Doorway + door Staircase + enemy LowerKeese + enemy UpperKeese + room RockPush: + node RockPush: + door Doorway + door Staircase + room ScrubBomb: + node ScrubBomb: + door ScrubBomb + node DekuScrub: + flag DekuScrub + ScrubBomb -> DekuScrub: item Shield + room ScrubGrip: + node ScrubGrip: + door ScrubGrip + node DekuScrub: + chest DekuScrub + ScrubGrip -> DekuScrub: item Shield + room ScrubHint: + node ScrubHint: + door ScrubHint + node DekuScrub: + flag DekuScrub + ScrubHint -> DekuScrub: item Shield + room SwitchBridge: + node SwitchBridgeNorth: + door Staircase + enemy RedChus + node SwitchBridgeSouth: + door Doorway + enemy RedChus + flag Switch + SwitchBridgeNorth -> SwitchBridgeSouth: (item Boomerang | item Cape | item BombBag | item Bow | item SwordBeam | item PerilBeam) + room PotCircle: + node PotCircle: + door Doorway + door Staircase + chest PotCircleChest + enemy RedChus + #This room was missing from the stub so I added it + room PreMineralSpring: + node PreMineralSpring: + door Doorway + door Ladder + enemy RedChus \ No newline at end of file From 0f6cfd9effc1938b5bfaeaa246767685566659af Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 1 Apr 2021 13:56:45 -0400 Subject: [PATCH 2/7] Apply Ibot's suggestions from code review Co-authored-by: Ibot02 --- crenel_caves.logic | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index c7ab9f6..635de6f 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -1,6 +1,6 @@ area CrenelCaves: room BlocksChest: - node BlocksChest: + node Main: door Staircase door Doorway enemy RedChus @@ -16,12 +16,11 @@ area CrenelCaves: node MushroomGapNorth: door Staircase enemy Helmasaur - MushroomGapNorth <-> MushroomGapSouth: (item GustJar | item Cape | item LightArrows) + MushroomGapNorth <-> MushroomGapSouth: (item GustJar | item Cape | item LightArrows | item Cane) room BlocksBomb: node PreBombBlocks: door PreBombBlocks - enemy SilverChu - enemy RedChu + enemy Chus node PostBombBlocks: door PostBombBlocks enemy SilverChu @@ -54,7 +53,7 @@ area CrenelCaves: node Switches: flag Switches #Completely guessing here on the actual item names/syntax - GraybladeEntrance -> Switches: (item SpinAttack & (item RedSword | item BlueSword | item FourSword)) + GraybladeEntrance -> Switches: item CanSplit2 node SwitchDoor: door SwitchDoor Switches <-> SwitchDoor @@ -103,7 +102,7 @@ area CrenelCaves: door Doorway enemy RedChus flag Switch - SwitchBridgeNorth -> SwitchBridgeSouth: (item Boomerang | item Cape | item BombBag | item Bow | item SwordBeam | item PerilBeam) + SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) room PotCircle: node PotCircle: door Doorway @@ -115,4 +114,4 @@ area CrenelCaves: node PreMineralSpring: door Doorway door Ladder - enemy RedChus \ No newline at end of file + enemy RedChus From 9ed35282b2e068d402945b67150b0aa12c49be24 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 1 Apr 2021 14:54:49 -0400 Subject: [PATCH 3/7] Updated names of nodes and fixed logic problems --- crenel_caves.logic | 55 ++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index 635de6f..ab4c5e3 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -8,10 +8,10 @@ area CrenelCaves: room BlocksPuzzle: node BlocksPuzzle: door Ladder - door Doorway + door BlocksPuzzleDoor enemy Helmasaurs node MushroomGapSouth: - door Doorway + door MushroomGapDoor enemy Helmasaur node MushroomGapNorth: door Staircase @@ -24,6 +24,7 @@ area CrenelCaves: node PostBombBlocks: door PostBombBlocks enemy SilverChu + #These blocks respawn when leaving, and it seems to be impossible to go backwards through this room? PreBombBlocks -> PostBombBlocks: item BombBag room FloodBlock: #This is the room w/ 2 chests and a HP on the very left side of crenel right? node FloodBlockEntrance: @@ -31,54 +32,55 @@ area CrenelCaves: node FloodBlockChests: chest LeftFloodBlockChest chest RightFloodBlockChest + #These are also respawning bomb-blocks FloodBlockEntrance -> FloodBlockChests: (item BombBag | item Cape) node FloodBlockHP: chest HearPiece + #Should grabbing the HP from the water be in logic? Don't think it currently is FloodBlockEntrance -> FloodBlockHP: (item BombBag | item Cape | item Flippers) room FountHP: - node FountHP: - door FountHP + node Main: + door Doorway chest HeartPiece room FountRupee: - node FountRupee: - door FountRupee - node FountRupeeItems: + node Main: + door Doorway chest LeftRupee chest CenterRupee chest RightRupee - FountRupee -> FountRupeeItems: setting Rupeemania room GraybladeEntrance: - node GraybladeEntrance: + node Main: door Entrance + exit DojoExit node Switches: flag Switches #Completely guessing here on the actual item names/syntax - GraybladeEntrance -> Switches: item CanSplit2 + Main -> Switches: item CanSplit2 node SwitchDoor: - door SwitchDoor - Switches <-> SwitchDoor + entrance SwitchDoor + Switches -> SwitchDoor GraybladeEntrance -> SwitchDoor: flag SwitchesPressed room Guru: - node Guru: - door Guru + node Main: + door Doorway room HelmaHall: - node HelmaHall: + node Main: door Staircase door Doorway enemy Helmasaurs room MushroomGap: - node MushroomGap: + node Main: door Doorway door Staircase enemy LowerKeese enemy UpperKeese room RockPush: - node RockPush: + node Main: door Doorway door Staircase room ScrubBomb: node ScrubBomb: - door ScrubBomb + door Doorway node DekuScrub: flag DekuScrub ScrubBomb -> DekuScrub: item Shield @@ -98,20 +100,25 @@ area CrenelCaves: node SwitchBridgeNorth: door Staircase enemy RedChus - node SwitchBridgeSouth: + node SwitchBridgeGap + flag Switch + SwitchBridgeNorth -> SwitchBridgeGap: (item Boomerang | item BombBag | item Bow | item CanUseSwordBeam | item CanUsePerilBeam) + SwitchBridgeGap -> SwitchBridgeNorth + node SwitchBridgeSouth: door Doorway enemy RedChus - flag Switch - SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) + SwitchBridgeSouth -> SwitchBridgeGap: (item SmithSword | item Boomerang | item BombBag | item Bow) + SwitchBridgeGap -> SwitchBridgeSouth + SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) room PotCircle: - node PotCircle: + node Main: door Doorway door Staircase chest PotCircleChest enemy RedChus #This room was missing from the stub so I added it room PreMineralSpring: - node PreMineralSpring: + node Main: door Doorway door Ladder - enemy RedChus + enemy RedChus \ No newline at end of file From 97356c3aff2c82793c1de0abf07556bc3eb7894a Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 1 Apr 2021 17:22:11 -0400 Subject: [PATCH 4/7] Replaced some tabs with spaces --- crenel_caves.logic | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index ab4c5e3..9bca886 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -24,7 +24,7 @@ area CrenelCaves: node PostBombBlocks: door PostBombBlocks enemy SilverChu - #These blocks respawn when leaving, and it seems to be impossible to go backwards through this room? + #These blocks respawn when leaving, and it seems to be impossible to go backwards through this room? PreBombBlocks -> PostBombBlocks: item BombBag room FloodBlock: #This is the room w/ 2 chests and a HP on the very left side of crenel right? node FloodBlockEntrance: @@ -32,11 +32,11 @@ area CrenelCaves: node FloodBlockChests: chest LeftFloodBlockChest chest RightFloodBlockChest - #These are also respawning bomb-blocks + #These are also respawning bomb-blocks FloodBlockEntrance -> FloodBlockChests: (item BombBag | item Cape) node FloodBlockHP: chest HearPiece - #Should grabbing the HP from the water be in logic? Don't think it currently is + #Should grabbing the HP from the water be in logic? Don't think it currently is FloodBlockEntrance -> FloodBlockHP: (item BombBag | item Cape | item Flippers) room FountHP: node Main: @@ -51,11 +51,11 @@ area CrenelCaves: room GraybladeEntrance: node Main: door Entrance - exit DojoExit + exit DojoExit node Switches: - flag Switches + flag Switches #Completely guessing here on the actual item names/syntax - Main -> Switches: item CanSplit2 + Main -> Switches: item CanSplit2 node SwitchDoor: entrance SwitchDoor Switches -> SwitchDoor @@ -100,16 +100,16 @@ area CrenelCaves: node SwitchBridgeNorth: door Staircase enemy RedChus - node SwitchBridgeGap - flag Switch - SwitchBridgeNorth -> SwitchBridgeGap: (item Boomerang | item BombBag | item Bow | item CanUseSwordBeam | item CanUsePerilBeam) - SwitchBridgeGap -> SwitchBridgeNorth - node SwitchBridgeSouth: + node SwitchBridgeGap: + flag Switch + SwitchBridgeNorth -> SwitchBridgeGap: (item Boomerang | item BombBag | item Bow | item CanUseSwordBeam | item CanUsePerilBeam) + SwitchBridgeGap -> SwitchBridgeNorth + node SwitchBridgeSouth: door Doorway enemy RedChus SwitchBridgeSouth -> SwitchBridgeGap: (item SmithSword | item Boomerang | item BombBag | item Bow) - SwitchBridgeGap -> SwitchBridgeSouth - SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) + SwitchBridgeGap -> SwitchBridgeSouth + SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) room PotCircle: node Main: door Doorway From 445808544b28e42fac13c1b1e1c2940701654221 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Apr 2021 23:49:27 -0400 Subject: [PATCH 5/7] Apply Ibot's suggestions from code review Co-authored-by: Ibot02 --- crenel_caves.logic | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index 9bca886..0df2241 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -50,16 +50,15 @@ area CrenelCaves: chest RightRupee room GraybladeEntrance: node Main: - door Entrance - exit DojoExit + door South + exit North node Switches: flag Switches - #Completely guessing here on the actual item names/syntax Main -> Switches: item CanSplit2 node SwitchDoor: - entrance SwitchDoor + entrance North Switches -> SwitchDoor - GraybladeEntrance -> SwitchDoor: flag SwitchesPressed + GraybladeEntrance -> SwitchDoor: flag Switches room Guru: node Main: door Doorway @@ -121,4 +120,4 @@ area CrenelCaves: node Main: door Doorway door Ladder - enemy RedChus \ No newline at end of file + enemy RedChus From 89a4abfe41c85ef61bf8cd24d6baea90a8a6f8b8 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Apr 2021 11:48:43 -0400 Subject: [PATCH 6/7] Removed uneccesary edges --- crenel_caves.logic | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index 0df2241..9d3fe49 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -57,7 +57,6 @@ area CrenelCaves: Main -> Switches: item CanSplit2 node SwitchDoor: entrance North - Switches -> SwitchDoor GraybladeEntrance -> SwitchDoor: flag Switches room Guru: node Main: @@ -102,12 +101,10 @@ area CrenelCaves: node SwitchBridgeGap: flag Switch SwitchBridgeNorth -> SwitchBridgeGap: (item Boomerang | item BombBag | item Bow | item CanUseSwordBeam | item CanUsePerilBeam) - SwitchBridgeGap -> SwitchBridgeNorth node SwitchBridgeSouth: door Doorway enemy RedChus SwitchBridgeSouth -> SwitchBridgeGap: (item SmithSword | item Boomerang | item BombBag | item Bow) - SwitchBridgeGap -> SwitchBridgeSouth SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) room PotCircle: node Main: @@ -120,4 +117,4 @@ area CrenelCaves: node Main: door Doorway door Ladder - enemy RedChus + enemy RedChus \ No newline at end of file From 315c12eeda30c4fb44a996f183af67a51560519b Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 10 Nov 2024 16:09:26 +0100 Subject: [PATCH 7/7] Crenel Caves: Fix & Rename for consistency Co-authored-By: Henny022 --- crenel_caves.logic | 118 +++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 52 deletions(-) diff --git a/crenel_caves.logic b/crenel_caves.logic index 9d3fe49..d9345b9 100644 --- a/crenel_caves.logic +++ b/crenel_caves.logic @@ -1,120 +1,134 @@ area CrenelCaves: room BlocksChest: node Main: - door Staircase - door Doorway + door Stairs + door South enemy RedChus - chest BlocksChest + chest Chest room BlocksPuzzle: - node BlocksPuzzle: + node BlocksPuzzleNorth: door Ladder - door BlocksPuzzleDoor enemy Helmasaurs + node BlocksPuzzleSouth: + door SouthWest + BlocksPuzzleNorth -> BlocksPuzzleSouth node MushroomGapSouth: - door MushroomGapDoor + door SouthEast enemy Helmasaur node MushroomGapNorth: - door Staircase + door Stairs enemy Helmasaur MushroomGapNorth <-> MushroomGapSouth: (item GustJar | item Cape | item LightArrows | item Cane) room BlocksBomb: node PreBombBlocks: - door PreBombBlocks + door North enemy Chus node PostBombBlocks: - door PostBombBlocks + door South enemy SilverChu #These blocks respawn when leaving, and it seems to be impossible to go backwards through this room? - PreBombBlocks -> PostBombBlocks: item BombBag - room FloodBlock: #This is the room w/ 2 chests and a HP on the very left side of crenel right? + PreBombBlocks -> PostBombBlocks: ( item BombBag | hasExplosive ) + room FloodBlock: node FloodBlockEntrance: - door FloodBlock + door South node FloodBlockChests: chest LeftFloodBlockChest chest RightFloodBlockChest #These are also respawning bomb-blocks - FloodBlockEntrance -> FloodBlockChests: (item BombBag | item Cape) + FloodBlockEntrance -> FloodBlockChests: (item BombBag | hasExplosive | item Cape) node FloodBlockHP: chest HearPiece #Should grabbing the HP from the water be in logic? Don't think it currently is - FloodBlockEntrance -> FloodBlockHP: (item BombBag | item Cape | item Flippers) + FloodBlockEntrance -> FloodBlockHP: ( item BombBag | hasExplosive | item Cape | ( item Flippers | trick GrabFromWater )) room FountHP: node Main: - door Doorway + door South chest HeartPiece room FountRupee: node Main: - door Doorway - chest LeftRupee + door South + chest WestRupee chest CenterRupee - chest RightRupee + chest EastRupee room GraybladeEntrance: node Main: door South - exit North + target North node Switches: flag Switches Main -> Switches: item CanSplit2 node SwitchDoor: - entrance North - GraybladeEntrance -> SwitchDoor: flag Switches + warp North + Main -> SwitchDoor: flag Switches room Guru: node Main: - door Doorway + door South + npc Guru room HelmaHall: node Main: - door Staircase - door Doorway + door NorthStairs + door South enemy Helmasaurs room MushroomGap: node Main: - door Doorway - door Staircase + door South + door NorthStairs enemy LowerKeese enemy UpperKeese room RockPush: node Main: - door Doorway - door Staircase + door South + door NorthStairs room ScrubBomb: - node ScrubBomb: - door Doorway + node Main: + door South + node DefeatScrub: + set DekuScrub + Main -> DefeatScrub: ( item Shield | item MirrorShield ) node DekuScrub: - flag DekuScrub - ScrubBomb -> DekuScrub: item Shield + npc DekuScrub + Main -> DekuScrub: flag DekuScrub room ScrubGrip: - node ScrubGrip: - door ScrubGrip + node Main: + door South + node DefeatScrub: + set DekuScrub + Main -> DefeatScrub: ( item Shield | item MirrorShield ) node DekuScrub: + npc DekuScrub + node Buy: chest DekuScrub - ScrubGrip -> DekuScrub: item Shield + Main -> DekuScrub: flag DekuScrub + DekuScrub -> Buy: spend40 room ScrubHint: - node ScrubHint: - door ScrubHint + node Main: + door South + node DefeatScrub: + set DekuScrub + Main -> DefeatScrub: ( item Shield | item MirrorShield ) node DekuScrub: - flag DekuScrub - ScrubHint -> DekuScrub: item Shield + npc DekuScrub + ScrubHint -> DekuScrub: flag DekuScrub room SwitchBridge: node SwitchBridgeNorth: - door Staircase - enemy RedChus + door NorthStairs + enemy NorthChus node SwitchBridgeGap: flag Switch - SwitchBridgeNorth -> SwitchBridgeGap: (item Boomerang | item BombBag | item Bow | item CanUseSwordBeam | item CanUsePerilBeam) + SwitchBridgeNorth -> SwitchBridgeGap: ( helper HasProjectileDamage | item BombBag | hasExplosive ) node SwitchBridgeSouth: - door Doorway - enemy RedChus - SwitchBridgeSouth -> SwitchBridgeGap: (item SmithSword | item Boomerang | item BombBag | item Bow) - SwitchBridgeNorth <-> SwitchBridgeSouth: (item Cape | flag Switch) + door South + enemy SouthChus + SwitchBridgeSouth -> SwitchBridgeGap: helper CanHitSwitch + SwitchBridgeNorth <-> SwitchBridgeSouth: ( item Cape | flag Switch ) room PotCircle: node Main: - door Doorway - door Staircase - chest PotCircleChest + door South + door NorthStairs + chest Chest enemy RedChus - #This room was missing from the stub so I added it room PreMineralSpring: node Main: - door Doorway + door South door Ladder - enemy RedChus \ No newline at end of file + enemy RedChus