From e90b28895cc28daf1a2e4fb772bd191400cf9e62 Mon Sep 17 00:00:00 2001
From: fgrosswig <falk@grosswig.de>
Date: Mon, 06 Jan 2020 21:50:15 +0100
Subject: [PATCH] battery_box.lua: Make "srcstack" local (#525)
---
technic/machines/LV/water_mill.lua | 161 +++++++++++++++++++++++++++--------------------------
1 files changed, 83 insertions(+), 78 deletions(-)
diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua
index bf67268..ed3c1e1 100644
--- a/technic/machines/LV/water_mill.lua
+++ b/technic/machines/LV/water_mill.lua
@@ -1,103 +1,108 @@
-- A water mill produces LV EUs by exploiting flowing water across it
--- It is a LV EU supplyer and fairly low yield (max 120EUs)
--- It is a little under half as good as the thermal generator.
+-- It is a LV EU supplier and fairly low yield (max 180EUs)
+-- It is a little over half as good as the thermal generator.
local S = technic.getter
+
+local cable_entry = "^technic_cable_connection_overlay.png"
minetest.register_alias("water_mill", "technic:water_mill")
minetest.register_craft({
output = 'technic:water_mill',
recipe = {
- {'default:stone', 'default:stone', 'default:stone'},
- {'group:wood', 'default:diamond', 'group:wood'},
- {'default:stone', 'default:copper_ingot', 'default:stone'},
+ {'technic:marble', 'default:diamond', 'technic:marble'},
+ {'group:wood', 'technic:machine_casing', 'group:wood'},
+ {'technic:marble', 'technic:lv_cable', 'technic:marble'},
}
-})
-
-minetest.register_node("technic:water_mill", {
- description = S("Water Mill"),
- tiles = {"technic_water_mill_top.png", "technic_machine_bottom.png",
- "technic_water_mill_side.png", "technic_water_mill_side.png",
- "technic_water_mill_side.png", "technic_water_mill_side.png"},
- paramtype2 = "facedir",
- groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
- legacy_facedir_simple = true,
- sounds = default.node_sound_wood_defaults(),
- on_construct = function(pos)
- local meta = minetest.get_meta(pos)
- meta:set_string("infotext", S("Water Mill"))
- meta:set_int("LV_EU_supply", 0)
- end,
-})
-
-minetest.register_node("technic:water_mill_active", {
- description = S("Water Mill"),
- tiles = {"technic_water_mill_top_active.png", "technic_machine_bottom.png",
- "technic_water_mill_side.png", "technic_water_mill_side.png",
- "technic_water_mill_side.png", "technic_water_mill_side.png"},
- paramtype2 = "facedir",
- groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1},
- legacy_facedir_simple = true,
- sounds = default.node_sound_wood_defaults(),
- drop = "technic:water_mill",
})
local function check_node_around_mill(pos)
local node = minetest.get_node(pos)
- if node.name == "default:water_flowing" or
- node.name == "default:water_source" then
- return true
+ if node.name == "default:water_flowing"
+ or node.name == "default:river_water_flowing" then
+ return node.param2 -- returns approx. water flow, if any
end
return false
end
-minetest.register_abm({
- nodenames = {"technic:water_mill", "technic:water_mill_active"},
- interval = 1,
- chance = 1,
- action = function(pos, node, active_object_count, active_object_count_wider)
- local meta = minetest.get_meta(pos)
- local water_nodes = 0
- local lava_nodes = 0
- local production_level = 0
- local eu_supply = 0
+local run = function(pos, node)
+ local meta = minetest.get_meta(pos)
+ local water_flow = 0
+ local production_level = 0
+ local eu_supply = 0
+ local max_output = 4 * 45 -- keeping it around 180, little more than previous 150 :)
- local positions = {
- {x=pos.x+1, y=pos.y, z=pos.z},
- {x=pos.x-1, y=pos.y, z=pos.z},
- {x=pos.x, y=pos.y, z=pos.z+1},
- {x=pos.x, y=pos.y, z=pos.z-1},
- }
+ local positions = {
+ {x=pos.x+1, y=pos.y, z=pos.z},
+ {x=pos.x-1, y=pos.y, z=pos.z},
+ {x=pos.x, y=pos.y, z=pos.z+1},
+ {x=pos.x, y=pos.y, z=pos.z-1},
+ }
- for _, p in pairs(positions) do
- local check = check_node_around_mill(p)
- if check then
- water_nodes = water_nodes + 1
- end
- end
-
- production_level = 25 * water_nodes
- eu_supply = 30 * water_nodes
-
- if production_level > 0 then
- meta:set_int("LV_EU_supply", eu_supply)
- end
-
- meta:set_string("infotext",
- S("Water Mill").." ("..production_level.."%)")
-
- if production_level > 0 and
- minetest.get_node(pos).name == "technic:water_mill" then
- hacky_swap_node (pos, "technic:water_mill_active")
- meta:set_int("LV_EU_supply", 0)
- return
- end
- if production_level == 0 then
- hacky_swap_node(pos, "technic:water_mill")
+ for _, p in pairs(positions) do
+ local check = check_node_around_mill(p)
+ if check then
+ water_flow = water_flow + check
end
end
-})
+
+ eu_supply = math.min(4 * water_flow, max_output)
+ production_level = math.floor(100 * eu_supply / max_output)
+
+ meta:set_int("LV_EU_supply", eu_supply)
+
+ meta:set_string("infotext",
+ S("Hydro %s Generator"):format("LV").." ("..production_level.."%)")
+
+ if production_level > 0 and
+ minetest.get_node(pos).name == "technic:water_mill" then
+ technic.swap_node (pos, "technic:water_mill_active")
+ meta:set_int("LV_EU_supply", 0)
+ return
+ end
+ if production_level == 0 then
+ technic.swap_node(pos, "technic:water_mill")
+ end
+end
+
+minetest.register_node("technic:water_mill", {
+ description = S("Hydro %s Generator"):format("LV"),
+ tiles = {
+ "technic_water_mill_top.png",
+ "technic_machine_bottom.png"..cable_entry,
+ "technic_water_mill_side.png",
+ "technic_water_mill_side.png",
+ "technic_water_mill_side.png",
+ "technic_water_mill_side.png"
+ },
+ paramtype2 = "facedir",
+ groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+ technic_machine=1, technic_lv=1},
+ legacy_facedir_simple = true,
+ sounds = default.node_sound_wood_defaults(),
+ on_construct = function(pos)
+ local meta = minetest.get_meta(pos)
+ meta:set_string("infotext", S("Hydro %s Generator"):format("LV"))
+ meta:set_int("LV_EU_supply", 0)
+ end,
+ technic_run = run,
+})
+
+minetest.register_node("technic:water_mill_active", {
+ description = S("Hydro %s Generator"):format("LV"),
+ tiles = {"technic_water_mill_top_active.png", "technic_machine_bottom.png",
+ "technic_water_mill_side.png", "technic_water_mill_side.png",
+ "technic_water_mill_side.png", "technic_water_mill_side.png"},
+ paramtype2 = "facedir",
+ groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
+ technic_machine=1, technic_lv=1, not_in_creative_inventory=1},
+ legacy_facedir_simple = true,
+ sounds = default.node_sound_wood_defaults(),
+ drop = "technic:water_mill",
+ technic_run = run,
+ technic_disabled_machine_name = "technic:water_mill",
+})
technic.register_machine("LV", "technic:water_mill", technic.producer)
technic.register_machine("LV", "technic:water_mill_active", technic.producer)
--
Gitblit v1.8.0