# HG changeset patch
# User Nenue
# Date 1504594704 14400
# Node ID e8b6c5433128407bfb6336b83e909e01c1d4bdcf
# Parent f6ef9a9f5476fda6d0c17fa453578efd13f7c375
7.3 Updates
diff -r f6ef9a9f5476 -r e8b6c5433128 ClassPlanShipments.lua
--- a/ClassPlanShipments.lua Tue Jul 25 12:38:27 2017 -0400
+++ b/ClassPlanShipments.lua Tue Sep 05 02:58:24 2017 -0400
@@ -114,7 +114,7 @@
print('Talents:')
if (talentTrees) then
for treeIndex, treeID in ipairs(talentTrees) do
- local _, _, tree = C_Garrison.GetTalentTreeInfoForID(garrisonType, treeID);
+ local _, _, tree = C_Garrison.GetTalentTreeInfoForID(treeID);
for talentIndex, talent in ipairs(tree) do
local showTalent = false;
if (talent.isBeingResearched) or (talent.id == completeTalentID) then
diff -r f6ef9a9f5476 -r e8b6c5433128 FlightMap.lua
--- a/FlightMap.lua Tue Jul 25 12:38:27 2017 -0400
+++ b/FlightMap.lua Tue Sep 05 02:58:24 2017 -0400
@@ -82,12 +82,13 @@
local scale1, scale2, scale3 = unpack(db.Config.FlightMapScalingLimits)
local mapAreaID = self:GetMap():GetMapID();
+ print(mapAreaID)
WorldPlanQuests.isStale = true
for zoneIndex = 1, C_MapCanvas.GetNumZones(mapAreaID) do
local zoneMapID, zoneName, zoneDepth, left, right, top, bottom = C_MapCanvas.GetZoneInfo(mapAreaID, zoneIndex);
- print(zoneMapID, zoneName)
+ print(zoneMapID, zoneName, self:GetTransformFlags())
if zoneDepth <= 1 then -- Exclude subzones
- local taskInfo = C_TaskQuest.GetQuestsForPlayerByMapID(zoneMapID, mapAreaID);
+ local taskInfo = C_TaskQuest.GetQuestsForPlayerByMapID(zoneMapID, mapAreaID, self:GetTransformFlags());
if taskInfo then
for i, info in ipairs(taskInfo) do
@@ -96,7 +97,7 @@
local pin = WorldPlanQuests:AcquirePin(info, zoneMapID)
if pin then
- print(pin:GetID(), pin.used, pin.filtered)
+ --print(pin:GetID(), pin.used, pin.filtered)
if pin.canShow then
pinsToRemove[info.questId] = nil;
diff -r f6ef9a9f5476 -r e8b6c5433128 QuestPOI.lua
--- a/QuestPOI.lua Tue Jul 25 12:38:27 2017 -0400
+++ b/QuestPOI.lua Tue Sep 05 02:58:24 2017 -0400
@@ -116,7 +116,7 @@
hideNumber = true,
},
[REWARD_CURRENCY] = {
- textColor = {1,1,0,.5}
+ textColor = {0,1,1,.75}
},
[REWARD_REAGENT] = {
@@ -607,8 +607,12 @@
return self.dataLoaded
end
-local ID_RESOURCES = 1220
-local ID_LEGIONFALL = 1342
+local shownCurrencies = {
+ [1220] = true,
+ [1342] = true,
+ [1508] = true, -- argunite
+ [1506] = true, -- argus waystone
+}
--- Returns true if data has changed (either from loading in or qualifications changed)
function QuestPOI:UpdateRewards()
@@ -655,17 +659,12 @@
})
--dprint(' currency', i, currencyID, name, " |T"..tostring(texture)..":12:12|t")
- if currencyID == ID_RESOURCES then
+ if shownCurrencies[currencyID] then
rewardIcon = texture
rewardCount = numItems
rewardName = name
rewardType = REWARD_CURRENCY
foundPrimary = true
- elseif currencyID == ID_LEGIONFALL then
- xpIcon = texture
- xpCount = numItems
- xpName = name
- xpType = REWARD_CURRENCY
end
end
diff -r f6ef9a9f5476 -r e8b6c5433128 WorldMap.lua
--- a/WorldMap.lua Tue Jul 25 12:38:27 2017 -0400
+++ b/WorldMap.lua Tue Sep 05 02:58:24 2017 -0400
@@ -531,6 +531,7 @@
isDataLoaded = true
local taskInfo = TQ_GetQuestsForPlayerByMapID(db.currentMapID)
+ local transformFlags = (db.currentMapID == 1184) and Enum.MapTransform.IsForFlightMap or nil
if taskInfo then
self:UpdateQuestsForMap(taskInfo, db.currentMapID)
end
@@ -538,19 +539,21 @@
if numZones then
for i = 1, numZones do
local mapAreaID = MC_GetZoneInfo(db.currentMapID, i)
- local taskInfo = TQ_GetQuestsForPlayerByMapID(mapAreaID, db.currentMapID)
+ local taskInfo = TQ_GetQuestsForPlayerByMapID(mapAreaID, db.currentMapID, transformFlags)
db.QuestsByZone[mapAreaID] = db.QuestsByZone[mapAreaID] or {}
if taskInfo then
- self:UpdateQuestsForMap(taskInfo, mapAreaID)
+ self:UpdateQuestsForMap(taskInfo, mapAreaID, transformFlags)
end
end
end
+
+
end
-- Attempt to display the pins for quests in taskInfo
-function Module:UpdateQuestsForMap(taskInfo, mapID)
+function Module:UpdateQuestsForMap(taskInfo, mapID, transformFlags)
print('|cFF00FF00UpdateQuestsForMap()|r', GetMapNameByID(mapID), GetMapNameByID(db.currentMapID), layoutDirty)
if db.QuestsByZone[mapID] then
wipe(db.QuestsByZone[mapID])
@@ -562,6 +565,16 @@
for index, info in pairs(taskInfo) do
local questID, x, y = info.questId, info.x, info.y
+
+ -- rough workaround for argus map; flightmap and world map images are different, so not completely accurate
+ if transformFlags and x and y then
+ print(x,y)
+ x = x / 2 + .25
+ y = y / 2 + .30
+ print(x,y)
+ end
+
+
local pin = self:AcquirePin(info)
if pin then
if pin.canShow then
diff -r f6ef9a9f5476 -r e8b6c5433128 WorldPlan.lua
--- a/WorldPlan.lua Tue Jul 25 12:38:27 2017 -0400
+++ b/WorldPlan.lua Tue Sep 05 02:58:24 2017 -0400
@@ -147,7 +147,7 @@
EnablePins = true,
FadeWhileGrouped = false,
FlightMapAlphaLimits = {1, .7, 1},
- FlightMapScalingLimits = {1, 3, 1.5},
+ FlightMapScalingLimits = {1, 1, 1.5},
--UntrackedColor = {},
--TrackedColor = {},
--CriteriaColor = {},
@@ -402,8 +402,8 @@
--self:SetParent(WorldMapFrame)
- ofunc[WorldMap_SetupWorldQuestButton] = WorldMap_SetupWorldQuestButton
- WorldMap_SetupWorldQuestButton = nop
+ --ofunc[WorldMap_SetupWorldQuestButton] = WorldMap_SetupWorldQuestButton
+ --WorldMap_SetupWorldQuestButton = nop
end
function WorldPlanCore:OnShow()
diff -r f6ef9a9f5476 -r e8b6c5433128 WorldPlan.toc
--- a/WorldPlan.toc Tue Jul 25 12:38:27 2017 -0400
+++ b/WorldPlan.toc Tue Sep 05 02:58:24 2017 -0400
@@ -1,8 +1,8 @@
## Interface: 70200
## Title: WorldPlan
-## Notes: World Quest planning helper
+## Notes: World Quest Map Overlay
## Author: Krakyn
-## Version: 1.0-@project-revision@
+## Version: 2.0
## SavedVariables: WorldPlanData
## X-Category: Interface Enhancements
## DefaultState: Enabled
@@ -10,13 +10,4 @@
## OptionalDeps: Veneer
WorldPlan.xml
-##Data.xml
-QuestPOI.xml
-WorldMap.xml
-FilterBar.xml
-FlightMap.xml
-ClassPlan.xml
-ClassPlanMissions.xml
-ClassPlanShipments.xml
-ClassPlanFollowers.xml
-MapFrame.xml
\ No newline at end of file
+##Data.xml
\ No newline at end of file
diff -r f6ef9a9f5476 -r e8b6c5433128 WorldPlan.xml
--- a/WorldPlan.xml Tue Jul 25 12:38:27 2017 -0400
+++ b/WorldPlan.xml Tue Sep 05 02:58:24 2017 -0400
@@ -51,5 +51,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file