Merge pull request #349 from artscout/master

Enable archaeology + Quest DB + POIs

Carbonite/Data/MapWorldHotspots.lua

@@ -3,52 +3,75 @@ Nx.MapWorldHotspots = {
 }
 
 Nx.MapWorldHotspots2 = {
-		[1442] = "3990003ff1ff3991ff4662663994666650cc3995329ff799932ccc466333",
-		[1446] = "5320661992cc5323337993994cc6cc7ff1ff3ff8cc8cc732",
-		[1450] = "2cc1ff9ffccc",
-		[1411] = "5990007999ff5ff9ff732599",
-		[1419] = "5991335ff2665993999981334cc4cca65b32",
-		[1423] = "1330cce65865199932dff466399d98bff1ff",
-		[1427] = "066133c65d32",
-		[1431] = "5991ff9321991ff399ccb0cc0cc466dff7321ffb98ccb066266bffc651ff",
-		[1435] = "9990006653330cc333f328659ffb985ff3ff",
-		[1439] = "3330007ff4cc3334cc6cc0cc3335995ff0663335ff5990663336664cc2cc3339324665ff",
-		[1443] = "1ff0005990cc1ff0ccb983ff1ff4ccacc6cc1ffb98b982cc1ffe65a65199",
-		[1447] = "7ff0007991335ff1339983ff5995329ff1331ff666d984cc199b32dff4cc",
-		[1451] = "199133a65ecb",
-		[1412] = "5320663ff0664660cc4cc0664661336655995326cc5991995328655ff0cc3ff9327325ff",
-		[1416] = "5320cc4cc3335323ff5992662cc6667ff0cc2cc732c650cc0cc7ffe653ff0ccbff7321ffb98bff399266",
-		[1420] = "0661ffe657ff0669ffd32266b32c65266066",
-		[1424] = "8651ff3321ff2663ff932066266466c65333266799b321ff266999a650cc066a65c65133066b98b32399",
-		[1428] = "0cc333f32999",
-		[1432] = "2cc000b329ff2669ffb98399266d983ff199",
-		[1436] = "266000532133266133799466266599865532266acc9320cc266b989981ff266d983ff133",
-		[1440] = "0661ff5991ffdff3991991ff0663ff5ff1338654661ff0cc0665329ff066066599f321991ff732d321ff266932ccb1ff3ffb32b320cc732bff7ff199732d98532066",
-		[1444] = "1ff0668cc3991ff3ffd322661ff666c656cc1ffd325992cc",
-		[1448] = "7990663320cc6cc1333ff0666661994660cc5992665322cc5995324660665325994cc1335326cc3324cc532b984cc0cc5ffc653ff199666dff3990cc666ecb1ff0cc",
-		[1452] = "6660005ff4cc4664cc7ff3ff7998cc4cc0cc8659993ff1ff732b983992cc732e653320cc",
-		[1413] = "8650661990665990cc4663ff5994cc4cc0666665323ff3ff6669321ff133666a651991995ffbff1ff266666e65199066",
-		[1417] = "3993339981992cc4cca650662cc532bff1991996ccd327ff",
-		[1421] = "4660cc9324664665327991334666666658cc",
-		[1425] = "6661337323ff133532c657ff932d32466199",
-		[1429] = "0cc2667ff1ff0cc466e656cc333b32bff2cc333dff466133333f32199066",
-		[1433] = "133066d98e65",
-		[1437] = "066133f32bff7ffd32799066",
-		[1441] = "1331331991331332662660cc1333334cc0cc1333ff5ff1991335997991331336cce653ff9ffacc5994cc",
-		[1445] = "8cc0005990cc5320cc9322cc4663999ff9995ffd32865133",
-		[1449] = "2cc0009ffbff2ccbff998399",
-		[1418] = "6661338cc1ff000333f32b98",
-		[1422] = "5990005325995995995991ff4667996cc1ff4669998cc133532acc7ff266599d327991ff865f324cc066",
-		[1426] = "0cc266d326660cc8ccccb2cc0ccb98665333",
-		[1430] = "5320cc4667325327ff532599532d983ff066",
-		[1434] = "4660666cc0661990cc998e65",
-		[1438] = "000000ffffff",
-		[1453] = "000000f31aca000acad313ff000ec9bfd130",
-		[1455] = "12d000ecbdff266dffd92132",
+
+-- Kalimdor
+		[1411] = "5a91767969fd627a8a73253e",
+		[1412] = "5320843590634c80e34170794661515e15d15326cb5991975328655fe0cc3ff9317305fc",
+		[1413] = "82217327508c3321901e665ca8e0ab0c82795151f66116c652e81a60e1cd5a99c162b202679b6b5391667f7ccb3b420e",
+		[1438] = "234040acff83",
+		[1439] = "3320007fe4cb3324c86cc0cc3325995fe0623325ff5990663326665052c337b9194665fa",
+		[1440] = "0661ff5991ffe074761a01310663ff5fe1338654661f90cc0665329fb060066599f301991ff732d301fd265932ccc1ff3ffb32b320cb730bee566163965cfc2d80dcc88bb621016f",
+		[1441] = "13313219812d1332652650c61333334cc0cc1333ff5ff19913359879512f1336cbe653fa9ffacc5974cc",
+		[1442] = "22000f42e2251ff20f5c626c39946667625038868997159c941c173de2bb",
+		[1443] = "1fd0005960cc1fd0ccb963fe1fd4ccac86ca1fdb98b962c61fde64a61199",
+		[1444] = "1ff0668ca3981ff3ffd2c2651ff64dc436c21ffce75972cb",
+		[1445] = "8dc0005a11135340fb9322cb4663999fd9985ffd3186512e",
+		[1446] = "5320661992c95323337963994cc6cc7ff1ff3ff8cb8cc41a",
+		[1447] = "56e0599282e449e32ea6415a3ad48db5e2411ad603da057e12cb11dfb4c8",
+		[1448] = "7970662c30c66cc13339b0646661974030cb5992654d72df5995324660605325993e614b5326cc2f94cc532b984cb0c65ffc653b019f666dfd3990c8666ecb1ff0c7",
+		[1449] = "2cc0009fbbfe2ccbfe999397",
+		[1450] = "2cc1f9a16c0d",
+		[1451] = "198133a8dc84",
+		[1452] = "5eb0006cb6832fc6659b05052f4b4215a09e7d5b5644428981fda82ef12d",
+		[1454] = "35b038b48ebe",
 		[1456] = "1ff0664cc12e1ff199c654663975ffac8260397865865398666bfe5993f9",
 		[1457] = "000000bfffff",
+		[1943] = "000066ffdf98",
+		[1947] = "000000bfefff",
+		[1950] = "000000ffff98",
+		[198] = "2b62138d323315d435aa673f401b057393e6b466ed4033e4",
+		[199] = "5bf2441092ad580c502bf2e85d14a626d21289f6472df1b96655452453c564f8ef2234c44ad1061c913f6c63bd0510f5",
+		[249] = "3ee13672ad52afe65535a827",
+		[327] = "3cd0db7c9e8d",
+-- Eastern Kingdoms
+		[1417] = "29f33b9d019821b4baad509d1b8521c891d61346c3d3f879",
+		[1418] = "6661338cb1f90e432cf1695a",
+		[1419] = "59713157727457e38f5f81504cc4c979aadf",
+		[1420] = "0661ffe657ff0669ffd32248",
+		[1421] = "4630cc932466463532798132588655535728",
+		[1422] = "5c600052f5995975995931fe4657996d62094659978cb133507acb8162665d8d1174f194",
+		[1423] = "1320cbe63864196932dfe466397d96c04142",
+		[1424] = "6671002bd2c054e38c6c212141649d80a3203fe79081c26040e9997db0e840ba6d74a1223a8b8f72036c",
+		[1425] = "6661337323ff153521d5d76b924c5c5d6255",
+		[1526] = "020165e5d76c0cc8ccd9d2d10ccb986f93d5",
+		[1427] = "060132c65d2d",
+		[1428] = "0bb333f2793c",
+		[1429] = "0cc2667f91ff0cc464e026df333b2fb9c2c0384dd53fe15f",
+		[1430] = "53a1d83d96515327fe4df5df",
+		[1431] = "5c91f49771c01eb399ccc0cb0cc464dc072524bb73c5c24c",
+		[1432] = "2ca0006c5a1327e9c3b9832e1eac9a4572b595b25c312850",
+		[1433] = "1b6062c77d25",
+		[1434] = "5291946030a218822a9a37b184198442832a",
+		[1435] = "aae0008a1a9e1233a4fff79ea37af9842476",
+		[1436] = "265000520ffe75911a29b49a7795473145f5761b2043025f",
+		[1437] = "06612eb36b08709c2949c11a",
+		[1453] = "000000f31aca000acad313ff000ec9bfd130",
+		[1455] = "12d000ecbdff266dffd92132",
 		[1458] = "6660008c7fff",
---Outland
+		[1941] = "1ff066c63dfe",
+		[1942] = "064130f31d95",
+		[124] = "3fe3ff7fd7fd",
+		[201] = "39c000a429b579769d6236c7",
+		[204] = "0d3000a00fff921107430633",
+		[205] = "6321143887dc46370b8927ff",
+		[210] = "30511b5a1ff288b401395cd4",
+		[217] = "1d7000597ffe74b1df2c0fff9f23033ddf19",
+		[218] = "34c13d898d66",
+		[241] = "546000887ea62e50f927ca02",
+		[244] = "3fd3ff7fe7fc",
+		[245] = "3ff3ff7fe7fc",
+
+-- Outland
 		[1944] = "399000c65130198130e63b2f399c64c65198532dfeacc0cb5ffecb9fc064999f316650cb",
 		[1946] = "0c90005323980c9393d967fe932b975320639ffbfe466194a65d983ff063accdff3990cb",
 		[1948] = "5310649ff2623332ccbff4613ff732b32863",
@@ -70,6 +93,12 @@ Nx.MapWorldHotspots2 = {
 		[125] = "1e50cab32b764369028908ed",
 		[127] = "2a73ca5649260802cb4317170ec18a33a1997d54e2779887",
 		[170] = "3ff0007fcc0d",
+		[338] = "000000ffffff",
+-- Maelstrom
+		[174] = "20b030cebff6",
+		[194] = "000000ffeffe",
+		[207] = "000000ffefff",
+		[276] = "000000ffffff",
 }
 
 -------------------------------------------------------------------------------

Carbonite/Locales/ruRU/Map.lua

@@ -30,7 +30,7 @@ L["Show Mining Locations"] = "Показать расположение руд"
 L["Show Artifact Locations"] = "Показать расположение артифактов"
 L["Show Guide POIs"] = "Показать POI"
 L["Show Custom Icons"] = "Показать пользовательские значки"
-L["Show World Quests"] = true
+L["Show World Quests"] = "Показать задания мира"
 L["Show Archaeology Blobs"] = "Показать зоны археологии"
 L["Show Quest Blobs"] = "Показать точки квестов"
 L["Show Unexplored Areas"] = "Показать неиследованные территории"

Carbonite/NxMap.lua

@@ -822,10 +822,10 @@ function Nx.Map:Create (index)
 	item:SetChecked (Nx.db.char.Map, "ShowCustom")
 	local item = showMenu:AddItem(0, L["Show Instance Raid Bosses"], func, m)
 	item:SetChecked (Nx.db.char.Map, "ShowRaidBoss")
---	local item = showMenu:AddItem(0, L["Show World Quests"], func, m)
---	item:SetChecked (Nx.db.char.Map, "ShowWorldQuest")
---	local item = showMenu:AddItem(0, L["Show Archaeology Blobs"], func, m)	
---	item:SetChecked (Nx.db.char.Map, "ShowArchBlobs")	
+	local item = showMenu:AddItem(0, L["Show World Quests"], func, m)
+	item:SetChecked (Nx.db.char.Map, "ShowWorldQuest")
+	local item = showMenu:AddItem(0, L["Show Archaeology Blobs"], func, m)	
+	item:SetChecked (Nx.db.char.Map, "ShowArchBlobs")	
 	local item = showMenu:AddItem(0, L["Show Quest Blobs"], func, m)
 	item:SetChecked (Nx.db.char.Map, "ShowQuestBlobs")
 
@@ -1190,6 +1190,27 @@ function Nx.Map:Create (index)
 		m:AddIconRect ("TestZR", i, 5, i+1, 6, "00ff0080")
 	end
 --]]
