Merge pull request #81 from LetsTimeIt/namespacing

feat: Inspiring mobs are now much more noticeable feat: Addon now has its own namespace (DungeonTools). There is still one clash, but it is on the MDT side, so there's not much we can do on that. fix: if a mob does not have an i18n entry, or if the i18n stuff fails, we fall back to the literal key provided fix: default routes no longer get wiped
LetsTimeIt · Jan 2, 2021 · 55e32b5 · 55e32b5
2 parents 6c0ba6c + 61de9c5
commit 55e32b5
Show file tree

Hide file tree

Showing 50 changed files with 146 additions and 101 deletions.
diff --git a/AceGUIWidget-DungeonToolsNewPullButton.lua b/AceGUIWidget-DungeonToolsNewPullButton.lua
@@ -1,5 +1,6 @@
 local Type, Version = "MDTNewPullButton", 1
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
+local MDT = DungeonTools
 local L = MDT.L
 local width,height = 248,32
 

diff --git a/AceGUIWidget-DungeonToolsPullButton.lua b/AceGUIWidget-DungeonToolsPullButton.lua
@@ -1,6 +1,6 @@
 local Type, Version = "MDTPullButton", 1
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 
 

diff --git a/AceGUIWidget-DungeonToolsSpellButton.lua b/AceGUIWidget-DungeonToolsSpellButton.lua
@@ -1,6 +1,6 @@
 local ButtonType, ButtonVersion = "MDTSpellButton", 1
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-
+local MDT = DungeonTools
 local width,height = 248,32
 local tinsert,SetPortraitToTexture,SetPortraitTextureFromCreatureDisplayID,GetItemQualityColor,MouseIsOver = table.insert,SetPortraitToTexture,SetPortraitTextureFromCreatureDisplayID,GetItemQualityColor,MouseIsOver
 

diff --git a/AceGUIWidget-DungeonToolsSpellLabel.lua b/AceGUIWidget-DungeonToolsSpellLabel.lua
@@ -1,6 +1,6 @@
 local LabelType, LabelVersion = "MDTSpellLabel", 1
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
-
+local MDT = DungeonTools
 local width,height = 248,18
 local tinsert,SetPortraitToTexture,SetPortraitTextureFromCreatureDisplayID,GetItemQualityColor,MouseIsOver = table.insert,SetPortraitToTexture,SetPortraitTextureFromCreatureDisplayID,GetItemQualityColor,MouseIsOver
 

diff --git a/BattleForAzeroth/AtalDazar.lua b/BattleForAzeroth/AtalDazar.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 15
 MDT.dungeonTotalCount[dungeonIndex] = {normal=198,teeming=237,teemingEnabled=true}

diff --git a/BattleForAzeroth/Freehold.lua b/BattleForAzeroth/Freehold.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 16
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/KingsRest.lua b/BattleForAzeroth/KingsRest.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 17
 MDT.dungeonTotalCount[dungeonIndex] = {normal=246,teeming=286,teemingEnabled=true}

diff --git a/BattleForAzeroth/MechagonCity.lua b/BattleForAzeroth/MechagonCity.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 26
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/MechagonIsland.lua b/BattleForAzeroth/MechagonIsland.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 25
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/ShrineoftheStorm.lua b/BattleForAzeroth/ShrineoftheStorm.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 18
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/SiegeofBoralus.lua b/BattleForAzeroth/SiegeofBoralus.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 19
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/TempleofSethraliss.lua b/BattleForAzeroth/TempleofSethraliss.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 20
 MDT.dungeonTotalCount[dungeonIndex] = {normal=220,teeming=264,teemingEnabled=true}

diff --git a/BattleForAzeroth/TheMotherlode.lua b/BattleForAzeroth/TheMotherlode.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 21
 MDT.dungeonTotalCount[dungeonIndex] = {normal=384,teeming=460,teemingEnabled=true}

