MTSR/techage
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FR controller command interface error

Browse Source
This commit is contained in:
Joachim Stolberg 2022-01-24 17:54:50 +01:00
parent 7ef1a81420
commit c60b242c5d
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fusion_reactor/controller.lua
View File

@ -69,7 +69,7 @@ sched.register(tSched, CALL_RATE1, 1, function(pos, outdir)
local resp = control.request(pos, Cable, outdir, "con", "test_plasma") local resp = control.request(pos, Cable, outdir, "con", "test_plasma")
local cnt = count_trues(resp) local cnt = count_trues(resp)
if cnt ~= EXPECTED_PLASMA_NUM then if cnt ~= EXPECTED_PLASMA_NUM then
return S("Tokamak shape error") return S("Plasma ring shape error")
end end
return true return true
end) end)
@ -98,11 +98,6 @@ sched.register(tSched, CALL_RATE2, 4, function(pos, outdir)
return true return true
end) end)
-- function(pos, outdir)
-- local resp = control.request(pos, Cable, outdir, "con", "no_gas")
-- return "no_gas: " .. concentrate(resp)
-- end,
local function can_start(pos, nvm) local function can_start(pos, nvm)
local outdir = networks.side_to_outdir(pos, "L") local outdir = networks.side_to_outdir(pos, "L")
if not power.power_available(pos, Cable, outdir) then if not power.power_available(pos, Cable, outdir) then
@ -269,6 +264,12 @@ minetest.register_node("techage:ta5_fr_controller_act", {
sounds = default.node_sound_metal_defaults(), sounds = default.node_sound_metal_defaults(),
}) })
techage.register_node({"techage:ta5_fr_controller_pas", "techage:ta5_fr_controller_act"}, {
on_recv_message = function(pos, src, topic, payload)
return State:on_receive_message(pos, topic, payload)
end,
})
power.register_nodes({"techage:ta5_fr_controller_pas", "techage:ta5_fr_controller_act"}, Cable, "con", {"L", "R"}) power.register_nodes({"techage:ta5_fr_controller_pas", "techage:ta5_fr_controller_act"}, Cable, "con", {"L", "R"})
minetest.register_craft({ minetest.register_craft({
@ -279,3 +280,4 @@ minetest.register_craft({
{'default:steel_ingot', 'default:diamond', 'techage:aluminum'}, {'default:steel_ingot', 'default:diamond', 'techage:aluminum'},
}, },
}) })

2
locale/techage.de.tr
View File

@ -242,9 +242,9 @@ Tube Concentrator=Röhren Konzentrator
Cooling failed=Kühlung ausgefallen Cooling failed=Kühlung ausgefallen
Magnet detection error@n(@1% found / 100% expected)=Magneterkennungsfehler@n(@1% erkannt / 100% erwartet) Magnet detection error@n(@1% found / 100% expected)=Magneterkennungsfehler@n(@1% erkannt / 100% erwartet)
Nucleus detection error=Kern nicht erkannt Nucleus detection error=Kern nicht erkannt
Plasma ring shape error=Formfehler des Plasmarings
Shell shape error@n(@1% found / 100% expected)=Hüllenformfehler@n(@1% erkannt / 100% erwartet) Shell shape error@n(@1% found / 100% expected)=Hüllenformfehler@n(@1% erkannt / 100% erwartet)
TA5 Fusion Reactor Controller=TA5 Fusionsreaktor Controller TA5 Fusion Reactor Controller=TA5 Fusionsreaktor Controller
Tokamak shape error=Tokamakformfehler
### controller.lua ### ### controller.lua ###
### heatexchanger2.lua ### ### heatexchanger2.lua ###

2
locale/template.txt
View File

@ -242,9 +242,9 @@ Tube Concentrator=
Cooling failed= Cooling failed=
Magnet detection error@n(@1% found / 100% expected)= Magnet detection error@n(@1% found / 100% expected)=
Nucleus detection error= Nucleus detection error=
Plasma ring shape error=
Shell shape error@n(@1% found / 100% expected)= Shell shape error@n(@1% found / 100% expected)=
TA5 Fusion Reactor Controller= TA5 Fusion Reactor Controller=
Tokamak shape error=
### controller.lua ### ### controller.lua ###
### heatexchanger2.lua ### ### heatexchanger2.lua ###

8
wind_turbine/pillar.lua
View File

@ -21,10 +21,14 @@ minetest.register_node("techage:pillar", {
mesh = "techage_cylinder_07.obj", mesh = "techage_cylinder_07.obj",
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-8/32, -16/32, -8/32, 8/32, 16/32, 8/32}, fixed = {-10/32, -16/32, -10/32, 10/32, 16/32, 10/32},
},
collision_box = {
type = "fixed",
fixed = {-4/32, -16/32, -4/32, 4/32, 16/32, 4/32},
}, },
climbable = true, climbable = true,
walkable = false, walkable = true,
paramtype = "light", paramtype = "light",
backface_culling = true, backface_culling = true,
groups = {cracky=1}, groups = {cracky=1},