diff --git a/fusion_reactor/controller.lua b/fusion_reactor/controller.lua index 31f0401..848cdaf 100644 --- a/fusion_reactor/controller.lua +++ b/fusion_reactor/controller.lua @@ -69,7 +69,7 @@ sched.register(tSched, CALL_RATE1, 1, function(pos, outdir) local resp = control.request(pos, Cable, outdir, "con", "test_plasma") local cnt = count_trues(resp) if cnt ~= EXPECTED_PLASMA_NUM then - return S("Tokamak shape error") + return S("Plasma ring shape error") end return true end) @@ -98,11 +98,6 @@ sched.register(tSched, CALL_RATE2, 4, function(pos, outdir) return true 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 outdir = networks.side_to_outdir(pos, "L") 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(), }) +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"}) minetest.register_craft({ @@ -279,3 +280,4 @@ minetest.register_craft({ {'default:steel_ingot', 'default:diamond', 'techage:aluminum'}, }, }) + diff --git a/locale/techage.de.tr b/locale/techage.de.tr index d9cd4d5..b59c664 100644 --- a/locale/techage.de.tr +++ b/locale/techage.de.tr @@ -242,9 +242,9 @@ Tube Concentrator=Röhren Konzentrator Cooling failed=Kühlung ausgefallen Magnet detection error@n(@1% found / 100% expected)=Magneterkennungsfehler@n(@1% erkannt / 100% erwartet) 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) TA5 Fusion Reactor Controller=TA5 Fusionsreaktor Controller -Tokamak shape error=Tokamakformfehler ### controller.lua ### ### heatexchanger2.lua ### diff --git a/locale/template.txt b/locale/template.txt index bb17203..63384bd 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -242,9 +242,9 @@ Tube Concentrator= Cooling failed= Magnet detection error@n(@1% found / 100% expected)= Nucleus detection error= +Plasma ring shape error= Shell shape error@n(@1% found / 100% expected)= TA5 Fusion Reactor Controller= -Tokamak shape error= ### controller.lua ### ### heatexchanger2.lua ### diff --git a/wind_turbine/pillar.lua b/wind_turbine/pillar.lua index 11551d2..31c83b9 100644 --- a/wind_turbine/pillar.lua +++ b/wind_turbine/pillar.lua @@ -21,10 +21,14 @@ minetest.register_node("techage:pillar", { mesh = "techage_cylinder_07.obj", selection_box = { 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, - walkable = false, + walkable = true, paramtype = "light", backface_culling = true, groups = {cracky=1},