+	local questwin = CreateFrame("QuestPOIFrame")
+	m.QuestWin = questwin
+	m.QuestWin:SetParent(m.TextScFrm:GetScrollChild())
+	m.QuestWin:Hide()
+	--m.QuestWin:SetSize(WorldMapButton:GetSize())
+	m.QuestWin:SetFillAlpha(255 * m.QuestAlpha)
+	m.QuestWin:SetBorderAlpha(255 * m.QuestAlpha)
+	m.QuestWin:SetFillTexture([[Interface\WorldMap\UI-QuestBlob-Inside]])
+	m.QuestWin:SetBorderTexture([[Interface\WorldMap\UI-QuestBlob-Outside]])
+	m.QuestWin:SetBorderScalar(0.15)
+
+	local arch = CreateFrame("ArchaeologyDigSiteFrame")
+	m.Arch = arch
+	m.Arch:SetParent(m.TextScFrm:GetScrollChild())
+	m.Arch:Hide()
+	--m.Arch:SetSize(WorldMapButton:GetSize())
+	m.Arch:SetFillAlpha(255 * m.ArchAlpha)
+	m.Arch:SetBorderAlpha(255 * m.ArchAlpha )
+	m.Arch:SetFillTexture( [[Interface\WorldMap\UI-ArchaeologyBlob-Inside]] )
+	m.Arch:SetBorderTexture( [[Interface\WorldMap\UI-ArchaeologyBlob-Outside]] )
+	m.Arch:SetBorderScalar( 0.15 )
 
 	Nx.Map.RMapId = 9000		-- Safe default
 	Nx.Map.UpdateMapID = 9000
