forked from minetest-mods/MoreMesecons
		
	Compare commits
	
		
			21 Commits
		
	
	
		
			dev
			...
			c77698d1fe
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c77698d1fe | |||
|  | b8deed592f | ||
| 27f6967614 | |||
|  | 1dab017abe | ||
|  | 74a95e559e | ||
| 77587418cb | |||
| b24c64116a | |||
| b9d8cb03f2 | |||
| a9febb7572 | |||
| 90be91e9d6 | |||
|  | ba31d9e663 | ||
| a7f8e2e98b | |||
| 28411dd7e9 | |||
|  | e162cabae4 | ||
|  | c41d0371c0 | ||
|  | 28292dc2a5 | ||
|  | e5cdeef141 | ||
|  | 182eb9822a | ||
|  | 021100b3d4 | ||
|  | 227cba54b2 | ||
|  | 23b96b9db6 | 
							
								
								
									
										22
									
								
								.luacheckrc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								.luacheckrc
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,22 @@ | ||||
| read_globals = { | ||||
| 	-- Defined by Minetest | ||||
| 	"vector", "PseudoRandom", "VoxelArea", "table", | ||||
|  | ||||
| 	-- Mods | ||||
| 	"digiline", "default", "creative", | ||||
|  | ||||
| 	-- Required for the mesechest registration | ||||
| 	minetest = { | ||||
| 		fields = { | ||||
| 			register_lbm = {read_only = false}, | ||||
| 			register_node = {read_only = false}, | ||||
| 			registered_on_player_receive_fields = { | ||||
| 				read_only = false, | ||||
| 				other_fields = true, | ||||
| 			}, | ||||
| 		}, | ||||
| 		other_fields = true | ||||
| 	} | ||||
| } | ||||
| globals = {"moremesecons", "mesecon"} | ||||
| ignore = {"212", "631", "422", "432"} | ||||
| @@ -64,3 +64,5 @@ minetest.register_craft({ | ||||
| 	recipe = {	{"mesecons_blinkyplant:blinky_plant_off"}, | ||||
| 			{"default:mese_crystal_fragment"},} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_adjustable_blinky_plant] loaded.") | ||||
|   | ||||
| @@ -156,3 +156,5 @@ minetest.register_abm({ | ||||
| 		end | ||||
| 	end, | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_adjustable_player_detector] loaded.") | ||||
|   | ||||
| @@ -55,14 +55,14 @@ local function resolve_commands(commands, pos) | ||||
| 	local nearest = nil | ||||
| 	local min_distance = math.huge | ||||
| 	local players = minetest.get_connected_players() | ||||
| 	for index, player in pairs(players) do | ||||
| 	for _, player in pairs(players) do | ||||
| 		local distance = vector.distance(pos, player:getpos()) | ||||
| 		if distance < min_distance then | ||||
| 			min_distance = distance | ||||
| 			nearest = player:get_player_name() | ||||
| 		end | ||||
| 	end | ||||
| 	new_commands = commands:gsub("@nearest", nearest) | ||||
| 	local new_commands = commands:gsub("@nearest", nearest) | ||||
| 	return new_commands, min_distance, new_commands ~= commands | ||||
| end | ||||
|  | ||||
| @@ -172,3 +172,5 @@ minetest.register_craft({ | ||||
| 		{"group:mesecon_conductor_craftable","default:mese_crystal","group:mesecon_conductor_craftable"} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_commandblock] loaded.") | ||||
|   | ||||
| @@ -5,7 +5,7 @@ local nodebox = { | ||||
|  | ||||
| local function signalchanger_get_output_rules(node) | ||||
| 	local rules = {{x=-1, y=0, z=0}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -13,7 +13,7 @@ end | ||||
|  | ||||
| local function signalchanger_get_input_rules(node) | ||||
| 	local rules = {{x=0, y=0, z=-1, name="input_on"}, {x=0, y=0, z=1, name="input_off"}, {x=1, y=0, z=0, name="input_signal"}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -79,3 +79,5 @@ minetest.register_craft({ | ||||
| 	output = "moremesecons_conductor_signalchanger:conductor_signalchanger_off", | ||||
| 	recipe = {{"group:mesecon_conductor_craftable","moremesecons_signalchanger:signalchanger_off"}} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_conductor_signalchanger] loaded.") | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| local function dual_delayer_get_input_rules(node) | ||||
| 	local rules = {{x=1, y=0, z=0}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -8,7 +8,7 @@ end | ||||
|  | ||||
| local function dual_delayer_get_output_rules(node) | ||||
| 	local rules = {{x=0, y=0, z=1}, {x=0, y=0, z=-1}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -17,19 +17,19 @@ end | ||||
| local dual_delayer_activate = function(pos, node) | ||||
| 	mesecon.receptor_on(pos, {dual_delayer_get_output_rules(node)[1]}) -- Turn on the port 1 | ||||
| 	minetest.swap_node(pos, {name = "moremesecons_dual_delayer:dual_delayer_10", param2 = node.param2}) | ||||
| 	minetest.after(0.4, function(pos, node) | ||||
| 	minetest.after(0.4, function() | ||||
| 		mesecon.receptor_on(pos, {dual_delayer_get_output_rules(node)[2]}) -- Turn on the port 2 | ||||
| 		minetest.swap_node(pos, {name = "moremesecons_dual_delayer:dual_delayer_11", param2 = node.param2}) | ||||
| 	end, pos, node) | ||||
| 	end) | ||||
| end | ||||
|  | ||||
| local dual_delayer_deactivate = function(pos, node, link) | ||||
| 	mesecon.receptor_off(pos, {dual_delayer_get_output_rules(node)[2]}) -- Turn off the port 2 | ||||
| 	minetest.swap_node(pos, {name = "moremesecons_dual_delayer:dual_delayer_10", param2 = node.param2}) | ||||
| 	minetest.after(0.4, function(pos, node) | ||||
| 	minetest.after(0.4, function() | ||||
| 		mesecon.receptor_off(pos, {dual_delayer_get_output_rules(node)[1]}) -- Turn off the port 1 | ||||
| 		minetest.swap_node(pos, {name = "moremesecons_dual_delayer:dual_delayer_00", param2 = node.param2}) | ||||
| 	end, pos, node) | ||||
| 	end) | ||||
| end | ||||
|  | ||||
|  | ||||
| @@ -58,6 +58,10 @@ for n,i in pairs({{0,0},{1,0},{1,1}}) do | ||||
| 		top_texture = pre..top_texture | ||||
| 	end | ||||
|  | ||||
| 	local use_texture_alpha | ||||
| 	if minetest.features.use_texture_alpha_string_modes then | ||||
| 		use_texture_alpha = "opaque" | ||||
| 	end | ||||
| 	minetest.register_node("moremesecons_dual_delayer:dual_delayer_"..i1 ..i2, { | ||||
| 		description = "Dual Delayer", | ||||
| 		drop = "moremesecons_dual_delayer:dual_delayer_00", | ||||
| @@ -74,6 +78,7 @@ for n,i in pairs({{0,0},{1,0},{1,1}}) do | ||||
| 		}, | ||||
| 		groups = groups, | ||||
| 		tiles = {top_texture, "moremesecons_dual_delayer_bottom.png", "moremesecons_dual_delayer_side_left.png", "moremesecons_dual_delayer_side_right.png", "moremesecons_dual_delayer_ends.png", "moremesecons_dual_delayer_ends.png"}, | ||||
| 		use_texture_alpha = use_texture_alpha, | ||||
| 		mesecons = { | ||||
| 			receptor = { | ||||
| 				state = mesecon.state.off, | ||||
| @@ -93,3 +98,5 @@ minetest.register_craft({ | ||||
| 	output = "moremesecons_dual_delayer:dual_delayer_00 2", | ||||
| 	recipe = {"mesecons_delayer:delayer_off_1", "mesecons_delayer:delayer_off_1"} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_dual_delayer] loaded.") | ||||
|   | ||||
| @@ -139,3 +139,5 @@ minetest.register_abm({ | ||||
| 		end | ||||
| 	end, | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_entity_detector] loaded.") | ||||
|   | ||||
| @@ -46,3 +46,5 @@ minetest.register_craft({ | ||||
| 	recipe = {	{"default:torch"}, | ||||
| 			{"default:mese_crystal_fragment"},} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_igniter] loaded.") | ||||
|   | ||||
| @@ -18,10 +18,6 @@ local function induction_transmitter_get_output_rules(node) | ||||
| 	return {vector.multiply(minetest.facedir_to_dir(node.param2), 2)} | ||||
| end | ||||
|  | ||||
| local function induction_transmitter_get_virtual_output_rules(node) | ||||
| 	return {minetest.facedir_to_dir(node.param2)} | ||||
| end | ||||
|  | ||||
| local function act(pos, node, state) | ||||
| 	minetest.swap_node(pos, {name = "moremesecons_induction_transmitter:induction_transmitter_"..state, param2 = node.param2}) | ||||
|  | ||||
| @@ -102,3 +98,5 @@ minetest.register_craft({ | ||||
| 		{"", "default:mese_crystal_fragment", ""} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_induction_transmitter] loaded.") | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| local injector_controller_get_output_rules = function(node) | ||||
| 	local rules = {{x = 0, y = 0, z = 1}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -10,7 +10,7 @@ local injector_controller_get_input_rules = function(node) | ||||
| 	local rules = {{x = 0, y = 0, z = -1}, | ||||
| 			{x = 1, y = 0, z = 0}, | ||||
| 			{x = -1, y = 0, z = 0}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -82,3 +82,5 @@ minetest.register_craft({ | ||||
| 	output = "moremesecons_injector_controller:injector_controller_off", | ||||
| 	recipe = {{"mesecons_blinkyplant:blinky_plant_off","mesecons_gates:and_off"}} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_injector_controller] loaded.") | ||||
|   | ||||
| @@ -131,3 +131,5 @@ if moremesecons.setting("jammer", "enable_lbm", false) then | ||||
| 		action = add_jammer | ||||
| 	}) | ||||
| end | ||||
|  | ||||
| minetest.log("action", "[moremesecons_jammer] loaded.") | ||||
|   | ||||
| @@ -128,33 +128,35 @@ minetest.register_node("moremesecons_luablock:luablock", { | ||||
| 			env.pos = table.copy(npos) | ||||
| 			env.mem = minetest.deserialize(meta:get_string("mem")) or {} | ||||
|  | ||||
| 			local func, err | ||||
| 			local func, err_syntax | ||||
| 			if _VERSION == "Lua 5.1" then | ||||
| 				func, err = loadstring(code) | ||||
| 				func, err_syntax = loadstring(code) | ||||
| 				if func then | ||||
| 					setfenv(func, env) | ||||
| 				end | ||||
| 			else | ||||
| 				func, err = load(code, nil, "t", env) | ||||
| 				func, err_syntax = load(code, nil, "t", env) | ||||
| 			end | ||||
| 			if not func then | ||||
| 				meta:set_string("errmsg", err) | ||||
| 				make_formspec(meta, pos) | ||||
| 				meta:set_string("errmsg", err_syntax) | ||||
| 				make_formspec(meta, npos) | ||||
| 				return | ||||
| 			end | ||||
|  | ||||
| 			local good, err = pcall(func) | ||||
| 			local good, err_runtime = pcall(func) | ||||
|  | ||||
| 			if not good then -- Runtime error | ||||
| 				meta:set_string("errmsg", err) | ||||
| 				make_formspec(meta, pos) | ||||
| 			if not good then | ||||
| 				meta:set_string("errmsg", err_runtime) | ||||
| 				make_formspec(meta, npos) | ||||
| 				return | ||||
| 			end | ||||
|  | ||||
| 			meta:set_string("mem", minetest.serialize(env.mem)) | ||||
|  | ||||
| 			meta:set_string("errmsg", "") | ||||
| 			make_formspec(meta, pos) | ||||
| 			make_formspec(meta, npos) | ||||
| 		end | ||||
| 	}} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_luablock] loaded.") | ||||
|   | ||||
| @@ -76,14 +76,17 @@ end]] | ||||
| local file_path = minetest.get_worldpath().."/MoreMesecons_lctt" | ||||
|  | ||||
| -- load templates from a compressed file | ||||
| local templates_file = io.open(file_path, "rb") | ||||
| if templates_file then | ||||
| 	local templates_raw = templates_file:read("*all") | ||||
| 	io.close(templates_file) | ||||
| 	if templates_raw | ||||
| 	and templates_raw ~= "" then | ||||
| 		for name,t in pairs(minetest.deserialize(minetest.decompress(templates_raw))) do | ||||
| 			templates[name] = t | ||||
| do | ||||
| 	local templates_file = io.open(file_path, "rb") | ||||
| 	if templates_file then | ||||
| 		local templates_raw = templates_file:read("*all") | ||||
| 		io.close(templates_file) | ||||
| 		if templates_raw | ||||
| 		and templates_raw ~= "" then | ||||
| 			local data = minetest.deserialize(minetest.decompress(templates_raw)) | ||||
| 			for name,t in pairs(data) do | ||||
| 				templates[name] = t | ||||
| 			end | ||||
| 		end | ||||
| 	end | ||||
| end | ||||
| @@ -352,3 +355,5 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) | ||||
| 		return | ||||
| 	end | ||||
| end) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_luacontroller_tool] loaded.") | ||||
|   | ||||
| @@ -2,7 +2,7 @@ local function mesechest_get_output_rules(node) | ||||
| 	local rules = {{x=-1, y=0, z=0}, | ||||
| 			{x=0, y=0, z=-1}, | ||||
| 			{x=0, y=0, z=1}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -61,7 +61,7 @@ for i, f in ipairs(minetest.registered_on_player_receive_fields) do | ||||
| 	end | ||||
| end | ||||
|  | ||||
| default.register_chest("mesechest", { | ||||
| default.chest.register_chest("moremesecons_mesechest:mesechest", { | ||||
| 	description = "Mese Chest", | ||||
| 	tiles = { | ||||
| 		"default_chest_top.png^[colorize:#d8e002:70", | ||||
| @@ -82,7 +82,7 @@ default.register_chest("mesechest", { | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| default.register_chest("mesechest_locked", { | ||||
| default.chest.register_chest("moremesecons_mesechest:mesechest_locked", { | ||||
| 	description = "Locked Mese Chest", | ||||
| 	tiles = { | ||||
| 		"default_chest_top.png^[colorize:#d8e002:70", | ||||
| @@ -108,11 +108,19 @@ minetest.register_node = old_minetest_register_node | ||||
| minetest.register_lbm = old_minetest_register_lbm | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "default:mesechest", | ||||
| 	output = "moremesecons_mesechest:mesechest", | ||||
| 	recipe = {{"group:mesecon_conductor_craftable", "default:chest", "group:mesecon_conductor_craftable"}} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "default:mesechest_locked", | ||||
| 	output = "moremesecons_mesechest:mesechest_locked", | ||||
| 	recipe = {{"group:mesecon_conductor_craftable", "default:chest_locked", "group:mesecon_conductor_craftable"}} | ||||
| }) | ||||
|  | ||||
| -- Legacy | ||||
| minetest.register_alias("default:mesechest", "moremesecons_mesechest:mesechest") | ||||
| minetest.register_alias("mesechest", "moremesecons_mesechest:mesechest") | ||||
| minetest.register_alias("default:mesechest_locked", "moremesecons_mesechest:mesechest") | ||||
| minetest.register_alias("mesechest_locked", "moremesecons_mesechest:mesechest_locked") | ||||
|  | ||||
| minetest.log("action", "[moremesecons_mesechest] loaded.") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ local kill_nearest_player = function(pos) | ||||
| 	-- Search the nearest player | ||||
| 	local nearest | ||||
| 	local min_distance = MAX_DISTANCE | ||||
| 	for index, player in pairs(minetest.get_connected_players()) do | ||||
| 	for _, player in pairs(minetest.get_connected_players()) do | ||||
| 		local distance = vector.distance(pos, player:getpos()) | ||||
| 		if distance < min_distance then | ||||
| 			min_distance = distance | ||||
| @@ -60,3 +60,5 @@ minetest.register_node("moremesecons_playerkiller:playerkiller", { | ||||
| 	end, | ||||
| 	sounds = default.node_sound_stone_defaults(), | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_playerkiller] loaded.") | ||||
|   | ||||
| @@ -121,3 +121,5 @@ minetest.register_craft({ | ||||
| 	recipe = {{"mesecons_luacontroller:luacontroller0000", "mesecons_noteblock:noteblock"}, | ||||
| 		{"group:wood", "group:wood"}} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_sayer] loaded.") | ||||
|   | ||||
| @@ -6,7 +6,7 @@ local nodebox = { | ||||
| local function signalchanger_get_output_rules(node) | ||||
| 	local rules = {{x=-1, y=0, z=0}, | ||||
| 			{x=1, y=0, z=0}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -14,7 +14,7 @@ end | ||||
|  | ||||
| local function signalchanger_get_input_rules(node) | ||||
| 	local rules = {{x=0, y=0, z=-1, name="input_on"}, {x=0, y=0, z=1, name="input_off"}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -79,3 +79,5 @@ minetest.register_craft({ | ||||
| 	output = "moremesecons_signalchanger:signalchanger_off", | ||||
| 	recipe = {{"group:mesecon_conductor_craftable","moremesecons_switchtorch:switchtorch_off","group:mesecon_conductor_craftable"}} | ||||
| }) | ||||
|  | ||||
| minetest.log("action", "[moremesecons_signalchanger] loaded.") | ||||
|   | ||||
| @@ -80,7 +80,7 @@ minetest.register_node("moremesecons_switchtorch:switchtorch_on", { | ||||
| 	selection_box = torch_selectionbox, | ||||
| 	groups = {dig_immediate=3, not_in_creative_inventory = 1}, | ||||
| 	drop = "moremesecons_switchtorch:switchtorch_off", | ||||
| 	light_source = LIGHT_MAX-5, | ||||
| 	light_source = 9, | ||||
| 	mesecons = {receptor = { | ||||
| 		state = mesecon.state.on, | ||||
| 		rules = torch_get_output_rules | ||||
| @@ -127,3 +127,5 @@ minetest.register_abm({ | ||||
| -- 2 = x+1 | ||||
| -- 0 = y+1 | ||||
| -- 1 = y-1 | ||||
|  | ||||
| minetest.log("action", "[moremesecons_switchtorch] loaded.") | ||||
|   | ||||
| @@ -24,12 +24,12 @@ local function teleport_nearest(pos) | ||||
|  | ||||
| 	-- Search for the nearest player | ||||
| 	local nearest = nil | ||||
| 	local min_distance = MAX_PLAYER_DISTANCE | ||||
| 	local min_distance_player = MAX_PLAYER_DISTANCE | ||||
| 	local players = minetest.get_connected_players() | ||||
| 	for index, player in pairs(players) do | ||||
| 	for _, player in pairs(players) do | ||||
| 		local distance = vector.distance(pos, player:getpos()) | ||||
| 		if distance <= min_distance then | ||||
| 			min_distance = distance | ||||
| 		if distance <= min_distance_player then | ||||
| 			min_distance_player = distance | ||||
| 			nearest = player | ||||
| 		end | ||||
| 	end | ||||
| @@ -106,3 +106,5 @@ if moremesecons.setting("teleporter", "enable_lbm", false) then | ||||
| 		action = register | ||||
| 	}) | ||||
| end | ||||
|  | ||||
| minetest.log("action", "[moremesecons_teleporter] loaded.") | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| local timegate_get_output_rules = function(node) | ||||
| 	local rules = {{x = 0, y = 0, z = 1}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -8,7 +8,7 @@ end | ||||
|  | ||||
| local timegate_get_input_rules = function(node) | ||||
| 	local rules = {{x = 0, y = 0, z = -1}} | ||||
| 	for i = 0, node.param2 do | ||||
| 	for _ = 0, node.param2 do | ||||
| 		rules = mesecon.rotate_rules_left(rules) | ||||
| 	end | ||||
| 	return rules | ||||
| @@ -35,7 +35,7 @@ local function timegate_activate(pos, node) | ||||
| 	end) | ||||
| end | ||||
|  | ||||
| boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab | ||||
| local boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab | ||||
|  | ||||
| 	 { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 },		-- the jeweled "on" indicator | ||||
| 	 { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 }, | ||||
| @@ -47,6 +47,10 @@ boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 },		-- the main slab | ||||
| 	 { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 },		-- the two wire stubs | ||||
| 	 { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }} | ||||
|  | ||||
| local use_texture_alpha | ||||
| if minetest.features.use_texture_alpha_string_modes then | ||||
| 	use_texture_alpha = "opaque" | ||||
| end | ||||
| mesecon.register_node("moremesecons_timegate:timegate", { | ||||
| 	description = "Time Gate", | ||||
| 	drawtype = "nodebox", | ||||
| @@ -84,6 +88,7 @@ mesecon.register_node("moremesecons_timegate:timegate", { | ||||
| 			"moremesecons_timegate_sides_off.png", | ||||
| 			"moremesecons_timegate_sides_off.png" | ||||
| 		}, | ||||
| 		use_texture_alpha = use_texture_alpha, | ||||
| 		groups = {bendy=2,snappy=1,dig_immediate=2}, | ||||
| 		mesecons = { | ||||
| 			receptor = | ||||
| @@ -106,6 +111,7 @@ mesecon.register_node("moremesecons_timegate:timegate", { | ||||
| 			"moremesecons_timegate_sides_on.png", | ||||
| 			"moremesecons_timegate_sides_on.png" | ||||
| 		}, | ||||
| 		use_texture_alpha = use_texture_alpha, | ||||
| 		groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1}, | ||||
| 		mesecons = { | ||||
| 			receptor = { | ||||
| @@ -128,3 +134,5 @@ minetest.register_craft({ | ||||
|  | ||||
| minetest.register_alias("moremesecons_temporarygate:temporarygate_off", "moremesecons_timegate:timegate_off") | ||||
| minetest.register_alias("moremesecons_temporarygate:temporarygate_on", "moremesecons_timegate:timegate_on") | ||||
|  | ||||
| minetest.log("action", "[moremesecons_timegate] loaded.") | ||||
|   | ||||
| @@ -243,12 +243,11 @@ MapDataStorage.__index = { | ||||
| 			indices[i] = ("%.17g"):format(vi) | ||||
| 			values[i] = v | ||||
| 		end | ||||
| 		result = { | ||||
| 		return minetest.serialize({ | ||||
| 			version = "MapDataStorage_v1", | ||||
| 			indices = "return {" .. table.concat(indices, ",") .. "}", | ||||
| 			values = minetest.serialize(values), | ||||
| 		} | ||||
| 		return minetest.serialize(result) | ||||
| 		}) | ||||
| 	end, | ||||
| } | ||||
| MapDataStorage.deserialize = function(txtdata) | ||||
| @@ -317,6 +316,7 @@ end | ||||
|  | ||||
|  | ||||
|  | ||||
| --[[ | ||||
| -- This testing code shows an example usage of the MapDataStorage code | ||||
| local function do_test() | ||||
| 	print("Test if iter returns correct positions when a lot is set") | ||||
| @@ -339,14 +339,14 @@ local function do_test() | ||||
| 		end | ||||
| 	end | ||||
| 	local i = 0 | ||||
| 	for pos, v in data:iter({x=-4, y=-4, z=-4}, {x=2, y=2, z=2}) do | ||||
| 	for pos in data:iter({x=-4, y=-4, z=-4}, {x=2, y=2, z=2}) do | ||||
| 		i = i + 1 | ||||
| 		assert(vector.equals(pos, expected_positions[i])) | ||||
| 	end | ||||
|  | ||||
| 	print("Test if iter works correctly on a corner") | ||||
| 	local found = false | ||||
| 	for pos, v in data:iter({x=-8, y=-7, z=-80}, {x=-5, y=-5, z=-5}) do | ||||
| 	for pos in data:iter({x=-8, y=-7, z=-80}, {x=-5, y=-5, z=-5}) do | ||||
| 		assert(not found) | ||||
| 		found = true | ||||
| 		assert(vector.equals(pos, {x=-5, y=-5, z=-5})) | ||||
| @@ -377,5 +377,6 @@ local function do_test() | ||||
|  | ||||
| 	--~ data:iterAll() | ||||
| end | ||||
| --~ do_test() | ||||
|  | ||||
| do_test() | ||||
| --]] | ||||
| minetest.log("action", "[moremesecons_utils] loaded.") | ||||
|   | ||||
| @@ -186,10 +186,10 @@ function wireless_receptor_off(pos, id, network, check) | ||||
| 	end | ||||
| end | ||||
|  | ||||
| function activate_network(owner, channel) | ||||
| local function activate_network(owner, channel) | ||||
| 	local network = wireless[owner][channel] | ||||
| 	for i, wl_pos in pairs(network.members) do | ||||
| 		wireless_receptor_on(wl_pos, id, network) | ||||
| 		wireless_receptor_on(wl_pos, i, network) | ||||
| 	end | ||||
| end | ||||
|  | ||||
| @@ -253,22 +253,35 @@ function wireless_effector_off(pos) | ||||
| 	update_mod_storage() | ||||
| end | ||||
|  | ||||
| -- This table is required to prevent a message from being sent in loop between wireless nodes | ||||
| local sending_digilines = {} | ||||
|  | ||||
| local function on_digiline_receive(pos, node, channel, msg) | ||||
| 	if is_jammed(pos) then | ||||
| 		return | ||||
| 	end | ||||
|  | ||||
| 	local wls = moremesecons.get_data_from_pos(wireless_meta, pos) | ||||
| 	if not wls then | ||||
| 		return | ||||
| 	end | ||||
|  | ||||
| 	if wls.owner == "" or not wireless[wls.owner] or channel == "" or not wireless[wls.owner][wls.channel] then | ||||
| 		return | ||||
| 	end | ||||
|  | ||||
| 	local pos_hash = minetest.hash_node_position(pos) | ||||
| 	if sending_digilines[pos_hash] then | ||||
| 		return | ||||
| 	end | ||||
|  | ||||
| 	sending_digilines[pos_hash] = true | ||||
| 	for i, wl_pos in pairs(wireless[wls.owner][wls.channel].members) do | ||||
| 		if i ~= wls.id and check_wireless_exists(wl_pos) then | ||||
| 		if i ~= wls.id then | ||||
| 			digiline:receptor_send(wl_pos, digiline.rules.default, channel, msg) | ||||
| 		end | ||||
| 	end | ||||
| 	sending_digilines[pos_hash] = nil | ||||
| end | ||||
|  | ||||
| mesecon.register_node("moremesecons_wireless:wireless", { | ||||
| @@ -290,7 +303,6 @@ mesecon.register_node("moremesecons_wireless:wireless", { | ||||
| 		mesecon.receptor_off(pos) | ||||
| 	end, | ||||
| 	after_place_node = function(pos, placer) | ||||
| 		local placername = placer:get_player_name() | ||||
| 		set_owner(pos, placer:get_player_name()) | ||||
| 	end, | ||||
| 	on_receive_fields = function(pos, _, fields, player) | ||||
| @@ -327,6 +339,15 @@ mesecon.register_node("moremesecons_wireless:wireless", { | ||||
|  | ||||
| minetest.register_alias("moremesecons_wireless:wireless", "moremesecons_wireless:wireless_off") | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "moremesecons_wireless:wireless_off 2", | ||||
| 	recipe = { | ||||
| 		{"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"}, | ||||
| 		{"", "mesecons_torch:mesecon_torch_on", ""}, | ||||
| 		{"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"}, | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| local function remove_jammer(pos) | ||||
| 	moremesecons.remove_data_from_pos(jammers, pos) | ||||
| end | ||||
| @@ -354,83 +375,76 @@ function is_jammed(pos) | ||||
| 	return false | ||||
| end | ||||
|  | ||||
| mesecon.register_node("moremesecons_wireless:jammer", { | ||||
| 	description = "Wireless Jammer", | ||||
| 	paramtype = "light", | ||||
| 	drawtype = "nodebox", | ||||
| },{ | ||||
| 	tiles = {"mesecons_wire_off.png^moremesecons_jammer_top.png", "moremesecons_jammer_bottom.png", "mesecons_wire_off.png^moremesecons_jammer_side_off.png"}, | ||||
| 	node_box = { | ||||
| 		type = "fixed", | ||||
| 		fixed = { | ||||
| 			-- connection | ||||
| 			{-1/16, -0.5, -0.5, 1/16, -7/16, 0.5}, | ||||
| 			{-0.5, -0.5, -1/16, 0.5, -7/16, 1/16}, | ||||
| if moremesecons.setting("wireless", "enable_jammer", true) then | ||||
| 	mesecon.register_node("moremesecons_wireless:jammer", { | ||||
| 		description = "Wireless Jammer", | ||||
| 		paramtype = "light", | ||||
| 		drawtype = "nodebox", | ||||
| 	},{ | ||||
| 		tiles = {"mesecons_wire_off.png^moremesecons_jammer_top.png", "moremesecons_jammer_bottom.png", "mesecons_wire_off.png^moremesecons_jammer_side_off.png"}, | ||||
| 		node_box = { | ||||
| 			type = "fixed", | ||||
| 			fixed = { | ||||
| 				-- connection | ||||
| 				{-1/16, -0.5, -0.5, 1/16, -7/16, 0.5}, | ||||
| 				{-0.5, -0.5, -1/16, 0.5, -7/16, 1/16}, | ||||
|  | ||||
| 			--stabilization | ||||
| 			{-1/16, -7/16, -1/16, 1/16, -6/16, 1/16}, | ||||
| 				--stabilization | ||||
| 				{-1/16, -7/16, -1/16, 1/16, -6/16, 1/16}, | ||||
|  | ||||
| 			-- fields | ||||
| 			{-7/16, -6/16, -7/16, 7/16, -4/16, 7/16}, | ||||
| 			{-5/16, -4/16, -5/16, 5/16, -3/16, 5/16}, | ||||
| 			{-3/16, -3/16, -3/16, 3/16, -2/16, 3/16}, | ||||
| 			{-1/16, -2/16, -1/16, 1/16, -1/16, 1/16}, | ||||
| 				-- fields | ||||
| 				{-7/16, -6/16, -7/16, 7/16, -4/16, 7/16}, | ||||
| 				{-5/16, -4/16, -5/16, 5/16, -3/16, 5/16}, | ||||
| 				{-3/16, -3/16, -3/16, 3/16, -2/16, 3/16}, | ||||
| 				{-1/16, -2/16, -1/16, 1/16, -1/16, 1/16}, | ||||
| 			}, | ||||
| 		}, | ||||
| 	}, | ||||
| 	groups = {dig_immediate=2}, | ||||
| 	mesecons = {effector = { | ||||
| 		rules = mesecon.rules.flat, | ||||
| 		action_on = function(pos) | ||||
| 			add_jammer(pos) | ||||
| 			minetest.swap_node(pos, {name="moremesecons_wireless:jammer_on"}) | ||||
| 		end | ||||
| 	}} | ||||
| },{ | ||||
| 	tiles = {"mesecons_wire_on.png^moremesecons_jammer_top.png", "moremesecons_jammer_bottom.png", "mesecons_wire_on.png^moremesecons_jammer_side_on.png"}, | ||||
| 	node_box = { | ||||
| 		type = "fixed", | ||||
| 		fixed = { | ||||
| 			-- connection | ||||
| 			{-1/16, -0.5, -0.5, 1/16, -7/16, 0.5}, | ||||
| 			{-0.5, -0.5, -1/16, 0.5, -7/16, 1/16}, | ||||
| 		groups = {dig_immediate=2}, | ||||
| 		mesecons = {effector = { | ||||
| 			rules = mesecon.rules.flat, | ||||
| 			action_on = function(pos) | ||||
| 				add_jammer(pos) | ||||
| 				minetest.swap_node(pos, {name="moremesecons_wireless:jammer_on"}) | ||||
| 			end | ||||
| 		}} | ||||
| 	},{ | ||||
| 		tiles = {"mesecons_wire_on.png^moremesecons_jammer_top.png", "moremesecons_jammer_bottom.png", "mesecons_wire_on.png^moremesecons_jammer_side_on.png"}, | ||||
| 		node_box = { | ||||
| 			type = "fixed", | ||||
| 			fixed = { | ||||
| 				-- connection | ||||
| 				{-1/16, -0.5, -0.5, 1/16, -7/16, 0.5}, | ||||
| 				{-0.5, -0.5, -1/16, 0.5, -7/16, 1/16}, | ||||
|  | ||||
| 			--stabilization | ||||
| 			{-1/16, -7/16, -1/16, 1/16, 5/16, 1/16}, | ||||
| 				--stabilization | ||||
| 				{-1/16, -7/16, -1/16, 1/16, 5/16, 1/16}, | ||||
|  | ||||
| 			-- fields | ||||
| 			{-7/16, -6/16, -7/16, 7/16, -4/16, 7/16}, | ||||
| 			{-5/16, -3/16, -5/16, 5/16, -1/16, 5/16}, | ||||
| 			{-3/16, 0, -3/16, 3/16, 2/16, 3/16}, | ||||
| 			{-1/16, 3/16, -1/16, 1/16, 5/16, 1/16}, | ||||
| 				-- fields | ||||
| 				{-7/16, -6/16, -7/16, 7/16, -4/16, 7/16}, | ||||
| 				{-5/16, -3/16, -5/16, 5/16, -1/16, 5/16}, | ||||
| 				{-3/16, 0, -3/16, 3/16, 2/16, 3/16}, | ||||
| 				{-1/16, 3/16, -1/16, 1/16, 5/16, 1/16}, | ||||
| 			}, | ||||
| 		}, | ||||
| 	}, | ||||
| 	groups = {dig_immediate=2, not_in_creative_inventory=1}, | ||||
| 	mesecons = {effector = { | ||||
| 		rules = mesecon.rules.flat, | ||||
| 		action_off = function(pos) | ||||
| 			remove_jammer(pos) | ||||
| 			minetest.swap_node(pos, {name="moremesecons_wireless:jammer_off"}) | ||||
| 		end | ||||
| 	}}, | ||||
| 	on_destruct = remove_jammer, | ||||
| 	on_construct = add_jammer, | ||||
| }) | ||||
| 		groups = {dig_immediate=2, not_in_creative_inventory=1}, | ||||
| 		mesecons = {effector = { | ||||
| 			rules = mesecon.rules.flat, | ||||
| 			action_off = function(pos) | ||||
| 				remove_jammer(pos) | ||||
| 				minetest.swap_node(pos, {name="moremesecons_wireless:jammer_off"}) | ||||
| 			end | ||||
| 		}}, | ||||
| 		on_destruct = remove_jammer, | ||||
| 		on_construct = add_jammer, | ||||
| 	}) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "moremesecons_wireless:jammer_off", | ||||
| 	recipe = { | ||||
| 		{"moremesecons_wireless:wireless", "mesecons_torch:mesecon_torch_on", "moremesecons_wireless:wireless"} | ||||
| 	} | ||||
| }) | ||||
|  | ||||
| minetest.register_craft({ | ||||
| 	output = "moremesecons_wireless:wireless_off 2", | ||||
| 	recipe = { | ||||
| 		{"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"}, | ||||
| 		{"", "mesecons_torch:mesecon_torch_on", ""}, | ||||
| 		{"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"}, | ||||
| 	} | ||||
| }) | ||||
| 	minetest.register_craft({ | ||||
| 		output = "moremesecons_wireless:jammer_off", | ||||
| 		recipe = { | ||||
| 			{"moremesecons_wireless:wireless", "mesecons_torch:mesecon_torch_on", "moremesecons_wireless:wireless"} | ||||
| 		} | ||||
| 	}) | ||||
| end | ||||
|  | ||||
| if moremesecons.setting("wireless", "enable_lbm", false) then | ||||
| 	minetest.register_lbm({ | ||||
| @@ -484,3 +498,5 @@ if storage:get_string("wireless_meta_2") == "" then | ||||
| 	end | ||||
| 	minetest.log("action", "[moremesecons_wireless] Done!") | ||||
| end | ||||
|  | ||||
| minetest.log("action", "[moremesecons_wireless] loaded.") | ||||
|   | ||||
| @@ -63,6 +63,9 @@ moremesecons_teleporter.enable_lbm (Enable Registration LBM) bool false | ||||
|  | ||||
| [Wireless] | ||||
|  | ||||
| # Whether to enable the wireless jammer node | ||||
| moremesecons_wireless.enable_jammer (Enable wireless jammer) bool true | ||||
|  | ||||
| # Wireless Jammer action range | ||||
| # Any value less than or equal to 0 will be changed to 1 and a NaN value will be changed to the default value | ||||
| moremesecons_wireless.jammer_max_distance (Wireless Jammer action range) float 15 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user