Move trigger icons to lzr_triggers

mods/lzr_laser/util.lua

@@ -295,24 +295,6 @@ lzr_laser.positions_to_pos_string = function(positions)
 	return to_str
 end
 
-local signal_type_icons = {
-	[lzr_triggers.SIGNAL_TYPE_ACTIVATE_OFF] = "lzr_laser_particle_signal_type_activate_off.png",
-	[lzr_triggers.SIGNAL_TYPE_ACTIVATE_ON] = "lzr_laser_particle_signal_type_activate_on.png",
-	[lzr_triggers.SIGNAL_TYPE_ACTIVATE_TOGGLE] = "lzr_laser_particle_signal_type_activate_toggle.png",
-	[lzr_triggers.SIGNAL_TYPE_DEACTIVATE_OFF] = "lzr_laser_particle_signal_type_deactivate_off.png",
-	[lzr_triggers.SIGNAL_TYPE_DEACTIVATE_ON] = "lzr_laser_particle_signal_type_deactivate_on.png",
-	[lzr_triggers.SIGNAL_TYPE_DEACTIVATE_TOGGLE] = "lzr_laser_particle_signal_type_deactivate_toggle.png",
-	[lzr_triggers.SIGNAL_TYPE_SYNC] = "lzr_laser_particle_signal_type_sync.png",
-	[lzr_triggers.SIGNAL_TYPE_SYNC_INV] = "lzr_laser_particle_signal_type_sync_inv.png",
-	[lzr_triggers.SIGNAL_TYPE_TOGGLE] = "lzr_laser_particle_signal_type_toggle.png",
-	[lzr_triggers.SIGNAL_TYPE_TOGGLE_OFF] = "lzr_laser_particle_signal_type_toggle_off.png",
-	[lzr_triggers.SIGNAL_TYPE_TOGGLE_ON] = "lzr_laser_particle_signal_type_toggle_on.png",
-}
-local receiver_type_icons = {
-	[lzr_triggers.RECEIVER_TYPE_ANY] = "lzr_laser_particle_receiver_type_any.png",
-	[lzr_triggers.RECEIVER_TYPE_SYNC_AND] = "lzr_laser_particle_receiver_type_sync_and.png",
-}
-
 
 local temp_waypoints = {}
 local add_temp_waypoint = function(player, texture, wpos, size, z_index_add)
@@ -374,11 +356,11 @@ lzr_laser.show_trigger_info = function(trigger_id, player, show_trigger_type)
 	local receivers = lzr_triggers.get_receivers(trigger_id)
 	local senders = lzr_triggers.get_senders(trigger_id)
 	if #receivers > 0 and #senders > 0 then
-		add_temp_waypoint(player, "lzr_laser_particle_sender_receiver.png", tpos)
+		add_temp_waypoint(player, "lzr_triggers_icon_sender_receiver.png", tpos)
 	end
 	if #receivers > 0 then
 		if #senders == 0 then
-			add_temp_waypoint(player, "lzr_laser_particle_sender.png", tpos)
+			add_temp_waypoint(player, "lzr_triggers_icon_sender.png", tpos)
 		end
 		for r=1, #receivers do
 			local rtrig = lzr_triggers.get_trigger(receivers[r])
@@ -394,11 +376,11 @@ lzr_laser.show_trigger_info = function(trigger_id, player, show_trigger_type)
 					rloc = player:get_pos()
 					rloc = vector.offset(rloc, 0, 1, 0)
 				end
-				add_temp_waypoint(player, "lzr_laser_particle_receiver.png^[opacity:127", rloc)
+				add_temp_waypoint(player, "lzr_triggers_icon_receiver.png^[opacity:127", rloc)
 				if show_trigger_type then
 					-- Small icon for receiver type
 					local rloc_receiver_type = vector.offset(rloc, 0.125, 0.125, 0.125)
-					add_temp_waypoint(player, receiver_type_icons[rtrig.receiver_type].."^[opacity:127", rloc_receiver_type, 0.4, 1)
+					add_temp_waypoint(player, lzr_triggers.RECEIVER_TYPE_ICONS[rtrig.receiver_type].."^[opacity:127", rloc_receiver_type, 0.4, 1)
 				end
 				lzr_laser.particle_line(tpos, rloc, "lzr_laser_particle_signal_marker.png", 1, 0, 0)
 			end
@@ -406,12 +388,12 @@ lzr_laser.show_trigger_info = function(trigger_id, player, show_trigger_type)
 		if show_trigger_type then
 			-- Small icon for signal type
 			local tpos_signal_type = vector.offset(tpos, -0.125, -0.125, -0.125)
