From 3f8c348a49dd2ffeb77805f790b153131b7c63bf Mon Sep 17 00:00:00 2001
From: CookieCat <81494827+CookieCat45@users.noreply.github.com>
Date: Thu, 23 May 2024 03:49:17 -0400
Subject: [PATCH] AHIT: Fix Your Contract has Expired being placed on the first
 level when it shouldn't (#3379)

---
 worlds/ahit/Regions.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py
index 6a388a98..0ba0f5b9 100644
--- a/worlds/ahit/Regions.py
+++ b/worlds/ahit/Regions.py
@@ -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 act.name == "Your Contract has Expired":
+        if diff < Difficulty.EXPERT or world.options.ShuffleSubconPaintings and world.options.NoPaintingSkips:
+            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