diff --git a/__pycache__/shadowdice.cpython-38.pyc b/__pycache__/shadowdice.cpython-38.pyc deleted file mode 100644 index c5a9291..0000000 Binary files a/__pycache__/shadowdice.cpython-38.pyc and /dev/null differ 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')