1
0
Bifurcation 0

Commented out the offensive code that was causing issue 448 (not sure why it was being offensive, but it was). Made some data collection adjustments to further streamline parsing in the future.

Cette révision appartient à :
Nathanial.C.Jones 2011-06-19 04:05:19 +00:00
Parent 374eeaccff
révision 163a021f90
5 fichiers modifiés avec 24 ajouts et 21 suppressions

Voir le fichier

@ -1,7 +1,7 @@
QuestHelper_File["collect.lua"] = "4.0.1.$svnversion$"
QuestHelper_Loadtime["collect.lua"] = GetTime()
local --[[ static ]] MINSVNVERSION = 180
local --[[ static ]] MINSVNVERSION = 183
local --[[ static ]] PURGEDEV = false
local debug_output = false
if QuestHelper_File["collect.lua"] == "Development Version" then debug_output = true end
@ -84,12 +84,14 @@ QH_Collect_LZW_Init(nil, API)
local CompressCollection
function QH_Collector_Init()
-- Dunno why, but these statements cause the 1% issue.
--[[
QH_Collector_UpgradeAll(QuestHelper_Collector)
for _, v in pairs(QuestHelper_Collector) do
if not v.modified then v.modified = time() - 7 * 24 * 60 * 60 end -- eugh. Yeah, we set it to be a week ago. It's pretty grim.
end
--]]
QuestHelper_Collector_Version = QuestHelper_Collector_Version_Current
local svnversion = "$svnversion$"

Voir le fichier

@ -39,9 +39,10 @@ local function ScanAchievements(oldADB, newADB)
if v.complete and not oldADB.criteria[k].complete then -- Note that it's possible for objectives to be "uncompleted" when it's things like "do a bunch of shit in one run of this battleground" (see: isle of conquest)
--QuestHelper:TextOut(string.format("Criteria complete, %d", k))
--QuestHelper:TextOut(string.format("Criteria complete, %s", select(1, GetAchievementCriteriaInfo(k))))
if not QHCA[v.parent] then QHCA[v.parent] = {} end
if not QHCA[v.parent][k] then QHCA[v.parent][k] = {} end
table.insert(QHCA[v.parent][k], cloc)
if not QHCA[k] then QHCA[k] = {} end
if not QHCA[k].parent then QHCA[k].parent = v.parent end
if not QHCA[k].achieved then QHCA[k].achieved = {} end
table.insert(QHCA[k].achieved, cloc)
--QHCA[v.parent][k] = (QHCA[v.parent][k] or "") .. cloc
elseif v.progress > oldADB.criteria[k].progress then
--QuestHelper:TextOut(string.format("Criteria progress, %d", k))

Voir le fichier

@ -15,13 +15,17 @@ local function GetRoute(currentname, endnode)
local links = GetNumRoutes(endnode)
if links > 50 then -- links is apparently sometimes 999998. Why? I could not say. It is a mystery. Hopefully this will show up in the datafiles and I'll be able to debug it.
return path, string.format("@@@ WACKYLAND %s %d @@@", TaxiNodeGetType(endnode), links)
if (TaxiNodeGetType(endnode) == "NONE") then
return path, TaxiNodeName(endnode) .. " not currently in use."
else
return path, string.format("@@@ WACKYLAND %s %d @@@", TaxiNodeGetType(endnode), links)
end
end
local route = ""
for j = 1, links - 1 do -- Why only the first n-1 links? Why not all? Research.
if #route > 0 then route = route .. "," end
route = route .. string.format("(%fr,%f)", TaxiGetDestX(endnode, j), TaxiGetDestY(endnode, j))
route = route .. string.format("(%f,%f)", TaxiGetDestX(endnode, j), TaxiGetDestY(endnode, j))
end
return path, route
@ -84,8 +88,8 @@ local function OnUpdate()
end
elseif phase == "FLYING" then
-- yaay
QHCFT[path][route] = (type(QHCFT[path][route]) == "number" and QHCFT[path][route] or 0) + (GetTime() - start_time)
QHCFT[path][route .. "##count"] = (QHCFT[path][route .. "##count"] or 0) + 1
QHCFT[path][route].time = (QHCFT[path][route].time or 0) + (GetTime() - start_time)
QHCFT[path][route].count = (QHCFT[path][route].count or 0) + 1
phase = "IDLE"
path, route, start_time = nil, nil, nil
end

Voir le fichier

@ -86,7 +86,8 @@ local function MouseoverUnit()
data.loc = GetLoc()
data.minrange = minrange
data.maxrange = maxrange
table.insert(critter, data)
if not critter.encounters then critter.encounters = {} end
table.insert(critter.encounters, data)
--Merger.Add(critter, string.format("(%s %s %s),", GetLoc(), tostring(minrange), tostring(maxrange))) --strchar(minrange, maxrange))
if #recentlySeenCritters_Recent >= 100 then

Voir le fichier

@ -48,21 +48,16 @@ local function GetSpecBolus()
for t = 1, GetNumTalentTabs() do -- come on. Is this ever not going to be 3? Seriously? Perhaps someday, but not as of Cat.
local _, tab, _, _, p, _, _, yn = GetTalentTabInfo(t)
p = p or 0
if not yn or p == 0 then talents[tab] = 0 -- No point if locked or no points spent (assuming unlocked even if all possible points spent [available and/or max points for tab]), so we set it to a scalar value of 0, to tell the compiler that it can just assume that everything is 0. I suppose I should collect all talents, but meh.
else
talents_learned = true
talents[tab] = {}
for ta = 1, GetNumTalents(t) do
local talent, _, _, _, rank, _ = GetTalentInfo(t, ta)
if rank > 0 then talents[tab][talent] = rank end -- Let's limit to actual talents
end
talents_learned = true
talents[tab] = {}
for ta = 1, GetNumTalents(t) do
local talent, _, _, _, rank, _ = GetTalentInfo(t, ta)
talents[tab][talent] = rank
end
end
local spec = {}
if talents_learned then spec.talents = talents -- If any talent tree has a talent that has been learned, then keep our work.
else spec.talents = 0 -- Otherwise, ditch our work to save space.
end
spec.talents = talents
spec.class = id
spec.race = race
spec.level = level