LttP: re-remove LttP import in BaseClasses

This commit is contained in:
Fabian Dill
2021-08-30 19:11:12 +02:00
parent 12957db90f
commit 6c357b61cc
3 changed files with 73 additions and 72 deletions

View File

@@ -6,7 +6,7 @@ import typing
from BaseClasses import Item, CollectionState
from .SubClasses import ALttPItem
from ..AutoWorld import World
from ..AutoWorld import World, LogicMixin
from .Options import alttp_options, smallkey_shuffle
from .Items import as_dict_item_table, item_name_groups, item_table
from .Regions import lookup_name_to_id, create_regions, mark_light_world_regions
@@ -391,4 +391,13 @@ def get_same_seed(world, seed_def: tuple) -> str:
return seeds[seed_def]
seeds[seed_def] = str(world.random.randint(0, 2 ** 64))
world.__named_seeds = seeds
return seeds[seed_def]
return seeds[seed_def]
class ALttPLogic(LogicMixin):
def _lttp_has_key(self, item, player, count: int = 1):
if self.world.logic[player] == 'nologic':
return True
if self.world.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
return self.can_buy_unlimited('Small Key (Universal)', player)
return self.prog_items[item, player] >= count