Fixed Blacklist and python 3.8 support (#1616)

worlds/kh2/OpenKH.py

@@ -1,3 +1,5 @@
+import logging
+
 import yaml
 import os
 import Utils
@@ -61,13 +63,13 @@ def patch_kh2(self, output_directory):
     slotDataDuping = set()
     for values in CheckDupingItems.values():
         if isinstance(values, set):
-            slotDataDuping |= values
+            slotDataDuping = slotDataDuping.union(values)
         else:
             for inner_values in values.values():
-                slotDataDuping |= inner_values
+                slotDataDuping = slotDataDuping.union(inner_values)
 
     if self.multiworld.Keyblade_Minimum[self.player].value > self.multiworld.Keyblade_Maximum[self.player].value:
-        print(
+        logging.info(
                 f"{self.multiworld.get_file_safe_player_name(self.player)} has Keyblade Minimum greater than Keyblade Maximum")
         keyblademin = self.multiworld.Keyblade_Maximum[self.player].value
         keyblademax = self.multiworld.Keyblade_Minimum[self.player].value

worlds/kh2/Options.py

@@ -1,6 +1,8 @@
 from Options import Choice, Option, Range, Toggle, OptionSet
 import typing
 
+from worlds.kh2 import SupportAbility_Table, ActionAbility_Table
+
 
 class SoraEXP(Range):
     """Sora Level Exp Multiplier"""
@@ -166,8 +168,7 @@ class KeybladeAbilities(Choice):
 class BlacklistKeyblade(OptionSet):
     """Black List these Abilities on Keyblades"""
     display_name = "Blacklist Keyblade Abilities"
-    verify_item_name = True
-
+    valid_keys = set(SupportAbility_Table.keys()).union(ActionAbility_Table.keys())
 
 class Goal(Choice):
     """Win Condition