Skip to content

Commit

Permalink
Fix Crenel
Browse files Browse the repository at this point in the history
Co-authored-By: Henny022 <git@henny022.de>
Ibot02 and Henny022 committed Aug 4, 2024
1 parent 3c1020a commit 5357e07
Showing 2 changed files with 141 additions and 43 deletions.
164 changes: 121 additions & 43 deletions tmc/logic/crenel.logic
Original file line number Diff line number Diff line change
@@ -6,23 +6,41 @@ area Crenel:
exit FairyBombWall
exit WestHillBombWall
enemy CenterTektites
node CenterBombWallEntrances:
target EastClimbWall
node EastClimbWall:
warp EastClimbWall
Center -> EastClimbWall: item GripRing
node CenterBombWalls:
set EastHillBombWallOpen
set FairyBombWallOpen
set WestHillBombWallOpen
node EastHillBombWall:
entrance EastHillBombWall
node FairyBombWall:
entrance FairyBombWall
node WestHillBombWall:
entrance WestHillBombWall
Center -> CenterBombWallEntrances: ( item BombBag | state HasExplosive )
Center -> CenterBombWalls: ( item BombBag | hasExplosive )
Center -> EastHillBombWall: flag EastHillBombWallOpen
Center -> FairyBombWall: flag FairyBombWallOpen
Center -> WestHillBombWall: flag WestHillBombWallOpen
node EastHillTop:
door EastHillLadder
node EastHillTopBombBlock:
set BombBlockExploded
EastHillTopBombBlock <-> EastHillTop:( item BombBag | state HasExplosive )
EastHillTopBombBlock <-> EastHillTop:( item BombBag | hasExplosive )
EastHillTop -> Center
node EastHillTopSwipeSouthEastRupee:
chest SouthEastRupee
EastHillTop -> EastHillTopSwipeSouthEastRupee: ( helper AnySword & swipeable SouthEastRupee )
node EastHillTopMinish:
door SpringMinishPath
EastHillTop -> EastHillTopMinish: ( item CanTurnMinish & flag BombBlockExploded )
EastHillTopMinish -> EastHillTop: ( item CanGrow & flag BombBlockExploded )
node NorthVine:
door NorthVine
warp NorthVine
node NorthVineDown:
target NorthVine
node SouthEast:
chest SouthEastRupee
door East
@@ -34,7 +52,10 @@ area Crenel:
Center -> SouthEast
node SouthEastBombWall:
entrance SouthEastBombWall
SouthEast -> SouthEastBombWall: ( item BombBag | state HasExplosive )
SouthEast -> SouthEastBombWall: flag SouthEastBombWallOpen
SouthEast -> SouthEastBombWallOpen: ( item BombBag | hasExplosive )
node SouthEastBombWallOpen:
set SouthEastBombWallOpen
node West:
door LedgeCave
door NorthBridge
@@ -43,25 +64,51 @@ area Crenel:
West -> Center
node WestBridgeChestFusion:
chest WestBridgeChestFusion
West <-> WestBridgeChestFusion: flag WestBridgeChestFusion
West <-> WestBridgeChestFusion: fusion WestBridgeChest
node WestMinish:
door MinishCave
door MinishHouse
door MinishPath
West <-> NorthVine: flag CrenelGreenBeanIsPlanted
West <-> WestMinish: (item GustJar | item BombBag)
node WestMinishUpVines:
door MinishCave
WestMinish <-> WestMinishUpVines: noBean
node WestMinishPlantBean:
set CrenelGreenBeanIsPlanted
WestMinish -> WestMinishPlantBean: hasBean
node WestMinishHouseExit:
target MinishHouse
node WestMinishHouse:
warp MinishHouse
node WestBlowUpDust:
set WestMinishHouseRevealed
set WestPortalRevealed
West -> NorthVine: flag CrenelGreenBeanIsGrown
NorthVineDown -> West: flag CrenelGreenBeanIsGrown
West -> WestBlowUpDust: (item GustJar | item BombBag)
West -> WestMinish: ( flag WestPortalRevealed & item CanTurnMinish )
WestMinish -> West: ( flag WestPortalRevealed & item CanGrow )
WestMinish -> WestMinishHouse: flag WestMinishHouseRevealed
WestMinishHouseExit -> WestMinish: flag WestMinishHouseRevealed
node WestGrowBean:
set CrenelGreenBeanIsGrown
West -> WestGrowBean: ( flag CrenelGreenBeanIsPlanted & item MineralWater )
node SouthEast +: warp Virtual.Zeffa.FluteAway
node Center +: warp Virtual.Zeffa.FluteAway
node West +: warp Virtual.Zeffa.FluteAway
node EastHillTop +: warp Virtual.Zeffa.FluteAway
room Higher:
node CoFExterior:
door CoFEntrance
door MelariMinishEast
exit Crest
set Virtual.Zeffa.CrenelCrest
node CoFExteriorMinish:
door MelariMinishWest
node EastOfMine:
door CaveEntrance
node EastOfMineMinish:
door MelariMinishWest
door MelariMinishEast
EastOfMine -> EastOfMineMinish: item CanTurnMinish
EastOfMineMinish -> EastOfMine: item CanGrow
CoFExterior -> CoFExteriorMinish: item CanTurnMinish
CoFExteriorMinish -> CoFExterior: item CanGrow
node GraybladeExterior:
door Grayblade
node Main:
@@ -70,13 +117,16 @@ area Crenel:
exit MainBombWall
Main -> CoFExterior: item Cane
CoFExterior -> Main
Main -> GraybladeExterior: item GripRing
Main <-> GraybladeExterior: item GripRing
node MainClimbSouth:
door MainClimbSouth
Main <-> MainClimbSouth: item GripRing
node MainBombWall:
entrance MainBombWall
Main -> MainBombWall: ( item BombBag | state HasExplosive )
node MainBombWallOpen:
set MainBombWall
Main -> MainBombWallOpen: ( item BombBag | hasExplosive )
Main -> MainBombWall: flag MainBombWall
node MiddleMountainShelf:
door MiddleMountainShelfEast
door MiddleMountainShelfWest
@@ -90,6 +140,8 @@ area Crenel:
node GraybladeExterior +: entrance Virtual.Zeffa.FluteAway
node MiddleMountainShelf +: entrance Virtual.Zeffa.FluteAway
node TopMountainShelf +: entrance Virtual.Zeffa.FluteAway
node MainClimbSouth +: entrance Virtual.Zeffa.FluteAway
node Main +: entrance Virtual.Zeffa.FluteAway
room Middle:
node BridgeBombWall:
entrance BridgeBombWall
@@ -100,57 +152,76 @@ area Crenel:
enemy NorthWestTektites
exit BridgeBombWall
exit FairyBombWall
Main -> BridgeBombWall: ( item BombBag | state HasExplosive )
Main -> FairyBombWall: ( item BombBag | state HasExplosive )
door SouthVineEntrance
target NorthWestClimb
node MainBombWalls:
set BridgeBombWall
set FairyBombWall
Main -> MainBombWalls: ( item BombBag | hasExplosive )
Main -> BridgeBombWall: flag BrigeBombWall
Main -> FairyBombWall: flag FairyBombWall
node UpperEast:
target NorthEastClimb
node NorthEastClimb:
door NorthEastClimb
Main <-> NorthEastClimb: item GripRing
warp NorthEastClimb
Main -> UpperEast: ( item GripRing | ( item GustJar & trick LayerGustJar ) )
UpperEast -> UpperCenter
UpperEast -> NorthEastClimb: item GripRing
node NorthWestClimb:
door NorthWestClimb
Main <-> NorthWestClimb: item GripRing
node UpperEastArea:
warp NorthWestClimb
Main -> NorthWestClimb: item GripRing
node UpperWest:
door NorthLadder
enemy UpperEastTektites
node UpperWestArea:
node UpperCenter:
door CenterCave
enemy UpperEastTektites
UpperEastArea -> Main
UpperWestArea -> Main
UpperEastArea <-> UpperWestArea
UpperCenter -> Main
UpperWest -> Main
UpperWest <-> UpperCenter
node SouthClimb:
door SouthClimb
Main <-> SouthClimb: item GripRing
node SouthVineEntrance:
entrance SouthVine
node SouthVineExit:
exit SouthVine
Main -> SouthVineEntrance: flag CrenelGreenBeanIsPlanted
SouthVineExit -> Main: flag CrenelGreenBeanIsPlanted
node SouthWest:
door BridgeSouth
exit SouthWestBombWall
node SouthWestBombWallOpen:
set SouthWestBombWall
node SouthWestBombWall:
entrance SouthWestBombWall
SouthWest -> SouthWestBombWall: ( item BombBag | state HasExplosive )
SouthWest -> SouthWestBombWallOpen: ( item BombBag | hasExplosive )
SouthWest -> SouthWestBombWall: flag SouthWestBombWall
node Main +: warp Virtual.Zeffa.FluteAway
node SouthClimb +: warp Virtual.Zeffa.FluteAway
node UpperWest +: warp Virtual.Zeffa.FluteAway
node UpperCenter +: warp Virtual.Zeffa.FluteAway
node UpperEast +: warp Virtual.Zeffa.FluteAway
room Climb:
node NorthEntrance:
entrance North
node MiddlePlatform:
node North:
exit North
node MiddlePlatform
node MiddlePlatformChestFusion:
chest ChestFusion
MiddlePlatform <-> MiddlePlatformChestFusion: flag MiddlePlatformChestFusion
node BombWallPlatform:
exit BombWall
node BombWallEntrance:
entrance BombWall
MiddlePlatform -> BombWallPlatform
BombWallPlatform -> BombWallEntrance: ( item BombBag | state HasExplosive )
node BombWall:
set BombWall
node South:
door South
North -> MiddlePlatform
North -> NorthEntrance: item GripRing
MiddlePlatform -> BombWallPlatform
MiddlePlatform -> North: item GripRing
BombWallPlatform -> South
South -> MiddlePlatform: item GripRing
MiddlePlatform -> NorthEntrance: item GripRing
BombWallPlatform -> MiddlePlatform: item GripRing
South -> BombWallPlatform: item GripRing
MiddlePlatform -> MiddlePlatformChestFusion: fusion MiddlePlatformChest
BombWallPlatform -> BombWallEntrance: flag BombWall
BombWallPlatform -> BombWall: ( item BombBag | hasExplosive )
node DigCave:
door DigCave
node West:
@@ -159,9 +230,13 @@ area Crenel:
West <-> DigCave: item MoleMitts
node South +: entrance Virtual.Zeffa.FluteAway
node West +: entrance Virtual.Zeffa.FluteAway
node North +: entrance Virtual.Zeffa.FluteAway
node MiddlePlatform +: entrance Virtual.Zeffa.FluteAway
node BombWallPlatform +: entrance Virtual.Zeffa.FluteAway
room Peak:
node EastPeakRight:
set BoulderPushed
set SouthBoulderInHole
set NorthBoulderInHole
node EastPeakRightMinish:
door MinishPathEast
EastPeakRight -> EastPeakRightMinish: item CanTurnMinish
@@ -171,17 +246,20 @@ area Crenel:
node EastPeakLeftMinish:
door MinishPathWest
node Main:
door Climb
door Ladder
enemy PeakEnemies
exit Beanstalk
node MainBeanstalk:
entrance Beanstalk
node WestClimb:
door Climb
Main <-> WestClimb: item GripRing
Main -> EastPeakLeftMinish: item CanTurnMinish
EastPeakLeftMinish -> Main: item CanGrow
Main <-> EastPeakLadder: flag BoulderPushed
Main <-> EastPeakRight: flag BoulderPushed
Main -> MainBeanstalk: flag CrenelBeanstalkFusion
Main -> EastPeakLadder: flag NorthBoulderInHole
EastPeakLadder -> Main
Main <-> EastPeakRight: flag SouthBoulderInHole
Main -> MainBeanstalk: fusion CrenelBeanstalk
node EastPeakRight +: entrance Virtual.Zeffa.FluteAway
node EastPeakLadder +: entrance Virtual.Zeffa.FluteAway
node Main +: entrance Virtual.Zeffa.FluteAway
20 changes: 20 additions & 0 deletions tmc/module.yaml
Original file line number Diff line number Diff line change
@@ -27,11 +27,31 @@ provides:
stateful: true
type: truthy
export: edge
noBean:
arguments: []
stateful: true
type: truthy
export: edge
hasBean:
arguments: []
stateful: true
type: truthy
export: edge
helper:
arguments: ["unscoped"]
stateful: false
type: truthy
export: edge
fusion:
arguments: ["scoped"]
stateful: false
type: truthy
export: edge
swipeable:
arguments: ["scoped"]
stateful: false
type: truthy
export: edge
logic-sugar:
entrance:
type: multi

0 comments on commit 5357e07

Please sign in to comment.