mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-28 00:03:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Your Contract Has Expired being placed on first level when it shouldn't

Browse Source
This commit is contained in:
CookieCat
2024-05-22 11:33:39 -04:00
parent 2c7ff4bfe6
commit 445afb971e
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
worlds/ahit/Regions.py
View File

@@ -699,11 +699,14 @@ def is_valid_first_act(world: "HatInTimeWorld", act: Region) -> bool:
# Needs to be at least moderate to cross the big dweller wall
if act.name == "Queen Vanessa's Manor" and diff < Difficulty.MODERATE:
return False
elif act.name == "Your Contract has Expired" and diff < Difficulty.EXPERT: # Snatcher Hover
return False
elif act.name == "Heating Up Mafia Town": # Straight up impossible
return False
# Need to be able to hover
if (diff < Difficulty.EXPERT or world.options.ShuffleSubconPaintings and world.options.NoPaintingSkips) \
and act.name == "Your Contract has Expired":
return False
if act.name == "Dead Bird Studio":
# No umbrella logic = moderate, umbrella logic = expert.
if diff < Difficulty.MODERATE or world.options.UmbrellaLogic and diff < Difficulty.EXPERT:
@@ -718,14 +721,9 @@ def is_valid_first_act(world: "HatInTimeWorld", act: Region) -> bool:
return False
if world.options.ShuffleSubconPaintings and act_chapters.get(act.name, "") == "Subcon Forest":
# This requires a cherry hover to enter Subcon
if act.name == "Your Contract has Expired":
if diff < Difficulty.EXPERT or world.options.NoPaintingSkips:
return False
else:
# Only allow Subcon levels if paintings can be skipped
if diff < Difficulty.MODERATE or world.options.NoPaintingSkips:
return False
# Only allow Subcon levels if painting skips are allowed
if diff < Difficulty.MODERATE or world.options.NoPaintingSkips:
return False
return True