summaryrefslogtreecommitdiff
path: root/moretrees
diff options
context:
space:
mode:
Diffstat (limited to 'moretrees')
-rw-r--r--moretrees/biome_defs.lua12
-rw-r--r--moretrees/crafts.lua16
-rw-r--r--moretrees/default_settings.txt1
-rw-r--r--moretrees/init.lua6
-rw-r--r--moretrees/node_defs.lua58
-rw-r--r--moretrees/tree_biomes.txt46
-rw-r--r--moretrees/tree_models.lua31
7 files changed, 40 insertions, 130 deletions
diff --git a/moretrees/biome_defs.lua b/moretrees/biome_defs.lua
index 463f4b8..c080ed0 100644
--- a/moretrees/biome_defs.lua
+++ b/moretrees/biome_defs.lua
@@ -124,18 +124,6 @@ moretrees.willow_biome = {
max_count = 5,
}
-moretrees.acacia_biome = {
- surface = { "default:dirt_with_grass", "default:dirt_with_dry_grass", "default:desert_sand" },
- avoid_nodes = moretrees.avoidnodes,
- avoid_radius = 15,
- seed_diff = 1,
- rarity = 50,
- max_count = 15,
- plantlife_limit = -1,
- humidity_min = 0.3,
- humidity_max = 0,
-}
-
moretrees.rubber_tree_biome = {
surface = "default:dirt_with_grass",
avoid_nodes = moretrees.avoidnodes,
diff --git a/moretrees/crafts.lua b/moretrees/crafts.lua
index 9a0982b..9d1fe79 100644
--- a/moretrees/crafts.lua
+++ b/moretrees/crafts.lua
@@ -4,14 +4,6 @@ for i in ipairs(moretrees.treelist) do
local treename = moretrees.treelist[i][1]
minetest.register_craft({
- output = "moretrees:"..treename.."_trunk 2",
- recipe = {
- {"moretrees:"..treename.."_trunk_sideways"},
- {"moretrees:"..treename.."_trunk_sideways"}
- }
- })
-
- minetest.register_craft({
type = "shapeless",
output = "moretrees:"..treename.."_planks 4",
recipe = {
@@ -20,14 +12,6 @@ for i in ipairs(moretrees.treelist) do
})
minetest.register_craft({
- type = "shapeless",
- output = "moretrees:"..treename.."_planks 4",
- recipe = {
- "moretrees:"..treename.."_trunk_sideways"
- }
- })
-
- minetest.register_craft({
type = "fuel",
recipe = "moretrees:"..treename.."_sapling",
burntime = 10,
diff --git a/moretrees/default_settings.txt b/moretrees/default_settings.txt
index 0925d88..6aa64b5 100644
--- a/moretrees/default_settings.txt
+++ b/moretrees/default_settings.txt
@@ -10,7 +10,6 @@ moretrees.enable_date_palm = true
moretrees.enable_cedar = true
moretrees.enable_rubber_tree = true
moretrees.enable_willow = true
-moretrees.enable_acacia = true
moretrees.enable_birch = true
moretrees.enable_spruce = true
moretrees.enable_jungle_tree = true
diff --git a/moretrees/init.lua b/moretrees/init.lua
index 8189ffd..c9813db 100644
--- a/moretrees/init.lua
+++ b/moretrees/init.lua
@@ -91,7 +91,6 @@ if moretrees.spawn_saplings then
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"
moretrees.spawn_birch_object = "moretrees:birch_sapling_ongen"
moretrees.spawn_spruce_object = "moretrees:spruce_sapling_ongen"
moretrees.spawn_jungletree_object = "moretrees:jungletree_sapling_ongen"
@@ -109,7 +108,6 @@ else
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
moretrees.spawn_birch_object = "moretrees.grow_birch"
moretrees.spawn_spruce_object = "moretrees.grow_spruce"
moretrees.spawn_jungletree_object = "moretrees.grow_jungletree"
@@ -156,10 +154,6 @@ if moretrees.enable_willow then
biome_lib:register_generate_plant(moretrees.willow_biome, moretrees.spawn_willow_object)
end
-if moretrees.enable_acacia then
- biome_lib:register_generate_plant(moretrees.acacia_biome, moretrees.spawn_acacia_object)
-end
-
if moretrees.enable_birch then
biome_lib:register_generate_plant(moretrees.birch_biome, moretrees.spawn_birch_object)
end
diff --git a/moretrees/node_defs.lua b/moretrees/node_defs.lua
index 1a02a9a..505ff75 100644
--- a/moretrees/node_defs.lua
+++ b/moretrees/node_defs.lua
@@ -3,23 +3,21 @@ local S = moretrees.intllib
moretrees.avoidnodes = {}
moretrees.treelist = {
- {"beech", "Beech Tree"},
- {"apple_tree", "Apple Tree"},
- {"oak", "Oak Tree", "acorn", "Acorn", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
- {"sequoia", "Giant Sequoia"},
- {"birch", "Birch Tree"},
- {"palm", "Palm Tree", "palm_fruit_trunk_gen", "Palm Tree", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
- {"date_palm", "Date Palm Tree", "date_palm_fruit_trunk", "Date Palm Tree", {0, 0, 0, 0, 0, 0}, 0.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 },
- {"poplar", "Poplar Tree"},
+ {"beech", "Beech Tree"},
+ {"apple_tree", "Apple Tree"},
+ {"oak", "Oak Tree", "acorn", "Acorn", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+ {"sequoia", "Giant Sequoia"},
+ {"birch", "Birch Tree"},
+ {"palm", "Palm Tree", "palm_fruit_trunk_gen", "Palm Tree", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
+ {"date_palm", "Date Palm Tree", "date_palm_fruit_trunk", "Date Palm Tree", {0, 0, 0, 0, 0, 0}, 0.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 },
+ {"poplar", "Poplar Tree"},
{"poplar_small", "Poplar Tree"},
- {"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" },
- {"acacia", "Acacia Tree", nil, nil, nil, nil, "default_acacia_sapling.png" },
+ {"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" },
}
local dirs1 = { 21, 20, 23, 22, 21 }
@@ -42,10 +40,6 @@ if moretrees.plantlike_leaves then
drawtype = "plantlike",
visual_scale = math.sqrt(2)
})
-else
- minetest.override_item("default:leaves", {
- waving = 1
- })
end
-- redefine default jungle leaves for same
@@ -56,10 +50,6 @@ if moretrees.plantlike_leaves then
drawtype = "plantlike",
visual_scale = math.sqrt(2)
})
-else
- minetest.override_item("default:jungleleaves", {
- waving = 1
- })
end
for i in ipairs(moretrees.treelist) do
@@ -86,8 +76,7 @@ for i in ipairs(moretrees.treelist) do
decay = moretrees.palm_leafdecay_radius
end
- if treename ~= "jungletree" -- the default game provides jungle tree, acacia, and pine trunk/planks nodes.
- and treename ~= "acacia"
+ if treename ~= "jungletree" -- the default game provides jungle tree and pine trunk/planks nodes.
and treename ~= "poplar_small"
and treename ~= "pine" then
@@ -223,7 +212,7 @@ for i in ipairs(moretrees.treelist) do
end
minetest.register_node("moretrees:"..treename.."_sapling_ongen", {
- description = S(treedesc.." Sapling"),
+ description = S(treedesc.." Sapling (on-generated)"),
drawtype = "plantlike",
tiles = {saptex},
inventory_image = saptex,
@@ -264,14 +253,8 @@ for i in ipairs(moretrees.treelist) do
end
if treename ~= "jungletree"
- and treename ~= "acacia"
and treename ~= "poplar_small"
and treename ~= "pine" then
- print("called default.register_leafdecay for:")
- print("moretrees:"..treename.."_trunk")
- print("moretrees:"..treename.."_leaves")
- if fruitname then print(fruitname) end
- print("radius = "..decay)
default.register_leafdecay({
trunks = { "moretrees:"..treename.."_trunk" },
leaves = { "moretrees:"..treename.."_leaves", fruitname },
@@ -415,7 +398,7 @@ minetest.register_node("moretrees:fir_leaves_bright", {
default.register_leafdecay({
trunks = { "moretrees:fir_trunk" },
- leaves = { "moretrees:fir_leaves", "moretrees:fir_leaves_bright" },
+ leaves = { "moretrees:fir_leaves", "moretrees:fir_leaves_bright" },
radius = moretrees.leafdecay_radius,
})
@@ -433,10 +416,9 @@ table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
table.insert(moretrees.avoidnodes, "default:tree")
if moretrees.spawn_saplings then
- table.insert(moretrees.avoidnodes, "snow:sapling_pine")
- table.insert(moretrees.avoidnodes, "default:junglesapling")
- table.insert(moretrees.avoidnodes, "default:pine_sapling")
- table.insert(moretrees.avoidnodes, "default:acacia_sapling")
+ table.insert(moretrees.avoidnodes, "snow:sapling_pine")
+ table.insert(moretrees.avoidnodes, "default:junglesapling")
+ table.insert(moretrees.avoidnodes, "default:pine_sapling")
end
-- "empty" (tapped) rubber tree nodes
diff --git a/moretrees/tree_biomes.txt b/moretrees/tree_biomes.txt
index 0dd0345..b6a4fd0 100644
--- a/moretrees/tree_biomes.txt
+++ b/moretrees/tree_biomes.txt
@@ -1,26 +1,24 @@
- Elevation Temperature Nearness to Nearby What nodes Perlin Avoid
-Tree type (m) (approx., °C) some node water to spawn on seed diff radius
------------------------------------------------------------------------------------------------------------------------
-jungle tree - 5 to +10 above +15 water, 20 10 dirt_with_grass 329 5
-fir above +25 -20 to +10 n/a n/a dirt_with_grass 359 8
-firs on snow above +15 -20 to +10 n/a n/a snow:snow 359 8
-palm - 1 to + 1 +15 to +32 water, 15 10 sand 330 5
-date palm - 1 to +10 above +39 water, 20h,20v 100 desert_sand 339 10
-date palm +11 to +30 above +39 water, 1h,30v 1 desert_sand 340 10
-apple + 1 to +10 +23 to +32 n/a n/a dirt_with grass 331 15
-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
-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
-rubber - 5 to + 5 above +32 water, 15 10 dirt_with_grass 338 20
-poplar n/a -10 to +26 water, 15h,5v 1 dirt_with_grass 341,342,343 10
-
-beech n/a n/a n/a n/a dirt_with_grass 2 10
+ Elevation Temperature Nearness to Nearby What nodes Perlin Avoid
+Tree type (m) (approx., °C) some node water to spawn on seed diff radius
+--------------------------------------------------------------------------------------------------------------
+jungle tree - 5 to +10 above +15 water, 20 10 dirt_with_grass 329 5
+fir above +25 -20 to +10 n/a n/a dirt_with_grass 359 8
+firs on snow above +15 -20 to +10 n/a n/a snow:snow 359 8
+palm - 1 to + 1 +15 to +32 water, 15 10 sand 330 5
+date palm - 1 to +10 above +39 water, 20h,20v 100 desert_sand 339 10
+date palm +11 to +30 above +39 water, 1h,30v 1 desert_sand 340 10
+apple + 1 to +10 +23 to +32 n/a n/a dirt_with grass 331 15
+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
+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
+rubber - 5 to + 5 above +32 water, 15 10 dirt_with_grass 338 20
+poplar n/a -10 to +26 water, 15h,5v 1 dirt_with_grass 341,342,343 10
+
+beech n/a n/a n/a n/a dirt_with_grass 2 10
Notes:
@@ -29,10 +27,6 @@ Notes:
Beech trees are meant to replace default trees, but are themselves disabled by default. They grow in the same areas
as the default ones do, and under the same conditions.
-Acacia trees depend on humidity as their primary control, and they don't use the fertile ground option. They grow near
-the edges of a desert biome, occasionally into the grass beyond, and anywhere else on desert sand or dirt with grass,
-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.
diff --git a/moretrees/tree_models.lua b/moretrees/tree_models.lua
index 9372fe9..879a32a 100644
--- a/moretrees/tree_models.lua
+++ b/moretrees/tree_models.lua
@@ -230,37 +230,6 @@ moretrees.willow_model={
thin_branches=true
}
-moretrees.acacia_model={
- axiom="FFFFFFccccA",
- rules_a = "[B]//[B]//[B]//[B]",
- rules_b = "&TTTT&TT^^G&&----GGGGGG++GGG++" -- line up with the "canvas" edge
- .."fffffffGG++G++" -- first layer, drawn in a zig-zag raster pattern
- .."Gffffffff--G--"
- .."ffffffffG++G++"
- .."fffffffff--G--"
- .."fffffffff++G++"
- .."fffffffff--G--"
- .."ffffffffG++G++"
- .."Gffffffff--G--"
- .."fffffffGG"
- .."^^G&&----GGGGGGG++GGGGGG++" -- re-align to second layer canvas edge
- .."ffffGGG++G++" -- second layer
- .."GGfffff--G--"
- .."ffffffG++G++"
- .."fffffff--G--"
- .."ffffffG++G++"
- .."GGfffff--G--"
- .."ffffGGG",
- rules_c = "/",
- trunk="default:acacia_tree",
- leaves="default:acacia_leaves",
- angle=45,
- iterations=3,
- random_level=0,
- trunk_type="single",
- thin_branches=true,
-}
-
moretrees.rubber_tree_model={
axiom="FFFFA",
rules_a="[&FFBFA]////[&BFFFA]////[&FBFFA]",
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 18:04:12 +0000