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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Fabian Dill 2021-03-14 00:42:21 +01:00
parent 0aa50b51a2 7000f572f6
commit d83e86feb1
1 changed files with 2 additions and 2 deletions

4
Mystery.py
View File

@ -188,7 +188,7 @@ def main(args=None, callback=ERmain):
if path == args.weights: if path == args.weights:
settings.name = f"Player{player}" settings.name = f"Player{player}"
elif not settings.name: elif not settings.name:
settings.name = os.path.split(path)[-1].split(".")[0] settings.name = os.path.splitext(os.path.split(path)[-1])[0]
if "-" not in settings.shuffle and settings.shuffle != "vanilla": if "-" not in settings.shuffle and settings.shuffle != "vanilla":
settings.shuffle += f"-{random.randint(0, 2 ** 64)}" settings.shuffle += f"-{random.randint(0, 2 ** 64)}"
@ -214,7 +214,7 @@ def main(args=None, callback=ERmain):
if path == args.weights: # if name came from the weights file, just use base player name if path == args.weights: # if name came from the weights file, just use base player name
erargs.name[player] = f"Player{player}" erargs.name[player] = f"Player{player}"
elif not erargs.name[player]: # if name was not specified, generate it from filename elif not erargs.name[player]: # if name was not specified, generate it from filename
erargs.name[player] = os.path.split(path)[-1].split(".")[0] erargs.name[player] = os.path.splitext(os.path.split(path)[-1])[0]
new_name = [] new_name = []
name_counter[erargs.name[player]] += 1 name_counter[erargs.name[player]] += 1
for name in erargs.name[player].split("%%"): for name in erargs.name[player].split("%%"):