Add generator menu to TA5 generator

README.md

@@ -95,12 +95,15 @@ Available worlds will be converted to 'lsqlite3', but there is no way back, so:
 
 ### History
 
-**2023-08-20 V1.17**
+**2023-08-25 V1.17**
 
 - Add support for doclib / remove techage internal doc support  
   **The mod doclib is a new hard depenency !**
 - Fix LICENCSE file bug
 - Add beduino support for TA3 repeater (realmicu)
+- Add inv_name_prefix to `techage.register_consumer` (debiankaios)
+- Add generator menu to TA5 generator (fusion reactor)
+- Adapt mod to the new lcdlib mod
 - Fix some bugs
 
 **2023-06-30 V1.16**

fusion_reactor/generator.lua

@@ -3,7 +3,7 @@
 	TechAge
 	=======
 
-	Copyright (C) 2019-2022 Joachim Stolberg
+	Copyright (C) 2019-2023 Joachim Stolberg
 
 	AGPL v3
 	See LICENSE.txt for more information
@@ -20,8 +20,14 @@ local power = networks.power
 local control = networks.control
 
 local CYCLE_TIME = 2
+local STANDBY_TICKS = 1
+local COUNTDOWN_TICKS = 2
 local PWR_PERF = 800
 
+local function formspec(self, pos, nvm)
+	return techage.generator_formspec(self, pos, nvm, S("TA5 Generator"), nvm.provided, PWR_PERF)
+end
+
 local function swap_node(pos, name)
 	local node = techage.get_node_lvm(pos)
 	if node.name == name then
@@ -31,6 +37,13 @@ local function swap_node(pos, name)
 	minetest.swap_node(pos, node)
 end
 
+local function can_start(pos, nvm, state)
+	if nvm.alive_cnt and nvm.alive_cnt > 0 then
+		return true
+	end
+	return S("no steam")
+end
+
 local function start_node(pos, nvm)
 	local meta = M(pos)
 	nvm.provided = 0
@@ -38,8 +51,6 @@ local function start_node(pos, nvm)
 	techage.evaluate_charge_termination(nvm, meta)
 	local outdir = meta:get_int("outdir")
 	power.start_storage_calc(pos, Cable, outdir)
-	swap_node(pos, "techage:ta5_generator_on")
-	minetest.get_node_timer(pos):start(CYCLE_TIME)
 end
 
 local function stop_node(pos, nvm)
@@ -47,7 +58,32 @@ local function stop_node(pos, nvm)
 	nvm.alive_cnt = 0
 	local outdir = M(pos):get_int("outdir")
 	power.start_storage_calc(pos, Cable, outdir)
-	swap_node(pos, "techage:ta5_generator")
+end
+
+local State = techage.NodeStates:new({
+	node_name_passive = "techage:ta5_generator",
+	node_name_active = "techage:ta5_generator_on",
+	cycle_time = CYCLE_TIME,
+	standby_ticks = STANDBY_TICKS,
+	formspec_func = formspec,
+	infotext_name = S("TA5 Generator"),
+	can_start = can_start,
+	start_node = start_node,
+	stop_node = stop_node,
+})
+
+local function on_receive_fields(pos, formname, fields, player)
+	if minetest.is_protected(pos, player:get_player_name()) then
+		return
+	end
+	local nvm = techage.get_nvm(pos)
+	State:state_button_event(pos, nvm, fields)
+end
+
+local function on_rightclick(pos, node, clicker)
+	local nvm = techage.get_nvm(pos)
+	techage.set_activeformspec(pos, clicker)
+	M(pos):set_string("formspec", formspec(State, pos, nvm))
 end
 
 local function get_generator_data(pos, outdir, tlib2)
@@ -59,8 +95,15 @@ end
 
 local function node_timer(pos, elapsed)
 	local nvm = techage.get_nvm(pos)
+	local running = techage.is_running(nvm)
 	nvm.alive_cnt = (nvm.alive_cnt or 0) - 1
-	if nvm.alive_cnt > 0 then
+	local alive = nvm.alive_cnt > 0
+	if running and not alive then
+		State:standby(pos, nvm, S("no steam"))
+		stop_node(pos, nvm, State)
+	elseif not running and alive then
+		State:start(pos, nvm)
+	elseif running then
 		local meta = M(pos)
 		local outdir = meta:get_int("outdir")
 		local tp1 = tonumber(meta:get_string("termpoint1"))
@@ -70,12 +113,12 @@ local function node_timer(pos, elapsed)
 		if val > 0 then
 			nvm.load = val
 		end
-		return true
+		State:keep_running(pos, nvm, COUNTDOWN_TICKS)
-	else
-		swap_node(pos, "techage:ta5_generator")
-		stop_node(pos, nvm)
-		return false
 	end
