summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@linuxworks.belug.de>2018-01-11 22:02:24 +0100
committerroot <root@linuxworks.belug.de>2018-01-11 22:02:24 +0100
commitca0731f57e506fe93b56a288e3799f419c848759 (patch)
tree180ef461deee2a85721e5688cc3d73194cc4001f
parenta2ca81a30e615b66694d177d0ec654a28bf407fb (diff)
parent324155f80519259fdf58f43604cecbf47bfb035e (diff)
Merge branch 'master' of https://github.com/minetest-mods/moretreesHEADmaster
-rw-r--r--init.lua9
-rw-r--r--node_defs.lua10
2 files changed, 8 insertions, 11 deletions
diff --git a/init.lua b/init.lua
index c9813db..f3f840f 100644
--- a/init.lua
+++ b/init.lua
@@ -2,13 +2,13 @@
--
-- This mod adds more types of trees to the game
--
--- Some of the node definitions and textures came from cisoun's conifers mod
+-- Some of the node definitions and textures came from cisoun's conifers mod
-- and bas080's jungle trees mod.
--
-- Brought together into one mod and made L-systems compatible by Vanessa
-- Ezekowitz.
--
--- Firs and Jungle tree axioms/rules by Vanessa Ezekowitz, with the
+-- Firs and Jungle tree axioms/rules by Vanessa Ezekowitz, with the
-- latter having been tweaked by RealBadAngel, most other axioms/rules written
-- by RealBadAngel.
--
@@ -51,7 +51,8 @@ end
-- infinite stacks checking
-if minetest.get_modpath("unified_inventory") or not minetest.setting_getbool("creative_mode") then
+if minetest.get_modpath("unified_inventory") or not
+ minetest.settings:get_bool("creative_mode") then
moretrees.expect_infinite_stacks = false
else
moretrees.expect_infinite_stacks = true
@@ -224,7 +225,7 @@ function moretrees.grow_jungletree(pos)
local r2 = math.random(3)
if r1 == 1 then
moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red"
- else
+ else
moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_yellow"
end
moretrees.jungletree_model.leaves2_chance = math.random(25, 75)
diff --git a/node_defs.lua b/node_defs.lua
index 7526491..b13d605 100644
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -1,7 +1,7 @@
local S = moretrees.intllib
moretrees.avoidnodes = {}
-
+
moretrees.treelist = {
{"beech", "Beech Tree"},
{"apple_tree", "Apple Tree"},
@@ -27,7 +27,7 @@ local dirs3 = { 14, 11, 16, 5, 14 }
local moretrees_new_leaves_drawtype = "allfaces_optional"
local moretrees_plantlike_leaves_visual_scale = 1
-if moretrees.plantlike_leaves then
+if moretrees.plantlike_leaves then
moretrees_new_leaves_drawtype = "plantlike"
moretrees_plantlike_leaves_visual_scale = math.sqrt(2)
end
@@ -159,7 +159,7 @@ for i in ipairs(moretrees.treelist) do
stairsplus:register_all(
"moretrees",
treename.."_trunk",
- "moretrees:"..treename.."_trunk",
+ "moretrees:"..treename.."_trunk",
{
groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 },
tiles = {
@@ -480,10 +480,6 @@ minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horiz
minetest.register_alias("moretrees:jungletree_planks", "default:junglewood")
minetest.register_alias("moretrees:jungletree_leaves_green", "default:jungleleaves")
-minetest.register_alias("jungletree:leaves_green", "default:jungleleaves")
-minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red")
-minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow")
-
minetest.register_alias("moretrees:acacia_trunk", "default:acacia_tree")
minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood")
minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling")