morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into Archipelago_Main

Browse Source 
# Conflicts:
#	BaseClasses.py
#	LttPAdjuster.py
#	Main.py
#	Mystery.py
#	Utils.py
#	WebHostLib/generate.py
#	playerSettings.yaml
This commit is contained in:
Fabian Dill
2021-04-01 11:44:37 +02:00
parent dc73fa0f33 641dbcb138
commit d24ee45462
20 changed files with 1979 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WebHostLib/generate.py
View File

@@ -1,12 +1,14 @@
import os
import tempfile
import random
from collections import Counter
from flask import request, flash, redirect, url_for, session, render_template
from worlds.alttp.EntranceRandomizer import parse_arguments
from Main import main as ERmain
from Main import get_seed, seeddigits
from Mystery import handle_name
import pickle
from .models import *
@@ -80,13 +82,15 @@ def gen_game(gen_options, race=False, owner=None, sid=None):
erargs.progression_balancing = {}
erargs.create_diff = True
name_counter = Counter()
for player, (playerfile, settings) in enumerate(gen_options.items(), 1):
for k, v in settings.items():
if v is not None:
getattr(erargs, k)[player] = v
if not erargs.name[player]:
erargs.name[player] = os.path.split(playerfile)[-1].split(".")[0]
erargs.name[player] = os.path.splitext(os.path.split(playerfile)[-1])[0]
erargs.name[player] = handle_name(erargs.name[player], player, name_counter)
erargs.names = ",".join(erargs.name[i] for i in range(1, playercount + 1))
del (erargs.name)