Version/romnaming refactor
This commit is contained in:
17
Main.py
17
Main.py
@@ -40,10 +40,7 @@ from source.enemizer.DamageTables import DamageTable
|
||||
from source.enemizer.Enemizer import randomize_enemies
|
||||
from source.rom.DataTables import init_data_tables
|
||||
|
||||
version_number = '1.5.0'
|
||||
version_branch = '-u'
|
||||
__version__ = f'{version_number}{version_branch}'
|
||||
|
||||
from Versions import ORVersion, DRVersion, GKVersion
|
||||
from source.classes.BabelFish import BabelFish
|
||||
|
||||
|
||||
@@ -122,15 +119,13 @@ def main(args, seed=None, fish=None):
|
||||
world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
|
||||
world.finish_init()
|
||||
|
||||
from OverworldShuffle import __version__ as ORVersion
|
||||
logger.info(
|
||||
world.fish.translate("cli","cli","app.title") + "\n",
|
||||
ORVersion,
|
||||
GKVersion,
|
||||
"%s (%s)" % (world.seed, str(args.outputname)) if str(args.outputname).startswith('M') else world.seed,
|
||||
Settings.make_code(world, 1) if world.players == 1 else ''
|
||||
)
|
||||
|
||||
for k,v in {"DR":__version__,"OR":ORVersion}.items():
|
||||
for k,v in {"GK": GKVersion, "OR": ORVersion, "DR": DRVersion}.items():
|
||||
logger.info((k + ' Version:').ljust(16) + '%s' % v)
|
||||
|
||||
parsed_names = parse_player_names(args.names, world.players, args.teams)
|
||||
@@ -421,15 +416,13 @@ def export_yaml(args, fish):
|
||||
if args.seed and int(args.seed) > 0:
|
||||
world.seed = int(args.seed)
|
||||
|
||||
from OverworldShuffle import __version__ as ORVersion
|
||||
logger.info(
|
||||
world.fish.translate("cli","cli","app.title") + "\n",
|
||||
ORVersion,
|
||||
GKVersion,
|
||||
"(%s)" % outfilebase,
|
||||
Settings.make_code(world, 1) if world.players == 1 else ''
|
||||
)
|
||||
|
||||
for k,v in {"DR":__version__,"OR":ORVersion}.items():
|
||||
for k,v in {"GK": GKVersion, "OR": ORVersion, "DR": DRVersion}.items():
|
||||
logger.info((k + ' Version:').ljust(16) + '%s' % v)
|
||||
|
||||
for player in range(1, world.players + 1):
|
||||
|
||||
Reference in New Issue
Block a user