From 68674deb0007028d9662152d51928f11c15d953f Mon Sep 17 00:00:00 2001 From: Alchav <59858495+Alchav@users.noreply.github.com> Date: Mon, 20 Jun 2022 15:17:57 -0400 Subject: [PATCH] FF1 - classify some items as useful (#669) --- worlds/ff1/Items.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/worlds/ff1/Items.py b/worlds/ff1/Items.py index 7536c480eb..e045fbaf18 100644 --- a/worlds/ff1/Items.py +++ b/worlds/ff1/Items.py @@ -9,8 +9,7 @@ class ItemData(NamedTuple): name: str code: int item_type: str - progression: bool - + classification: ItemClassification FF1_BRIDGE = 'Bridge' @@ -27,6 +26,11 @@ FF1_PROGRESSION_LIST = [ "EarthOrb", "FireOrb", "WaterOrb", "AirOrb" ] +FF1_USEFUL_LIST = [ + "Tail", "Masamune", "Xcalber", "Katana", "Vorpal", + "DragonArmor", "Opal", "AegisShield", "Ribbon" +] + class FF1Items: _item_table: List[ItemData] = [] @@ -38,8 +42,9 @@ class FF1Items: with open(file_path) as file: items = json.load(file) # Hardcode progression and categories for now - self._item_table = [ItemData(name, code, "FF1Item", name in FF1_PROGRESSION_LIST) - for name, code in items.items()] + self._item_table = [ItemData(name, code, "FF1Item", ItemClassification.progression if name in + FF1_PROGRESSION_LIST else ItemClassification.useful if name in FF1_USEFUL_LIST else + ItemClassification.filler) for name, code in items.items()] self._item_table_lookup = {item.name: item for item in self._item_table} def _get_item_table(self) -> List[ItemData]: @@ -62,7 +67,7 @@ class FF1Items: def generate_item(self, name: str, player: int) -> Item: item = self._get_item_table_lookup().get(name) - return Item(name, ItemClassification.progression if item.progression else ItemClassification.filler, + return Item(name, item.classification, item.code, player) def get_item_name_to_code_dict(self) -> Dict[str, int]: