Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix prev commit and convert spaces => tabs.

Browse Source
This commit is contained in:
Maksim 2019-05-11 23:20:22 +02:00
parent c95e292e20
commit 6cd76e2e17
7 changed files with 95 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
games/default/files/creative/inventory.lua
View File

@ -46,15 +46,15 @@ hoch["matr"] = "^[transformfy"
hoch["inv"] = "^[transformfy" hoch["inv"] = "^[transformfy"
bg["blocks"] = "default_grass_side.png" bg["blocks"] = "default_grass_side.png"
bg["deco"] = "creative_deko.png" bg["deco"] = "default_sapling.png"
bg["mese"] = "creative_mese.png" bg["mese"] = "jeija_lightstone_gray_on.png"
bg["rail"] = "boats_inventory.png" bg["rail"] = "boats_inventory.png"
bg["misc"] = "bucket_water.png" bg["misc"] = "bucket_water.png"
bg["all"] = "creative_all.png" bg["all"] = "creative_all.png"
bg["food"] = "creative_food.png" bg["food"] = "creative_food.png"
bg["tools"] = "creative_tool.png" bg["tools"] = "default_tool_diamondpick.png"
bg["combat"] = "creative_sword.png" bg["combat"] = "default_tool_steelsword.png"
bg["brew"] = "creative_brew.png" bg["brew"] = "potions_bottle.png"
bg["matr"] = "default_emerald.png" bg["matr"] = "default_emerald.png"
bg["inv"] = "creative_inv.png" bg["inv"] = "creative_inv.png"

2
games/default/files/default/functions.lua
View File

@ -401,7 +401,7 @@ local function leafdecay_after_destruct(pos, oldnode, def)
local node = minetest.get_node(v) local node = minetest.get_node(v)
local timer = minetest.get_node_timer(v) local timer = minetest.get_node_timer(v)
if node.param2 == 0 and not timer:is_started() then if node.param2 == 0 and not timer:is_started() then
timer:start(math.random(20, 120) / 10) timer:start(math.random(40, 160) / 10)
end end
end end
end end

19
games/default/files/default/nodes.lua
View File

@ -865,6 +865,7 @@ minetest.register_node("default:water_source", {
tiles = { tiles = {
{ {
name = "default_water_source_animated.png", name = "default_water_source_animated.png",
backface_culling = false,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
@ -872,18 +873,15 @@ minetest.register_node("default:water_source", {
length = 2.0, length = 2.0,
}, },
}, },
},
special_tiles = {
-- New-style water source material (mostly unused)
{ {
name = "default_water_source_animated.png", name = "default_water_source_animated.png",
backface_culling = true,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
aspect_h = 32, aspect_h = 32,
length = 2.0, length = 2.0,
}, },
backface_culling = false,
}, },
}, },
alpha = 160, alpha = 160,
@ -958,6 +956,7 @@ minetest.register_node("default:river_water_source", {
tiles = { tiles = {
{ {
name = "default_river_water_source_animated.png", name = "default_river_water_source_animated.png",
backface_culling = false,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
@ -965,17 +964,15 @@ minetest.register_node("default:river_water_source", {
length = 2.0, length = 2.0,
}, },
}, },
},
special_tiles = {
{ {
name = "default_river_water_source_animated.png", name = "default_river_water_source_animated.png",
backface_culling = true,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
aspect_h = 32, aspect_h = 32,
length = 2.0, length = 2.0,
}, },
backface_culling = false,
}, },
}, },
alpha = 160, alpha = 160,
@ -994,7 +991,7 @@ minetest.register_node("default:river_water_source", {
liquid_renewable = false, liquid_renewable = false,
liquid_range = 2, liquid_range = 2,
post_effect_color = {a = 103, r = 30, g = 76, b = 90}, post_effect_color = {a = 103, r = 30, g = 76, b = 90},
groups = {water = 3, liquid = 3, puts_out_fire = 1, cools_lava = 1, not_in_creative_inventory = 1}, groups = {water = 3, liquid = 3, cools_lava = 1, not_in_creative_inventory = 1},
sounds = default.node_sound_water_defaults(), sounds = default.node_sound_water_defaults(),
}) })
@ -1053,6 +1050,7 @@ minetest.register_node("default:lava_source", {
tiles = { tiles = {
{ {
name = "default_lava_source_animated.png", name = "default_lava_source_animated.png",
backface_culling = false,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
@ -1060,18 +1058,15 @@ minetest.register_node("default:lava_source", {
length = 3.0, length = 3.0,
}, },
}, },
},
special_tiles = {
-- New-style lava source material (mostly unused)
{ {
name = "default_lava_source_animated.png", name = "default_lava_source_animated.png",
backface_culling = true,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
aspect_h = 32, aspect_h = 32,
length = 3.0, length = 3.0,
}, },
backface_culling = false,
}, },
}, },
paramtype = "light", paramtype = "light",