Skip to content

Commit

Permalink
Add desert/silver sandstone-related blocks. (#1596)
Browse files Browse the repository at this point in the history
Add desert and silver sand-related blocks, and stairs.
  • Loading branch information
kaeza authored and sofar committed Mar 7, 2017
1 parent 496521f commit 1d45b27
Show file tree
Hide file tree
Showing 11 changed files with 200 additions and 10 deletions.
10 changes: 10 additions & 0 deletions mods/default/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
82 changes: 73 additions & 9 deletions mods/default/crafting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
})

Expand Down
2 changes: 2 additions & 0 deletions mods/default/license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
56 changes: 55 additions & 1 deletion mods/default/nodes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"},
Expand All @@ -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",
Expand Down
Binary file added mods/default/textures/default_desert_sandstone.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/default/textures/default_silver_sandstone.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions mods/stairs/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 1d45b27

Please sign in to comment.