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

Removed arbitrary second_item_group variable when we start to implement multiple item groups

Browse Source
This commit is contained in:
MarioSpore
2025-09-22 23:24:27 -04:00
parent 834096f282
commit c84ef117c8
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
worlds/grinch/Items.py
View File

@@ -5,11 +5,10 @@ from BaseClasses import Item
from BaseClasses import ItemClassification as IC #IC can be any name, saves having to type the whole word in code from BaseClasses import ItemClassification as IC #IC can be any name, saves having to type the whole word in code
class GrinchItemData(NamedTuple): class GrinchItemData(NamedTuple):
item_group: str #arbituary that can be whatever it can be, basically the field/property for item groups item_group: str #list[str] #arbituary that can be whatever it can be, basically the field/property for item groups
id: Optional[int] id: Optional[int]
classification: IC classification: IC
update_ram_addr: list[GrinchRamData] update_ram_addr: list[GrinchRamData]
second_item_group: Optional[str] = None
class GrinchItem(Item): class GrinchItem(Item):
game: str = "The Grinch" game: str = "The Grinch"
@@ -100,28 +99,27 @@ GADGETS_TABLE: dict[str, GrinchItemData] = {
#Mission Specific Items #Mission Specific Items
MISSION_ITEMS_TABLE: dict[str, GrinchItemData] = { MISSION_ITEMS_TABLE: dict[str, GrinchItemData] = {
"Who Cloak": GrinchItemData("Mission Specific Items", 200, IC.progression, "Who Cloak": GrinchItemData("Mission Specific Items", 200, IC.progression,
[GrinchRamData(0x0101F9, binary_bit_pos=0)], second_item_group="Useful Items"), [GrinchRamData(0x0101F9, binary_bit_pos=0)]),
"Painting Bucket": GrinchItemData("Mission Specific Items", 201, IC.progression_deprioritized, "Painting Bucket": GrinchItemData("Mission Specific Items", 201, IC.progression_deprioritized,
[GrinchRamData(0x0101F9, binary_bit_pos=1)], second_item_group="Useful Items"), [GrinchRamData(0x0101F9, binary_bit_pos=1)]),
"Scissors": GrinchItemData("Mission Specific Items", 202, IC.progression_deprioritized, "Scissors": GrinchItemData("Mission Specific Items", 202, IC.progression_deprioritized,
[GrinchRamData(0x0101F9, binary_bit_pos=6), GrinchRamData(0x0100C2, binary_bit_pos=1)], [GrinchRamData(0x0101F9, binary_bit_pos=6), GrinchRamData(0x0100C2, binary_bit_pos=1)]),
second_item_group="Useful Items"),
"Glue Bucket": GrinchItemData("Mission Specific Items", 203, IC.progression_deprioritized, "Glue Bucket": GrinchItemData("Mission Specific Items", 203, IC.progression_deprioritized,
[GrinchRamData(0x0101F9, binary_bit_pos=4)], second_item_group="Useful Items"), [GrinchRamData(0x0101F9, binary_bit_pos=4)]),
"Cable Car Access Card": GrinchItemData("Mission Specific Items", 204, IC.progression, "Cable Car Access Card": GrinchItemData("Mission Specific Items", 204, IC.progression,
[GrinchRamData(0x0101F9, binary_bit_pos=5)], second_item_group="Useful Items"), [GrinchRamData(0x0101F9, binary_bit_pos=5)]),
"Drill": GrinchItemData("Mission Specific Items", 205, IC.progression_deprioritized, "Drill": GrinchItemData("Mission Specific Items", 205, IC.progression_deprioritized,
[GrinchRamData(0x0101FA, binary_bit_pos=2)], second_item_group="Useful Items"), [GrinchRamData(0x0101FA, binary_bit_pos=2)]),
"Rope": GrinchItemData("Mission Specific Items", 206, IC.progression_deprioritized, "Rope": GrinchItemData("Mission Specific Items", 206, IC.progression_deprioritized,
[GrinchRamData(0x0101FA, binary_bit_pos=1)], second_item_group="Useful Items"), [GrinchRamData(0x0101FA, binary_bit_pos=1)]),
"Hook": GrinchItemData("Mission Specific Items", 207, IC.progression_deprioritized, "Hook": GrinchItemData("Mission Specific Items", 207, IC.progression_deprioritized,
[GrinchRamData(0x0101FA, binary_bit_pos=0)], second_item_group="Useful Items"), [GrinchRamData(0x0101FA, binary_bit_pos=0)]),
"Sculpting Tools": GrinchItemData("Mission Specific Items", 208, IC.progression_deprioritized, "Sculpting Tools": GrinchItemData("Mission Specific Items", 208, IC.progression_deprioritized,
[GrinchRamData(0x0101F9, binary_bit_pos=2)], second_item_group="Useful Items"), [GrinchRamData(0x0101F9, binary_bit_pos=2)]),
"Hammer": GrinchItemData("Mission Specific Items", 209, IC.progression_deprioritized, "Hammer": GrinchItemData("Mission Specific Items", 209, IC.progression_deprioritized,
[GrinchRamData(0x0101F9, binary_bit_pos=3)], second_item_group="Useful Items"), [GrinchRamData(0x0101F9, binary_bit_pos=3)]),
"Scout Clothes": GrinchItemData("Mission Specific Items", 210, IC.progression, "Scout Clothes": GrinchItemData("Mission Specific Items", 210, IC.progression,
[GrinchRamData(0x0101F9, binary_bit_pos=7)], second_item_group="Useful Items") [GrinchRamData(0x0101F9, binary_bit_pos=7)])
} }
#Sleigh Parts #Sleigh Parts