Changes to torch and delayer appearance (#669)

* plantlike, x-shaped torch
* removed separate LEDs for luacontroller since already contained in base mod it depends on
* changed delayer textures to be more consistent with other gates
* Reduced the amount of textures needed for pistons with texture modifiers. Will continue to work fine with all existing texturepacks. No change in graphics.
* use luacontroller_LED instead of microcontroller_LED to prevent breaking the digistuff mod which inherits it. I hope no mods inherit microcontroller LED.
This commit is contained in:
mruncreative 2024-06-08 13:43:47 +02:00 committed by GitHub
parent a82bac7b5b
commit 0a4651c33c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
44 changed files with 53 additions and 60 deletions

View File

Before

Width:  |  Height:  |  Size: 844 B

After

Width:  |  Height:  |  Size: 844 B

View File

Before

Width:  |  Height:  |  Size: 838 B

After

Width:  |  Height:  |  Size: 838 B

View File

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 851 B

View File

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 846 B

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

View File

Before

Width:  |  Height:  |  Size: 84 B

After

Width:  |  Height:  |  Size: 84 B

View File

Before

Width:  |  Height:  |  Size: 84 B

After

Width:  |  Height:  |  Size: 84 B

View File

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 740 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 720 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 751 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B