Merge branch 'development'

Hoizame · Oct 1, 2019 · 1f1de95 · 1f1de95
2 parents 65e6847 + 2a3806c
commit 1f1de95
Show file tree

Hide file tree

Showing 9 changed files with 399 additions and 99 deletions.
diff --git a/AtlasLootClassic/Button/Button.lua b/AtlasLootClassic/Button/Button.lua
@@ -275,7 +275,7 @@ function Button:Create()
 
 	-- counter
 	button.count = button:CreateFontString(buttonName.."_count", "ARTWORK", "AtlasLoot_ItemAmountFont")
-	button.count:SetPoint("BOTTOMRIGHT", button.icon, "BOTTOMRIGHT", 0, 1)
+	button.count:SetPoint("BOTTOMRIGHT", button.icon, "BOTTOMRIGHT", -1, 1)
 	button.count:SetJustifyH("RIGHT")
 	button.count:SetHeight(15)
 	button.count:SetText(15)
@@ -333,7 +333,7 @@ function Button:Create()
 	button.secButton.completed:Hide()
 
 	button.secButton.count = button.secButton:CreateFontString(buttonName.."_secCount", "ARTWORK", "AtlasLoot_ItemAmountFont")
-	button.secButton.count:SetPoint("BOTTOMRIGHT", button.secButton.icon, "BOTTOMRIGHT", 0, 1)
+	button.secButton.count:SetPoint("BOTTOMRIGHT", button.secButton.icon, "BOTTOMRIGHT", -1, 1)
 	button.secButton.count:SetJustifyH("RIGHT")
 	button.secButton.count:SetHeight(15)
 	button.secButton.count:SetText(15)

diff --git a/AtlasLootClassic/Data/ContentPhase.lua b/AtlasLootClassic/Data/ContentPhase.lua
diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,13 @@
 
 This mod is distributed under Version 2 of the GPL.  A copy of the GPL is included in this zip file with links to non-english translations.
 
+## v1.2.0 (Sep. 30, 2019)
+
+- Add droprates for dungeons / raids
+- Add auto select for dungeons / raids
+- Update content phase items
+- Add License back into zip file
+
 ## v1.1.12 (Sep. 18, 2019)
 
 - Update BRD loottables

diff --git a/AtlasLootClassic/ItemDB/ItemDB.lua b/AtlasLootClassic/ItemDB/ItemDB.lua
@@ -404,6 +404,7 @@ local SpecialMobList = {
 	elite = format(ATLAS_TEXTURE, "nameplates-icon-elite-gold"),
 	quest = format(ATLAS_TEXTURE, "QuestNormal"),
 	questTurnIn = format(ATLAS_TEXTURE, "QuestTurnin"),
+	boss = format(PATH_TEXTURE, "Interface\\TargetingFrame\\UI-TargetingFrame-Skull"),
 }
 
 --- Get the content Type
@@ -464,12 +465,20 @@ function ItemDB.ContentProto:GetNameForItemTable(index, raw)
 			addEnd = addEnd.." "..format(CONTENT_PHASE_FORMAT, index.ContentPhase)
 		end
 		if IsMapsModuleAviable() and index.AtlasMapBossID then
-			addStart = "|cffffffff"..index.AtlasMapBossID..")|r "
+			addStart = addStart.."|cffffffff"..index.AtlasMapBossID..")|r "
+		end
+		if AtlasLoot.db.enableBossLevel and index.Level then
+			if type(index.Level) == "table" then
+				addStart = addStart.."|cff808080<"..index.Level[1].." - "..index.Level[2]..">|r "
+			elseif index.Level == 999 then
+				addStart = addStart..SpecialMobList.boss
+			else
+				addStart = addStart.."|cff808080<"..(index.Level == 999 and SpecialMobList.boss or index.Level)..">|r "
+			end
 		end
 		if index.specialType and SpecialMobList[index.specialType] then
 			addStart = addStart..SpecialMobList[index.specialType]
 		end
-
 	end
 	if index.name then
 		return addStart..index.name..addEnd

diff --git a/AtlasLootClassic/db.lua b/AtlasLootClassic/db.lua
@@ -2,6 +2,7 @@ AtlasLoot.AtlasLootDBDefaults = {
 	profile = {
 		showIDsInTT = false,
 		showLvlRange = true,
+		enableBossLevel = false,
 		showMinEnterLvl = false,
 		enableWoWHeadIntegration = true,
 		useEnglishWoWHead = false,

diff --git a/AtlasLootClassic_Collections/data.lua b/AtlasLootClassic_Collections/data.lua
@@ -318,6 +318,7 @@ data["Azuregos"] = {
 		{ -- AAzuregos
 			name = AL["Azuregos"],
 			npcId = 6109,
+			Level = 999,
 			DisplayIDs = {{11460}},
 			AtlasMapBossID = 1,
 			[NORMAL_DIFF] = {
@@ -357,6 +358,7 @@ data["LordKazzak"] = {
 		{ -- KKazzak
 			name = AL["Lord Kazzak"],
 			npcId = 12397,
+			Level = 999,
 			DisplayIDs = {{12449}},
 			AtlasMapBossID = 1,
 			[NORMAL_DIFF] = {
@@ -386,6 +388,7 @@ data["DragonsOfNightmare"] = {
 		{ -- DLethon
 			name = AL["Lethon"],
 			npcId = 14888,
+			Level = 999,
 			DisplayIDs = {{15365}},
 			[NORMAL_DIFF] = {
 				{ 1,  20628 }, -- Deviate Growth Cap
@@ -411,6 +414,7 @@ data["DragonsOfNightmare"] = {
 		{ -- DEmeriss
 			name = AL["Emeriss"],
 			npcId = 14889,
+			Level = 999,
 			DisplayIDs = {{15366}},
 			[NORMAL_DIFF] = {
 				{ 1,  20623 }, -- Circlet of Restless Dreams
@@ -435,6 +439,7 @@ data["DragonsOfNightmare"] = {
 		{ -- DTaerar
 			name = AL["Taerar"],
 			npcId = 14890,
+			Level = 999,
 			DisplayIDs = {{15363}, {15367}},
 			[NORMAL_DIFF] = {
 				{ 1,  20633 }, -- Unnatural Leather Spaulders
@@ -459,6 +464,7 @@ data["DragonsOfNightmare"] = {
 		{ -- DYsondre
 			name = AL["Ysondre"],
 			npcId = 14887,
+			Level = 999,
 			DisplayIDs = {{15364}},
 			[NORMAL_DIFF] = {
 				{ 1,  20637 }, -- Acid Inscribed Pauldrons
@@ -696,7 +702,6 @@ data["Tabards"] = {
 	},
 }
 
-
 data["GurubashiArena"] = {
 	name = AL["Gurubashi Arena"],
 	ContentType = WORLD_EVENT_CONTENT,