Merge branch 'development' into pr/Anyalah/398

Hoizame · Hoizame · commit 046feb689fad · 2023-10-22T16:11:05.000+02:00
diff --git a/AtlasLootClassic/AtlasLootClassic_Vanilla.toc b/AtlasLootClassic/AtlasLootClassic_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## SavedVariables: AtlasLootClassicDB
diff --git a/AtlasLootClassic/AtlasLootClassic_Wrath.toc b/AtlasLootClassic/AtlasLootClassic_Wrath.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 30404
+## Interface: 30404
 ## Author: Lag
 ## Version: @project-version@
 ## SavedVariables: AtlasLootClassicDB
diff --git a/AtlasLootClassic/Data/Companion.lua b/AtlasLootClassic/Data/Companion.lua
@@ -666,11 +666,12 @@ local EventFrame = CreateFrame("FRAME")
 EventFrame:RegisterEvent("COMPANION_LEARNED")
 EventFrame:RegisterEvent("COMPANION_UNLEARNED")
 EventFrame:RegisterEvent("COMPANION_UPDATE")
+
 local function UpdateKnownCompanions(typ)
     if GetNumCompanions(typ) <= 0 then return end
-    
+
 	if typ == "MOUNT" then
-	  
+
       mountIDs = C_MountJournal.GetMountIDs() --List of all avalible MountIDs
       mountCounter = 1 --loop counter
       while mountCounter <= #mountIDs do
@@ -681,7 +682,7 @@ local function UpdateKnownCompanions(typ)
 	else
       for i = 1, GetNumCompanions(typ) do
         local creatureID = GetCompanionInfo(typ, i) -- creatureID, creatureName, spellID, icon, active
-        
+
 	  	COLLECTED_COMPANIONS[creatureID] = true
       end
 	end
@@ -696,6 +697,12 @@ local function EventFrame_OnEvent(frame, event, arg1)
 end
 EventFrame:SetScript("OnEvent", EventFrame_OnEvent)
 
+if C_MountJournal then
+
+else
+
+end
+
 -- first companion scan
 local function OnInit()
     EventFrame_OnEvent()
diff --git a/AtlasLootClassic/Documentation/Release_Notes.md b/AtlasLootClassic/Documentation/Release_Notes.md
@@ -7,7 +7,7 @@ This mod is distributed under Version 2 of the GPL.  A copy of the GPL is includ
 
 - Add Defiler Scourgestone Vendor
 - Update Dalaran Vendor
-- #397, #388 Update to use new Mount API 
+- #397, #388 Update to use new Mount API
 - #396 Added "Maiden of Grief" Missing items in Titan Rune Beta - Halls of Stone
 - #395 Fixed "King Dred" Wrong loot in Titan Rune Beta - Drak'Tharon Keep
 - #394 Fixed "The Prophet Tharon'ja" Wrong loot in Titan Rune Beta - Drak'Tharon Keep
