Dateien nach "/" hochladen
This commit is contained in:
+7
-1
@@ -663,6 +663,11 @@ function Roles:ScanTrainer()
|
||||
rec.sn, rec.sr = sn, sr and math.floor(sr) or nil
|
||||
end
|
||||
end
|
||||
local ic = TrainerCall("GetTrainerServiceIcon", i)
|
||||
ic = ic and Util.Clean(ic[1])
|
||||
if (type(ic) == "string" and ic ~= "") or type(ic) == "number" then
|
||||
rec.ic = ic
|
||||
end
|
||||
local cost = FirstNumber(TrainerCall("GetTrainerServiceCost", i), "moneyCost")
|
||||
if cost and not seen[key .. ":" .. cost] then
|
||||
seen[key .. ":" .. cost] = true
|
||||
@@ -1093,7 +1098,7 @@ BuildLearnPlan = function(token)
|
||||
local skey = lv .. "\1" .. (r.sp and ("s" .. r.sp) or key)
|
||||
local sp = seen[skey]
|
||||
if not sp then
|
||||
sp = { nm = r.nm, sp = r.sp, rk = r.rk, lv = lv, pr = {}, trainers = {} }
|
||||
sp = { nm = r.nm, sp = r.sp, rk = r.rk, lv = lv, ic = r.ic, pr = {}, trainers = {} }
|
||||
seen[skey] = sp
|
||||
local g = levels[lv]
|
||||
if not g then
|
||||
@@ -1105,6 +1110,7 @@ BuildLearnPlan = function(token)
|
||||
end
|
||||
sp.rk = sp.rk or r.rk
|
||||
sp.sp = sp.sp or r.sp
|
||||
sp.ic = sp.ic or r.ic
|
||||
for p, n in pairs(r.pr or {}) do sp.pr[p] = (sp.pr[p] or 0) + n end
|
||||
local g = levels[lv]
|
||||
if IsPetTrainer(u) then sp.pet = true end
|
||||
|
||||
+2
-1
@@ -411,7 +411,7 @@ local function TrainTable(src)
|
||||
local nm = Text(r.nm, 60)
|
||||
local pr = PriceMap(r.pr)
|
||||
if nm and pr then
|
||||
out[e[1]] = { nm = nm, sp = Int(r.sp, 1, 10000000), rk = Text(r.rk, 30), lv = Int(r.lv, 1, 130), sn = Text(r.sn, 40), sr = Int(r.sr, 1, 1000), pr = pr }
|
||||
out[e[1]] = { nm = nm, sp = Int(r.sp, 1, 10000000), rk = Text(r.rk, 30), lv = Int(r.lv, 1, 130), sn = Text(r.sn, 40), sr = Int(r.sr, 1, 1000), ic = Text(r.ic, 120), pr = pr }
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
@@ -1687,6 +1687,7 @@ local function MergeTrain(dst, src)
|
||||
d.lv = d.lv or r.lv
|
||||
d.sn = d.sn or r.sn
|
||||
d.sr = d.sr or r.sr
|
||||
d.ic = d.ic or r.ic
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user