Merge b2b4e2cf73 into cffbc33e6d

mesecons_delayer/init.lua

@@ -27,20 +27,6 @@ local delaytime = { 0.1, 0.3, 0.5, 1.0 }
 
 for i = 1, 4 do
 
-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 },
-	 { -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 },
-	 { -3/16, -7/16,  2/16, 3/16, -26/64, 3/16 },
-	 { -2/16, -7/16,  3/16, 2/16, -26/64, 4/16 },
-
-	 { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 },		-- the timer indicator
-	 { -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 }
-}
-
 -- Delayer definition defaults
 local def = {
 	drawtype = "nodebox",
@@ -48,11 +34,14 @@ local def = {
 	walkable = true,
 	selection_box = {
 		type = "fixed",
-		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+		fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
 	},
 	node_box = {
 		type = "fixed",
-		fixed = boxes
+		fixed = {
+			{ -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab
+			{ -6/16, -7/16, -6/16, 6/16, -6/16, 6/16 }
+		},
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -74,16 +63,16 @@ end
 
 local off_state = {
 	description = S("Delayer"),
+	inventory_image = "jeija_gate_off.png^jeija_delayer.png",
+	wield_image = "jeija_gate_off.png^jeija_delayer.png",
 	tiles = {
-		"mesecons_delayer_off_"..tostring(i)..".png",
-		"mesecons_delayer_bottom.png",
-		"mesecons_delayer_ends_off.png",
-		"mesecons_delayer_ends_off.png",
-		"mesecons_delayer_sides_off.png",
-		"mesecons_delayer_sides_off.png"
+		"jeija_microcontroller_bottom.png^jeija_gate_off.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png",
+		"jeija_microcontroller_bottom.png",
+		"jeija_gate_side.png",
+		"jeija_gate_side.png",
+		"jeija_gate_side.png",
+		"jeija_gate_side.png",
 	},
-	inventory_image = "mesecons_delayer_off_1.png",
-	wield_image = "mesecons_delayer_off_1.png",
 	groups = off_groups,
 	on_punch = function(pos, node, puncher)
 		if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then
@@ -117,13 +106,15 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state)
 -- Activated delayer definition defaults
 local on_state = {
 	description = S("You hacker you"),
+	inventory_image = "jeija_gate_on.png^jeija_delayer.png",
+	wield_image = "jeija_gate_on.png^jeija_delayer.png",
 	tiles = {
-		"mesecons_delayer_on_"..tostring(i)..".png",
-		"mesecons_delayer_bottom.png",
-		"mesecons_delayer_ends_on.png",
-		"mesecons_delayer_ends_on.png",
-		"mesecons_delayer_sides_on.png",
-		"mesecons_delayer_sides_on.png"
+		"jeija_microcontroller_bottom.png^jeija_gate_on.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png",
+		"jeija_microcontroller_bottom.png",
+		"jeija_gate_side.png",
+		"jeija_gate_side.png",
+		"jeija_gate_side.png",
+		"jeija_gate_side.png",
 	},
 	groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1},
 	on_punch = function(pos, node, puncher)

mesecons_fpga/init.lua

@@ -20,10 +20,10 @@ plg.register_nodes = function(template)
 
 		-- build top texture string
 		local texture = "jeija_fpga_top.png"
-		if a == 1 then texture = texture .. "^jeija_microcontroller_LED_A.png" end
-		if b == 1 then texture = texture .. "^jeija_microcontroller_LED_B.png" end
-		if c == 1 then texture = texture .. "^jeija_microcontroller_LED_C.png" end
-		if d == 1 then texture = texture .. "^jeija_microcontroller_LED_D.png" end
+		if a == 1 then texture = texture .. "^jeija_luacontroller_LED_A.png" end
+		if b == 1 then texture = texture .. "^jeija_luacontroller_LED_B.png" end
+		if c == 1 then texture = texture .. "^jeija_luacontroller_LED_C.png" end
+		if d == 1 then texture = texture .. "^jeija_luacontroller_LED_D.png" end
 		ndef.tiles[1] = texture
 		ndef.inventory_image = texture
 

mesecons_gates/mod.conf

@@ -1,2 +1,2 @@
 name = mesecons_gates
-depends = mesecons, mesecons_gamecompat, mesecons_microcontroller, mesecons_delayer, mesecons_torch, mesecons_materials
+depends = mesecons, mesecons_gamecompat, mesecons_microcontroller, mesecons_torch, mesecons_materials

mesecons_microcontroller/init.lua

@@ -12,16 +12,16 @@ for d = 0, 1 do
 local nodename = "mesecons_microcontroller:microcontroller"..tostring(d)..tostring(c)..tostring(b)..tostring(a)
 local top = "jeija_microcontroller_top.png"
 if tostring(a) == "1" then
-	top = top.."^jeija_microcontroller_LED_A.png"
+	top = top.."^jeija_luacontroller_LED_A.png"
 end
 if tostring(b) == "1" then
-	top = top.."^jeija_microcontroller_LED_B.png"
+	top = top.."^jeija_luacontroller_LED_B.png"
 end
 if tostring(c) == "1" then
-	top = top.."^jeija_microcontroller_LED_C.png"
+	top = top.."^jeija_luacontroller_LED_C.png"
 end
 if tostring(d) == "1" then
-	top = top.."^jeija_microcontroller_LED_D.png"
+	top = top.."^jeija_luacontroller_LED_D.png"
 end
 local groups
 if tostring(d)..tostring(c)..tostring(b)..tostring(a) ~= "0000" then

mesecons_pistons/init.lua

@@ -270,9 +270,9 @@ minetest.register_node("mesecons_pistons:piston_normal_off", {
 	description = S("Piston"),
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_bottom.png",
-		"mesecons_piston_left.png",
-		"mesecons_piston_right.png",
+		"mesecons_piston_top.png^[transform2",
+		"mesecons_piston_top.png^[transform3",
+		"mesecons_piston_top.png^[transform1",
 		"mesecons_piston_back.png",
 		"mesecons_piston_pusher_front.png"
 	},
@@ -296,9 +296,9 @@ minetest.register_node("mesecons_pistons:piston_normal_on", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_bottom.png",
-		"mesecons_piston_left.png",
-		"mesecons_piston_right.png",
+		"mesecons_piston_top.png^[transform2",
+		"mesecons_piston_top.png^[transform3",
+		"mesecons_piston_top.png^[transform1",
 		"mesecons_piston_back.png",
 		"mesecons_piston_on_front.png"
 	},
@@ -325,9 +325,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_pusher_top.png",
-		"mesecons_piston_pusher_bottom.png",
-		"mesecons_piston_pusher_left.png",
-		"mesecons_piston_pusher_right.png",
+		"mesecons_piston_pusher_top.png^[transform2",
+		"mesecons_piston_pusher_top.png^[transform3",
+		"mesecons_piston_pusher_top.png^[transform1",
 		"mesecons_piston_pusher_back.png",
 		"mesecons_piston_pusher_front.png"
 	},
@@ -349,9 +349,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", {
 	description = S("Sticky Piston"),
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_bottom.png",
-		"mesecons_piston_left.png",
-		"mesecons_piston_right.png",
+		"mesecons_piston_top.png^[transform2",
+		"mesecons_piston_top.png^[transform3",
+		"mesecons_piston_top.png^[transform1",
 		"mesecons_piston_back.png",
 		"mesecons_piston_pusher_front_sticky.png"
 	},
@@ -375,9 +375,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_top.png",
-		"mesecons_piston_bottom.png",
-		"mesecons_piston_left.png",
-		"mesecons_piston_right.png",
+		"mesecons_piston_top.png^[transform2",
+		"mesecons_piston_top.png^[transform3",
+		"mesecons_piston_top.png^[transform1",
 		"mesecons_piston_back.png",
 		"mesecons_piston_on_front.png"
 	},
@@ -404,9 +404,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", {
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_piston_pusher_top.png",
-		"mesecons_piston_pusher_bottom.png",
-		"mesecons_piston_pusher_left.png",
-		"mesecons_piston_pusher_right.png",
+		"mesecons_piston_pusher_top.png^[transform2",
+		"mesecons_piston_pusher_top.png^[transform3",
+		"mesecons_piston_pusher_top.png^[transform1",
 		"mesecons_piston_pusher_back.png",
 		"mesecons_piston_pusher_front_sticky.png"
 	},

mesecons_torch/init.lua

@@ -56,8 +56,8 @@ local torch_selectionbox =
 }
 
 minetest.register_node("mesecons_torch:mesecon_torch_off", {
-	drawtype = "torchlike",
-	tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"},
+	drawtype = "plantlike",
+	tiles = {"jeija_torches_off.png"},
 	inventory_image = "jeija_torches_off.png",
 	paramtype = "light",
 	is_ground_content = false,
@@ -75,8 +75,8 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", {
 })
 
 minetest.register_node("mesecons_torch:mesecon_torch_on", {
-	drawtype = "torchlike",
-	tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"},
+	drawtype = "plantlike",
+	tiles = {"jeija_torches_on.png"},
 	inventory_image = "jeija_torches_on.png",
 	wield_image = "jeija_torches_on.png",
 	paramtype = "light",