Dusk/TurtleMail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small opening code improvement

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-02-26 22:03:56 +01:00
parent a3e02ec3d5
commit bb20b4ae96
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
open.lua
+8 -22
View File
@@ -1,6 +1,6 @@
Postal.open = {} Postal.open = {}
local wait_for_update, open, process, inventory_count, stop local wait_for_update, open, process, stop
local controller = (function() local controller = (function()
local controller local controller
@@ -48,39 +48,25 @@ end
function open(i, inbox_count, k) function open(i, inbox_count, k)
wait_for_update(function() wait_for_update(function()
local _, _, _, _, money, COD_amount, _, has_item = GetInboxHeaderInfo(i) local _, _, _, _, money, COD_amount, _, has_item = GetInboxHeaderInfo(i)
if GetInboxNumItems() < inbox_count or COD_amount > 0 then if GetInboxNumItems() < inbox_count then
return k(COD_amount > 0) return k(false)
elseif COD_amount > 0 then
return k(true)
elseif has_item then elseif has_item then
local inventory_count_before = inventory_count()
TakeInboxItem(i) TakeInboxItem(i)
controller().wait(function() return inventory_count() > inventory_count_before end, function() controller().wait(function() return not ({GetInboxHeaderInfo(i)})[8] or GetInboxNumItems() < inbox_count end, function()
return open(i, inbox_count, k) return open(i, inbox_count, k)
end) end)
elseif money > 0 then elseif money > 0 then
local money_before = GetMoney()
TakeInboxMoney(i) TakeInboxMoney(i)
controller().wait(function() return GetMoney() > money_before end, function() controller().wait(function() return ({GetInboxHeaderInfo(i)})[5] == 0 or GetInboxNumItems() < inbox_count end, function()
return open(i, inbox_count, k) return open(i, inbox_count, k)
end) end)
else else
local inbox_count_before = GetInboxNumItems()
DeleteInboxItem(i) DeleteInboxItem(i)
controller().wait(function() return GetInboxNumItems() < inbox_count_before end, function() controller().wait(function() return GetInboxNumItems() < inbox_count end, function()
return open(i, inbox_count, k) return open(i, inbox_count, k)
end) end)
end end
end) end)
end
function inventory_count()
local acc = 0
for bag = 0, 4 do
if GetBagName(bag) then
for slot = 1, GetContainerNumSlots(bag) do
local _, count = GetContainerItemInfo(bag, slot)
acc = acc + (count or 0)
end
end
end
return acc
end end