Various fixes

Co-authored-By: Henny022 <[email protected]>
minishmaker · Dec 29, 2024 · b1bd2b9 · b1bd2b9
1 parent 74d823b
commit b1bd2b9
Show file tree

Hide file tree

Showing 27 changed files with 127 additions and 71 deletions.
diff --git a/basicDefinitions/module.yaml b/basicDefinitions/module.yaml
@@ -25,7 +25,7 @@ provides:
       export: edge-from-beyond-the-void
     warp:
       arguments:
-        - unscoped
+        - scoped
       stateful: false
       type: truthy
       export: target
@@ -49,7 +49,7 @@ provides:
       export: edge
     enemy:
       arguments:
-        - unscoped
+        - scoped
       stateful: false
       type: truthy
       export: target
@@ -64,6 +64,11 @@ provides:
       stateful: false
       type: truthy
       export: edge-from-beyond-the-void
+    goal:
+      arguments: []
+      stateful: false
+      type: truthy
+      export: target
   logic-sugar:
     door:
       type: multi

diff --git a/tmc/descriptors.dscr b/tmc/descriptors.dscr
@@ -10,12 +10,12 @@ item CanSpin:
 
 
 numberOfGorons:
-  (fusion GoronCave.Main.Goron1 & 1) +
-  (fusion GoronCave.Main.Goron2 & 1) +
-  (fusion GoronCave.Main.Goron3 & 1) +
-  (fusion GoronCave.Main.Goron4 & 1) +
-  (fusion GoronCave.Main.Goron5 & 1) +
-  (fusion GoronCave.Main.Goron6 & 1).
+  (fusion GoronCave.Main.Goron1, 1) +
+  (fusion GoronCave.Main.Goron2, 1) +
+  (fusion GoronCave.Main.Goron3, 1) +
+  (fusion GoronCave.Main.Goron4, 1) +
+  (fusion GoronCave.Main.Goron5, 1) +
+  (fusion GoronCave.Main.Goron6, 1).
 
 fourGorons:
   numberOfGorons >= 4.

diff --git a/tmc/logic/beanstalks.logic b/tmc/logic/beanstalks.logic
@@ -24,6 +24,7 @@ area Beanstalks:
       chest HP
       chest North
       chest West
+      door South
   room LakeHyliaClimb:
     node Main:
       door North

diff --git a/tmc/logic/castor_darknut_cave.logic b/tmc/logic/castor_darknut_cave.logic
@@ -6,7 +6,7 @@ area CastorDarknutCave:
     node PostFight:
       chest Chest
       warp South
-    Main -> PostFight: defeat Darknut
+    Main -> PostFight: kill Darknut
   room Stairs:
     node Main:
       door NorthEastStair

diff --git a/tmc/logic/cave_of_flames.logic b/tmc/logic/cave_of_flames.logic
@@ -94,7 +94,7 @@ area CaveOfFlames:
       door Minecart
   room BF1PillbugsAndFloating:
     node South:
-      door West
+      door East
       enemy Pillbugs
     node North:
       door North

diff --git a/tmc/logic/caves.logic b/tmc/logic/caves.logic
@@ -5,8 +5,9 @@ area Caves:
       door South
       enemy Keese
   room LonLonPuddle:
-    door South
-    chest Chest
+    node Main:
+      door South
+      chest Chest
   room LonLonTingle:
     node South:
       door South
@@ -77,9 +78,10 @@ area Caves:
       door WestLadder
     East -> West: ( helper CanSplit3 | helper CanSplit4 )
   room NorthHyruleFieldCaveBasement:
-    chest HP
-    door Stair
-    door South
+    node Main:
+      chest HP
+      door Stair
+      door South
   room NorthHyruleFieldFairy:
     node Main:
       door South

diff --git a/tmc/logic/crenel_caves.logic b/tmc/logic/crenel_caves.logic
@@ -55,7 +55,7 @@ area CrenelCaves:
       door South
       target North
     node Switches:
-      flag Switches
+      set Switches
     Main -> Switches: item CanSplit2
     node SwitchDoor:
       warp North
