From c53aa46b174418c4f54e084efc76d60d24d176b3 Mon Sep 17 00:00:00 2001 From: Silverwizard Date: Mon, 3 Mar 2025 11:47:11 -0500 Subject: [PATCH] Fixed interrupt to have init then name. Also made spaces allowed in names --- __pycache__/shadowdice.cpython-38.pyc | Bin 17718 -> 0 bytes help.html | 2 +- metadata.ini | 2 +- shadowdice.py | 15 ++++++--------- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 __pycache__/shadowdice.cpython-38.pyc diff --git a/__pycache__/shadowdice.cpython-38.pyc b/__pycache__/shadowdice.cpython-38.pyc deleted file mode 100644 index c5a9291a810ad8aa8092a5b20143141b22752ff7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17718 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 diff --git a/help.html b/help.html index d8e2c0c..d682bd3 100644 --- a/help.html +++ b/help.html @@ -5,7 +5,7 @@ All commands can be run by typing it in the chat or privately messaging JJMumble !listinitpools: List all init pools in the init DB
!rollinit: Rolls the inits for all of the users, and outputs it
!initpass: Subtracts 10 from all inits, minimum 0
-!interupt: Subtracts an amount from a single user's init, wont work if you try to subtract more init from the character than they have !interupt Malta 7 will subtract 7 init from Malta
+!interrupt: Subtracts an amount from a single user's init, wont work if you try to subtract more init from the character than they have !interupt 7 Malta will subtract 7 init from Malta
!clearinit: Deletes all of the initiatives
!srun: Roll a bunch of dice, count successes and ones !srun 12 will roll a pool of 12 dice
!preedge: Roll a pool with exploding 6s, counts successes, ones, and explosions !preedge 12 will roll a poll of 12 dice
diff --git a/metadata.ini b/metadata.ini index 0d5338b..74fe7be 100644 --- a/metadata.ini +++ b/metadata.ini @@ -11,7 +11,7 @@ PluginCommands: [ "listinitpools", "initpass", "clearinit", - "interupt", + "interrupt", "srun", "preedge", "assensing", diff --git a/shadowdice.py b/shadowdice.py index f28c11e..50ba9fd 100644 --- a/shadowdice.py +++ b/shadowdice.py @@ -51,7 +51,7 @@ class Plugin(PluginBase): try: number_of_dice = int(all_data[1]) init_bonus = int(all_data[2]) - character_name = str(all_data[3]) + character_name = str(" ".join(all_data[3:len(all_data)])) init_db = sqlite3.connect('init.db') cur = init_db.cursor() cur.execute("INSERT INTO inits values (?,?,?,?) ON CONFLICT(name) DO UPDATE SET dice=" + str(number_of_dice) + ", bonus=" + str(init_bonus), (number_of_dice, init_bonus, 0, character_name)) @@ -114,11 +114,11 @@ class Plugin(PluginBase): text_type='header', box_align='left') return - def cmd_interupt(self, data): + def cmd_interrupt(self, data): all_data = data.message.strip().split() try: - name = str(all_data[1]) - subtract = int(all_data[2]) + subtract = int(all_data[1]) + name = str(" ".join(all_data[2:len(all_data)])) init_db = sqlite3.connect('init.db') cur = init_db.cursor() cur.execute("SELECT * from inits WHERE name = :name", {"name": name}) @@ -136,11 +136,10 @@ class Plugin(PluginBase): text_type='header', box_align='left') return - def cmd_delinit(self, data): all_data = data.message.strip().split() try: - name = str(all_data[1]) + name = str(" ".join(all_data[1:len(all_data)])) init_db = sqlite3.connect('init.db') cur = init_db.cursor() cur.execute("DELETE from inits WHERE name = :name", {"name": name}) @@ -239,10 +238,8 @@ class Plugin(PluginBase): if this_die == 1: ones = ones + 1 if this_die == 6: - i = i-1 + number_of_dice = number_of_dice + 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')