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

Core: don't start threads for 'pass' 

Core: print output progress every 10 files (OoT output may take a while, so let's give some user feedback on progress)
Subnautica: remove empty output method
This commit is contained in:
Fabian Dill 2021-09-03 20:35:40 +02:00
parent 2e2ca1665b
commit 89984a0d09
2 changed files with 144 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Main.py
View File

@ -185,10 +185,9 @@ def main(args, seed=None):
logger.info(f'Beginning output...') logger.info(f'Beginning output...')
outfilebase = 'AP_' + world.seed_name outfilebase = 'AP_' + world.seed_name
pool = concurrent.futures.ThreadPoolExecutor()
output = tempfile.TemporaryDirectory() output = tempfile.TemporaryDirectory()
with output as temp_dir: with output as temp_dir:
with concurrent.futures.ThreadPoolExecutor() as pool:
check_accessibility_task = pool.submit(world.fulfills_accessibility) check_accessibility_task = pool.submit(world.fulfills_accessibility)
output_file_futures = [] output_file_futures = []
@ -347,8 +346,6 @@ def main(args, seed=None):
logger.info(f'Generating output files ({i}/{len(output_file_futures)}).') logger.info(f'Generating output files ({i}/{len(output_file_futures)}).')
future.result() future.result()
pool.shutdown() # wait for all queued tasks to complete
if not args.skip_playthrough: if not args.skip_playthrough:
logger.info('Calculating playthrough.') logger.info('Calculating playthrough.')
create_playthrough(world) create_playthrough(world)

2
README.md
View File

@ -9,6 +9,7 @@ Currently, the following games are supported:
* Subnautica * Subnautica
* Slay the Spire * Slay the Spire
* Risk of Rain 2 * Risk of Rain 2
* The Legend of Zelda: Ocarina of Time
For setup and instructions check out our [tutorials page](http://archipelago.gg:48484/tutorial). For setup and instructions check out our [tutorials page](http://archipelago.gg:48484/tutorial).
Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled
@ -39,6 +40,7 @@ This project makes use of multiple other projects. We wouldn't be here without t
* [z3randomizer](https://github.com/CaitSith2/z3randomizer) * [z3randomizer](https://github.com/CaitSith2/z3randomizer)
* [Enemizer](https://github.com/Ijwu/Enemizer) * [Enemizer](https://github.com/Ijwu/Enemizer)
* [Ocarina of Time Randomizer](https://github.com/TestRunnerSRL/OoT-Randomizer)
## Contributing ## Contributing
Contributions are welcome. We have a few asks of any new contributors. Contributions are welcome. We have a few asks of any new contributors.