mtcontrib
/
moretrees
mirror of https://github.com/mt-mods/moretrees.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Forgot some references to the old jungletrees and conifers nodes 

when I was weeding out the legacy names and textures.  This should fix
the last of it.
This commit is contained in:
Vanessa Ezekowitz 2013-01-21 20:50:41 -05:00
parent 1b14c24ea1
commit 466fb89ec1
10 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crafts.lua
View File

@ -66,31 +66,31 @@ minetest.register_craft({
---- ----
minetest.register_craft({ minetest.register_craft({
output = "conifers:trunk_reversed 2", output = "moretrees:fir_trunk_sideways 2",
recipe = { recipe = {
{"conifers:trunk", "conifers:trunk"}, {"moretrees:fir_trunk", "fir:trunk"},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "conifers:trunk 2", output = "moretrees:fir_trunk 2",
recipe = { recipe = {
{"conifers:trunk_reversed"}, {"moretrees:fir_trunk_sideways"},
{"conifers:trunk_reversed"} {"moretrees:fir_trunk_sideways"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "default:wood 4", output = "default:wood 4",
recipe = { recipe = {
{"conifers:trunk"} {"moretrees:fir_trunk"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "default:wood 4", output = "default:wood 4",
recipe = { recipe = {
{"conifers:trunk_reversed"} {"moretrees:fir_trunk_sideways"}
} }
}) })

14
init.lua
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.birch_biome, "moretrees:grow_birch")
plantslib:register_generate_plant(moretrees.spruce_biome, "moretrees:grow_spruce") 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.jungletree_biome, "moretrees:grow_jungletree")
plantslib:register_generate_plant(moretrees.conifer_biome, "moretrees:grow_conifer") plantslib:register_generate_plant(moretrees.conifer_biome, "moretrees:grow_fir")
-- These three lines replace default trees with beech -- These three lines replace default trees with beech
-- Enable them if you want but be warned - due to serious bugs in the speed -- Enable them if you want but be warned - due to serious bugs in the speed
@ -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: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: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_conifer",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:jungletree_sapling",nil,nil,nil,nil,nil,nil,nil,nil,"moretrees:grow_jungletree",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 -- Code to spawn a birch tree
@ -135,9 +135,9 @@ function moretrees:grow_jungletree(pos)
local r1 = math.random(2) local r1 = math.random(2)
local r2 = math.random(3) local r2 = math.random(3)
if r1 == 1 then if r1 == 1 then
moretrees.jungletree_model.leaves2 = "jungletree:leaves_red" moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red"
else else
moretrees.jungletree_model.leaves2 = "jungletree:leaves_yellow" moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_yellow"
end end
moretrees.jungletree_model.leaves2_chance = math.random(25, 75) moretrees.jungletree_model.leaves2_chance = math.random(25, 75)
@ -169,11 +169,11 @@ function moretrees:grow_jungletree(pos)
minetest.env:spawn_tree(pos, moretrees.jungletree_model) minetest.env:spawn_tree(pos, moretrees.jungletree_model)
end end
function moretrees:grow_conifer(pos) function moretrees:grow_fir(pos)
if math.random(2) == 1 then if math.random(2) == 1 then
moretrees.conifer_model.leaves="conifers:leaves" moretrees.conifer_model.leaves="moretrees:fir_leaves"
else else
moretrees.conifer_model.leaves="conifers:leaves_special" moretrees.conifer_model.leaves="moretrees:fir_leaves_special"
end end
if math.random(2) == 1 then if math.random(2) == 1 then
moretrees.conifer_model.rules_a = moretrees.ct_rules_a1 moretrees.conifer_model.rules_a = moretrees.ct_rules_a1

87
node_defs.lua
View File

@ -18,9 +18,9 @@ table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk")
table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_red") table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_red")
table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_green") table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_green")
table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_yellow") table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_yellow")
table.insert(moretrees.avoidnodes, "moretrees:conifer_trunk") table.insert(moretrees.avoidnodes, "moretrees:fir_trunk")
table.insert(moretrees.avoidnodes, "moretrees:conifer_leaves") table.insert(moretrees.avoidnodes, "moretrees:fir_leaves")
table.insert(moretrees.avoidnodes, "moretrees:conifer_leaves_bright") table.insert(moretrees.avoidnodes, "moretrees:fir_leaves_bright")
for i in ipairs(leaves) do for i in ipairs(leaves) do
local name = leaves[i] local name = leaves[i]
@ -205,17 +205,17 @@ for color = 1, 3 do
}) })
end end
-- Nodes for conifers -- Nodes for firs
minetest.register_node("moretrees:conifer_trunk", { minetest.register_node("moretrees:fir_trunk", {
description = "Conifer trunk", description = "Fir trunk",
tile_images = { tile_images = {
"moretrees_conifer_trunktop.png", "moretrees_fir_trunktop.png",
"moretrees_conifer_trunktop.png", "moretrees_fir_trunktop.png",
"moretrees_conifer_trunk.png", "moretrees_fir_trunk.png",
"moretrees_conifer_trunk.png", "moretrees_fir_trunk.png",
"moretrees_conifer_trunk.png", "moretrees_fir_trunk.png",
"moretrees_conifer_trunk.png" "moretrees_fir_trunk.png"
}, },
is_ground_content = true, is_ground_content = true,
groups = { groups = {
@ -229,21 +229,16 @@ minetest.register_node("moretrees:conifer_trunk", {
sounds = default.node_sound_wood_defaults() sounds = default.node_sound_wood_defaults()
}) })
minetest.register_node("moretrees:conifer_trunk_sideways", { minetest.register_node("moretrees:fir_trunk_sideways", {
description = "Conifer reversed trunk", description = "Fir Trunk (sideways)",
tile_images = { tile_images = {
"moretrees_conifer_trunk.png^[transformR90", "moretrees_fir_trunk.png^[transformR90",
"moretrees_conifer_trunk.png^[transformR90", "moretrees_fir_trunk.png^[transformR90",
"moretrees_conifer_trunktop.png", "moretrees_fir_trunktop.png",
"moretrees_conifer_trunktop.png", "moretrees_fir_trunktop.png",
"moretrees_conifer_trunk.png^[transformR90", "moretrees_fir_trunk.png^[transformR90",
"moretrees_conifer_trunk.png^[transformR90" "moretrees_fir_trunk.png^[transformR90"
}, },
--inventory_image = minetest.inventorycube(
--"conifers_trunk.png",
--"conifers_trunktop.png",
--"conifers_trunk.png"
--),
paramtype2 = "facedir", paramtype2 = "facedir",
material = minetest.digprop_woodlike(1.0), material = minetest.digprop_woodlike(1.0),
@ -258,10 +253,10 @@ minetest.register_node("moretrees:conifer_trunk_sideways", {
sounds = default.node_sound_wood_defaults() sounds = default.node_sound_wood_defaults()
}) })
minetest.register_node("moretrees:conifer_leaves", { minetest.register_node("moretrees:fir_leaves", {
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
description = "Conifer leaves", description = "Fir Leaves",
tile_images = { "moretrees_conifer_leaves.png" }, tile_images = { "moretrees_fir_leaves.png" },
paramtype = "light", paramtype = "light",
groups = { groups = {
snappy = 3, snappy = 3,
@ -273,23 +268,23 @@ minetest.register_node("moretrees:conifer_leaves", {
items = { items = {
{ {
-- player will get sapling with 1/20 chance -- player will get sapling with 1/20 chance
items = {'conifers:sapling'}, items = {'moretrees:fir_sapling'},
rarity = 20, rarity = 20,
}, },
{ {
-- player will get leaves only if he get no saplings, -- player will get leaves only if he get no saplings,
-- this is because max_items is 1 -- this is because max_items is 1
items = {'conifers:leaves'}, items = {'moretrees:fir_leaves'},
} }
} }
}, },
sounds = default.node_sound_leaves_defaults() sounds = default.node_sound_leaves_defaults()
}) })
minetest.register_node("moretrees:conifer_leaves_bright", { minetest.register_node("moretrees:fir_leaves_bright", {
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
description = "Bright conifer leaves", description = "Fir Leaves (Bright)",
tile_images = { "moretrees_conifer_leaves_bright.png" }, tile_images = { "moretrees_fir_leaves_bright.png" },
paramtype = "light", paramtype = "light",
groups = { groups = {
@ -302,23 +297,23 @@ minetest.register_node("moretrees:conifer_leaves_bright", {
items = { items = {
{ {
-- player will get sapling with 1/20 chance -- player will get sapling with 1/20 chance
items = {'conifers:sapling'}, items = {'moretrees:fir_sapling'},
rarity = 20, rarity = 20,
}, },
{ {
-- player will get leaves only if he get no saplings, -- player will get leaves only if he get no saplings,
-- this is because max_items is 1 -- this is because max_items is 1
items = {'conifers:leaves'}, items = {'moretrees:fir_leaves'},
} }
} }
}, },
sounds = default.node_sound_leaves_defaults() sounds = default.node_sound_leaves_defaults()
}) })
minetest.register_node("moretrees:conifer_sapling", { minetest.register_node("moretrees:fir_sapling", {
description = "Conifer sapling", description = "Fir sapling",
drawtype = "plantlike", drawtype = "plantlike",
tile_images = {"moretrees_conifer_sapling.png"}, tile_images = {"moretrees_fir_sapling.png"},
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
groups = { groups = {
@ -338,9 +333,15 @@ minetest.register_alias("jungletree:leaves_green", "moretrees:jungletree_leaves_
minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red") minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red")
minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow") minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow")
minetest.register_alias("conifers:trunk", "moretrees:conifer_trunk") minetest.register_alias("moretrees:conifer_trunk", "moretrees:fir_trunk")
minetest.register_alias("conifers:trunk_reversed", "moretrees:conifer_trunk_sideways") minetest.register_alias("moretrees:conifer_trunk_sideways", "moretrees:fir_trunk_sideways")
minetest.register_alias("conifers:leaves", "moretrees:conifer_leaves") minetest.register_alias("moretrees:conifer_leaves", "moretrees:fir_leaves")
minetest.register_alias("conifers:leaves_special", "moretrees:conifer_leaves_bright") minetest.register_alias("moretrees:conifer_leaves_bright", "moretrees:fir_leaves_bright")
minetest.register_alias("conifers:sapling", "moretrees:conifer_sapling") minetest.register_alias("moretrees:conifer_sapling", "moretrees:fir_sapling")
minetest.register_alias("conifers:trunk", "moretrees:fir_trunk")
minetest.register_alias("conifers:trunk_reversed", "moretrees:fir_trunk_sideways")
minetest.register_alias("conifers:leaves", "moretrees:fir_leaves")
minetest.register_alias("conifers:leaves_special", "moretrees:fir_leaves_bright")
minetest.register_alias("conifers:sapling", "moretrees:fir_sapling")

0
textures/moretrees_conifer_leaves.png → textures/moretrees_fir_leaves.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

0
textures/moretrees_conifer_leaves_bright.png → textures/moretrees_fir_leaves_bright.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

0
textures/moretrees_conifer_sapling.png → textures/moretrees_fir_sapling.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 454 B

0
textures/moretrees_conifer_trunk.png → textures/moretrees_fir_trunk.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

0
textures/moretrees_conifer_trunk_reversed.png → textures/moretrees_fir_trunk_reversed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 721 B

0
textures/moretrees_conifer_trunktop.png → textures/moretrees_fir_trunktop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 768 B

6
tree_models.lua
View File

@ -186,8 +186,8 @@ moretrees.jungletree_model={
axiom=nil, axiom=nil,
rules_a=nil, rules_a=nil,
rules_b=nil, rules_b=nil,
trunk="default:jungletree", trunk="moretrees:jungletree_trunk",
leaves="jungletree:leaves_green", leaves="moretrees:jungletree_leaves_green",
leaves2=nil, leaves2=nil,
leaves2_chance=nil, leaves2_chance=nil,
angle=45, angle=45,
@ -203,7 +203,7 @@ moretrees.conifer_model={
axiom="FFFAF[&&-F][&&+F][&&---F][&&+++F]Fff", axiom="FFFAF[&&-F][&&+F][&&---F][&&+++F]Fff",
rules_a=nil, rules_a=nil,
rules_b=nil, rules_b=nil,
trunk="conifers:trunk", trunk="moretrees:fir_trunk",
leaves=nil, leaves=nil,
angle=45, angle=45,
iterations=7, iterations=7,