From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 12 Oct 2016 23:48:56 +0000 (+0100)
Subject: Default: Add bush stem and leaves nodes
X-Git-Tag: 0.4.15~64
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=048aaa2616e25ee15cd04a0d50f1a61ff2bdcd38;p=oweals%2Fminetest_game.git

Default: Add bush stem and leaves nodes

To allow mapgen bushes in green-grass and savanna grasslands.
Nodes for a generic bush and an acacia bush.
Stem nodes are craftable to a single wood node to provide a small
amount of wood resource in grasslands.
Fuel times are that of corresponding 'wood' nodes, 1/4 that of
corresponding tree nodes.
No leafdecay to enable use as hedges or without a nearby tree trunk.
Uses 'default leaves simple' texture for extra visual thickness.
---

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 9ae2c002..19901674 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -92,6 +92,8 @@ paramat (CC BY-SA 3.0):
   default_acacia_tree.png
   default_acacia_tree_top.png
   default_acacia_wood.png
+  default_acacia_bush_stem.png
+  default_bush_stem.png
   default_junglewood.png
   default_jungletree_top.png
   default_sandstone_brick.png
diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 7ce62d2b..a7a0daa2 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -35,6 +35,20 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:wood',
+	recipe = {
+		{'default:bush_stem'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:acacia_wood',
+	recipe = {
+		{'default:acacia_bush_stem'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
@@ -929,6 +943,18 @@ minetest.register_craft({
 })
 
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:bush_stem",
+	burntime = 7,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:acacia_bush_stem",
+	burntime = 8,
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:junglegrass",
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index f185bde3..23b91454 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -131,6 +131,11 @@ default:dry_grass_3
 default:dry_grass_4
 default:dry_grass_5
 
+default:bush_stem
+default:bush_leaves
+default:acacia_bush_stem
+default:acacia_bush_leaves
+
 Corals
 ------
 
@@ -1216,6 +1221,55 @@ for i = 2, 5 do
 end
 
 
+minetest.register_node("default:bush_stem", {
+	description = "Bush Stem",
+	drawtype = "plantlike",
+	visual_scale = 1.18,
+	tiles = {"default_bush_stem.png"},
+	inventory_image = "default_bush_stem.png",
+	wield_image = "default_bush_stem.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	groups = {choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:bush_leaves", {
+	description = "Bush Leaves",
+	drawtype = "allfaces_optional",
+	waving = 1,
+	visual_scale = 1.3,
+	tiles = {"default_leaves_simple.png"},
+	paramtype = "light",
+	groups = {snappy = 3, flammable = 2, leaves = 1},
+	sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_node("default:acacia_bush_stem", {
+	description = "Acacia Bush Stem",
+	drawtype = "plantlike",
+	visual_scale = 1.18,
+	tiles = {"default_acacia_bush_stem.png"},
+	inventory_image = "default_acacia_bush_stem.png",
+	wield_image = "default_acacia_bush_stem.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	groups = {choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:acacia_bush_leaves", {
+	description = "Acacia Bush Leaves",
+	drawtype = "allfaces_optional",
+	waving = 1,
+	visual_scale = 1.3,
+	tiles = {"default_acacia_leaves.png"},
+	paramtype = "light",
+	groups = {snappy = 3, flammable = 2, leaves = 1},
+	sounds = default.node_sound_leaves_defaults(),
+})
+
+
 --
 -- Corals
 --
diff --git a/mods/default/textures/default_acacia_bush_stem.png b/mods/default/textures/default_acacia_bush_stem.png
new file mode 100644
index 00000000..29039152
Binary files /dev/null and b/mods/default/textures/default_acacia_bush_stem.png differ
diff --git a/mods/default/textures/default_bush_stem.png b/mods/default/textures/default_bush_stem.png
new file mode 100644
index 00000000..18b615f7
Binary files /dev/null and b/mods/default/textures/default_bush_stem.png differ