OoT: create and copy less useless data state (#2379)
This commit is contained in:
parent
e3112e5d51
commit
20dd478fb5
|
@ -307,6 +307,10 @@ class MultiWorld():
|
||||||
def get_game_players(self, game_name: str) -> Tuple[int, ...]:
|
def get_game_players(self, game_name: str) -> Tuple[int, ...]:
|
||||||
return tuple(player for player in self.player_ids if self.game[player] == game_name)
|
return tuple(player for player in self.player_ids if self.game[player] == game_name)
|
||||||
|
|
||||||
|
@functools.lru_cache()
|
||||||
|
def get_game_groups(self, game_name: str) -> Tuple[int, ...]:
|
||||||
|
return tuple(group_id for group_id in self.groups if self.game[group_id] == game_name)
|
||||||
|
|
||||||
@functools.lru_cache()
|
@functools.lru_cache()
|
||||||
def get_game_worlds(self, game_name: str):
|
def get_game_worlds(self, game_name: str):
|
||||||
return tuple(world for player, world in self.worlds.items() if
|
return tuple(world for player, world in self.worlds.items() if
|
||||||
|
|
|
@ -43,14 +43,14 @@ i_o_limiter = threading.Semaphore(2)
|
||||||
|
|
||||||
class OOTCollectionState(metaclass=AutoLogicRegister):
|
class OOTCollectionState(metaclass=AutoLogicRegister):
|
||||||
def init_mixin(self, parent: MultiWorld):
|
def init_mixin(self, parent: MultiWorld):
|
||||||
all_ids = parent.get_all_ids()
|
oot_ids = parent.get_game_players(OOTWorld.game) + parent.get_game_groups(OOTWorld.game)
|
||||||
self.child_reachable_regions = {player: set() for player in all_ids}
|
self.child_reachable_regions = {player: set() for player in oot_ids}
|
||||||
self.adult_reachable_regions = {player: set() for player in all_ids}
|
self.adult_reachable_regions = {player: set() for player in oot_ids}
|
||||||
self.child_blocked_connections = {player: set() for player in all_ids}
|
self.child_blocked_connections = {player: set() for player in oot_ids}
|
||||||
self.adult_blocked_connections = {player: set() for player in all_ids}
|
self.adult_blocked_connections = {player: set() for player in oot_ids}
|
||||||
self.day_reachable_regions = {player: set() for player in all_ids}
|
self.day_reachable_regions = {player: set() for player in oot_ids}
|
||||||
self.dampe_reachable_regions = {player: set() for player in all_ids}
|
self.dampe_reachable_regions = {player: set() for player in oot_ids}
|
||||||
self.age = {player: None for player in all_ids}
|
self.age = {player: None for player in oot_ids}
|
||||||
|
|
||||||
def copy_mixin(self, ret) -> CollectionState:
|
def copy_mixin(self, ret) -> CollectionState:
|
||||||
ret.child_reachable_regions = {player: copy.copy(self.child_reachable_regions[player]) for player in
|
ret.child_reachable_regions = {player: copy.copy(self.child_reachable_regions[player]) for player in
|
||||||
|
|
Loading…
Reference in New Issue