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

Fix another item.type crash bug. (#927) 

* Fix another item.type crash bug.

* Another location that can crash, in the instance of plando fixed.
This commit is contained in:
CaitSith2 2022-08-17 07:16:14 -07:00 committed by GitHub
parent 431a9b7023
commit 6602c580f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/oot/HintList.py
View File

@ -1,6 +1,7 @@
import random import random
from BaseClasses import LocationProgressType from BaseClasses import LocationProgressType
from .Items import OOTItem
# Abbreviations # Abbreviations
# DMC Death Mountain Crater # DMC Death Mountain Crater
@ -1260,7 +1261,7 @@ def hintExclusions(world, clear_cache=False):
world.hint_exclusions = [] world.hint_exclusions = []
for location in world.get_locations(): for location in world.get_locations():
if (location.locked and (location.item.type != 'Song' or world.shuffle_song_items != 'song')) or location.progress_type == LocationProgressType.EXCLUDED: if (location.locked and ((isinstance(location.item, OOTItem) and location.item.type != 'Song') or world.shuffle_song_items != 'song')) or location.progress_type == LocationProgressType.EXCLUDED:
world.hint_exclusions.append(location.name) world.hint_exclusions.append(location.name)
world_location_names = [ world_location_names = [

2
worlds/oot/Patches.py
View File

@ -2104,7 +2104,7 @@ def place_shop_items(rom, world, shop_items, messages, locations, init_shop_id=F
shop_objs = { 0x0148 } # "Sold Out" object shop_objs = { 0x0148 } # "Sold Out" object
for location in locations: for location in locations:
if location.item.type == 'Shop': if isinstance(location.item, OOTItem) and location.item.type == 'Shop':
shop_objs.add(location.item.special['object']) shop_objs.add(location.item.special['object'])
rom.write_int16(location.address1, location.item.index) rom.write_int16(location.address1, location.item.index)
else: else: