mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-04-30 09:23:27 -07:00
Compare commits
3 Commits
misc-webho
...
core_spoil
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa36271e02 | ||
|
|
78057476f3 | ||
|
|
cdbb2cf7b7 |
@@ -1087,14 +1087,16 @@ class Spoiler:
|
|||||||
playthrough: Dict[str, Union[List[str], Dict[str, str]]] # sphere "0" is list, others are dict
|
playthrough: Dict[str, Union[List[str], Dict[str, str]]] # sphere "0" is list, others are dict
|
||||||
unreachables: Set[Location]
|
unreachables: Set[Location]
|
||||||
paths: Dict[str, List[Union[Tuple[str, str], Tuple[str, None]]]] # last step takes no further exits
|
paths: Dict[str, List[Union[Tuple[str, str], Tuple[str, None]]]] # last step takes no further exits
|
||||||
|
level: int
|
||||||
|
|
||||||
def __init__(self, multiworld: MultiWorld) -> None:
|
def __init__(self, multiworld: MultiWorld, level: int = 0) -> None:
|
||||||
self.multiworld = multiworld
|
self.multiworld = multiworld
|
||||||
self.hashes = {}
|
self.hashes = {}
|
||||||
self.entrances = {}
|
self.entrances = {}
|
||||||
self.playthrough = {}
|
self.playthrough = {}
|
||||||
self.unreachables = set()
|
self.unreachables = set()
|
||||||
self.paths = {}
|
self.paths = {}
|
||||||
|
self.level = level
|
||||||
|
|
||||||
def set_entrance(self, entrance: str, exit_: str, direction: str, player: int) -> None:
|
def set_entrance(self, entrance: str, exit_: str, direction: str, player: int) -> None:
|
||||||
if self.multiworld.players == 1:
|
if self.multiworld.players == 1:
|
||||||
@@ -1296,11 +1298,13 @@ class Spoiler:
|
|||||||
outfile.write('\n\nLocations:\n\n')
|
outfile.write('\n\nLocations:\n\n')
|
||||||
outfile.write('\n'.join(
|
outfile.write('\n'.join(
|
||||||
['%s: %s' % (location, item) for location, item in locations]))
|
['%s: %s' % (location, item) for location, item in locations]))
|
||||||
|
if self.level > 1:
|
||||||
outfile.write('\n\nPlaythrough:\n\n')
|
outfile.write('\n\nPlaythrough:\n\n')
|
||||||
outfile.write('\n'.join(['%s: {\n%s\n}' % (sphere_nr, '\n'.join(
|
outfile.write('\n'.join(['%s: {\n%s\n}' % (sphere_nr, '\n'.join(
|
||||||
[f" {location}: {item}" for (location, item) in sphere.items()] if isinstance(sphere, dict) else
|
[f" {location}: {item}" for (location, item) in sphere.items()] if isinstance(sphere, dict) else
|
||||||
[f" {item}" for item in sphere])) for (sphere_nr, sphere) in self.playthrough.items()]))
|
[f" {item}" for item in sphere])) for (sphere_nr, sphere) in self.playthrough.items()]))
|
||||||
|
else:
|
||||||
|
outfile.write('\n\nPlaythrough is disabled.\n\n')
|
||||||
if self.unreachables:
|
if self.unreachables:
|
||||||
outfile.write('\n\nUnreachable Items:\n\n')
|
outfile.write('\n\nUnreachable Items:\n\n')
|
||||||
outfile.write(
|
outfile.write(
|
||||||
|
|||||||
2
Main.py
2
Main.py
@@ -36,7 +36,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
|
|||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
world.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
|
world.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
|
||||||
world.plando_options = args.plando_options
|
world.plando_options = args.plando_options
|
||||||
|
world.spoiler.level = args.spoiler
|
||||||
world.shuffle = args.shuffle.copy()
|
world.shuffle = args.shuffle.copy()
|
||||||
world.logic = args.logic.copy()
|
world.logic = args.logic.copy()
|
||||||
world.mode = args.mode.copy()
|
world.mode = args.mode.copy()
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use that version. These steps are for developers or platforms without compiled r
|
|||||||
|
|
||||||
What you'll need:
|
What you'll need:
|
||||||
* [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version
|
* [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version
|
||||||
* **Python 3.11 does not work currently**
|
* **Python 3.12 is currently unsupported**
|
||||||
* pip: included in downloads from python.org, separate in many Linux distributions
|
* pip: included in downloads from python.org, separate in many Linux distributions
|
||||||
* Matching C compiler
|
* Matching C compiler
|
||||||
* possibly optional, read operating system specific sections
|
* possibly optional, read operating system specific sections
|
||||||
@@ -30,7 +30,7 @@ After this, you should be able to run the programs.
|
|||||||
|
|
||||||
Recommended steps
|
Recommended steps
|
||||||
* Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads)
|
* Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads)
|
||||||
* **Python 3.11 does not work currently**
|
* **Python 3.12 is currently unsupported**
|
||||||
|
|
||||||
* **Optional**: Download and install Visual Studio Build Tools from
|
* **Optional**: Download and install Visual Studio Build Tools from
|
||||||
[Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
|
[Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
|
||||||
|
|||||||
@@ -13,5 +13,6 @@ ModuleUpdate.update_ran = True # don't upgrade
|
|||||||
|
|
||||||
import Utils
|
import Utils
|
||||||
|
|
||||||
Utils.local_path.cached_path = pathlib.Path(__file__).parent.parent
|
file_path = pathlib.Path(__file__).parent.parent
|
||||||
|
Utils.local_path.cached_path = file_path
|
||||||
Utils.user_path() # initialize cached_path
|
Utils.user_path() # initialize cached_path
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
def load_tests(loader, standard_tests, pattern):
|
def load_tests(loader, standard_tests, pattern):
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
from ..TestBase import file_path
|
from .. import file_path
|
||||||
from worlds.AutoWorld import AutoWorldRegister
|
from worlds.AutoWorld import AutoWorldRegister
|
||||||
|
|
||||||
suite = unittest.TestSuite()
|
suite = unittest.TestSuite()
|
||||||
|
|||||||
Reference in New Issue
Block a user