From ec00baf4d968c473b78a3e5d8f075c8e4e1da992 Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sun, 16 Jun 2019 22:48:20 +0200 Subject: [PATCH] bugfix --- coal_power_station/akkubox.lua | 20 ++------------------ coal_power_station/firebox.lua | 2 +- furnace/booster.lua | 1 - init.lua | 1 - iron_age/coalburner.lua | 2 +- iron_age/meltingpot.lua | 4 ++-- power/junctionbox.lua | 2 +- power/power.lua | 10 +++++----- steam_engine/cylinder.lua | 2 +- 9 files changed, 13 insertions(+), 31 deletions(-) diff --git a/coal_power_station/akkubox.lua b/coal_power_station/akkubox.lua index fcc6aa5..0da487a 100644 --- a/coal_power_station/akkubox.lua +++ b/coal_power_station/akkubox.lua @@ -112,7 +112,7 @@ end local function get_capa(itemstack) local meta = itemstack:get_meta() if meta then - return in_range(meta:get_int("capa") * (PWR_CAPA/100), 0, 100) + return in_range(meta:get_int("capa") * (PWR_CAPA/100), 0, 3000) end return 0 end @@ -149,8 +149,7 @@ minetest.register_node("techage:ta3_akku", { after_place_node = function(pos, placer, itemstack) local mem = tubelib2.get_mem(pos) State:node_init(pos, mem, "") - --mem.capa = get_capa(itemstack) - mem.capa = 300 + mem.capa = get_capa(itemstack) on_rightclick(pos) end, @@ -190,18 +189,3 @@ minetest.register_craft({ {"techage:iron_ingot", "techage:iron_ingot", "default:wood"}, }, }) - -minetest.register_lbm({ - label = "[techage] Akku conversion", - name = "techage:akku_conversion", - nodenames = {"techage:ta3_akku"}, - run_at_every_load = true, - action = function(pos, node) - local mem = tubelib2.get_mem(pos) - if mem.power_result then -- old node? - mem.power_result = nil - mem.capa = in_range((mem.capa or 0) * 10, 0, PWR_CAPA) - end - end -}) - diff --git a/coal_power_station/firebox.lua b/coal_power_station/firebox.lua index 68e8cf5..91d86fd 100644 --- a/coal_power_station/firebox.lua +++ b/coal_power_station/firebox.lua @@ -39,7 +39,7 @@ end local function node_timer(pos, elapsed) local mem = tubelib2.get_mem(pos) - print("firebox burn_cycles = "..(mem.burn_cycles or 0)) + --print("firebox burn_cycles = "..(mem.burn_cycles or 0)) if mem.running then -- trigger generator and provide power ratio 0..1 local ratio = techage.transfer( diff --git a/furnace/booster.lua b/furnace/booster.lua index 83e2e91..da239dd 100644 --- a/furnace/booster.lua +++ b/furnace/booster.lua @@ -136,7 +136,6 @@ techage.power.register_node({"techage:ta3_booster", "techage:ta3_booster_on"}, { -- for intra machine communication techage.register_node({"techage:ta3_booster", "techage:ta3_booster_on"}, { on_transfer = function(pos, in_dir, topic, payload) - --print("ta3_booster", topic, payload, in_dir) if M(pos):get_int("indir") == in_dir then local mem = tubelib2.get_mem(pos) if topic == "power" then diff --git a/init.lua b/init.lua index 2ea1736..98b93bc 100644 --- a/init.lua +++ b/init.lua @@ -45,7 +45,6 @@ else -- Power networks dofile(MP.."/power/power.lua") - dofile(MP.."/power/power2.lua") dofile(MP.."/power/junction.lua") dofile(MP.."/power/drive_axle.lua") dofile(MP.."/power/steam_pipe.lua") diff --git a/iron_age/coalburner.lua b/iron_age/coalburner.lua index dbc3e48..c44e662 100644 --- a/iron_age/coalburner.lua +++ b/iron_age/coalburner.lua @@ -187,7 +187,7 @@ function techage.start_burner(pos, playername) end function techage.keep_running_burner(pos) - print("keep_running_burner") + --print("keep_running_burner") local meta = minetest.get_meta(pos) local height = meta:get_int("height") remove_flame(pos, height) diff --git a/iron_age/meltingpot.lua b/iron_age/meltingpot.lua index dfa9ebd..9968a25 100644 --- a/iron_age/meltingpot.lua +++ b/iron_age/meltingpot.lua @@ -209,7 +209,7 @@ local function get_heat(pos) pos.y = pos.y - 1 local node = minetest.get_node(pos) local meta = minetest.get_meta(pos) - print("get_heat1", minetest.get_item_group(node.name, "techage_flame")) + --print("get_heat1", minetest.get_item_group(node.name, "techage_flame")) if minetest.get_item_group(node.name, "techage_flame") == 0 then pos.y = pos.y + 1 return 0 @@ -218,7 +218,7 @@ local function get_heat(pos) pos.y = pos.y - 1 node = minetest.get_node(pos) pos.y = pos.y + 2 - print("get_heat2", node.name, minetest.get_item_group(node.name, "techage_flame")) + --print("get_heat2", node.name, minetest.get_item_group(node.name, "techage_flame")) if minetest.get_item_group(node.name, "techage_flame") == 0 and node.name ~= "techage:charcoal_burn" then return 0 diff --git a/power/junctionbox.lua b/power/junctionbox.lua index e933186..5ac5dc9 100644 --- a/power/junctionbox.lua +++ b/power/junctionbox.lua @@ -39,7 +39,7 @@ techage.register_junction("techage:electric_junction", 2/8, Boxes, techage.Elect after_tube_update = function(node, pos, out_dir, peer_pos, peer_in_dir) local name = "techage:electric_junction"..techage.junction_type(pos, techage.ElectricCable) minetest.swap_node(pos, {name = name, param2 = 0}) - techage.power2.on_network_change(pos) ------------ TODO + techage.power.on_network_change(pos) end, }) diff --git a/power/power.lua b/power/power.lua index a9a854f..9f2a21e 100644 --- a/power/power.lua +++ b/power/power.lua @@ -146,7 +146,7 @@ end -- called from any generator local function on_power_switch(pos) - print("on_power_change"..S(pos)) + --print("on_power_change"..S(pos)) local mem = tubelib2.get_mem(pos) mem.master_pos = nil mem.is_master = nil @@ -154,7 +154,7 @@ local function on_power_switch(pos) local mpos = determine_master(pos) store_master(pos, mpos) if mpos then - print("master = "..S(mpos)) + --print("master = "..S(mpos)) local mem = tubelib2.get_mem(mpos) mem.is_master = true return mem @@ -179,9 +179,9 @@ local function accounting(mem) mem.demand1 = min(mem.needed1, mem.available1 + mem.available2) mem.supply2 = min(mem.demand1 - mem.supply1, mem.available2) mem.demand2 = min(mem.supply1 - mem.demand1, mem.available1) - mem.reserve = (mem.available1 + mem.available1) > mem.needed1 - print("needed = "..mem.needed1.."/"..mem.needed2..", available = "..mem.available1.."/"..mem.available2) - print("supply = "..mem.supply1.."/"..mem.supply2..", demand = "..mem.demand1.."/"..mem.demand2..", reserve = "..dump(mem.reserve)) + mem.reserve = (mem.available1 + mem.available2) > mem.needed1 + --print("needed = "..mem.needed1.."/"..mem.needed2..", available = "..mem.available1.."/"..mem.available2) + --print("supply = "..mem.supply1.."/"..mem.supply2..", demand = "..mem.demand1.."/"..mem.demand2..", reserve = "..dump(mem.reserve)) -- reset values for nect cycle mem.needed1 = 0 mem.needed2 = 0 diff --git a/steam_engine/cylinder.lua b/steam_engine/cylinder.lua index 79e2239..8d67f84 100644 --- a/steam_engine/cylinder.lua +++ b/steam_engine/cylinder.lua @@ -110,7 +110,7 @@ techage.register_node({"techage:cylinder", "techage:cylinder_on"}, { if topic == "trigger" then local power = techage.transfer(pos, "R", "trigger", nil, nil, { "techage:flywheel", "techage:flywheel_on"}) or 0 - print("trigger", power, mem.running) + --print("trigger", power, mem.running) if not power then return 0