@@ -114,7 +114,7 @@ area CrenelCaves:
       door NorthStairs
       enemy NorthChus
     node SwitchBridgeGap:
-      flag Switch
+      set Switch
     SwitchBridgeNorth -> SwitchBridgeGap: ( helper HasProjectileDamage | item BombBag | hasExplosive )
     node SwitchBridgeSouth:
       door South

diff --git a/tmc/logic/dark_hyrule_castle.logic b/tmc/logic/dark_hyrule_castle.logic
@@ -44,7 +44,7 @@ area DarkHyruleCastle:
     node Main:
       door StairDown
       door South
-    Main -> BombWall: ( item BombBag | state HasExplosive )
+    Main -> BombWall: ( item BombBag | hasExplosive )
     Main <-> East: flag WallBombed
     node EastMinish:
       door EastMinish
@@ -59,7 +59,7 @@ area DarkHyruleCastle:
     node BombWall:
       set WallBombed
     Main <-> West: flag WallBombed
-    Main -> BombWall: ( item BombBag | state HasExplosive )
+    Main -> BombWall: ( item BombBag | hasExplosive )
   room B1MinishPortal:
     node East:
       door East
@@ -405,7 +405,7 @@ area DarkHyruleCastle:
       chest Chest
   room F2SoutheastTower:
     node Main:
-      node Stairs
+      door Stairs
       chest Chest
   room F2SouthwestTower:
     node Main:

diff --git a/tmc/logic/fortress_of_winds.logic b/tmc/logic/fortress_of_winds.logic
@@ -62,7 +62,7 @@ area FortressOfWinds:
     node BlueWarp:
       warp BlueWarp
     Main -> PostFight: kill Darknut
-    Main -> BlueWarp: GFCenterStairs.BlueWarp
+    Main -> BlueWarp: flag GFCenterStairs.BlueWarp
     South -> Main
     East -> Main
     Main -> South: kill Darknut
@@ -105,10 +105,10 @@ area FortressOfWinds:
       chest EastChest
       chest WestChest
       target South
-    node DropDown
+    node DropDown:
       target RoofHole
       warp Hole
-    node DropDownMinish
+    node DropDownMinish:
       target RoofMinishHole
       warp MinishHole
     node South:
@@ -190,7 +190,7 @@ area FortressOfWinds:
     node Main:
       door North
       door StairDown
-    node DropDown
+    node DropDown:
       target RoofHole
       warp Hole
     Main -> DropDown
@@ -200,7 +200,7 @@ area FortressOfWinds:
       door West
     node MainEast:
       set KeyDropped
-    Main <-> MainEast: ( item Cape | item CanSplit2 | ( trick CloneSlide & ( item CanSplit 3 | item CanSplit4 )))
+    Main <-> MainEast: ( item Cape | helper CanSplit2 | ( trick CloneSlide & ( helper CanSplit3 | helper CanSplit4 )))
     node East:
       door South
       target RedWarp
@@ -251,7 +251,7 @@ area FortressOfWinds:
       chest Chest
     node Fight:
       enemy Eyegores
-    Main -> Chest: defeat Eyegores
+    Main -> Chest: kill Eyegores
     Main -> Fight: ( helper CanClone2 | helper CanClone3 | helper CanClone4 )
   room F2MazaalRoom:
     node Main:
@@ -262,7 +262,7 @@ area FortressOfWinds:
       warp North
       chest HP
       warp South
-    Main -> PostFight: defeat Mazaal
+    Main -> PostFight: kill Mazaal
   room F2PreMazaal:
     node Main:
       door South
@@ -303,7 +303,7 @@ area FortressOfWinds:
       door EastMinish
     node Key:
       chest Key
-    Main -> Key: F2East.KeyDropped
+    Main -> Key: flag F2East.KeyDropped
   room GFMinishHP:
     node Main:
       chest Chest
@@ -321,7 +321,7 @@ area FortressOfWinds:
       target DropDown
     node Key:
       chest Key
