Merge pull request #13 from tro-janek/master

Season 3 Data refined
wind-addons · Jan 18, 2024 · 6dc6dff · 6dc6dff
2 parents dbe3da2 + 6f35fd7
commit 6dc6dff
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 97 deletions.
diff --git a/Modules/AvoidableDamageData/BlackRookHold.lua b/Modules/AvoidableDamageData/BlackRookHold.lua
@@ -4,6 +4,8 @@ local AD = W:GetModule("AvoidableDamage")
 -- TODO: Glaive Toss avoidable damage only if you're not the target
 -- TODO: Bloodthirsty Leap avoidable damage only if you're not the target
 -- TODO: Brutal Glaive avoidable damage only if you're not the target
+-- Commenting out Knife Dance, it can be LOS'ed, but it's debatable whether the addon should show it or not
+-- Commenting out Fel Bat Pup meele damage, since it's debatable
 
 local mistakes = {
     -- Amalgam of Souls
@@ -89,16 +91,6 @@ local mistakes = {
         spell = 225732,
         playerIsNotTank = true
     },
-    {
-        -- Glaive Toss
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 196916
-    },
-    {
-        -- Spirit Blast
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 196883
-    },
     {
         -- Soul Echoes
         type = AD.MISTAKE.SPELL_DAMAGE,
@@ -114,22 +106,16 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 200256
     },
-    {
-        -- Soul Venom
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 225908,
-        playerIsNotTank = true
-    },
     {
         -- Arrow Barrage
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 200344
     },
-    {
-        -- Knife Dance
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 200325
-    },
+    -- {
+    --     -- Knife Dance
+    --     type = AD.MISTAKE.SPELL_DAMAGE,
+    --     spell = 200325
+    -- },
     {
         -- Bonebreaking Strike
         type = AD.MISTAKE.SPELL_DAMAGE,
@@ -155,12 +141,12 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 201062
     },
-    {
-        -- Fel Bat Pup fixated on a player
-        type = AD.MISTAKE.MELEE,
-        npc = 102781,
-        playerIsNotTank = true
-    },
+    -- {
+    --     -- Fel Bat Pup fixated on a player
+    --     type = AD.MISTAKE.MELEE,
+    --     npc = 102781,
+    --     playerIsNotTank = true
+    -- },
     {
         -- Raven's Dive
         type = AD.MISTAKE.SPELL_DAMAGE,

diff --git a/Modules/AvoidableDamageData/DawnOfTheInfinite.lua b/Modules/AvoidableDamageData/DawnOfTheInfinite.lua
@@ -2,6 +2,7 @@ local W, F, L, P = unpack(select(2, ...))
 local AD = W:GetModule("AvoidableDamage")
 
 -- TODO: Chronikar:Withering Sandpool - initial damage not avoidable
+-- Commenting out Embers & Sharpnel, they are dots left after avoidable damage
 
 local mistakes = {
     -- Chronikar
@@ -184,11 +185,11 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 418092
     },
-    {
-        -- Shrapnel
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 407313
-    },
+    -- {
+    --     -- Shrapnel
+    --     type = AD.MISTAKE.SPELL_DAMAGE,
+    --     spell = 407313
+    -- },
     {
         -- Consecration
         type = AD.MISTAKE.SPELL_DAMAGE,
@@ -240,11 +241,11 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 412029
     },
-    {
-        -- Embers
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 407315
-    },
+    -- {
+    --     -- Embers
+    --     type = AD.MISTAKE.SPELL_DAMAGE,
+    --     spell = 407315
+    -- },
     {
         -- Kaboom!
         type = AD.MISTAKE.SPELL_DAMAGE,

diff --git a/Modules/AvoidableDamageData/Everbloom.lua b/Modules/AvoidableDamageData/Everbloom.lua
@@ -21,12 +21,12 @@ local mistakes = {
         spell = 164357,
         playerIsNotTank = true
     },
-    {
-        -- Witherbark:Unchecked Growth (Meele)
-        type = AD.MISTAKE.MELEE,
-        npc = 81737,
-        playerIsNotTank = true
-    },
+    -- {
+    --     -- Witherbark:Unchecked Growth (Meele)
+    --     type = AD.MISTAKE.MELEE,
+    --     npc = 81737,
+    --     playerIsNotTank = true
+    -- },
     -- Ancient Protectors
     {
         -- Ancient Protectors:Noxious Charge
@@ -71,11 +71,6 @@ local mistakes = {
         -- Spatial Disruption
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 426982
-    },
-    {
-        -- Bounding Whirl
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 172579
     }
 }
 

diff --git a/Modules/AvoidableDamageData/ThroneOfTheTides.lua b/Modules/AvoidableDamageData/ThroneOfTheTides.lua
@@ -2,6 +2,7 @@ local W, F, L, P = unpack(select(2, ...))
 local AD = W:GetModule("AvoidableDamage")
 
 -- Acid Barrage is debatable. Can be dodged, but requires very good coordination
+-- Commenting out Meele hits by adds on bosses, since it's debatable
 
 local mistakes = {
     -- Lady Naz'jar
@@ -20,18 +21,18 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 427769
     },
-    {
-        -- Lady Naz'jar:Naz'jar Honor Guard (Meele)
-        type = AD.MISTAKE.MELEE,
-        npc = 40633,
-        playerIsNotTank = true
-    },
-    {
-        -- Lady Naz'jar:Naz'jar Frost Witch (Meele)
-        type = AD.MISTAKE.MELEE,
-        npc = 44404,
-        playerIsNotTank = true
-    },
+    -- {
+    --     -- Lady Naz'jar:Naz'jar Honor Guard (Meele)
+    --     type = AD.MISTAKE.MELEE,
+    --     npc = 40633,
+    --     playerIsNotTank = true
+    -- },
+    -- {
+    --     -- Lady Naz'jar:Naz'jar Frost Witch (Meele)
+    --     type = AD.MISTAKE.MELEE,
+    --     npc = 44404,
+    --     playerIsNotTank = true
+    -- },
     -- Commander Ulthok
     {
         -- Commander Ulthok:Bubbling Ooze
@@ -71,18 +72,18 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 428809
     },
-    {
-        -- Ozumat:Sludge (Meele)
-        type = AD.MISTAKE.MELEE,
-        npc = 213942,
-        playerIsNotTank = true
-    },
-    {
-        -- Ozumat:Splotch (Meele)
-        type = AD.MISTAKE.MELEE,
-        npc = 213806,
-        playerIsNotTank = true
-    },
+    -- {
+    --     -- Ozumat:Sludge (Meele)
+    --     type = AD.MISTAKE.MELEE,
+    --     npc = 213942,
+    --     playerIsNotTank = true
+    -- },
+    -- {
+    --     -- Ozumat:Splotch (Meele)
+    --     type = AD.MISTAKE.MELEE,
+    --     npc = 213806,
+    --     playerIsNotTank = true
+    -- },
     -- Mobs
     {
         -- Shadow Smash

diff --git a/Modules/AvoidableDamageData/WaycrestManor.lua b/Modules/AvoidableDamageData/WaycrestManor.lua
@@ -54,26 +54,11 @@ local mistakes = {
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 265372
     },
-    {
-        -- Spellbind
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 260699
-    },
     {
         -- Toad Blight
         type = AD.MISTAKE.SPELL_DAMAGE,
         spell = 265352
     },
-    {
-        -- Drain Essence
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 256878
-    },
-    {
-        -- Uproot
-        type = AD.MISTAKE.SPELL_DAMAGE,
-        spell = 278849
-    },
     {
         -- Pallid Glare
         type = AD.MISTAKE.SPELL_DAMAGE,

diff --git a/Options/Information.lua b/Options/Information.lua
@@ -158,7 +158,11 @@ O.information = {
                 ["2"] = {
                     order = 2,
                     type = "description",
-                    name = "jan-trojanowski"
+                    name = format(
+                        "%s: %s",
+                        "tro-janek",
+                        F.CreateClassColorString("Mhalvir @ " .. L["Burning Legion"] .. "(EU)", "SHAMAN")
+                    )
                 }
             }
         },

diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 <div align="center">
 <img width="512" src="Title.svg"/><br><br>
-<img src="https://img.shields.io/badge/Version-2.1.1-green.svg?longCache=true&style=for-the-badge"/>
+<img src="https://img.shields.io/badge/Version-2.1.2-green.svg?longCache=true&style=for-the-badge"/>
 
 [简体中文 (zhCN)](README_zhCN.md) | [繁體中文 (zhTW)](README_zhTW.md) | [ру́сский язы́к (ruRU)](README_ruRU.md)
 </div>
 
 # ✅ Status
 
-![Publish State](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.1) [![Join Discord Server](https://img.shields.io/badge/Wind%20Plugins-Join-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/nA44TeZ)
+![Publish State](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.2) [![Join Discord Server](https://img.shields.io/badge/Wind%20Plugins-Join-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/nA44TeZ)
 
 Download Sites: [Curse](https://www.curseforge.com/wow/addons/wind-dungeon-helper) | [Wago](https://addons.wago.io/addons/winddungeonhelper) | [WoWInterface](https://www.wowinterface.com/downloads/info25532-WindDungeonHelper.html) | [Github Release](https://github.com/fang2hou/WindDungeonHelper/releases)
 

diff --git a/README_ruRU.md b/README_ruRU.md
@@ -1,13 +1,13 @@
 <div align="center">
 <img width="512" src="Title.svg"/><br><br>
-<img src="https://img.shields.io/badge/Version-2.1.1-green.svg?longCache=true&style=for-the-badge"/>
+<img src="https://img.shields.io/badge/Version-2.1.2-green.svg?longCache=true&style=for-the-badge"/>
 
 [English (enUS)](README.md) | [简体中文 (zhCN)](README_zhCN.md) | [繁體中文 (zhTW)](README_zhTW.md)
 </div>
 
 # ✅ Состояние
 
-![Publish State](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.1) [![Join Discord Server](https://img.shields.io/badge/Wind%20Plugins-Join-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/nA44TeZ)
+![Publish State](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.2) [![Join Discord Server](https://img.shields.io/badge/Wind%20Plugins-Join-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/nA44TeZ)
 
 Сайты для скачивания: [Curse](https://www.curseforge.com/wow/addons/wind-dungeon-helper) | [Wago](https://addons.wago.io/addons/winddungeonhelper) | [WoWInterface](https://www.wowinterface.com/downloads/info25532-WindDungeonHelper.html) | [Github Release](https://github.com/fang2hou/WindDungeonHelper/releases)
 

diff --git a/README_zhCN.md b/README_zhCN.md
@@ -1,13 +1,13 @@
 <div align="center">
 <img width="512" src="Title.svg"/><br><br>
-<img src="https://img.shields.io/badge/版本-2.1.1-green.svg?longCache=true&style=for-the-badge"/>
+<img src="https://img.shields.io/badge/版本-2.1.2-green.svg?longCache=true&style=for-the-badge"/>
 
 [English (enUS)](README.md) | [繁體中文 (zhTW)](README_zhTW.md) | [ру́сский язы́к (ruRU)](README_ruRU.md)
 </div>
 
 # ✅ 状态
 
-![发布测试状态](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.1) [![加入 Discord 服务器](https://img.shields.io/badge/Wind%20Plugins-加入-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/wvV5rQy)
+![发布测试状态](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.2) [![加入 Discord 服务器](https://img.shields.io/badge/Wind%20Plugins-加入-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/wvV5rQy)
 
 下载地址: [Curse](https://www.curseforge.com/wow/addons/wind-dungeon-helper) | [Wago](https://addons.wago.io/addons/winddungeonhelper) | [WoWInterface](https://www.wowinterface.com/downloads/info25532-WindDungeonHelper.html) | [Github 发布](https://github.com/fang2hou/WindDungeonHelper/releases)
 

diff --git a/README_zhTW.md b/README_zhTW.md
@@ -1,13 +1,13 @@
 <div align="center">
 <img width="512" src="Title.svg"/><br><br>
-<img src="https://img.shields.io/badge/版本-2.1.1-green.svg?longCache=true&style=for-the-badge"/>
+<img src="https://img.shields.io/badge/版本-2.1.2-green.svg?longCache=true&style=for-the-badge"/>
 
 [English (enUS)](README.md) | [简体中文 (zhCN)](README_zhCN.md) | [ру́сский язы́к (ruRU)](README_ruRU.md)
 </div>
 
 # ✅ 狀態
 
-![發布狀態](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.1) [![加入 Discord 伺服器](https://img.shields.io/badge/Wind%20Plugins-加入-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/wvV5rQy)
+![發布狀態](https://img.shields.io/github/actions/workflow/status/fang2hou/WindDungeonHelper/publish_stable.yml?branch=2.1.2) [![加入 Discord 伺服器](https://img.shields.io/badge/Wind%20Plugins-加入-grey.svg?longCache=true&color=7289DA&logo=discord)](https://discord.gg/wvV5rQy)
 
 下載點: [Curse](https://www.curseforge.com/wow/addons/wind-dungeon-helper) | [Wago](https://addons.wago.io/addons/winddungeonhelper) | [WoWInterface](https://www.wowinterface.com/downloads/info25532-WindDungeonHelper.html) | [Github 發布](https://github.com/fang2hou/WindDungeonHelper/releases)
 

diff --git a/WindDungeonHelper.toc b/WindDungeonHelper.toc
@@ -1,6 +1,6 @@
 ## Interface: 100205
 ## Author: fang2hou
-## Version: 2.1.1
+## Version: 2.1.2
 ## Title: |cff5385edW|r|cff528ceci|r|cff5094ean|r|cff4f9be9d|r |cff4caae6D|r|cff4ab2e4u|r|cff49b8e3n|r|cff47bde2g|r|cff46c3e1e|r|cff45c8dfo|r|cff44ceden|r |cff41d7ddH|r|cff41d7dde|r|cff41d7ddl|r|cff41d7ddp|r|cff41d7dde|r|cff41d7ddr|r
 ## Title-zhCN: |cff5385edW|r|cff5093eai|r|cff4ea1e8n|r|cff4bb0e5d|r |cff46c5e0地|r|cff43d0de下|r|cff41d7dd城|r|cff41d7dd助|r|cff41d7dd手|r
 ## Title-zhTW: |cff5385edW|r|cff5094eai|r|cff4da4e7n|r|cff4ab4e4d|r |cff44cbdf地|r|cff41d7dd城|r|cff41d7dd助|r|cff41d7dd手|r