-			add_temp_waypoint(player, signal_type_icons[trigger.signal_type], tpos_signal_type, 0.4, 1)
+			add_temp_waypoint(player, lzr_triggers.SIGNAL_TYPE_ICONS[trigger.signal_type], tpos_signal_type, 0.4, 1)
 		end
 	end
 	if #senders > 0 then
 		if #receivers == 0 then
-			add_temp_waypoint(player, "lzr_laser_particle_receiver.png", tpos)
+			add_temp_waypoint(player, "lzr_triggers_icon_receiver.png", tpos)
 		end
 		for s=1, #senders do
 			local strig = lzr_triggers.get_trigger(senders[s])
@@ -427,11 +409,11 @@ lzr_laser.show_trigger_info = function(trigger_id, player, show_trigger_type)
 					sloc = player:get_pos()
 					sloc = vector.offset(sloc, 0, 1, 0)
 				end
-				add_temp_waypoint(player, "lzr_laser_particle_sender.png^[opacity:127", sloc)
+				add_temp_waypoint(player, "lzr_triggers_icon_sender.png^[opacity:127", sloc)
 				if show_trigger_type then
 					-- Small icon for signal type
 					local sloc_signal_type = vector.offset(sloc, -0.125, -0.125, -0.125)
-					add_temp_waypoint(player, signal_type_icons[strig.signal_type].."^[opacity:127", sloc_signal_type, 0.4, 1)
+					add_temp_waypoint(player, lzr_triggers.SIGNAL_TYPE_ICONS[strig.signal_type].."^[opacity:127", sloc_signal_type, 0.4, 1)
 				end
 				lzr_laser.particle_line(tpos, sloc, "lzr_laser_particle_signal_marker.png", 1, 0, 0)
 			end
@@ -439,7 +421,7 @@ lzr_laser.show_trigger_info = function(trigger_id, player, show_trigger_type)
 		if show_trigger_type then
 			-- Small icon for receiver type
 			local tpos_receiver_type = vector.offset(tpos, 0.125, 0.125, 0.125)
-			add_temp_waypoint(player, receiver_type_icons[trigger.receiver_type], tpos_receiver_type, 0.4, 1)
+			add_temp_waypoint(player, lzr_triggers.RECEIVER_TYPE_ICONS[trigger.receiver_type], tpos_receiver_type, 0.4, 1)
 		end
 	end
 end

mods/lzr_triggers/dialog.lua

@@ -16,7 +16,7 @@ local COLOR_NONTRIGGER = "#BBBBBB"
 local COLOR_SENDER = "#39df3b"
 local COLOR_RECEIVER = "#df3939"
 local COLOR_SENDER_RECEIVER = "#e2c70f"
-local trigger_type_images = "0=blank.png^[resize:16x16,1=lzr_laser_particle_sender.png^[resize:16x16,2=lzr_laser_particle_receiver.png^[resize:16x16,3=lzr_laser_particle_sender_receiver.png^[resize:16x16"
+local trigger_type_images = "0=blank.png^[resize:16x16,1=lzr_triggers_icon_sender.png^[resize:16x16,2=lzr_triggers_icon_receiver.png^[resize:16x16,3=lzr_triggers_icon_sender_receiver.png^[resize:16x16"
 local IMAGE_ID_BLANK = 0
 local IMAGE_ID_SENDER = 1
 local IMAGE_ID_RECEIVER = 2
@@ -94,8 +94,12 @@ local show_trigger_dialog = function(player, selected_trigger)
 		end
 		tstr = tstr .. cnt_receivers..","
 		tstr = tstr .. cnt_senders..","
-		tstr = tstr .. def.signal_type..","
-		tstr = tstr .. def.receiver_type
+
+		local signal_type = def.signal_type
+		local receiver_type = def.receiver_type
+
+		tstr = tstr .. signal_type..","
+		tstr = tstr .. receiver_type
 
 		table.insert(tstrs, tstr)
 

mods/lzr_triggers/init.lua

@@ -93,6 +93,21 @@ lzr_triggers.SIGNAL_TYPE_DEACTIVATE_OFF = 10
 -- Maximum signal type ID (for iterations)
 lzr_triggers.MAX_SIGNAL_TYPE = 10
 
