nalc/moretrees
1
0
Fork 0
forked from mtcontrib/moretrees
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nalc:nalc-1.1
Branches Tags
nalc:master nalc:nalc-1.1
nalc:nalc-1.2.0 nalc:nalc-1.1 nalc:nalc-1.0 mtcontrib:2018-11-09 mtcontrib:2019-05-22 mtcontrib:2019-05-22-2 mtcontrib:2019-06-18-1 mtcontrib:2019-06-18-2 mtcontrib:2019-10-03-1 mtcontrib:20200603-1302 mtcontrib:2021-01-30 mtcontrib:2021-04-14-1
...
compare: nalc:157f53def089e1bdfad85d022492355f9fa4f87b
Branches Tags
nalc:master nalc:nalc-1.1 mtcontrib:master mtcontrib:lsystem_decoration_test mtcontrib:sapling_groups mtcontrib:unique_ids
nalc:nalc-1.2.0 nalc:nalc-1.1 nalc:nalc-1.0 mtcontrib:2018-11-09 mtcontrib:2019-05-22 mtcontrib:2019-05-22-2 mtcontrib:2019-06-18-1 mtcontrib:2019-06-18-2 mtcontrib:2019-10-03-1 mtcontrib:20200603-1302 mtcontrib:2021-01-30 mtcontrib:2021-04-14-1

8 Commits
nalc-1.1 ... 157f53def0

Author SHA1 Message Date
sys4
157f53def0 Merge branch 'master' into nalc-1.2 2019-06-02 19:33:04 +02:00
Vanessa Dannenberg
acb534d8d0 fix derps in tables 2019-05-22 21:05:04 -04:00
Vanessa Dannenberg
f45ffc09bf Use a "set" for surface list rather than a plain table 
(requires biome_lib from commit a96f015c or later)
 2019-05-22 20:03:15 -04:00
Vanessa Dannenberg
e912fba6c8 tweak on-gen to be faster still 2019-05-22 19:16:30 -04:00
Vanessa Dannenberg
7161cfbdee rework how sapling growth is defined 
if on-gen, saplings grow per their biome_defs.lua settings
if placed, they grow on the surfaces given in the tables:

* anything but palms will grow on the dirt surfaces
* conifers can also grow on a cold surface, but other trees will not
* only palms can grow on sand, but they will not grow on dirt or cold
 2019-05-22 19:09:41 -04:00
Vanessa Dannenberg
a27af10d2e put on_gen saplings into creative inv, adjust description 2019-05-22 18:44:09 -04:00
Vanessa Dannenberg
e474194daf speed up sapling growth. 
they're just too damned slow

also sped up the on_gen ones
they were slower than they needed to be
 2019-05-22 18:41:03 -04:00
sys4
26f1ec49d2 Les rubber tree spawn aussi dans le sable près de l'eau 2019-05-10 19:00:36 +02:00
4 changed files with 74 additions and 85 deletions
Expand all files Collapse all files

5
biome_defs.lua
View File

@ -125,7 +125,10 @@ moretrees.willow_biome = {
}
moretrees.rubber_tree_biome = {
surface = "default:dirt_with_grass",
surface = {
"default:dirt_with_grass",
"default:sand",
},
avoid_nodes = moretrees.avoidnodes,
avoid_radius = 10,
seed_diff = 338,

4
default_settings.txt
View File

@ -122,8 +122,8 @@ moretrees.dates_item_drop_ichance = 10 -- inverse probability of ripe dates dr
-- Sapling settings
moretrees.sapling_interval = 500
moretrees.sapling_chance = 20
moretrees.sapling_interval = 100
moretrees.sapling_chance = 5
-- If this variable is set to true, drop leaves out as entities during leaf
-- decay, rather than just disappearing them.

4
node_defs.lua
View File

@ -212,7 +212,7 @@ for i in ipairs(moretrees.treelist) do
end
minetest.register_node("moretrees:"..treename.."_sapling_ongen", {
description = S(treedesc.." Sapling (on-generated)"),
description = S(treedesc.." Sapling (fast growth)"),
drawtype = "plantlike",
tiles = {saptex},
inventory_image = saptex,
@ -224,7 +224,7 @@ for i in ipairs(moretrees.treelist) do
type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
},
groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,not_in_creative_inventory=1,sapling=1},
groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
sounds = default.node_sound_defaults(),
drop = "moretrees:"..treename.."_sapling"
})

146
saplings.lua
View File

