From 95f32b633a44aded8e902ca611e0eca9ef7e4d94 Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Thu, 9 Aug 2018 21:44:50 -0500 Subject: [PATCH] added dynmap_url to config --- BotConfig.py | 3 ++- DatabaseModels.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BotConfig.py b/BotConfig.py index 8c3ae8e..969129c 100644 --- a/BotConfig.py +++ b/BotConfig.py @@ -11,6 +11,7 @@ class Config: self.world_name = self.config['Minecraft']['World_Name'] self.status = self.config['Discord']['Status'] self.prefix = self.config['Discord']['Prefix'] + self.dynmap_url = self.config['Minecraft']['dynmap_url'] except: print("Invalid config file") quit(1) @@ -30,7 +31,7 @@ class Config: config['Discord'] = {'Token': '', 'Status': '', 'Prefix': '', } config['SQL'] = {'Dialect+Driver': '', 'username': '', 'password': '', 'host': '', 'port': '', 'database':'','test_args':''} - config['Minecraft'] = {'World_Name': ''} + config['Minecraft'] = {'World_Name': '', 'dynmap_url': ''} with open('GeoffreyConfig.ini', 'w') as configfile: config.write(configfile) diff --git a/DatabaseModels.py b/DatabaseModels.py index 9af5c01..10fdd5d 100644 --- a/DatabaseModels.py +++ b/DatabaseModels.py @@ -206,8 +206,8 @@ class Location(SQL_Base): raise LocationInitError def dynmap_link(self): - return ''.\ - format(bot_config.world_name, self.x, self.z) + return '<{}/?worldname={}&mapname=surface&zoom=4&x={}&y=65&z={}>'.\ + format(bot_config.dynmap_url, bot_config.world_name, self.x, self.z) def pos_to_str(self): return '(x= {}, z= {}) in the {}'.format(self.x, self.z, self.dimension.value.title())