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

Zillion: remove old option access from item link validation (#2673)

Browse Source 
* Zillion: remove old option access from item link validation
and a little bit a cleaning in other stuff nearby

* one option access missed
This commit is contained in:
Doug Hoskisson
2024-01-14 06:48:30 -08:00
committed by GitHub
parent 6904bd5885
commit ed6b7b2670
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
worlds/zillion/logic.py
View File

@@ -1,9 +1,11 @@
from typing import Dict, FrozenSet, Tuple, cast, List, Counter as _Counter
from typing import Dict, FrozenSet, Tuple, List, Counter as _Counter
from BaseClasses import CollectionState
from zilliandomizer.logic_components.items import Item, items
from zilliandomizer.logic_components.locations import Location
from zilliandomizer.randomizer import Randomizer
from zilliandomizer.logic_components.items import Item, items
from .region import ZillionLocation
from .item import ZillionItem
from .id_maps import item_name_to_id
@@ -18,11 +20,12 @@ def set_randomizer_locs(cs: CollectionState, p: int, zz_r: Randomizer) -> int:
returns a hash of the player and of the set locations with their items
"""
from . import ZillionWorld
z_world = cs.multiworld.worlds[p]
my_locations = cast(List[ZillionLocation], getattr(z_world, "my_locations"))
assert isinstance(z_world, ZillionWorld)
_hash = p
for z_loc in my_locations:
for z_loc in z_world.my_locations:
zz_name = z_loc.zz_loc.name
zz_item = z_loc.item.zz_item \
if isinstance(z_loc.item, ZillionItem) and z_loc.item.player == p \