diff --git a/BattleForAzeroth/TheUnderrot.lua b/BattleForAzeroth/TheUnderrot.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 22
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/TolDagor.lua b/BattleForAzeroth/TolDagor.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 23
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/WaycrestManor.lua b/BattleForAzeroth/WaycrestManor.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local dungeonIndex = 24
 MDT.mapInfo[dungeonIndex] = {

diff --git a/BattleForAzeroth/overrides.lua b/BattleForAzeroth/overrides.lua
@@ -1,3 +1,4 @@
+local MDT = DungeonTools
 local displayIdOverrides = {
 
 }

diff --git a/Bindings.xml b/Bindings.xml
@@ -1,11 +1,11 @@
 <Bindings>
-    <Binding name="MDTTOGGLE" runOnUp="false" category="Dungeon Tools">
-      MDT:ShowInterface()
+    <Binding name="DungeonToolsToggle" runOnUp="false" category="Dungeon Tools">
+      DungeonTools:ShowInterface()
     </Binding>
-    <Binding name="MDTNPC" runOnUp="false" category="Dungeon Tools">
-        MDT:AddCloneAtCursorPosition()
+    <Binding name="DungeonToolsNPC" runOnUp="false" category="Dungeon Tools">
+        DungeonTools:AddCloneAtCursorPosition()
     </Binding>
-    <Binding name="MDTWAYPOINT" runOnUp="false" category="Dungeon Tools">
-        MDT:AddPatrolWaypointAtCursorPosition()
+    <Binding name="DungeonToolsWaypoint" runOnUp="false" category="Dungeon Tools">
+        DungeonTools:AddPatrolWaypointAtCursorPosition()
     </Binding>
 </Bindings>
diff --git a/DataCollection.lua b/DataCollection.lua
@@ -1,8 +1,8 @@
 ---Tracks spells casted by enemies and adds them to the dataset
 local db
 local f
-local MDT = MDT
-
+local MDT = DungeonTools
+local commsObject = MDT.commsObject
 MDT.DataCollection = {}
 local DC = MDT.DataCollection
 function DC:Init()
@@ -232,7 +232,7 @@ function MDT:RequestDataCollectionUpdate()
     if true then return end
     local distribution = self:IsPlayerInGroup()
     if not distribution then return end
-    MDTcommsObject:SendCommMessage(self.dataCollectionPrefixes.request, "0", distribution, nil, "ALERT")
+    commsObject:SendCommMessage(self.dataCollectionPrefixes.request, "0", distribution, nil, "ALERT")
 end
 
 ---Distribute collected data to party/raid
@@ -250,7 +250,7 @@ function DC:DistributeData()
             [2] = db.dataCollectionCC
         }
         local export = MDT:TableToString(package,false,5)
-        MDTcommsObject:SendCommMessage(MDT.dataCollectionPrefixes.distribute, export, distribution, nil, "BULK",nil,nil)
+        commsObject:SendCommMessage(MDT.dataCollectionPrefixes.distribute, export, distribution, nil, "BULK",nil,nil)
     end
 end
 

diff --git a/DungeonEnemies.lua b/DungeonEnemies.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local db
 local tonumber,tinsert,slen,pairs,ipairs,tostring,next,type,sformat,twipe,max,tremove,DrawLine = tonumber,table.insert,string.len,pairs,ipairs,tostring,next,type,string.format,table.wipe,math.max,table.remove,DrawLine
 local L = MDT.L
@@ -66,7 +66,7 @@ function MDT:DoFramesOverlap(frameA, frameB, offset)
 end
 
 
