added support for new coloring feature
Rubberduck
parent
761fa087cf
commit
fdcad50023
52
lamps.lua
52
lamps.lua
|
|
@ -471,7 +471,12 @@ function meseconductors:register_lamp(mod, node)
|
|||
local onstate = "meseconductors:"..mod.."_"..node
|
||||
local description = minetest.registered_nodes[mod ..":"..node].description .. " (mesecons)"
|
||||
local description_on = minetest.registered_nodes[mod ..":"..node].description .. " (mesecons on)"
|
||||
<<<<<<< HEAD
|
||||
local tiles = minetest.registered_nodes[mod ..":"..node].tiles
|
||||
local overlay_tiles = minetest.registered_nodes[mod ..":"..node].overlay_tiles
|
||||
=======
|
||||
local textures = minetest.registered_nodes[mod ..":"..node].tiles
|
||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
||||
local groups = table.copy(minetest.registered_nodes[mod ..":"..node].groups)
|
||||
if node == "lava_source" then
|
||||
groups = {snappy=3}
|
||||
|
|
@ -479,6 +484,12 @@ function meseconductors:register_lamp(mod, node)
|
|||
description_on = "Fake Lava Source"
|
||||
end
|
||||
|
||||
<<<<<<< HEAD
|
||||
local use_texture_alpha = minetest.registered_nodes[mod ..":"..node].use_texture_alpha
|
||||
local palette = minetest.registered_nodes[mod ..":"..node].palette
|
||||
local after_place_node = minetest.registered_nodes[mod ..":"..node].after_place_node
|
||||
=======
|
||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
||||
local drawtype = minetest.registered_nodes[mod ..":"..node].drawtype
|
||||
local paramtype = minetest.registered_nodes[mod ..":"..node].paramtype
|
||||
local paramtype2 = minetest.registered_nodes[mod ..":"..node].paramtype2
|
||||
|
|
@ -499,12 +510,22 @@ function meseconductors:register_lamp(mod, node)
|
|||
|
||||
|
||||
minetest.register_node(offstate, {
|
||||
<<<<<<< HEAD
|
||||
tiles = tiles,
|
||||
overlay_tiles = overlay_tiles,
|
||||
description = description,
|
||||
use_texture_alpha = use_texture_alpha,
|
||||
drawtype = drawtype,
|
||||
paramtype = paramtype,
|
||||
paramtype2 = paramtype2,
|
||||
=======
|
||||
tiles = textures,
|
||||
description = description,
|
||||
drawtype = drawtype,
|
||||
paramtype = paramtype,
|
||||
paramtype2 = paramtype2,
|
||||
--paramtype2 = "wallmounted",
|
||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
||||
groups = groups,
|
||||
sounds = sounds,
|
||||
sunlight_propagates = sunlight_propagates,
|
||||
|
|
@ -516,7 +537,12 @@ function meseconductors:register_lamp(mod, node)
|
|||
wield_image = wield_image,
|
||||
inventory_image = inventory_image,
|
||||
walkable = walkable,
|
||||
<<<<<<< HEAD
|
||||
palette = palette,
|
||||
after_place_node = after_place_node,
|
||||
=======
|
||||
|
||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
||||
mesecons = {effector = {
|
||||
rules = rules_all,
|
||||
|
||||
|
|
@ -534,9 +560,17 @@ function meseconductors:register_lamp(mod, node)
|
|||
|
||||
|
||||
minetest.register_node(onstate, {
|
||||
<<<<<<< HEAD
|
||||
tiles = tiles,
|
||||
overlay_tiles = overlay_tiles,
|
||||
drop = offstate,
|
||||
description = description_on,
|
||||
use_texture_alpha = use_texture_alpha,
|
||||
=======
|
||||
tiles = textures,
|
||||
drop = offstate,
|
||||
description = description_on,
|
||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
||||
drawtype = drawtype,
|
||||
groups = groups_on,
|
||||
paramtype = paramtype,
|
||||
|
|
@ -552,6 +586,11 @@ function meseconductors:register_lamp(mod, node)
|
|||
sunlight_propagates = sunlight_propagates,
|
||||
light_source = light_source,
|
||||
walkable = walkable,
|
||||
<<<<<<< HEAD
|
||||
palette = palette,
|
||||
after_place_node = after_place_node,
|
||||
=======
|
||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
||||
mesecons = {effector = {
|
||||
rules = rules_all,
|
||||
action_off = function (pos, node)
|
||||
|
|
@ -567,12 +606,13 @@ end
|
|||
meseconductors:register_lamp("default", "meselamp")
|
||||
meseconductors:register_lamp("ethereal", "glostone")
|
||||
|
||||
meseconductors:register_lamp("homedecor", "glowlight_half_white")
|
||||
meseconductors:register_lamp("homedecor", "glowlight_half_yellow")
|
||||
meseconductors:register_lamp("homedecor", "glowlight_quarter_white")
|
||||
meseconductors:register_lamp("homedecor", "glowlight_quarter_yellow")
|
||||
meseconductors:register_lamp("homedecor", "glowlight_small_cube_white")
|
||||
meseconductors:register_lamp("homedecor", "glowlight_small_cube_yellow")
|
||||
meseconductors:register_lamp("homedecor", "glowlight_half")
|
||||
--meseconductors:register_lamp("homedecor", "glowlight_half_white")
|
||||
--meseconductors:register_lamp("homedecor", "glowlight_half_yellow")
|
||||
--meseconductors:register_lamp("homedecor", "glowlight_quarter_white")
|
||||
--meseconductors:register_lamp("homedecor", "glowlight_quarter_yellow")
|
||||
--meseconductors:register_lamp("homedecor", "glowlight_small_cube_white")
|
||||
--meseconductors:register_lamp("homedecor", "glowlight_small_cube_yellow")
|
||||
meseconductors:register_lamp("homedecor", "lattice_lantern_large")
|
||||
meseconductors:register_lamp("homedecor", "lattice_lantern_small")
|
||||
meseconductors:register_lamp("homedecor", "ceiling_lamp")
|
||||
|
|
|
|||
23
nodes.lua
23
nodes.lua
|
|
@ -13,16 +13,20 @@ function meseconductors:register_wire_block(mod, node)
|
|||
local onstate = "meseconductors:"..mod.."_"..node.."_on"
|
||||
local description = minetest.registered_nodes[mod ..":"..node].description .. " (conductable)"
|
||||
local description_on = minetest.registered_nodes[mod ..":"..node].description .. " (conductable - on - NICI)"
|
||||
local textures2 = minetest.registered_nodes[mod ..":"..node].tiles
|
||||
local tiles = minetest.registered_nodes[mod ..":"..node].tiles
|
||||
local overlay_tiles = minetest.registered_nodes[mod ..":"..node].overlay_tiles
|
||||
local groups = table.copy(minetest.registered_nodes[mod ..":"..node].groups)
|
||||
|
||||
if not meseconductors.use_creative_inventory then
|
||||
groups["not_in_creative_inventory"] = 1
|
||||
end
|
||||
|
||||
|
||||
local use_texture_alpha = minetest.registered_nodes[mod ..":"..node].use_texture_alpha
|
||||
local palette = minetest.registered_nodes[mod ..":"..node].palette
|
||||
local after_place_node = minetest.registered_nodes[mod ..":"..node].after_place_node
|
||||
local drawtype = minetest.registered_nodes[mod ..":"..node].drawtype
|
||||
local paramtype = minetest.registered_nodes[mod ..":"..node].paramtype
|
||||
local paramtype2 = minetest.registered_nodes[mod ..":"..node].paramtype2
|
||||
local sounds = minetest.registered_nodes[mod ..":"..node].sounds
|
||||
local sunlight_propagates = minetest.registered_nodes[mod ..":"..node].sunlight_propagates
|
||||
local light_source = minetest.registered_nodes[mod ..":"..node].light_source
|
||||
|
|
@ -42,11 +46,14 @@ function meseconductors:register_wire_block(mod, node)
|
|||
}
|
||||
|
||||
minetest.register_node(offstate, {
|
||||
tiles = textures2,
|
||||
|
||||
tiles = tiles,
|
||||
overlay_tiles = overlay_tiles,
|
||||
use_texture_alpha = use_texture_alpha,
|
||||
after_place_node = after_place_node,
|
||||
description = description,
|
||||
drawtype = drawtype,
|
||||
paramtype = paramtype,
|
||||
paramtype2 = paramtype2,
|
||||
sounds = sounds,
|
||||
sunlight_propagates = sunlight_propagates,
|
||||
light_source = light_source,
|
||||
|
|
@ -58,7 +65,7 @@ function meseconductors:register_wire_block(mod, node)
|
|||
groups = groups,
|
||||
|
||||
})
|
||||
local textures_on = table.copy(textures2)
|
||||
local textures_on = table.copy(tiles)
|
||||
if meseconductors.highlight_conducting then
|
||||
for i = 1, #textures_on, 1 do
|
||||
local t = textures_on[i]
|
||||
|
|
@ -67,7 +74,7 @@ function meseconductors:register_wire_block(mod, node)
|
|||
|
||||
textures_on[i] = t .."^[brighten"
|
||||
else
|
||||
textures_on[i] = textures2[i]
|
||||
textures_on[i] = tiles[i]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -79,10 +86,14 @@ function meseconductors:register_wire_block(mod, node)
|
|||
|
||||
minetest.register_node(onstate, {
|
||||
tiles = textures_on,
|
||||
overlay_tiles = overlay_tiles,
|
||||
use_texture_alpha = use_texture_alpha,
|
||||
after_place_node = after_place_node,
|
||||
drop = offstate,
|
||||
description = description_on,
|
||||
drawtype = drawtype,
|
||||
paramtype = paramtype,
|
||||
paramtype2 = paramtype2,
|
||||
sounds = sounds,
|
||||
sunlight_propagates = sunlight_propagates,
|
||||
light_source = light_source,
|
||||
|
|
|
|||
Loading…
Reference in New Issue