minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2024-12-24 18:00:29 +01:00
Code Issues Releases Wiki Activity

Supply converter: demany only the needed power (#577)

Browse Source 
Supply converter demands only the needed power to satisfy the demand on the output network. It can still be too much if the output network has other power sources, because supply is not taken in account.

This surplus of energy can be used to charge batteries.
This commit is contained in:
ZettaScript 2022-10-20 17:56:10 +02:00 committed by GitHub
parent fa39b24ed5
commit 718a5beda1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
technic/machines/supply_converter.lua
View File

@ -120,7 +120,7 @@ local run = function(pos, node, run_stage)
return return
end end
local remain = 0.9 local efficiency = 0.9
-- Machine information -- Machine information
local machine_name = S("Supply Converter") local machine_name = S("Supply Converter")
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
@ -133,7 +133,6 @@ local run = function(pos, node, run_stage)
enabled = enabled == "1" enabled = enabled == "1"
end end
enabled = enabled and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0) enabled = enabled and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0)
local demand = enabled and meta:get_int("power") or 0
local pos_up = {x=pos.x, y=pos.y+1, z=pos.z} local pos_up = {x=pos.x, y=pos.y+1, z=pos.z}
local pos_down = {x=pos.x, y=pos.y-1, z=pos.z} local pos_down = {x=pos.x, y=pos.y-1, z=pos.z}
@ -144,14 +143,36 @@ local run = function(pos, node, run_stage)
local to = technic.get_cable_tier(name_down) local to = technic.get_cable_tier(name_down)
if from and to then if from and to then
local input = meta:get_int(from.."_EU_input") -- Get the "to" network switching station for EU demand calculation
meta:set_int(from.."_EU_demand", demand) local network_hash = technic.cables[minetest.hash_node_position(pos_down)]
meta:set_int(from.."_EU_supply", 0) local network = network_hash and minetest.get_position_from_hash(network_hash)
meta:set_int(to.."_EU_demand", 0) local sw_pos = network and {x=network.x,y=network.y+1,z=network.z}
meta:set_int(to.."_EU_supply", input * remain) local timeout = 0
meta:set_string("infotext", S("@1 (@2 @3 -> @4 @5)", machine_name, for tier in pairs(technic.machines) do
technic.EU_string(input), from, -- Supply converter must be connected to a network
technic.EU_string(input * remain), to)) timeout = math.max(meta:get_int(tier.."_EU_timeout"), timeout)
end
if timeout > 0 and sw_pos and minetest.get_node(sw_pos).name == "technic:switching_station" then
local sw_meta = minetest.get_meta(sw_pos)
local demand = 0
if enabled then
-- Reverse evaluate the required machine and round to a nice number
demand = 100 * math.ceil((sw_meta:get_int("demand") / efficiency) / 100)
-- Do not draw more than the limit
demand = math.min(demand, meta:get_int("power"))
end
local input = meta:get_int(from.."_EU_input") -- actual input
meta:set_int(from.."_EU_demand", demand) -- desired input
meta:set_int(from.."_EU_supply", 0)
meta:set_int(to.."_EU_demand", 0)
meta:set_int(to.."_EU_supply", input * efficiency)
meta:set_string("infotext", S("@1 (@2 @3 -> @4 @5)", machine_name,
technic.EU_string(input), from,
technic.EU_string(input * efficiency), to))
else
meta:set_string("infotext",S("%s Has No Network"):format(machine_name))
end
else else
meta:set_string("infotext", S("%s Has Bad Cabling"):format(machine_name)) meta:set_string("infotext", S("%s Has Bad Cabling"):format(machine_name))
if to then if to then