From c10a791ed6bc761642726709aa92ab4e11dd94a2 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Fri, 2 Sep 2022 13:10:03 -0600
Subject: [PATCH] Important key fix for logic placment

---
 Fill.py           |  3 ++-
 KeyDoorShuffle.py | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Fill.py b/Fill.py
index 5a414c98..d7a97bf2 100644
--- a/Fill.py
+++ b/Fill.py
@@ -172,7 +172,8 @@ def valid_key_placement(item, location, key_pool, world):
         if key_logic.prize_location:
             prize_loc = world.get_location(key_logic.prize_location, location.player)
         cr_count = world.crystals_needed_for_gt[location.player]
-        return key_logic.check_placement(unplaced_keys, location if item.bigkey else None, prize_loc, cr_count)
+        wild_keys = world.keyshuffle[item.player] != 'none'
+        return key_logic.check_placement(unplaced_keys, wild_keys, location if item.bigkey else None, prize_loc, cr_count)
     else:
         return not item.is_inside_dungeon_item(world)
 
diff --git a/KeyDoorShuffle.py b/KeyDoorShuffle.py
index bb4f6835..ad06f3fc 100644
--- a/KeyDoorShuffle.py
+++ b/KeyDoorShuffle.py
@@ -62,9 +62,9 @@ class KeyLogic(object):
         self.sm_doors = {}
         self.prize_location = None
 
-    def check_placement(self, unplaced_keys, big_key_loc=None, prize_loc=None, cr_count=7):
+    def check_placement(self, unplaced_keys, wild_keys, big_key_loc=None, prize_loc=None, cr_count=7):
         for rule in self.placement_rules:
-            if not rule.is_satisfiable(self.outside_keys, unplaced_keys, big_key_loc, prize_loc, cr_count):
+            if not rule.is_satisfiable(self.outside_keys, wild_keys, unplaced_keys, big_key_loc, prize_loc, cr_count):
                 return False
             if big_key_loc:
                 for rule_a, rule_b in itertools.combinations(self.placement_rules, 2):
@@ -186,17 +186,20 @@ class PlacementRule(object):
         if not bk_blocked and check_locations is None:
             return True
         available_keys = outside_keys
-        empty_chests = 0
         # todo: sometimes we need an extra empty chest to accomodate the big key too
         # dungeon bias seed 563518200 for example
         threshold = self.needed_keys_wo_bk if bk_blocked else self.needed_keys_w_bk
-        for loc in check_locations:
-            if not loc.item:
-                empty_chests += 1
-            elif loc.item and loc.item.name == self.small_key:
-                available_keys += 1
-        place_able_keys = min(empty_chests, unplaced_keys)
-        available_keys += place_able_keys
+        if not wild_keys:
+            empty_chests = 0
+            for loc in check_locations:
+                if not loc.item:
+                    empty_chests += 1
+                elif loc.item and loc.item.name == self.small_key:
+                    available_keys += 1
+            place_able_keys = min(empty_chests, unplaced_keys)
+            available_keys += place_able_keys
+        else:
+            available_keys += unplaced_keys
         return available_keys >= threshold