Stairs: Code cleanup, fix various errors

Improve registration format
Fix groups not matching corresponding full node
Improve some descriptions
This commit is contained in:
paramat 2016-06-26 03:57:30 +01:00
parent 22dc7b2d9e
commit 983af7b1c0
1 changed files with 236 additions and 158 deletions

View File

@ -256,8 +256,8 @@ end
-- Stair/slab registration function. -- Stair/slab registration function.
-- Nodes will be called stairs:{stair,slab}_<subname> -- Nodes will be called stairs:{stair,slab}_<subname>
function stairs.register_stair_and_slab(subname, recipeitem, groups, images, function stairs.register_stair_and_slab(subname, recipeitem,
desc_stair, desc_slab, sounds) groups, images, desc_stair, desc_slab, sounds)
stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds) stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds)
stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds) stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds)
end end
@ -265,184 +265,262 @@ end
-- Register default stairs and slabs -- Register default stairs and slabs
stairs.register_stair_and_slab("wood", "default:wood", stairs.register_stair_and_slab(
{snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, "wood",
"default:wood",
{choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
{"default_wood.png"}, {"default_wood.png"},
"Wooden Stair", "Wooden Stair",
"Wooden Slab", "Wooden Slab",
default.node_sound_wood_defaults()) default.node_sound_wood_defaults()
)
stairs.register_stair_and_slab("junglewood", "default:junglewood", stairs.register_stair_and_slab(
{snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, "junglewood",
"default:junglewood",
{choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
{"default_junglewood.png"}, {"default_junglewood.png"},
"Junglewood Stair", "Jungle Wood Stair",
"Junglewood Slab", "Jungle Wood Slab",
default.node_sound_wood_defaults()) default.node_sound_wood_defaults()
)
stairs.register_stair_and_slab("pine_wood", "default:pine_wood", stairs.register_stair_and_slab(
{snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, "pine_wood",
"default:pine_wood",
{choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
{"default_pine_wood.png"}, {"default_pine_wood.png"},
"Pine Wood Stair", "Pine Wood Stair",
"Pine Wood Slab", "Pine Wood Slab",
default.node_sound_wood_defaults()) default.node_sound_wood_defaults()
)
stairs.register_stair_and_slab("acacia_wood", "default:acacia_wood", stairs.register_stair_and_slab(
{snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, "acacia_wood",
"default:acacia_wood",
{choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
{"default_acacia_wood.png"}, {"default_acacia_wood.png"},
"Acacia Wood Stair", "Acacia Wood Stair",
"Acacia Wood Slab", "Acacia Wood Slab",
default.node_sound_wood_defaults()) default.node_sound_wood_defaults()
)
stairs.register_stair_and_slab("aspen_wood", "default:aspen_wood", stairs.register_stair_and_slab(
{snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, "aspen_wood",
"default:aspen_wood",
{choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
{"default_aspen_wood.png"}, {"default_aspen_wood.png"},
"Aspen Wood Stair", "Aspen Wood Stair",
"Aspen Wood Slab", "Aspen Wood Slab",
default.node_sound_wood_defaults()) default.node_sound_wood_defaults()
)
stairs.register_stair_and_slab("stone", "default:stone", stairs.register_stair_and_slab(
"stone",
"default:stone",
{cracky = 3}, {cracky = 3},
{"default_stone.png"}, {"default_stone.png"},
"Stone Stair", "Stone Stair",
"Stone Slab", "Stone Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("cobble", "default:cobble", stairs.register_stair_and_slab(
"cobble",
"default:cobble",
{cracky = 3}, {cracky = 3},
{"default_cobble.png"}, {"default_cobble.png"},
"Cobblestone Stair", "Cobblestone Stair",
"Cobblestone Slab", "Cobblestone Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("mossycobble", nil, stairs.register_stair_and_slab(
"mossycobble",
nil,
{cracky = 3}, {cracky = 3},
{"default_mossycobble.png"}, {"default_mossycobble.png"},
"Mossy Cobblestone Stair", "Mossy Cobblestone Stair",
"Mossy Cobblestone Slab", "Mossy Cobblestone Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("stonebrick", "default:stonebrick", stairs.register_stair_and_slab(
{cracky = 3}, "stonebrick",
"default:stonebrick",
{cracky = 2},
{"default_stone_brick.png"}, {"default_stone_brick.png"},
"Stone Brick Stair", "Stone Brick Stair",
"Stone Brick Slab", "Stone Brick Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("stone_block", "default:stone_block", stairs.register_stair_and_slab(
"stone_block",
"default:stone_block",
{cracky = 2}, {cracky = 2},
{"default_stone_block.png"}, {"default_stone_block.png"},
"Stone Block Stair", "Stone Block Stair",
"Stone Block Slab", "Stone Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("desert_stone", "default:desert_stone", stairs.register_stair_and_slab(
"desert_stone",
"default:desert_stone",
{cracky = 3}, {cracky = 3},
{"default_desert_stone.png"}, {"default_desert_stone.png"},
"Desertstone Stair", "Desert Stone Stair",
"Desertstone Slab", "Desert Stone Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("desert_cobble", "default:desert_cobble", stairs.register_stair_and_slab(
"desert_cobble",
"default:desert_cobble",
{cracky = 3}, {cracky = 3},
{"default_desert_cobble.png"}, {"default_desert_cobble.png"},
"Desert Cobblestone Stair", "Desert Cobblestone Stair",
"Desert Cobblestone Slab", "Desert Cobblestone Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("desert_stonebrick", "default:desert_stonebrick", stairs.register_stair_and_slab(
{cracky = 3}, "desert_stonebrick",
"default:desert_stonebrick",
{cracky = 2},
{"default_desert_stone_brick.png"}, {"default_desert_stone_brick.png"},
"Desert Stone Brick Stair", "Desert Stone Brick Stair",
"Desert Stone Brick Slab", "Desert Stone Brick Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("desert_stone_block", "default:desert_stone_block", stairs.register_stair_and_slab(
"desert_stone_block",
"default:desert_stone_block",
{cracky = 2}, {cracky = 2},
{"default_desert_stone_block.png"}, {"default_desert_stone_block.png"},
"Desert Stone Block Stair", "Desert Stone Block Stair",
"Desert Stone Block Slab", "Desert Stone Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("sandstone", "default:sandstone", stairs.register_stair_and_slab(
"sandstone",
"default:sandstone",
{crumbly = 1, cracky = 3}, {crumbly = 1, cracky = 3},
{"default_sandstone.png"}, {"default_sandstone.png"},
"Sandstone Stair", "Sandstone Stair",
"Sandstone Slab", "Sandstone Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("sandstonebrick", "default:sandstonebrick", stairs.register_stair_and_slab(
"sandstonebrick",
"default:sandstonebrick",
{cracky = 2}, {cracky = 2},
{"default_sandstone_brick.png"}, {"default_sandstone_brick.png"},
"Sandstone Brick Stair", "Sandstone Brick Stair",
"Sandstone Brick Slab", "Sandstone Brick Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("sandstone_block", "default:sandstone_block", stairs.register_stair_and_slab(
"sandstone_block",
"default:sandstone_block",
{cracky = 2}, {cracky = 2},
{"default_sandstone_block.png"}, {"default_sandstone_block.png"},
"Sandstone Block Stair", "Sandstone Block Stair",
"Sandstone Block Slab", "Sandstone Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("obsidian", "default:obsidian", stairs.register_stair_and_slab(
"obsidian",
"default:obsidian",
{cracky = 1, level = 2}, {cracky = 1, level = 2},
{"default_obsidian.png"}, {"default_obsidian.png"},
"Obsidian Stair", "Obsidian Stair",
"Obsidian Slab", "Obsidian Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("obsidianbrick", "default:obsidianbrick", stairs.register_stair_and_slab(
"obsidianbrick",
"default:obsidianbrick",
{cracky = 1, level = 2}, {cracky = 1, level = 2},
{"default_obsidian_brick.png"}, {"default_obsidian_brick.png"},
"Obsidian Brick Stair", "Obsidian Brick Stair",
"Obsidian Brick Slab", "Obsidian Brick Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("obsidian_block", "default:obsidian_block", stairs.register_stair_and_slab(
"obsidian_block",
"default:obsidian_block",
{cracky = 1, level = 2}, {cracky = 1, level = 2},
{"default_obsidian_block.png"}, {"default_obsidian_block.png"},
"Obsidian Block Stair", "Obsidian Block Stair",
"Obsidian Block Slab", "Obsidian Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("brick", "default:brick", stairs.register_stair_and_slab(
"brick",
"default:brick",
{cracky = 3}, {cracky = 3},
{"default_brick.png"}, {"default_brick.png"},
"Brick Stair", "Brick Stair",
"Brick Slab", "Brick Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("straw", "farming:straw", stairs.register_stair_and_slab(
"straw",
"farming:straw",
{snappy = 3, flammable = 4}, {snappy = 3, flammable = 4},
{"farming_straw.png"}, {"farming_straw.png"},
"Straw Stair", "Straw Stair",
"Straw Slab", "Straw Slab",
default.node_sound_leaves_defaults()) default.node_sound_leaves_defaults()
)
stairs.register_stair_and_slab("steelblock", "default:steelblock", stairs.register_stair_and_slab(
"steelblock",
"default:steelblock",
{cracky = 1, level = 2}, {cracky = 1, level = 2},
{"default_steel_block.png"}, {"default_steel_block.png"},
"Steel Block Stair", "Steel Block Stair",
"Steel Block Slab", "Steel Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("copperblock", "default:copperblock", stairs.register_stair_and_slab(
"copperblock",
"default:copperblock",
{cracky = 1, level = 2}, {cracky = 1, level = 2},
{"default_copper_block.png"}, {"default_copper_block.png"},
"Copper Block Stair", "Copper Block Stair",
"Copper Block Slab", "Copper Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("bronzeblock", "default:bronzeblock", stairs.register_stair_and_slab(
"bronzeblock",
"default:bronzeblock",
{cracky = 1, level = 2}, {cracky = 1, level = 2},
{"default_bronze_block.png"}, {"default_bronze_block.png"},
"Bronze Block Stair", "Bronze Block Stair",
"Bronze Block Slab", "Bronze Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)
stairs.register_stair_and_slab("goldblock", "default:goldblock", stairs.register_stair_and_slab(
"goldblock",
"default:goldblock",
{cracky = 1}, {cracky = 1},
{"default_gold_block.png"}, {"default_gold_block.png"},
"Gold Block Stair", "Gold Block Stair",
"Gold Block Slab", "Gold Block Slab",
default.node_sound_stone_defaults()) default.node_sound_stone_defaults()
)