OOPS
parent
fdcad50023
commit
1889fd0c2c
39
lamps.lua
39
lamps.lua
|
@ -471,12 +471,11 @@ function meseconductors:register_lamp(mod, node)
|
||||||
local onstate = "meseconductors:"..mod.."_"..node
|
local onstate = "meseconductors:"..mod.."_"..node
|
||||||
local description = minetest.registered_nodes[mod ..":"..node].description .. " (mesecons)"
|
local description = minetest.registered_nodes[mod ..":"..node].description .. " (mesecons)"
|
||||||
local description_on = minetest.registered_nodes[mod ..":"..node].description .. " (mesecons on)"
|
local description_on = minetest.registered_nodes[mod ..":"..node].description .. " (mesecons on)"
|
||||||
<<<<<<< HEAD
|
|
||||||
local tiles = 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 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)
|
local groups = table.copy(minetest.registered_nodes[mod ..":"..node].groups)
|
||||||
if node == "lava_source" then
|
if node == "lava_source" then
|
||||||
groups = {snappy=3}
|
groups = {snappy=3}
|
||||||
|
@ -484,12 +483,10 @@ function meseconductors:register_lamp(mod, node)
|
||||||
description_on = "Fake Lava Source"
|
description_on = "Fake Lava Source"
|
||||||
end
|
end
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
local use_texture_alpha = minetest.registered_nodes[mod ..":"..node].use_texture_alpha
|
local use_texture_alpha = minetest.registered_nodes[mod ..":"..node].use_texture_alpha
|
||||||
local palette = minetest.registered_nodes[mod ..":"..node].palette
|
local palette = minetest.registered_nodes[mod ..":"..node].palette
|
||||||
local after_place_node = minetest.registered_nodes[mod ..":"..node].after_place_node
|
local after_place_node = minetest.registered_nodes[mod ..":"..node].after_place_node
|
||||||
=======
|
|
||||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
|
||||||
local drawtype = minetest.registered_nodes[mod ..":"..node].drawtype
|
local drawtype = minetest.registered_nodes[mod ..":"..node].drawtype
|
||||||
local paramtype = minetest.registered_nodes[mod ..":"..node].paramtype
|
local paramtype = minetest.registered_nodes[mod ..":"..node].paramtype
|
||||||
local paramtype2 = minetest.registered_nodes[mod ..":"..node].paramtype2
|
local paramtype2 = minetest.registered_nodes[mod ..":"..node].paramtype2
|
||||||
|
@ -510,7 +507,7 @@ function meseconductors:register_lamp(mod, node)
|
||||||
|
|
||||||
|
|
||||||
minetest.register_node(offstate, {
|
minetest.register_node(offstate, {
|
||||||
<<<<<<< HEAD
|
|
||||||
tiles = tiles,
|
tiles = tiles,
|
||||||
overlay_tiles = overlay_tiles,
|
overlay_tiles = overlay_tiles,
|
||||||
description = description,
|
description = description,
|
||||||
|
@ -518,14 +515,6 @@ function meseconductors:register_lamp(mod, node)
|
||||||
drawtype = drawtype,
|
drawtype = drawtype,
|
||||||
paramtype = paramtype,
|
paramtype = paramtype,
|
||||||
paramtype2 = paramtype2,
|
paramtype2 = paramtype2,
|
||||||
=======
|
|
||||||
tiles = textures,
|
|
||||||
description = description,
|
|
||||||
drawtype = drawtype,
|
|
||||||
paramtype = paramtype,
|
|
||||||
paramtype2 = paramtype2,
|
|
||||||
--paramtype2 = "wallmounted",
|
|
||||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
|
||||||
groups = groups,
|
groups = groups,
|
||||||
sounds = sounds,
|
sounds = sounds,
|
||||||
sunlight_propagates = sunlight_propagates,
|
sunlight_propagates = sunlight_propagates,
|
||||||
|
@ -537,12 +526,9 @@ function meseconductors:register_lamp(mod, node)
|
||||||
wield_image = wield_image,
|
wield_image = wield_image,
|
||||||
inventory_image = inventory_image,
|
inventory_image = inventory_image,
|
||||||
walkable = walkable,
|
walkable = walkable,
|
||||||
<<<<<<< HEAD
|
|
||||||
palette = palette,
|
palette = palette,
|
||||||
after_place_node = after_place_node,
|
after_place_node = after_place_node,
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
|
||||||
mesecons = {effector = {
|
mesecons = {effector = {
|
||||||
rules = rules_all,
|
rules = rules_all,
|
||||||
|
|
||||||
|
@ -560,17 +546,11 @@ function meseconductors:register_lamp(mod, node)
|
||||||
|
|
||||||
|
|
||||||
minetest.register_node(onstate, {
|
minetest.register_node(onstate, {
|
||||||
<<<<<<< HEAD
|
|
||||||
tiles = tiles,
|
tiles = tiles,
|
||||||
overlay_tiles = overlay_tiles,
|
overlay_tiles = overlay_tiles,
|
||||||
drop = offstate,
|
drop = offstate,
|
||||||
description = description_on,
|
description = description_on,
|
||||||
use_texture_alpha = use_texture_alpha,
|
use_texture_alpha = use_texture_alpha,
|
||||||
=======
|
|
||||||
tiles = textures,
|
|
||||||
drop = offstate,
|
|
||||||
description = description_on,
|
|
||||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
|
||||||
drawtype = drawtype,
|
drawtype = drawtype,
|
||||||
groups = groups_on,
|
groups = groups_on,
|
||||||
paramtype = paramtype,
|
paramtype = paramtype,
|
||||||
|
@ -586,11 +566,8 @@ function meseconductors:register_lamp(mod, node)
|
||||||
sunlight_propagates = sunlight_propagates,
|
sunlight_propagates = sunlight_propagates,
|
||||||
light_source = light_source,
|
light_source = light_source,
|
||||||
walkable = walkable,
|
walkable = walkable,
|
||||||
<<<<<<< HEAD
|
|
||||||
palette = palette,
|
palette = palette,
|
||||||
after_place_node = after_place_node,
|
after_place_node = after_place_node,
|
||||||
=======
|
|
||||||
>>>>>>> 761fa087cfa0bff9fe7f1dda1a25c42be7b1830f
|
|
||||||
mesecons = {effector = {
|
mesecons = {effector = {
|
||||||
rules = rules_all,
|
rules = rules_all,
|
||||||
action_off = function (pos, node)
|
action_off = function (pos, node)
|
||||||
|
@ -607,12 +584,6 @@ meseconductors:register_lamp("default", "meselamp")
|
||||||
meseconductors:register_lamp("ethereal", "glostone")
|
meseconductors:register_lamp("ethereal", "glostone")
|
||||||
|
|
||||||
meseconductors:register_lamp("homedecor", "glowlight_half")
|
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_large")
|
||||||
meseconductors:register_lamp("homedecor", "lattice_lantern_small")
|
meseconductors:register_lamp("homedecor", "lattice_lantern_small")
|
||||||
meseconductors:register_lamp("homedecor", "ceiling_lamp")
|
meseconductors:register_lamp("homedecor", "ceiling_lamp")
|
||||||
|
|
Loading…
Reference in New Issue