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

[OSRS] Fixes Incorrect filler item names causing failures on tests. (#3768) 

* Updates filler item names to match the actual item names

* Adds more descriptive error message in case this error comes back

* Properly raises exception instead of just text

* Replaces exception with assert
This commit is contained in:
digiholic 2024-08-16 14:10:30 -06:00 committed by GitHub
parent e9c863dffd
commit c014c5a54a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/osrs/Names.py
View File

@ -93,9 +93,9 @@ class ItemNames(str, Enum):
Progressive_Armor = "Progressive Armor" Progressive_Armor = "Progressive Armor"
Progressive_Weapons = "Progressive Weapons" Progressive_Weapons = "Progressive Weapons"
Progressive_Tools = "Progressive Tools" Progressive_Tools = "Progressive Tools"
Progressive_Range_Armor = "Progressive Range Armor" Progressive_Range_Armor = "Progressive Ranged Armor"
Progressive_Range_Weapon = "Progressive Range Weapon" Progressive_Range_Weapon = "Progressive Ranged Weapons"
Progressive_Magic = "Progressive Magic Spell" Progressive_Magic = "Progressive Magic"
Lobsters = "10 Lobsters" Lobsters = "10 Lobsters"
Swordfish = "5 Swordfish" Swordfish = "5 Swordfish"
Energy_Potions = "10 Energy Potions" Energy_Potions = "10 Energy Potions"

4
worlds/osrs/__init__.py
View File

@ -524,7 +524,9 @@ class OSRSWorld(World):
return region return region
def create_item(self, item_name: str) -> "Item": def create_item(self, item_name: str) -> "Item":
item = [item for item in item_rows if item.name == item_name][0] items = [item for item in item_rows if item.name == item_name]
assert len(items) > 0, f"No matching item found for name {item_name} for player {self.player_name}"
item = items[0]
index = item_rows.index(item) index = item_rows.index(item)
return OSRSItem(item.name, item.progression, self.base_id + index, self.player) return OSRSItem(item.name, item.progression, self.base_id + index, self.player)