From 6e400a547049f707685bc7d6d8ff6419a848f42e Mon Sep 17 00:00:00 2001 From: dngfx <294904+dngfx@users.noreply.github.com> Date: Fri, 31 Aug 2018 16:06:11 +0100 Subject: [PATCH] Just duck things~ --- modules/ducks.py | 63 +++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/modules/ducks.py b/modules/ducks.py index aec604cf..1ac284c9 100644 --- a/modules/ducks.py +++ b/modules/ducks.py @@ -15,14 +15,14 @@ class Module(object): self.decoy_hooked = 0 events.on("received.command.bef").hook(self.duck_bef, - help="Befriend a duck!") + help="Befriend a duck!") events.on("received.command.bang").hook(self.duck_bang, - help="Shoot a duck! Meanie.") + help="Shoot a duck! Meanie.") events.on("received.command.decoy").hook(self.set_decoy, - help="Be a sneaky fellow and make a decoy duck.") + help="Be a sneaky fellow and make a decoy duck.") events.on("received.command.friends").hook(self.duck_friends, - help="See who the friendliest people to ducks are!") + help="See who the friendliest people to ducks are!") # events.on("received.command.killers").hook(self.duck_killers, # help="See who shoots the most amount of ducks.") # events.on("received.command.ducks").hook(self.duck_list, @@ -58,7 +58,8 @@ class Module(object): for server in self.bot.servers.values(): for channel in server.channels.values(): ducks_enabled = channel.get_setting("ducks-enabled", 0) - ducks_enabled = int(ducks_enabled) if isinstance(ducks_enabled, str) else ducks_enabled + ducks_enabled = int(ducks_enabled) if isinstance(ducks_enabled, + str) else ducks_enabled min_time = "min-duck-time-%s" % channel.name max_time = "max-duck-time-%s" % channel.name @@ -66,8 +67,10 @@ class Module(object): min_duck_time = channel.get_setting("min-duck-time", 240) max_duck_time = channel.get_setting("max-duck-time", 1200) - min_duck_time = int(min_duck_time) if isinstance(min_duck_time, str) else min_duck_time - max_duck_time = int(max_duck_time) if isinstance(max_duck_time, str) else max_duck_time + min_duck_time = int(min_duck_time) if isinstance(min_duck_time, + str) else min_duck_time + max_duck_time = int(max_duck_time) if isinstance(max_duck_time, + str) else max_duck_time self.duck_times[min_time] = min_duck_time self.duck_times[max_time] = max_duck_time @@ -84,8 +87,10 @@ class Module(object): min = "min-duck-time-%s" % (channel_name) max = "max-duck-time-%s" % (channel_name) - self.bot.log.debug("Attempting to set %s to %s", [str(min), str(self.duck_times[min])]); - self.bot.log.debug("Attempting to set %s to %s", [str(max), str(self.duck_times[max])]); + self.bot.log.debug("Attempting to set %s to %s", + [str(min), str(self.duck_times[min])]); + self.bot.log.debug("Attempting to set %s to %s", + [str(max), str(self.duck_times[max])]); return random.randint(self.duck_times[min], self.duck_times[max]) @@ -93,7 +98,10 @@ class Module(object): return random.randint(10, 20) def duck_friends(self, event): - pass + friends = event["server"].find_all_user_channel_settings( + "ducks-befriended") + + print(friends) def duck_bef(self, event): user = event["user"] @@ -101,29 +109,33 @@ class Module(object): id = user.id active_duck = event["target"].get_setting("active-duck", 0) - active_duck = int(active_duck) if isinstance(active_duck, str) else active_duck + active_duck = int(active_duck) if isinstance(active_duck, + str) else active_duck if active_duck == 0: event["stderr"].set_prefix("Kick") if event["server"].has_user(target): if not event["server"].is_own_nickname(target): - event["target"].send_kick(target, "You tried befriending a non-existent duck. Creepy!") + event["target"].send_kick(target, + "You tried befriending a non-existent duck. Creepy!") else: event["stderr"].write("Nope.") else: event["stderr"].write("That user is not in this channel") else: befriended_ducks = event["target"].get_user_setting(id, - "ducks-befriended", 0) + "ducks-befriended", + 0) event["target"].set_user_setting(id, - "ducks-befriended", - befriended_ducks + 1) + "ducks-befriended", + befriended_ducks + 1) event["target"].set_setting("active-duck", 0) grammar = "" if befriended_ducks == 0 else "s" event["stdout"].write( - target + ", you've befriended " + str(befriended_ducks + 1) + " duck" + grammar + " in " + event[ + target + ", you've befriended " + str( + befriended_ducks + 1) + " duck" + grammar + " in " + event[ "target"].name) next_duck_time = self.duck_time(event) @@ -137,7 +149,8 @@ class Module(object): event["stderr"].set_prefix("Kick") if event["server"].has_user(target): if not event["server"].is_own_nickname(target): - event["target"].send_kick(target, "You tried shooting a non-existent duck. Creepy!") + event["target"].send_kick(target, + "You tried shooting a non-existent duck. Creepy!") else: event["stderr"].write("Nope.") else: @@ -150,7 +163,9 @@ class Module(object): grammar = "" if shot_ducks == 0 else "s" event["stdout"].write( - target + ", you've shot " + str(shot_ducks + 1) + " duck" + grammar + " in " + event["target"].name); + target + ", you've shot " + str( + shot_ducks + 1) + " duck" + grammar + " in " + event[ + "target"].name); next_duck_time = self.duck_time(event) self.bot.add_timer("duck-appear", next_duck_time, persist=False) @@ -159,13 +174,16 @@ class Module(object): for server in self.bot.servers.values(): for channel in server.channels.values(): ducks_enabled = channel.get_setting("ducks-enabled", 0) - ducks_enabled = int(ducks_enabled) if isinstance(ducks_enabled, str) else ducks_enabled + ducks_enabled = int(ducks_enabled) if isinstance(ducks_enabled, + str) else ducks_enabled if ducks_enabled == 0: continue - self.bot.log.info("Ducks enabled for %s: %s", [str(channel.name), str(ducks_enabled)]) + self.bot.log.info("Ducks enabled for %s: %s", + [str(channel.name), str(ducks_enabled)]) active_duck = channel.get_setting("active-duck", 0) - active_duck = int(active_duck) if isinstance(active_duck, str) else active_duck + active_duck = int(active_duck) if isinstance(active_duck, + str) else active_duck if ducks_enabled == 1 and active_duck == 0: ducks = [ @@ -189,7 +207,8 @@ class Module(object): channel.set_setting("active-duck", 0) next_duck_time = self.duck_time(channel.name) - self.bot.add_timer("duck-appear", next_duck_time, persist=False) + self.bot.add_timer("duck-appear", next_duck_time, + persist=False) def duck_decoy(self, event): ducks = [