diff --git a/main_controller.py b/main_controller.py index ca693a2..260e634 100644 --- a/main_controller.py +++ b/main_controller.py @@ -186,6 +186,8 @@ def update_loop(): if "weather_message" in this_game.last_update[0].keys(): state["update_emoji"] = this_game.weather.emoji + else: + state["update_emoji"] = "🏏" if "steals" in this_game.last_update[0].keys(): updatestring = "" @@ -211,7 +213,7 @@ def update_loop(): if this_game.last_update[1] > 0: updatestring += f"{this_game.last_update[1]} runs scored!" - state["update_emoji"] = "🏏" + state["update_text"] = updatestring this_game.weather.modify_atbat_message(this_game, state) diff --git a/the_prestige.py b/the_prestige.py index 819b7fd..74ee121 100644 --- a/the_prestige.py +++ b/the_prestige.py @@ -1319,11 +1319,11 @@ class OBLSetRivalCommand(Command): elif owner_id != msg.author.id and msg.author.id not in config()["owners"]: await msg.channel.send("You're not authorized to mess with this team. Sorry, boss.") return - #try: - db.set_obl_rival(team, team_r) - await msg.channel.send("One pair of mortal enemies, coming right up. Unless you're more of the 'enemies to lovers' type. We can manage that too, don't worry.") - #except: - #await msg.channel.send("Hm. We don't think that team has tried to do anything in the One Big League yet, so you'll have to wait for consent. Get them to check their bounty board.") + try: + db.set_obl_rival(team, team_r) + await msg.channel.send("One pair of mortal enemies, coming right up. Unless you're more of the 'enemies to lovers' type. We can manage that too, don't worry.") + except: + await msg.channel.send("Hm. We don't think that team has tried to do anything in the One Big League yet, so you'll have to wait for consent. Get them to check their bounty board.") class OBLConqueredCommand(Command): name = "oblwins" diff --git a/weather.py b/weather.py index b4af354..450fc8a 100644 --- a/weather.py +++ b/weather.py @@ -44,7 +44,7 @@ class Supernova(Weather): self.emoji = "🌟" def modify_atbat_stats(self, roll): - roll["pitch_stat"] *= 0.9 + roll["pitch_stat"] *= 0.8 class Midnight(Weather): def __init__(self, game): @@ -73,6 +73,7 @@ class SlightTailwind(Weather): result.clear() result.update({ "text": f"{game.get_batter()} would have gone out, but they took a mulligan!", + "mulligan": True, "text_only": True, "weather_message": True, })