MTSR/techage
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix silo load value bug

Browse Source
This commit is contained in:
Joachim Stolberg 2020-12-20 23:58:49 +01:00
parent d1daeef7d7
commit dba2b84b73
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
liquids/silo.lua
View File

@ -209,6 +209,7 @@ minetest.register_node("techage:ta3_silo", {
after_dig_node = function(pos, oldnode, oldmetadata, digger) after_dig_node = function(pos, oldnode, oldmetadata, digger)
Pipe:after_dig_node(pos) Pipe:after_dig_node(pos)
techage.remove_node(pos, oldnode, oldmetadata) techage.remove_node(pos, oldnode, oldmetadata)
techage.del_mem(pos)
end, end,
liquid = tLiquid, liquid = tLiquid,
networks = tNetworks, networks = tNetworks,
@ -254,6 +255,7 @@ minetest.register_node("techage:ta4_silo", {
after_dig_node = function(pos, oldnode, oldmetadata, digger) after_dig_node = function(pos, oldnode, oldmetadata, digger)
Pipe:after_dig_node(pos) Pipe:after_dig_node(pos)
techage.remove_node(pos, oldnode, oldmetadata) techage.remove_node(pos, oldnode, oldmetadata)
techage.del_mem(pos)
end, end,
liquid = tLiquid, liquid = tLiquid,
networks = tNetworks, networks = tNetworks,
@ -272,7 +274,11 @@ techage.register_node({"techage:ta3_silo", "techage:ta4_silo"}, {
on_pull_item = function(pos, in_dir, num) on_pull_item = function(pos, in_dir, num)
local inv = M(pos):get_inventory() local inv = M(pos):get_inventory()
if not inv:is_empty("main") then if not inv:is_empty("main") then
return techage.get_items(pos, inv, "main", num) local taken = techage.get_items(pos, inv, "main", num)
local nvm = techage.get_nvm(pos)
nvm.item_count = nvm.item_count or get_item_count(pos)
nvm.item_count = nvm.item_count - taken:get_count()
return taken
end end
end, end,
on_push_item = function(pos, in_dir, stack) on_push_item = function(pos, in_dir, stack)
@ -284,11 +290,17 @@ techage.register_node({"techage:ta3_silo", "techage:ta4_silo"}, {
if inv:is_empty("main") then if inv:is_empty("main") then
inv:add_item("main", stack) inv:add_item("main", stack)
local nvm = techage.get_nvm(pos)
nvm.item_count = nvm.item_count or get_item_count(pos)
nvm.item_count = nvm.item_count + stack:get_count()
return true return true
end end
if inv:contains_item("main", name) and inv:room_for_item("main", stack) then if inv:contains_item("main", name) and inv:room_for_item("main", stack) then
inv:add_item("main", stack) inv:add_item("main", stack)
local nvm = techage.get_nvm(pos)
nvm.item_count = nvm.item_count or get_item_count(pos)
nvm.item_count = nvm.item_count + stack:get_count()
return true return true
end end
end end
@ -297,6 +309,9 @@ techage.register_node({"techage:ta3_silo", "techage:ta4_silo"}, {
on_unpull_item = function(pos, in_dir, stack) on_unpull_item = function(pos, in_dir, stack)
local meta = M(pos) local meta = M(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local nvm = techage.get_nvm(pos)
nvm.item_count = nvm.item_count or get_item_count(pos)
nvm.item_count = nvm.item_count + stack:get_count()
return techage.put_items(inv, "main", stack) return techage.put_items(inv, "main", stack)
end, end,
on_recv_message = function(pos, src, topic, payload) on_recv_message = function(pos, src, topic, payload)
@ -314,6 +329,10 @@ techage.register_node({"techage:ta3_silo", "techage:ta4_silo"}, {
return "unsupported" return "unsupported"
end end
end, end,
on_node_load = function(pos)
local nvm = techage.get_nvm(pos)
nvm.item_count = nil
end,
}) })
Pipe:add_secondary_node_names({"techage:ta3_silo", "techage:ta4_silo"}) Pipe:add_secondary_node_names({"techage:ta3_silo", "techage:ta4_silo"})

2
power/formspecs.lua
View File

@ -19,7 +19,7 @@
local in_range = techage.in_range local in_range = techage.in_range
function techage.power.percent(max_val, curr_val) function techage.power.percent(max_val, curr_val)
return math.min(math.ceil(((curr_val or 0) * 100.0) / (max_val or 1.0)), 100) return math.min(math.ceil(((curr_val or 0) * 100) / (max_val or 1.0)), 100)
end end
function techage.power.formspec_load_bar(charging, max_val) function techage.power.formspec_load_bar(charging, max_val)