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

OoT: Fix blind item.type reference (#905)

Browse Source 
* oot: remove blind reference to item.type

* oot: logical reasoning is hard

* oot: fix blind item.type reference
This commit is contained in:
espeon65536
2022-08-12 19:36:06 -07:00
committed by GitHub
parent f5e48c850d
commit 645ede869f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
worlds/oot/Patches.py
View File

@@ -5,6 +5,7 @@ import zlib
from collections import defaultdict
from functools import partial
from .Items import OOTItem
from .LocationList import business_scrubs
from .Hints import writeGossipStoneHints, buildAltarHints, \
buildGanonText, getSimpleHintNoPrefix
@@ -1881,9 +1882,9 @@ def get_override_entry(player_id, location):
type = 2
elif location.type == 'GS Token':
type = 3
elif location.type == 'Shop' and location.item.type != 'Shop':
elif location.type == 'Shop' and not (isinstance(location.item, OOTItem) and location.item.type == 'Shop'):
type = 0
elif location.type == 'GrottoNPC' and location.item.type != 'Shop':
elif location.type == 'GrottoNPC' and not (isinstance(location.item, OOTItem) and location.item.type == 'Shop'):
type = 4
elif location.type in ['Song', 'Cutscene']:
type = 5