From fd1405ada000b5d8ce44f023a8551b841e2b9783 Mon Sep 17 00:00:00 2001 From: Nikolaj Date: Tue, 9 Dec 2025 13:31:49 +0100 Subject: [PATCH] :sparkles: Handful of logic fixes --- Sly3Regions.py | 4 ++-- Sly3Rules.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Sly3Regions.py b/Sly3Regions.py index 797f85a..e920897 100644 --- a/Sly3Regions.py +++ b/Sly3Regions.py @@ -42,11 +42,11 @@ def create_access_rule(episode: str, n: int, options: "Sly3Options", player: int ["Carmelita"] ], "Dead Men Tell No Tales": [ - [], + ["Disguise (Pirate)"], ["Bentley", "Penelope", "Grapple-Cam", "Murray", "Silent Obliteration", "Treasure Map"], ["Panda King", "Dimitri"] ] - }[episode][:n-2], []) + }[episode][:n-1], []) access = access and all(state.has(i, player) for i in requirements) return access diff --git a/Sly3Rules.py b/Sly3Rules.py index a6cd29b..7e249ea 100644 --- a/Sly3Rules.py +++ b/Sly3Rules.py @@ -15,7 +15,7 @@ def set_rules_sly3(world: "Sly3World"): # Putting ThiefNet stuff out of logic, to make early game less slow. # Divides the items into 8 groups of 3. First groups requires 2 episodes # items to be in logic, second group requires 4, etc. - for i in range(1,35): + for i in range(1,38): episode_items_n = ceil(i/4)*2 add_rule( world.get_location(f"ThiefNet {i:02}"), @@ -156,14 +156,15 @@ def set_rules_sly3(world: "Sly3World"): ## A Cold Alliance require("A Cold Alliance - Big Air in China", ["Bentley", "Murray", "Guru", "Penelope", "Binocucom"]) + require("A Cold Alliance - Sharpshooter", "Panda King") # A Cold Alliance - Treetop Tangle # A Cold Alliance - Tsao Showdown require("A Cold Alliance - China Treasure Hunt", "Treasure Map") ## Dead Men Tell No Tales - # Dead Men Tell No Tales - Patch Grab - # Dead Men Tell No Tales - Stealth Challenge + require("Dead Men Tell No Tales - Patch Grab", "Disguise (Pirate)") + require("Dead Men Tell No Tales - Stealth Challenge", "Disguise (Pirate)") require("Dead Men Tell No Tales - Boat Bash", "Murray") require("Dead Men Tell No Tales - Last Ship Sailing", ["Bentley", "Penelope", "Grapple-Cam", "Murray", "Silent Obliteration", "Treasure Map"]) # Dead Men Tell No Tales - Pirate Treasure Hunt