From 31be4d5e901287abe1755c417096a641a527ac80 Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Tue, 4 Jun 2024 15:20:37 -0400 Subject: [PATCH] KH2: Fixing Start Inventory bug, limiting CustomItemPool keys, fixing two typos (#3444) * Fixing inclusion checking error * Fixing typo, limiting valid keys to valid keys * Adding space * Add period --- worlds/kh2/Options.py | 4 ++-- worlds/kh2/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/worlds/kh2/Options.py b/worlds/kh2/Options.py index ffe95d1d5f25..ddaf36ebcbf9 100644 --- a/worlds/kh2/Options.py +++ b/worlds/kh2/Options.py @@ -308,14 +308,14 @@ class CorSkipToggle(Toggle): Full Cor Skip is also affected by this Toggle. """ - display_name = "CoR Skip Toggle." + display_name = "CoR Skip Toggle" default = False class CustomItemPoolQuantity(ItemDict): """Add more of an item into the itempool. Note: You cannot take out items from the pool.""" display_name = "Custom Item Pool" - verify_item_name = True + valid_keys = default_itempool_option.keys() default = default_itempool_option diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py index 15cfa11c93cf..faf0bed88567 100644 --- a/worlds/kh2/__init__.py +++ b/worlds/kh2/__init__.py @@ -430,13 +430,13 @@ def starting_invo_verify(self): """ for item, value in self.options.start_inventory.value.items(): if item in ActionAbility_Table \ - or item in SupportAbility_Table or exclusion_item_table["StatUps"] \ + or item in SupportAbility_Table or item in exclusion_item_table["StatUps"] \ or item in DonaldAbility_Table or item in GoofyAbility_Table: # cannot have more than the quantity for abilties if value > item_dictionary_table[item].quantity: logging.info( - f"{self.multiworld.get_file_safe_player_name(self.player)} cannot have more than {item_dictionary_table[item].quantity} of {item}" - f"Changing the amount to the max amount") + f"{self.multiworld.get_file_safe_player_name(self.player)} cannot have more than {item_dictionary_table[item].quantity} of {item}." + f" Changing the amount to the max amount") value = item_dictionary_table[item].quantity self.item_quantity_dict[item] -= value