-MDTDungeonEnemyMixin = {};
+DungeonToolsEnemyMixin = {};
 
 local defaultSizes = {
     ["texture_Background"] = 20,
@@ -83,13 +83,13 @@ local defaultSizes = {
     ["texture_DragUp"] = 8,
 }
 
-function MDTDungeonEnemyMixin:updateSizes(scale)
+function DungeonToolsEnemyMixin:updateSizes(scale)
     for tex,size in pairs(defaultSizes) do
         self[tex]:SetSize(size*self.normalScale*scale,size*self.normalScale*scale)
     end
 end
 
-function MDTDungeonEnemyMixin:OnEnter()
+function DungeonToolsEnemyMixin:OnEnter()
     self:updateSizes(1.2)
     self:SetFrameLevel(self:GetFrameLevel()+5)
     self:DisplayPatrol(true)
@@ -131,7 +131,7 @@ function MDTDungeonEnemyMixin:OnEnter()
     end
 end
 
-function MDTDungeonEnemyMixin:OnLeave()
+function DungeonToolsEnemyMixin:OnLeave()
     self:updateSizes(1)
     self:SetFrameLevel(self:GetFrameLevel()-5)
     if db.devMode then
@@ -306,7 +306,7 @@ local function setUpMouseHandlersAwakened(self,clone,scale,riftOffsets)
     end)
 end
 
-function MDTDungeonEnemyMixin:OnClick(button, down)
+function DungeonToolsEnemyMixin:OnClick(button, down)
 
     if button == "LeftButton" then
         if IsShiftKeyDown() then
@@ -393,7 +393,7 @@ function MDT:GetPatrolBlips()
     return patrolPoints
 end
 
-function MDTDungeonEnemyMixin:DisplayPatrol(shown)
+function DungeonToolsEnemyMixin:DisplayPatrol(shown)
     local scale = MDT:GetScale()
 
     --Hide all points/line
@@ -489,7 +489,8 @@ function MDT:DisplayBlipTooltip(blip, shown)
     ]]
     local occurence = (blip.data.isBoss and "") or blip.cloneIdx
 
-    local text = data.name.." "..occurence..group.."\n"..string.format(L["Level %d %s"],data.level,data.creatureType).."\n".. string.format(L["%s HP"],MDT:FormatEnemyHealth(health)).."\n"
+    local mobName = data.name or ""
+    local text = mobName.." "..occurence..group.."\n"..string.format(L["Level %d %s"],data.level,data.creatureType).."\n".. string.format(L["%s HP"],MDT:FormatEnemyHealth(health)).."\n"
     local count = MDT:IsCurrentPresetTeeming() and data.teemingCount or data.count
     text = text ..L["Forces"]..": ".. MDT:FormatEnemyForces(count)
     local reapingText
@@ -607,7 +608,7 @@ end
 
 local emissaryIds = {[155432]=true,[155433]=true,[155434]=true}
 
-function MDTDungeonEnemyMixin:SetUp(data,clone)
+function DungeonToolsEnemyMixin:SetUp(data,clone)
     local scale = MDT:GetScale()
     self:ClearAllPoints()
     self:SetPoint("CENTER", MDT.main_frame.mapPanelTile1,"TOPLEFT",clone.x*scale,clone.y*scale)
@@ -706,7 +707,7 @@ function MDT:DungeonEnemies_UpdateEnemies()
             if clone.sublevel == currentSublevel or (not clone.sublevel) then
                 --skip rifts that were dragged to another sublevel
                 if not (data.corrupted and riftOffsets and riftOffsets[data.id] and riftOffsets[data.id].sublevel) then
-                    local blip = MDT.dungeonEnemies_framePools:Acquire("MDTDungeonEnemyTemplate")
+                    local blip = MDT.dungeonEnemies_framePools:Acquire("DungeonToolsEnemyTemplate")
                     blip:SetUp(data,clone)
                     blip.enemyIdx = enemyIdx
                     blip.cloneIdx = cloneIdx
@@ -721,7 +722,7 @@ function MDT:DungeonEnemies_UpdateEnemies()
                 for enemyIdx,data in pairs(enemies) do
                     if data.id == npcId then
                         for cloneIdx,clone in pairs(data["clones"]) do
