Add desert/silver sandstone-related blocks. (#1596)

Add desert and silver sand-related blocks, and stairs.

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 342a8c4feda4c4756df9864da9c751502e2077fd..1ca66e4ed24cca20abfd862f4edc672f6bc64d05 100644 (file)
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -202,6 +202,16 @@ npx (CC BY-SA 3.0)
   default_rainforest_litter.png
   default_rainforest_litter_side.png
 
+GreenXenith (CC-BY-SA 3.0):
+  default_silver_sandstone.png
+  default_silver_sandstone_brick.png
+  default_silver_sandstone_block.png
+
+kaeza (CC-BY-SA 3.0):
+  default_desert_sandstone.png
+  default_desert_sandstone_brick.png
+  default_desert_sandstone_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/

diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index ce27bb4202d510c2bfade7bb7cd5b4943d61c103..b360ddcfdd7bb9ea8920cfd523e4d749fc360196 100644 (file)
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -503,26 +503,90 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-       output = 'default:sand 4',
+       output = "default:sand 4",
        recipe = {
-               {'default:sandstone'},
+               {"default:sandstone"},
        }
 })
 
 minetest.register_craft({
-       output = 'default:sandstonebrick 4',
+       output = "default:sandstonebrick 4",
        recipe = {
-               {'default:sandstone', 'default:sandstone'},
-               {'default:sandstone', 'default:sandstone'},
+               {"default:sandstone", "default:sandstone"},
+               {"default:sandstone", "default:sandstone"},
        }
 })
 
 minetest.register_craft({
-       output = 'default:sandstone_block 9',
+       output = "default:sandstone_block 9",
        recipe = {
-               {'default:sandstone', 'default:sandstone', 'default:sandstone'},
-               {'default:sandstone', 'default:sandstone', 'default:sandstone'},
-               {'default:sandstone', 'default:sandstone', 'default:sandstone'},
+               {"default:sandstone", "default:sandstone", "default:sandstone"},
+               {"default:sandstone", "default:sandstone", "default:sandstone"},
+               {"default:sandstone", "default:sandstone", "default:sandstone"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:desert_sandstone",
+       recipe = {
+               {"default:desert_sand", "default:desert_sand"},
+               {"default:desert_sand", "default:desert_sand"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:desert_sand 4",
+       recipe = {
+               {"default:desert_sandstone"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:desert_sandstone_brick 4",
+       recipe = {
+               {"default:desert_sandstone", "default:desert_sandstone"},
+               {"default:desert_sandstone", "default:desert_sandstone"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:desert_sandstone_block 9",
+       recipe = {
+               {"default:desert_sandstone", "default:desert_sandstone", "default:desert_sandstone"},
+               {"default:desert_sandstone", "default:desert_sandstone", "default:desert_sandstone"},
+               {"default:desert_sandstone", "default:desert_sandstone", "default:desert_sandstone"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:silver_sandstone",
+       recipe = {
+               {"default:silver_sand", "default:silver_sand"},
+               {"default:silver_sand", "default:silver_sand"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:silver_sand 4",
+       recipe = {
+               {"default:silver_sandstone"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:silver_sandstone_brick 4",
+       recipe = {
+               {"default:silver_sandstone", "default:silver_sandstone"},
+               {"default:silver_sandstone", "default:silver_sandstone"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:silver_sandstone_block 9",
+       recipe = {
+               {"default:silver_sandstone", "default:silver_sandstone", "default:silver_sandstone"},
+               {"default:silver_sandstone", "default:silver_sandstone", "default:silver_sandstone"},
+               {"default:silver_sandstone", "default:silver_sandstone", "default:silver_sandstone"},
        }
 })
 

diff --git a/mods/default/license.txt b/mods/default/license.txt
index e9267366aa65aeb2452fafc7a4e9bd49bfb7ab6c..09e4225f0a6a9c027fba42fd84d969fcdac98841 100644 (file)
--- a/mods/default/license.txt
+++ b/mods/default/license.txt
@@ -41,6 +41,8 @@ Copyright (C) 2010-2016:
   asl97
   KevDoy
   Mito551
+  GreenXenith
+  kaeza
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 82a97c652535c3c0e38b8e8392054357c269d951..34136cb3325169180ec78a988824246ce16da0a4 100644 (file)
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -30,6 +30,12 @@ default:desert_stone_block
 default:sandstone
 default:sandstonebrick
 default:sandstone_block
+default:desert_sandstone
+default:desert_sandstone_brick
+default:desert_sandstone_block
+default:silver_sandstone
+default:silver_sandstone_brick
+default:silver_sandstone_block
 
 default:obsidian
 default:obsidianbrick
@@ -275,7 +281,6 @@ minetest.register_node("default:desert_stone_block", {
        sounds = default.node_sound_stone_defaults(),
 })
 
-
 minetest.register_node("default:sandstone", {
        description = "Sandstone",
        tiles = {"default_sandstone.png"},
@@ -301,6 +306,55 @@ minetest.register_node("default:sandstone_block", {
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_sandstone", {
+       description = "Desert Sandstone",
+       tiles = {"default_desert_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_brick", {
+       description = "Desert Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_desert_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_block", {
+       description = "Desert Sandstone Block",
+       tiles = {"default_desert_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone", {
+       description = "Silver Sandstone",
+       tiles = {"default_silver_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_brick", {
+       description = "Silver Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_silver_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_block", {
+       description = "Silver Sandstone Block",
+       tiles = {"default_silver_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
 
 minetest.register_node("default:obsidian", {
        description = "Obsidian",

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

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

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

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

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

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

diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index 191c78df961be7913c0a441c5525497f87e744d9..86dadf97e4785a4b4595a794ac7fcac2ccbdc087 100644 (file)
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -444,6 +444,66 @@ stairs.register_stair_and_slab(
        default.node_sound_stone_defaults()
 )
 
+stairs.register_stair_and_slab(
+       "desert_sandstone",
+       "default:desert_sandstone",
+       {crumbly = 1, cracky = 3},
+       {"default_desert_sandstone.png"},
+       "Desert Sandstone Stair",
+       "Desert Sandstone Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "desert_sandstone_brick",
+       "default:desert_sandstone_brick",
+       {cracky = 2},
+       {"default_desert_sandstone_brick.png"},
+       "Desert Sandstone Brick Stair",
+       "Desert Sandstone Brick Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "desert_sandstone_block",
+       "default:desert_sandstone_block",
+       {cracky = 2},
+       {"default_desert_sandstone_block.png"},
+       "Desert Sandstone Block Stair",
+       "Desert Sandstone Block Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "silver_sandstone",
+       "default:silver_sandstone",
+       {crumbly = 1, cracky = 3},
+       {"default_silver_sandstone.png"},
+       "Silver Sandstone Stair",
+       "Silver Sandstone Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "silver_sandstone_brick",
+       "default:silver_sandstone_brick",
+       {cracky = 2},
+       {"default_silver_sandstone_brick.png"},
+       "Silver Sandstone Brick Stair",
+       "Silver Sandstone Brick Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "silver_sandstone_block",
+       "default:silver_sandstone_block",
+       {cracky = 2},
+       {"default_silver_sandstone_block.png"},
+       "Silver Sandstone Block Stair",
+       "Silver Sandstone Block Slab",
+       default.node_sound_stone_defaults()
+)
+
 stairs.register_stair_and_slab(
        "obsidian",
        "default:obsidian",