From c5ec0c2f5c4ab35db42d6fbdd287a5d02bdee63b Mon Sep 17 00:00:00 2001 From: Julia <23560850+CandyCrystal@users.noreply.github.com> Date: Tue, 30 Mar 2021 21:45:55 +0200 Subject: [PATCH 01/22] Update town.logic --- town.logic | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index 086f8cc..bcccac0 100644 --- a/town.logic +++ b/town.logic @@ -1,2 +1,44 @@ area Town: - room Main \ No newline at end of file + room Main: + node Main: + chest CafeLady + door Bakery + door East + door FigurineHouseEast + door FigurineHouseWest + door HearthLedge + door HearthNorth + door HearthSOuth + door Julietta + door MayorEast + door MayorWest + door North + door Rem + door SchoolEast + door SchoolWest + door Simon + door South + door Stockwell + door Swiftblade + door Well + door West + entrance Crest + entrance TownDigging + node MainBellHP: + chest MainBellHP + Main -> MainBellHP: item Cape + node MainMinish + Main <-> MainMinish: item CaneOfPacci + node NorthEastMinish: + door SchoolEntranceMinishEast + door SchoolGarden + node SouthWest: + door Carlov + door Carpenters + door DrLeft + Main <-> SouthWest: (item Flippers | item Cape) + node TownDigging: + exit TownDigging + Main <-> TownDigging: item MoleMitts + node Main +: exit Virtual.Zeffa.FluteAway + node SouthWest +: exit Virtual.Zeffa.FluteAway From eebab69045836d870e84884b64313254b7e56f5a Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Tue, 30 Mar 2021 23:53:45 +0200 Subject: [PATCH 02/22] Update town.logic --- town.logic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index bcccac0..877d563 100644 --- a/town.logic +++ b/town.logic @@ -1,10 +1,11 @@ area Town: room Main: + node FigurineHouseDoorEast: + door FigurineHouseEast node Main: chest CafeLady door Bakery door East - door FigurineHouseEast door FigurineHouseWest door HearthLedge door HearthNorth @@ -24,6 +25,7 @@ area Town: door West entrance Crest entrance TownDigging + Main <-> FigurineHouseDoorEast: item CarlovMedal node MainBellHP: chest MainBellHP Main -> MainBellHP: item Cape From 0432111329369c21ba9f7437b819ed7f60899357 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 13:27:28 +0200 Subject: [PATCH 03/22] Update town.logic I believe everything has now been added --- town.logic | 74 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/town.logic b/town.logic index 877d563..82fe43f 100644 --- a/town.logic +++ b/town.logic @@ -1,46 +1,96 @@ area Town: room Main: + node Anju: + chest AnjuHP + node CatsMinish: + door Fountain + door StratoMinishBack node FigurineHouseDoorEast: door FigurineHouseEast + node HearthLedge: + door HearthLedge + chest HearthLedge + node JuliettaRoof: + door JuliettaChimney + door RomioChimney + node LibraryRoof: + door LibraryRoof + node LibraryRoofMinish: + door FlipperCave + door LibraryMinish + LibraryRoof <-> LibraryRoofMinish: item Cane node Main: chest CafeLady door Bakery + door Borlov door East door FigurineHouseWest - door HearthLedge door HearthNorth - door HearthSOuth + door HearthSouth + door GormanHouseSouth + door GormanHouseWest door Julietta - door MayorEast + door LibraryBottom door MayorWest door North + door PostOffice door Rem - door SchoolEast + door Romio door SchoolWest door Simon door South door Stockwell + door Strato door Swiftblade door Well - door West entrance Crest - entrance TownDigging + Main <-> Anju: (item Flippers | item Cape) Main <-> FigurineHouseDoorEast: item CarlovMedal node MainBellHP: chest MainBellHP - Main -> MainBellHP: item Cape - node MainMinish - Main <-> MainMinish: item CaneOfPacci - node NorthEastMinish: + Main <-> MainBellHP: item Cape + node MainMinish: + door BakeryMinish + door CafeMinish + door CarpenterBuildingMinish + door DrLeftMinish + door HearthMinish + door RomeoMinish + node MayorGarden: + door MayorEast + door MayorBasementLadder + node MinishBridge: + door CafeBridgeMinish + door StockwellBridgeMinish + node SchoolGarden: + door SchoolEast + node SchoolGardenMinish: door SchoolEntranceMinishEast door SchoolGarden + node SchoolRoof: + chest SchoolRoof + door SchoolEntranceMinishWest node SouthWest: door Carlov door Carpenters door DrLeft - Main <-> SouthWest: (item Flippers | item Cape) + Main <-> SouthWest: (item Flippers | item Cape | flag DogMoves) node TownDigging: - exit TownDigging + door TownDigging Main <-> TownDigging: item MoleMitts + node Waterfall: + door Waterfall + Main <-> Waterfall: item Flippers + node West: + door West + Main <-> West: item CanSpin + node WestMinish: + door DrLeftChimney + door GormanHouseWest + door StratoMinish + node HearthLedge +: exit Virtual.Zeffa.FluteAway node Main +: exit Virtual.Zeffa.FluteAway + node MayorGarden +: exit Virtual.Zeffa.FluteAway + node LibraryRoof +: exit Virtual.Zeffa.FluteAway + node SchoolGarden +: exit Virtual.Zeffa.FluteAway node SouthWest +: exit Virtual.Zeffa.FluteAway From ac83e8b7761a8c0e2b598b66f755e760898a6a90 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 13:29:48 +0200 Subject: [PATCH 04/22] Update town.logic --- town.logic | 3 +++ 1 file changed, 3 insertions(+) diff --git a/town.logic b/town.logic index 82fe43f..78b757c 100644 --- a/town.logic +++ b/town.logic @@ -2,6 +2,8 @@ area Town: room Main: node Anju: chest AnjuHP + node AnjuRoof: + door AnjuChimney node CatsMinish: door Fountain door StratoMinishBack @@ -50,6 +52,7 @@ area Town: chest MainBellHP Main <-> MainBellHP: item Cape node MainMinish: + door AnjuMinish door BakeryMinish door CafeMinish door CarpenterBuildingMinish From 4a04b0e1be7a37aa7fa318bbc64109bc4f4a1f8a Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 13:31:19 +0200 Subject: [PATCH 05/22] Update town.logic --- town.logic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index 78b757c..afba475 100644 --- a/town.logic +++ b/town.logic @@ -14,7 +14,7 @@ area Town: chest HearthLedge node JuliettaRoof: door JuliettaChimney - door RomioChimney + door RomioChimneyEast node LibraryRoof: door LibraryRoof node LibraryRoofMinish: @@ -65,6 +65,8 @@ area Town: node MinishBridge: door CafeBridgeMinish door StockwellBridgeMinish + node RomioRoof: + door RomioChimneyWest node SchoolGarden: door SchoolEast node SchoolGardenMinish: From 6815578b5418faeac81bf3000672be455feb2e0b Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 13:58:25 +0200 Subject: [PATCH 06/22] Added a node for the GormanSouth --- town.logic | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index afba475..7f9b987 100644 --- a/town.logic +++ b/town.logic @@ -9,6 +9,8 @@ area Town: door StratoMinishBack node FigurineHouseDoorEast: door FigurineHouseEast + node GormanHouseSouth: + door GormanHouseSouth node HearthLedge: door HearthLedge chest HearthLedge @@ -29,7 +31,6 @@ area Town: door FigurineHouseWest door HearthNorth door HearthSouth - door GormanHouseSouth door GormanHouseWest door Julietta door LibraryBottom @@ -48,6 +49,7 @@ area Town: entrance Crest Main <-> Anju: (item Flippers | item Cape) Main <-> FigurineHouseDoorEast: item CarlovMedal + Main <-> GormanHouseSouth: flag TalkedToOracle node MainBellHP: chest MainBellHP Main <-> MainBellHP: item Cape @@ -98,4 +100,5 @@ area Town: node MayorGarden +: exit Virtual.Zeffa.FluteAway node LibraryRoof +: exit Virtual.Zeffa.FluteAway node SchoolGarden +: exit Virtual.Zeffa.FluteAway + node SchoolRoof +: exit Virtual.Zeffa.FluteAway node SouthWest +: exit Virtual.Zeffa.FluteAway From 92726561f7b405d394c0854d8a002f34db2f741e Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:03:21 +0200 Subject: [PATCH 07/22] Update town.logic Changed library roof minish access to be one directional --- town.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/town.logic b/town.logic index 7f9b987..defb97d 100644 --- a/town.logic +++ b/town.logic @@ -22,7 +22,7 @@ area Town: node LibraryRoofMinish: door FlipperCave door LibraryMinish - LibraryRoof <-> LibraryRoofMinish: item Cane + LibraryRoof -> LibraryRoofMinish: item Cane node Main: chest CafeLady door Bakery From ac032b6245abf8e65a5e6ad38b60e01402e4fa68 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:23:47 +0200 Subject: [PATCH 08/22] Update town.logic added fusion flag to the waterfall --- town.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/town.logic b/town.logic index defb97d..2a9a081 100644 --- a/town.logic +++ b/town.logic @@ -87,7 +87,7 @@ area Town: Main <-> TownDigging: item MoleMitts node Waterfall: door Waterfall - Main <-> Waterfall: item Flippers + Main <-> Waterfall: (item Flippers | flag TownWaterfallFusion) node West: door West Main <-> West: item CanSpin From 194174c4e4daac9dd54a7d7c1c03e1b06dd47f6e Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:30:52 +0200 Subject: [PATCH 09/22] Apply suggestions from code review Co-authored-by: Ibot02 --- town.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/town.logic b/town.logic index 2a9a081..ea34ee1 100644 --- a/town.logic +++ b/town.logic @@ -87,7 +87,7 @@ area Town: Main <-> TownDigging: item MoleMitts node Waterfall: door Waterfall - Main <-> Waterfall: (item Flippers | flag TownWaterfallFusion) + Main <-> Waterfall: (item Flippers & flag TownWaterfallFusion) node West: door West Main <-> West: item CanSpin From c55e92565916753f09de7f088e5b6072f9270d02 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:31:35 +0200 Subject: [PATCH 10/22] Update town.logic --- town.logic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index ea34ee1..fe8d1aa 100644 --- a/town.logic +++ b/town.logic @@ -87,7 +87,8 @@ area Town: Main <-> TownDigging: item MoleMitts node Waterfall: door Waterfall - Main <-> Waterfall: (item Flippers & flag TownWaterfallFusion) + Main -> Waterfall: (item Flippers & flag TownWaterfallFusion) + Waterfall -> Main: item Flippers node West: door West Main <-> West: item CanSpin From 356adf3aeb8297ae36c4ea1194a2fa3c62730bfb Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:39:12 +0200 Subject: [PATCH 11/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/town.logic b/town.logic index fe8d1aa..b9b67e9 100644 --- a/town.logic +++ b/town.logic @@ -85,10 +85,12 @@ area Town: node TownDigging: door TownDigging Main <-> TownDigging: item MoleMitts - node Waterfall: - door Waterfall - Main -> Waterfall: (item Flippers & flag TownWaterfallFusion) - Waterfall -> Main: item Flippers + node WaterfallExit: + exit Waterfall + node WaterfallEntrance: + entrance Waterfall + Main -> WaterfallEntrance: (item Flippers & flag TownWaterfallFusion) + WaterfallExit -> Main: item Flippers node West: door West Main <-> West: item CanSpin From 82b5b9a4fd532b2a2deed13c86dc87297894b097 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:56:49 +0200 Subject: [PATCH 12/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 1 + 1 file changed, 1 insertion(+) diff --git a/town.logic b/town.logic index b9b67e9..23a6e1e 100644 --- a/town.logic +++ b/town.logic @@ -47,6 +47,7 @@ area Town: door Swiftblade door Well entrance Crest + flag Virtual.Zeffa.TownCrest Main <-> Anju: (item Flippers | item Cape) Main <-> FigurineHouseDoorEast: item CarlovMedal Main <-> GormanHouseSouth: flag TalkedToOracle From b19080359e04ad4b38b8fe2102c436633942d5b4 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:58:56 +0200 Subject: [PATCH 13/22] Update town.logic Fixed the library door --- town.logic | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/town.logic b/town.logic index 23a6e1e..ed28740 100644 --- a/town.logic +++ b/town.logic @@ -17,6 +17,10 @@ area Town: node JuliettaRoof: door JuliettaChimney door RomioChimneyEast + node LibraryEntrance: + entrance LibraryBottom + node LibraryExit: + exit LibraryBottom node LibraryRoof: door LibraryRoof node LibraryRoofMinish: @@ -51,6 +55,8 @@ area Town: Main <-> Anju: (item Flippers | item Cape) Main <-> FigurineHouseDoorEast: item CarlovMedal Main <-> GormanHouseSouth: flag TalkedToOracle + Main -> LibraryEntrance: flag LibraryManHasMoved + LibraryExit-> Main node MainBellHP: chest MainBellHP Main <-> MainBellHP: item Cape From 04fb5476370562e6aa3c9aac7d315dd8602f2f38 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:05:35 +0200 Subject: [PATCH 14/22] Update town.logic Added Anju's garden --- town.logic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/town.logic b/town.logic index ed28740..bf60c82 100644 --- a/town.logic +++ b/town.logic @@ -2,6 +2,8 @@ area Town: room Main: node Anju: chest AnjuHP + node AnjuGarden: + door Anju node AnjuRoof: door AnjuChimney node CatsMinish: From fa8ee021e262cfec38ebf1b9ee66a4360b8496f5 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:35:48 +0200 Subject: [PATCH 15/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 1 - 1 file changed, 1 deletion(-) diff --git a/town.logic b/town.logic index bf60c82..3fbabe6 100644 --- a/town.logic +++ b/town.logic @@ -58,7 +58,6 @@ area Town: Main <-> FigurineHouseDoorEast: item CarlovMedal Main <-> GormanHouseSouth: flag TalkedToOracle Main -> LibraryEntrance: flag LibraryManHasMoved - LibraryExit-> Main node MainBellHP: chest MainBellHP Main <-> MainBellHP: item Cape From 38ba9047abfe48a68d1c065b891cb9cf83b22637 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:35:56 +0200 Subject: [PATCH 16/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 2 -- 1 file changed, 2 deletions(-) diff --git a/town.logic b/town.logic index 3fbabe6..c4e5a38 100644 --- a/town.logic +++ b/town.logic @@ -21,8 +21,6 @@ area Town: door RomioChimneyEast node LibraryEntrance: entrance LibraryBottom - node LibraryExit: - exit LibraryBottom node LibraryRoof: door LibraryRoof node LibraryRoofMinish: From 1f38822e551d9c6dae615c578ccf9d02fa594f6c Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:38:46 +0200 Subject: [PATCH 17/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index c4e5a38..1e1f098 100644 --- a/town.logic +++ b/town.logic @@ -99,7 +99,11 @@ area Town: WaterfallExit -> Main: item Flippers node West: door West - Main <-> West: item CanSpin + Main -> West: (flag GuardMoved | (setting TownGuardBootSkip & item Boots)) + West -> Main: (flag GuardMoved | setting TownGuardEastwards) # should moving past the guard this way be in logic? probably yes unless it's decoupled ER, this way we can choose that elsewhere + node GuardMove: + flag GuardMoved + Main -> GuardMove: item CanSpin node WestMinish: door DrLeftChimney door GormanHouseWest From b3596cdd898bb9568c852783438fe48e426ede0b Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:39:52 +0200 Subject: [PATCH 18/22] Update town.logic --- town.logic | 1 + 1 file changed, 1 insertion(+) diff --git a/town.logic b/town.logic index 1e1f098..305920b 100644 --- a/town.logic +++ b/town.logic @@ -51,6 +51,7 @@ area Town: door Swiftblade door Well entrance Crest + exit LibraryBottom flag Virtual.Zeffa.TownCrest Main <-> Anju: (item Flippers | item Cape) Main <-> FigurineHouseDoorEast: item CarlovMedal From ad39737bb64e3bf7f70aaf0d3ca108946c20b04d Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:43:45 +0200 Subject: [PATCH 19/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 1 - 1 file changed, 1 deletion(-) diff --git a/town.logic b/town.logic index 305920b..49a14d0 100644 --- a/town.logic +++ b/town.logic @@ -37,7 +37,6 @@ area Town: door HearthSouth door GormanHouseWest door Julietta - door LibraryBottom door MayorWest door North door PostOffice From 9d0c32da2917b048e6108e48c89daabeae3e6c4b Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:49:34 +0200 Subject: [PATCH 20/22] Update town.logic --- town.logic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/town.logic b/town.logic index 49a14d0..b8870c2 100644 --- a/town.logic +++ b/town.logic @@ -24,7 +24,6 @@ area Town: node LibraryRoof: door LibraryRoof node LibraryRoofMinish: - door FlipperCave door LibraryMinish LibraryRoof -> LibraryRoofMinish: item Cane node Main: @@ -75,6 +74,9 @@ area Town: door StockwellBridgeMinish node RomioRoof: door RomioChimneyWest + node SewerDoor: + door SewerDoor + SewerDoor <-> LibraryRoofMinish: item Flippers node SchoolGarden: door SchoolEast node SchoolGardenMinish: From 7e65cfef7230e5f9753458b47186a84a979cafa1 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 16:20:05 +0200 Subject: [PATCH 21/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 1 + 1 file changed, 1 insertion(+) diff --git a/town.logic b/town.logic index b8870c2..e4c04d3 100644 --- a/town.logic +++ b/town.logic @@ -4,6 +4,7 @@ area Town: chest AnjuHP node AnjuGarden: door Anju + AnjuGarden -> Main # do we want to be able to make this out of logic (so as to not require this in entrance rando)? node AnjuRoof: door AnjuChimney node CatsMinish: From 19097abf3bc5ae2ce9633d8381b28b5de32f3446 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Wed, 31 Mar 2021 16:36:55 +0200 Subject: [PATCH 22/22] Update town.logic Co-authored-by: Ibot02 --- town.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/town.logic b/town.logic index e4c04d3..e073fb4 100644 --- a/town.logic +++ b/town.logic @@ -66,7 +66,7 @@ area Town: door CarpenterBuildingMinish door DrLeftMinish door HearthMinish - door RomeoMinish + door RomioMinish node MayorGarden: door MayorEast door MayorBasementLadder