From 43acec290067f9aca534647d46ba1f13cfeb377a Mon Sep 17 00:00:00 2001
From: TechDudie <73961295+TechDudie@users.noreply.github.com>
Date: Tue, 09 Feb 2021 19:03:55 +0100
Subject: [PATCH] Add Rubber Goo as replacement for the grinder (#578)
---
technic/machines/LV/water_mill.lua | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua
index 9088d1d..e26224e 100644
--- a/technic/machines/LV/water_mill.lua
+++ b/technic/machines/LV/water_mill.lua
@@ -1,8 +1,10 @@
-- 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")
@@ -11,25 +13,25 @@
recipe = {
{'technic:marble', 'default:diamond', 'technic:marble'},
{'group:wood', 'technic:machine_casing', 'group:wood'},
- {'technic:marble', 'technic:lv_cable0', 'technic:marble'},
+ {'technic:marble', 'technic:lv_cable', 'technic:marble'},
}
})
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
local run = function(pos, node)
local meta = minetest.get_meta(pos)
- local water_nodes = 0
- local lava_nodes = 0
- local production_level = 0
- local eu_supply = 0
+ local water_flow = 0
+ local production_level
+ local eu_supply
+ 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},
@@ -41,16 +43,14 @@
for _, p in pairs(positions) do
local check = check_node_around_mill(p)
if check then
- water_nodes = water_nodes + 1
+ water_flow = water_flow + check
end
end
- production_level = 25 * water_nodes
- eu_supply = 30 * water_nodes
+ eu_supply = math.min(4 * water_flow, max_output)
+ production_level = math.floor(100 * eu_supply / max_output)
- if production_level > 0 then
- meta:set_int("LV_EU_supply", eu_supply)
- end
+ meta:set_int("LV_EU_supply", eu_supply)
meta:set_string("infotext",
S("Hydro %s Generator"):format("LV").." ("..production_level.."%)")
@@ -68,11 +68,17 @@
minetest.register_node("technic:water_mill", {
description = S("Hydro %s Generator"):format("LV"),
- 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"},
+ 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},
+ 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)
@@ -89,7 +95,8 @@
"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, not_in_creative_inventory=1},
+ 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",
--
Gitblit v1.8.0