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

oot/alttp: fix bugs found through MMBN3 testing (#1527)

This commit is contained in:
el-u 2023-03-11 20:15:30 +01:00 committed by GitHub
parent 04e6a8eae8
commit 426a81a065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worlds/alttp/__init__.py
View File

@ -20,7 +20,7 @@ from .Client import ALTTPSNIClient
from .Rom import LocalRom, patch_rom, patch_race_rom, check_enemizer, patch_enemizer, apply_rom_settings, \ from .Rom import LocalRom, patch_rom, patch_race_rom, check_enemizer, patch_enemizer, apply_rom_settings, \
get_hash_string, get_base_rom_path, LttPDeltaPatch get_hash_string, get_base_rom_path, LttPDeltaPatch
from .Rules import set_rules from .Rules import set_rules
from .Shops import create_shops, ShopSlotFill, ShopType, price_rate_display, price_type_display_name from .Shops import create_shops, Shop, ShopSlotFill, ShopType, price_rate_display, price_type_display_name
from .SubClasses import ALttPItem, LTTPRegionType from .SubClasses import ALttPItem, LTTPRegionType
from worlds.AutoWorld import World, WebWorld, LogicMixin from worlds.AutoWorld import World, WebWorld, LogicMixin
from .StateHelpers import can_buy_unlimited from .StateHelpers import can_buy_unlimited
@ -674,11 +674,7 @@ class ALTTPWorld(World):
f'\n\nBosses{(f" ({self.multiworld.get_player_name(self.player)})" if self.multiworld.players > 1 else "")}:\n') f'\n\nBosses{(f" ({self.multiworld.get_player_name(self.player)})" if self.multiworld.players > 1 else "")}:\n')
spoiler_handle.write(' ' + '\n '.join([f'{x}: {y}' for x, y in bossmap.items()])) spoiler_handle.write(' ' + '\n '.join([f'{x}: {y}' for x, y in bossmap.items()]))
def build_shop_info() -> typing.Dict: def build_shop_info(shop: Shop) -> typing.Dict[str, str]:
shop = self.multiworld.shops[self.player]
if not shop.custom:
return None
shop_data = { shop_data = {
"location": str(shop.region), "location": str(shop.region),
"type": "Take Any" if shop.type == ShopType.TakeAny else "Shop" "type": "Take Any" if shop.type == ShopType.TakeAny else "Shop"
@ -704,12 +700,12 @@ class ALTTPWorld(World):
return shop_data return shop_data
shop_data = build_shop_info() if shop_info := [build_shop_info(shop) for shop in self.multiworld.shops if shop.custom]:
if shop_data is not None:
spoiler_handle.write('\n\nShops:\n\n') spoiler_handle.write('\n\nShops:\n\n')
spoiler_handle.write(''.join("{} [{}]\n {}".format(shop_data['location'], shop_data['type'], "\n ".join( for shop_data in shop_info:
spoiler_handle.write("{} [{}]\n {}\n".format(shop_data['location'], shop_data['type'], "\n ".join(
item for item in [shop_data.get('item_0', None), shop_data.get('item_1', None), shop_data.get('item_2', None)] if item for item in [shop_data.get('item_0', None), shop_data.get('item_1', None), shop_data.get('item_2', None)] if
item)))) item)))
def get_filler_item_name(self) -> str: def get_filler_item_name(self) -> str:
if self.multiworld.goal[self.player] == "icerodhunt": if self.multiworld.goal[self.player] == "icerodhunt":

2
worlds/oot/HintList.py
View File

@ -50,7 +50,7 @@ def getHint(item, clearer_hint=False):
return Hint(item, clearText, hintType) return Hint(item, clearText, hintType)
else: else:
return Hint(item, textOptions, hintType) return Hint(item, textOptions, hintType)
elif type(item) is str: elif isinstance(item, str):
return Hint(item, item, 'generic') return Hint(item, item, 'generic')
else: # is an Item else: # is an Item
return Hint(item.name, item.hint_text, 'item') return Hint(item.name, item.hint_text, 'item')