diff --git a/init.lua b/init.lua index 4f8df32..649b251 100644 --- a/init.lua +++ b/init.lua @@ -33,6 +33,11 @@ dofile(MP.."/octagon_panes.lua") dofile(MP.."/forcefield.lua") dofile(MP.."/crafts.lua") +if minetest.get_modpath("unifieddyes") then + -- register colored nodes + dofile(MP.."/nodes_colored.lua") +end + if minetest.get_modpath("letters") then -- register letter nodes dofile(MP.."/letters.lua") diff --git a/nodes.lua b/nodes.lua index 6200c9b..5b1fb10 100644 --- a/nodes.lua +++ b/nodes.lua @@ -640,28 +640,13 @@ for _, row in ipairs(nodetypes) do node_def.palette = "unifieddyes_palette_extended.png" node_def.groups.ud_param2_colorable = 1 node_def.airbrush_replacement_node = "scifi_nodes:"..name.."_colored" + -- NOTE: about the "Node scifi_nodes:xxx has a palette, but not a suitable paramtype2" warning: + -- inserting "color" here (which would be the proper type) results in wrong + -- colored original nodes due to existing param2type = "facedir" + -- a migration lbm for those might be the proper solution but has to be thoroughly tested first + node_def.paramtype2 = nil end -- register node minetest.register_node("scifi_nodes:"..name, node_def) - - if is_colorable and has_unifieddyes_mod then - -- register colored node - minetest.register_node("scifi_nodes:"..name.."_colored", { - description = desc, - tiles = {"scifi_nodes_"..name..".png"}, - groups = { - cracky = 1, - ud_param2_colorable = 1, - not_in_creative_inventory = 1 - }, - palette = "unifieddyes_palette_extended.png", - paramtype = "light", - paramtype2 = "color", - light_source = light, - sounds = scifi_nodes.node_sound_glass_defaults(), - on_construct = unifieddyes.on_construct, - on_dig = unifieddyes.on_dig - }) - end end diff --git a/nodes_colored.lua b/nodes_colored.lua new file mode 100644 index 0000000..1e49aa0 --- /dev/null +++ b/nodes_colored.lua @@ -0,0 +1,68 @@ + +minetest.register_node("scifi_nodes:whiteoct_colored", { + description = "white octagon", + tiles = {"scifi_nodes_super_white.png"}, + overlay_tiles = {{ name = "scifi_nodes_whiteoct_overlay.png", color = "white" }}, + groups = { + cracky = 1, + ud_param2_colorable = 1, + not_in_creative_inventory = 1 + }, + palette = "unifieddyes_palette_extended.png", + paramtype = "light", + paramtype2 = "color", + sounds = scifi_nodes.node_sound_glass_defaults(), + on_construct = unifieddyes.on_construct, + on_dig = unifieddyes.on_dig +}) + +minetest.register_node("scifi_nodes:whitetile_colored", { + description = "white tile2", + tiles = {"scifi_nodes_whitetile.png"}, + overlay_tiles = {{ name = "scifi_nodes_whitetile_overlay.png", color = "white" }}, + groups = { + cracky = 1, + ud_param2_colorable = 1, + not_in_creative_inventory = 1 + }, + palette = "unifieddyes_palette_extended.png", + paramtype = "light", + paramtype2 = "color", + sounds = scifi_nodes.node_sound_glass_defaults(), + on_construct = unifieddyes.on_construct, + on_dig = unifieddyes.on_dig +}) + +minetest.register_node("scifi_nodes:white_colored", { + description = "plastic wall", + tiles = {"scifi_nodes_white.png"}, + -- NOTE: colorless overlay not enabled for the plastic wall node, doesn't look that natural + -- overlay_tiles = {{ name = "scifi_nodes_white_overlay.png", color = "white" }}, + groups = { + cracky = 1, + ud_param2_colorable = 1, + not_in_creative_inventory = 1 + }, + palette = "unifieddyes_palette_extended.png", + paramtype = "light", + paramtype2 = "color", + sounds = scifi_nodes.node_sound_glass_defaults(), + on_construct = unifieddyes.on_construct, + on_dig = unifieddyes.on_dig +}) + +minetest.register_node("scifi_nodes:white2_colored", { + description = "plastic", + tiles = {"scifi_nodes_white2.png"}, + groups = { + cracky = 1, + ud_param2_colorable = 1, + not_in_creative_inventory = 1 + }, + palette = "unifieddyes_palette_extended.png", + paramtype = "light", + paramtype2 = "color", + sounds = scifi_nodes.node_sound_glass_defaults(), + on_construct = unifieddyes.on_construct, + on_dig = unifieddyes.on_dig +}) \ No newline at end of file diff --git a/textures/scifi_nodes_lightoverlay.png b/textures/scifi_nodes_lightoverlay.png index a8790ee..69c3108 100644 Binary files a/textures/scifi_nodes_lightoverlay.png and b/textures/scifi_nodes_lightoverlay.png differ diff --git a/textures/scifi_nodes_white_overlay.png b/textures/scifi_nodes_white_overlay.png new file mode 100644 index 0000000..07ca929 Binary files /dev/null and b/textures/scifi_nodes_white_overlay.png differ diff --git a/textures/scifi_nodes_whiteoct_overlay.png b/textures/scifi_nodes_whiteoct_overlay.png new file mode 100644 index 0000000..7309ca6 Binary files /dev/null and b/textures/scifi_nodes_whiteoct_overlay.png differ diff --git a/textures/scifi_nodes_whitetile_overlay.png b/textures/scifi_nodes_whitetile_overlay.png new file mode 100644 index 0000000..b0664d8 Binary files /dev/null and b/textures/scifi_nodes_whitetile_overlay.png differ