Implemented various fixes

Changed the method of adding classifications together at Fuzzy's request.
Corrected the order that Progression and Progression + Skip Balancing were checked so that Progression + Skip Balancing takes priority again.
Modified a check so that it now looks for if an item has the Progression flag, rather than being exactly Progression or Progression + Skip Balancing.
Added a case for removing Useful + Trap items if there aren't enough locations for them in the pool.

Author: Seatori

src/DataValidation.py

@@ -282,8 +282,8 @@ def preFillCheckIfEnoughItemsForValue(world: World, multiworld: MultiWorld):
         # compare whats available vs requested but only if there's anything requested
         if values_requested:
             errors = []
-            existing_items = [item for item in get_items_for_player(multiworld, player, True) if item.code is not None and
-                        item.classification == ItemClassification.progression or item.classification == ItemClassification.progression_skip_balancing]
+            existing_items = [item for item in get_items_for_player(multiworld, player, True) if
+                              item.code is not None and ItemClassification.progression in item.classification]
             for value, val_count in values_requested.items():
                 items_value = get_items_with_value(world, multiworld, value, player, True)
                 found_count = 0

src/__init__.py

@@ -208,24 +208,18 @@ def create_item(self, name: str) -> Item:
         name = before_create_item(name, self, self.multiworld, self.player)
 
         item = self.item_name_to_item[name]
-        filler = ItemClassification.filler
-        trap = ItemClassification.filler
-        useful = ItemClassification.filler
-        progression = ItemClassification.filler
-        progression_skip_balancing = ItemClassification.filler
+        classification = ItemClassification.filler
 
         if "trap" in item and item["trap"]:
-            trap = ItemClassification.trap
+            classification |= ItemClassification.trap
 
         if "useful" in item and item["useful"]:
-            useful = ItemClassification.useful
+            classification |= ItemClassification.useful
 
-        if "progression" in item and item["progression"]:
-            progression = ItemClassification.progression
-        elif "progression_skip_balancing" in item and item["progression_skip_balancing"]:
-            progression_skip_balancing = ItemClassification.progression_skip_balancing
-
-        classification = filler | trap | useful | progression | progression_skip_balancing
+        if "progression_skip_balancing" in item and item["progression_skip_balancing"]:
+            classification |= ItemClassification.progression_skip_balancing
+        elif "progression" in item and item["progression"]:
+            classification |= ItemClassification.progression
 
         item_object = ManualItem(name, classification,
                         self.item_name_to_id[name], player=self.player)
@@ -392,9 +386,15 @@ def adjust_filler_items(self, item_pool, traps):
             fillers = [item for item in item_pool if item.classification == ItemClassification.filler]
             traps = [item for item in item_pool if item.classification == ItemClassification.trap]
             useful = [item for item in item_pool if item.classification == ItemClassification.useful]
+            # Useful + Trap is classified separately so that it can have a unique priority ranking.
+            useful_traps = [item for item in item_pool if
+                            ItemClassification.progression not in item.classification
+                            and ItemClassification.useful in item.classification
+                            and ItemClassification.trap in item.classification]
             self.random.shuffle(fillers)
             self.random.shuffle(traps)
             self.random.shuffle(useful)
+            self.random.shuffle(useful_traps)
             for _ in range(0, abs(extras)):
                 popped = None
                 if fillers:
@@ -403,6 +403,9 @@ def adjust_filler_items(self, item_pool, traps):
                     popped = traps.pop()
                 elif useful:
                     popped = useful.pop()
+                # Not sure if Useful + Trap should go before or after Useful.
+                elif useful_traps:
+                    popped = useful_traps.pop()
                 else:
                     logging.warning("Could not remove enough non-progression items from the pool.")
                     break