Restore previous pine as cedar

Commit ad0cbbc0f disabled the previous moretrees pine, and aliased it to the
default minetest pine.  The default pine is a completely different tree though,
with different apppearance and different textures.

This commit restores the previous pine tree, renaming it to cedar to avoid a tree
name clash with the default game. Any existing moretrees pine trees will be
converted to cedar, so that their appearance does not change. Moretrees pine
trees that have already been converted to the default pine tree are not converted
back.
This commit is contained in:
Rogier 2016-05-18 16:54:45 +02:00
parent ee5bc1dfb3
commit cd9926f9e5
14 changed files with 26 additions and 21 deletions

View File

@ -150,7 +150,7 @@ moretrees.spruce_biome = {
max_count = 5, max_count = 5,
} }
moretrees.pine_biome = { moretrees.cedar_biome = {
surface = "default:dirt_with_grass", surface = "default:dirt_with_grass",
avoid_nodes = moretrees.avoidnodes, avoid_nodes = moretrees.avoidnodes,
avoid_radius = 10, avoid_radius = 10,

View File

@ -80,9 +80,9 @@ minetest.register_craftitem("moretrees:spruce_nuts", {
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
}) })
minetest.register_craftitem("moretrees:pine_nuts", { minetest.register_craftitem("moretrees:cedar_nuts", {
description = S("Roasted Pine Cone Nuts"), description = S("Roasted Cedar Cone Nuts"),
inventory_image = "moretrees_pine_nuts.png", inventory_image = "moretrees_cedar_nuts.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
}) })
@ -138,8 +138,8 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = "moretrees:pine_nuts 4", output = "moretrees:cedar_nuts 4",
recipe = "moretrees:pine_cone", recipe = "moretrees:cedar_cone",
}) })
minetest.register_craft({ minetest.register_craft({

View File

@ -6,7 +6,7 @@ moretrees.enable_apple_tree = true
moretrees.enable_oak = true moretrees.enable_oak = true
moretrees.enable_sequoia = true moretrees.enable_sequoia = true
moretrees.enable_palm = true moretrees.enable_palm = true
moretrees.enable_pine = true moretrees.enable_cedar = true
moretrees.enable_rubber_tree = true moretrees.enable_rubber_tree = true
moretrees.enable_willow = true moretrees.enable_willow = true
moretrees.enable_acacia = true moretrees.enable_acacia = true

View File

@ -85,7 +85,7 @@ if moretrees.spawn_saplings then
moretrees.spawn_oak_object = "moretrees:oak_sapling_ongen" moretrees.spawn_oak_object = "moretrees:oak_sapling_ongen"
moretrees.spawn_sequoia_object = "moretrees:sequoia_sapling_ongen" moretrees.spawn_sequoia_object = "moretrees:sequoia_sapling_ongen"
moretrees.spawn_palm_object = "moretrees:palm_sapling_ongen" moretrees.spawn_palm_object = "moretrees:palm_sapling_ongen"
moretrees.spawn_pine_object = "moretrees:pine_sapling_ongen" moretrees.spawn_cedar_object = "moretrees:cedar_sapling_ongen"
moretrees.spawn_rubber_tree_object = "moretrees:rubber_tree_sapling_ongen" moretrees.spawn_rubber_tree_object = "moretrees:rubber_tree_sapling_ongen"
moretrees.spawn_willow_object = "moretrees:willow_sapling_ongen" moretrees.spawn_willow_object = "moretrees:willow_sapling_ongen"
moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen" moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen"
@ -100,7 +100,7 @@ else
moretrees.spawn_oak_object = moretrees.oak_model moretrees.spawn_oak_object = moretrees.oak_model
moretrees.spawn_sequoia_object = moretrees.sequoia_model moretrees.spawn_sequoia_object = moretrees.sequoia_model
moretrees.spawn_palm_object = moretrees.palm_model moretrees.spawn_palm_object = moretrees.palm_model
moretrees.spawn_pine_object = moretrees.pine_model moretrees.spawn_cedar_object = moretrees.cedar_model
moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model
moretrees.spawn_willow_object = moretrees.willow_model moretrees.spawn_willow_object = moretrees.willow_model
moretrees.spawn_acacia_object = moretrees.acacia_model moretrees.spawn_acacia_object = moretrees.acacia_model
@ -131,8 +131,8 @@ if moretrees.enable_palm then
biome_lib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object) biome_lib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object)
end end
if moretrees.enable_pine then if moretrees.enable_cedar then
biome_lib:register_generate_plant(moretrees.pine_biome, moretrees.spawn_pine_object) biome_lib:register_generate_plant(moretrees.cedar_biome, moretrees.spawn_cedar_object)
end end
if moretrees.enable_rubber_tree then if moretrees.enable_rubber_tree then

View File

@ -10,12 +10,12 @@ moretrees.treelist = {
{"birch", "Birch Tree"}, {"birch", "Birch Tree"},
{"palm", "Palm Tree", "coconut", "Coconut", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 }, {"palm", "Palm Tree", "coconut", "Coconut", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
{"spruce", "Spruce Tree", "spruce_cone", "Spruce Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, {"spruce", "Spruce Tree", "spruce_cone", "Spruce Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
{"cedar", "Cedar Tree", "cedar_cone", "Cedar Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
{"willow", "Willow Tree"}, {"willow", "Willow Tree"},
{"rubber_tree", "Rubber Tree"}, {"rubber_tree", "Rubber Tree"},
{"fir", "Douglas Fir", "fir_cone", "Fir Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, {"fir", "Douglas Fir", "fir_cone", "Fir Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
{"jungletree", "Jungle Tree", nil, nil, nil, nil, "default_junglesapling.png" }, {"jungletree", "Jungle Tree", nil, nil, nil, nil, "default_junglesapling.png" },
{"pine", "Pine Tree", "pine_cone", "Pine Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8, "default_pine_sapling.png" },
{"acacia", "Acacia Tree", nil, nil, nil, nil, "default_acacia_sapling.png" }, {"acacia", "Acacia Tree", nil, nil, nil, nil, "default_acacia_sapling.png" },
} }
@ -424,7 +424,9 @@ minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood")
minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling") minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling")
minetest.register_alias("moretrees:acacia_leaves", "default:acacia_leaves") minetest.register_alias("moretrees:acacia_leaves", "default:acacia_leaves")
minetest.register_alias("moretrees:pine_trunk", "default:pine_tree") minetest.register_alias("moretrees:pine_trunk", "moretrees:cedar_trunk")
minetest.register_alias("moretrees:pine_planks", "default:pine_wood") minetest.register_alias("moretrees:pine_planks", "moretrees:cedar_planks")
minetest.register_alias("moretrees:pine_sapling", "default:pine_sapling") minetest.register_alias("moretrees:pine_sapling", "moretrees:cedar_sapling")
minetest.register_alias("moretrees:pine_leaves", "default:pine_needles") minetest.register_alias("moretrees:pine_leaves", "moretrees:cedar_leaves")
minetest.register_alias("moretrees:pine_cone", "moretrees:cedar_cone")
minetest.register_alias("moretrees:pine_nuts", "moretrees:cedar_nuts")

View File

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 648 B

View File

@ -11,7 +11,7 @@ oak 0 to +10 + 4 to +16 n/a n/a dirt_with grass 332 15
sequoia 0 to +10 -30 to +50 n/a n/a dirt_with grass 333 10 sequoia 0 to +10 -30 to +50 n/a n/a dirt_with grass 333 10
birch +10 to +15 -20 to +10 n/a n/a dirt_with grass 334 5 birch +10 to +15 -20 to +10 n/a n/a dirt_with grass 334 5
spruce above +20 -20 to +10 n/a n/a dirt_with grass 335 10 spruce above +20 -20 to +10 n/a n/a dirt_with grass 335 10
pine n/a n/a water, 15 5 dirt_with grass 336 10 cedar n/a n/a water, 15 5 dirt_with grass 336 10
willow - 5 to + 5 n/a water, 15 5 dirt_with grass 337 20 willow - 5 to + 5 n/a water, 15 5 dirt_with grass 337 20
acacia n/a n/a n/a n/a dirt_with_grass, acacia n/a n/a n/a n/a dirt_with_grass,
desert_sand n/a 15 desert_sand n/a 15
@ -32,3 +32,6 @@ where the humidity is low (but not bone dry).
Fir trees appear in a snow biome only with older versions of SPlizard's Snow Biomes mod. In more recent versions, Fir trees appear in a snow biome only with older versions of SPlizard's Snow Biomes mod. In more recent versions,
these trees will not grow, due to an engine bug. these trees will not grow, due to an engine bug.
Cedar trees replace, and are identical to, the original pine trees, as the minetest default game now has (a completely
different type of) pine trees.

View File

@ -138,20 +138,20 @@ moretrees.spruce_model2={
fruit_chance=8 fruit_chance=8
} }
moretrees.pine_model={ moretrees.cedar_model={
axiom="FFFFFcccdddB///cFdFB////cFdFB///cFdFB///cFdFA///cFdFA///cFdFB[FF]f", axiom="FFFFFcccdddB///cFdFB////cFdFB///cFdFB///cFdFA///cFdFA///cFdFB[FF]f",
rules_a="[&&&TTTT[++^TFdd][--&TFd]//Tdd[+^Fd][--&Fdd]]", rules_a="[&&&TTTT[++^TFdd][--&TFd]//Tdd[+^Fd][--&Fdd]]",
rules_b="[&&&TTT[++^Fdd][--&Fdd]//dd[+^d][--&Fd]]", rules_b="[&&&TTT[++^Fdd][--&Fdd]//dd[+^d][--&Fd]]",
rules_c="/", rules_c="/",
rules_d="F", rules_d="F",
trunk="default:pine_tree", trunk="moretrees:cedar_trunk",
leaves="default:pine_needles", leaves="moretrees:cedar_leaves",
angle=30, angle=30,
iterations=2, iterations=2,
random_level=0, random_level=0,
trunk_type="single", trunk_type="single",
thin_branches=true, thin_branches=true,
fruit="moretrees:pine_cone", fruit="moretrees:cedar_cone",
fruit_chance=8 fruit_chance=8
} }