-                            local blip = MDT.dungeonEnemies_framePools:Acquire("MDTDungeonEnemyTemplate")
+                            local blip = MDT.dungeonEnemies_framePools:Acquire("DungeonToolsEnemyTemplate")
                             blip:SetUp(data,clone)
                             blip.enemyIdx = enemyIdx
                             blip.cloneIdx = cloneIdx
@@ -736,7 +737,7 @@ end
 function MDT:DungeonEnemies_CreateFramePools()
     db = self:GetDB()
     MDT.dungeonEnemies_framePools = MDT.dungeonEnemies_framePools or CreateFramePoolCollection()
-    MDT.dungeonEnemies_framePools:CreatePool("Button", MDT.main_frame.mapPanelFrame, "MDTDungeonEnemyTemplate");
+    MDT.dungeonEnemies_framePools:CreatePool("Button", MDT.main_frame.mapPanelFrame, "DungeonToolsEnemyTemplate");
 end
 
 function MDT:FindPullOfBlip(blip)
@@ -908,6 +909,10 @@ end
 ---DungeonEnemies_GetPullColor
 ---Returns the custom color for a pull
 function MDT:DungeonEnemies_GetPullColor(pull,pulls)
+    if not preset or not preset.value or not preset.value.pulls then
+        r,g,b = MDT:HexToRGB(db.defaultColor)
+        return r,g,b
+    end
     pulls = pulls or preset.value.pulls
     local r,g,b = MDT:HexToRGB(pulls[pull]["color"])
     if not r then

diff --git a/DungeonEnemies.xml b/DungeonEnemies.xml
@@ -2,7 +2,7 @@
 ..\FrameXML\UI.xsd">
     <Script file="DungeonEnemies.lua"/>
 
-    <Button name="MDTDungeonEnemyTemplate" enableMouse="true" virtual="true" mixin="MDTDungeonEnemyMixin">
+    <Button name="DungeonToolsEnemyTemplate" enableMouse="true" virtual="true" mixin="DungeonToolsEnemyMixin">
 
         <Layers>
 
@@ -94,7 +94,7 @@
                     </Anchors>
                 </Texture>
                 <Texture name="$parent_Indicator" hidden="false" parentKey="texture_Indicator" file = "Interface\AddOns\DungeonTools\Textures\UI-EncounterJournalTextures">
-                    <TexCoords left="0.85" right="0.97" top="0.43" bottom="0.4865"/>
+                    <TexCoords left="0.826" right="0.924" top="0.338" bottom="0.387"/>
                     <Color r="2.04" g="0" b="0" a="0"/>
                     <Anchors>
                         <Anchor point="CENTER"/>
@@ -137,5 +137,5 @@
             <OnClick method="OnClick"/>
         </Scripts>
     </Button>
-    <Frame name="MDTAnimatedLineTemplate" virtual="true"/>
+    <Frame name="DungeonToolsAnimatedLineTemplate" virtual="true"/>
 </Ui>
diff --git a/DungeonTools.lua b/DungeonTools.lua
@@ -44,9 +44,9 @@ SLASH_DUNGEONTOOLS1 = "/mplus"
 SLASH_DUNGEONTOOLS2 = "/mdt"
 SLASH_DUNGEONTOOLS3 = "/dungeontools"
 
-BINDING_NAME_MDTTOGGLE = L["Toggle Window"]
-BINDING_NAME_MDTNPC = L["New NPC at Cursor Position"]
-BINDING_NAME_MDTWAYPOINT = L["New Patrol Waypoint at Cursor Position"]
+BINDING_NAME_DungeonToolsToggle = L["Toggle Window"]
+BINDING_NAME_DungeonToolsNPC = L["New NPC at Cursor Position"]
+BINDING_NAME_DungeonToolsWaypoint = L["New Patrol Waypoint at Cursor Position"]
 
 function SlashCmdList.DUNGEONTOOLS(cmd, editbox)
 	local rqst, arg = strsplit(' ', cmd)
@@ -149,23 +149,6 @@ do
 				icon:Show("DungeonTools")
 			end
 
