WebHost: check for duplicate names
Generate: use Counter for duplicate names to make finding the dupes easier
This commit is contained in:
parent
d7d1d54a0b
commit
3fc93a33c8
|
@ -14,7 +14,7 @@ ModuleUpdate.update()
|
||||||
|
|
||||||
import Utils
|
import Utils
|
||||||
from worlds.alttp import Options as LttPOptions
|
from worlds.alttp import Options as LttPOptions
|
||||||
from worlds.generic import PlandoItem, PlandoConnection
|
from worlds.generic import PlandoConnection
|
||||||
from Utils import parse_yaml, version_tuple, __version__, tuplize_version, get_options
|
from Utils import parse_yaml, version_tuple, __version__, tuplize_version, get_options
|
||||||
from worlds.alttp.EntranceRandomizer import parse_arguments
|
from worlds.alttp.EntranceRandomizer import parse_arguments
|
||||||
from Main import main as ERmain
|
from Main import main as ERmain
|
||||||
|
@ -180,7 +180,7 @@ def main(args=None, callback=ERmain):
|
||||||
erargs.name[player] = handle_name(erargs.name[player], player, name_counter)
|
erargs.name[player] = handle_name(erargs.name[player], player, name_counter)
|
||||||
|
|
||||||
if len(set(erargs.name.values())) != len(erargs.name):
|
if len(set(erargs.name.values())) != len(erargs.name):
|
||||||
raise Exception(f"Names have to be unique. Names: {erargs.name}")
|
raise Exception(f"Names have to be unique. Names: {Counter(erargs.name.values())}")
|
||||||
|
|
||||||
if args.yaml_output:
|
if args.yaml_output:
|
||||||
import yaml
|
import yaml
|
||||||
|
|
|
@ -121,7 +121,8 @@ def gen_game(gen_options, meta: TypeOptional[Dict[str, object]] = None, owner=No
|
||||||
if not erargs.name[player]:
|
if not erargs.name[player]:
|
||||||
erargs.name[player] = os.path.splitext(os.path.split(playerfile)[-1])[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.name[player] = handle_name(erargs.name[player], player, name_counter)
|
||||||
|
if len(set(erargs.name.values())) != len(erargs.name):
|
||||||
|
raise Exception(f"Names have to be unique. Names: {Counter(erargs.name.values())}")
|
||||||
ERmain(erargs, seed, baked_server_options=meta)
|
ERmain(erargs, seed, baked_server_options=meta)
|
||||||
|
|
||||||
return upload_to_db(target.name, sid, owner, race)
|
return upload_to_db(target.name, sid, owner, race)
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
factorio-rcon-py>=1.2.1
|
factorio-rcon-py>=1.2.1
|
||||||
schema>=0.7.4
|
|
||||||
|
|
Loading…
Reference in New Issue