@@ -1563,6 +1584,21 @@ function Nx.Map:UpdateWorldMap()
 			v:SetScale (.001)
 		end
 	end
+	if not InCombatLockdown() then
+		self.Arch:DrawNone();
+		if Nx.db.char.Map.ShowArchBlobs then
+			for i = 1, ArchaeologyMapUpdateAll(Nx.Map:GetCurrentMapAreaID()) do
+				self.Arch:DrawBlob(ArcheologyGetVisibleBlobID(i), true)
+			end
+			self:ClipZoneFrm( self.Cont, self.Zone, self.Arch, 1 )
+			self.Arch:SetFrameLevel(self.Level)
+			self.Arch:SetFillAlpha(255 * self.ArchAlpha)
+			self.Arch:SetBorderAlpha( 255 * self.ArchAlpha )
+			self.Arch:Show()
+		else
+			self.Arch:Hide()
+		end
+	end
 end
 
 --------
@@ -1915,7 +1951,7 @@ function Nx.Map:MinimapOwnInit()
 
 	mm:SetParent (self.Frm)
 
-	--self.MMFrm:SetQuestBlobRingAlpha(1)
+	self.MMFrm:SetQuestBlobRingAlpha(1)
 	self.MMFrm:SetPOIArrowTexture("Interface\\Addons\\Carbonite\\Gfx\\Map\\32Transparent")
 	self.MMFrm:SetStaticPOIArrowTexture("Interface\\Addons\\Carbonite\\Gfx\\Map\\32Transparent")
 	mm:SetScript ("OnMouseDown", self.MinimapOnMouseDown)
