Merge pull request #140 from NabDev/hotfix-arenadeaths

Arena deaths are no longer announced
Galarzaa90 · Oct 23, 2018 · f64e45a · f64e45a
2 parents 625d9dd + e399c17
commit f64e45a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## Version 1.7.2 (2018-10-23)
+- Deaths caused by arena creatuers are no longer announced.
+
 ## Version 1.7.1 (2018-10-12)
 - Fixed links in `/about` command.
 - Combine walks through fields and walks around fields into a single embed field.

diff --git a/cogs/tracking.py b/cogs/tracking.py
@@ -447,12 +447,12 @@ async def announce_death(self, death: Death, levels_lost=0, char: Character = No
             if death.by_player:
                 message = weighed_choice(death_messages_player, vocation=char.vocation, level=death.level,
                                          levels_lost=levels_lost, min_level=min_level)
-            elif death.killer in ["death", "energy", "earth", "fire", "Pit Battler", "Pit Berserker",
-                                  "Pit Blackling",
-                                  "Pit Brawler", "Pit Condemned", "Pit Demon", "Pit Destroyer", "Pit Fiend",
-                                  "Pit Groveller", "Pit Grunt", "Pit Lord", "Pit Maimer", "Pit Overlord",
-                                  "Pit Reaver",
-                                  "Pit Scourge"] and levels_lost == 0:
+            elif death.killer.lower() in ["death", "energy", "earth", "fire", "pit battler", "pit berserker",
+                                          "pit blackling",
+                                          "pit brawler", "pit condemned", "pit demon", "pit destroyer", "pit fiend",
+                                          "pit groveller", "pit grunt", "pit lord", "pit maimer", "pit overlord",
+                                          "pit reaver",
+                                          "pit scourge"] and levels_lost == 0:
                 # Skip element damage deaths unless player lost a level to avoid spam from arena deaths
                 # This will cause a small amount of deaths to not be announced but it's probably worth the tradeoff
                 return

diff --git a/nabbot.py b/nabbot.py
@@ -42,7 +42,7 @@ def __init__(self):
         # A list version is created from the dictionary
         self.tracked_worlds = {}
         self.tracked_worlds_list = []
-        self.__version__ = "1.7.1"
+        self.__version__ = "1.7.2"
         self.__min_discord__ = 1580
 
     async def on_ready(self):