Ethereal NG 1.20 release for minetest 0.4.14

1 files changed, 114 insertions, 114 deletions

diff --git a/leaves.lua b/leaves.lua
index 92273b8..ab42122 100644
--- a/leaves.lua
+++ b/leaves.lua
@@ -1,55 +1,66 @@
--- Leaf style (set in init.lua file)
-if ethereal.leaftype == 0 then
-	leaftype = "plantlike"
-else
+
+-- set leaftype (value inside init.lua)
+local leaftype = "plantlike"
+
+if ethereal.leaftype ~= 0 then
 	leaftype = "allfaces_optional"
 end
 
---= Define leaves for ALL trees (and Mushroom Tops)
+-- default apple tree leaves
+minetest.override_item("default:leaves", {
+	drawtype = leaftype,
+	visual_scale = 1.2,
+	inventory_image = "default_leaves.png",
+	wield_image = "default_leaves.png",
+	walkable = ethereal.leafwalk,
+})
 
--- Acacia Leaves
-if not minetest.registered_nodes["default:acacia_leaves"] then
-minetest.register_node("ethereal:acacia_leaves", {
-	description = "Acacia Leaves",
+-- default jungle tree leaves
+minetest.override_item("default:jungleleaves", {
 	drawtype = leaftype,
-	tiles = {"moretrees_acacia_leaves.png"},
-	inventory_image = "moretrees_acacia_leaves.png",
-	wield_image = "moretrees_acacia_leaves.png",
-	paramtype = "light",
+	visual_scale = 1.2,
+	inventory_image = "default_jungleleaves.png",
+	wield_image = "default_jungleleaves.png",
 	walkable = ethereal.leafwalk,
+})
+
+-- default pine tree leaves
+minetest.override_item("default:pine_needles", {
+	drawtype = leaftype,
 	visual_scale = 1.2,
-	waving = 1,
-	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
+	inventory_image = "default_pine_needles.png",
+	wield_image = "default_pine_needles.png",
+	walkable = ethereal.leafwalk,
 	drop = {
 		max_items = 1,
 		items = {
-			{items = {"ethereal:acacia_sapling"}, rarity = 20},
-			{items = {"ethereal:acacia_leaves"}}
+			{items = {"default:pine_sapling"}, rarity = 20},
+			{items = {"ethereal:pine_nuts"}, rarity = 5},
+			{items = {"default:pine_needles"}}
 		}
 	},
-	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
 })
-else
+
+-- default acacia tree leaves
 minetest.override_item("default:acacia_leaves", {
 	drawtype = leaftype,
-	tiles = {"moretrees_acacia_leaves.png"},
-	inventory_image = "moretrees_acacia_leaves.png",
-	wield_image = "moretrees_acacia_leaves.png",
+--	tiles = {"moretrees_acacia_leaves.png"},
+	inventory_image = "default_acacia_leaves.png",
+	wield_image = "default_acacia_leaves.png",
+	visual_scale = 1.2,
+	walkable = ethereal.leafwalk,
+})
+
+-- default aspen tree leaves
+minetest.override_item("default:aspen_leaves", {
+	drawtype = leaftype,
+	inventory_image = "default_aspen_leaves.png",
+	wield_image = "default_aspen_leaves.png",
 	visual_scale = 1.2,
 	walkable = ethereal.leafwalk,
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"ethereal:acacia_sapling"}, rarity = 20},
-			{items = {"default:acacia_leaves"}}
-		}
-	},
 })
-minetest.register_alias("ethereal:acacia_leaves", "default:acacia_leaves")
-end
 
