From b3b73a999140621d8a9fbe6731c4dbf7ecbfbed2 Mon Sep 17 00:00:00 2001
From: CandyCrystal <23560850+CandyCrystal@users.noreply.github.com>
Date: Sun, 4 Apr 2021 14:43:44 +0200
Subject: [PATCH 1/2] Update minish_houses.logic

---
 minish_houses.logic | 94 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 21 deletions(-)

diff --git a/minish_houses.logic b/minish_houses.logic
index d600fc8..8562264 100644
--- a/minish_houses.logic
+++ b/minish_houses.logic
@@ -1,22 +1,74 @@
 area MinishHouseInteriors:
-  room EasternHills
-  room Festari
-  room Gentari
-  room GentariSide
-  room HyruleTownPreWestGorman
-  room LakeCenter
-  room LakeCrest
-  room MineEast
-  room MineSouth
-  room MineSouthWest
-  room MinishWoods
-  room SouthHyruleField
-  room Trilby
-  room VillageBarrel
-  room VillageLakeMushroom
-  room VillageMushroomCenter
-  room VillageMushroomEast
-  room VillageMushroomWest
-  room VillagePot
-  room VillageShoe
-  room WesternWood
+  room EasternHills:
+    node Main:
+      door South
+  room Festari:
+    node Main:
+      door South
+      exit North
+    node NorthEntrance:
+      entrance North
+    Main <-> NorthEntrance: ( item JabberNut | item BombBag )
+  room Gentari:
+    node Main:
+      door South
+    node West:
+      door West
+    Main <-> West: flag CurtainsOpen
+  room GentariSide:
+    node Main:
+      door East
+      door West
+  room HyruleTownPreWestGorman:
+    node Main:
+      door South
+  room LakeCenter:
+    node Main:
+      door South
+  room LakeCrest:
+    node Main:
+      door South
+  room MineEast:
+    node Main:
+      door West
+  room MineSouthEast:
+    node Main:
+      door North
+  room MineSouthWest:
+    node Main:
+      door North
+  room MinishWoods:
+    node Main:
+      door South
+  room SouthHyruleField:
+    node Main:
+      door South
+  room Trilby:
+    node Main:
+      door South
+  room VillageBarrel:
+    node Main:
+      chest Chest
+      door South
+      door Ladder
+  room VillageLakeMushroom:
+    node Main:
+      door South
+  room VillageMushroomCenter:
+    node Main:
+      door South
+  room VillageMushroomEast:
+    node Main:
+      door South
+  room VillageMushroomWest:
+    node Main:
+      door South
+  room VillagePot:
+    node Main:
+      door South
+  room VillageShoe:
+    node Main:
+      door South
+  room WesternWood:
+    node Main:
+      door South

From 602a0e54cbff72c0f38393bc8958e2d8eafddede Mon Sep 17 00:00:00 2001
From: Ibot02 <jtp.jtp@gmx.de>
Date: Sun, 15 Dec 2024 17:31:54 +0100
Subject: [PATCH 2/2] Minish Houses: Add NPCs

Co-authored-By: Henny022 <git@henny022.de>
---
 minish_houses.logic | 54 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/minish_houses.logic b/minish_houses.logic
index 8562264..1d9c8f2 100644
--- a/minish_houses.logic
+++ b/minish_houses.logic
@@ -2,16 +2,28 @@ area MinishHouseInteriors:
   room EasternHills:
     node Main:
       door South
+      npc Minish
   room Festari:
     node Main:
       door South
-      exit North
+      target North
+      npc Festari
     node NorthEntrance:
-      entrance North
-    Main <-> NorthEntrance: ( item JabberNut | item BombBag )
+      warp North
+    Main -> NorthEntrance: flag FestariMoved
+    node FestariMoves:
+      set FestariMoved
+    Main -> FestariMoves: ( item JabberNut & flag Gentari.TalkToElder )
   room Gentari:
     node Main:
       door South
+      npc Gentari
+    node OpenCurtains:
+      set CurtainsOpen
+    Main -> CurtainsOpen: item EarthElement
+    node TalkToElder:
+      set TalkToElder
+    Main -> TalkToElder: item JabberNut
     node West:
       door West
     Main <-> West: flag CurtainsOpen
@@ -22,53 +34,87 @@ area MinishHouseInteriors:
   room HyruleTownPreWestGorman:
     node Main:
       door South
+      npc Minish
   room LakeCenter:
     node Main:
       door South
+    node Librari:
+      npc Librari
+      item Librari
+    Main -> Librari: defeat Gyorg.Main.Gyorg
   room LakeCrest:
     node Main:
       door South
+      npc Minish
+      set HyruleTown.LibraryOpen
   room MineEast:
     node Main:
       door West
+    node Apprentice:
+      npc Apprentice
+    Main -> Apprentice: MelariMine.Main.MelariMoved
   room MineSouthEast:
     node Main:
       door North
+    node Apprentice:
+      npc Apprentice
+    Main -> Apprentice: MelariMine.Main.MelariMoved
   room MineSouthWest:
     node Main:
       door North
+    node Melari:
+      npc Melari
+    Main -> Mellari: MelariMine.Main.MelariMoved
   room MinishWoods:
     node Main:
       door South
+      npc Belari
+      item Belari
+    node RemoteBombs:
+      item RemoteBombs
+    Main -> RemoteBombs: fusion RemoteBombs
   room SouthHyruleField:
     node Main:
       door South
+      npc Minish
   room Trilby:
     node Main:
       door South
+      npc Minish
   room VillageBarrel:
     node Main:
-      chest Chest
+      chest ItemOnTable
       door South
       door Ladder
+      npc South
+    node NorthMinish:
+      npc North
+    Main -> NorthMinish: item JabberNut
   room VillageLakeMushroom:
     node Main:
       door South
+      npc Minish
   room VillageMushroomCenter:
     node Main:
       door South
+      npc Minish
   room VillageMushroomEast:
     node Main:
       door South
+      npc Minish
   room VillageMushroomWest:
     node Main:
       door South
+      npc Minish
   room VillagePot:
     node Main:
       door South
+      npc Minish
   room VillageShoe:
     node Main:
       door South
+      npc Minish
   room WesternWood:
     node Main:
       door South
+      npc Minish