monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TUNIC: Fix UT create_item classification (#4514) 

Co-authored-by: Silent <110704408+silent-destroyer@users.noreply.github.com>
This commit is contained in:
Scipio Wright 2025-01-24 17:10:58 -05:00 committed by GitHub
parent ddf7fdccc7
commit 513e361764
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
worlds/tunic/__init__.py
View File

@ -242,10 +242,18 @@ class TunicWorld(World):
def create_item(self, name: str, classification: ItemClassification = None) -> TunicItem: def create_item(self, name: str, classification: ItemClassification = None) -> TunicItem:
item_data = item_table[name] item_data = item_table[name]
# if item_data.combat_ic is None, it'll take item_data.classification instead # evaluate alternate classifications based on options
itemclass: ItemClassification = ((item_data.combat_ic if self.options.combat_logic else None) # it'll choose whichever classification isn't None first in this if else tree
itemclass: ItemClassification = (classification
or (item_data.combat_ic if self.options.combat_logic else None)
or (ItemClassification.progression | ItemClassification.useful
if name == "Glass Cannon" and self.options.grass_randomizer
and not self.options.start_with_sword else None)
or (ItemClassification.progression | ItemClassification.useful
if name == "Shield" and self.options.ladder_storage
and not self.options.ladder_storage_without_items else None)
or item_data.classification) or item_data.classification)
return TunicItem(name, classification or itemclass, self.item_name_to_id[name], self.player) return TunicItem(name, itemclass, self.item_name_to_id[name], self.player)
def create_items(self) -> None: def create_items(self) -> None:
tunic_items: List[TunicItem] = [] tunic_items: List[TunicItem] = []
@ -278,8 +286,6 @@ class TunicWorld(World):
if self.options.grass_randomizer: if self.options.grass_randomizer:
items_to_create["Grass"] = len(grass_location_table) items_to_create["Grass"] = len(grass_location_table)
tunic_items.append(self.create_item("Glass Cannon", ItemClassification.progression))
items_to_create["Glass Cannon"] = 0
for grass_location in excluded_grass_locations: for grass_location in excluded_grass_locations:
self.get_location(grass_location).place_locked_item(self.create_item("Grass")) self.get_location(grass_location).place_locked_item(self.create_item("Grass"))
items_to_create["Grass"] -= len(excluded_grass_locations) items_to_create["Grass"] -= len(excluded_grass_locations)
@ -351,11 +357,6 @@ class TunicWorld(World):
tunic_items.append(self.create_item(page, ItemClassification.progression | ItemClassification.useful)) tunic_items.append(self.create_item(page, ItemClassification.progression | ItemClassification.useful))
items_to_create[page] = 0 items_to_create[page] = 0
# logically relevant if you have ladder storage enabled
if self.options.ladder_storage and not self.options.ladder_storage_without_items:
tunic_items.append(self.create_item("Shield", ItemClassification.progression))
items_to_create["Shield"] = 0
if self.options.maskless: if self.options.maskless:
tunic_items.append(self.create_item("Scavenger Mask", ItemClassification.useful)) tunic_items.append(self.create_item("Scavenger Mask", ItemClassification.useful))
items_to_create["Scavenger Mask"] = 0 items_to_create["Scavenger Mask"] = 0