Better support for customized start_inverntory with dungeon items (can be mixed with item pool)

ItemList.py

@@ -1014,8 +1014,19 @@ item_alternates = {
 
 
 def modify_pool_for_start_inventory(start_inventory, world, player):
-    # skips custom item pools - these shouldn't be adjusted
     if (world.customizer and world.customizer.get_item_pool()) or world.custom:
+        # custom item pools only adjust in dungeon items
+        for item in start_inventory:
+            if item.dungeon:
+                d = world.get_dungeon(item.dungeon, item.player)
+                match = next((i for i in d.all_items if i.name == item.name), None)
+                if match:
+                    if match.map or match.compass:
+                        d.dungeon_items.remove(match)
+                    elif match.smallkey:
+                        d.small_keys.remove(match)
+                    elif match.bigkey and d.big_key == match:
+                        d.big_key = None
         return
     for item in start_inventory:
         if item.player == player:
@@ -1041,8 +1052,8 @@ def modify_pool_for_start_inventory(start_inventory, world, player):
                         d.dungeon_items.remove(match)
                     elif match.smallkey:
                         d.small_keys.remove(match)
-                    elif match.bigkey:
-                        d.big_key.remove(match)
+                    elif match.bigkey and d.big_key == match:
+                        d.big_key = None
 
 
 def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer, goal, mode, swords, bombbag, customitemarray):

KeyDoorShuffle.py

@@ -2094,6 +2094,12 @@ def validate_key_placement(key_layout, world, player):
     if world.bigkeyshuffle[player]:
         max_counter = find_max_counter(key_layout)
         big_key_outside = bigkey_name not in (l.item.name for l in max_counter.free_locations if l.item)
+    for i in world.precollected_items:
+        if i.player == player and i.name == bigkey_name:
+            big_key_outside = True
+            break
+        if i.player == player and i.name == smallkey_name:
+            keys_outside += 1
 
     for code, counter in key_layout.key_counters.items():
         if len(counter.child_doors) == 0: