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

Core: shuffle around AutoWorld imports

This commit is contained in:
Fabian Dill 2022-02-18 20:29:35 +01:00
parent 1d19868119
commit 18d937d83e
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BaseClasses.py
View File

@ -6,7 +6,7 @@ import logging
import json import json
import functools import functools
from collections import OrderedDict, Counter, deque from collections import OrderedDict, Counter, deque
from typing import List, Dict, Optional, Set, Iterable, Union, Any, Tuple, TypedDict, TYPE_CHECKING, Callable from typing import List, Dict, Optional, Set, Iterable, Union, Any, Tuple, TypedDict, Callable
import secrets import secrets
import random import random
@ -14,13 +14,6 @@ import Options
import Utils import Utils
import NetUtils import NetUtils
if TYPE_CHECKING:
from worlds import AutoWorld
auto_world = AutoWorld.World
else:
auto_world = object
class Group(TypedDict, total=False): class Group(TypedDict, total=False):
name: str name: str
@ -159,7 +152,7 @@ class MultiWorld():
group["players"] |= players group["players"] |= players
return group_id, group return group_id, group
new_id: int = self.players + len(self.groups) + 1 new_id: int = self.players + len(self.groups) + 1
from worlds import AutoWorld
self.game[new_id] = game self.game[new_id] = game
self.custom_data[new_id] = {} self.custom_data[new_id] = {}
self.player_types[new_id] = NetUtils.SlotType.group self.player_types[new_id] = NetUtils.SlotType.group
@ -193,7 +186,6 @@ class MultiWorld():
range(1, self.players + 1)} range(1, self.players + 1)}
def set_options(self, args): def set_options(self, args):
from worlds import AutoWorld
for option_key in Options.common_options: for option_key in Options.common_options:
setattr(self, option_key, getattr(args, option_key, {})) setattr(self, option_key, getattr(args, option_key, {}))
for option_key in Options.per_game_common_options: for option_key in Options.per_game_common_options:
@ -1286,7 +1278,6 @@ class Spoiler():
return json.dumps(out) return json.dumps(out)
def to_file(self, filename): def to_file(self, filename):
from worlds.AutoWorld import call_all, call_single, call_stage
self.parse_data() self.parse_data()
def bool_to_text(variable: Union[bool, str]) -> str: def bool_to_text(variable: Union[bool, str]) -> str:
@ -1308,7 +1299,7 @@ class Spoiler():
Utils.__version__, self.world.seed)) Utils.__version__, self.world.seed))
outfile.write('Filling Algorithm: %s\n' % self.world.algorithm) outfile.write('Filling Algorithm: %s\n' % self.world.algorithm)
outfile.write('Players: %d\n' % self.world.players) outfile.write('Players: %d\n' % self.world.players)
call_stage(self.world, "write_spoiler_header", outfile) AutoWorld.call_stage(self.world, "write_spoiler_header", outfile)
for player in range(1, self.world.players + 1): for player in range(1, self.world.players + 1):
if self.world.players > 1: if self.world.players > 1:
@ -1320,7 +1311,7 @@ class Spoiler():
if options: if options:
for f_option, option in options.items(): for f_option, option in options.items():
write_option(f_option, option) write_option(f_option, option)
call_single(self.world, "write_spoiler_header", player, outfile) AutoWorld.call_single(self.world, "write_spoiler_header", player, outfile)
if player in self.world.get_game_players("A Link to the Past"): if player in self.world.get_game_players("A Link to the Past"):
outfile.write('%s%s\n' % ('Hash: ', self.hashes[player])) outfile.write('%s%s\n' % ('Hash: ', self.hashes[player]))
@ -1370,7 +1361,7 @@ class Spoiler():
for dungeon, medallion in self.medallions.items(): for dungeon, medallion in self.medallions.items():
outfile.write(f'\n{dungeon}: {medallion}') outfile.write(f'\n{dungeon}: {medallion}')
call_all(self.world, "write_spoiler", outfile) AutoWorld.call_all(self.world, "write_spoiler", outfile)
outfile.write('\n\nLocations:\n\n') outfile.write('\n\nLocations:\n\n')
outfile.write('\n'.join( outfile.write('\n'.join(
@ -1411,7 +1402,7 @@ class Spoiler():
path_listings.append("{}\n {}".format(location, "\n => ".join(path_lines))) path_listings.append("{}\n {}".format(location, "\n => ".join(path_lines)))
outfile.write('\n'.join(path_listings)) outfile.write('\n'.join(path_listings))
call_all(self.world, "write_spoiler_end", outfile) AutoWorld.call_all(self.world, "write_spoiler_end", outfile)
seeddigits = 20 seeddigits = 20
@ -1422,3 +1413,8 @@ def get_seed(seed=None):
random.seed(None) random.seed(None)
return random.randint(0, pow(10, seeddigits) - 1) return random.randint(0, pow(10, seeddigits) - 1)
return seed return seed
from worlds import AutoWorld
auto_world = AutoWorld.World