-    Main -> Key: F2CenterKeyPull.KeyDropped
+    Main -> Key: flag F2CenterKeyPull.KeyDropped
   room GFWizrobes:
     node Main:
       enemy Wizrobes

diff --git a/tmc/logic/gleerock.logic b/tmc/logic/gleerock.logic
@@ -7,4 +7,4 @@ area Gleerock:
       warp GreenWarp
       chest HC
       chest Prize
-    Main -> PostFight: defeat Gleerock
+    Main -> PostFight: kill Gleerock
diff --git a/tmc/logic/greenchu.logic b/tmc/logic/greenchu.logic
@@ -8,4 +8,4 @@ area Greenchu:
       chest HP
       chest Element
       warp Door # requires re-entering the room after having already defeated green chu, but relevant for decoupled entrance rando
-    Main -> PostFight: defeat Greenchu
+    Main -> PostFight: kill Greenchu
diff --git a/tmc/logic/gyorg.logic b/tmc/logic/gyorg.logic
@@ -5,4 +5,4 @@ area Gyorg:
       enemy Gyorg
     node PostFight:
       warp PostFight
-    Main -> PostFight: defeat Gyorg
+    Main -> PostFight: kill Gyorg
diff --git a/tmc/logic/house_interiors_4.logic b/tmc/logic/house_interiors_4.logic
@@ -24,8 +24,8 @@ area HouseInteriors4:
       npc Malon
     node MainEnterFromEast:
       target East
-    Main <-> MainUnlocked: HyruleField.LonLon.OpenWestRanchDoor
-    MainEnterFromEast -> Main: HyruleField.LonLon.OpenWestRanchDoor
+    Main <-> MainUnlocked: flag HyruleField.LonLon.OpenWestRanchDoor
+    MainEnterFromEast -> Main: flag HyruleField.LonLon.OpenWestRanchDoor
   room Lumberjack:
     node Main:
       door South

diff --git a/tmc/logic/hyrule_field.logic b/tmc/logic/hyrule_field.logic
@@ -466,7 +466,7 @@ area HyruleField:
       door EastNorth
       door EastSouth
       door West
-      ennemy OctorocsAndKeatons
+      enemy OctorocsAndKeatons
       door TopLadder
       warp Virtual.Zeffa.FluteAway
 
@@ -556,7 +556,7 @@ area HyruleField:
 
     node VaatiTakeoverCutscene:
       set VaatiTakeover
-    Main -> VaatiTakeoverCutscene: ( item RedSword & defeat Gleerock.Main.Gleerock )
+    Main -> VaatiTakeoverCutscene: ( item RedSword & kill Gleerock.Main.Gleerock )
 
     node East:
       door East

diff --git a/tmc/logic/lake_hylia.logic b/tmc/logic/lake_hylia.logic
@@ -72,7 +72,7 @@ area LakeHylia:
       enemy ChuAndOctorok
     node DavidJr:
       npc DavidJr
-    NorthWest -> DavidJr: flag HyruleField.WestWoodsNorth.VaatiTakeover & flag HyruleField.South.TalkedToTingle
+    NorthWest -> DavidJr: ( flag HyruleField.WestWoodsNorth.VaatiTakeover & flag HyruleField.South.TalkedToTingle )
     West <-> Water: item Flippers
     West <-> SouthIslands: item Cape
     West <-> NorthWest: flag Boulder
@@ -90,7 +90,7 @@ area LakeHylia:
     SouthEast -> SouthEastMinish: (item CanTurnMinish & flag TreeBonk)
     SouthEastMinish <-> MinishWater: item Flippers
     SouthEastMinish -> SouthEast: item CanGrow
-    node DigCaveNorthArea:
+    node DigCaveNorthArea
     node NorthIslands:
       chest NorthHP
     DigCaveNorthArea <-> NorthHP: item Cape

diff --git a/tmc/logic/melari_mine.logic b/tmc/logic/melari_mine.logic
@@ -12,7 +12,7 @@ area MelariMine:
       target West
     node West:
       warp West
-    Main -> West: WestEntranceFree
+    Main -> West: flag WestEntranceFree
     node MainDigSpots: # digspots are clockwise from the north entrance to Melari
       chest DigSpot1
       chest DigSpot2

