Adapt to networks v0.08
This commit is contained in:
parent
da15e05496
commit
086594e24c
@ -175,7 +175,7 @@ local function after_dig_node3(pos, oldnode)
|
|||||||
techage.del_mem(pos)
|
techage.del_mem(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if nvm.running then
|
if nvm.running then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
@ -127,7 +127,7 @@ local function after_dig_node(pos, oldnode)
|
|||||||
techage.del_mem(pos)
|
techage.del_mem(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
@ -227,7 +227,7 @@ local function on_receive_fields(pos, formname, fields, player)
|
|||||||
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_storage_data(pos, tlib2)
|
local function get_storage_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
nvm.capa_max = nvm.capa_max or 1
|
nvm.capa_max = nvm.capa_max or 1
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
|
@ -164,7 +164,7 @@ local function after_dig_node(pos, oldnode, oldmetadata, digger)
|
|||||||
Cable:after_dig_node(pos)
|
Cable:after_dig_node(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
3
init.lua
3
init.lua
@ -36,6 +36,9 @@ elseif minetest.global_exists("lcdlib") and lcdlib.version < 1.0 then
|
|||||||
elseif minetest.global_exists("safer_lua") and safer_lua.version < 1.0 then
|
elseif minetest.global_exists("safer_lua") and safer_lua.version < 1.0 then
|
||||||
minetest.log("error", "[techage] Techage requires safer_lua version 1.0 or newer!")
|
minetest.log("error", "[techage] Techage requires safer_lua version 1.0 or newer!")
|
||||||
return
|
return
|
||||||
|
elseif minetest.global_exists("networks") and networks.version < 0.08 then
|
||||||
|
minetest.log("error", "[techage] Techage requires networks version 0.08 or newer!")
|
||||||
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Test MT 5.4 new string mode
|
-- Test MT 5.4 new string mode
|
||||||
|
@ -158,7 +158,7 @@ local function on_rightclick(pos, node, clicker)
|
|||||||
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / nvm.max_power, perf = nvm.max_power, capa = nvm.max_power * 2}
|
return {level = (nvm.load or 0) / nvm.max_power, perf = nvm.max_power, capa = nvm.max_power * 2}
|
||||||
|
@ -121,7 +121,7 @@ local function after_dig_node(pos, oldnode)
|
|||||||
techage.del_mem(pos)
|
techage.del_mem(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 4}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 4}
|
||||||
|
@ -158,7 +158,7 @@ minetest.register_node("techage:ta2_winch", {
|
|||||||
techage.del_mem(pos)
|
techage.del_mem(pos)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
get_storage_data = function(pos, tlib2)
|
get_storage_data = function(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
nvm.capa = nvm.capa or 1
|
nvm.capa = nvm.capa or 1
|
||||||
if nvm.running then
|
if nvm.running then
|
||||||
|
@ -87,7 +87,7 @@ local function on_receive_fields(pos, formname, fields, player)
|
|||||||
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_storage_data(pos, tlib2)
|
local function get_storage_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if nvm.running then
|
if nvm.running then
|
||||||
return {level = (nvm.capa or 0) / PWR_CAPA, capa = PWR_CAPA}
|
return {level = (nvm.capa or 0) / PWR_CAPA, capa = PWR_CAPA}
|
||||||
|
@ -72,7 +72,7 @@ local function node_timer_off(pos, elapsed)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if nvm.running then
|
if nvm.running then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
@ -77,7 +77,7 @@ local function node_timer_off(pos, elapsed)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if nvm.running then
|
if nvm.running then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
@ -164,7 +164,7 @@ local function on_rightclick(pos, node, clicker)
|
|||||||
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if nvm.running and techage.is_running(nvm) then
|
if nvm.running and techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
@ -112,10 +112,13 @@ local function after_dig_node(pos, oldnode, oldmetadata, digger)
|
|||||||
techage.del_mem(pos)
|
techage.del_mem(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
-- check for secondary/generator side
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
if outdir == M(pos):get_int("outdir") then
|
||||||
|
if techage.is_running(nvm) then
|
||||||
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ local function after_dig_node(pos, oldnode, oldmetadata, digger)
|
|||||||
techage.del_mem(pos)
|
techage.del_mem(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
@ -174,7 +174,7 @@ local function on_receive_fields(pos, formname, fields, player)
|
|||||||
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
M(pos):set_string("formspec", formspec(State, pos, nvm))
|
||||||
end
|
end
|
||||||
|
|
||||||
local function get_generator_data(pos, tlib2)
|
local function get_generator_data(pos, outdir, tlib2)
|
||||||
local nvm = techage.get_nvm(pos)
|
local nvm = techage.get_nvm(pos)
|
||||||
if techage.is_running(nvm) then
|
if techage.is_running(nvm) then
|
||||||
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
return {level = (nvm.load or 0) / PWR_PERF, perf = PWR_PERF, capa = PWR_PERF * 2}
|
||||||
|
Loading…
Reference in New Issue
Block a user