From 834d89bbba743d7b7bc243d06808de6cb7303e00 Mon Sep 17 00:00:00 2001 From: silverwizard Date: Wed, 27 Apr 2022 21:48:43 -0400 Subject: [PATCH] Fixed error messages --- __pycache__/shadowdice.cpython-38.pyc | Bin 17187 -> 17718 bytes aliases.csv | 2 + metadata.ini | 1 + shadowdice.py | 51 +++++++++++--------------- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/__pycache__/shadowdice.cpython-38.pyc b/__pycache__/shadowdice.cpython-38.pyc index df675da14e1786185aa48e730ce3aa35a6597751..c5a9291a810ad8aa8092a5b20143141b22752ff7 100644 GIT binary patch delta 4640 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 J_Zo0i{SU7qVCMh; diff --git a/aliases.csv b/aliases.csv index 23cd3e2..bea95c6 100644 --- a/aliases.csv +++ b/aliases.csv @@ -4,3 +4,5 @@ pass,(initpass) listinits,(listinit) removeinit,(delinit) rollinits,(rollinit) +srun4,(srun) +srun5,(srun) diff --git a/metadata.ini b/metadata.ini index 6f5b108..0d5338b 100644 --- a/metadata.ini +++ b/metadata.ini @@ -18,6 +18,7 @@ PluginCommands: [ "delivery", "perception_mods", "environmental", + "hosts", "concealability" ] diff --git a/shadowdice.py b/shadowdice.py index 0e141d1..df27b4c 100644 --- a/shadowdice.py +++ b/shadowdice.py @@ -2,7 +2,6 @@ from JJMumbleBot.lib.plugin_template import PluginBase from JJMumbleBot.lib.utils.plugin_utils import PluginUtilityService from JJMumbleBot.lib.utils.logging_utils import log from JJMumbleBot.lib.utils.print_utils import PrintMode -from JJMumbleBot.plugins.extensions.randomizer.resources.strings import CMD_INVALID_CUSTOM_ROLL from JJMumbleBot.settings import global_settings as gs from JJMumbleBot.lib.resources.strings import * import os @@ -19,7 +18,7 @@ class Plugin(PluginBase): self.plugin_cmds = loads(self.metadata.get(C_PLUGIN_INFO, P_PLUGIN_CMDS)) init_db = sqlite3.connect('init.db') init = init_db.cursor() - init.execute("CREATE TABLE inits (dice int, bonus int, total int, name string UNIQUE)") + init.execute("CREATE TABLE IF NOT EXISTS inits (dice int, bonus int, total int, name string UNIQUE)") init_db.commit() init_db.close() self.is_running = True @@ -65,9 +64,7 @@ class Plugin(PluginBase): init_db.close() gs.gui_service.quick_gui("Added init for: " + character_name, text_type='header', box_align='left') except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !addinit #dice #bonus $name", text_type='header', box_align='left') return @@ -82,9 +79,7 @@ class Plugin(PluginBase): init_db.close() gs.gui_service.quick_gui(ret_text, text_type='header', box_align='left') except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !listinit", text_type='header', box_align='left') return @@ -99,9 +94,7 @@ class Plugin(PluginBase): init_db.close() gs.gui_service.quick_gui(ret_text, text_type='header', box_align='left') except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !listinitpools", text_type='header', box_align='left') return @@ -122,9 +115,7 @@ class Plugin(PluginBase): init_db.close() gs.gui_service.quick_gui(ret_text, text_type='header', box_align='left') except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !initpass", text_type='header', box_align='left') return @@ -146,8 +137,6 @@ class Plugin(PluginBase): init_db.commit() init_db.close() except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) gs.gui_service.quick_gui("Can only subtract init from a name in the list of inits, try !listinit to confirm spellings", text_type='header', box_align='left') return @@ -164,8 +153,6 @@ class Plugin(PluginBase): init_db.close() gs.gui_service.quick_gui("Deleted init for: " + name + " (if they exist)", text_type='header', box_align='left') except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) gs.gui_service.quick_gui("Can only remove init from a name in the list of inits, try !listinit to confirm spellings", text_type='header', box_align='left') return @@ -206,9 +193,7 @@ class Plugin(PluginBase): init_db.close() return except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !rollinit", text_type='header', box_align='left') return @@ -222,7 +207,10 @@ class Plugin(PluginBase): for i in range(number_of_dice): random.seed(int.from_bytes(os.urandom(8), byteorder="big")) this_die = random.randint(1,6) - ret_text += f"{this_die}, " + if i == 0: + ret_text += f"{this_die}" + else: + ret_text += f", {this_die}" if this_die > 4: successes = successes + 1 if this_die == 1: @@ -231,9 +219,7 @@ class Plugin(PluginBase): gs.gui_service.quick_gui(ret_text, text_type='header', box_align='left') return except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !srun #", text_type='header', box_align='left') return @@ -249,7 +235,10 @@ class Plugin(PluginBase): while i < number_of_dice: random.seed(int.from_bytes(os.urandom(8), byteorder="big")) this_die = random.randint(1,6) - ret_text += f"{this_die}, " + if i == 0: + ret_text += f"{this_die}" + else: + ret_text += f", {this_die}" if this_die > 4: successes = successes + 1 if this_die == 1: @@ -257,14 +246,14 @@ class Plugin(PluginBase): if this_die == 6: i = i-1 explosions = explosions + 1 + if i < 1: + ret_text +=f", " i = i + 1 ret_text += f"
Successes: {successes} , Ones: {ones} , Explosions: {explosions}" gs.gui_service.quick_gui(ret_text, text_type='header', box_align='left') return except IndexError: - log(ERROR, CMD_INVALID_CUSTOM_ROLL, - origin=L_COMMAND, error_type=CMD_INVALID_ERR, print_mode=PrintMode.VERBOSE_PRINT.value) - gs.gui_service.quick_gui(CMD_INVALID_CUSTOM_ROLL, + gs.gui_service.quick_gui("Format: !preedge #", text_type='header', box_align='left') return @@ -287,3 +276,7 @@ class Plugin(PluginBase): def cmd_environmental(self, data): ret_text = "
ENVIRONMENTAL
VISIBILITY LIGHT / GLARE WIND RANGE MODIFIER
Clear Full Light / No Glare None / Light Breeze Short 0
Light Rain / Fog / Smoke Partial Light / Weak Glare Light Winds / Light Breeze Medium -1
Moderate Rain / Fog / Smoke Dim Light / Moderate Glare Moderate Winds / Light Breeze Long -3
Heavy Rain / Fog / Smoke Total Darkness/ Blinding Glare Strong Winds / Light Breeze Extreme -6
Combination of two or more conditions at the -6 level row -10
" gs.gui_service.quick_gui(ret_text, text_type='header', box_align='center') + + def cmd_hosts(self, data): + ret_text = "
SAMPLE HOST RATINGS
EXAMPLESRATING
Personal sites, pirate archives, public education1-2
Low-end commercial, private business, public libraries, small policlubs3-4
Social media, small colleges and universities, local police, international policlubs5-6
Matrix games, local corporate hosts, large universities, low-level government7-8
Affluent groups, regional corporate hosts, major government, secure sites9-10
Megacorporate headquarters, military command, clandestine head office11-12
" + gs.gui_service.quick_gui(ret_text, text_type='header', box_align='center')