More stuff

game.conf

@@ -1 +1 @@
-name = Lord of the Test
+name = Minetest: Third Age

mods/lottitems/init.lua

@@ -3,4 +3,3 @@ local modpath = minetest.get_modpath("lottitems")
 dofile(modpath .. "/base_nodes/init.lua")
 dofile(modpath .. "/deco/init.lua")
 dofile(modpath .. "/mapgen/init.lua")
-dofile(modpath .. "/plants/init.lua")

mods/lottitems/plants/init.lua

@@ -1,4 +0,0 @@
-local modpath = minetest.get_modpath("lottitems") .. "/plants"
-
-dofile(modpath .. "/trees.lua")
-dofile(modpath .. "/plants.lua")

mods/lottitems/plants/plants.lua

@@ -1,11 +0,0 @@
-minetest.register_node("lottitems:cactus", {
-	description = "Cactus",
-	tiles = {"lottitems_cactus_top.png", "lottitems_cactus_top.png", "lottitems_cactus.png"},
-	groups = {axe = 2},
-})
-
-minetest.register_node("lottitems:apple", {
-	description = "Apple",
-	tiles = {"lottitems_apple.png"},
-	groups = {hand = 1, food = 2, plant = 1},
-})

mods/lottmapgen/mapgen/biomes.lua

@@ -58,8 +58,11 @@ local c_pilinehtar = minetest.get_content_id("lottplants:pilinehtar")
 local c_mallos = minetest.get_content_id("lottplants:mallos")
 local c_menelluin = minetest.get_content_id("lottplants:menelluin")
 local c_sunflower = minetest.get_content_id("lottplants:sunflower")
+local c_bluebell = minetest.get_content_id("lottplants:bluebell")
 local c_silsandstone = minetest.get_content_id("lottitems:silver_sandstone")
 local c_morwat = minetest.get_content_id("lottmapgen:blacksource")
+local c_mountain_grass = minetest.get_content_id("lottplants:mountain_grass")
+local c_encyclia = minetest.get_content_id("lottplants:encyclia")
 
 -- Grasses
 local c_base_grass = minetest.get_content_id("lottitems:base_grass")
