diff options
| -rw-r--r-- | crafts.lua | 14 | ||||
| -rw-r--r-- | init.lua | 14 | ||||
| -rw-r--r-- | node_defs.lua | 87 | ||||
| -rw-r--r-- | textures/moretrees_fir_leaves.png (renamed from textures/moretrees_conifer_leaves.png) | bin | 333 -> 333 bytes | |||
| -rw-r--r-- | textures/moretrees_fir_leaves_bright.png (renamed from textures/moretrees_conifer_leaves_bright.png) | bin | 367 -> 367 bytes | |||
| -rw-r--r-- | textures/moretrees_fir_sapling.png (renamed from textures/moretrees_conifer_sapling.png) | bin | 454 -> 454 bytes | |||
| -rw-r--r-- | textures/moretrees_fir_trunk.png (renamed from textures/moretrees_conifer_trunk.png) | bin | 699 -> 699 bytes | |||
| -rw-r--r-- | textures/moretrees_fir_trunk_reversed.png (renamed from textures/moretrees_conifer_trunk_reversed.png) | bin | 721 -> 721 bytes | |||
| -rw-r--r-- | textures/moretrees_fir_trunktop.png (renamed from textures/moretrees_conifer_trunktop.png) | bin | 768 -> 768 bytes | |||
| -rw-r--r-- | tree_models.lua | 6 |
10 files changed, 61 insertions, 60 deletions
@@ -66,31 +66,31 @@ minetest.register_craft({ ---- minetest.register_craft({ - output = "conifers:trunk_reversed 2", + output = "moretrees:fir_trunk_sideways 2", recipe = { - {"conifers:trunk", "conifers:trunk"}, + {"moretrees:fir_trunk", "fir:trunk"}, } }) minetest.register_craft({ - output = "conifers:trunk 2", + output = "moretrees:fir_trunk 2", recipe = { - {"conifers:trunk_reversed"}, - {"conifers:trunk_reversed"} + {"moretrees:fir_trunk_sideways"}, + {"moretrees:fir_trunk_sideways"} } }) minetest.register_craft({ output = "default:wood 4", recipe = { - {"conifers:trunk"} + {"moretrees:fir_trunk"} } }) minetest.register_craft({ output = "default:wood 4", recipe = { - {"conifers:trunk_reversed"} + {"moretrees:fir_trunk_sideways"} } }) @@ -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_conifer") +plantslib:register_generate_plant(moretrees.conifer_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 @@ -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_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) -- Code to spawn a birch tree @@ -135,9 +135,9 @@ function moretrees:grow_jungletree(pos) local r1 = math.random(2) local r2 = math.random(3) if r1 == 1 then - moretrees.jungletree_model.leaves2 = "jungletree:leaves_red" + moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red" else - moretrees.jungletree_model.leaves2 = "jungletree:leaves_yellow" + moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_yellow" end 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) end -function moretrees:grow_conifer(pos) +function moretrees:grow_fir(pos) if math.random(2) == 1 then - moretrees.conifer_model.leaves="conifers:leaves" + moretrees.conifer_model.leaves="moretrees:fir_leaves" else - moretrees.conifer_model.leaves="conifers:leaves_special" + moretrees.conifer_model.leaves="moretrees:fir_leaves_special" end if math.random(2) == 1 then moretrees.conifer_model.rules_a = moretrees.ct_rules_a1 diff --git a/node_defs.lua b/node_defs.lua index d807f95..38ed950 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -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_green") table.insert(moretrees.avoidnodes, "moretrees:jungletree_leaves_yellow") -table.insert(moretrees.avoidnodes, "moretrees:conifer_trunk") -table.insert(moretrees.avoidnodes, "moretrees:conifer_leaves") -table.insert(moretrees.avoidnodes, "moretrees:conifer_leaves_bright") +table.insert(moretrees.avoidnodes, "moretrees:fir_trunk") +table.insert(moretrees.avoidnodes, "moretrees:fir_leaves") +table.insert(moretrees.avoidnodes, "moretrees:fir_leaves_bright") for i in ipairs(leaves) do local name = leaves[i] @@ -205,17 +205,17 @@ for color = 1, 3 do }) end --- Nodes for conifers +-- Nodes for firs -minetest.register_node("moretrees:conifer_trunk", { - description = "Conifer trunk", +minetest.register_node("moretrees:fir_trunk", { + description = "Fir trunk", tile_images = { - "moretrees_conifer_trunktop.png", - "moretrees_conifer_trunktop.png", - "moretrees_conifer_trunk.png", - "moretrees_conifer_trunk.png", - "moretrees_conifer_trunk.png", - "moretrees_conifer_trunk.png" + "moretrees_fir_trunktop.png", + "moretrees_fir_trunktop.png", + "moretrees_fir_trunk.png", + "moretrees_fir_trunk.png", + "moretrees_fir_trunk.png", + "moretrees_fir_trunk.png" }, is_ground_content = true, groups = { @@ -229,21 +229,16 @@ minetest.register_node("moretrees:conifer_trunk", { sounds = default.node_sound_wood_defaults() }) -minetest.register_node("moretrees:conifer_trunk_sideways", { - description = "Conifer reversed trunk", +minetest.register_node("moretrees:fir_trunk_sideways", { + description = "Fir Trunk (sideways)", tile_images = { - "moretrees_conifer_trunk.png^[transformR90", - "moretrees_conifer_trunk.png^[transformR90", - "moretrees_conifer_trunktop.png", - "moretrees_conifer_trunktop.png", - "moretrees_conifer_trunk.png^[transformR90", - "moretrees_conifer_trunk.png^[transformR90" + "moretrees_fir_trunk.png^[transformR90", + "moretrees_fir_trunk.png^[transformR90", + "moretrees_fir_trunktop.png", + "moretrees_fir_trunktop.png", + "moretrees_fir_trunk.png^[transformR90", + "moretrees_fir_trunk.png^[transformR90" }, - --inventory_image = minetest.inventorycube( - --"conifers_trunk.png", - --"conifers_trunktop.png", - --"conifers_trunk.png" - --), paramtype2 = "facedir", material = minetest.digprop_woodlike(1.0), @@ -258,10 +253,10 @@ minetest.register_node("moretrees:conifer_trunk_sideways", { sounds = default.node_sound_wood_defaults() }) -minetest.register_node("moretrees:conifer_leaves", { +minetest.register_node("moretrees:fir_leaves", { drawtype = "allfaces_optional", - description = "Conifer leaves", - tile_images = { "moretrees_conifer_leaves.png" }, + description = "Fir Leaves", + tile_images = { "moretrees_fir_leaves.png" }, paramtype = "light", groups = { snappy = 3, @@ -273,23 +268,23 @@ minetest.register_node("moretrees:conifer_leaves", { items = { { -- player will get sapling with 1/20 chance - items = {'conifers:sapling'}, + items = {'moretrees:fir_sapling'}, rarity = 20, }, { -- player will get leaves only if he get no saplings, -- this is because max_items is 1 - items = {'conifers:leaves'}, + items = {'moretrees:fir_leaves'}, } } }, sounds = default.node_sound_leaves_defaults() }) -minetest.register_node("moretrees:conifer_leaves_bright", { +minetest.register_node("moretrees:fir_leaves_bright", { drawtype = "allfaces_optional", - description = "Bright conifer leaves", - tile_images = { "moretrees_conifer_leaves_bright.png" }, + description = "Fir Leaves (Bright)", + tile_images = { "moretrees_fir_leaves_bright.png" }, paramtype = "light", groups = { @@ -302,23 +297,23 @@ minetest.register_node("moretrees:conifer_leaves_bright", { items = { { -- player will get sapling with 1/20 chance - items = {'conifers:sapling'}, + items = {'moretrees:fir_sapling'}, rarity = 20, }, { -- player will get leaves only if he get no saplings, -- this is because max_items is 1 - items = {'conifers:leaves'}, + items = {'moretrees:fir_leaves'}, } } }, sounds = default.node_sound_leaves_defaults() }) -minetest.register_node("moretrees:conifer_sapling", { - description = "Conifer sapling", +minetest.register_node("moretrees:fir_sapling", { + description = "Fir sapling", drawtype = "plantlike", - tile_images = {"moretrees_conifer_sapling.png"}, + tile_images = {"moretrees_fir_sapling.png"}, paramtype = "light", walkable = false, 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_yellow", "moretrees:jungletree_leaves_yellow") -minetest.register_alias("conifers:trunk", "moretrees:conifer_trunk") -minetest.register_alias("conifers:trunk_reversed", "moretrees:conifer_trunk_sideways") -minetest.register_alias("conifers:leaves", "moretrees:conifer_leaves") -minetest.register_alias("conifers:leaves_special", "moretrees:conifer_leaves_bright") -minetest.register_alias("conifers:sapling", "moretrees:conifer_sapling") +minetest.register_alias("moretrees:conifer_trunk", "moretrees:fir_trunk") +minetest.register_alias("moretrees:conifer_trunk_sideways", "moretrees:fir_trunk_sideways") +minetest.register_alias("moretrees:conifer_leaves", "moretrees:fir_leaves") +minetest.register_alias("moretrees:conifer_leaves_bright", "moretrees:fir_leaves_bright") +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") diff --git a/textures/moretrees_conifer_leaves.png b/textures/moretrees_fir_leaves.png Binary files differindex cfaaa1c..cfaaa1c 100644 --- a/textures/moretrees_conifer_leaves.png +++ b/textures/moretrees_fir_leaves.png diff --git a/textures/moretrees_conifer_leaves_bright.png b/textures/moretrees_fir_leaves_bright.png Binary files differindex c5dca1c..c5dca1c 100644 --- a/textures/moretrees_conifer_leaves_bright.png +++ b/textures/moretrees_fir_leaves_bright.png diff --git a/textures/moretrees_conifer_sapling.png b/textures/moretrees_fir_sapling.png Binary files differindex bcbed08..bcbed08 100644 --- a/textures/moretrees_conifer_sapling.png +++ b/textures/moretrees_fir_sapling.png diff --git a/textures/moretrees_conifer_trunk.png b/textures/moretrees_fir_trunk.png Binary files differindex 6e4e67a..6e4e67a 100644 --- a/textures/moretrees_conifer_trunk.png +++ b/textures/moretrees_fir_trunk.png diff --git a/textures/moretrees_conifer_trunk_reversed.png b/textures/moretrees_fir_trunk_reversed.png Binary files differindex 0730e31..0730e31 100644 --- a/textures/moretrees_conifer_trunk_reversed.png +++ b/textures/moretrees_fir_trunk_reversed.png diff --git a/textures/moretrees_conifer_trunktop.png b/textures/moretrees_fir_trunktop.png Binary files differindex 4f21401..4f21401 100644 --- a/textures/moretrees_conifer_trunktop.png +++ b/textures/moretrees_fir_trunktop.png diff --git a/tree_models.lua b/tree_models.lua index 2288379..a355a0d 100644 --- a/tree_models.lua +++ b/tree_models.lua @@ -186,8 +186,8 @@ moretrees.jungletree_model={ axiom=nil, rules_a=nil, rules_b=nil, - trunk="default:jungletree", - leaves="jungletree:leaves_green", + trunk="moretrees:jungletree_trunk", + leaves="moretrees:jungletree_leaves_green", leaves2=nil, leaves2_chance=nil, angle=45, @@ -203,7 +203,7 @@ moretrees.conifer_model={ axiom="FFFAF[&&-F][&&+F][&&---F][&&+++F]Fff", rules_a=nil, rules_b=nil, - trunk="conifers:trunk", + trunk="moretrees:fir_trunk", leaves=nil, angle=45, iterations=7, |
