Merge branch 'SC2-043-maintenance' into sc2-next

worlds/sc2/PoolFilter.py

@@ -279,7 +279,13 @@ def attempt_removal(item: Item) -> bool:
 
         while len(inventory) + len(locked_items) > inventory_size:
             if len(inventory) == 0:
-                raise Exception("Reduced item pool generation failed - not enough locations available to place items.")
+                # There are more items than locations and all of them are already locked due to YAML or logic.
+                # Random items from locked ones will go to starting items
+                self.multiworld.random.shuffle(locked_items)
+                while len(locked_items) > inventory_size:
+                    item: Item = locked_items.pop()
+                    self.multiworld.push_precollected(item)
+                break
             # Select random item from removable items
             item = self.multiworld.random.choice(inventory)
             # Cascade removals to associated items

worlds/sc2/__init__.py

@@ -49,7 +49,7 @@ class SC2World(World):
     mission_req_table: Dict[SC2Campaign, Dict[str, MissionInfo]] = {}
     final_mission_id: int
     victory_item: str
-    required_client_version = 0, 3, 6
+    required_client_version = 0, 4, 3
 
     def __init__(self, multiworld: MultiWorld, player: int):
         super(SC2World, self).__init__(multiworld, player)