From d9c182cf9d37ff278b0235d44024fd53377fe6ab Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Tue, 3 Mar 2015 18:22:38 +0100 Subject: [PATCH] Changed all the LIGHT_MAX calls to default.LIGHT_MAX - Avoided crash by using the real variable instead of its old name --- minetestforfun_game/mods/default/init.lua | 10 +- minetestforfun_game/mods/default/mapgen.lua | 889 +++++++++--------- minetestforfun_game/mods/default/nodes.lua | 14 +- mods/bobblocks/blocks.lua | 70 +- mods/bobblocks/health.lua | 2 +- .../building_blocks/init.lua | 2 +- mods/homedecor_modpack/chains/init.lua | 4 +- .../homedecor/climate-control.lua | 2 +- .../homedecor/electronics.lua | 2 +- mods/homedecor_modpack/homedecor/lighting.lua | 18 +- .../homedecor/misc-nodes.lua | 2 +- mods/lantern/init.lua | 16 +- mods/mesecons/mesecons_button/init.lua | 2 +- mods/mesecons/mesecons_lamp/init.lua | 2 +- mods/mesecons/mesecons_lightstone/init.lua | 2 +- mods/mesecons/mesecons_powerplant/init.lua | 2 +- mods/mesecons/mesecons_torch/init.lua | 2 +- mods/sea/noairblocks/init.lua | 6 +- mods/snow/src/nodes.lua | 2 +- 19 files changed, 525 insertions(+), 524 deletions(-) diff --git a/minetestforfun_game/mods/default/init.lua b/minetestforfun_game/mods/default/init.lua index 0a1057d9..eee2de3e 100644 --- a/minetestforfun_game/mods/default/init.lua +++ b/minetestforfun_game/mods/default/init.lua @@ -3,12 +3,12 @@ default = {} -- Definitions made by this mod are usable by all mods. --- The API documentation in here was moved into doc/lua_api.txt. +-- The API documentation in here was moved into game_api.txt -WATER_ALPHA = 160 -WATER_VISC = 1 -LAVA_VISC = 3 -- Slower movement in lava. -LIGHT_MAX = 14 -- 15 is reserved for sunlight. +-- Definitions made by this mod that other mods can use too +default = {} + +default.LIGHT_MAX = 14 -- GUI related stuff: default.gui_bg = "bgcolor[#080808BB;true]" diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua index d50b0792..7a244e5c 100644 --- a/minetestforfun_game/mods/default/mapgen.lua +++ b/minetestforfun_game/mods/default/mapgen.lua @@ -31,331 +31,370 @@ minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble") -- Ore generation -- -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 8, - clust_size = 3, - height_min = -30000, - height_max = 64, -}) +function default.register_ores() + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_coal", + wherein = "default:stone", + clust_scarcity = 9 * 9 * 9, + clust_num_ores = 8, + clust_size = 3, + height_min = -30000, + height_max = 64, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:desert_stone_with_coal", - wherein = "default:desert_stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 10, - clust_size = 3, - height_min = 0, - height_max = 64, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:desert_stone_with_coal", + wherein = "default:desert_stone", + clust_scarcity = 9 * 9 * 9, + clust_num_ores = 10, + clust_size = 3, + height_min = 0, + height_max = 64, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 24 * 24 * 24, - clust_num_ores = 27, - clust_size = 6, - height_min = -30000, - height_max = 0, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_coal", + wherein = "default:stone", + clust_scarcity = 24 * 24 * 24, + clust_num_ores = 27, + clust_size = 6, + height_min = -30000, + height_max = 0, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 11 * 11 * 11, - clust_num_ores = 3, - clust_size = 2, - height_min = -15, - height_max = 2, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_iron", + wherein = "default:stone", + clust_scarcity = 11 * 11 * 11, + clust_num_ores = 3, + clust_size = 2, + height_min = -15, + height_max = 2, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - height_min = -63, - height_max = -16, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_iron", + wherein = "default:stone", + clust_scarcity = 10 * 10 * 10, + clust_num_ores = 5, + clust_size = 3, + height_min = -63, + height_max = -16, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 5, - clust_size = 3, - height_min = -30000, - height_max = -64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_iron", + wherein = "default:stone", + clust_scarcity = 9 * 9 * 9, + clust_num_ores = 5, + clust_size = 3, + height_min = -30000, + height_max = -64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 25 * 25 * 25, - clust_num_ores = 27, - clust_size = 6, - height_min = -30000, - height_max = -64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_iron", + wherein = "default:stone", + clust_scarcity = 25 * 25 * 25, + clust_num_ores = 27, + clust_size = 6, + height_min = -30000, + height_max = -64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 18 * 18 * 18, - clust_num_ores = 3, - clust_size = 2, - height_min = -255, - height_max = -128, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_mese", + wherein = "default:stone", + clust_scarcity = 18 * 18 * 18, + clust_num_ores = 3, + clust_size = 2, + height_min = -255, + height_max = -128, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 5, - clust_size = 3, - height_min = -1024, - height_max = -256, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_mese", + wherein = "default:stone", + clust_scarcity = 14 * 14 * 14, + clust_num_ores = 5, + clust_size = 3, + height_min = -1024, + height_max = -256, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 20 * 20 * 20, - clust_num_ores = 3, - clust_size = 2, - height_min = -30000, - height_max = -1024, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:mese", + wherein = "default:stone", + clust_scarcity = 20 * 20 * 20, + clust_num_ores = 3, + clust_size = 2, + height_min = -30000, + height_max = -1024, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 40 * 40 * 40, - clust_num_ores = 3, - clust_size = 2, - height_min = -1024, - height_max = 64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:mese", + wherein = "default:stone", + clust_scarcity = 40 * 40 * 40, + clust_num_ores = 3, + clust_size = 2, + height_min = -1024, + height_max = 64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:meze", - wherein = "default:stone", - clust_scarcity = 40 * 40 * 40, - clust_num_ores = 3, - clust_size = 2, - height_min = 0, - height_max = 64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:meze", + wherein = "default:stone", + clust_scarcity = 40 * 40 * 40, + clust_num_ores = 3, + clust_size = 2, + height_min = 0, + height_max = 64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:desert_stone", - clust_scarcity = 40 * 40 * 40, - clust_num_ores = 3, - clust_size = 2, - height_min = -1024, - height_max = 64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:mese", + wherein = "default:desert_stone", + clust_scarcity = 40 * 40 * 40, + clust_num_ores = 3, + clust_size = 2, + height_min = -1024, + height_max = 64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:meze", - wherein = "default:desert_stone", - clust_scarcity = 40 * 40 * 40, - clust_num_ores = 3, - clust_size = 2, - height_min = 0, - height_max = 64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:meze", + wherein = "default:desert_stone", + clust_scarcity = 40 * 40 * 40, + clust_num_ores = 3, + clust_size = 2, + height_min = 0, + height_max = 64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "maptools:superapple", - wherein = "default:apple", - clust_scarcity = 6 * 6 * 6, - clust_num_ores = 5, - clust_size = 2, - height_min = 0, - height_max = 64, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "maptools:superapple", + wherein = "default:apple", + clust_scarcity = 6 * 6 * 6, + clust_num_ores = 5, + clust_size = 2, + height_min = 0, + height_max = 64, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "maptools:superapple", - wherein = "default:jungleleaves", - clust_scarcity = 16 * 16 * 16, - clust_num_ores = 5, - clust_size = 2, - height_min = 0, - height_max = 64, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "maptools:superapple", + wherein = "default:jungleleaves", + clust_scarcity = 16 * 16 * 16, + clust_num_ores = 5, + clust_size = 2, + height_min = 0, + height_max = 64, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coin", - wherein = "default:stone", - clust_scarcity = 26 * 26 * 26, - clust_num_ores = 1, - clust_size = 1, - height_min = -30000, - height_max = 0, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_coin", + wherein = "default:stone", + clust_scarcity = 26 * 26 * 26, + clust_num_ores = 1, + clust_size = 1, + height_min = -30000, + height_max = 0, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 3, - clust_size = 2, - height_min = -255, - height_max = -64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_gold", + wherein = "default:stone", + clust_scarcity = 15 * 15 * 15, + clust_num_ores = 3, + clust_size = 2, + height_min = -255, + height_max = -64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 5, - clust_size = 3, - height_min = -30000, - height_max = -256, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_gold", + wherein = "default:stone", + clust_scarcity = 13 * 13 * 13, + clust_num_ores = 5, + clust_size = 3, + height_min = -30000, + height_max = -256, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 17 * 17 * 17, - clust_num_ores = 4, - clust_size = 3, - height_min = -512, - height_max = -256, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_diamond", + wherein = "default:stone", + clust_scarcity = 17 * 17 * 17, + clust_num_ores = 4, + clust_size = 3, + height_min = -512, + height_max = -256, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 4, - clust_size = 3, - height_min = -30000, - height_max = -512, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_diamond", + wherein = "default:stone", + clust_scarcity = 15 * 15 * 15, + clust_num_ores = 4, + clust_size = 3, + height_min = -30000, + height_max = -512, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 12 * 12 * 12, - clust_num_ores = 4, - clust_size = 3, - height_min = -63, - height_max = -16, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_copper", + wherein = "default:stone", + clust_scarcity = 12 * 12 * 12, + clust_num_ores = 4, + clust_size = 3, + height_min = -63, + height_max = -16, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:desert_stone_with_copper", - wherein = "default:desert_stone", - clust_scarcity = 11 * 11 * 11, - clust_num_ores = 6, - clust_size = 3, - height_min = 0, - height_max = 64, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:desert_stone_with_copper", + wherein = "default:desert_stone", + clust_scarcity = 11 * 11 * 11, + clust_num_ores = 6, + clust_size = 3, + height_min = 0, + height_max = 64, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - height_min = -30000, - height_max = -64, - flags = "absheight", -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_copper", + wherein = "default:stone", + clust_scarcity = 10 * 10 * 10, + clust_num_ores = 5, + clust_size = 3, + height_min = -30000, + height_max = -64, + flags = "absheight", + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 32 * 32 * 32, - clust_num_ores = 40, - clust_size = 4, - height_max = 64, - height_min = -30000, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_coal", + wherein = "default:stone", + clust_scarcity = 32 * 32 * 32, + clust_num_ores = 40, + clust_size = 4, + height_max = 64, + height_min = -30000, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 48 * 48 * 48, - clust_num_ores = 40, - clust_size = 4, - height_max = 64, - height_min = -30000, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_iron", + wherein = "default:stone", + clust_scarcity = 48 * 48 * 48, + clust_num_ores = 40, + clust_size = 4, + height_max = 64, + height_min = -30000, + }) -minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 30 * 30 * 30, - clust_num_ores = 64, - clust_size = 5, - height_max = -1024, - height_min = -30000, -}) + minetest.register_ore({ + ore_type = "scatter", + ore = "default:stone_with_diamond", + wherein = "default:stone", + clust_scarcity = 30 * 30 * 30, + clust_num_ores = 64, + clust_size = 5, + height_max = -1024, + height_min = -30000, + }) -if minetest.setting_get("mg_name") == "indev" then - -- Floatlands and high mountains springs: + if minetest.setting_get("mg_name") == "indev" then + -- Floatlands and high mountains springs: + minetest.register_ore({ + ore_type = "scatter", + ore = "default:water_source", + ore_param2 = 128, + wherein = "default:stone", + clust_scarcity = 40 *40 *40, + clust_num_ores = 8, + clust_size = 3, + height_min = 100, + height_max = 30000, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:lava_source", + ore_param2 = 128, + wherein = "default:stone", + clust_scarcity = 50 * 50 * 50, + clust_num_ores = 5, + clust_size = 2, + height_min = 10000, + height_max = 30000, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:sand", + wherein = "default:stone", + clust_scarcity = 20 * 20 * 20, + clust_num_ores = 5 * 5 * 3, + clust_size = 5, + height_min = 500, + height_max = 30000, + }) + end + + -- Underground springs: + minetest.register_ore({ ore_type = "scatter", ore = "default:water_source", ore_param2 = 128, wherein = "default:stone", - clust_scarcity = 40 *40 *40, - clust_num_ores = 8, - clust_size = 3, - height_min = 100, - height_max = 30000, + clust_scarcity = 20 * 20 * 20, + clust_num_ores = 10, + clust_size = 4, + height_min = -10000, + height_max = -10, }) minetest.register_ore({ @@ -363,169 +402,131 @@ if minetest.setting_get("mg_name") == "indev" then ore = "default:lava_source", ore_param2 = 128, wherein = "default:stone", - clust_scarcity = 50 * 50 * 50, + clust_scarcity = 32 * 32 * 32, clust_num_ores = 5, clust_size = 2, - height_min = 10000, - height_max = 30000, + height_min = -30000, + height_max = -100, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:dirt", + wherein = "default:stone", + clust_scarcity = 16 * 16 * 16, + clust_num_ores = 64, + clust_size = 5, + height_max = 64, + height_min = -4096, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:gravel", + wherein = "default:stone", + clust_scarcity = 16 * 16 * 16, + clust_num_ores = 64, + clust_size = 5, + height_max = 64, + height_min = -30000, }) minetest.register_ore({ ore_type = "scatter", ore = "default:sand", wherein = "default:stone", - clust_scarcity = 20 * 20 * 20, - clust_num_ores = 5 * 5 * 3, + clust_scarcity = 24 * 24 * 24, + clust_num_ores = 32, + clust_size = 4, + height_max = 64, + height_min = -1024, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:clay", + wherein = "default:stone", + clust_scarcity = 32 * 32 * 32, + clust_num_ores = 32, + clust_size = 4, + height_max = 64, + height_min = -1024, + }) + + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:cobble", + wherein = "default:stone", + clust_scarcity = 40 * 40 * 40, + clust_num_ores = 512, + clust_size = 9, + height_max = 64, + height_min = -4096, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:desert_cobble", + wherein = "default:desert_stone", + clust_scarcity = 40 * 40 * 40, + clust_num_ores = 512, + clust_size = 9, + height_max = 64, + height_min = 0, + }) + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:clay", + wherein = "default:sand", + clust_scarcity = 14 * 14 * 14, + clust_num_ores = 64, clust_size = 5, - height_min = 500, - height_max = 30000, + height_max = 4, + height_min = -8, + }) + + -- Air rooms in dirt: + + minetest.register_ore({ + ore_type = "scatter", + ore = "air", + wherein = "default:dirt", + clust_scarcity = 24 * 24 * 24, + clust_num_ores = 200, + clust_size = 7, + height_min = -30000, + height_max = 64, + }) + + -- Acid lakes in gravel: + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:acid_source", + wherein = "default:gravel", + clust_scarcity = 20 * 20 * 20, + clust_num_ores = 64, + clust_size = 5, + height_min = -30000, + height_max = 64, + }) + + -- Ice pools in stone: + + minetest.register_ore({ + ore_type = "scatter", + ore = "default:ice", + wherein = "default:stone", + clust_scarcity = 32 * 32 * 32, + clust_num_ores = 200, + clust_size = 6, + height_min = -30000, + height_max = 64, }) end --- Underground springs: - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:water_source", - ore_param2 = 128, - wherein = "default:stone", - clust_scarcity = 20 * 20 * 20, - clust_num_ores = 10, - clust_size = 4, - height_min = -10000, - height_max = -10, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:lava_source", - ore_param2 = 128, - wherein = "default:stone", - clust_scarcity = 32 * 32 * 32, - clust_num_ores = 5, - clust_size = 2, - height_min = -30000, - height_max = -100, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:dirt", - wherein = "default:stone", - clust_scarcity = 16 * 16 * 16, - clust_num_ores = 64, - clust_size = 5, - height_max = 64, - height_min = -4096, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:gravel", - wherein = "default:stone", - clust_scarcity = 16 * 16 * 16, - clust_num_ores = 64, - clust_size = 5, - height_max = 64, - height_min = -30000, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:sand", - wherein = "default:stone", - clust_scarcity = 24 * 24 * 24, - clust_num_ores = 32, - clust_size = 4, - height_max = 64, - height_min = -1024, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:clay", - wherein = "default:stone", - clust_scarcity = 32 * 32 * 32, - clust_num_ores = 32, - clust_size = 4, - height_max = 64, - height_min = -1024, -}) - - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:cobble", - wherein = "default:stone", - clust_scarcity = 40 * 40 * 40, - clust_num_ores = 512, - clust_size = 9, - height_max = 64, - height_min = -4096, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:desert_cobble", - wherein = "default:desert_stone", - clust_scarcity = 40 * 40 * 40, - clust_num_ores = 512, - clust_size = 9, - height_max = 64, - height_min = 0, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:clay", - wherein = "default:sand", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 64, - clust_size = 5, - height_max = 4, - height_min = -8, -}) - --- Air rooms in dirt: - -minetest.register_ore({ - ore_type = "scatter", - ore = "air", - wherein = "default:dirt", - clust_scarcity = 24 * 24 * 24, - clust_num_ores = 200, - clust_size = 7, - height_min = -30000, - height_max = 64, -}) - --- Acid lakes in gravel: - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:acid_source", - wherein = "default:gravel", - clust_scarcity = 20 * 20 * 20, - clust_num_ores = 64, - clust_size = 5, - height_min = -30000, - height_max = 64, -}) - --- Ice pools in stone: - -minetest.register_ore({ - ore_type = "scatter", - ore = "default:ice", - wherein = "default:stone", - clust_scarcity = 32 * 32 * 32, - clust_num_ores = 200, - clust_size = 6, - height_min = -30000, - height_max = 64, -}) - - function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max) minetest.log("action", "WARNING: default.generate_ore is deprecated") diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index bf3b434f..92db9b9e 100644 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -1036,7 +1036,7 @@ minetest.register_node("default:acid_flowing", { animation={type = "vertical_frames", aspect_w= 16, aspect_h = 16, length = 0.6} }, }, - alpha = WATER_ALPHA, + alpha = 160, paramtype = "light", paramtype2 = "flowingliquid", walkable = false, @@ -1048,7 +1048,7 @@ minetest.register_node("default:acid_flowing", { liquidtype = "flowing", liquid_alternative_flowing = "default:acid_flowing", liquid_alternative_source = "default:acid_source", - liquid_viscosity = WATER_VISC, + liquid_viscosity = 1, damage_per_second = 3, post_effect_color = {a = 120, r = 50, g = 90, b = 30}, groups = {water = 3, acid = 3, liquid = 3, puts_out_fire = 1, not_in_creative_inventory = 1}, @@ -1069,7 +1069,7 @@ minetest.register_node("default:acid_source", { backface_culling = false, } }, - alpha = WATER_ALPHA, + alpha = 160, paramtype = "light", walkable = false, pointable = false, @@ -1080,7 +1080,7 @@ minetest.register_node("default:acid_source", { liquidtype = "source", liquid_alternative_flowing = "default:acid_flowing", liquid_alternative_source = "default:acid_source", - liquid_viscosity = WATER_VISC, + liquid_viscosity = 1, damage_per_second = 3, post_effect_color = {a = 120, r = 50, g = 90, b = 30}, groups = {water = 3, acid = 3, liquid = 3, puts_out_fire = 1}, @@ -1102,7 +1102,7 @@ minetest.register_node("default:torch", { sunlight_propagates = true, is_ground_content = false, walkable = false, - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, node_box = { type = "wallmounted", wall_top = {-0.0625, -0.0625, -0.0625, 0.0625, 0.5 , 0.0625}, @@ -1464,7 +1464,7 @@ minetest.register_node("default:nyancat", { "default_nc_side.png", "default_nc_back.png", "default_nc_front.png"}, paramtype = "light", paramtype2 = "facedir", - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, groups = {cracky = 2}, is_ground_content = false, post_effect_color = {a = 128, r= 255, g= 128, b= 255}, @@ -1478,7 +1478,7 @@ minetest.register_node("default:nyancat_rainbow", { "default_nc_rb.png", "default_nc_rb.png"}, paramtype = "light", paramtype2 = "facedir", - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, sunlight_propagates = true, walkable = false, use_texture_alpha = true, diff --git a/mods/bobblocks/blocks.lua b/mods/bobblocks/blocks.lua index 9447b435..e994974c 100755 --- a/mods/bobblocks/blocks.lua +++ b/mods/bobblocks/blocks.lua @@ -101,7 +101,7 @@ minetest.register_node("bobblocks:redblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -113,7 +113,7 @@ minetest.register_node("bobblocks:redblock_off", { description = "Red Block", tile_images = {"bobblocks_redblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:redblock', mesecons = {conductor={ @@ -132,7 +132,7 @@ minetest.register_node("bobblocks:orangeblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -144,7 +144,7 @@ minetest.register_node("bobblocks:orangeblock_off", { description = "Orange Block", tile_images = {"bobblocks_orangeblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:orangeblock', mesecons = {conductor={ @@ -163,7 +163,7 @@ minetest.register_node("bobblocks:yellowblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -175,7 +175,7 @@ minetest.register_node("bobblocks:yellowblock_off", { description = "Yellow Block", tile_images = {"bobblocks_yellowblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:yellowblock', mesecons = {conductor={ @@ -194,7 +194,7 @@ minetest.register_node("bobblocks:greenblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -206,7 +206,7 @@ minetest.register_node("bobblocks:greenblock_off", { description = "Green Block", tile_images = {"bobblocks_greenblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:greenblock', mesecons = {conductor={ @@ -226,7 +226,7 @@ minetest.register_node("bobblocks:blueblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -238,7 +238,7 @@ minetest.register_node("bobblocks:blueblock_off", { description = "Blue Block", tile_images = {"bobblocks_blueblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:blueblock', mesecons = {conductor={ @@ -257,7 +257,7 @@ minetest.register_node("bobblocks:indigoblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -269,7 +269,7 @@ minetest.register_node("bobblocks:indigoblock_off", { description = "Indigo Block", tile_images = {"bobblocks_indigoblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:indigoblock', mesecons = {conductor={ @@ -289,7 +289,7 @@ minetest.register_node("bobblocks:violetblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -301,7 +301,7 @@ minetest.register_node("bobblocks:violetblock_off", { description = "Violet Block", tile_images = {"bobblocks_violetblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:violetblock', mesecons = {conductor={ @@ -320,7 +320,7 @@ minetest.register_node("bobblocks:whiteblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -332,7 +332,7 @@ minetest.register_node("bobblocks:whiteblock_off", { description = "White Block", tile_images = {"bobblocks_whiteblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:whiteblock', mesecons = {conductor={ @@ -352,7 +352,7 @@ minetest.register_node("bobblocks:greyblock", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -364,7 +364,7 @@ minetest.register_node("bobblocks:greyblock_off", { description = "Grey Block", tile_images = {"bobblocks_greyblock.png"}, is_ground_content = true, - alpha = WATER_ALPHA, + alpha = 160, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:greyblock', mesecons = {conductor={ @@ -385,7 +385,7 @@ minetest.register_node("bobblocks:redpole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -402,7 +402,7 @@ minetest.register_node("bobblocks:redpole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:redpole', mesecons = {conductor={ @@ -421,7 +421,7 @@ minetest.register_node("bobblocks:orangepole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -438,7 +438,7 @@ minetest.register_node("bobblocks:orangepole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:orangepole', mesecons = {conductor={ @@ -457,7 +457,7 @@ minetest.register_node("bobblocks:yellowpole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -474,7 +474,7 @@ minetest.register_node("bobblocks:yellowpole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:yellowpole', mesecons = {conductor={ @@ -493,7 +493,7 @@ minetest.register_node("bobblocks:greenpole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -510,7 +510,7 @@ minetest.register_node("bobblocks:greenpole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:greenpole', mesecons = {conductor={ @@ -529,7 +529,7 @@ minetest.register_node("bobblocks:bluepole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -546,7 +546,7 @@ minetest.register_node("bobblocks:bluepole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:bluepole', mesecons = {conductor={ @@ -565,7 +565,7 @@ minetest.register_node("bobblocks:indigopole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -582,7 +582,7 @@ minetest.register_node("bobblocks:indigopole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:indigopole', mesecons = {conductor={ @@ -601,7 +601,7 @@ minetest.register_node("bobblocks:violetpole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -618,7 +618,7 @@ minetest.register_node("bobblocks:violetpole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:violetpole', mesecons = {conductor={ @@ -637,7 +637,7 @@ minetest.register_node("bobblocks:whitepole", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-0, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, mesecons = {conductor={ state = mesecon.state.on, @@ -654,7 +654,7 @@ minetest.register_node("bobblocks:whitepole_off", { sunlight_propagates = true, is_ground_content = true, sounds = default.node_sound_glass_defaults(), - light_source = LIGHT_MAX-10, + light_source = default.LIGHT_MAX-10, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, drop = 'bobblocks:whitepole', mesecons = {conductor={ @@ -674,7 +674,7 @@ minetest.register_node("bobblocks:greypole", { is_ground_content = true, sounds = default.node_sound_glass_defaults(), groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, - --light_source = LIGHT_MAX-0, + --light_source = default.LIGHT_MAX-0, }) diff --git a/mods/bobblocks/health.lua b/mods/bobblocks/health.lua index 343bd15b..df66dcc2 100755 --- a/mods/bobblocks/health.lua +++ b/mods/bobblocks/health.lua @@ -51,7 +51,7 @@ minetest.register_node("bobblocks:health_on", { tile_images = {"bobblocks_health_on.png"}, paramtype2 = "facedir", legacy_facedir_simple = true, - light_source = LIGHT_MAX-0, + light_source = default.LIGHT_MAX-1, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, is_ground_content = true, walkable = false, diff --git a/mods/homedecor_modpack/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua index 9ba35aa0..28c4c8ad 100755 --- a/mods/homedecor_modpack/building_blocks/init.lua +++ b/mods/homedecor_modpack/building_blocks/init.lua @@ -165,7 +165,7 @@ minetest.register_node("building_blocks:Fireplace", { }, paramtype = "light", paramtype2 = "facedir", - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, sunlight_propagates = true, is_ground_content = true, groups = {cracky=2}, diff --git a/mods/homedecor_modpack/chains/init.lua b/mods/homedecor_modpack/chains/init.lua index f0c02250..d3799b62 100755 --- a/mods/homedecor_modpack/chains/init.lua +++ b/mods/homedecor_modpack/chains/init.lua @@ -72,7 +72,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, @@ -87,7 +87,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, diff --git a/mods/homedecor_modpack/homedecor/climate-control.lua b/mods/homedecor_modpack/homedecor/climate-control.lua index b3e08335..cc755746 100755 --- a/mods/homedecor_modpack/homedecor/climate-control.lua +++ b/mods/homedecor_modpack/homedecor/climate-control.lua @@ -122,7 +122,7 @@ homedecor.register("ceiling_fan", { } }, groups = { snappy = 3 }, - light_source = LIGHT_MAX-1, + light_source = default.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), }) diff --git a/mods/homedecor_modpack/homedecor/electronics.lua b/mods/homedecor_modpack/homedecor/electronics.lua index 85cf8fe7..dd3dd81f 100755 --- a/mods/homedecor_modpack/homedecor/electronics.lua +++ b/mods/homedecor_modpack/homedecor/electronics.lua @@ -80,7 +80,7 @@ homedecor.register("television", { } } }, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), }) diff --git a/mods/homedecor_modpack/homedecor/lighting.lua b/mods/homedecor_modpack/homedecor/lighting.lua index 69bc72c3..f70edef2 100755 --- a/mods/homedecor_modpack/homedecor/lighting.lua +++ b/mods/homedecor_modpack/homedecor/lighting.lua @@ -82,7 +82,7 @@ homedecor.register("glowlight_half_"..color, { selection_box = glowlight_nodebox.half, node_box = glowlight_nodebox.half, groups = { snappy = 3 }, - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) @@ -100,7 +100,7 @@ homedecor.register("glowlight_quarter_"..color, { selection_box = glowlight_nodebox.quarter, node_box = glowlight_nodebox.quarter, groups = { snappy = 3 }, - light_source = LIGHT_MAX-1, + light_source = default.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) @@ -120,7 +120,7 @@ homedecor.register("glowlight_small_cube_"..color, { selection_box = glowlight_nodebox.small_cube, node_box = glowlight_nodebox.small_cube, groups = { snappy = 3 }, - light_source = LIGHT_MAX-1, + light_source = default.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) @@ -138,7 +138,7 @@ homedecor.register("plasma_lamp", { } }, -- use_texture_alpha = true, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), @@ -170,7 +170,7 @@ homedecor.register("candle", { }, sunlight_propagates = true, groups = { snappy = 3 }, - light_source = LIGHT_MAX-4, + light_source = default.LIGHT_MAX-4, sounds = default.node_sound_wood_defaults(), }) @@ -190,7 +190,7 @@ homedecor.register("candle_thin", { sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, - light_source = LIGHT_MAX-4, + light_source = default.LIGHT_MAX-4, }) homedecor.register("oil_lamp", { @@ -206,7 +206,7 @@ homedecor.register("oil_lamp", { } }, groups = { snappy = 3 }, - light_source = LIGHT_MAX-4, + light_source = default.LIGHT_MAX-4, sounds = default.node_sound_wood_defaults(), }) @@ -250,7 +250,7 @@ homedecor.register("lattice_lantern_large", { description = S("Lattice lantern (large)"), tiles = { 'homedecor_lattice_lantern_large.png' }, groups = { snappy = 3 }, - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, sounds = default.node_sound_wood_defaults(), }) @@ -270,7 +270,7 @@ homedecor.register("lattice_lantern_small", { fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } }, groups = { snappy = 3 }, - light_source = LIGHT_MAX-1, + light_source = default.LIGHT_MAX-1, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 78bd8d77..230c2d66 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -178,7 +178,7 @@ homedecor.register("fishtank_lighted", { "homedecor_fishtank_back_lighted.png", "homedecor_fishtank_front_lighted.png" }, - light_source = LIGHT_MAX-4, + light_source = default.LIGHT_MAX-4, node_box = { type = "fixed", fixed = { diff --git a/mods/lantern/init.lua b/mods/lantern/init.lua index 1c2fbc94..8914e5fc 100755 --- a/mods/lantern/init.lua +++ b/mods/lantern/init.lua @@ -10,7 +10,7 @@ minetest.register_node("lantern:lantern", { tiles = {"lantern_tb.png","lantern_tb.png","lantern.png","lantern.png","lantern.png","lantern.png"}, paramtype = "light", sunlight_propagates = true, - light_source = LIGHT_MAX-1, + light_source = default.LIGHT_MAX-1, paramtype2 = "wallmounted", walkable = false, groups = {snappy = 2, cracky = 2, dig_immediate = 3}, @@ -48,7 +48,7 @@ minetest.register_node("lantern:candle", { paramtype = "light", sunlight_propagates = true, walkable = false, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = {dig_immediate = 3, attached_node = 1}, sounds = default.node_sound_defaults(), selection_box = { @@ -63,7 +63,7 @@ minetest.register_node("lantern:lamp", { paramtype = "light", sunlight_propagates = true, walkable = true, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = {snappy = 2, cracky = 2, oddly_breakable_by_hand = 3}, sounds = default.node_sound_glass_defaults(), }) @@ -179,7 +179,7 @@ minetest.register_node("lantern:lamp1", { paramtype = "light", sunlight_propagates = true, walkable = true, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = {snappy = 2, cracky = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1}, sounds = default.node_sound_glass_defaults(), selection_box = { @@ -202,7 +202,7 @@ minetest.register_node("lantern:lamp2", { paramtype = "light", sunlight_propagates = true, walkable = true, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = {snappy = 2, cracky = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1}, sounds = default.node_sound_glass_defaults(), selection_box = { @@ -225,7 +225,7 @@ minetest.register_node("lantern:lamp3", { paramtype = "light", sunlight_propagates = true, walkable = true, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = {snappy = 2, cracky = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1}, sounds = default.node_sound_glass_defaults(), selection_box = { @@ -248,7 +248,7 @@ minetest.register_node("lantern:lamp4", { paramtype = "light", sunlight_propagates = true, walkable = true, - light_source = LIGHT_MAX - 1, + light_source = default.LIGHT_MAX - 1, groups = {snappy = 2, cracky = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1}, sounds = default.node_sound_glass_defaults(), selection_box = { @@ -348,4 +348,4 @@ minetest.register_craft({ type = "shapeless", output = 'lantern:lantern_lampost1', recipe = {"lantern:lantern_lampost4"} -}) \ No newline at end of file +}) diff --git a/mods/mesecons/mesecons_button/init.lua b/mods/mesecons/mesecons_button/init.lua index f147d8f5..ead688ee 100644 --- a/mods/mesecons/mesecons_button/init.lua +++ b/mods/mesecons/mesecons_button/init.lua @@ -67,7 +67,7 @@ minetest.register_node("mesecons_button:button_on", { paramtype2 = "facedir", legacy_wallmounted = true, walkable = false, - light_source = LIGHT_MAX-7, + light_source = default.LIGHT_MAX-7, sunlight_propagates = true, selection_box = { type = "fixed", diff --git a/mods/mesecons/mesecons_lamp/init.lua b/mods/mesecons/mesecons_lamp/init.lua index 6cdae2da..e0df9ef5 100644 --- a/mods/mesecons/mesecons_lamp/init.lua +++ b/mods/mesecons/mesecons_lamp/init.lua @@ -17,7 +17,7 @@ minetest.register_node("mesecons_lamp:lamp_on", { legacy_wallmounted = true, sunlight_propagates = true, walkable = true, - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, node_box = mesecon_lamp_box, selection_box = mesecon_lamp_box, groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1}, diff --git a/mods/mesecons/mesecons_lightstone/init.lua b/mods/mesecons/mesecons_lightstone/init.lua index db34249e..da7cc41e 100644 --- a/mods/mesecons/mesecons_lightstone/init.lua +++ b/mods/mesecons/mesecons_lightstone/init.lua @@ -31,7 +31,7 @@ function mesecon.lightstone_add(name, base_item, texture_off, texture_on) tiles = {texture_on}, groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2}, drop = "mesecons_lightstone:lightstone_" .. name .. "_off", - light_source = LIGHT_MAX-2, + light_source = default.LIGHT_MAX-2, sounds = default.node_sound_stone_defaults(), mesecons = {effector = { rules = lightstone_rules, diff --git a/mods/mesecons/mesecons_powerplant/init.lua b/mods/mesecons/mesecons_powerplant/init.lua index 33cedffc..a5e33272 100644 --- a/mods/mesecons/mesecons_powerplant/init.lua +++ b/mods/mesecons/mesecons_powerplant/init.lua @@ -9,7 +9,7 @@ minetest.register_node("mesecons_powerplant:power_plant", { paramtype = "light", walkable = false, groups = {dig_immediate=3, mesecon = 2}, - light_source = LIGHT_MAX-9, + light_source = default.LIGHT_MAX-9, description="Power Plant", selection_box = { type = "fixed", diff --git a/mods/mesecons/mesecons_torch/init.lua b/mods/mesecons/mesecons_torch/init.lua index 91f8e65b..5d1ad8f0 100644 --- a/mods/mesecons/mesecons_torch/init.lua +++ b/mods/mesecons/mesecons_torch/init.lua @@ -76,7 +76,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", { paramtype2 = "wallmounted", selection_box = torch_selectionbox, groups = {dig_immediate=3}, - light_source = LIGHT_MAX-5, + light_source = default.LIGHT_MAX-5, description="Mesecon Torch", mesecons = {receptor = { state = mesecon.state.on, diff --git a/mods/sea/noairblocks/init.lua b/mods/sea/noairblocks/init.lua index 0cf74c1f..836d732a 100755 --- a/mods/sea/noairblocks/init.lua +++ b/mods/sea/noairblocks/init.lua @@ -29,7 +29,7 @@ minetest.register_node("noairblocks:water_flowingx", { liquidtype = "flowing", liquid_alternative_flowing = "noairblocks:water_flowingx", liquid_alternative_source = "noairblocks:water_sourcex", - liquid_viscosity = WATER_VISC, + liquid_viscosity = 1, freezemelt = "default:snow", post_effect_color = {a=64, r=100, g=100, b=200}, groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1, freezes=1, melt_around=1}, @@ -61,7 +61,7 @@ minetest.register_node("noairblocks:water_sourcex", { liquidtype = "source", liquid_alternative_flowing = "noairblocks:water_flowingx", liquid_alternative_source = "noairblocks:water_sourcex", - liquid_viscosity = WATER_VISC, + liquid_viscosity = 1, freezemelt = "default:ice", post_effect_color = {a=64, r=100, g=100, b=200}, groups = {water=3, liquid=3, puts_out_fire=1, freezes=1}, @@ -227,4 +227,4 @@ local pos1 = {x=pos.x+1,y=pos.y+1,z=pos.z+1} return end end, -}) \ No newline at end of file +}) diff --git a/mods/snow/src/nodes.lua b/mods/snow/src/nodes.lua index a6113c20..17cb4a4c 100755 --- a/mods/snow/src/nodes.lua +++ b/mods/snow/src/nodes.lua @@ -209,7 +209,7 @@ minetest.register_node("snow:star", { minetest.register_node("snow:star_lit", { description = "Star Lighted", drawtype = "plantlike", - light_source = LIGHT_MAX, + light_source = default.LIGHT_MAX - 1, tiles = {"snow_star_lit.png"}, wield_image = "snow_star.png", paramtype = "light",