morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Blacklist and python 3.8 support (#1616)

Browse Source
This commit is contained in:
JaredWeakStrike
2023-03-28 12:02:06 -04:00
committed by GitHub
parent b7c74919b7
commit ae7dad8bf9
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/kh2/OpenKH.py
View File

@@ -1,3 +1,5 @@
import logging
import yaml import yaml
import os import os
import Utils import Utils
@@ -61,13 +63,13 @@ def patch_kh2(self, output_directory):
slotDataDuping = set() slotDataDuping = set()
for values in CheckDupingItems.values(): for values in CheckDupingItems.values():
if isinstance(values, set): if isinstance(values, set):
slotDataDuping |= values slotDataDuping = slotDataDuping.union(values)
else: else:
for inner_values in values.values(): 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: 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") 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 keyblademin = self.multiworld.Keyblade_Maximum[self.player].value
keyblademax = self.multiworld.Keyblade_Minimum[self.player].value keyblademax = self.multiworld.Keyblade_Minimum[self.player].value

5
worlds/kh2/Options.py
View File

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