--- Willow Twig
+-- willow twig
 minetest.register_node("ethereal:willow_twig", {
 	description = "Willow Twig",
 	drawtype = "plantlike",
@@ -72,7 +83,7 @@ minetest.register_node("ethereal:willow_twig", {
 	after_place_node = default.after_place_leaves,
 })
 
--- Redwood leaves
+-- redwood leaves
 minetest.register_node("ethereal:redwood_leaves", {
 	description = "Redwood Leaves",
 	drawtype = leaftype,
@@ -95,23 +106,7 @@ minetest.register_node("ethereal:redwood_leaves", {
 	after_place_node = default.after_place_leaves,
 })
 
--- Default Apple Tree Leaves
-minetest.override_item("default:leaves", {
-	drawtype = leaftype,
-	visual_scale = 1.2,
-	inventory_image = "default_leaves.png",
-	wield_image = "default_leaves.png",
-	walkable = ethereal.leafwalk,
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"ethereal:tree_sapling"}, rarity = 15},
-			{items = {"default:leaves"}}
-		}
-	},
-})
-
--- Orange Tree Leaves
+-- orange tree leaves
 minetest.register_node("ethereal:orange_leaves", {
 	description = "Orange Leaves",
 	drawtype = leaftype,
@@ -134,23 +129,7 @@ minetest.register_node("ethereal:orange_leaves", {
 	after_place_node = default.after_place_leaves,
 })
 
--- Default Jungle Tree Leaves
-minetest.override_item("default:jungleleaves", {
-	drawtype = leaftype,
-	visual_scale = 1.2,
-	inventory_image = "default_jungleleaves.png",
-	wield_image = "default_jungleleaves.png",
-	walkable = ethereal.leafwalk,
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"ethereal:jungle_tree_sapling"}, rarity = 20},
-			{items = {"default:jungleleaves"}}
-		}
-	},
-})
-
--- Banana Tree Leaves
+-- banana tree leaves
 minetest.register_node("ethereal:bananaleaves", {
 	description = "Banana Leaves",
 	drawtype = leaftype,
@@ -165,7 +144,7 @@ minetest.register_node("ethereal:bananaleaves", {
 	drop = {
 		max_items = 1,
 		items = {
-			{items = {"ethereal:banana_tree_sapling"}, rarity = 15},
+			{items = {"ethereal:banana_tree_sapling"}, rarity = 10},
 			{items = {"ethereal:bananaleaves"}}
 		}
 	},
@@ -173,7 +152,7 @@ minetest.register_node("ethereal:bananaleaves", {
 	after_place_node = default.after_place_leaves,
 })
 
--- Healing Tree Leaves
+-- healing tree leaves
 minetest.register_node("ethereal:yellowleaves", {
 	description = "Healing Tree Leaves",
 	drawtype = leaftype,
@@ -192,14 +171,14 @@ minetest.register_node("ethereal:yellowleaves", {
 			{items = {"ethereal:yellowleaves"}}
 		}
 	},
-	-- Leaves are edible, heal half a heart
+	-- one leaf heals half a heart when eaten
 	on_use = minetest.item_eat(1),
 	sounds = default.node_sound_leaves_defaults(),
 	after_place_node = default.after_place_leaves,
 	light_source = 9,
 })
 
--- Palm Tree Leaves
+-- palm tree leaves
 minetest.register_node("ethereal:palmleaves", {
 	description = "Palm Leaves",
 	drawtype = leaftype,
@@ -222,7 +201,7 @@ minetest.register_node("ethereal:palmleaves", {
 	after_place_node = default.after_place_leaves,
 })
 
--- Birch Tree Leaves
+-- birch tree leaves
 minetest.register_node("ethereal:birch_leaves", {
 	description = "Birch Leaves",
 	drawtype = leaftype,
@@ -245,50 +224,54 @@ minetest.register_node("ethereal:birch_leaves", {
 	after_place_node = default.after_place_leaves,
 })
 
--- Pine Tree Leaves
-minetest.override_item("default:pine_needles", {
+-- frost tree leaves
+minetest.register_node("ethereal:frost_leaves", {
+	description = "Frost Leaves",
 	drawtype = leaftype,
 	visual_scale = 1.2,
-	tiles = {"pine_leaves.png"},
-	inventory_image = "pine_leaves.png",
-	wield_image = "pine_leaves.png",
+	tiles = {"ethereal_frost_leaves.png"},
+	inventory_image = "ethereal_frost_leaves.png",
+	wield_image = "ethereal_frost_leaves.png",
+	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	waving = 1,
+	groups = {snappy = 3, leafdecay = 3, leaves = 1, puts_out_fire = 1},
 	drop = {
 		max_items = 1,
 		items = {
-			{items = {"ethereal:pine_tree_sapling"}, rarity = 20},
-			{items = {"ethereal:pine_nuts"}, rarity = 5},
-			{items = {"default:pine_needles"}}
+			{items = {"ethereal:frost_tree_sapling"}, rarity = 15},
+			{items = {"ethereal:frost_leaves"}}
 		}
 	},
+	light_source = 9,
+	sounds = default.node_sound_leaves_defaults(),
+	after_place_node = default.after_place_leaves,
 })
-minetest.register_alias("ethereal:pineleaves", "default:pine_needles")
 
--- Frost Tree Leaves
-minetest.register_node("ethereal:frost_leaves", {
-	description = "Frost Leaves",
+-- bamboo stalk leaves
+minetest.register_node("ethereal:bamboo_leaves", {
+	description = "Bamboo Leaves",
 	drawtype = leaftype,
 	visual_scale = 1.2,
-	tiles = {"ethereal_frost_leaves.png"},
-	inventory_image = "ethereal_frost_leaves.png",
-	wield_image = "ethereal_frost_leaves.png",
+	tiles = {"bamboo_leaves.png"},
+	inventory_image = "bamboo_leaves.png",
+	wield_image = "bamboo_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
-	groups = {snappy = 3, leafdecay = 3, leaves = 1, puts_out_fire = 1},
+	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {
 		max_items = 1,
 		items = {
-			{items = {"ethereal:frost_tree_sapling"}, rarity = 15},
-			{items = {"ethereal:frost_leaves"}}
+			{items = {"ethereal:bamboo_sprout"}, rarity = 10},
+			{items = {"ethereal:bamboo_leaves"}}
 		}
 	},
-	light_source = 9,
 	sounds = default.node_sound_leaves_defaults(),
 	after_place_node = default.after_place_leaves,
 })
 
--- Mushroom Tops
+-- mushroom tops
 minetest.register_node("ethereal:mushroom", {
 	description = "Mushroom Cap",
 	tiles = {"mushroom_block.png"},
@@ -309,7 +292,7 @@ minetest.register_craft({
 	burntime = 10,
 })
 
--- Mushroom Pore (Spongelike block inside mushrooms that has special properties)
+-- mushroom pore (spongelike material found inside giant shrooms)
 minetest.register_node("ethereal:mushroom_pore", {
 	description = "Mushroom Pore",
 	tiles = {"mushroom_pore.png"},
@@ -320,7 +303,7 @@ minetest.register_node("ethereal:mushroom_pore", {
 	sounds = default.node_sound_dirt_defaults(),
 })
 
--- Hedge Block
+-- hedge block
 minetest.register_node("ethereal:bush", {
 	description = "Bush",
 	tiles = {"ethereal_bush.png"},
@@ -333,30 +316,47 @@ minetest.register_craft({
 	output = "ethereal:bush",
 	recipe = {
 		{"group:leaves", "group:leaves", "group:leaves"},
+		{"group:leaves", "ethereal:bamboo_leaves", "group:leaves"},
 		{"group:leaves", "group:leaves", "group:leaves"},
+	}
+})
+
+-- bush block #2
+minetest.register_node("ethereal:bush2", {
+	drawtype = "allfaces_optional",
+	description = "Bush #2",
+	tiles = {"default_aspen_leaves.png"},
+	paramtype = "light",
+	walkable = true,
+	groups = {snappy = 3, flammable = 2},
+	sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_craft({
+	output = "ethereal:bush2",
+	recipe = {
+		{"group:leaves", "group:leaves", "group:leaves"},
+		{"group:leaves", "default:aspen_leaves", "group:leaves"},
 		{"group:leaves", "group:leaves", "group:leaves"},
 	}
 })
 
--- Bamboo Leaves
-minetest.register_node("ethereal:bamboo_leaves", {
-	description = "Bamboo Leaves",
-	drawtype = leaftype,
-	visual_scale = 1.2,
-	tiles = {"bamboo_leaves.png"},
-	inventory_image = "bamboo_leaves.png",
-	wield_image = "bamboo_leaves.png",
+-- bush block #3
+minetest.register_node("ethereal:bush3", {
+	drawtype = "allfaces_optional",
+	description = "Bush #3",
+	tiles = {"default_pine_needles.png"},
 	paramtype = "light",
-	walkable = ethereal.leafwalk,
-	waving = 1,
-	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"ethereal:bamboo_sprout"}, rarity = 10},
-			{items = {"ethereal:bamboo_leaves"}}
-		}
-	},
+	walkable = true,
+	groups = {snappy = 3, flammable = 2},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+})
+
+minetest.register_craft({
+	output = "ethereal:bush3",
+	recipe = {
+		{"group:leaves", "group:leaves", "group:leaves"},
+		{"group:leaves", "default:pine_needles", "group:leaves"},
+		{"group:leaves", "group:leaves", "group:leaves"},
+	}
 })