diff --git a/tmc/logic/minish_cracks.logic b/tmc/logic/minish_cracks.logic
@@ -9,7 +9,7 @@ area MinishCracks:
       enemy Mulldozers
     node MainEnemiesDefeated:
       chest Chest
-    Main -> MainEnemiesDefeated: defeat Mulldozers
+    Main -> MainEnemiesDefeated: kill Mulldozers
   room CastorLilyDown:
     node Main:
       chest Chest
@@ -38,7 +38,7 @@ area MinishCracks:
   room LonLon:
     node Main:
       chest Chest
-      door Ladde
+      door Ladder
   room MinishWoodsFusion:
     node Main:
       chest Chest

diff --git a/tmc/logic/minish_houses.logic b/tmc/logic/minish_houses.logic
@@ -40,8 +40,8 @@ area MinishHouseInteriors:
       door South
     node Librari:
       npc Librari
-      item Librari
-    Main -> Librari: defeat Gyorg.Main.Gyorg
+      chest Librari
+    Main -> Librari: kill Gyorg.Main.Gyorg
   room LakeCrest:
     node Main:
       door South
@@ -52,26 +52,26 @@ area MinishHouseInteriors:
       door West
     node Apprentice:
       npc Apprentice
-    Main -> Apprentice: MelariMine.Main.MelariMoved
+    Main -> Apprentice: flag MelariMine.Main.MelariMoved
   room MineSouthEast:
     node Main:
       door North
     node Apprentice:
       npc Apprentice
-    Main -> Apprentice: MelariMine.Main.MelariMoved
+    Main -> Apprentice: flag MelariMine.Main.MelariMoved
   room MineSouthWest:
     node Main:
       door North
     node Melari:
       npc Melari
-    Main -> Mellari: MelariMine.Main.MelariMoved
+    Main -> Mellari: flag MelariMine.Main.MelariMoved
   room MinishWoods:
     node Main:
       door South
       npc Belari
-      item Belari
+      chest Belari
     node RemoteBombs:
-      item RemoteBombs
+      chest RemoteBombs
     Main -> RemoteBombs: fusion RemoteBombs
   room SouthHyruleField:
     node Main:

diff --git a/tmc/logic/minish_rafters.logic b/tmc/logic/minish_rafters.logic
@@ -34,7 +34,7 @@ area MinishRafters:
     node DropBook:
       set BookFall
     Main -> Book: flag HouseInteriors2.Library.BookQuestStart
-    Book -> DropBook: ( item CanSplit & ( item BombBag | state HasExplosive | item GustJar ) )
+    Book -> DropBook: ( item CanSplit & ( item BombBag | hasExplosive | item GustJar ) )
   room Shop:
     node Main:
       chest Chest

diff --git a/tmc/logic/palace_of_winds.logic b/tmc/logic/palace_of_winds.logic
@@ -20,7 +20,7 @@ area PalaceOfWinds:
     SouthWestRedSwitch -> SouthWestBlueSwitch: (item BombBag | item Boomerang | item MagicalBoomerang | ( trick GustJarProjectilesThroughWalls & item GustJar ))
     SouthEastRedSwitch -> SouthWestRedSwitch
     SouthEastBlueSwitch -> SouthWestBlueSwitch: item Cape
-    SouthEastBlueSwitch <-> SouthEastRedSwitch: canHitSwitch
+    SouthEastBlueSwitch <-> SouthEastRedSwitch: helper CanHitSwitch
     MainBlueSwitch <-> SouthEastBlueSwitch 
     Main <-> SouthEastRedSwitch: item Cape
     Main -> MainBlueSwitch: helper HasProjectileDamage
@@ -561,7 +561,7 @@ area PalaceOfWinds:
     node EastPastWall:
       warp East
     East -> EastBlowUpWall: ( item BombBag | hasExplosive )
-    EastBlowUpWall:
+    node EastBlowUpWall:
       set BombableWall
     East -> EastPastWall: flag BombableWall
     East -> South