@@ -3586,17 +3622,17 @@ function Nx.Map:OnEvent (event, ...)
 		if (Nx.db.profile.Map.HideCombat and win:IsSizeMax()) then
 			map.Win.Frm:Hide()
 		end
-		--map.Arch:Hide()
-		--map.QuestWin:Hide()
-		--map.Arch:SetParent(nil)
-		--map.QuestWin:SetParent(nil)
-		--map.Arch:ClearAllPoints()
-		--map.QuestWin:ClearAllPoints()
+		map.Arch:Hide()
+		map.QuestWin:Hide()
+		map.Arch:SetParent(nil)
+		map.QuestWin:SetParent(nil)
+		map.Arch:ClearAllPoints()
+		map.QuestWin:ClearAllPoints()
 	elseif event == "PLAYER_REGEN_ENABLED" then
-		--map.Arch:SetParent(map.TextScFrm:GetScrollChild())		
-		--map.QuestWin:SetParent(map.TextScFrm:GetScrollChild())		
-		--map.Arch:Show()
-		--map.QuestWin:Hide()
+		map.Arch:SetParent(map.TextScFrm:GetScrollChild())		
+		map.QuestWin:SetParent(map.TextScFrm:GetScrollChild())		
+		map.Arch:Show()
+		map.QuestWin:Hide()
 	elseif event == "ZONE_CHANGED_NEW_AREA" then
 		-- DETECT EXIT INSTANCE
 		if Nx.Map.NInstMapId then 
@@ -4816,9 +4852,9 @@ function Nx.Map:Update (elapsed)
 	--local poiNum = 0 --GetNumMapLandmarks()
 	if not IsAltKeyDown() then
 		--for i = 1, poiNum do
-		local tPOIs = {}--C_TaxiMap.GetTaxiNodesForMap(rid)
+		local tPOIs = C_TaxiMap.GetTaxiNodesForMap(rid)
 		local pPOIs = {}--C_PetInfo.GetPetTamersForMap(rid)
-		local dPOIs = {}--C_ResearchInfo.GetDigSitesForMap(rid)
+		local dPOIs = C_ResearchInfo.GetDigSitesForMap(rid)
 
 		local zPOIs = Nx.ArrayConcat(tPOIs, pPOIs, dPOIs)