Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
also do it for forest belltower
Browse files Browse the repository at this point in the history
ScipioWright committed Dec 14, 2024
1 parent dd2883c commit e0b78d7
Showing 2 changed files with 23 additions and 3 deletions.
9 changes: 8 additions & 1 deletion worlds/tunic/er_data.py
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ def destination_scene(self) -> str: # the vanilla connection
Portal(name="Temple Door Exit", region="Sealed Temple",
destination="Overworld Redux", tag="_main"),

Portal(name="Forest Belltower to Fortress", region="Forest Belltower Main",
Portal(name="Forest Belltower to Fortress", region="Forest Belltower Main behind bushes",
destination="Fortress Courtyard", tag="_"),
Portal(name="Forest Belltower to Forest", region="Forest Belltower Lower",
destination="East Forest Redux", tag="_"),
@@ -600,6 +600,7 @@ class DeadEnd(IntEnum):
"Sealed Temple Rafters": RegionInfo("Temple"),
"Forest Belltower Upper": RegionInfo("Forest Belltower"),
"Forest Belltower Main": RegionInfo("Forest Belltower"),
"Forest Belltower Main behind bushes": RegionInfo("Forest Belltower"),
"Forest Belltower Lower": RegionInfo("Forest Belltower"),
"East Forest": RegionInfo("East Forest Redux"),
"East Forest Dance Fox Spot": RegionInfo("East Forest Redux"),
@@ -996,6 +997,12 @@ class DeadEnd(IntEnum):
"Forest Belltower Main": {
"Forest Belltower Lower":
[],
"Forest Belltower Main behind bushes":
[],
},
"Forest Belltower Main behind bushes": {
"Forest Belltower Main":
[],
},
"East Forest": {
"East Forest Dance Fox Spot":
17 changes: 15 additions & 2 deletions worlds/tunic/er_rules.py
Original file line number Diff line number Diff line change
@@ -39,6 +39,12 @@ def can_shop(state: CollectionState, world: "TunicWorld") -> bool:
return has_sword(state, world.player) and state.can_reach_region("Shop", world.player)


# for the ones that are not early bushes where ER can screw you over a bit
def can_get_past_bushes(state: CollectionState, world: "TunicWorld") -> bool:
# add in glass cannon + stick for grass rando
return has_sword(state, world.player) or state.has_any((fire_wand, laurels, gun), world.player)


def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_pairs: Dict[Portal, Portal]) -> None:
player = world.player
options = world.options
@@ -403,6 +409,13 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_
connecting_region=regions["Forest Belltower Lower"],
rule=lambda state: has_ladder("Ladder to East Forest", state, world))

regions["Forest Belltower Main behind bushes"].connect(
connecting_region=regions["Forest Belltower Main"],
rule=lambda state: can_get_past_bushes(state, world))
# you can use the slimes to break the bushes
regions["Forest Belltower Main"].connect(
connecting_region=regions["Forest Belltower Main behind bushes"])

# ice grapple up to dance fox spot, and vice versa
regions["East Forest"].connect(
connecting_region=regions["East Forest Dance Fox Spot"],
@@ -435,10 +448,10 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_

regions["Guard House 2 Upper before bushes"].connect(
connecting_region=regions["Guard House 2 Upper after bushes"],
rule=lambda state: has_sword(state, player) or state.has_any((fire_wand, laurels, gun), player))
rule=lambda state: can_get_past_bushes(state, world))
regions["Guard House 2 Upper after bushes"].connect(
connecting_region=regions["Guard House 2 Upper before bushes"],
rule=lambda state: has_sword(state, player) or state.has_any((fire_wand, laurels, gun), player))
rule=lambda state: can_get_past_bushes(state, world))

regions["Guard House 2 Upper after bushes"].connect(
connecting_region=regions["Guard House 2 Lower"],

0 comments on commit e0b78d7

Please sign in to comment.