Fix ore generation, use MTG pine nodes

Remove pine textures and custom nodes
New logger format
This commit is contained in:
SmallJoker 2017-09-23 12:21:28 +02:00
parent aba820d766
commit b72ef91576
10 changed files with 13 additions and 18 deletions

View File

@ -324,8 +324,8 @@ function lualandmg.generate(minp, maxp, seed, regen)
nvals_caves = nil
local t2 = os.clock()
local log_message = (minetest.pos_to_string(minp).." generated in "..
math.ceil((t2 - t1) * 1000).." ms")
local log_message = minetest.pos_to_string(minp).." terrain = "..
math.ceil((t2 - t1) * 1000)
if is_surface then
-- Do the mudflow!
@ -398,10 +398,8 @@ function lualandmg.generate(minp, maxp, seed, regen)
end
end
local td = math.ceil((os.clock() - t2) * 1000)
if td > 0 then
log_message = log_message..", mudflow in "..td.."ms"
end
log_message = log_message..", mudflow = "..
math.ceil((os.clock() - t2) * 1000)
end
vm:set_data(data)
@ -410,11 +408,14 @@ function lualandmg.generate(minp, maxp, seed, regen)
else
vm:set_lighting({day=0, night=0})
end
minetest.generate_ores(vm, minp, maxp)
vm:calc_lighting()
vm:write_to_map()
vm:update_liquids()
minetest.generate_ores(vm, minp, maxp)
minetest.generate_decorations(vm, minp, maxp)
log_message = log_message..", total = "..
math.ceil((os.clock() - t1) * 1000).." [ms]"
minetest.log("action", log_message)
end

View File

@ -1,13 +1,7 @@
local trees = {
pine = {
sapling = "skylands_pine_sapling.png",
leaves = {"skylands_needles.png", "needles", 3, 30},
wood = "moretrees_pine_wood.png",
trunk = {"moretrees_pine_trunk.png", "moretrees_pine_trunk_top.png"}
},
oak = {
sapling = "yappy_oak_sapling.png",
leaves = {"yappy_oak_leaves.png", "leaves", 4, 40},
sapling = "lualandmg_oak_sapling.png",
leaves = {"lualandmg_oak_leaves.png", "leaves", 4, 40},
wood = "moretrees_oak_wood.png",
trunk = {"moretrees_oak_trunk.png", "moretrees_oak_trunk_top.png"}
}

View File

Before

Width:  |  Height:  |  Size: 855 B

After

Width:  |  Height:  |  Size: 855 B

View File

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 648 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 860 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 692 B

View File

@ -3,8 +3,8 @@ local c_ignore = minetest.get_content_id("ignore")
local c_oak_tree = minetest.get_content_id("lualandmg:oak_trunk")
local c_oak_leaves = minetest.get_content_id("lualandmg:oak_leaves")
local c_pine_tree = minetest.get_content_id("lualandmg:pine_trunk")
local c_pine_needles = minetest.get_content_id("lualandmg:pine_needles")
local c_pine_tree = minetest.get_content_id("default:pine_tree")
local c_pine_needles = minetest.get_content_id("default:pine_needles")
local c_jungletree = minetest.get_content_id("default:jungletree")
local c_jungleleaves = minetest.get_content_id("default:jungleleaves")