Merge pull request #261 from Hoizame/development

Development
Hoizame · Oct 8, 2022 · 76abc1e · 76abc1e
2 parents dd34d79 + ad012c6
commit 76abc1e
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 49 deletions.
diff --git a/AtlasLootClassic/Data/AutoSelect.lua b/AtlasLootClassic/Data/AutoSelect.lua
@@ -1088,14 +1088,16 @@ function AutoSelect:AddInstanceTable(module, instanceAlID, iniTab)
     if not iniTab then return end
     local instanceID = iniTab.InstanceID
     if not module or not instanceAlID or not instanceID then return end
-    if not AutoSelectSave[instanceID] then
+    --if not AutoSelectSave[instanceID] then
+		-- AutoSelect now overwrite multiple instanceID's and use the last one added
+		-- That prevent problems with instances like naxx
         AutoSelectSave[instanceID] = {
             base = { module, instanceAlID }
         }
-    end
-    local content = AutoSelectSave[instanceID]
+    --end
 
     if iniTab.SubAreaIDs then
+		local content = AutoSelectSave[instanceID]
         if not content.sub then
             content.sub = {}
             content.subList = {}

diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -2,6 +2,16 @@
 
 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.
 
+## v3.0.5 (Oct, 04, 2022)
+
+- add missing prismatic gems #257
+- add missing Pattern: Dragonscale Ammo Pouch #255
+- add Pattern: Nerubian Reinforced Quiver #254
+- add Deadman's Hand for Arcanist Doan (bcc)
+- add Burning Skull Pendant into Gundrak normal trash
+- fix Gundrak level range 71, 76, 78 #252
+- Include InstanceIDs in Wrath DungeonsAndRaids #256
+
 ## v3.0.4 (Oct, 01, 2022)
 
 - fix lua error with ruRU clients

