From 71e0fce57ae1b5c84c822afe289cf048fa30687b Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 21 Jan 2013 20:52:04 -0500 Subject: [PATCH] Added fir cones, more tweaks to weed out old conifer/jungletree refs. Changed fir models so that they include the new cones. --- biome_defs.lua | 2 +- init.lua | 22 +++++++++++----------- node_defs.lua | 16 +++++++++++++++- textures/moretrees_fir_cone.png | Bin 0 -> 848 bytes tree_biomes.txt | 2 +- tree_models.lua | 8 +++++--- 6 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 textures/moretrees_fir_cone.png diff --git a/biome_defs.lua b/biome_defs.lua index 3c8fa8c..827e092 100644 --- a/biome_defs.lua +++ b/biome_defs.lua @@ -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, diff --git a/init.lua b/init.lua index 40a8dc2..c6f5bd7 100644 --- a/init.lua +++ b/init.lua @@ -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 diff --git a/node_defs.lua b/node_defs.lua index 38ed950..4036a48 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -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: diff --git a/textures/moretrees_fir_cone.png b/textures/moretrees_fir_cone.png new file mode 100644 index 0000000000000000000000000000000000000000..b40c94e445240475ddeed399d5fb6493ee067cb0 GIT binary patch literal 848 zcmV-W1F!svP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*Y{ z0V*v45Prx2000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}00083NklP2q!gG4<)BYph={1b7Y(%_sEDb= zM;{6aA_x?_JXjPZNc2!CiKJx|-N>v^X&h5W&v@pn9>x&|4Wb1L_G0b*t^Z$a5E1@0 z!~LzizRao;5dwaV2mBgGxW846H{%zD1d@0xR{~|GaeMr{;v^w~CfdrX?w)X5awo9_ z$n>+z>H>skrg6R~tujx^NR|PQ9D~{|jGC*pZx%VGA}1YiB5`2Aukpnqi2+$|i2{D@ ziB*6q^Au{_Z8f*9lgXhnx>w_D7t(S|919U!%Z@(E*^ z0!3!DHdO)uZ1KuaB%trBf$R(^#2H-K9*Me!BCNY1eJH8oT9+q(Z{5U<$r3E6g3<9E zR*Zy9lx!5E`-{}}k7I`8W{-a4=yrAJ!&o%4@y@i(A{c5)t^Fr&PZt_dVtk4JakqnG z-XKiQk~{xGur|x1dbX{T=b9gfa~}-qHX$=y^lKBx&Rl7VTi^hYsxj0aENz+5iHg<> zGsD4VOEwAQpC7BZ`gB&^=~JS^K@*)d&Ud9b_LuhjL$~5flmTG$x5>Q85)C%_+KbM< z-{*C4TXB{kZ!%{+pAF~+(MZTdOLy4!=uOBMf1I!b04U#Vi8!r{`iBk0>*7#kAj>UB zyWU2m!Zk7(Cc^gzbS+~11z=|k5&)}%Q*g#ab)jW0MdQDMGp4=smF`sL!9tYqj}ig@ a6Mq2HQ0000