Beginnings of conversion from old, modified Astrolabe-0.4 to new, improved Astrolabe-1.0.
WARNING: THESE MODIFICATIONS ARE NOT TESTED AND ARE LIKELY TO CAUSE CATASTROPHIC ISSUES AT THIS TIME. ANY ATTEMPT TO USE THIS REVISION IS NOT RECOMMENDED.
Cette révision appartient à :
Nathanial.C.Jones
Parent
c9a7c07ffc
révision
f9b92178d5
|
|
@ -61,7 +61,7 @@ libs\AceGUI-3.0\AceGUI-3.0.xml
|
|||
libs\AceConfig-3.0\AceConfig-3.0.xml
|
||||
|
||||
bst_astrolabe.lua
|
||||
libs\AstrolabeQH\Load.xml
|
||||
libs\Astrolabe\Load.xml
|
||||
#MapMonitor.lua
|
||||
#AstroLabeToLibMapDataConversionStub.lua
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ QuestHelper_Loadtime["arrow.lua"] = GetTime()
|
|||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
* The name or alias of the copyright holder may not be used to endorse
|
||||
* The name or alias of the copyright holder may not be used to endorse
|
||||
or promote products derived from this software without specific prior
|
||||
written permission.
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ function QH_Arrow_SetScale(scale)
|
|||
else
|
||||
scale = QuestHelper_Pref.arrow_arrowsize
|
||||
end
|
||||
|
||||
|
||||
if not showDownArrow then
|
||||
wayframe:SetHeight(42 * scale)
|
||||
wayframe:SetWidth(56 * scale)
|
||||
|
|
@ -154,7 +154,7 @@ function QH_Arrow_SetTextScale(scale)
|
|||
else
|
||||
scale = QuestHelper_Pref.arrow_textsize
|
||||
end
|
||||
|
||||
|
||||
wayframe.title:SetFont(default_font_name, default_font_size * scale, default_font_flags)
|
||||
wayframe.status:SetFont(default_font_name, default_font_size * scale, default_font_flags)
|
||||
wayframe.tta:SetFont(default_font_name, default_font_size * scale, default_font_flags)
|
||||
|
|
@ -189,19 +189,19 @@ local speed_count = 0
|
|||
OnUpdate = function()
|
||||
local self = wayframe
|
||||
QuestHelper: Assert(self)
|
||||
|
||||
if not active_point.c or QuestHelper.collect_rc ~= active_point.c or QuestHelper.collect_delayed or QuestHelper.InBrokenInstance or not QuestHelper_Pref.arrow then
|
||||
|
||||
if not QuestHelper_Pref.arrow then
|
||||
self:Hide()
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
self:Show()
|
||||
|
||||
local dist, dx, dy = QuestHelper.Astrolabe:ComputeDistance(QuestHelper.collect_rc, QuestHelper.collect_rz, QuestHelper.collect_rx, QuestHelper.collect_ry, active_point.c, active_point.z, active_point.x, active_point.y)
|
||||
local dist, dx, dy = QuestHelper.Astrolabe:ComputeDistance(QuestHelper.collect_rm, QuestHelper.collect_rf, QuestHelper.collect_rx, QuestHelper.collect_ry, active_point.m, active_point.f, active_point.x, active_point.y)
|
||||
--print(QuestHelper.collect_rc, QuestHelper.collect_rz, QuestHelper.collect_rx, QuestHelper.collect_ry, active_point.c, active_point.z, active_point.x, active_point.y)
|
||||
|
||||
|
||||
local text = ""
|
||||
|
||||
|
||||
if dist then
|
||||
-- I had support for miles and kilometers, but decided that distances were rarely large
|
||||
-- enough to warrent it.
|
||||
|
|
@ -211,14 +211,14 @@ OnUpdate = function()
|
|||
text = QHFormat("DISTANCE_YARDS", math.floor(0.5 + dist))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
status:SetText(text)
|
||||
|
||||
-- Showing the arrival arrow?
|
||||
if dist and dist <= 10 then
|
||||
if not showDownArrow then
|
||||
showDownArrow = true
|
||||
QH_Arrow_SetScale()
|
||||
QH_Arrow_SetScale()
|
||||
arrow:SetTexture("Interface\\AddOns\\QuestHelper\\arrow_image_down")
|
||||
arrow:SetVertexColor(0, 1, 0)
|
||||
end
|
||||
|
|
@ -236,7 +236,7 @@ OnUpdate = function()
|
|||
else
|
||||
if showDownArrow then
|
||||
showDownArrow = false
|
||||
QH_Arrow_SetScale()
|
||||
QH_Arrow_SetScale()
|
||||
arrow:SetTexture("Interface\\AddOns\\QuestHelper\\arrow_image")
|
||||
showDownArrow = false
|
||||
end
|
||||
|
|
@ -252,7 +252,7 @@ OnUpdate = function()
|
|||
local gr,gg,gb = 0, 1, 0
|
||||
local mr,mg,mb = 1, 1, 0
|
||||
local br,bg,bb = 1, 0, 0
|
||||
local r,g,b = ColorGradient(perc, br, bg, bb, mr, mg, mb, gr, gg, gb)
|
||||
local r,g,b = ColorGradient(perc, br, bg, bb, mr, mg, mb, gr, gg, gb)
|
||||
arrow:SetVertexColor(r,g,b)
|
||||
|
||||
|
||||
|
|
@ -291,11 +291,11 @@ OnUpdate = function()
|
|||
|
||||
if speed > 0 then
|
||||
local eta = math.abs(dist / speed)
|
||||
tta:SetFormattedText("%01d:%02d", eta / 60, eta % 60)
|
||||
tta:SetFormattedText("%01d:%02d", eta / 60, eta % 60)
|
||||
else
|
||||
tta:SetText("")
|
||||
end
|
||||
|
||||
|
||||
last_distance = dist
|
||||
tta_throttle = 0
|
||||
end
|
||||
|
|
@ -317,14 +317,14 @@ function QH_Arrow_PopulateMenu(menu)
|
|||
hide:SetFunction(function () QuestHelper:ToggleArrow() end)
|
||||
--hide:AddTexture(spacer(), true)
|
||||
--hide:AddTexture(spacer(), false)
|
||||
|
||||
|
||||
local lock = QuestHelper:CreateMenuItem(menu, "Lock")
|
||||
local ltex = QuestHelper:CreateIconTexture(item, 10)
|
||||
lock:SetFunction(function () QuestHelper_Pref.arrow_locked = not QuestHelper_Pref.arrow_locked end)
|
||||
lock:AddTexture(ltex, true)
|
||||
lock:AddTexture(spacer(), false)
|
||||
ltex:SetVertexColor(1, 1, 1, QuestHelper_Pref.arrow_locked and 1 or 0)
|
||||
|
||||
|
||||
local scale = QuestHelper:CreateMenuItem(menu, "Arrow Scale")
|
||||
local scale_menu = QuestHelper:CreateMenu()
|
||||
scale:SetSubmenu(scale_menu)
|
||||
|
|
@ -341,7 +341,7 @@ function QH_Arrow_PopulateMenu(menu)
|
|||
end
|
||||
it:AddTexture(icon)
|
||||
end
|
||||
|
||||
|
||||
local tscale = QuestHelper:CreateMenuItem(menu, "Text Scale")
|
||||
local tscale_menu = QuestHelper:CreateMenu()
|
||||
tscale:SetSubmenu(tscale_menu)
|
||||
|
|
@ -358,7 +358,7 @@ function QH_Arrow_PopulateMenu(menu)
|
|||
end
|
||||
it:AddTexture(icon)
|
||||
end
|
||||
|
||||
|
||||
local reset = QuestHelper:CreateMenuItem(menu, QHText("SETTINGS_MENU_ARROW_RESET"))
|
||||
reset:SetFunction(function () QH_Arrow_Reset() end)
|
||||
end
|
||||
|
|
@ -366,14 +366,14 @@ end
|
|||
local function WayFrame_OnClick(self, button)
|
||||
local menu = QuestHelper:CreateMenu()
|
||||
QuestHelper:CreateMenuTitle(menu, QHText("SETTINGS_ARROWLINK_ARROW"))
|
||||
|
||||
|
||||
QH_Arrow_PopulateMenu(menu)
|
||||
|
||||
|
||||
local submenu = QuestHelper:CreateMenu()
|
||||
item = QuestHelper:CreateMenuItem(menu, "Objective")
|
||||
item:SetSubmenu(submenu)
|
||||
QH_Append_NextObjective(submenu)
|
||||
|
||||
|
||||
menu:ShowAtCursor()
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ QuestHelper_File["core.lua"] = "4.0.1.$svnversion$"
|
|||
QuestHelper_Loadtime["core.lua"] = GetTime()
|
||||
|
||||
|
||||
QuestHelper.Astrolabe = QH_Astrolabe_Ready and DongleStub("Astrolabe-0.4-QuestHelper")
|
||||
QuestHelper.Astrolabe = QH_Astrolabe_Ready and DongleStub("Astrolabe-1.0")
|
||||
local walker = QuestHelper:CreateWorldMapWalker()
|
||||
QuestHelper.minimap_marker = QuestHelper:CreateMipmapDodad()
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ local function LookupName(x, y)
|
|||
best, d2 = TaxiNodeName(i), u
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return best
|
||||
end
|
||||
|
||||
|
|
@ -32,17 +32,17 @@ local function getRoute(id)
|
|||
if routes and routes > 0 and routes < 100 then
|
||||
local origin, dest = TaxiNodeName(i), TaxiNodeName(id)
|
||||
local path_hash = 0
|
||||
|
||||
|
||||
if routes > 1 then
|
||||
local path_str = ""
|
||||
|
||||
|
||||
for j = 1,routes-1 do
|
||||
path_str = string.format("%s/%s", path_str, LookupName(TaxiGetDestX(id, j), TaxiGetDestY(id, j)))
|
||||
end
|
||||
|
||||
|
||||
path_hash = QuestHelper:HashString(path_str)
|
||||
end
|
||||
|
||||
|
||||
return origin, dest, path_hash
|
||||
end
|
||||
end
|
||||
|
|
@ -72,15 +72,15 @@ end
|
|||
TaxiNodeOnButtonEnter = function(btn, ...)
|
||||
QuestHelper: Assert(btn)
|
||||
local rv = real_TaxiNodeOnButtonEnter(btn, ...)
|
||||
|
||||
|
||||
if QuestHelper_Pref.flight_time then
|
||||
local index = btn:GetID()
|
||||
if TaxiNodeGetType(index) == "REACHABLE" then
|
||||
|
||||
|
||||
local snode, dnode = getSrcDest(index)
|
||||
|
||||
|
||||
local eta, estimate = getEtaEstimate(snode, dnode)
|
||||
|
||||
|
||||
if eta then -- Going to replace the tooltip.
|
||||
GameTooltip:SetOwner(btn, "ANCHOR_RIGHT")
|
||||
GameTooltip:ClearLines()
|
||||
|
|
@ -94,27 +94,27 @@ TaxiNodeOnButtonEnter = function(btn, ...)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return rv
|
||||
end
|
||||
|
||||
TakeTaxiNode = function(id)
|
||||
local src, dest = getSrcDest(id)
|
||||
|
||||
|
||||
if src then
|
||||
local flight_data = QuestHelper.flight_data
|
||||
if not flight_data then
|
||||
flight_data = QuestHelper:CreateTable()
|
||||
QuestHelper.flight_data = flight_data
|
||||
end
|
||||
|
||||
|
||||
flight_data.src = src
|
||||
flight_data.dest = dest
|
||||
flight_data.start_time = nil
|
||||
flight_data.end_time = nil
|
||||
flight_data.end_time_estimate = nil
|
||||
end
|
||||
|
||||
|
||||
real_TakeTaxiNode(id)
|
||||
end
|
||||
|
||||
|
|
@ -126,9 +126,9 @@ function QuestHelper:getFlightInstructor(area)
|
|||
return npc
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local static = QuestHelper_StaticData[QuestHelper_Locale]
|
||||
|
||||
|
||||
if static then
|
||||
fi_table = static.flight_instructors and static.flight_instructors[self.faction]
|
||||
if fi_table then
|
||||
|
|
@ -148,7 +148,7 @@ end
|
|||
-- If so, find the flightpath distance and the "walking" distance. Add up walking and flightpath separately, and return the sums.
|
||||
local function getWalkToFlight(tbl, fi1, fi2)
|
||||
local f, w = 0, 0
|
||||
|
||||
|
||||
if tbl then
|
||||
for origin, list in pairs(tbl) do
|
||||
for dest, hashlist in pairs(list) do
|
||||
|
|
@ -158,15 +158,15 @@ local function getWalkToFlight(tbl, fi1, fi2)
|
|||
local obj1, obj2 = QuestHelper:GetObjective("monster", npc1), QuestHelper:GetObjective("monster", npc2)
|
||||
obj1:PrepareRouting(true, {failable = true})
|
||||
obj2:PrepareRouting(true, {failable = true})
|
||||
|
||||
|
||||
local pos1, pos2 = obj1:Position(), obj2:Position()
|
||||
|
||||
|
||||
if pos1 and pos2 then
|
||||
local x, y = pos1[3]-pos2[3], pos1[4]-pos2[4]
|
||||
w = w + math.sqrt(x*x+y*y)
|
||||
f = f + hashlist[0]
|
||||
end
|
||||
|
||||
|
||||
obj2:DoneRouting()
|
||||
obj1:DoneRouting()
|
||||
end
|
||||
|
|
@ -174,7 +174,7 @@ local function getWalkToFlight(tbl, fi1, fi2)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return f, w
|
||||
end
|
||||
|
||||
|
|
@ -184,12 +184,12 @@ function QuestHelper:computeWalkToFlightMult()
|
|||
local s = QuestHelper_StaticData[self.locale]
|
||||
s = s and s.flight_routes
|
||||
s = s and s[self.faction]
|
||||
|
||||
|
||||
local fi1 = QuestHelper_FlightInstructors_Local[self.faction]
|
||||
local fi2 = QuestHelper_StaticData[self.locale]
|
||||
fi2 = fi2 and fi2.flight_instructors
|
||||
fi2 = fi2 and fi2[self.faction]
|
||||
|
||||
|
||||
local f1, w1 = getWalkToFlight(l, fi1, fi2)
|
||||
local f2, w2 = getWalkToFlight(s, fi1, fi2)
|
||||
return (f1+f2+0.032876)/(w1+w2+0.1)
|
||||
|
|
@ -200,45 +200,45 @@ function QuestHelper:computeLinkTime(origin, dest, hash, fallback)
|
|||
if origin == dest then
|
||||
return 0
|
||||
end
|
||||
|
||||
|
||||
local l = QuestHelper_FlightRoutes_Local[self.faction]
|
||||
local s = QuestHelper_StaticData[self.locale]
|
||||
s = s and s.flight_routes
|
||||
s = s and s[self.faction]
|
||||
|
||||
|
||||
hash = hash or 0
|
||||
|
||||
|
||||
-- Will try to lookup flight time there, failing that, will use the time from there to here.
|
||||
local t = getTime(l, origin, dest, hash) or getTime(s, origin, dest, hash) or
|
||||
getTime(l, dest, origin, hash) or getTime(s, dest, origin, hash) or fallback
|
||||
|
||||
|
||||
if t == nil then -- Don't have any recored information on this flight time, will estimate based on distances.
|
||||
l = QuestHelper_FlightInstructors_Local[self.faction]
|
||||
s = QuestHelper_StaticData[self.locale]
|
||||
s = s and s.flight_instructors
|
||||
s = s and s[self.faction]
|
||||
|
||||
|
||||
local npc1, npc2 = (l and l[origin]) or (s and s[origin]),
|
||||
(l and l[dest]) or (s and s[dest])
|
||||
|
||||
|
||||
if npc1 and npc2 then
|
||||
local obj1, obj2 = self:GetObjective("monster", npc1), self:GetObjective("monster", npc2)
|
||||
obj1:PrepareRouting(true)
|
||||
obj2:PrepareRouting(true)
|
||||
|
||||
|
||||
local pos1, pos2 = obj1:Position(), obj2:Position()
|
||||
|
||||
|
||||
if pos1 and pos2 then
|
||||
local x, y = pos1[3]-pos2[3], pos1[4]-pos2[4]
|
||||
|
||||
|
||||
t = math.sqrt(x*x+y*y)*self.flight_scalar
|
||||
end
|
||||
|
||||
|
||||
obj2:DoneRouting()
|
||||
obj1:DoneRouting()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if t and type(t) ~= "number" then
|
||||
QuestHelper:AppendNotificationError("2008-10-11 computelinktime is not a number", string.format("%s %s", type(t), fallback and type(fallback) or "(nil)"))
|
||||
return nil
|
||||
|
|
@ -253,11 +253,11 @@ function QuestHelper:addLinkInfo(data, flight_times)
|
|||
if select(2, UnitClass("player")) ~= "DRUID" then
|
||||
-- As only druids can use the flight point in moonglade, we need to figure out
|
||||
-- where it is so we can ignore it.
|
||||
|
||||
|
||||
if not moonglade_fp then
|
||||
|
||||
|
||||
local fi_table = QuestHelper_FlightInstructors_Local[self.faction]
|
||||
|
||||
|
||||
if fi_table then for area, npc in pairs(fi_table) do
|
||||
local npc_obj = self:GetObjective("monster", npc)
|
||||
npc_obj:PrepareRouting(true, {failable = true})
|
||||
|
|
@ -269,11 +269,11 @@ function QuestHelper:addLinkInfo(data, flight_times)
|
|||
end
|
||||
npc_obj:DoneRouting()
|
||||
end end
|
||||
|
||||
|
||||
if not moonglade_fp then
|
||||
fi_table = QuestHelper_StaticData[QuestHelper_Locale]
|
||||
fi_table = fi_table and fi_table.flight_instructors and fi_table.flight_instructors[self.faction]
|
||||
|
||||
|
||||
if fi_table then for area, npc in pairs(fi_table) do
|
||||
local npc_obj = self:GetObjective("monster", npc)
|
||||
npc_obj:PrepareRouting(true, {failable = true})
|
||||
|
|
@ -286,7 +286,7 @@ function QuestHelper:addLinkInfo(data, flight_times)
|
|||
npc_obj:DoneRouting()
|
||||
end end
|
||||
end
|
||||
|
||||
|
||||
if not moonglade_fp then
|
||||
-- This will always be unknown for the session, even if you call buildFlightTimes again
|
||||
-- but if it's unknown then you won't be able to
|
||||
|
|
@ -296,14 +296,14 @@ function QuestHelper:addLinkInfo(data, flight_times)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
for origin, list in pairs(data) do
|
||||
local tbl = flight_times[origin]
|
||||
if not tbl then
|
||||
tbl = self:CreateTable("Flightpath AddLinkInfo origin table")
|
||||
flight_times[origin] = tbl
|
||||
end
|
||||
|
||||
|
||||
for dest, hashs in pairs(list) do
|
||||
if origin ~= moonglade_fp and QuestHelper_KnownFlightRoutes[dest] and hashs[0] then
|
||||
local tbl2 = tbl[dest]
|
||||
|
|
@ -328,29 +328,29 @@ local function getDataTime(ft, origin, dest)
|
|||
local str = nil
|
||||
local data = ft[origin][dest]
|
||||
local t = data[1]
|
||||
|
||||
|
||||
for key in pairs(visited) do visited[key] = nil end
|
||||
|
||||
|
||||
while true do
|
||||
local n = data[2]
|
||||
|
||||
|
||||
-- We might be asked about a route that visits the same point multiple times, and
|
||||
-- since this is effectively a linked list, we need to check for this to avoid
|
||||
-- infinite loops.
|
||||
if visited[n] then return end
|
||||
visited[n] = true
|
||||
|
||||
|
||||
local temp = QuestHelper:computeLinkTime(origin, n, str and QuestHelper:HashString(str) or 0, false)
|
||||
|
||||
|
||||
if temp then
|
||||
t = temp + (n == dest and 0 or ft[n][dest][1])
|
||||
end
|
||||
|
||||
|
||||
if n == dest then break end
|
||||
str = string.format("%s/%s", str or "", n)
|
||||
data = ft[n][dest]
|
||||
end
|
||||
|
||||
|
||||
return t
|
||||
end
|
||||
|
||||
|
|
@ -360,28 +360,28 @@ QuestHelper_Flight_Updates_Current = 0
|
|||
|
||||
function QuestHelper:buildFlightTimes()
|
||||
self.flight_scalar = self:computeWalkToFlightMult()
|
||||
|
||||
|
||||
local flight_times = self.flight_times
|
||||
if not flight_times then
|
||||
flight_times = self:CreateTable()
|
||||
self.flight_times = flight_times
|
||||
end
|
||||
|
||||
|
||||
for key, list in pairs(flight_times) do
|
||||
self:ReleaseTable(list)
|
||||
flight_times[key] = nil
|
||||
end
|
||||
|
||||
|
||||
local l = QuestHelper_FlightRoutes_Local[self.faction]
|
||||
local s = QuestHelper_StaticData[self.locale]
|
||||
s = s and s.flight_routes
|
||||
s = s and s[self.faction]
|
||||
|
||||
|
||||
self:addLinkInfo(l, flight_times)
|
||||
self:addLinkInfo(s, flight_times)
|
||||
|
||||
|
||||
QuestHelper_Flight_Updates_Current = 0
|
||||
|
||||
|
||||
-- This appears to set up flight_times so it gives directions from any node to any other node. I'm not sure what the getDataTime() call is all about, and I'm also not sure what dat[2] is for. In any case, I don't see anything immediately suspicious about this, just dubious.
|
||||
local cont = true
|
||||
while cont do
|
||||
|
|
@ -391,19 +391,19 @@ function QuestHelper:buildFlightTimes()
|
|||
origin = next(flight_times, origin)
|
||||
if not origin then break end
|
||||
local list = flight_times[origin]
|
||||
|
||||
|
||||
for dest, data in pairs(list) do
|
||||
QuestHelper_Flight_Updates_Current = QuestHelper_Flight_Updates_Current + 1
|
||||
if flight_times[dest] then for dest2, data2 in pairs(flight_times[dest]) do
|
||||
if dest2 ~= origin then
|
||||
local dat = list[dest2]
|
||||
|
||||
|
||||
if not dat then
|
||||
dat = self:CreateTable()
|
||||
dat[1], dat[2] = data[1]+data2[1], dest
|
||||
list[dest2] = dat
|
||||
dat[1] = getDataTime(flight_times, origin, dest2)
|
||||
|
||||
|
||||
if not dat[1] then
|
||||
self:ReleaseTable(dat)
|
||||
list[dest2] = nil
|
||||
|
|
@ -415,7 +415,7 @@ function QuestHelper:buildFlightTimes()
|
|||
if o2 ~= dest then
|
||||
dat[1], dat[2] = data[1]+data2[1], dest
|
||||
local t2 = getDataTime(flight_times, origin, dest2)
|
||||
|
||||
|
||||
if t2 and t2 < o1 then
|
||||
dat[1] = t2
|
||||
cont = true
|
||||
|
|
@ -430,9 +430,9 @@ function QuestHelper:buildFlightTimes()
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
QuestHelper_Flight_Updates = QuestHelper_Flight_Updates_Current
|
||||
|
||||
|
||||
-- Replace the tables with simple times.
|
||||
for orig, list in pairs(flight_times) do
|
||||
for dest, data in pairs(list) do
|
||||
|
|
@ -475,11 +475,11 @@ function QuestHelper:flightBegan()
|
|||
if self.flight_data and not self.flight_data.start_time then
|
||||
self.flight_data.start_time = GetTime()
|
||||
local src, dest = self.flight_data.src, self.flight_data.dest
|
||||
|
||||
|
||||
|
||||
|
||||
local eta, estimate = getEtaEstimate(src, dest)
|
||||
|
||||
--[[
|
||||
|
||||
--[[ NOTE: MUST CONVERT TO M(ap), F(loor) coordinate system before enabling again.
|
||||
local npc = self:getFlightInstructor(self.flight_data.dest) -- Will inform QuestHelper that we're going to be at this NPC in whenever.
|
||||
if npc then
|
||||
local npc_obj = self:GetObjective("monster", npc)
|
||||
|
|
@ -490,20 +490,20 @@ function QuestHelper:flightBegan()
|
|||
local x, y = self.Astrolabe:TranslateWorldMapPosition(c, 0,
|
||||
pos[3]/self.continent_scales_x[c],
|
||||
pos[4]/self.continent_scales_y[c], c, z)
|
||||
|
||||
|
||||
self:SetTargetLocation(QuestHelper_IndexLookup[c][z], x, y, eta)
|
||||
|
||||
|
||||
end
|
||||
npc_obj:DoneRouting()
|
||||
end]]
|
||||
|
||||
|
||||
do
|
||||
local loc = QH_Flight_Destinations[dest]
|
||||
if loc then -- sometimes we just don't have a loc, I think due to flightpath recalculations going on right then
|
||||
QuestHelper.routing_ac, QuestHelper.routing_ax, QuestHelper.routing_ay, QuestHelper.routing_c, QuestHelper.routing_z = QuestHelper_ParentLookup[loc.p], loc.x, loc.y, QuestHelper_ZoneLookup[loc.p][1], QuestHelper_ZoneLookup[loc.p][2]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if eta and QuestHelper_Pref.flight_time then
|
||||
self.flight_data.end_time_estimate = time() + eta
|
||||
self:PerformCustomSearch(flight_updater) -- Reusing the search status indicator to display ETA for flight.
|
||||
|
|
@ -515,7 +515,7 @@ function QuestHelper:flightEnded(interrupted)
|
|||
local flight_data = self.flight_data
|
||||
if flight_data and not flight_data.end_time then
|
||||
flight_data.end_time = GetTime()
|
||||
|
||||
|
||||
self:UnsetTargetLocation()
|
||||
self:StopCustomSearch()
|
||||
end
|
||||
|
|
|
|||
Fichier diff supprimé car celui-ci est trop grand
Voir la Diff
|
|
@ -0,0 +1,6 @@
|
|||
## Interface: 50001
|
||||
## Title: Astrolabe |cff224477(lib)
|
||||
## Notes: A library for drawing icons on the Minimap and World Maps.
|
||||
## Version: 1.0
|
||||
## Author: Esamynn (James Carrothers)
|
||||
Load.xml
|
||||
|
|
@ -0,0 +1,235 @@
|
|||
--[[
|
||||
Name: AstrolabeMapMonitor
|
||||
Revision: $Rev: 44 $
|
||||
$Date: 2007-03-30 11:56:21 -0700 (Fri, 30 Mar 2007) $
|
||||
Author(s): Esamynn (esamynn@wowinterface.com)
|
||||
Inspired By: Gatherer by Norganna
|
||||
MapLibrary by Kristofer Karlsson (krka@kth.se)
|
||||
Website: http://esamynn.wowinterface.com/
|
||||
Documentation: http://www.esamynn.org/wiki/Astrolabe/World_Map_Monitor
|
||||
SVN: http://esamynn.org/svn/astrolabe/
|
||||
Description:
|
||||
This is a small stub library to support the main Astrolabe
|
||||
library. It's purpose is to monitor the visibility of
|
||||
various World Map frames, so that Astrolabe can modify its
|
||||
behaviour accordingly.
|
||||
|
||||
Copyright (C) 2007 James Carrothers
|
||||
|
||||
License:
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Note:
|
||||
This library's source code is specifically designed to work with
|
||||
World of Warcraft's interpreted AddOn system. You have an implicit
|
||||
licence to use this library with these facilities since that is its
|
||||
designated purpose as per:
|
||||
http://www.fsf.org/licensing/licenses/gpl-faq.html#InterpreterIncompat
|
||||
]]
|
||||
|
||||
-- WARNING!!!
|
||||
-- DO NOT MAKE CHANGES TO THIS LIBRARY WITHOUT FIRST CHANGING THE LIBRARY_VERSION_MAJOR
|
||||
-- STRING (to something unique) OR ELSE YOU MAY BREAK OTHER ADDONS THAT USE THIS LIBRARY!!!
|
||||
local LIBRARY_VERSION_MAJOR = "AstrolabeMapMonitor"
|
||||
local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 44 $", "(%d+)") or 1)
|
||||
|
||||
if not DongleStub then error(LIBRARY_VERSION_MAJOR .. " requires DongleStub.") end
|
||||
if not DongleStub:IsNewerVersion(LIBRARY_VERSION_MAJOR, LIBRARY_VERSION_MINOR) then return end
|
||||
|
||||
local AstrolabeMapMonitor = {};
|
||||
|
||||
function AstrolabeMapMonitor:GetVersion()
|
||||
return LIBRARY_VERSION_MAJOR, LIBRARY_VERSION_MINOR;
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Global World Map Frame Registration Table
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
if ( type(WorldMapDisplayFrames) ~= "table" ) then
|
||||
WorldMapDisplayFrames = { WorldMapFrame };
|
||||
else
|
||||
local worldMapFound = false;
|
||||
for k, v in pairs(WorldMapDisplayFrames) do
|
||||
if ( v == WorldMapFrame ) then
|
||||
worldMapFound = true;
|
||||
break;
|
||||
end
|
||||
end
|
||||
if not ( worldMapFound ) then
|
||||
table.insert(WorldMapDisplayFrames, WorldMapFrame);
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Working Tables and Config Constants
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
AstrolabeMapMonitor.TrackedWorldMaps = {};
|
||||
AstrolabeMapMonitor.AstrolabeLibrarys = {};
|
||||
|
||||
AstrolabeMapMonitor.NumVisibleWorldMaps = 0;
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Monitor Frame Script Handlers
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
local function onShow( frame )
|
||||
AstrolabeMapMonitor.NumVisibleWorldMaps = AstrolabeMapMonitor.NumVisibleWorldMaps + 1;
|
||||
AstrolabeMapMonitor:Update()
|
||||
end
|
||||
|
||||
local function onHide( frame )
|
||||
AstrolabeMapMonitor.NumVisibleWorldMaps = AstrolabeMapMonitor.NumVisibleWorldMaps - 1;
|
||||
AstrolabeMapMonitor:Update()
|
||||
end
|
||||
|
||||
local function setScripts( monitorFrame )
|
||||
monitorFrame:SetScript("OnShow", onShow);
|
||||
monitorFrame:SetScript("OnHide", onHide);
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Internal Utility Functions
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
local function assert(level,condition,message)
|
||||
if not condition then
|
||||
error(message,level)
|
||||
end
|
||||
end
|
||||
|
||||
local function argcheck(value, num, ...)
|
||||
assert(1, type(num) == "number",
|
||||
"Bad argument #2 to 'argcheck' (number expected, got " .. type(level) .. ")")
|
||||
|
||||
for i=1,select("#", ...) do
|
||||
if type(value) == select(i, ...) then return end
|
||||
end
|
||||
|
||||
local types = strjoin(", ", ...)
|
||||
local name = string.match(debugstack(2,2,0), ": in function [`<](.-)['>]")
|
||||
error(string.format("Bad argument #%d to 'AstrolabeMapMonitor.%s' (%s expected, got %s)", num, name, types, type(value)), 3)
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Public API
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
function AstrolabeMapMonitor:MonitorWorldMap( worldMapFrame )
|
||||
-- check argument types
|
||||
argcheck(worldMapFrame, 2, "table");
|
||||
assert((worldMapFrame.SetParent), "Usage Message");
|
||||
|
||||
local TrackedWorldMaps = self.TrackedWorldMaps;
|
||||
if ( TrackedWorldMaps[worldMapFrame] ) then
|
||||
return 1;
|
||||
end
|
||||
local monitorFrame = CreateFrame("Frame", nil, worldMapFrame);
|
||||
TrackedWorldMaps[worldMapFrame] = monitorFrame;
|
||||
setScripts(monitorFrame);
|
||||
self:ForceUpdate();
|
||||
return 0;
|
||||
end
|
||||
|
||||
function AstrolabeMapMonitor:LookForMapsToRegister()
|
||||
for k, frame in pairs(WorldMapDisplayFrames) do
|
||||
if ( type(frame) == "table" and frame.SetParent ) then
|
||||
self:MonitorWorldMap(frame);
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function AstrolabeMapMonitor:Update()
|
||||
local visibleMap = false;
|
||||
if ( (self.NumVisibleWorldMaps) > 0 ) then
|
||||
visibleMap = true;
|
||||
end
|
||||
for lib, versionString in pairs(self.AstrolabeLibrarys) do
|
||||
lib.WorldMapVisible = visibleMap;
|
||||
if ( (not visibleMap) and lib.AllWorldMapsHidden ) then
|
||||
lib:AllWorldMapsHidden();
|
||||
end
|
||||
end
|
||||
return visibleMap;
|
||||
end
|
||||
|
||||
function AstrolabeMapMonitor:ForceUpdate()
|
||||
self.NumVisibleWorldMaps = 0;
|
||||
for worldMap, monitorFrame in pairs(self.TrackedWorldMaps) do
|
||||
if ( worldMap:IsVisible() ) then
|
||||
self.NumVisibleWorldMaps = self.NumVisibleWorldMaps + 1;
|
||||
end
|
||||
end
|
||||
return self:Update();
|
||||
end
|
||||
|
||||
function AstrolabeMapMonitor:RegisterAstrolabeLibrary( lib, majorVersionString )
|
||||
-- check argument types
|
||||
argcheck(lib, 2, "table");
|
||||
argcheck(majorVersionString, 3, "string");
|
||||
|
||||
self.AstrolabeLibrarys[lib] = majorVersionString;
|
||||
self:Update();
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Handler Scripts
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
function AstrolabeMapMonitor:OnEvent( frame, event )
|
||||
if ( event == "ADDON_LOADED" ) then
|
||||
self:LookForMapsToRegister();
|
||||
self:ForceUpdate();
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- Library Registration
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
|
||||
local function activate( newInstance, oldInstance )
|
||||
if ( oldInstance ) then -- this is an upgrade activate
|
||||
for k, v in pairs(oldInstance) do
|
||||
if ( type(v) ~= "function" ) then
|
||||
newInstance[k] = v;
|
||||
end
|
||||
end
|
||||
AstrolabeMapMonitor = oldInstance;
|
||||
else
|
||||
AstrolabeMapMonitor.eventFrame = CreateFrame("Frame");
|
||||
end
|
||||
for worldMap, monitorFrame in pairs(AstrolabeMapMonitor.TrackedWorldMaps) do
|
||||
setScripts(monitorFrame);
|
||||
end
|
||||
local frame = AstrolabeMapMonitor.eventFrame;
|
||||
frame:Hide();
|
||||
frame:UnregisterAllEvents();
|
||||
frame:RegisterEvent("ADDON_LOADED");
|
||||
frame:SetScript("OnEvent",
|
||||
function( frame, event, ... )
|
||||
AstrolabeMapMonitor:OnEvent(frame, event, ...);
|
||||
end
|
||||
);
|
||||
end
|
||||
|
||||
DongleStub:Register(AstrolabeMapMonitor, activate)
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
--[[-------------------------------------------------------------------------
|
||||
James Whitehead II grants anyone the right to use this work for any purpose,
|
||||
without any conditions, unless such conditions are required by law.
|
||||
---------------------------------------------------------------------------]]
|
||||
|
||||
local major = "DongleStub"
|
||||
local minor = tonumber(string.match("$Revision: 313 $", "(%d+)") or 1)
|
||||
|
||||
local g = getfenv(0)
|
||||
|
||||
if not g.DongleStub or g.DongleStub:IsNewerVersion(major, minor) then
|
||||
local lib = setmetatable({}, {
|
||||
__call = function(t,k)
|
||||
if type(t.versions) == "table" and t.versions[k] then
|
||||
return t.versions[k].instance
|
||||
else
|
||||
error("Cannot find a library with name '"..tostring(k).."'", 2)
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
function lib:IsNewerVersion(major, minor)
|
||||
local versionData = self.versions and self.versions[major]
|
||||
|
||||
-- If DongleStub versions have differing major version names
|
||||
-- such as DongleStub-Beta0 and DongleStub-1.0-RC2 then a second
|
||||
-- instance will be loaded, with older logic. This code attempts
|
||||
-- to compensate for that by matching the major version against
|
||||
-- "^DongleStub", and handling the version check correctly.
|
||||
|
||||
if major:match("^DongleStub") then
|
||||
local oldmajor,oldminor = self:GetVersion()
|
||||
if self.versions and self.versions[oldmajor] then
|
||||
return minor > oldminor
|
||||
else
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
if not versionData then return true end
|
||||
local oldmajor,oldminor = versionData.instance:GetVersion()
|
||||
return minor > oldminor
|
||||
end
|
||||
|
||||
local function NilCopyTable(src, dest)
|
||||
for k,v in pairs(dest) do dest[k] = nil end
|
||||
for k,v in pairs(src) do dest[k] = v end
|
||||
end
|
||||
|
||||
function lib:Register(newInstance, activate, deactivate)
|
||||
assert(type(newInstance.GetVersion) == "function",
|
||||
"Attempt to register a library with DongleStub that does not have a 'GetVersion' method.")
|
||||
|
||||
local major,minor = newInstance:GetVersion()
|
||||
assert(type(major) == "string",
|
||||
"Attempt to register a library with DongleStub that does not have a proper major version.")
|
||||
assert(type(minor) == "number",
|
||||
"Attempt to register a library with DongleStub that does not have a proper minor version.")
|
||||
|
||||
-- Generate a log of all library registrations
|
||||
if not self.log then self.log = {} end
|
||||
table.insert(self.log, string.format("Register: %s, %s", major, minor))
|
||||
|
||||
if not self:IsNewerVersion(major, minor) then return false end
|
||||
if not self.versions then self.versions = {} end
|
||||
|
||||
local versionData = self.versions[major]
|
||||
if not versionData then
|
||||
-- New major version
|
||||
versionData = {
|
||||
["instance"] = newInstance,
|
||||
["deactivate"] = deactivate,
|
||||
}
|
||||
|
||||
self.versions[major] = versionData
|
||||
if type(activate) == "function" then
|
||||
table.insert(self.log, string.format("Activate: %s, %s", major, minor))
|
||||
activate(newInstance)
|
||||
end
|
||||
return newInstance
|
||||
end
|
||||
|
||||
local oldDeactivate = versionData.deactivate
|
||||
local oldInstance = versionData.instance
|
||||
|
||||
versionData.deactivate = deactivate
|
||||
|
||||
local skipCopy
|
||||
if type(activate) == "function" then
|
||||
table.insert(self.log, string.format("Activate: %s, %s", major, minor))
|
||||
skipCopy = activate(newInstance, oldInstance)
|
||||
end
|
||||
|
||||
-- Deactivate the old libary if necessary
|
||||
if type(oldDeactivate) == "function" then
|
||||
local major, minor = oldInstance:GetVersion()
|
||||
table.insert(self.log, string.format("Deactivate: %s, %s", major, minor))
|
||||
oldDeactivate(oldInstance, newInstance)
|
||||
end
|
||||
|
||||
-- Re-use the old table, and discard the new one
|
||||
if not skipCopy then
|
||||
NilCopyTable(newInstance, oldInstance)
|
||||
end
|
||||
return oldInstance
|
||||
end
|
||||
|
||||
function lib:GetVersion() return major,minor end
|
||||
|
||||
local function Activate(new, old)
|
||||
-- This code ensures that we'll move the versions table even
|
||||
-- if the major version names are different, in the case of
|
||||
-- DongleStub
|
||||
if not old then old = g.DongleStub end
|
||||
|
||||
if old then
|
||||
new.versions = old.versions
|
||||
new.log = old.log
|
||||
end
|
||||
g.DongleStub = new
|
||||
end
|
||||
|
||||
-- Actually trigger libary activation here
|
||||
local stub = g.DongleStub or lib
|
||||
lib = stub:Register(lib, Activate)
|
||||
end
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||
..\FrameXML\UI.xsd">
|
||||
<Script file="DongleStub.lua"/>
|
||||
<Script file="AstrolabeMapMonitor.lua"/>
|
||||
<Script file="Astrolabe.lua"/>
|
||||
</Ui>
|
||||
|
|
@ -0,0 +1,504 @@
|
|||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the Lesser GPL. It also counts
|
||||
as the successor of the GNU Library Public License, version 2, hence
|
||||
the version number 2.1.]
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
Licenses are intended to guarantee your freedom to share and change
|
||||
free software--to make sure the software is free for all its users.
|
||||
|
||||
This license, the Lesser General Public License, applies to some
|
||||
specially designated software packages--typically libraries--of the
|
||||
Free Software Foundation and other authors who decide to use it. You
|
||||
can use it too, but we suggest you first think carefully about whether
|
||||
this license or the ordinary General Public License is the better
|
||||
strategy to use in any particular case, based on the explanations below.
|
||||
|
||||
When we speak of free software, we are referring to freedom of use,
|
||||
not price. Our General Public Licenses are designed to make sure that
|
||||
you have the freedom to distribute copies of free software (and charge
|
||||
for this service if you wish); that you receive source code or can get
|
||||
it if you want it; that you can change the software and use pieces of
|
||||
it in new free programs; and that you are informed that you can do
|
||||
these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
distributors to deny you these rights or to ask you to surrender these
|
||||
rights. These restrictions translate to certain responsibilities for
|
||||
you if you distribute copies of the library or if you modify it.
|
||||
|
||||
For example, if you distribute copies of the library, whether gratis
|
||||
or for a fee, you must give the recipients all the rights that we gave
|
||||
you. You must make sure that they, too, receive or can get the source
|
||||
code. If you link other code with the library, you must provide
|
||||
complete object files to the recipients, so that they can relink them
|
||||
with the library after making changes to the library and recompiling
|
||||
it. And you must show them these terms so they know their rights.
|
||||
|
||||
We protect your rights with a two-step method: (1) we copyright the
|
||||
library, and (2) we offer you this license, which gives you legal
|
||||
permission to copy, distribute and/or modify the library.
|
||||
|
||||
To protect each distributor, we want to make it very clear that
|
||||
there is no warranty for the free library. Also, if the library is
|
||||
modified by someone else and passed on, the recipients should know
|
||||
that what they have is not the original version, so that the original
|
||||
author's reputation will not be affected by problems that might be
|
||||
introduced by others.
|
||||
|
||||
Finally, software patents pose a constant threat to the existence of
|
||||
any free program. We wish to make sure that a company cannot
|
||||
effectively restrict the users of a free program by obtaining a
|
||||
restrictive license from a patent holder. Therefore, we insist that
|
||||
any patent license obtained for a version of the library must be
|
||||
consistent with the full freedom of use specified in this license.
|
||||
|
||||
Most GNU software, including some libraries, is covered by the
|
||||
ordinary GNU General Public License. This license, the GNU Lesser
|
||||
General Public License, applies to certain designated libraries, and
|
||||
is quite different from the ordinary General Public License. We use
|
||||
this license for certain libraries in order to permit linking those
|
||||
libraries into non-free programs.
|
||||
|
||||
When a program is linked with a library, whether statically or using
|
||||
a shared library, the combination of the two is legally speaking a
|
||||
combined work, a derivative of the original library. The ordinary
|
||||
General Public License therefore permits such linking only if the
|
||||
entire combination fits its criteria of freedom. The Lesser General
|
||||
Public License permits more lax criteria for linking other code with
|
||||
the library.
|
||||
|
||||
We call this license the "Lesser" General Public License because it
|
||||
does Less to protect the user's freedom than the ordinary General
|
||||
Public License. It also provides other free software developers Less
|
||||
of an advantage over competing non-free programs. These disadvantages
|
||||
are the reason we use the ordinary General Public License for many
|
||||
libraries. However, the Lesser license provides advantages in certain
|
||||
special circumstances.
|
||||
|
||||
For example, on rare occasions, there may be a special need to
|
||||
encourage the widest possible use of a certain library, so that it becomes
|
||||
a de-facto standard. To achieve this, non-free programs must be
|
||||
allowed to use the library. A more frequent case is that a free
|
||||
library does the same job as widely used non-free libraries. In this
|
||||
case, there is little to gain by limiting the free library to free
|
||||
software only, so we use the Lesser General Public License.
|
||||
|
||||
In other cases, permission to use a particular library in non-free
|
||||
programs enables a greater number of people to use a large body of
|
||||
free software. For example, permission to use the GNU C Library in
|
||||
non-free programs enables many more people to use the whole GNU
|
||||
operating system, as well as its variant, the GNU/Linux operating
|
||||
system.
|
||||
|
||||
Although the Lesser General Public License is Less protective of the
|
||||
users' freedom, it does ensure that the user of a program that is
|
||||
linked with the Library has the freedom and the wherewithal to run
|
||||
that program using a modified version of the Library.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow. Pay close attention to the difference between a
|
||||
"work based on the library" and a "work that uses the library". The
|
||||
former contains code derived from the library, whereas the latter must
|
||||
be combined with the library in order to run.
|
||||
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library or other
|
||||
program which contains a notice placed by the copyright holder or
|
||||
other authorized party saying it may be distributed under the terms of
|
||||
this Lesser General Public License (also called "this License").
|
||||
Each licensee is addressed as "you".
|
||||
|
||||
A "library" means a collection of software functions and/or data
|
||||
prepared so as to be conveniently linked with application programs
|
||||
(which use some of those functions and data) to form executables.
|
||||
|
||||
The "Library", below, refers to any such software library or work
|
||||
which has been distributed under these terms. A "work based on the
|
||||
Library" means either the Library or any derivative work under
|
||||
copyright law: that is to say, a work containing the Library or a
|
||||
portion of it, either verbatim or with modifications and/or translated
|
||||
straightforwardly into another language. (Hereinafter, translation is
|
||||
included without limitation in the term "modification".)
|
||||
|
||||
"Source code" for a work means the preferred form of the work for
|
||||
making modifications to it. For a library, complete source code means
|
||||
all the source code for all modules it contains, plus any associated
|
||||
interface definition files, plus the scripts used to control compilation
|
||||
and installation of the library.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running a program using the Library is not restricted, and output from
|
||||
such a program is covered only if its contents constitute a work based
|
||||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||
all the notices that refer to this License and to the absence of any
|
||||
warranty; and distribute a copy of this License along with the
|
||||
Library.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy,
|
||||
and you may at your option offer warranty protection in exchange for a
|
||||
fee.
|
||||
|
||||
2. You may modify your copy or copies of the Library or any portion
|
||||
of it, thus forming a work based on the Library, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) The modified work must itself be a software library.
|
||||
|
||||
b) You must cause the files modified to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
c) You must cause the whole of the work to be licensed at no
|
||||
charge to all third parties under the terms of this License.
|
||||
|
||||
d) If a facility in the modified Library refers to a function or a
|
||||
table of data to be supplied by an application program that uses
|
||||
the facility, other than as an argument passed when the facility
|
||||
is invoked, then you must make a good faith effort to ensure that,
|
||||
in the event an application does not supply such function or
|
||||
table, the facility still operates, and performs whatever part of
|
||||
its purpose remains meaningful.
|
||||
|
||||
(For example, a function in a library to compute square roots has
|
||||
a purpose that is entirely well-defined independent of the
|
||||
application. Therefore, Subsection 2d requires that any
|
||||
application-supplied function or table used by this function must
|
||||
be optional: if the application does not supply it, the square
|
||||
root function must still compute square roots.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Library,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Library, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote
|
||||
it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Library.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Library
|
||||
with the Library (or with a work based on the Library) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||
License instead of this License to a given copy of the Library. To do
|
||||
this, you must alter all the notices that refer to this License, so
|
||||
that they refer to the ordinary GNU General Public License, version 2,
|
||||
instead of to this License. (If a newer version than version 2 of the
|
||||
ordinary GNU General Public License has appeared, then you can specify
|
||||
that version instead if you wish.) Do not make any other change in
|
||||
these notices.
|
||||
|
||||
Once this change is made in a given copy, it is irreversible for
|
||||
that copy, so the ordinary GNU General Public License applies to all
|
||||
subsequent copies and derivative works made from that copy.
|
||||
|
||||
This option is useful when you wish to copy part of the code of
|
||||
the Library into a program that is not a library.
|
||||
|
||||
4. You may copy and distribute the Library (or a portion or
|
||||
derivative of it, under Section 2) in object code or executable form
|
||||
under the terms of Sections 1 and 2 above provided that you accompany
|
||||
it with the complete corresponding machine-readable source code, which
|
||||
must be distributed under the terms of Sections 1 and 2 above on a
|
||||
medium customarily used for software interchange.
|
||||
|
||||
If distribution of object code is made by offering access to copy
|
||||
from a designated place, then offering equivalent access to copy the
|
||||
source code from the same place satisfies the requirement to
|
||||
distribute the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
5. A program that contains no derivative of any portion of the
|
||||
Library, but is designed to work with the Library by being compiled or
|
||||
linked with it, is called a "work that uses the Library". Such a
|
||||
work, in isolation, is not a derivative work of the Library, and
|
||||
therefore falls outside the scope of this License.
|
||||
|
||||
However, linking a "work that uses the Library" with the Library
|
||||
creates an executable that is a derivative of the Library (because it
|
||||
contains portions of the Library), rather than a "work that uses the
|
||||
library". The executable is therefore covered by this License.
|
||||
Section 6 states terms for distribution of such executables.
|
||||
|
||||
When a "work that uses the Library" uses material from a header file
|
||||
that is part of the Library, the object code for the work may be a
|
||||
derivative work of the Library even though the source code is not.
|
||||
Whether this is true is especially significant if the work can be
|
||||
linked without the Library, or if the work is itself a library. The
|
||||
threshold for this to be true is not precisely defined by law.
|
||||
|
||||
If such an object file uses only numerical parameters, data
|
||||
structure layouts and accessors, and small macros and small inline
|
||||
functions (ten lines or less in length), then the use of the object
|
||||
file is unrestricted, regardless of whether it is legally a derivative
|
||||
work. (Executables containing this object code plus portions of the
|
||||
Library will still fall under Section 6.)
|
||||
|
||||
Otherwise, if the work is a derivative of the Library, you may
|
||||
distribute the object code for the work under the terms of Section 6.
|
||||
Any executables containing that work also fall under Section 6,
|
||||
whether or not they are linked directly with the Library itself.
|
||||
|
||||
6. As an exception to the Sections above, you may also combine or
|
||||
link a "work that uses the Library" with the Library to produce a
|
||||
work containing portions of the Library, and distribute that work
|
||||
under terms of your choice, provided that the terms permit
|
||||
modification of the work for the customer's own use and reverse
|
||||
engineering for debugging such modifications.
|
||||
|
||||
You must give prominent notice with each copy of the work that the
|
||||
Library is used in it and that the Library and its use are covered by
|
||||
this License. You must supply a copy of this License. If the work
|
||||
during execution displays copyright notices, you must include the
|
||||
copyright notice for the Library among them, as well as a reference
|
||||
directing the user to the copy of this License. Also, you must do one
|
||||
of these things:
|
||||
|
||||
a) Accompany the work with the complete corresponding
|
||||
machine-readable source code for the Library including whatever
|
||||
changes were used in the work (which must be distributed under
|
||||
Sections 1 and 2 above); and, if the work is an executable linked
|
||||
with the Library, with the complete machine-readable "work that
|
||||
uses the Library", as object code and/or source code, so that the
|
||||
user can modify the Library and then relink to produce a modified
|
||||
executable containing the modified Library. (It is understood
|
||||
that the user who changes the contents of definitions files in the
|
||||
Library will not necessarily be able to recompile the application
|
||||
to use the modified definitions.)
|
||||
|
||||
b) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (1) uses at run time a
|
||||
copy of the library already present on the user's computer system,
|
||||
rather than copying library functions into the executable, and (2)
|
||||
will operate properly with a modified version of the library, if
|
||||
the user installs one, as long as the modified version is
|
||||
interface-compatible with the version that the work was made with.
|
||||
|
||||
c) Accompany the work with a written offer, valid for at
|
||||
least three years, to give the same user the materials
|
||||
specified in Subsection 6a, above, for a charge no more
|
||||
than the cost of performing this distribution.
|
||||
|
||||
d) If distribution of the work is made by offering access to copy
|
||||
from a designated place, offer equivalent access to copy the above
|
||||
specified materials from the same place.
|
||||
|
||||
e) Verify that the user has already received a copy of these
|
||||
materials or that you have already sent this user a copy.
|
||||
|
||||
For an executable, the required form of the "work that uses the
|
||||
Library" must include any data and utility programs needed for
|
||||
reproducing the executable from it. However, as a special exception,
|
||||
the materials to be distributed need not include anything that is
|
||||
normally distributed (in either source or binary form) with the major
|
||||
components (compiler, kernel, and so on) of the operating system on
|
||||
which the executable runs, unless that component itself accompanies
|
||||
the executable.
|
||||
|
||||
It may happen that this requirement contradicts the license
|
||||
restrictions of other proprietary libraries that do not normally
|
||||
accompany the operating system. Such a contradiction means you cannot
|
||||
use both them and the Library together in an executable that you
|
||||
distribute.
|
||||
|
||||
7. You may place library facilities that are a work based on the
|
||||
Library side-by-side in a single library together with other library
|
||||
facilities not covered by this License, and distribute such a combined
|
||||
library, provided that the separate distribution of the work based on
|
||||
the Library and of the other library facilities is otherwise
|
||||
permitted, and provided that you do these two things:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work
|
||||
based on the Library, uncombined with any other library
|
||||
facilities. This must be distributed under the terms of the
|
||||
Sections above.
|
||||
|
||||
b) Give prominent notice with the combined library of the fact
|
||||
that part of it is a work based on the Library, and explaining
|
||||
where to find the accompanying uncombined form of the same work.
|
||||
|
||||
8. You may not copy, modify, sublicense, link with, or distribute
|
||||
the Library except as expressly provided under this License. Any
|
||||
attempt otherwise to copy, modify, sublicense, link with, or
|
||||
distribute the Library is void, and will automatically terminate your
|
||||
rights under this License. However, parties who have received copies,
|
||||
or rights, from you under this License will not have their licenses
|
||||
terminated so long as such parties remain in full compliance.
|
||||
|
||||
9. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Library or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Library (or any work based on the
|
||||
Library), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Library or works based on it.
|
||||
|
||||
10. Each time you redistribute the Library (or any work based on the
|
||||
Library), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute, link with or modify the Library
|
||||
subject to these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties with
|
||||
this License.
|
||||
|
||||
11. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Library at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Library by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Library.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under any
|
||||
particular circumstance, the balance of the section is intended to apply,
|
||||
and the section as a whole is intended to apply in other circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
12. If the distribution and/or use of the Library is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Library under this License may add
|
||||
an explicit geographical distribution limitation excluding those countries,
|
||||
so that distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
|
||||
13. The Free Software Foundation may publish revised and/or new
|
||||
versions of the Lesser General Public License from time to time.
|
||||
Such new versions will be similar in spirit to the present version,
|
||||
but may differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Library
|
||||
specifies a version number of this License which applies to it and
|
||||
"any later version", you have the option of following the terms and
|
||||
conditions either of that version or of any later version published by
|
||||
the Free Software Foundation. If the Library does not specify a
|
||||
license version number, you may choose any version ever published by
|
||||
the Free Software Foundation.
|
||||
|
||||
14. If you wish to incorporate parts of the Library into other free
|
||||
programs whose distribution conditions are incompatible with these,
|
||||
write to the author to ask for permission. For software which is
|
||||
copyrighted by the Free Software Foundation, write to the Free
|
||||
Software Foundation; we sometimes make exceptions for this. Our
|
||||
decision will be guided by the two goals of preserving the free status
|
||||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Libraries
|
||||
|
||||
If you develop a new library, and you want it to be of the greatest
|
||||
possible use to the public, we recommend making it free software that
|
||||
everyone can redistribute and change. You can do so by permitting
|
||||
redistribution under these terms (or, alternatively, under the terms of the
|
||||
ordinary General Public License).
|
||||
|
||||
To apply these terms, attach the following notices to the library. It is
|
||||
safest to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least the
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1990
|
||||
Ty Coon, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
|
||||
|
||||
|
|
@ -55,19 +55,31 @@ function QuestHelper.tooltip:GetPrevLines() -- Just a helper to make life easier
|
|||
return _G[name.."TextLeft"..last], _G[name.."TextRight"..last]
|
||||
end
|
||||
|
||||
function QuestHelper:SetTargetLocation(i, x, y, toffset)
|
||||
local continentMapIDs = { -- [c] = id
|
||||
[1] = 13,
|
||||
[2] = 14,
|
||||
[3] = 466,
|
||||
[4] = 485,
|
||||
[5] = 751,
|
||||
[6] = 862
|
||||
}
|
||||
|
||||
function QuestHelper:SetTargetLocation(M, F, x, y, toffset)
|
||||
-- Informs QuestHelper that you're going to be at some location in toffset seconds.
|
||||
local c, z = unpack(QuestHelper_ZoneLookup[i])
|
||||
--local c, z = unpack(QuestHelper_ZoneLookup[i])
|
||||
|
||||
self.target = self:CreateTable()
|
||||
self.target[2] = self:CreateTable()
|
||||
|
||||
self.target_time = time()+(toffset or 0)
|
||||
|
||||
x, y = self.Astrolabe:TranslateWorldMapPosition(c, z, x, y, c, 0)
|
||||
local pM, pF = self.Astrolabe:GetCurrentPlayerPosition()
|
||||
|
||||
x, y = self.Astrolabe:TranslateWorldMapPosition(M, F, x, y, pM, pF)
|
||||
error("HAVE NOT FIGURED OUT THE self.target TABLE")
|
||||
self.target[1] = self.zone_nodes[i]
|
||||
self.target[3] = x * self.continent_scales_x[c]
|
||||
self.target[4] = y * self.continent_scales_y[c]
|
||||
self.target[3] = x -- * self.continent_scales_x[c]
|
||||
self.target[4] = y -- * self.continent_scales_y[c]
|
||||
|
||||
self:SetTargetLocationRecalculate()
|
||||
end
|
||||
|
|
@ -212,8 +224,8 @@ local function FileCheck()
|
|||
-- ["graph_core.lua"] = true,
|
||||
-- ["graph_flightpath.lua"] = true,
|
||||
|
||||
["AstrolabeQH/Astrolabe.lua"] = true,
|
||||
["AstrolabeQH/AstrolabeMapMonitor.lua"] = true,
|
||||
--* ["AstrolabeQH/Astrolabe.lua"] = true,
|
||||
--* ["AstrolabeQH/AstrolabeMapMonitor.lua"] = true,
|
||||
}
|
||||
|
||||
local uninstallederr = ""
|
||||
|
|
@ -656,61 +668,19 @@ Thanks for testing!]], "QuestHelper " .. version_string, 500, 20, 10)
|
|||
self:HandlePartyChange()
|
||||
end]]
|
||||
|
||||
local nc, nz, nx, ny = self.Astrolabe:GetCurrentPlayerPosition()
|
||||
local tc, tx, ty
|
||||
local nm, nf, nx, ny = self.Astrolabe:GetCurrentPlayerPosition()
|
||||
|
||||
if nc and nc ~= -1 and nc ~= 6 then -- We just want the raw data here, before we've done anything clever.
|
||||
tc, tx, ty = self.Astrolabe:GetAbsoluteContinentPosition(nc, nz, nx, ny)
|
||||
QuestHelper: Assert(tc and tx and ty) -- is it true? nobody knows! :D
|
||||
end
|
||||
if nm and nf and nx and ny then
|
||||
self.collect_rm, self.collect_rf, self.collect_rx, self.collect_ry = nm, nf, nx, ny
|
||||
|
||||
if nc and nc == self.c and map_shown_decay > 0 and self.z > 0 and self.z ~= nz then
|
||||
-- There's a chance Astrolable will return the wrong zone if you're messing with the world map, if you can
|
||||
-- be seen in that zone but aren't in it.
|
||||
local nnx, nny = self.Astrolabe:TranslateWorldMapPosition(nc, nz, nx, ny, nc, self.z)
|
||||
if nnx > 0 and nny > 0 and nnx < 1 and nny < 1 then
|
||||
nz, nx, ny = self.z, nnx, nny
|
||||
end
|
||||
end
|
||||
|
||||
if nc and nc > 0 and nz == 0 and nc == self.c and self.z > 0 then
|
||||
--QuestHelper:Assert(nx < math.huge, "Broken at this point.")
|
||||
nx, ny = self.Astrolabe:TranslateWorldMapPosition(nc, nz, nx, ny, nc, self.z)
|
||||
--QuestHelper:Assert(nx < math.huge, "Broken at this point.")
|
||||
if nx and ny --[[and nx > -0.1 and ny > -0.1 and nx < 1.1 and ny < 1.1]] then -- removing the conditional because I think I can use the data even when it's a little wonky
|
||||
nz = self.z
|
||||
else
|
||||
nc, nz, nx, ny = nil, nil, nil, nil
|
||||
end
|
||||
end
|
||||
|
||||
if nc and nz > 0 then --and QuestHelper_IndexLookup[nc] then -- QuestHelper_IndexLookup is only initialized after we've finished the preinit step
|
||||
self.c, self.z, self.x, self.y = nc, nz, nx, ny
|
||||
local upd_zone = false
|
||||
--if self.i ~= QuestHelper_IndexLookup[nc][nz] then upd_zone = true end
|
||||
--self.i = QuestHelper_IndexLookup[nc][nz]
|
||||
--if upd_zone then QH_Route_Filter_Rescan("filter_zone") end
|
||||
end
|
||||
|
||||
if nc and nz and nx and ny and tc and tx and ty then
|
||||
self.collect_rc, self.collect_rz, self.collect_rx, self.collect_ry = nc, nz, nx, ny
|
||||
self.collect_ac, self.collect_ax, self.collect_ay = tc, tx, ty
|
||||
self.collect_delayed = false
|
||||
|
||||
local ibi = self.InBrokenInstance
|
||||
if nc < -77 then self.InBrokenInstance = true else self.InBrokenInstance = false end
|
||||
|
||||
if ibi and not self.InBrokenInstance then self.minimap_marker:OnUpdate(0) end -- poke
|
||||
else
|
||||
self.collect_delayed = true
|
||||
self.InBrokenInstance = true
|
||||
self.minimap_marker:OnUpdate(0) -- poke
|
||||
end
|
||||
|
||||
if not UnitOnTaxi("player") and not UnitIsDeadOrGhost("player") then
|
||||
QuestHelper.routing_ac, QuestHelper.routing_ax, QuestHelper.routing_ay, QuestHelper.routing_c, QuestHelper.routing_z = QuestHelper.collect_ac, QuestHelper.collect_ax, QuestHelper.collect_ay, QuestHelper.c, QuestHelper.z
|
||||
QuestHelper.routing_x, QuestHelper.routing_y, QuestHelper.routing_m, QuestHelper.routing_f = QuestHelper.collect_rx, QuestHelper.collect_ry, QuestHelper.rm, QuestHelper.rf
|
||||
end
|
||||
|
||||
QH_Timeslice_Toggle("routing", not not self.c)
|
||||
QH_Timeslice_Toggle("routing", not not self.m)
|
||||
|
||||
self:PumpCommMessages()
|
||||
--end
|
||||
|
|
@ -719,10 +689,13 @@ end)
|
|||
-- Some or all of these may be nil. c,x,y should be enough for a location - c is the pure continent (currently either 0 or 3 for Azeroth or Outland, or -77 for the DK starting zone) and x,y are the coordinates within that continent.
|
||||
-- rc and rz are the continent and zone that Questhelper thinks it's within. For various reasons, this isn't perfect. TODO: Base it off the map zone name identifiers instead of the map itself?
|
||||
function QuestHelper:Location_RawRetrieve()
|
||||
return self.collect_delayed, self.collect_rc, self.collect_rz, self.collect_rx, self.collect_ry
|
||||
return self.collect_rm, self.collect_rf, self.collect_rx, self.collect_ry
|
||||
end
|
||||
|
||||
--[[
|
||||
function QuestHelper:Location_AbsoluteRetrieve()
|
||||
return self.collect_delayed, self.collect_ac, self.collect_ax, self.collect_ay
|
||||
end
|
||||
--]]
|
||||
|
||||
--QH_Hook(QuestHelper, "OnEvent", QuestHelper.OnEvent)
|
||||
|
|
|
|||
Référencer dans un nouveau ticket