Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

overhaul colored nodes handling #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
25 changes: 5 additions & 20 deletions nodes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -642,28 +642,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
68 changes: 68 additions & 0 deletions nodes_colored.lua
Original file line number Diff line number Diff line change
@@ -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
})
Binary file modified textures/scifi_nodes_lightoverlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added textures/scifi_nodes_white_overlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added textures/scifi_nodes_whiteoct_overlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added textures/scifi_nodes_whitetile_overlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.