diff --git a/AtlasLootClassic_Crafting/data-wrath.lua b/AtlasLootClassic_Crafting/data-wrath.lua
@@ -1211,42 +1211,74 @@ data["JewelcraftingWrath"] = {
 		{
 			name = format(GEM_FORMAT1, ALIL["Orange"]),
 			[NORMAL_DIFF] = {
-				{ 1, 66579 },	-- Champion's Ametrine
-				{ 2, 66568 },	-- Deadly Ametrine
-				{ 3, 66584 },	-- Deft Ametrine
-				{ 4, 66583 },	-- Fierce Ametrine
-				{ 5, 66567 },	-- Inscribed Ametrine
-				{ 6, 66585 },	-- Lucent Ametrine
-				{ 7, 66569 },	-- Potent Ametrine
-				{ 8, 66574 },	-- Reckless Ametrine
-				{ 9, 66586 },	-- Resolute Ametrine
-				{ 10, 66582 },	-- Resplendent Ametrine
-				{ 11, 66581 },	-- Stalwart Ametrine
-				{ 12, 66571 },	-- Willful Ametrine
-				{ 16, 53977 },	-- Champion's Monarch Topaz
-				{ 17, 53979 },	-- Deadly Monarch Topaz
-				{ 18, 53991 },	-- Deft Monarch Topaz
-				{ 19, 54019 },	-- Fierce Monarch Topaz
-				{ 20, 53975 },	-- Inscribed Monarch Topaz
-				{ 21, 53981 },	-- Lucent Monarch Topaz
-				{ 22, 53984 },	-- Potent Monarch Topaz
-				{ 23, 53987 },	-- Reckless Monarch Topaz
-				{ 24, 54023 },	-- Resolute Monarch Topaz
-				{ 25, 53978 },	-- Resplendent Monarch Topaz
-				{ 26, 53993 },	-- Stalwart Monarch Topaz
-				{ 27, 53986 },	-- Willful Monarch Topaz
-				{ 101, 53874 },	-- Champion's Huge Citrine
-				{ 102, 53877 },	-- Deadly Huge Citrine
-				{ 103, 53880 },	-- Deft Huge Citrine
-				{ 104, 53876 },	-- Fierce Huge Citrine
-				{ 105, 53872 },	-- Inscribed Huge Citrine
-				{ 106, 53879 },	-- Lucent Huge Citrine
-				{ 107, 53882 },	-- Potent Huge Citrine
-				{ 108, 53885 },	-- Reckless Huge Citrine
-				{ 109, 53893 },	-- Resolute Huge Citrine
-				{ 110, 53875 },	-- Resplendent Huge Citrine
-				{ 111, 53891 },	-- Stalwart Huge Citrine
-				{ 112, 53884 },	-- Willful Huge Citrine
+				{ 1, 66576 },   -- Accurate Ametrine
+				{ 2, 66579 },	-- Champion's Ametrine
+				{ 3, 66568 },	-- Deadly Ametrine
+				{ 4, 66584 },	-- Deft Ametrine
+				{ 5, 66571 },	-- Durable Ametrine
+				{ 6, 66580 },	-- Empowered Ametrine
+				{ 7, 66572 },	-- Etched Ametrine
+				{ 8, 66583 },	-- Fierce Ametrine
+				{ 9, 66578 },   -- Glimmering Ametrine
+				{ 10, 66575 },  -- Glinting Ametrine
+				{ 11, 66567 },	-- Inscribed Ametrine
+				{ 12, 66585 },	-- Lucent Ametrine
+				{ 13, 66566 },  -- Luminous Ametrine
+				{ 14, 66569 },	-- Potent Ametrine
+				{ 15, 66573 },	-- Pristine Ametrine
+				{ 16, 66574 },	-- Reckless Ametrine
+				{ 17, 66586 },	-- Resolute Ametrine
+				{ 18, 66582 },	-- Resplendent Ametrine
+				{ 19, 66581 },	-- Stalwart Ametrine
+				{ 20, 66587 },  -- Stark Ametrine
+				{ 21, 66570 },  -- Veiled Ametrine
+				{ 22, 66577 },	-- Wicked Ametrine
+				-- blue
+				{ 101, 53994 }, -- Accurate Monarch Topaz
+				{ 102, 53977 },	-- Champion's Monarch Topaz
+				{ 103, 53979 },	-- Deadly Monarch Topaz
+				{ 104, 53991 },	-- Deft Monarch Topaz
+				{ 105, 53986 },	-- Durable Monarch Topaz
+				{ 106, 53990 },	-- Empowered Monarch Topaz
+				{ 107, 53976 }, -- Etched Monarch Topaz
+				{ 108, 54019 },	-- Fierce Monarch Topaz
+				{ 109, 53993 }, -- Glimmering Monarch Topaz
+				{ 110, 53980 }, -- Glinting Monarch Topaz
+				{ 111, 53975 },	-- Inscribed Monarch Topaz
+				{ 112, 53981 },	-- Lucent Monarch Topaz
+				{ 113, 53983 }, -- Luminous Monarch Topaz
+				{ 114, 53984 },	-- Potent Monarch Topaz
+				{ 115, 53989 }, -- Pristine Monarch Topaz
+				{ 116, 53987 },	-- Reckless Monarch Topaz
+				{ 117, 54023 },	-- Resolute Monarch Topaz
+				{ 118, 53978 },	-- Resplendent Monarch Topaz
+				{ 119, 53993 },	-- Stalwart Monarch Topaz
+				{ 120, 53991 }, -- Stark Monarch Topaz
+				{ 121, 53985 }, -- Veiled Monarch Topaz
+				{ 122, 53988 }, -- Wicked Monarch Topaz
+				-- green
+				{ 201, 53892 }, -- Accurate Huge Citrine
+				{ 202, 53874 },	-- Champion's Huge Citrine
+				{ 203, 53877 },	-- Deadly Huge Citrine
+				{ 204, 53880 },	-- Deft Huge Citrine
+				{ 205, 53884 }, -- Durable Huge Citrine
+				{ 206, 53888 }, -- Empowered Huge Citrine
+				{ 207, 53873 }, -- Etched Huge Citrine
+				{ 208, 53876 },	-- Fierce Huge Citrine
+				{ 209, 53891 }, -- Glimmering Huge Citrine
+				{ 210, 53878 }, -- Glinting Huge Citrine
+				{ 211, 53872 },	-- Inscribed Huge Citrine
+				{ 212, 53879 },	-- Lucent Huge Citrine
+				{ 213, 53881 }, -- Luminous Huge Citrine
+				{ 214, 53882 },	-- Potent Huge Citrine
+				{ 215, 53887 }, -- Prisinte Huge Citrine
+				{ 216, 53885 },	-- Reckless Huge Citrine
+				{ 217, 53893 },	-- Resolute Huge Citrine
+				{ 218, 53875 },	-- Resplendent Huge Citrine
+				{ 219, 53891 },	-- Stalwart Huge Citrine
+				{ 220, 53889 }, -- Stark Huge Citrine
+				{ 221, 53883 },	-- Veiled Huge Citrine
+				{ 222, 53886 }, -- Wicked Huge Citrine
 			}
 		},
 		{

diff --git a/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua b/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua
@@ -2549,7 +2549,7 @@ data["HallsOfReflection"] = {
 
 data["NaxxramasWrath"] = {
 	MapID = 3456,
-	InstanceID = 533,
+	InstanceID = AtlasLoot:GameVersion_LT(AtlasLoot.WRATH_VERSION_NUM,533,nil),
 	AtlasModule = ATLAS_MODULE_NAME,
 	AtlasMapID = "Naxxramas",
 	AtlasMapFile = "Naxxramas",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,7 @@ This mod is distributed under Version 2 of the GPL.  A copy of the GPL is includ
 
 [Changelog history](https://github.com/Hoizame/AtlasLootClassic/blob/master/AtlasLootClassic/Documentation/Release_Notes.md)
 
-## v3.0.5 (Oct, 04, 2022)
-
-- add missing prismatic gems #257
-- add missing Pattern: Dragonscale Ammo Pouch #255
-- add Pattern: Nerubian Reinforced Quiver #254
-- add Deadman's Hand for Arcanist Doan (bcc)
-- add Burning Skull Pendant into Gundrak normal trash
-- fix Gundrak level range 71, 76, 78 #252
-- Include InstanceIDs in Wrath DungeonsAndRaids #256
+## v3.0.6 (Oct, 08, 2022)
+
+- fix classic Naxxramas opens when in Wotlk #260
+- add missing orange gems pr #259