Default: Add savanna nodes, textures, crafting and fuels

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 9474e455303488aed9f7e67b464c766057e15b82..d48d5e03c7aae35501bb55aa060896e4f1cd953e 100644 (file)
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -57,7 +57,6 @@ VanessaE (WTFPL):
   default_nc_front.png
   default_nc_rb.png
   default_nc_side.png
-  default_grass_*.png
   default_desert_sand.png
   default_desert_stone.png
   default_desert_stone_brick.png
@@ -104,7 +103,7 @@ Zeg9 (CC BY-SA 3.0):
   default_gold_block.png
 
 paramat (CC BY-SA 3.0):
-  wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0)
+  wieldhand.png, derived from character.png by Jordach (CC BY-SA 3.0)
   default_pinetree.png
   default_pinetree_top.png
   default_pinewood.png
@@ -113,6 +112,14 @@ paramat (CC BY-SA 3.0):
   default_river_water.png
   default_river_water_source_animated.png
   default_river_water_flowing_animated.png
+  default_acacia_leaves.png
+  default_acacia_sapling.png
+  default_acacia_tree.png
+  default_acacia_tree_top.png
+  default_acacia_wood.png
+  default_dry_grass.png
+  default_dry_grass_side.png
+  default_dry_grass_*.png
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
@@ -151,6 +158,18 @@ Philipbenr (CC BY-SA 3.0):
   default_grass.png
   default_grass_side.png
 
+Gambit (WTFPL):
+  default_bronze_ingot.png
+  default_copper_ingot.png
+  default_copper_lump.png
+  default_iron_lump.png
+  default_gold_lump.png
+  default_clay_lump.png
+  default_coal.png
+  default_grass_*.png
+  default_paper.png
+  default_diamond_block.png
+
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/
@@ -190,15 +209,3 @@ Mito551 (sounds) (CC BY-SA):
   default_dirt_footstep.1.ogg
   default_dirt_footstep.2.ogg
   default_glass_footstep.ogg
-
-Gambit (WTFPL):
-  default_bronze_ingot.png
-  default_copper_ingot.png
-  default_copper_lump.png
-  default_iron_lump.png
-  default_gold_lump.png
-  default_clay_lump.png
-  default_coal.png
-  default_grass_*.png
-  default_paper.png
-  default_diamond_block.png

diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 354efa464ff2e1a8ab258cbc84cdcc5bc5c33f00..304b20322f3bac426c36be65f1517a4fd6c94e43 100644 (file)
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -21,6 +21,13 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = 'default:acacia_wood 4',
+       recipe = {
+               {'default:acacia_tree'},
+       }
+})
+
 minetest.register_craft({
        output = 'default:stick 4',
        recipe = {
@@ -796,7 +803,7 @@ minetest.register_craft({
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:sapling",
+       recipe = "group:sapling",
        burntime = 10,
 })
 
@@ -818,12 +825,6 @@ minetest.register_craft({
        burntime = 370,
 })
 
-minetest.register_craft({
-       type = "fuel",
-       recipe = "default:junglesapling",
-       burntime = 10,
-})
-
 minetest.register_craft({
        type = "fuel",
        recipe = "default:grass_1",
@@ -832,7 +833,7 @@ minetest.register_craft({
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:pine_sapling",
-       burntime = 10,
+       recipe = "default:dry_grass_1",
+       burntime = 2,
 })
 

diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index 426e27c46eaf0a6e8566c8999c69a79c3d72abb2..6cd254560b711057554839811179561d53134a69 100644 (file)
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -328,7 +328,7 @@ minetest.register_abm({
 })
 
 minetest.register_abm({
-       nodenames = {"default:dirt_with_grass"},
+       nodenames = {"default:dirt_with_grass", "default:dirt_with_dry_grass"},
        interval = 2,
        chance = 20,
        action = function(pos, node)

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 0796db51319d170953c1c406ee518b2f08d9e06b..0df41df21fe122a68b417c7b23f4b4ace5bb69d0 100644 (file)
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -27,6 +27,7 @@ Soft / Non-Stone
 
 default:dirt
 default:dirt_with_grass
+default:dirt_with_dry_grass
 default:dirt_with_grass_footsteps
 default:dirt_with_snow
 
@@ -62,6 +63,11 @@ default:pinewood
 default:pine_needles
 default:pine_sapling
 
+default:acacia_tree
+default:acacia_wood
+default:acacia_leaves
+default:acacia_sapling
+
 Ores
 ----
 (1. In stone 2. Block)
@@ -91,12 +97,19 @@ default:cactus
 default:papyrus
 default:dry_shrub
 default:junglegrass
+
 default:grass_1
 default:grass_2
 default:grass_3
 default:grass_4
 default:grass_5
 
+default:dry_grass_1
+default:dry_grass_2
+default:dry_grass_3
+default:dry_grass_4
+default:dry_grass_5
+
 Liquids
 -------
 (1. Source 2. Flowing)
@@ -259,6 +272,19 @@ minetest.register_node("default:dirt_with_grass", {
        }),
 })
 
+minetest.register_node("default:dirt_with_dry_grass", {
+       description = "Dirt with Dry Grass",
+       tiles = {"default_dry_grass.png",
+               "default_dirt.png",
+               "default_dirt.png^default_dry_grass_side.png"
+       },
+       groups = {crumbly = 3, soil = 1},
+       drop = 'default:dirt',
+       sounds = default.node_sound_dirt_defaults({
+               footstep = {name = "default_grass_footstep", gain = 0.4},
+       }),
+})
+
 minetest.register_node("default:dirt_with_grass_footsteps", {
        description = "Dirt with Grass and Footsteps",
        tiles = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
@@ -536,10 +562,14 @@ minetest.register_node("default:junglesapling", {
 
 minetest.register_node("default:pinetree", {
        description = "Pine Tree",
-       tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"},
+       tiles = {
+               "default_pinetree_top.png",
+               "default_pinetree_top.png",
+               "default_pinetree.png"
+       },
        paramtype2 = "facedir",
        is_ground_content = false,
-       groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+       groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
        sounds = default.node_sound_wood_defaults(),
 
        on_place = minetest.rotate_node
@@ -549,7 +579,7 @@ minetest.register_node("default:pinewood", {
        description = "Pinewood Planks",
        tiles = {"default_pinewood.png"},
        is_ground_content = false,
-       groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
        sounds = default.node_sound_wood_defaults(),
 })
 
@@ -561,20 +591,12 @@ minetest.register_node("default:pine_needles",{
        waving = 1,
        paramtype = "light",
        is_ground_content = false,
-       groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
+       groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
        drop = {
                max_items = 1,
                items = {
-                       {
-                               -- player will get sapling with 1/20 chance
-                               items = {"default:pine_sapling"},
-                               rarity = 20,
-                       },
-                       {
-                               -- player will get leaves only if he get no saplings,
-                               -- this is because max_items is 1
-                               items = {"default:pine_needles"},
-                       }
+                       {items = {"default:pine_sapling"}, rarity = 20},
+                       {items = {"default:pine_needles"}}
                }
        },
        sounds = default.node_sound_leaves_defaults(),
@@ -590,12 +612,86 @@ minetest.register_node("default:pine_sapling", {
        inventory_image = "default_pine_sapling.png",
        wield_image = "default_pine_sapling.png",
        paramtype = "light",
+       sunlight_propagates = true,
        walkable = false,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
        },
-       groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
+       groups = {
+               snappy = 2,
+               dig_immediate = 3,
+               flammable = 2,
+               attached_node = 1,
+               sapling = 1
+       },
+       sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_node("default:acacia_tree", {
+       description = "Acacia Tree",
+       tiles = {
+               "default_acacia_tree_top.png",
+               "default_acacia_tree_top.png",
+               "default_acacia_tree.png"
+       },
+       paramtype2 = "facedir",
+       is_ground_content = false,
+       groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+       sounds = default.node_sound_wood_defaults(),
+
+       on_place = minetest.rotate_node
+})
+
+minetest.register_node("default:acacia_wood", {
+       description = "Acacia Wood Planks",
+       tiles = {"default_acacia_wood.png"},
+       is_ground_content = false,
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+       sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:acacia_leaves", {
+       description = "Acacia Leaves",
+       drawtype = "allfaces_optional",
+       visual_scale = 1.3,
+       tiles = {"default_acacia_leaves.png"},
+       paramtype = "light",
+       is_ground_content = false,
+       groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {"default:acacia_sapling"}, rarity = 20},
+                       {items = {"default:acacia_leaves"}}
+               }
+       },
+       sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = default.after_place_leaves,
+})
+
+minetest.register_node("default:acacia_sapling", {
+       description = "Acacia Tree Sapling",
+       drawtype = "plantlike",
+       visual_scale = 1.0,
+       tiles = {"default_acacia_sapling.png"},
+       inventory_image = "default_acacia_sapling.png",
+       wield_image = "default_acacia_sapling.png",
+       paramtype = "light",
+       sunlight_propagates = true,
+       walkable = false,
+       selection_box = {
+               type = "fixed",
+               fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
+       },
+       groups = {
+               snappy = 2,
+               dig_immediate = 3,
+               flammable = 2,
+               attached_node = 1,
+               sapling = 1
+       },
        sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -848,6 +944,34 @@ for i=2,5 do
        })
 end
 
+for i = 1, 5 do
+       minetest.register_node("default:dry_grass_"..i, {
+               description = "Dry Grass",
+               drawtype = "plantlike",
+               waving = 1,
+               tiles = {"default_dry_grass_"..i..".png"},
+               inventory_image = "default_dry_grass_"..i..".png",
+               wield_image = "default_dry_grass_"..i..".png",
+               paramtype = "light",
+               sunlight_propagates = true,
+               walkable = false,
+               buildable_to = true,
+               groups = {
+                       snappy = 3,
+                       flammable = 3,
+                       flora = 1,
+                       attached_node = 1,
+                       not_in_creative_inventory = 1
+               },
+               drop = "default:dry_grass_1",
+               sounds = default.node_sound_leaves_defaults(),
+               selection_box = {
+                       type = "fixed",
+                       fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+               },
+       })
+end
+
 --
 -- Liquids
 --

diff --git a/mods/default/textures/default_acacia_leaves.png b/mods/default/textures/default_acacia_leaves.png
new file mode 100644 (file)
index 0000000..626e1b3
Binary files /dev/null and b/mods/default/textures/default_acacia_leaves.png differ

diff --git a/mods/default/textures/default_acacia_sapling.png b/mods/default/textures/default_acacia_sapling.png
new file mode 100644 (file)
index 0000000..07170a0
Binary files /dev/null and b/mods/default/textures/default_acacia_sapling.png differ

diff --git a/mods/default/textures/default_acacia_tree.png b/mods/default/textures/default_acacia_tree.png
new file mode 100644 (file)
index 0000000..169823d
Binary files /dev/null and b/mods/default/textures/default_acacia_tree.png differ

diff --git a/mods/default/textures/default_acacia_tree_top.png b/mods/default/textures/default_acacia_tree_top.png
new file mode 100644 (file)
index 0000000..2cf5ef0
Binary files /dev/null and b/mods/default/textures/default_acacia_tree_top.png differ

diff --git a/mods/default/textures/default_acacia_wood.png b/mods/default/textures/default_acacia_wood.png
new file mode 100644 (file)
index 0000000..b5abf1e
Binary files /dev/null and b/mods/default/textures/default_acacia_wood.png differ

diff --git a/mods/default/textures/default_dry_grass.png b/mods/default/textures/default_dry_grass.png
new file mode 100644 (file)
index 0000000..03455c3
Binary files /dev/null and b/mods/default/textures/default_dry_grass.png differ

diff --git a/mods/default/textures/default_dry_grass_1.png b/mods/default/textures/default_dry_grass_1.png
new file mode 100644 (file)
index 0000000..5cf68a3
Binary files /dev/null and b/mods/default/textures/default_dry_grass_1.png differ

diff --git a/mods/default/textures/default_dry_grass_2.png b/mods/default/textures/default_dry_grass_2.png
new file mode 100644 (file)
index 0000000..c925ace
Binary files /dev/null and b/mods/default/textures/default_dry_grass_2.png differ

diff --git a/mods/default/textures/default_dry_grass_3.png b/mods/default/textures/default_dry_grass_3.png
new file mode 100644 (file)
index 0000000..4e4d84e
Binary files /dev/null and b/mods/default/textures/default_dry_grass_3.png differ

diff --git a/mods/default/textures/default_dry_grass_4.png b/mods/default/textures/default_dry_grass_4.png
new file mode 100644 (file)
index 0000000..d315849
Binary files /dev/null and b/mods/default/textures/default_dry_grass_4.png differ

diff --git a/mods/default/textures/default_dry_grass_5.png b/mods/default/textures/default_dry_grass_5.png
new file mode 100644 (file)
index 0000000..871d04c
Binary files /dev/null and b/mods/default/textures/default_dry_grass_5.png differ

diff --git a/mods/default/textures/default_dry_grass_side.png b/mods/default/textures/default_dry_grass_side.png
new file mode 100644 (file)
index 0000000..27f4d96
Binary files /dev/null and b/mods/default/textures/default_dry_grass_side.png differ