From cd9926f9e53a2532296ff7019287559c3e7ea1ea Mon Sep 17 00:00:00 2001 From: Rogier Date: Wed, 18 May 2016 16:54:45 +0200 Subject: 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. --- init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index d2c5128..843958b 100644 --- a/init.lua +++ b/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 -- cgit v1.2.3 From afab0692df2d99c36473568602d1cc4059aa2e65 Mon Sep 17 00:00:00 2001 From: Rogier Date: Wed, 18 May 2016 22:54:19 +0200 Subject: Add date palm Spawns in hot and dry desert, but requires water. This makes it a bit harder to find, but where found, it can be more abundant. If found in the middle of a desert, its presence indicates a water source below the surface. As an additional optional feature, dates (slowly) grow back after harvesting. --- init.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 843958b..7d32f00 100644 --- a/init.lua +++ b/init.lua @@ -73,6 +73,7 @@ moretrees.cutting_tools = { dofile(modpath.."/tree_models.lua") dofile(modpath.."/node_defs.lua") +dofile(modpath.."/date_palm.lua") dofile(modpath.."/biome_defs.lua") dofile(modpath.."/saplings.lua") dofile(modpath.."/crafts.lua") @@ -85,6 +86,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_date_palm_object = "moretrees:date_palm_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" @@ -100,6 +102,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_date_palm_object = moretrees.date_palm_model moretrees.spawn_cedar_object = moretrees.cedar_model moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model moretrees.spawn_willow_object = moretrees.willow_model @@ -131,6 +134,11 @@ if moretrees.enable_palm then biome_lib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object) end +if moretrees.enable_date_palm then + biome_lib:register_generate_plant(moretrees.date_palm_biome, moretrees.spawn_date_palm_object) + biome_lib:register_generate_plant(moretrees.date_palm_biome_2, moretrees.spawn_date_palm_object) +end + if moretrees.enable_cedar then biome_lib:register_generate_plant(moretrees.cedar_biome, moretrees.spawn_cedar_object) end -- cgit v1.2.3 From 75e8027bf7ca581556f91e8c1444c865a77c482d Mon Sep 17 00:00:00 2001 From: Rogier Date: Thu, 19 May 2016 13:26:52 +0200 Subject: Make cocos palm regrow coconuts. This feature is optional, and can be turned off. Existing cocos trees are converted. --- init.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 7d32f00..2c50fd9 100644 --- a/init.lua +++ b/init.lua @@ -74,6 +74,7 @@ moretrees.cutting_tools = { dofile(modpath.."/tree_models.lua") dofile(modpath.."/node_defs.lua") dofile(modpath.."/date_palm.lua") +dofile(modpath.."/cocos_palm.lua") dofile(modpath.."/biome_defs.lua") dofile(modpath.."/saplings.lua") dofile(modpath.."/crafts.lua") -- cgit v1.2.3 From d72574d28835e30e9d7fa7644268876e6920421a Mon Sep 17 00:00:00 2001 From: Rogier Date: Fri, 1 Jul 2016 16:06:29 +0200 Subject: Add poplar tree Poplars exist in two kinds: small and large trees. Both use the same nodes, except for the sapling. Poplar leaves may drop one or the other sapling. Poplar trees require a humid environment, and water nearby. Provided there is water, an occasional poplar will grow under less humid conditions. --- init.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 2c50fd9..8189ffd 100644 --- a/init.lua +++ b/init.lua @@ -97,6 +97,8 @@ if moretrees.spawn_saplings then moretrees.spawn_jungletree_object = "moretrees:jungletree_sapling_ongen" moretrees.spawn_fir_object = "moretrees:fir_sapling_ongen" moretrees.spawn_fir_snow_object = "snow:sapling_pine" + moretrees.spawn_poplar_object = "moretrees:poplar_sapling_ongen" + moretrees.spawn_poplar_small_object = "moretrees:poplar_small_sapling_ongen" else moretrees.spawn_beech_object = moretrees.beech_model moretrees.spawn_apple_tree_object = moretrees.apple_tree_model @@ -113,6 +115,8 @@ else moretrees.spawn_jungletree_object = "moretrees.grow_jungletree" moretrees.spawn_fir_object = "moretrees.grow_fir" moretrees.spawn_fir_snow_object = "moretrees.grow_fir_snow" + moretrees.spawn_poplar_object = moretrees.poplar_model + moretrees.spawn_poplar_small_object = moretrees.poplar_small_model end if moretrees.enable_beech then @@ -175,6 +179,14 @@ if moretrees.enable_fir then end end +if moretrees.enable_poplar then + biome_lib:register_generate_plant(moretrees.poplar_biome, moretrees.spawn_poplar_object) + biome_lib:register_generate_plant(moretrees.poplar_biome_2, moretrees.spawn_poplar_object) + biome_lib:register_generate_plant(moretrees.poplar_biome_3, moretrees.spawn_poplar_object) + biome_lib:register_generate_plant(moretrees.poplar_small_biome, moretrees.spawn_poplar_small_object) + biome_lib:register_generate_plant(moretrees.poplar_small_biome_2, moretrees.spawn_poplar_small_object) +end + -- Code to spawn a birch tree function moretrees.grow_birch(pos) -- cgit v1.2.3