Use Enums instead of hardcoded values
This commit is contained in:
parent
7978fbae92
commit
1a35bcdfbf
|
@ -20,7 +20,7 @@ function modul.Guess(id)
|
||||||
local dif = dbcount - count
|
local dif = dbcount - count
|
||||||
modul['db'][playerID] = modul['db'][playerID] or {}
|
modul['db'][playerID] = modul['db'][playerID] or {}
|
||||||
local tab = modul['db'][playerID]
|
local tab = modul['db'][playerID]
|
||||||
for bag = 5, GetNumBankSlots() + 4 do
|
for bag = Enum.BagIndex.BankBag_1 ,Enum.BagIndex.BankBag_1 + GetNumBankSlots() - 1 do
|
||||||
local btab = tab[bag]
|
local btab = tab[bag]
|
||||||
if(btab and btab[id] and btab[id]['count'] > 0) then
|
if(btab and btab[id] and btab[id]['count'] > 0) then
|
||||||
while(dif > 0 and btab[id]['count'] > 0) do
|
while(dif > 0 and btab[id]['count'] > 0) do
|
||||||
|
@ -54,7 +54,7 @@ local function scanAllBankBags(delayed)
|
||||||
if(playerID) then
|
if(playerID) then
|
||||||
modul['db'][playerID] = modul['db'][playerID] or {}
|
modul['db'][playerID] = modul['db'][playerID] or {}
|
||||||
local tab = modul['db'][playerID]
|
local tab = modul['db'][playerID]
|
||||||
for bag=5,GetNumBankSlots()+4 do
|
for bag = Enum.BagIndex.BankBag_1 ,Enum.BagIndex.BankBag_1 + GetNumBankSlots() - 1 do
|
||||||
tab[bag] = tab[bag] or {}
|
tab[bag] = tab[bag] or {}
|
||||||
if(BankIsOpen) then
|
if(BankIsOpen) then
|
||||||
tab[bag] = child:scanBag(bag) -- loop all bought bankbags
|
tab[bag] = child:scanBag(bag) -- loop all bought bankbags
|
||||||
|
@ -63,13 +63,13 @@ local function scanAllBankBags(delayed)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if(BankIsOpen) then
|
if(BankIsOpen) then
|
||||||
tab[-1] = child:scanBag(-1) -- Main bankbag
|
tab[Enum.BagIndex.Bank] = child:scanBag(Enum.BagIndex.Bank) -- Main bankbag
|
||||||
else
|
else
|
||||||
guess(tab[-1])
|
guess(tab[Enum.BagIndex.Bank])
|
||||||
end
|
end
|
||||||
tab[-3] = child:scanBag(-3) -- Main reagentbag
|
tab[Enum.BagIndex.Reagentbank] = child:scanBag(Enum.BagIndex.Reagentbank) -- Main reagentbag
|
||||||
for k,v in pairs(modul['db'][playerID]) do
|
for k,v in pairs(modul['db'][playerID]) do
|
||||||
if(not(k == -1) and not(k == -3) and not(k > 4 and k <= GetNumBankSlots() + 4)) then
|
if(not(k == Enum.BagIndex.Bank) and not(k == Enum.BagIndex.Reagentbank) and not(k > Enum.BagIndex.ReagentBag and k <= GetNumBankSlots() + Enum.BagIndex.ReagentBag)) then
|
||||||
tab[k] = nil -- prevent bogus bankbags
|
tab[k] = nil -- prevent bogus bankbags
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -85,7 +85,7 @@ local function bagLoop(id, res)
|
||||||
if(playerID and units[k]['faction'] == units[playerID]['faction']) then
|
if(playerID and units[k]['faction'] == units[playerID]['faction']) then
|
||||||
local unitname = units[k]['name']
|
local unitname = units[k]['name']
|
||||||
for bag, list in pairs(v) do
|
for bag, list in pairs(v) do
|
||||||
dName = (bag == -3) and desc2 or desc
|
dName = (bag == Enum.BagIndex.Reagentbank) and desc2 or desc
|
||||||
for a, b in pairs(list) do
|
for a, b in pairs(list) do
|
||||||
if(a == id) then
|
if(a == id) then
|
||||||
res[unitname] = res[unitname] or {
|
res[unitname] = res[unitname] or {
|
||||||
|
|
Loading…
Reference in New Issue