@ -1,98 +1,84 @@
-- sapling growth
-- these tables only affect hand-placed saplings
-- mapgen-placed always use their biome def settings, which are much more
-- limited, in the interest of speed.
local dirt_surfaces = {
set = true,
["default:dirt"] = true,
["default:dirt_with_grass"] = true,
["default:dirt_with_dry_grass"] = true,
["default:dirt_with_coniferous_litter"] = true,
["default:dirt_with_rainforest_litter"] = true,
["woodsoils:dirt_with_leaves_1"] = true,
["woodsoils:dirt_with_leaves_2"] = true,
["woodsoils:grass_with_leaves_1"] = true,
["woodsoils:grass_with_leaves_2"] = true
}
local conifer_surfaces = {
set = true,
["default:dirt"] = true,
["default:dirt_with_grass"] = true,
["default:dirt_with_dry_grass"] = true,
["default:dirt_with_coniferous_litter"] = true,
["default:dirt_with_rainforest_litter"] = true,
["woodsoils:dirt_with_leaves_1"] = true,
["woodsoils:dirt_with_leaves_2"] = true,
["woodsoils:grass_with_leaves_1"] = true,
["woodsoils:grass_with_leaves_2"] = true,
["default:dirt_with_snow"] = true
}
local sand_surfaces = {
set = true,
["default:sand"] = true,
["default:desert_sand"] = true,
["cottages:loam"] = true,
-- note, no silver sand here.
-- too cold for a palm, too... well... sandy for anything else.
}
for i in ipairs(moretrees.treelist) do
local treename = moretrees.treelist[i][1]
local tree_model = treename.."_model"
local tree_biome = treename.."_biome"
local surfaces
local grow_function = moretrees[tree_model]
if treename ~= "birch" and treename ~= "spruce" and treename ~= "fir" and treename ~= "jungletree" then
biome_lib:dbg(dump(moretrees[tree_biome].surface))
biome_lib:grow_plants({
grow_delay = moretrees.sapling_interval,
grow_chance = moretrees.sapling_chance,
grow_plant = "moretrees:"..treename.."_sapling",
grow_nodes = moretrees[tree_biome].surface,
grow_function = moretrees[tree_model],
})
if moretrees.spawn_saplings then
biome_lib:grow_plants({
grow_delay = 2,
grow_chance = 30,
grow_plant = "moretrees:"..treename.."_sapling_ongen",
grow_nodes = moretrees[tree_biome].surface,
grow_function = moretrees[tree_model],
})
end
if treename == "spruce"
or treename == "fir"
or treename == "cedar"
or treename == "pine" then
surfaces = conifer_surfaces
elseif string.find(treename, "palm") then
surfaces = sand_surfaces
else
surfaces = dirt_surfaces
end
end
biome_lib:grow_plants({
grow_delay = moretrees.sapling_interval,
grow_chance = moretrees.sapling_chance,
grow_plant = "moretrees:birch_sapling",
grow_nodes = moretrees.birch_biome.surface,
grow_function = "moretrees.grow_birch"
})
if treename == "spruce"
or treename == "fir"
or treename == "birch"
or treename == "jungletree" then
grow_function = "moretrees.grow_"..treename
end
biome_lib:dbg(dump(moretrees[tree_biome].surface))
biome_lib:grow_plants({
grow_delay = moretrees.sapling_interval,
grow_chance = moretrees.sapling_chance,
grow_plant = "moretrees:spruce_sapling",
grow_nodes = moretrees.spruce_biome.surface,
grow_function = "moretrees.grow_spruce"
})
biome_lib:grow_plants({
grow_delay = moretrees.sapling_interval,
grow_chance = moretrees.sapling_chance,
grow_plant = "moretrees:fir_sapling",
grow_nodes = moretrees.fir_biome.surface,
grow_function = "moretrees.grow_fir"
})
biome_lib:grow_plants({
grow_delay = moretrees.sapling_interval,
grow_chance = moretrees.sapling_chance,
grow_plant = "default:junglesapling",
grow_nodes = moretrees.jungletree_biome.surface,
grow_function = "moretrees.grow_jungletree"
})
if moretrees.spawn_saplings then
biome_lib:grow_plants({
grow_delay = 2,
grow_chance = 30,
grow_plant = "moretrees:jungletree_sapling_ongen",
grow_nodes = moretrees.jungletree_biome.surface,
grow_function = "moretrees.grow_jungletree"
grow_delay = moretrees.sapling_interval,
grow_chance = moretrees.sapling_chance,
grow_plant = "moretrees:"..treename.."_sapling",
grow_nodes = surfaces,
grow_function = grow_function,
})
biome_lib:grow_plants({
grow_delay = 2,
grow_chance = 30,
grow_plant = "moretrees:fir_sapling_ongen",
grow_nodes = moretrees.fir_biome.surface,
grow_function = "moretrees.grow_fir"
})
biome_lib:grow_plants({
grow_delay = 2,
grow_chance = 30,
grow_plant = "moretrees:spruce_sapling_ongen",
grow_nodes = moretrees.spruce_biome.surface,
grow_function = "moretrees.grow_spruce"
})
biome_lib:grow_plants({
grow_delay = 2,
grow_chance = 30,
grow_plant = "moretrees:birch_sapling_ongen",
grow_nodes = moretrees.birch_biome.surface,
grow_function = "moretrees.grow_birch"
grow_chance = 1,
grow_plant = "moretrees:"..treename.."_sapling_ongen",
grow_nodes = surfaces,
grow_function = grow_function,
})
end