diff --git a/BaseClasses.py b/BaseClasses.py index ffe95c8c..5a94807c 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1133,7 +1133,7 @@ class Spoiler(object): if self.world.players == 1: self.bosses = self.bosses["1"] - from Main import __version__ as ERVersion + from Utils import __version__ as ERVersion self.metadata = {'version': ERVersion, 'logic': self.world.logic, 'mode': self.world.mode, @@ -1185,7 +1185,7 @@ class Spoiler(object): self.parse_data() with open(filename, 'w', encoding="utf-8-sig") as outfile: outfile.write( - 'ALttP Entrance Randomizer Version %s - Seed: %s\n\n' % (self.metadata['version'], self.world.seed)) + 'ALttP Berserker\'s Multiworld Version %s - Seed: %s\n\n' % (self.metadata['version'], self.world.seed)) outfile.write('Filling Algorithm: %s\n' % self.world.algorithm) outfile.write('Players: %d\n' % self.world.players) outfile.write('Teams: %d\n' % self.world.teams) diff --git a/Main.py b/Main.py index caf43a2d..42135823 100644 --- a/Main.py +++ b/Main.py @@ -18,9 +18,8 @@ from Rules import set_rules from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, balance_multiworld_progression from ItemList import generate_itempool, difficulties, fill_prizes -from Utils import output_path, parse_player_names, get_options +from Utils import output_path, parse_player_names, get_options, __version__ -__version__ = '0.6.3-pre' def main(args, seed=None): if args.outputpath: @@ -63,7 +62,7 @@ def main(args, seed=None): world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)} - logger.info('ALttP Entrance Randomizer Version %s - Seed: %s\n', __version__, world.seed) + logger.info('ALttP Berserker\'s Multiworld Version %s - Seed: %s\n', __version__, world.seed) parsed_names = parse_player_names(args.names, world.players, args.teams) world.teams = len(parsed_names) diff --git a/MultiServer.py b/MultiServer.py index e5bb7ee2..a7f5e35e 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -185,7 +185,7 @@ async def on_client_connected(ctx: Context, client: Client): # tags are for additional features in the communication. # Name them by feature or fork, as you feel is appropriate. 'tags': ['Berserker'], - 'version': [1, 3, 0] + 'version': Utils._version_tuple }]]) async def on_client_disconnected(ctx: Context, client: Client): diff --git a/Utils.py b/Utils.py index 4a3c173a..645cd191 100644 --- a/Utils.py +++ b/Utils.py @@ -1,3 +1,6 @@ +__version__ = "2.0.2" +_version_tuple = tuple(int(piece, 10) for piece in __version__.split(".")) + import os import subprocess import sys