+-- Icons for each signal type
+lzr_triggers.SIGNAL_TYPE_ICONS = {
+	[lzr_triggers.SIGNAL_TYPE_ACTIVATE_OFF] = "lzr_triggers_icon_signal_type_activate_off.png",
+	[lzr_triggers.SIGNAL_TYPE_ACTIVATE_ON] = "lzr_triggers_icon_signal_type_activate_on.png",
+	[lzr_triggers.SIGNAL_TYPE_ACTIVATE_TOGGLE] = "lzr_triggers_icon_signal_type_activate_toggle.png",
+	[lzr_triggers.SIGNAL_TYPE_DEACTIVATE_OFF] = "lzr_triggers_icon_signal_type_deactivate_off.png",
+	[lzr_triggers.SIGNAL_TYPE_DEACTIVATE_ON] = "lzr_triggers_icon_signal_type_deactivate_on.png",
+	[lzr_triggers.SIGNAL_TYPE_DEACTIVATE_TOGGLE] = "lzr_triggers_icon_signal_type_deactivate_toggle.png",
+	[lzr_triggers.SIGNAL_TYPE_SYNC] = "lzr_triggers_icon_signal_type_sync.png",
+	[lzr_triggers.SIGNAL_TYPE_SYNC_INV] = "lzr_triggers_icon_signal_type_sync_inv.png",
+	[lzr_triggers.SIGNAL_TYPE_TOGGLE] = "lzr_triggers_icon_signal_type_toggle.png",
+	[lzr_triggers.SIGNAL_TYPE_TOGGLE_OFF] = "lzr_triggers_icon_signal_type_toggle_off.png",
+	[lzr_triggers.SIGNAL_TYPE_TOGGLE_ON] = "lzr_triggers_icon_signal_type_toggle_on.png",
+}
+
 --[[ RECEIVER TYPES ]]
 
 -- The receiver reacts to any incoming signal (default)
@@ -130,7 +145,11 @@ lzr_triggers.RECEIVER_TYPE_SYNC_AND = 1
 -- Maximum receiver type ID (for iterations)
 lzr_triggers.MAX_RECEIVER_TYPE = 1
 
-
+-- Icons for each receiver type
+lzr_triggers.RECEIVER_TYPE_ICONS = {
+	[lzr_triggers.RECEIVER_TYPE_ANY] = "lzr_triggers_icon_receiver_type_any.png",
+	[lzr_triggers.RECEIVER_TYPE_SYNC_AND] = "lzr_triggers_icon_receiver_type_sync_and.png",
+}
 
 lzr_triggers.reset_triggers = function()
 	triggers = {}
@@ -153,7 +172,7 @@ lzr_triggers.add_trigger = function(pos)
 		receiver_type = 0,
 	}
 	signals[id] = {}
-	minetest.log("verbose", "[lzr_laser] Added trigger '"..id.."'")
+	minetest.log("verbose", "[lzr_triggers] Added trigger '"..id.."'")
 	return id
 end
 
@@ -181,7 +200,7 @@ lzr_triggers.remove_trigger = function(id)
 			end
 		end
 	end
-	minetest.log("verbose", "[lzr_laser] Removed trigger '"..id.."'")
+	minetest.log("verbose", "[lzr_triggers] Removed trigger '"..id.."'")
 end
 
 -- Set the list of signals at once for the given sender.
@@ -194,7 +213,7 @@ lzr_triggers.set_signals = function(sender_trigger_id, receiver_trigger_ids)
 		return false
 	end
 	signals[sender_trigger_id] = receiver_trigger_ids
-	minetest.log("verbose", "[lzr_laser] Set signals for '"..sender_trigger_id.."'")
+	minetest.log("verbose", "[lzr_triggers] Set signals for '"..sender_trigger_id.."'")
 	return true
 end
 
@@ -214,7 +233,7 @@ lzr_triggers.add_signal = function(sender_trigger_id, receiver_trigger_id)
 	end
 	-- Add the signal
 	table.insert(signals[sender_trigger_id], receiver_trigger_id)
-	minetest.log("verbose", "[lzr_laser] Added signal to '"..receiver_trigger_id.."' for '"..sender_trigger_id.."'")
+	minetest.log("verbose", "[lzr_triggers] Added signal to '"..receiver_trigger_id.."' for '"..sender_trigger_id.."'")
 	return true
 end
 
@@ -259,15 +278,15 @@ lzr_triggers.set_trigger_location = function(id, location)
 	else
 		locdump = tostring(location)
 	end
-	minetest.log("verbose", "[lzr_laser] Set trigger location for '"..id.."' to "..locdump)
+	minetest.log("verbose", "[lzr_triggers] Set trigger location for '"..id.."' to "..locdump)
 end
 lzr_triggers.set_trigger_signal_type = function(id, signal_type)
 	triggers[id].signal_type = signal_type
-	minetest.log("verbose", "[lzr_laser] Set trigger signal type for '"..id.."' to "..signal_type)
+	minetest.log("verbose", "[lzr_triggers] Set trigger signal type for '"..id.."' to "..signal_type)
 end
 lzr_triggers.set_trigger_receiver_type = function(id, receiver_type)
 	triggers[id].receiver_type = receiver_type
-	minetest.log("verbose", "[lzr_laser] Set trigger receiver type for '"..id.."' to "..receiver_type)
+	minetest.log("verbose", "[lzr_triggers] Set trigger receiver type for '"..id.."' to "..receiver_type)
 end