+	if techage.is_activeformspec(pos) then
+		M(pos):set_string("formspec", formspec(State, pos, nvm))
+	end
+	return State:is_active(nvm)
 end
 
 minetest.register_node("techage:ta5_generator", {
@@ -91,7 +134,11 @@ minetest.register_node("techage:ta5_generator", {
 	},
 
 	after_place_node = function(pos, placer)
+		local nvm = techage.get_nvm(pos)
+		local number = techage.add_node(pos, "techage:ta5_generator")
+		State:node_init(pos, nvm, number)
 		M(pos):set_int("outdir", networks.side_to_outdir(pos, "R"))
+		M(pos):set_string("formspec", formspec(State, pos, nvm))
 		Cable:after_place_node(pos)
 	end,
 	after_dig_node = function(pos, oldnode)
@@ -101,6 +148,8 @@ minetest.register_node("techage:ta5_generator", {
 
 	get_generator_data = get_generator_data,
 	ta4_formspec = techage.generator_settings("ta4", PWR_PERF),
+	on_receive_fields = on_receive_fields,
+	on_rightclick = on_rightclick,
 	paramtype2 = "facedir",
 	groups = {cracky=2, crumbly=2, choppy=2},
 	on_rotate = screwdriver.disallow,
@@ -140,6 +189,8 @@ minetest.register_node("techage:ta5_generator_on", {
 
 	get_generator_data = get_generator_data,
 	ta4_formspec = techage.generator_settings("ta4", PWR_PERF),
+	on_receive_fields = on_receive_fields,
+	on_rightclick = on_rightclick,
 	on_timer = node_timer,
 	paramtype2 = "facedir",
 	drop = "",
@@ -159,17 +210,40 @@ techage.register_node({"techage:ta5_generator", "techage:ta5_generator_on"}, {
 		if topic == "trigger" then
 			nvm.alive_cnt = 5
 		elseif topic == "start" then
-			start_node(pos, nvm)
+			--start_node(pos, nvm)
 		elseif topic == "stop" then
 			stop_node(pos, nvm)
 		end
 	end,
 	on_recv_message = function(pos, src, topic, payload)
-		return "unsupported"
+		local nvm = techage.get_nvm(pos)
+		if topic == "delivered" then
+			return nvm.provided or 0
+		else
+			return State:on_receive_message(pos, topic, payload)
+		end
+	end,
+	on_beduino_receive_cmnd = function(pos, src, topic, payload)
+		return State:on_beduino_receive_cmnd(pos, topic, payload)
+	end,
+	on_beduino_request_data = function(pos, src, topic, payload)
+		local nvm = techage.get_nvm(pos)
+		if topic == 135 then
+			return 0, {nvm.provided or 0}
+		else
+			return State:on_beduino_request_data(pos, topic, payload)
+		end
 	end,
 	on_node_load = function(pos)
-		-- remove legacy formspec
+		-- Add node number if missing
-		M(pos):set_string("formspec", "")
+		local number = M(pos):get_string("node_number")
+		if number == "" then
+			local nvm = techage.get_nvm(pos)
+			local number = techage.add_node(pos, "techage:ta5_generator")
+			State:node_init(pos, nvm, number)
+			State:start(pos, nvm)
+			M(pos):set_string("formspec", formspec(State, pos, nvm))
+		end
 	end,
 })
 

locale/techage.de.tr

@@ -649,6 +649,7 @@ TA2 Gearbox=TA2 Getriebeblock
 TA3 Generator=TA3 Generator
 TA4 Generator=TA4 Generator
 TA5 Generator=TA5 Generator
+no steam=Kein Dampf
 
 ### generator.lua ###
 ### power_terminal2.lua ###
@@ -681,14 +682,6 @@ TA1 Mill Base=Mühlenunterteil
 
 TA4 LED Grow Light=TA4 LED Pflanzenlampe
 
-### guide.lua ###
-
-No plan available=Kein Plan verfügar
-Plan=Plan
-Sectional view=Schnittbild
-Side view=Seitenansicht
-Top view=Draufsicht
-
 ### hammer.lua ###
 
 TA1 Bronze Hammer (smash stone to gravel)=TA1 Bronzehammer (zerschlage Stein zu Kies)
@@ -1037,12 +1030,6 @@ TA3 Drill Pipe Wrench=TA3 Bohrgestängezange
 
 Plastic Granules=Plastikgranulat
 
-### plate.lua ###
-
-Lever=
-Stone Pressure Plate=
-Wooden Pressure Plate=
-
 ### player_detector.lua ###
 
 Command to send when player is detected=Befehl zum Senden, wenn ein Spieler erkannt wird
@@ -1358,6 +1345,10 @@ Refresh=Aktualisieren
 TA1 Axle=TA1 Achse
 TA1 Axle Bearing=TA1 Achsenlager
 
+### ta2_clutch.lua ###
+
+TA2 Clutch=
+
 ### ta2_weight_chest.lua ###
 
 TA2 Weight Chest=TA2 Gewichtekiste
@@ -1585,6 +1576,11 @@ TA4 Collider Detector Worker=TA4 Collider Detektor Worker
 
 ##### not used anymore #####
 
+No plan available=Kein Plan verfügar
+Plan=Plan
+Sectional view=Schnittbild
+Side view=Seitenansicht
+Top view=Draufsicht
 Blocks are back=Blöcke sind wieder da
 Blocks are disappeared=Blöcke sind verschwunden
 Remove=Entfernen

locale/template.txt

@@ -649,6 +649,7 @@ TA2 Gearbox=
 TA3 Generator=
 TA4 Generator=
 TA5 Generator=
+no steam=
 
 ### generator.lua ###
 ### power_terminal2.lua ###
@@ -681,14 +682,6 @@ TA1 Mill Base=
 
 TA4 LED Grow Light=
 
-### guide.lua ###
-
-No plan available=
-Plan=
-Sectional view=
-Side view=
-Top view=
-
 ### hammer.lua ###
 
 TA1 Bronze Hammer (smash stone to gravel)=
@@ -1352,6 +1345,10 @@ Refresh=
 TA1 Axle=
 TA1 Axle Bearing=
 
+### ta2_clutch.lua ###
+
+TA2 Clutch=
+
 ### ta2_weight_chest.lua ###
 
 TA2 Weight Chest=