1
0
mirror of https://github.com/mt-mods/moretrees.git synced 2024-12-24 17:50:24 +01:00

Added fir cones, more tweaks to weed out old conifer/jungletree refs.

Changed fir models so that they include the new cones.
This commit is contained in:
Vanessa Ezekowitz 2013-01-21 20:52:04 -05:00
parent 466fb89ec1
commit 71e0fce57a
6 changed files with 33 additions and 17 deletions

View File

@ -156,7 +156,7 @@ moretrees.jungletree_biome = {
rarity = 50,
}
moretrees.conifer_biome = {
moretrees.fir_biome = {
surface = "default:dirt_with_grass",
avoid_nodes = moretrees.avoidnodes,
avoid_radius = 10,

View File

@ -47,7 +47,7 @@ plantslib:register_generate_plant(moretrees.willow_biome, moretrees.willow_model
plantslib:register_generate_plant(moretrees.birch_biome, "moretrees:grow_birch")
plantslib:register_generate_plant(moretrees.spruce_biome, "moretrees:grow_spruce")
plantslib:register_generate_plant(moretrees.jungletree_biome, "moretrees:grow_jungletree")
plantslib:register_generate_plant(moretrees.conifer_biome, "moretrees:grow_fir")
plantslib:register_generate_plant(moretrees.fir_biome, "moretrees:grow_fir")
-- These three lines replace default trees with beech
-- Enable them if you want but be warned - due to serious bugs in the speed
@ -61,7 +61,7 @@ plantslib:register_generate_plant(moretrees.beech_biome, moretrees.beech_model)
-- sapling growth setup
local sapling_interval = 500
local sapling_interval = 500
local sapling_chance = 10
for i in ipairs(simple_trees) do
@ -90,7 +90,7 @@ end
plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:birch_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_birch",nil)
plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:spruce_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_spruce",nil)
plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:conifer_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_fir",nil)
plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:fir_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_fir",nil)
plantslib:grow_plants(sapling_interval,sapling_chance,"moretrees:jungletree_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_jungletree",nil)
-- Code to spawn a birch tree
@ -115,7 +115,7 @@ function moretrees:grow_spruce(pos)
end
end
-- Code that spawns jungle trees and firs ("conifer")
-- Code that spawns jungle trees and firs
moretrees.jt_axiom1 = "FFFA"
moretrees.jt_rules_a1 = "FFF[&&-FBf[&&&Ff]^^^Ff][&&+FBFf[&&&FFf]^^^Ff][&&---FBFf[&&&Ff]^^^Ff][&&+++FBFf[&&&Ff]^^^Ff]F/A"
@ -171,16 +171,16 @@ end
function moretrees:grow_fir(pos)
if math.random(2) == 1 then
moretrees.conifer_model.leaves="moretrees:fir_leaves"
moretrees.fir_model.leaves="moretrees:fir_leaves"
else
moretrees.conifer_model.leaves="moretrees:fir_leaves_special"
moretrees.fir_model.leaves="moretrees:fir_leaves_special"
end
if math.random(2) == 1 then
moretrees.conifer_model.rules_a = moretrees.ct_rules_a1
moretrees.conifer_model.rules_b = moretrees.ct_rules_b1
moretrees.fir_model.rules_a = moretrees.ct_rules_a1
moretrees.fir_model.rules_b = moretrees.ct_rules_b1
else
moretrees.conifer_model.rules_a = moretrees.ct_rules_a2
moretrees.conifer_model.rules_b = moretrees.ct_rules_b2
moretrees.fir_model.rules_a = moretrees.ct_rules_a2
moretrees.fir_model.rules_b = moretrees.ct_rules_b2
end
minetest.env:remove_node(pos)
@ -188,7 +188,7 @@ function moretrees:grow_fir(pos)
for leaf in ipairs(leaves) do
minetest.env:remove_node(leaves[leaf])
end
minetest.env:spawn_tree(pos,moretrees.conifer_model)
minetest.env:spawn_tree(pos,moretrees.fir_model)
end

View File

@ -324,7 +324,21 @@ minetest.register_node("moretrees:fir_sapling", {
sounds = default.node_sound_defaults(),
})
minetest.register_node("moretrees:fir_cone", {
description = "Fir cone",
drawtype = "plantlike",
visual_scale = 0.8,
tiles = {"moretrees_fir_cone.png"},
paramtype = "light",
sunlight_propagates = true,
walkable = false,
groups = {fleshy=3,dig_immediate=3,flammable=2},
sounds = default.node_sound_defaults(),
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
},
})
-- Backward compatbility with old mods/nodes:

Binary file not shown.

After

Width:  |  Height:  |  Size: 848 B

View File

@ -3,7 +3,7 @@
Tree type (m) (approx., °C) some node water to spawn on seed diff radius
-----------------------------------------------------------------------------------------------------------------------
jungle tree - 5 to +10 above +26 water, 15 10 dirt_with_grass 329 7
fir (conifers) above +25 -20 to +10 n/a n/a dirt_with_grass 359 8
fir above +25 -20 to +10 n/a n/a dirt_with_grass 359 8
palm - 1 to + 1 +18 to +32 water, 15 10 sand 330 5
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

View File

@ -194,12 +194,12 @@ moretrees.jungletree_model={
iterations=nil,
random_level=2,
trunk_type=nil,
thin_branches=true;
thin_branches=true,
fruit_chance=15,
fruit="vines:vine"
}
moretrees.conifer_model={
moretrees.fir_model={
axiom="FFFAF[&&-F][&&+F][&&---F][&&+++F]Fff",
rules_a=nil,
rules_b=nil,
@ -209,5 +209,7 @@ moretrees.conifer_model={
iterations=7,
random_level=5,
trunk_type="single",
thin_branches=true
thin_branches=true,
fruit="moretrees:fir_cone",
fruit_chance=8
}