@@ -255,13 +258,18 @@ lottmapgen.register_biome(6, {
 			elseif math.random(TREE5) == 3 then
 				lottmapgen.apple_tree2(x, y, z, area, data)
 			elseif math.random(TREE3) == 5 then
-				lottmapgen.default_tree(x, y, z, area, data)
+				lottmapgen.generate_tree(x, y, z, area, data,
+					"lottplants:oak_trunk", "lottplants:oak_leaves", 4)
 			elseif math.random(TREE4) == 6 then
 				lottmapgen.short_elm_tree(x, y, z, area, data)
 			elseif math.random(PLANT6) == 7 then
 				lottmapgen.basic_flowers(data, vi, p2data)
 			elseif math.random(PLANT2) == 1 then
 				lottmapgen.grass(data, vi, p2data)
+			elseif noise_1 > 0.5 then
+				if math.random(PLANT3) == 2 then
+					data[vi] = c_bluebell
+				end
 			end
 		end
 	end,
@@ -600,7 +608,7 @@ lottmapgen.register_biome(15, {
 				elseif math.random(PLANT3) == 7 then
 					lottmapgen.lorien_plants(data, vi, p2data)
 				elseif math.random(TREE6) == 8 then
-					lottmapgen.generate_bush(x, y, z, area, data, 
+					lottmapgen.generate_bush(x, y, z, area, data,
 						"lottplants:mallorn_tree", "lottplants:mallorn_leaves")
 				end
 			elseif noise < -0.65 then
@@ -625,7 +633,7 @@ lottmapgen.register_biome(15, {
 				elseif math.random(PLANT5) == 11 then
 					lottmapgen.lorien_plants(data, vi, p2data)
 				elseif math.random(TREE8) == 8 then
-					lottmapgen.generate_bush(x, y, z, area, data, 
+					lottmapgen.generate_bush(x, y, z, area, data,
 						"lottplants:mallorn_tree", "lottplants:mallorn_leaves")
 				elseif math.random(PLANT13) == 13 then
 					if math.random(1, 2) == 1 then
@@ -833,13 +841,85 @@ lottmapgen.register_biome(21, {
 	surface = function(data, vi)
 		data[vi] = c_iron_hills_grass
 	end,
-	deco = function(data, p2data, vi, area, x, y, z)
-		if math.random(TREE10) == 2 then
-			lottmapgen.beech_tree(x, y, z, area, data)
-		elseif math.random(TREE4) == 3 then
-			lottmapgen.pine_tree(x, y, z, area, data)
-		elseif math.random(TREE6) == 4 then
-			lottmapgen.fir_tree(x, y, z, area, data)
+	deco = function(data, p2data, vi, area, x, y, z, noise)
+		if noise > -0.1 then
+			if math.random(TREE3) == 3 then
+				if y > 55 then
+					lottmapgen.pine_tree(x, y, z, area, data, true)
+				else
+					lottmapgen.pine_tree(x, y, z, area, data, false)
+				end
+			elseif math.random(PLANT5) == 5 and y < 87 then
+				data[vi] = c_mountain_grass
+			elseif math.random(PLANT4) == 6 and y < 82 then
+				lottmapgen.grass(data, vi, p2data)
+			elseif y == 69 then
+				if math.random(3) == 1 then
+					data[vi] = c_snow
+				end
+			elseif y == 70 then
+				if math.random(3) ~= 1 then
+					data[vi] = c_snow
+				end
+			elseif y > 70 then
+				data[vi] = c_snow
+			elseif math.random(TREE7) == 1 then
+				lottmapgen.generate_bush(x, y, z, area, data, "lottplants:pine_trunk", "lottplants:pine_needles")
+			elseif math.random(PLANT7) == 7 and y < 47 then
+				lottmapgen.basic_flowers(data, vi, p2data)
+			elseif math.random(PLANT7) == 8 and y < 38 then
+				data[vi] = c_encyclia
+			elseif math.random(PLANT6) == 9 and y < 26 then
+				lottmapgen.petuniae(data, vi, p2data)
+			elseif math.random(TREE10) == 2 and y < 35 then
+				lottmapgen.beech_tree(x, y, z, area, data)
+			end
+		elseif noise > -0.5 then
+			if math.random(PLANT4) == 5 and y < 87 then
+				data[vi] = c_mountain_grass
+			elseif math.random(PLANT3) == 6 and y < 82 then
+				lottmapgen.grass(data, vi, p2data)
+			elseif y == 69 then
+				if math.random(3) == 1 then
+					data[vi] = c_snow
+				end
+			elseif y == 70 then
+				if math.random(3) ~= 1 then
+					data[vi] = c_snow
+				end
+			elseif math.random(PLANT6) == 7 and y < 47 then
+				lottmapgen.basic_flowers(data, vi, p2data)
+			elseif math.random(PLANT6) == 8 and y < 38 then
+				data[vi] = c_encyclia
+			elseif math.random(PLANT5) == 9 and y < 26 then
+				lottmapgen.petuniae(data, vi, p2data)
+			end
+		else
+			if math.random(PLANT4) == 5 and y < 87 then
+				data[vi] = c_mountain_grass
+			elseif math.random(PLANT3) == 6 and y < 82 then
+				lottmapgen.grass(data, vi, p2data)
+			elseif y == 69 then
+				if math.random(3) == 1 then
+					data[vi] = c_snow
+				end
+			elseif y == 70 then
+				if math.random(3) ~= 1 then
+					data[vi] = c_snow
+				end
+			elseif y > 70 then
+				data[vi] = c_snow
+			elseif math.random(TREE4) == 1 then
+				lottmapgen.generate_bush(x, y, z, area, data, "lottplants:pine_trunk", "lottplants:pine_needles")
+			elseif math.random(TREE8) == 1 then
+				lottmapgen.generate_bush(x, y, z, area, data, "lottplants:beech_trunk", "lottplants:beech_leaves")
+			elseif math.random(PLANT7) == 7 and y < 47 then
+				lottmapgen.basic_flowers(data, vi, p2data)
+			elseif math.random(PLANT7) == 8 and y < 38 then
+				data[vi] = c_encyclia
+			elseif math.random(PLANT6) == 9 and y < 26 then
+				lottmapgen.petuniae(data, vi, p2data)
+			end
 		end
 	end,
 	soil = c_dirt,

mods/lottmapgen/mapgen/mapgen.lua

@@ -19,10 +19,10 @@ local np_humid = {
 local np_ter = {
 	offset = 0,
 	scale = 1,
-	spread = {x=128, y=128, z=128},
+	spread = {x=256, y=256, z=256},
 	seed = 543213,
-	octaves = 5,
-	persist = 0.6
+	octaves = 4,
+	persist = 0.7
 }
 
 local np_terflat = {
@@ -70,6 +70,7 @@ local nbuf_dec = {}
 local nbuf_cave = {}
 local dbuf = {}
 local p2dbuf = {}
+local heightmap = {}
 
 --[[
 dofile(minetest.get_modpath("lottmapgen").."/nodes.lua")
@@ -81,6 +82,14 @@ dofile(minetest.get_modpath("lottmapgen").."/schems.lua")
 
 local times = {}
 
+local get_mapgen_object = minetest.get_mapgen_object
+function minetest.get_mapgen_object(param)
+	if param == "heightmap" then
+		return heightmap
+	end
+	return get_mapgen_object(param)
+end
+
 -- On generated function
 minetest.register_on_generated(function(minp, maxp, seed)
 	if minp.y < -31000 or minp.y > 5000 then
@@ -99,7 +108,6 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
 	local data = vm:get_data(dbuf)
 	local p2data = vm:get_param2_data(p2dbuf)
-	local ores = lottmapgen.ores
 
 	local c_air = minetest.get_content_id("air")
 	local c_tmp = minetest.get_content_id("lottmapgen:tmp") -- For caves.
@@ -135,6 +143,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local offset = math.random(5,20)
 	local nixyz = 1
 	local nixz = 1
+	heightmap = {}
 
 	for z = z0, z1 do
 		for y = y0, y1 do -- Caves
@@ -178,12 +187,14 @@ minetest.register_on_generated(function(minp, maxp, seed)
 					elseif y < 1 then
 						data[vi] = c_water
 					end
+					heightmap[nixz] = 0
 				elseif biome == 98 then
 					if y < underwater then
 						data[vi] = c_morstone
 					elseif y < 1 then
 						data[vi] = c_morwat
 					end
+					heightmap[nixz] = y
 				elseif data[vi] == c_tmp then
 					data[vi] = c_air
 					if nvals_dec[nixz] > 0.5 and y < -154 then
@@ -191,6 +202,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 					end
 				elseif y == stone_depth and y >= 0 then
 					if biome and lottmapgen.biome[biome] then
+						heightmap[nixz] = y
 						if lottmapgen.biome[biome].surface then
 							lottmapgen.biome[biome].surface(data, vi, y)
 						end
@@ -202,6 +214,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 					end
 				elseif y < stone_depth then
 					data[vi] = c_stone
+					if not heightmap[nixz] then
+						heightmap[nixz] = y
+					end
 					if biome and lottmapgen.biome[biome] then
 						if lottmapgen.biome[biome].soil_depth and
 							y >= stone_depth - lottmapgen.biome[biome].soil_depth -
@@ -247,7 +262,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	vm:update_liquids()
 	vm:write_to_map(data)
 	local chugent = math.ceil((os.clock() - t1) * 1000)
-	minetest.chat_send_all(chugent)	
+	minetest.chat_send_all(chugent)
 	table.insert(times, chugent)
 end)
 

mods/lottmapgen/technical/functions.lua

@@ -1,7 +1,7 @@
 --Plants
 
 function lottmapgen.grass(data, vi, p2data)
-	local c_grass = minetest.get_content_id("default:grass_" ..math.random(5))
+	local c_grass = minetest.get_content_id("lottplants:grass_" ..math.random(5))
 	data[vi] = c_grass
 	p2data[vi] = 40
 end
@@ -156,6 +156,18 @@ function lottmapgen.basic_flowers(data, vi, p2data)
 	data[vi] = c_flower
 end
 
+local petuniae = {
+	"white",
+	"pink",
+	"blue"
+}
+
+function lottmapgen.petuniae(data, vi, p2data)
+	local rand = math.random(#petuniae)
+	local c_flower = minetest.get_content_id("lottplants:petunia_" .. petuniae[rand])
+	data[vi] = c_flower
+end
+
 function lottmapgen.generate_bush(x, y, z, area, data, tree, leaves)
 	local c_tree = minetest.get_content_id(tree)
 	local c_leaves = minetest.get_content_id(leaves)
@@ -179,6 +191,27 @@ function lottmapgen.generate_bush(x, y, z, area, data, tree, leaves)
 	data[vi] = c_leaves
 end
 
+function lottmapgen.generate_tree(x, y, z, area, data, tree, leaves, height)
+	local c_tree = minetest.get_content_id(tree)
+	local c_leaves = minetest.get_content_id(leaves)
+	for j = -2, height do
+		if j >= (height - 3) then
+			for i = -2, 2 do
+			for k = -2, 2 do
+				local vil = area:index(x + i, y + j + 1, z + k)
+				if math.random(48) == 2 then
+					data[vil] = c_leaves
+				elseif math.random(3) ~= 2 then
+					data[vil] = c_leaves
+				end
+			end
+			end
+		end
+		local vit = area:index(x, y + j, z)
+		data[vit] = c_tree
+	end
+end
+
 function lottmapgen.burned_tree(x, y, z, area, data)
 	local c_tree = minetest.get_content_id("default:tree")
 	for j = -2, 4 do
@@ -235,9 +268,9 @@ function lottmapgen.apple_tree(x, y, z, area, data)
 end
 
 function lottmapgen.apple_tree2(x, y, z, area, data)
-	local c_tree = minetest.get_content_id("default:tree")
+	local c_tree = minetest.get_content_id("lottplants:apple_trunk")
 	local c_apple = minetest.get_content_id("default:apple")
-	local c_leaves = minetest.get_content_id("lottplants:appleleaf")
+	local c_leaves = minetest.get_content_id("lottplants:apple_leaves")
 	for j = -2, 4 do
 		if j >= 1 then
 			for i = -2, 2 do
@@ -377,8 +410,8 @@ function lottmapgen.yavannamire_tree(x, y, z, area, data)
 end
 
 function lottmapgen.default_tree(x, y, z, area, data)
-	local c_tree = minetest.get_content_id("default:tree")
-	local c_leaves = minetest.get_content_id("default:leaves")
+	local c_tree = minetest.get_content_id("lottplants:oak_tree")
+	local c_leaves = minetest.get_content_id("lottplants:oak_leaves")
 	for j = -2, 4 do
 		if j >= 1 then
 			for i = -2, 2 do
@@ -540,8 +573,8 @@ function lottmapgen.birch_tree(x, y, z, area, data)
 end
 
 function lottmapgen.short_birch_tree(x, y, z, area, data)
-	local c_birchtree = minetest.get_content_id("lottplants:birchtree")
-	local c_birchleaf = minetest.get_content_id("lottplants:birchleaf")
+	local c_birchtree = minetest.get_content_id("lottplants:birch_trunk")
+	local c_birchleaf = minetest.get_content_id("lottplants:birch_leaves")
 	for j = -2, math.random(5, 7) do
 		if j >= 2 then
 			for i = -2, 2 do
@@ -602,8 +635,8 @@ function lottmapgen.elm_tree(x, y, z, area, data)
 end
 
 function lottmapgen.short_elm_tree(x, y, z, area, data)
-	local c_tree = minetest.get_content_id("default:tree")
-	local c_elmleaf = minetest.get_content_id("lottplants:elmleaf")
+	local c_tree = minetest.get_content_id("lottplants:elm_trunk")
+	local c_elmleaf = minetest.get_content_id("lottplants:elm_leaves")
 	for j = -5, 9 do
 		if j >= 7 then
 			for i = -2, 2 do
@@ -621,7 +654,7 @@ function lottmapgen.short_elm_tree(x, y, z, area, data)
 end
 
 function lottmapgen.small_mallorn_tree(x, y, z, area, data)
-	local c_mallorntree = minetest.get_content_id("lottplants:mallorn_tree")
+	local c_mallorntree = minetest.get_content_id("lottplants:mallorn_trunk")
 	local c_mallornleaf = minetest.get_content_id("lottplants:mallorn_leaves")
 	for j = -5, 15 do
 		if j == 11 or j == 15 then
@@ -640,7 +673,7 @@ function lottmapgen.small_mallorn_tree(x, y, z, area, data)
 end
 
 function lottmapgen.young_mallorn_tree(x, y, z, area, data)
-	local c_youngmallorn = minetest.get_content_id("lottplants:young_mallorn_tree")
+	local c_youngmallorn = minetest.get_content_id("lottplants:young_mallorn_trunk")
 	local c_mallornleaf = minetest.get_content_id("lottplants:mallorn_leaves")
 	local t = 6 + math.random(1) -- trunk height
 	for j = 0, t do
@@ -716,9 +749,9 @@ function lottmapgen.mirk_tree2(x, y, z, area, data)
 end
 
 function lottmapgen.pine_tree(x, y, z, area, data, snow)
-	local c_pinetree = minetest.get_content_id("lottplants:pinetree")
-	local c_pineleaf = minetest.get_content_id("lottplants:pineleaf")
-	local c_snow = minetest.get_content_id("default:snow")
+	local c_pinetree = minetest.get_content_id("lottplants:pine_trunk")
+	local c_pineleaf = minetest.get_content_id("lottplants:pine_needles")
+	local c_snow = minetest.get_content_id("lottitems:snow_layer")
 	if snow == false then
 		c_snow = minetest.get_content_id("air")
 	end
@@ -785,9 +818,9 @@ function lottmapgen.pine_bush(x, y, z, area, data)
 end
 
 function lottmapgen.fir_tree(x, y, z, area, data)
-	local c_pinetree = minetest.get_content_id("lottplants:pinetree")
-	local c_firleaf = minetest.get_content_id("lottplants:firleaf")
-	local c_snow = minetest.get_content_id("default:snow")
+	local c_pinetree = minetest.get_content_id("lottplants:pine_tree")
+	local c_firleaf = minetest.get_content_id("lottplants:pine_needles")
+	local c_snow = minetest.get_content_id("lottitems:snow_layer")
 	for j = -4, 13 do
 		if j == 3 or j == 6 or j == 9 or j == 12 then
 			for i = -2, 2 do
@@ -925,7 +958,7 @@ end
 -- Trees Big
 
 function lottmapgen.mallorn_tree(x, y, z, area, data)
-	local c_maltree = minetest.get_content_id("lottplants:mallorn_tree")
+	local c_maltree = minetest.get_content_id("lottplants:mallorn_trunk")
 	local c_malleaf = minetest.get_content_id("lottplants:mallorn_leaves")
 	local top = math.random(25, 30)
 	local mid = math.floor(top/2)
@@ -1004,8 +1037,8 @@ function lottmapgen.mallorn_tree(x, y, z, area, data)
 end
 
 function lottmapgen.beech_tree(x, y, z, area, data)
-	local c_tree = minetest.get_content_id("default:tree")
-	local c_beechleaf = minetest.get_content_id("lottplants:beechleaf")
+	local c_tree = minetest.get_content_id("lottplants:beech_trunk")
+	local c_beechleaf = minetest.get_content_id("lottplants:beech_leaves")
 	local t = 10 + math.random(3) -- trunk height
 	for i = -2, 2 do
 	for k = -2, 2 do

mods/lottplants/flowers.lua

@@ -1,5 +1,5 @@
 -- Function to make registering flowers easier!
-local function register_flower(name, def)	
+local function register_flower(name, def)
 	minetest.register_node("lottplants:" .. name, {
 		description = def.description or lott.str_to_desc(name),
 		drawtype = "plantlike",
@@ -81,4 +81,41 @@ register_flower("niphredil", {
 	groups = {white = 1, flower = 1, plant = 1, lorien = 1},
 })
 
+register_flower("bluebell", {
+	visual_scale = 0.75,
+	groups = {blue = 1, flower = 1, plant = 1},
+})
+
+register_flower("buttercup", {
+	visual_scale = 0.75,
+	groups = {yellow = 1, flower = 1, plant = 1},
+})
+
+register_flower("calla_black", {
+	visual_scale = 0.75,
+	groups = {black = 1, flower = 1, plant = 1},
+})
+
+register_flower("calla_white", {
+	visual_scale = 0.75,
+	groups = {white = 1, flower = 1, plant = 1},
+})
+
+register_flower("encyclia", {
+	groups = {black = 1, flower = 1, plant = 1},
+})
+
+-- Petuniae
+
+register_flower("petunia_white", {
+	groups = {white = 1, flower = 1, plant = 1},
+})
+
+register_flower("petunia_pink", {
+	groups = {pink = 1, flower = 1, plant = 1},
+})
+
+register_flower("petunia_blue", {
+	groups = {blue = 1, flower = 1, plant = 1},
+})
 

mods/lottplants/food.lua

@@ -0,0 +1,5 @@
+minetest.register_node("lottitems:apple", {
+	description = "Apple",
+	tiles = {"lottitems_apple.png"},
+	groups = {hand = 1, food = 2, plant = 1, red = 1},
+})

mods/lottplants/grass.lua

@@ -1,27 +1,61 @@
+local function register_grass(name, heights, def)
+	minetest.register_node("lottplants:" .. name .. "_" .. heights, {
+		description = lott.str_to_desc(name),
+		drawtype = "plantlike",
+		tiles = {"lottplants_" .. name .. "_" .. heights .. ".png"},
+		inventory_image = "lottplants_" .. name .. "_" .. heights .. ".png",
+		paramtype = "light",
+		paramtype2 = "meshoptions",
+		buildable_to = true,
+		walkable = false,
+		waving = 1,
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, -0.5, 0.5, -0.3125, 0.5},
+		},
+		groups = def.groups or {green = 1, grass = 1, plant = 1}
+	})
+
+	if def.groups then
+		def.groups["hidden"] = 1
+	end
+	for i = 1, heights - 1 do
+		minetest.register_node("lottplants:" .. name .. "_" .. i, {
+			description = lott.str_to_desc(name),
+			drawtype = "plantlike",
+			tiles = {"lottplants_" .. name .. "_" .. i .. ".png"},
+			inventory_image = "lottplants_" .. name .. "_" .. heights .. ".png",
+			paramtype = "light",
+			paramtype2 = "meshoptions",
+			buildable_to = true,
+			walkable = false,
+			waving = 1,
+			drop = "lottplants:" .. name .. "_" .. heights,
+			selection_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, -0.5, 0.5, -0.3125, 0.5},
+			},
+			groups = def.groups or {green = 1, grass = 1, plant = 1, hidden = 1}
+		})
+	end
+end
+
+-- Normal Grass
+
+register_grass("grass", 5, {})
+
 -- Lorien Grass
 
-minetest.register_node("lottplants:lorien_grass_1", {
-	description = "Lorien Grass",
-	drawtype = "plantlike",
-	tiles = {"lottplants_lorien_grass_1.png"},
-	inventory_image = "lottplants_lorien_grass_1.png",
-	paramtype = "light",
-	paramtype2 = "meshoptions",
-	buildable_to = true,
-	walkable = false,
-	waving = 1,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.3125, 0.5},
-	},
+register_grass("lorien_grass", 3, {
 	groups = {green = 1, grass = 1, plant = 1, lorien = 1}
 })
 
-minetest.register_node("lottplants:lorien_grass_2", {
-	description = "Lorien Grass",
+-- Mountain Grass
+minetest.register_node("lottplants:mountain_grass", {
+	description = "Mountain Grass",
 	drawtype = "plantlike",
-	tiles = {"lottplants_lorien_grass_2.png"},
-	inventory_image = "lottplants_lorien_grass_2.png",
+	tiles = {"lottplants_mountain_grass.png"},
+	inventory_image = "lottplants_mountain_grass.png",
 	paramtype = "light",
 	paramtype2 = "meshoptions",
 	buildable_to = true,
@@ -31,22 +65,5 @@ minetest.register_node("lottplants:lorien_grass_2", {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.3125, 0.5},
 	},
-	groups = {green = 1, grass = 1, plant = 1, lorien = 1}
-})
-
-minetest.register_node("lottplants:lorien_grass_3", {
-	description = "Lorien Grass",
-	drawtype = "plantlike",
-	tiles = {"lottplants_lorien_grass_3.png"},
-	inventory_image = "lottplants_lorien_grass_3.png",
-	paramtype = "light",
-	paramtype2 = "meshoptions",
-	buildable_to = true,
-	walkable = false,
-	waving = 1,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.3125, 0.5},
-	},
-	groups = {green = 1, grass = 1, plant = 1, lorien = 1}
+	groups = {green = 1, grass = 1, plant = 1}
 })

mods/lottplants/other_plants.lua

@@ -0,0 +1,5 @@
+minetest.register_node("lottitems:cactus", {
+	description = "Cactus",
+	tiles = {"lottitems_cactus_top.png", "lottitems_cactus_top.png", "lottitems_cactus.png"},
+	groups = {axe = 2, plant = 1, green = 1},
+})

mods/lottplants/textures/credits.txt

@@ -3,22 +3,43 @@ Copyright (C) 2014-2016 RHRhino
 Copyright (C) 2015-2016 Gambit
 Copyright (C) 2016 yyt16384
 Copyright (C) 2017 paramat
-	lottplants_dandelion_white.png
 	lottplants_dandelion_yellow.png
+	lottplants_dandelion_white.png
 	lottplants_geranium.png
 	lottplants_rose.png
 	lottplants_tulip.png
 	lottplants_violet.png
 Copyright (C) 2015 philipbenr
+	lottplants_birch_trunk.png
+	lottplants_birch_trunk_top.png
 	lottplants_mallorn_leaves.png
-	lottplants_mallorn_tree.png
-	lottplants_mallorn_tree_top.png
+	lottplants_mallorn_trunk.png
+	lottplants_mallorn_trunk_top.png
 	lottplants_mallorn_wood.png
-	
+Copyright (C) 2017 The ExtrabiomesXL Team
+(https://github.com/ExtrabiomesXL/ExtrabiomesXL)
+	lottplants_buttercup.png
+	lottplants_bluebell.png
+	lottplants_calla_black.png
+	lottplants_calla_white.png
+	lottplants_elm_trunk.png
+	lottplants_elm_trunk_top.png
+	lottplants_mountain_grass.png
+Copyright (C) 2017 tobyplowy
+(Taken from farlands: https://github.com/D00Med/farlands)
+	lottplants_petunia_blue.png
+	lottplants_petuina_pink.png
+	lottplants_petunia_white.png
+	lottplants_pine_needles.png
+	lottplants_pine_trunk.png
+	lottplants_pine_trunk_top.png
+	lottplants_pine_wood.png
+
 Botania License
 Copyright (C) 2017 Vazkii
 (Taken from the Botania Minecraft mod: https://botaniamod.net/)
 	lottplants_elanor.png
+	lottplants_encyclia.png
 	lottplants_lissuin_short.png
 	lottplants_lissuin_tall_bottom.png
 	lottplants_lissuin_tall_top.png
@@ -31,12 +52,16 @@ Copyright (C) 2016 tenplus1
 
 CC0
 Copyright (C) 2013 Cisoun
-	lottplants_jungle_tree.png (modified by Amaz)
-	lottplants_jungle_tree_top.png (modified by Amaz)
+	lottplants_jungle_trunk.png (modified by Amaz)
+	lottplants_jungle_trunk_top.png (modified by Amaz)
 	lottplants_oak_leaves.png
-	lottplants_oak_tree.png
-	lottplants_oak_tree_top.png
+	lottplants_oak_trunk.png
+	lottplants_oak_trunk_top.png
 Copyright (C) 2013 PlizAdam
 	lottplants_jungle_leaves.png
 	lottplants_jungle_wood.png
 	lottplants_wood.png
+Copyright (C) 2014 VanessaE
+	lottplants_grass_*.png
+
+Everything not mentioned here: CC BY-SA 3.0, Minetest: Third Age (Amaz & fishyWET)

mods/lottplants/trees/init.lua

@@ -1,7 +1,7 @@
--- Trees, and related things
+-- trunks, and related things
 
 --[[
-Young tree nbs:
+Young trunk nbs:
 1:
 	{-0.125, -0.5, -0.125, 0.125, 0.5, 0.125}, -- NodeBox1
 	{-0.0625, -0.5, -0.1875, 0.0625, 0.5, -0.125}, -- NodeBox2
@@ -14,10 +14,10 @@ Young tree nbs:
 ]]--
 
 
--- Normal
-minetest.register_node("lottplants:oak_tree", {
+-- Oak
+minetest.register_node("lottplants:oak_trunk", {
 	description = "Oak Trunk",
-	tiles = {"lottplants_oak_tree_top.png", "lottplants_oak_tree_top.png", "lottplants_oak_tree.png"},
+	tiles = {"lottplants_oak_trunk_top.png", "lottplants_oak_trunk_top.png", "lottplants_oak_trunk.png"},
 	paramtype2 = "facedir",
 	groups = {tree = 1, wood = 1, plant = 1, axe = 1},
 })
@@ -38,18 +38,117 @@ minetest.register_node("lottplants:oak_leaves", {
 	groups = {leaves = 1, plant = 1},
 })
 
+-- Apple
+
+minetest.register_node("lottplants:apple_trunk", {
+	description = "Apple Trunk",
+	tiles = {"lottplants_apple_trunk_top.png", "lottplants_apple_trunk_top.png", "lottplants_apple_trunk.png"},
+	paramtype2 = "facedir",
+	groups = {tree = 1, wood = 1, plant = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:apple_planks", {
+	description = "Apple Planks",
+	tiles = {"lottplants_apple_planks.png"},
+	paramtype2 = "facedir",
+	groups = {wood = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:apple_leaves", {
+	description = "Apple Leaves",
+	drawtype = "allfaces_optional",
+	tiles = {"lottplants_apple_leaves.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {leaves = 1, plant = 1},
+})
+
+-- Beech
+
+minetest.register_node("lottplants:beech_trunk", {
+	description = "Beech Trunk",
+	tiles = {"lottplants_beech_trunk_top.png", "lottplants_beech_trunk_top.png", "lottplants_beech_trunk.png"},
+	paramtype2 = "facedir",
+	groups = {tree = 1, wood = 1, plant = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:beech_planks", {
+	description = "Beech Planks",
+	tiles = {"lottplants_beech_planks.png"},
+	paramtype2 = "facedir",
+	groups = {wood = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:beech_leaves", {
+	description = "Beech Leaves",
+	drawtype = "allfaces_optional",
+	tiles = {"lottplants_beech_leaves.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {leaves = 1, plant = 1},
+})
+-- Birch
+
+minetest.register_node("lottplants:birch_trunk", {
+	description = "Birch Trunk",
+	tiles = {"lottplants_birch_trunk_top.png", "lottplants_birch_trunk_top.png", "lottplants_birch_trunk.png"},
+	paramtype2 = "facedir",
+	groups = {tree = 1, wood = 1, plant = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:birch_planks", {
+	description = "Birch Planks",
+	tiles = {"lottplants_birch_planks.png"},
+	paramtype2 = "facedir",
+	groups = {wood = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:birch_leaves", {
+	description = "Birch Leaves",
+	drawtype = "allfaces_optional",
+	tiles = {"lottplants_birch_leaves.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {leaves = 1, plant = 1},
+})
+
+-- Elm
+
+minetest.register_node("lottplants:elm_trunk", {
+	description = "Elm Trunk",
+	tiles = {"lottplants_elm_trunk_top.png", "lottplants_elm_trunk_top.png", "lottplants_elm_trunk.png"},
+	paramtype2 = "facedir",
+	groups = {tree = 1, wood = 1, plant = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:elm_planks", {
+	description = "Elm Planks",
+	tiles = {"lottplants_elm_planks.png"},
+	paramtype2 = "facedir",
+	groups = {wood = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:elm_leaves", {
+	description = "Elm Leaves",
+	drawtype = "allfaces_optional",
+	tiles = {"lottplants_elm_leaves.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {leaves = 1, plant = 1},
+})
+
 -- Mallorn
-minetest.register_node("lottplants:mallorn_tree", {
+minetest.register_node("lottplants:mallorn_trunk", {
 	description = "Mallorn Trunk",
-	tiles = {"lottplants_mallorn_tree_top.png", "lottplants_mallorn_tree_top.png", "lottplants_mallorn_tree.png"},
+	tiles = {"lottplants_mallorn_trunk_top.png", "lottplants_mallorn_trunk_top.png", "lottplants_mallorn_trunk.png"},
 	paramtype2 = "facedir",
 	groups = {tree = 1, wood = 1, plant = 1, axe = 4}
 })
 
-minetest.register_node("lottplants:young_mallorn_tree", {
+minetest.register_node("lottplants:young_mallorn_trunk", {
 	description = "Young Mallorn Trunk",
 	drawtype = "nodebox",
-	tiles = {"lottplants_mallorn_tree_top.png", "lottplants_mallorn_tree_top.png", "lottplants_mallorn_tree.png"},
+	tiles = {"lottplants_mallorn_trunk_top.png", "lottplants_mallorn_trunk_top.png", "lottplants_mallorn_trunk.png"},
 	paramtype = "light",
 	node_box = {
 		type = "fixed",
@@ -65,6 +164,13 @@ minetest.register_node("lottplants:young_mallorn_tree", {
 	groups = {tree = 1, wood = 1, plant = 1, axe = 4}
 })
 
+minetest.register_node("lottplants:mallorn_planks", {
+	description = "Mallorn Planks",
+	tiles = {"lottplants_mallorn_planks.png"},
+	paramtype2 = "facedir",
+	groups = {wood = 1, axe = 1},
+})
+
 minetest.register_node("lottplants:mallorn_leaves", {
 	description = "Mallorn Leaves",
 	drawtype = "allfaces_optional",
@@ -73,3 +179,28 @@ minetest.register_node("lottplants:mallorn_leaves", {
 	paramtype2 = "facedir",
 	groups = {leaves = 1, plant = 1},
 })
+
+-- Pine
+
+minetest.register_node("lottplants:pine_trunk", {
+	description = "Pine Trunk",
+	tiles = {"lottplants_pine_trunk_top.png", "lottplants_pine_trunk_top.png", "lottplants_pine_trunk.png"},
+	paramtype2 = "facedir",
+	groups = {tree = 1, wood = 1, plant = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:pine_planks", {
+	description = "Pine Planks",
+	tiles = {"lottplants_pine_planks.png"},
+	paramtype2 = "facedir",
+	groups = {wood = 1, axe = 1},
+})
+
+minetest.register_node("lottplants:pine_needles", {
+	description = "Pine Needles",
+	drawtype = "allfaces_optional",
+	tiles = {"lottplants_pine_needles.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {leaves = 1, plant = 1},
+})

mods/lottplayer/init.lua

@@ -132,7 +132,7 @@ end)
 -- Default player appearance
 lottplayer.register_model("lottplayer_base_character.b3d", {
 	animation_speed = 30,
-	textures = {"man_skin1.png", "blank.png", "blank.png", "blank.png"},
+	textures = {"man_rhun.png", "blank.png", "blank.png", "blank.png"},
 	animations = {
 		stand     = {x = 0,   y = 79},
 		lay       = {x = 162, y = 166},
@@ -147,7 +147,7 @@ lottplayer.register_model("lottplayer_base_character.b3d", {
 
 lottplayer.register_model("lottplayer_dwarf_character.b3d", {
 	animation_speed = 30,
-	textures = {"man_skin1.png", "blank.png", "blank.png", "blank.png"},
+	textures = {"dwarf_misty_mountains.png", "blank.png", "blank.png", "blank.png"},
 	animations = {
 		stand     = {x = 0,   y = 79},
 		lay       = {x = 162, y = 166},