Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
Showing only changes of commit bd5cba8656 - Show all commits

View File

@@ -873,23 +873,27 @@ end
function turtle.condense() function turtle.condense()
local slots = turtle.getInventory() local slots = turtle.getInventory()
for i = 16, 1, -1 do for i = 1, 16 do
if slots[i].count > 0 then if slots[i].count < 64 then
for j = 1, i - 1 do for j = 16, i + 1, -1 do
if slots[j].count == 0 or slots[i].key == slots[j].key then if slots[j].count > 0 and (slots[i].count == 0 or slots[i].key == slots[j].key) then
turtle.select(i) turtle.select(j)
turtle.transferTo(j, 64) if turtle.transferTo(i) then
local transferred = slots[i].qty - turtle.getItemCount(i) local transferred = turtle.getItemCount(i) - slots[i].qty
slots[j].count = slots[j].count + transferred slots[j].count = slots[j].count - transferred
slots[i].count = slots[i].count - transferred slots[i].count = slots[i].count + transferred
slots[j].key = slots[i].key slots[i].key = slots[j].key
if slots[i].count == 0 then if slots[i].count == 64 then
break
end
else
break break
end end
end end
end end
end end
end end
turtle.select(1)
return true return true
end end