diff options
Diffstat (limited to 'moretrees')
| -rw-r--r-- | moretrees/biome_defs.lua | 2 | ||||
| -rw-r--r-- | moretrees/crafts.lua | 10 | ||||
| -rw-r--r-- | moretrees/default_settings.txt | 2 | ||||
| -rw-r--r-- | moretrees/init.lua | 8 | ||||
| -rw-r--r-- | moretrees/node_defs.lua | 12 | ||||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_cone.png | bin | 0 -> 315 bytes | |||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_leaves.png | bin | 0 -> 205 bytes | |||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_nuts.png | bin | 0 -> 369 bytes | |||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_sapling.png | bin | 0 -> 202 bytes | |||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_trunk.png | bin | 0 -> 1074 bytes | |||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_trunk_top.png | bin | 0 -> 451 bytes | |||
| -rw-r--r-- | moretrees/textures/moretrees_cedar_wood.png | bin | 0 -> 648 bytes | |||
| -rw-r--r-- | moretrees/tree_biomes.txt | 5 | ||||
| -rw-r--r-- | moretrees/tree_models.lua | 8 |
14 files changed, 26 insertions, 21 deletions
diff --git a/moretrees/biome_defs.lua b/moretrees/biome_defs.lua index 34d8e4e..48efee0 100644 --- a/moretrees/biome_defs.lua +++ b/moretrees/biome_defs.lua @@ -150,7 +150,7 @@ moretrees.spruce_biome = { max_count = 5, } -moretrees.pine_biome = { +moretrees.cedar_biome = { surface = "default:dirt_with_grass", avoid_nodes = moretrees.avoidnodes, avoid_radius = 10, diff --git a/moretrees/crafts.lua b/moretrees/crafts.lua index 515a097..395f602 100644 --- a/moretrees/crafts.lua +++ b/moretrees/crafts.lua @@ -80,9 +80,9 @@ minetest.register_craftitem("moretrees:spruce_nuts", { on_use = minetest.item_eat(1), }) -minetest.register_craftitem("moretrees:pine_nuts", { - description = S("Roasted Pine Cone Nuts"), - inventory_image = "moretrees_pine_nuts.png", +minetest.register_craftitem("moretrees:cedar_nuts", { + description = S("Roasted Cedar Cone Nuts"), + inventory_image = "moretrees_cedar_nuts.png", on_use = minetest.item_eat(1), }) @@ -138,8 +138,8 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", - output = "moretrees:pine_nuts 4", - recipe = "moretrees:pine_cone", + output = "moretrees:cedar_nuts 4", + recipe = "moretrees:cedar_cone", }) minetest.register_craft({ diff --git a/moretrees/default_settings.txt b/moretrees/default_settings.txt index a34ea23..1bb85f5 100644 --- a/moretrees/default_settings.txt +++ b/moretrees/default_settings.txt @@ -6,7 +6,7 @@ moretrees.enable_apple_tree = true moretrees.enable_oak = true moretrees.enable_sequoia = true moretrees.enable_palm = true -moretrees.enable_pine = true +moretrees.enable_cedar = true moretrees.enable_rubber_tree = true moretrees.enable_willow = true moretrees.enable_acacia = true diff --git a/moretrees/init.lua b/moretrees/init.lua index d2c5128..843958b 100644 --- a/moretrees/init.lua +++ b/moretrees/init.lua @@ -85,7 +85,7 @@ if moretrees.spawn_saplings then moretrees.spawn_oak_object = "moretrees:oak_sapling_ongen" moretrees.spawn_sequoia_object = "moretrees:sequoia_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_willow_object = "moretrees:willow_sapling_ongen" moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen" @@ -100,7 +100,7 @@ else moretrees.spawn_oak_object = moretrees.oak_model moretrees.spawn_sequoia_object = moretrees.sequoia_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_willow_object = moretrees.willow_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) end -if moretrees.enable_pine then - biome_lib:register_generate_plant(moretrees.pine_biome, moretrees.spawn_pine_object) +if moretrees.enable_cedar then + biome_lib:register_generate_plant(moretrees.cedar_biome, moretrees.spawn_cedar_object) end if moretrees.enable_rubber_tree then diff --git a/moretrees/node_defs.lua b/moretrees/node_defs.lua index 8328bef..94b7ed0 100644 --- a/moretrees/node_defs.lua +++ b/moretrees/node_defs.lua @@ -10,12 +10,12 @@ moretrees.treelist = { {"birch", "Birch Tree"}, {"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 }, + {"cedar", "Cedar Tree", "cedar_cone", "Cedar Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, {"willow", "Willow 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 }, {"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" }, } @@ -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_leaves", "default:acacia_leaves") -minetest.register_alias("moretrees:pine_trunk", "default:pine_tree") -minetest.register_alias("moretrees:pine_planks", "default:pine_wood") -minetest.register_alias("moretrees:pine_sapling", "default:pine_sapling") -minetest.register_alias("moretrees:pine_leaves", "default:pine_needles") +minetest.register_alias("moretrees:pine_trunk", "moretrees:cedar_trunk") +minetest.register_alias("moretrees:pine_planks", "moretrees:cedar_planks") +minetest.register_alias("moretrees:pine_sapling", "moretrees:cedar_sapling") +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") diff --git a/moretrees/textures/moretrees_cedar_cone.png b/moretrees/textures/moretrees_cedar_cone.png Binary files differnew file mode 100644 index 0000000..5e1fae9 --- /dev/null +++ b/moretrees/textures/moretrees_cedar_cone.png diff --git a/moretrees/textures/moretrees_cedar_leaves.png b/moretrees/textures/moretrees_cedar_leaves.png Binary files differnew file mode 100644 index 0000000..e6de482 --- /dev/null +++ b/moretrees/textures/moretrees_cedar_leaves.png diff --git a/moretrees/textures/moretrees_cedar_nuts.png b/moretrees/textures/moretrees_cedar_nuts.png Binary files differnew file mode 100644 index 0000000..e39f895 --- /dev/null +++ b/moretrees/textures/moretrees_cedar_nuts.png diff --git a/moretrees/textures/moretrees_cedar_sapling.png b/moretrees/textures/moretrees_cedar_sapling.png Binary files differnew file mode 100644 index 0000000..42f8ecc --- /dev/null +++ b/moretrees/textures/moretrees_cedar_sapling.png diff --git a/moretrees/textures/moretrees_cedar_trunk.png b/moretrees/textures/moretrees_cedar_trunk.png Binary files differnew file mode 100644 index 0000000..ea685e3 --- /dev/null +++ b/moretrees/textures/moretrees_cedar_trunk.png diff --git a/moretrees/textures/moretrees_cedar_trunk_top.png b/moretrees/textures/moretrees_cedar_trunk_top.png Binary files differnew file mode 100644 index 0000000..01aed1d --- /dev/null +++ b/moretrees/textures/moretrees_cedar_trunk_top.png diff --git a/moretrees/textures/moretrees_cedar_wood.png b/moretrees/textures/moretrees_cedar_wood.png Binary files differnew file mode 100644 index 0000000..8680bd5 --- /dev/null +++ b/moretrees/textures/moretrees_cedar_wood.png diff --git a/moretrees/tree_biomes.txt b/moretrees/tree_biomes.txt index 3e4533c..fdba90d 100644 --- a/moretrees/tree_biomes.txt +++ b/moretrees/tree_biomes.txt @@ -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
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
-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
acacia n/a n/a n/a n/a dirt_with_grass,
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,
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.
diff --git a/moretrees/tree_models.lua b/moretrees/tree_models.lua index 3443057..c534089 100644 --- a/moretrees/tree_models.lua +++ b/moretrees/tree_models.lua @@ -138,20 +138,20 @@ moretrees.spruce_model2={ fruit_chance=8 } -moretrees.pine_model={ +moretrees.cedar_model={ axiom="FFFFFcccdddB///cFdFB////cFdFB///cFdFB///cFdFA///cFdFA///cFdFB[FF]f", rules_a="[&&&TTTT[++^TFdd][--&TFd]//Tdd[+^Fd][--&Fdd]]", rules_b="[&&&TTT[++^Fdd][--&Fdd]//dd[+^d][--&Fd]]", rules_c="/", rules_d="F", - trunk="default:pine_tree", - leaves="default:pine_needles", + trunk="moretrees:cedar_trunk", + leaves="moretrees:cedar_leaves", angle=30, iterations=2, random_level=0, trunk_type="single", thin_branches=true, - fruit="moretrees:pine_cone", + fruit="moretrees:cedar_cone", fruit_chance=8 } |
