From d247bab1da1948579124671ffcc7b867548fe67e Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Sat, 3 Apr 2021 22:00:34 +0200 Subject: [PATCH 1/6] Update royal_valley.logic --- royal_valley.logic | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/royal_valley.logic b/royal_valley.logic index f809066..699a180 100644 --- a/royal_valley.logic +++ b/royal_valley.logic @@ -1,3 +1,42 @@ area RoyalValley: - room Graveyard - room LostWoods + room Graveyard: + node North: + door LeftGrave + door RightGrave + exit Crypt + node NorthDoor: + entrance Crypt + node North -> NorthDoor: item WhiteSword3 + node NorthButterfly: + chest Butterfly + North <-> NorthButterfly: flag GraveyardButterflyFusion + node NorthLeftChest: + chest LeftChest + North <-> NorthLeftChest: flag LeftChestFusion + node NorthRightChest: + chest RightChest + North <-> NorthRightChest: flag RightChestFusion + node Middle: + door Dampe + door South + enemy Ghinis + North <-> Middle: flag GotKeyFromCrow + node MiddleKeyCrow: + chest CrowKey + Middle <-> MiddleKeyCrow: ( item Boots & item GraveyardKey & flag TalkedToDampe ) + node South: + door East + door South + door North + enemy GhinisAndCrows + exit Fairy + node SouthFairy: + entrance Fairy + South -> SouthFairy: item BombBag + room LostWoods: + node Main + chest Chest + door North + door East + door South + door West From 47615fbe69914e4a5d1f9111f57f3119ace6a4bf Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Sat, 3 Apr 2021 22:01:52 +0200 Subject: [PATCH 2/6] Update royal_valley.logic --- royal_valley.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/royal_valley.logic b/royal_valley.logic index 699a180..b4b3492 100644 --- a/royal_valley.logic +++ b/royal_valley.logic @@ -6,7 +6,7 @@ area RoyalValley: exit Crypt node NorthDoor: entrance Crypt - node North -> NorthDoor: item WhiteSword3 + North -> NorthDoor: item WhiteSword3 node NorthButterfly: chest Butterfly North <-> NorthButterfly: flag GraveyardButterflyFusion From ec9e423cbffbd8f78e3c6f7cd7dba3b2d15a4144 Mon Sep 17 00:00:00 2001 From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com> Date: Sat, 3 Apr 2021 22:02:41 +0200 Subject: [PATCH 3/6] Update royal_valley.logic --- royal_valley.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/royal_valley.logic b/royal_valley.logic index b4b3492..07f57ae 100644 --- a/royal_valley.logic +++ b/royal_valley.logic @@ -34,7 +34,7 @@ area RoyalValley: entrance Fairy South -> SouthFairy: item BombBag room LostWoods: - node Main + node Main: chest Chest door North door East From 62c2b0131e829d813aea5ec69784f55513952022 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Fri, 9 Apr 2021 18:15:32 +0200 Subject: [PATCH 4/6] add crest entrances --- royal_valley.logic | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/royal_valley.logic b/royal_valley.logic index 07f57ae..c3556a2 100644 --- a/royal_valley.logic +++ b/royal_valley.logic @@ -33,6 +33,9 @@ area RoyalValley: node SouthFairy: entrance Fairy South -> SouthFairy: item BombBag + node South +: entrance Virtual.Zeffa.FluteAway + node Middle +: entrance Virtual.Zeffa.FluteAway + node North +: entrance Virtual.Zeffa.FluteAway room LostWoods: node Main: chest Chest @@ -40,3 +43,4 @@ area RoyalValley: door East door South door West + node Main +: entrance Virtual.Zeffa.FluteAway From e0f165fb0e16a2a60e2d42e069697628b0f14820 Mon Sep 17 00:00:00 2001 From: CandyCrystal Date: Wed, 19 May 2021 16:55:55 +0200 Subject: [PATCH 5/6] bob-omb logic --- royal_valley.logic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/royal_valley.logic b/royal_valley.logic index c3556a2..d1fa80d 100644 --- a/royal_valley.logic +++ b/royal_valley.logic @@ -32,7 +32,7 @@ area RoyalValley: exit Fairy node SouthFairy: entrance Fairy - South -> SouthFairy: item BombBag + South -> SouthFairy: ( item BombBag | state HasExplosive ) node South +: entrance Virtual.Zeffa.FluteAway node Middle +: entrance Virtual.Zeffa.FluteAway node North +: entrance Virtual.Zeffa.FluteAway From 09c3bdefec063d0d46a4520b5c7ae29960c40b14 Mon Sep 17 00:00:00 2001 From: Ibot02 Date: Sun, 11 Aug 2024 17:16:20 +0200 Subject: [PATCH 6/6] Royal_Valley: Fix --- royal_valley.logic | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/royal_valley.logic b/royal_valley.logic index d1fa80d..9c31450 100644 --- a/royal_valley.logic +++ b/royal_valley.logic @@ -1,46 +1,56 @@ area RoyalValley: room Graveyard: node North: - door LeftGrave - door RightGrave exit Crypt + exit LeftGrave + exit RightGrave + set LeftGraveOpen node NorthDoor: entrance Crypt + node LeftGraveOpen: + warp LeftGrave + node RightGraveOpen: + warp RightGrave North -> NorthDoor: item WhiteSword3 + North -> LeftGraveOpen: flag LeftGraveOpen + North -> RightGraveOpen: fusion RightGraveOpen node NorthButterfly: chest Butterfly - North <-> NorthButterfly: flag GraveyardButterflyFusion + North -> NorthButterfly: fusion GraveyardButterfly node NorthLeftChest: chest LeftChest - North <-> NorthLeftChest: flag LeftChestFusion + North -> NorthLeftChest: fusion LeftChest node NorthRightChest: chest RightChest - North <-> NorthRightChest: flag RightChestFusion + North -> NorthRightChest: fusion RightChest node Middle: door Dampe door South enemy Ghinis - North <-> Middle: flag GotKeyFromCrow + North <-> Middle: flag GateOpen node MiddleKeyCrow: - chest CrowKey - Middle <-> MiddleKeyCrow: ( item Boots & item GraveyardKey & flag TalkedToDampe ) + set ReobtainedKey + Middle -> MiddleKeyCrow: ( item Boots & item GraveyardKey ) + node TalkToDampe: + set GateOpen + Middle -> TalkToDampe: flag ReobtainedKey node South: door East door South door North enemy GhinisAndCrows - exit Fairy + target Fairy node SouthFairy: - entrance Fairy - South -> SouthFairy: ( item BombBag | state HasExplosive ) - node South +: entrance Virtual.Zeffa.FluteAway - node Middle +: entrance Virtual.Zeffa.FluteAway - node North +: entrance Virtual.Zeffa.FluteAway + warp Fairy + node SouthFairyOpen: + set FairyOpen + South -> SouthFairyOpen: ( item BombBag | hasExplosive ) + South -> SouthFairy: flag FairyOpen + node South +: warp Virtual.Zeffa.FluteAway + node Middle +: warp Virtual.Zeffa.FluteAway + node North +: warp Virtual.Zeffa.FluteAway room LostWoods: node Main: chest Chest door North - door East door South - door West - node Main +: entrance Virtual.Zeffa.FluteAway