Made it possible via moretrees config to force all moretrees, default, and

default jungle tree leaves to be plantlike drawtype.

The default setting is now plantlike.  Change moretres_settings.txt in
your world folder if you don't like it.

Rearranged a bit of code to accommodate this.
This commit is contained in:
Vanessa Ezekowitz 2013-11-14 18:05:37 -05:00
parent 88eb73af90
commit e1baf2018b
21 changed files with 56 additions and 24 deletions

View File

@ -26,6 +26,12 @@ moretrees.spawn_saplings = true
moretrees.enable_stairsplus = true
-- Set this to false if you don't like the plantlike drawtype for leaves
-- (this is done to improve peoples' framerates without resorting to making
-- leaf nodes opaque). Affects default leaves and default jungle leaves also.
moretrees.plantlike_leaves = true
-- Set this to true to enable leaf decay of all trees except the default ones.
moretrees.enable_leafdecay = true

View File

@ -39,7 +39,7 @@ if io.open(worldpath.."/moretrees_settings.txt","r") == nil then
end
io.write(block)
end
io.close()
else
dofile(worldpath.."/moretrees_settings.txt")
end
@ -63,6 +63,17 @@ else
moretrees.expect_infinite_stacks = true
end
-- node clone, for redefining stuff
function moretrees:clone_node(name)
node2={}
node=minetest.registered_nodes[name]
for k,v in pairs(node) do
node2[k]=v
end
return node2
end
-- tables, load other files
moretrees.cutting_tools = {

View File

@ -1,14 +1,5 @@
-- leaf decay
function clone_node(name)
node2={}
node=minetest.registered_nodes[name]
for k,v in pairs(node) do
node2[k]=v
end
return node2
end
-- this function is based on the default leafdecay code
local process_drops = function(pos, name)
local drops = minetest.get_node_drops(name)
@ -85,10 +76,6 @@ end
if moretrees.enable_default_leafdecay then
new_default_leaves = clone_node("default:leaves")
new_default_leaves.groups = {snappy=3, flammable=2, leaves=1}
minetest.register_node(":default:leaves", new_default_leaves)
minetest.register_abm({
nodenames = "default:leaves",
interval = moretrees.default_leafdecay_delay,
@ -105,10 +92,6 @@ end
if moretrees.enable_default_jungle_leafdecay then
new_default_jungle_leaves = clone_node("default:jungleleaves")
new_default_jungle_leaves.groups = {snappy=3, flammable=2, leaves=1}
minetest.register_node(":default:jungleleaves", new_default_jungle_leaves)
minetest.register_abm({
nodenames = "default:jungleleaves",
interval = moretrees.default_jungle_leafdecay_delay,

View File

@ -19,6 +19,35 @@ local dirs1 = { 21, 20, 23, 22, 21 }
local dirs2 = { 12, 9, 18, 7, 12 }
local dirs3 = { 14, 11, 16, 5, 14 }
moretrees_new_leaves_drawtype = "allfaces_optional"
moretrees_new_leaves_visual_scale = 1.0
moretrees_new_leaves_extension = ".png"
if moretrees.plantlike_leaves then
moretrees_new_leaves_drawtype = "plantlike"
moretrees_new_leaves_visual_scale = 1.189
moretrees_new_leaves_extension = "_plantlike.png"
end
new_default_leaves = moretrees:clone_node("default:leaves")
if moretrees.enable_default_leafdecay then
new_default_leaves.groups = {snappy=3, flammable=2, leaves=1}
end
new_default_leaves.drawtype = moretrees_new_leaves_drawtype
new_default_leaves.visual_scale = moretrees_new_leaves_visual_scale
new_default_leaves.tiles = {"default_leaves"..moretrees_new_leaves_extension}
minetest.register_node(":default:leaves", new_default_leaves)
new_default_jungle_leaves = clone_node("default:jungleleaves")
if moretrees.enable_default_jungle_leafdecay then
new_default_jungle_leaves.groups = {snappy=3, flammable=2, leaves=1}
end
new_default_jungle_leaves = moretrees:clone_node("default:jungleleaves")
new_default_jungle_leaves.drawtype = moretrees_new_leaves_drawtype
new_default_jungle_leaves.visual_scale = moretrees_new_leaves_visual_scale
new_default_jungle_leaves.tiles = {"default_jungleleaves"..moretrees_new_leaves_extension}
minetest.register_node(":default:jungleleaves", new_default_jungle_leaves)
for i in ipairs(moretrees.treelist) do
local treename = moretrees.treelist[i][1]
local treedesc = moretrees.treelist[i][2]
@ -103,8 +132,9 @@ for i in ipairs(moretrees.treelist) do
minetest.register_node("moretrees:"..treename.."_leaves", {
description = treedesc.." Leaves",
drawtype = "allfaces_optional",
tiles = { "moretrees_"..treename.."_leaves.png" },
drawtype = moretrees_new_leaves_drawtype,
visual_scale = moretrees_new_leaves_visual_scale,
tiles = { "moretrees_"..treename.."_leaves"..moretrees_new_leaves_extension },
paramtype = "light",
groups = {snappy=3, flammable=2, leaves=1, moretrees_leaves=1},
sounds = default.node_sound_leaves_defaults(),
@ -308,8 +338,9 @@ for color = 1, 3 do
local leave_name = "moretrees:jungletree_leaves_"..jungleleaves[color]
minetest.register_node(leave_name, {
description = "Jungle Tree Leaves ("..jungleleavesnames[color]..")",
drawtype = "allfaces_optional",
tiles = {"moretrees_jungletree_leaves_"..jungleleaves[color]..".png"},
drawtype = moretrees_new_leaves_drawtype,
visual_scale = moretrees_new_leaves_visual_scale,
tiles = {"moretrees_jungletree_leaves_"..jungleleaves[color]..moretrees_new_leaves_extension},
paramtype = "light",
groups = {snappy=3, flammable=2, leaves=1, moretrees_leaves=1},
drop = {
@ -326,9 +357,10 @@ end
-- Extra needles for firs
minetest.register_node("moretrees:fir_leaves_bright", {
drawtype = "allfaces_optional",
drawtype = moretrees_new_leaves_drawtype,
visual_scale = moretrees_new_leaves_visual_scale,
description = "Douglas Fir Leaves (Bright)",
tile_images = { "moretrees_fir_leaves_bright.png" },
tile_images = { "moretrees_fir_leaves_bright"..moretrees_new_leaves_extension },
paramtype = "light",
groups = {snappy=3, flammable=2, leaves=1, moretrees_leaves=1 },

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 B