From c41f6509cf2758945fbc0810ff9d7ab0fc077228 Mon Sep 17 00:00:00 2001
From: _TarkFrench <39446667+Tarku@users.noreply.github.com>
Date: Sat, 26 Oct 2019 19:34:17 +0200
Subject: [PATCH] French translation: fix some errors and ortho (#513)
---
technic/machines/HV/forcefield.lua | 212 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 173 insertions(+), 39 deletions(-)
diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua
index 5a1cced..29c023d 100644
--- a/technic/machines/HV/forcefield.lua
+++ b/technic/machines/HV/forcefield.lua
@@ -1,24 +1,38 @@
--- Forcefield mod by ShadowNinja
--- Modified by kpoppel
+--- Forcefield generator.
+-- @author ShadowNinja
--
-- Forcefields are powerful barriers but they consume huge amounts of power.
--- Forcefield Generator is a HV machine.
+-- The forcefield Generator is an HV machine.
-- How expensive is the generator?
-- Leaves room for upgrades lowering the power drain?
+local digilines_path = minetest.get_modpath("digilines")
+
local forcefield_power_drain = 10
-local forcefield_step_interval = 1
local S = technic.getter
+local cable_entry = "^technic_cable_connection_overlay.png"
+
minetest.register_craft({
- output = 'technic:forcefield_emitter_off',
+ output = "technic:forcefield_emitter_off",
recipe = {
- {'default:mese', 'technic:motor', 'default:mese' },
- {'technic:deployer_off', 'technic:machine_casing', 'technic:deployer_off'},
- {'default:mese', 'technic:hv_cable0', 'default:mese' },
+ {"default:mese", "basic_materials:motor", "default:mese" },
+ {"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"},
+ {"default:mese", "technic:hv_cable", "default:mese" },
}
})
+
+
+local replaceable_cids = {}
+
+minetest.after(0, function()
+ for name, ndef in pairs(minetest.registered_nodes) do
+ if ndef.buildable_to == true and name ~= "ignore" then
+ replaceable_cids[minetest.get_content_id(name)] = true
+ end
+ end
+end)
-- Idea: Let forcefields have different colors by upgrade slot.
@@ -32,24 +46,24 @@
local shape = meta:get_int("shape")
local range = meta:get_int("range")
local vm = VoxelManip()
- local p1 = {x = pos.x-range, y = pos.y-range, z = pos.z-range}
- local p2 = {x = pos.x+range, y = pos.y+range, z = pos.z+range}
- local MinEdge, MaxEdge = vm:read_from_map(p1, p2)
+ local MinEdge, MaxEdge = vm:read_from_map(vector.subtract(pos, range),
+ vector.add(pos, range))
local area = VoxelArea:new({MinEdge = MinEdge, MaxEdge = MaxEdge})
local data = vm:get_data()
- local c_air = minetest.get_content_id("air")
+ local c_air = minetest.get_content_id("air")
local c_field = minetest.get_content_id("technic:forcefield")
- for z=-range, range do
- for y=-range, range do
- local vi = area:index(pos.x+(-range), pos.y+y, pos.z+z)
- for x=-range, range do
+ for z = -range, range do
+ for y = -range, range do
+ local vi = area:index(pos.x + (-range), pos.y + y, pos.z + z)
+ for x = -range, range do
local relevant
if shape == 0 then
+ local squared = x * x + y * y + z * z
relevant =
- x*x+y*y+z*z <= range * range + range and
- x*x+y*y+z*z >= (range-1) * (range-1) + (range-1)
+ squared <= range * range + range and
+ squared >= (range - 1) * (range - 1) + (range - 1)
else
relevant =
x == -range or x == range or
@@ -57,9 +71,10 @@
z == -range or z == range
end
if relevant then
- if active and data[vi] == c_air then
+ local cid = data[vi]
+ if active and replaceable_cids[cid] then
data[vi] = c_field
- elseif not active and data[vi] == c_field then
+ elseif not active and cid == c_field then
data[vi] = c_air
end
end
@@ -71,11 +86,17 @@
vm:set_data(data)
vm:update_liquids()
vm:write_to_map()
- vm:update_map()
end
local function set_forcefield_formspec(meta)
- local formspec = "size[5,2.25]"..
+ local formspec
+ if digilines_path then
+ formspec = "size[5,3.25]"..
+ "field[0.3,3;5,1;channel;Digiline Channel;"..meta:get_string("channel").."]"
+ else
+ formspec = "size[5,2.25]"
+ end
+ formspec = formspec..
"field[0.3,0.5;2,1;range;"..S("Range")..";"..meta:get_int("range").."]"
-- The names for these toggle buttons are explicit about which
-- state they'll switch to, so that multiple presses (arising
@@ -100,6 +121,12 @@
end
local forcefield_receive_fields = function(pos, formname, fields, sender)
+ local player_name = sender:get_player_name()
+ if minetest.is_protected(pos, player_name) then
+ minetest.chat_send_player(player_name, "You are not allowed to edit this!")
+ minetest.record_protection_violation(pos, player_name)
+ return
+ end
local meta = minetest.get_meta(pos)
local range = nil
if fields.range then
@@ -115,9 +142,10 @@
update_forcefield(pos, meta, false)
end
if range then meta:set_int("range", range) end
- if fields.shape0 then meta:set_int("shape", 0) end
- if fields.shape1 then meta:set_int("shape", 1) end
- if fields.enable then meta:set_int("enabled", 1) end
+ if fields.channel then meta:set_string("channel", fields.channel) end
+ if fields.shape0 then meta:set_int("shape", 0) end
+ if fields.shape1 then meta:set_int("shape", 1) end
+ if fields.enable then meta:set_int("enabled", 1) end
if fields.disable then meta:set_int("enabled", 0) end
if fields.mesecon_mode_0 then meta:set_int("mesecon_mode", 0) end
if fields.mesecon_mode_1 then meta:set_int("mesecon_mode", 1) end
@@ -135,11 +163,89 @@
}
}
-local run = function(pos, node, active_object_count, active_object_count_wider)
+local digiline_def = {
+ receptor = {action = function() end},
+ effector = {
+ action = function(pos, node, channel, msg)
+ local meta = minetest.get_meta(pos)
+ if channel ~= meta:get_string("channel") then
+ return
+ end
+ local msgt = type(msg)
+ if msgt == "string" then
+ local smsg = msg:lower()
+ msg = {}
+ if smsg == "get" then
+ msg.command = "get"
+ elseif smsg == "off" then
+ msg.command = "off"
+ elseif smsg == "on" then
+ msg.command = "on"
+ elseif smsg == "toggle" then
+ msg.command = "toggle"
+ elseif smsg:sub(1, 5) == "range" then
+ msg.command = "range"
+ msg.value = tonumber(smsg:sub(7))
+ elseif smsg:sub(1, 5) == "shape" then
+ msg.command = "shape"
+ msg.value = smsg:sub(7):lower()
+ msg.value = tonumber(msg.value) or msg.value
+ end
+ elseif msgt ~= "table" then
+ return
+ end
+ if msg.command == "get" then
+ digilines.receptor_send(pos, digilines.rules.default, channel, {
+ enabled = meta:get_int("enabled"),
+ range = meta:get_int("range"),
+ shape = meta:get_int("shape")
+ })
+ return
+ elseif msg.command == "off" then
+ meta:set_int("enabled", 0)
+ elseif msg.command == "on" then
+ meta:set_int("enabled", 1)
+ elseif msg.command == "toggle" then
+ local onn = meta:get_int("enabled")
+ onn = 1-onn -- Mirror onn with pivot 0.5, so switch between 1 and 0.
+ meta:set_int("enabled", onn)
+ elseif msg.command == "range" then
+ if type(msg.value) ~= "number" then
+ return
+ end
+ msg.value = math.max(msg.value, 5)
+ msg.value = math.min(msg.value, 20)
+ update_forcefield(pos, meta, false)
+ meta:set_int("range", msg.value)
+ elseif msg.command == "shape" then
+ local valuet = type(msg.value)
+ if valuet == "string" then
+ if msg.value == "sphere" then
+ msg.value = 0
+ elseif msg.value == "cube" then
+ msg.value = 1
+ end
+ elseif valuet ~= "number" then
+ return
+ end
+ if not msg.value then
+ return
+ end
+ update_forcefield(pos, meta, false)
+ meta:set_int("shape", msg.value)
+ else
+ return
+ end
+ set_forcefield_formspec(meta)
+ end
+ },
+}
+
+local function run(pos, node)
local meta = minetest.get_meta(pos)
local eu_input = meta:get_int("HV_EU_input")
- local eu_demand = meta:get_int("HV_EU_demand")
- local enabled = meta:get_int("enabled") ~= 0 and (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0)
+ local enabled = meta:get_int("enabled") ~= 0 and
+ (meta:get_int("mesecon_mode") == 0 or meta:get_int("mesecon_effect") ~= 0)
local machine_name = S("%s Forcefield Emitter"):format("HV")
local range = meta:get_int("range")
@@ -153,13 +259,15 @@
if not enabled then
if node.name == "technic:forcefield_emitter_on" then
- meta:set_int("HV_EU_demand", 0)
update_forcefield(pos, meta, false)
technic.swap_node(pos, "technic:forcefield_emitter_off")
meta:set_string("infotext", S("%s Disabled"):format(machine_name))
- return
end
- elseif eu_input < power_requirement then
+ meta:set_int("HV_EU_demand", 0)
+ return
+ end
+ meta:set_int("HV_EU_demand", power_requirement)
+ if eu_input < power_requirement then
meta:set_string("infotext", S("%s Unpowered"):format(machine_name))
if node.name == "technic:forcefield_emitter_on" then
update_forcefield(pos, meta, false)
@@ -172,13 +280,19 @@
end
update_forcefield(pos, meta, true)
end
- meta:set_int("HV_EU_demand", power_requirement)
end
minetest.register_node("technic:forcefield_emitter_off", {
description = S("%s Forcefield Emitter"):format("HV"),
- tiles = {"technic_forcefield_emitter_off.png"},
- groups = {cracky = 1, technic_machine = 1},
+ tiles = {
+ "technic_forcefield_emitter_off.png",
+ "technic_machine_bottom.png"..cable_entry,
+ "technic_forcefield_emitter_off.png",
+ "technic_forcefield_emitter_off.png",
+ "technic_forcefield_emitter_off.png",
+ "technic_forcefield_emitter_off.png"
+ },
+ groups = {cracky = 1, technic_machine = 1, technic_hv = 1},
on_receive_fields = forcefield_receive_fields,
on_construct = function(pos)
local meta = minetest.get_meta(pos)
@@ -188,17 +302,29 @@
meta:set_int("enabled", 0)
meta:set_int("mesecon_mode", 0)
meta:set_int("mesecon_effect", 0)
+ if digilines_path then
+ meta:set_string("channel", "forcefield"..minetest.pos_to_string(pos))
+ end
meta:set_string("infotext", S("%s Forcefield Emitter"):format("HV"))
set_forcefield_formspec(meta)
end,
mesecons = mesecons,
+ digiline = digiline_def,
technic_run = run,
})
minetest.register_node("technic:forcefield_emitter_on", {
description = S("%s Forcefield Emitter"):format("HV"),
- tiles = {"technic_forcefield_emitter_on.png"},
- groups = {cracky = 1, technic_machine = 1, not_in_creative_inventory=1},
+ tiles = {
+ "technic_forcefield_emitter_on.png",
+ "technic_machine_bottom.png"..cable_entry,
+ "technic_forcefield_emitter_on.png",
+ "technic_forcefield_emitter_on.png",
+ "technic_forcefield_emitter_on.png",
+ "technic_forcefield_emitter_on.png"
+ },
+ groups = {cracky = 1, technic_machine = 1, technic_hv = 1,
+ not_in_creative_inventory=1},
drop = "technic:forcefield_emitter_off",
on_receive_fields = forcefield_receive_fields,
on_destruct = function(pos)
@@ -206,11 +332,16 @@
update_forcefield(pos, meta, false)
end,
mesecons = mesecons,
+ digiline = digiline_def,
technic_run = run,
technic_on_disable = function (pos, node)
local meta = minetest.get_meta(pos)
update_forcefield(pos, meta, false)
technic.swap_node(pos, "technic:forcefield_emitter_off")
+ end,
+ on_blast = function(pos, intensity)
+ minetest.dig_node(pos)
+ return {"technic:forcefield_emitter_off"}
end,
})
@@ -218,9 +349,10 @@
description = S("%s Forcefield"):format("HV"),
sunlight_propagates = true,
drawtype = "glasslike",
- groups = {not_in_creative_inventory=1, unbreakable=1},
+ groups = {not_in_creative_inventory=1},
paramtype = "light",
- light_source = 15,
+ light_source = default.LIGHT_MAX,
+ diggable = false,
drop = '',
tiles = {{
name = "technic_forcefield_animated.png",
@@ -231,11 +363,13 @@
length = 1.0,
},
}},
+ on_blast = function(pos, intensity)
+ end,
})
if minetest.get_modpath("mesecons_mvps") then
- mesecon:register_mvps_stopper("technic:forcefield")
+ mesecon.register_mvps_stopper("technic:forcefield")
end
technic.register_machine("HV", "technic:forcefield_emitter_on", technic.receiver)
--
Gitblit v1.8.0