diff --git a/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Vanilla.toc b/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Wrath.toc b/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Wrath.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 30402
+﻿## Interface: 30403
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_Collections/data-wrath.lua b/AtlasLootClassic_Collections/data-wrath.lua
@@ -1752,11 +1752,11 @@ data["HalloweenWrath"] = {
 		{ -- SMHeadlessHorseman
 			name = C_Map_GetAreaInfo(796).." - "..AL["Headless Horseman"],
 			[NORMAL_DIFF] = {
-                { 1, 49121 }, -- Ring of Ghoulish Glee
-                { 2, 49123 }, -- The Horseman's Seal
-                { 3, 49124 }, -- Wicked Witch's Band
-                { 5, 49126 }, -- The Horseman's Horrific Helm
-                { 6, 49128 }, -- The Horseman's Baleful Blade
+                { 1, 211817 }, -- Ring of Ghoulish Glee
+                { 2, 211844 }, -- The Horseman's Seal
+                { 3, 211847 }, -- Wicked Witch's Band
+                { 5, 211850 }, -- The Horseman's Horrific Helm
+                { 6, 211851 }, -- The Horseman's Baleful Blade
                 { 8, 33292 }, -- Hallowed Helm
                 { 10, 34068 }, -- Weighted Jack-o'-Lantern
                 { 12, 33277 }, -- Tome of Thomas Thomson
diff --git a/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting_Vanilla.toc b/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting_Vanilla.toc
@@ -1,4 +1,4 @@
-## Interface: 11403
+## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_Crafting/data-wrath.lua b/AtlasLootClassic_Crafting/data-wrath.lua
@@ -1241,7 +1241,7 @@ data["JewelcraftingWrath"] = {
 			[NORMAL_DIFF] = {
 				{ 1, 66498 },	-- Sparkling Majestic Zircon
 				{ 2, 66497 },	-- Solid Majestic Zircon
-				{ 3, 66498 },	-- Lustrous Majestic Zircon
+				{ 3, 66500 },	-- Lustrous Majestic Zircon
 				{ 4, 66499 },	-- Stormy Majestic Zircon
 				{ 6, 53953 },	-- Sparkling Sky Sapphire
 				{ 7, 53952 },	-- Solid Sky Sapphire
diff --git a/AtlasLootClassic_Data/AtlasLootClassic_Data_Vanilla.toc b/AtlasLootClassic_Data/AtlasLootClassic_Data_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_Data/source.lua b/AtlasLootClassic_Data/source.lua
@@ -3695,7 +3695,12 @@ local SOURCE_DATA = {
 [51805] = {4,14,1},
 [51806] = {4,14,1},
 [51807] = {4,14,1},
-[51808] = {4,14,1}
+[51808] = {4,14,1},
+[211817] = {9,8,1},
+[211844] = {9,8,1},
+[211847] = {9,8,1},
+[211850] = {9,8,1},
+[211851] = {9,8,1}
 }
 }
 --##END-DATA##
diff --git a/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids_Vanilla.toc b/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_DungeonsAndRaids/data.lua b/AtlasLootClassic_DungeonsAndRaids/data.lua
@@ -1313,11 +1313,11 @@ data["ScarletMonasteryGraveyard"] = {
 			AtlasMapBossID = nil,
 			ExtraList = true,
 			[NORMAL_DIFF] = {
-				{ 1, 49121 }, -- Ring of Ghoulish Glee
-				{ 2, 49123 }, -- The Horseman's Seal
-				{ 3, 49124 }, -- Wicked Witch's Band
-				{ 5, 49126 }, -- The Horseman's Horrific Helm
-				{ 6, 49128 }, -- The Horseman's Baleful Blade
+				{ 1, 211817 }, -- Ring of Ghoulish Glee
+				{ 2, 211844 }, -- The Horseman's Seal
+				{ 3, 211847 }, -- Wicked Witch's Band
+				{ 5, 211850 }, -- The Horseman's Horrific Helm
+				{ 6, 211851 }, -- The Horseman's Baleful Blade
 				{ 8, 33292 }, -- Hallowed Helm
 				{ 10, 34068 }, -- Weighted Jack-o'-Lantern
 				{ 12, 33277 }, -- Tome of Thomas Thomson
diff --git a/AtlasLootClassic_Factions/AtlasLootClassic_Factions_Vanilla.toc b/AtlasLootClassic_Factions/AtlasLootClassic_Factions_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_Factions/data-wrath.lua b/AtlasLootClassic_Factions/data-wrath.lua
@@ -405,9 +405,11 @@ data["TheAshenVerdict"] = {
 				{ 21, 49958 },	-- Pattern: Blessed Cenarion Boots (p7 450)
 				{ 22, 49963 },	-- Pattern: Earthsoul Boots (p7 450)
 				{ 23, 49961 },	-- Pattern: Footpads of Impending Death (p7 450)
-				{ 25, 49966 },	-- Pattern: Rock-Steady Treads (p7 450)
+				{ 24, 49966 },	-- Pattern: Rock-Steady Treads (p7 450)
 				{ 26, 49954 },	-- Pattern: Deathfrost Boots (p8 450)
 				{ 27, 49956 },	-- Pattern: Sandals of Consecration (p8 450)
+				{ 29, 52022 },	-- Plans: Shatter Rounds (p4 450)
+				{ 30, 52023 },	-- Plans: Iceblade Arrow (p4 450)
 			},
 		},
 		{ -- Friendly 5
diff --git a/AtlasLootClassic_Options/AtlasLootClassic_Options_Vanilla.toc b/AtlasLootClassic_Options/AtlasLootClassic_Options_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/AtlasLootClassic_PvP/AtlasLootClassic_PvP_Vanilla.toc b/AtlasLootClassic_PvP/AtlasLootClassic_PvP_Vanilla.toc
@@ -1,4 +1,4 @@
-﻿## Interface: 11403
+﻿## Interface: 11404
 ## Author: Lag
 ## Version: @project-version@
 ## Dependencies: AtlasLootClassic
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,15 +4,19 @@ 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.1.4 (Oct. 10, 2023)
+## v3.2.0 (Oct. 22, 2023)
 
+- update .toc version
+- fix lua error with companions
+- Hallow's End update PR #416
+- Fix epic blue gem id, add Ashen Verdict engineering PR #413
 - Add Defiler Scourgestone Vendor
 - Update Dalaran Vendor
-- #397, #388 Update to use new Mount API 
+- #397, #388 Update to use new Mount API
 - #396 Added "Maiden of Grief" Missing items in Titan Rune Beta - Halls of Stone
 - #395 Fixed "King Dred" Wrong loot in Titan Rune Beta - Drak'Tharon Keep
 - #394 Fixed "The Prophet Tharon'ja" Wrong loot in Titan Rune Beta - Drak'Tharon Keep
 - #393 Added Missing Leatherworking Fur Linings
 - #391 Added Enchanting Cloak Resistances (Arcane, Fire, Frost, Nature, Shadow), Removed Duplicates
-- #387 Fixed Incorrect Set Links for Death Knight Season 7 PvP Set  
-- #381 Added "Six Shared Loot Bosses" Missing items in Titan Rune Beta - Violet Hold
+- #387 Fixed Incorrect Set Links for Death Knight Season 7 PvP Set
+- #381 Added "Six Shared Loot Bosses" Missing items in Titan Rune Beta - Violet Hold

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Interface: 11403`
	`1`	`+## Interface: 11404`
`2`	`2`	`## Author: Lag`
`3`	`3`	`## Version: @project-version@`
`4`	`4`	`## SavedVariables: AtlasLootClassicDB`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Interface: 30404`
	`1`	`+## Interface: 30404`
`2`	`2`	`## Author: Lag`
`3`	`3`	`## Version: @project-version@`
`4`	`4`	`## SavedVariables: AtlasLootClassicDB`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Interface: 30402`
	`1`	`+## Interface: 30403`
`2`	`2`	`## Author: Lag`
`3`	`3`	`## Version: @project-version@`
`4`	`4`	`## Dependencies: AtlasLootClassic`
Original file line number	Diff line number	Diff line change
`@@ -3695,7 +3695,12 @@ local SOURCE_DATA = {`
`3695`	`3695`	`[51805] = {4,14,1},`
`3696`	`3696`	`[51806] = {4,14,1},`
`3697`	`3697`	`[51807] = {4,14,1},`
`3698`		`-[51808] = {4,14,1}`
	`3698`	`+[51808] = {4,14,1},`
	`3699`	`+[211817] = {9,8,1},`
	`3700`	`+[211844] = {9,8,1},`
	`3701`	`+[211847] = {9,8,1},`
	`3702`	`+[211850] = {9,8,1},`
	`3703`	`+[211851] = {9,8,1}`
`3699`	`3704`	`}`
`3700`	`3705`	`}`
`3701`	`3706`	`--##END-DATA##`