1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-13 14:00:32 +01:00

Merge branch 'master' into NALC2

This commit is contained in:
sys4-fr 2017-03-18 00:43:55 +01:00
commit a76f62fc27
12 changed files with 18 additions and 19 deletions

View File

@ -222,7 +222,7 @@ minetest.register_node("darkage:lamp", {
description = "Lamp",
tiles = {"darkage_lamp.png"},
paramtype = "light",
light_source = 18,
light_source = default.LIGHT_MAX,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,flammable=1},
sounds = default.node_sound_glass_defaults(),
})
@ -352,7 +352,7 @@ minetest.register_node("darkage:glow_glass", {
drawtype = "glasslike",
tiles = {"darkage_glass.png"},
paramtype = "light",
light_source = 18,
light_source = default.LIGHT_MAX,
sunlight_propagates = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(),

View File

@ -166,7 +166,7 @@ if stairsplus then
description = "Medieval Glow Glass",
tiles = {"darkage_glass.png"},
paramtype = "light",
light_source = 18,
light_source = default.LIGHT_MAX,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_stone_defaults(),
sunlight_propagates = true,

View File

@ -1,12 +1,11 @@
-- glow/init.lua
-- mod by john and Zeg9
LIGHT_MAX = 15
minetest.register_node("glow:stone", {
description = "Glowing stone",
tiles = {"glow_stone.png"},
light_source = LIGHT_MAX,
light_source = default.LIGHT_MAX,
groups = {cracky=3},
sounds = default.node_sound_glass_defaults(),
})
@ -14,7 +13,7 @@ minetest.register_node("glow:stone", {
minetest.register_node("glow:lamp", {
description = "Lamp",
tiles = {"glow_stone.png^glow_lamp_frame.png"},
light_source = LIGHT_MAX,
light_source = default.LIGHT_MAX,
groups = {cracky=3},
sounds = default.node_sound_glass_defaults(),
})

View File

@ -70,7 +70,7 @@ minetest.register_node("chains:chain_top_brass", {
minetest.register_node("chains:chandelier", {
description = "Chandelier (wrought iron)",
paramtype = "light",
light_source = LIGHT_MAX-2,
light_source = default.LIGHT_MAX-2,
walkable = false,
climbable = true,
sunlight_propagates = true,
@ -97,7 +97,7 @@ minetest.register_node("chains:chandelier", {
minetest.register_node("chains:chandelier_brass", {
description = "Chandelier (brass)",
paramtype = "light",
light_source = LIGHT_MAX-2,
light_source = default.LIGHT_MAX-2,
walkable = false,
climbable = true,
sunlight_propagates = true,

View File

@ -111,7 +111,7 @@ homedecor.register("ceiling_fan", {
}
},
groups = { snappy = 3 },
light_source = LIGHT_MAX-1,
light_source = default.LIGHT_MAX-1,
sounds = default.node_sound_glass_defaults(),
})

View File

@ -195,7 +195,7 @@ homedecor.register("fishtank_lighted", {
"homedecor_fishtank_water_top_lighted.png",
"homedecor_fishtank_sides_lighted.png",
},
light_source = LIGHT_MAX-4,
light_source = default.LIGHT_MAX-4,
use_texture_alpha = true,
selection_box = ft_cbox,
collision_box = ft_cbox,

View File

@ -242,7 +242,7 @@ minetest.register_node("maptools:lightbulb", {
drawtype = "airlike",
walkable = false,
pointable = false,
light_source = 15,
light_source = default.LIGHT_MAX,
paramtype = "light",
sunlight_propagates = true,
drop = "",

View File

@ -290,7 +290,7 @@ local nodes = {
tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, --MFF connected glass
paramtype = "light",
sunlight_propagates = true,
light_source = 15,
light_source = default.LIGHT_MAX,
groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass,
},
@ -300,7 +300,7 @@ local nodes = {
tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, --MFF connected glass
paramtype = "light",
sunlight_propagates = true,
light_source = 15,
light_source = default.LIGHT_MAX,
walkable = false,
groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass,

View File

@ -14,7 +14,7 @@ minetest.register_node("sealamps:torch", {
paramtype2 = "wallmounted",
sunlight_propagates = true,
walkable = false,
light_source = LIGHT_MAX-1,
light_source = default.LIGHT_MAX-1,
selection_box = {
type = "wallmounted",
wall_top = {-0.1, 0.5-0.6, -0.1, 0.1, 0.5, 0.1},
@ -40,7 +40,7 @@ minetest.register_node("sealamps:lantern", {
paramtype2 = "wallmounted",
sunlight_propagates = true,
walkable = false,
light_source = LIGHT_MAX-1,
light_source = default.LIGHT_MAX-1,
selection_box = {
type = "wallmounted",
wall_top = {-0.1, 0.5-0.6, -0.1, 0.1, 0.5, 0.1},
@ -71,4 +71,4 @@ minetest.register_craft({
recipe = {
{'default:steel_ingot', 'default:bronze_ingot', 'default:glass'},
},
})
})

View File

@ -132,7 +132,7 @@ minetest.register_node("snow:star", table.copy(nodedef))
-- Star (Lit Version) on Xmas Trees
nodedef.description = nodedef.description.." Lighted"
nodedef.light_source = LIGHT_MAX
nodedef.light_source = default.LIGHT_MAX
nodedef.tiles = {"snow_star_lit.png"}
nodedef.drop = "snow:star"
nodedef.groups.not_in_creative_inventory = 1

View File

@ -105,7 +105,7 @@ minetest.register_node("throwing:light", {
paramtype = "light",
sunlight_propagates = true,
tiles = {"throwing_empty.png"},
light_source = LIGHT_MAX-4,
light_source = default.LIGHT_MAX-4,
selection_box = {
type = "fixed",
fixed = {

@ -1 +1 @@
Subproject commit 978e88bda5b6d1f02187f700630b1a80a46fed07
Subproject commit 63153f10930b25c79c76449931384fb6d69ee984