-            --if db.dataCollectionActive then MDT.DataCollection:Init() end
-            --fix db corruption
-            do
-                for _,presets in pairs(db.presets) do
-                    for presetIdx,preset in pairs(presets) do
-                        if presetIdx == 1 then
-                            if preset.text ~= "Default" then
-                                preset.text = "Default"
-                                preset.value = {}
-                            end
-                        end
-                    end
-                end
-                for k,v in pairs(db.currentPreset) do
-                    if v <= 0 then db.currentPreset[k] = 1 end
-                end
-            end
             --register AddOn Options
             MDT:RegisterOptions()
             self:UnregisterEvent("ADDON_LOADED")
@@ -658,8 +641,35 @@ function MDT:GetDB()
 end
 
 local framesInitialized
+
+function MDT:ImportFromLegacyMDT()
+    mdtDb = LibStub("AceDB-3.0"):New("MythicDungeonToolsDB", defaultSavedVars).global
+    for dungeonIdx,presets in pairs(mdtDb.presets) do
+        if not db.presets[dungeonIdx] then
+            db.presets[dungeonIdx] = {}
+        end
+        oldPresetLen = #db.presets[dungeonIdx]
+        newPresetLen = #presets
+        -- Quick hack
+        db.presets[dungeonIdx][newPresetLen] = MDT:DeepCopy(db.presets[dungeonIdx][oldPresetLen])
+        currentIdx = oldPresetLen
+        for _,preset in pairs(presets) do
+            if preset["text"] ~= "Default" and preset["text"] ~= "<New Preset>" then
+                db.presets[dungeonIdx][currentIdx] = MDT:DeepCopy(preset)
+                db.presets[dungeonIdx][currentIdx]["text"] = preset["text"].." (Imported)";
+                currentIdx = currentIdx + 1
+            end
+        end
+    end
+    db.Imported = true
+end
 function MDT:ShowInterface(force)
     if not framesInitialized then initFrames() end
+
+    if not db.Imported then
+        MDT:ImportFromLegacyMDT()
+    end
+
 	if self.main_frame:IsShown() and not force then
 		MDT:HideInterface()
 	else

diff --git a/EnemyInfo.lua b/EnemyInfo.lua
@@ -1,4 +1,4 @@
-local MDT = MDT
+local MDT = DungeonTools
 local L = MDT.L
 local AceGUI = LibStub("AceGUI-3.0")
 local db

diff --git a/Legion/BlackRookHold.lua b/Legion/BlackRookHold.lua
@@ -1,6 +1,7 @@
 local dungeonIndex = 1
 local nerfMultiplier = 0.834
 local pi = math.pi
+local MDT = DungeonTools
 MDT.dungeonTotalCount[dungeonIndex] = { normal=300, teeming=360, teemingEnabled=true}
 MDT.dungeonBosses[dungeonIndex] = {--Black Rook Hold
 	[1] = {

diff --git a/Legion/CathedralOfEternalNight.lua b/Legion/CathedralOfEternalNight.lua
@@ -1,6 +1,7 @@
 local dungeonIndex = 2
 local pi = math.pi
 local nerfMultiplier = 1
+local MDT = DungeonTools
 MDT.dungeonTotalCount[dungeonIndex] = {normal=305,teeming=335,teemingEnabled=true}
 MDT.dungeonBosses[dungeonIndex] = { --Cathedral of Eternal Night
 	[2] = {

diff --git a/Legion/CourtOfStars.lua b/Legion/CourtOfStars.lua
@@ -1,6 +1,7 @@
 local dungeonIndex = 3
 local nerfMultiplier = 1
 local pi = math.pi
+local MDT = DungeonTools
 MDT.dungeonTotalCount[dungeonIndex] = {normal=160,teeming=192,teemingEnabled=true}
 MDT.dungeonBosses[dungeonIndex] = {--Court of Stars
 	[1] = {