Fix stair redundancy; +help for inner/outer stairs

1 files changed, 77 insertions, 95 deletions

diff --git a/helptexts.lua b/helptexts.lua
index 954f458..1b25ae1 100644
--- a/helptexts.lua
+++ b/helptexts.lua
@@ -35,6 +35,8 @@ local slabuse = S("To place a low slab, place it on the floor or the bottom half
 
 local stairdesc = S("Stairs are useful to reach higher places by walking over them; jumping is not required. Stairs can be placed upside-down, too.")
 local stairuse = S("To place this block normally, place it on the floor or at the lower half of the side of a block. To place it upside-down, place it at a ceiling or the upper half of the side of a block.")
+local innerstairdesc = S("Inner stairs are useful to reach higher places by walking without jumping. They are most useful to complement normal stairs at inner corners. They can be placed upside-down, too.")
+local outerstairdesc = S("Outer stairs are useful to reach higher places by walking without jumping. They are most useful to complement normal stairs at outer corners. They can be placed upside-down, too.")
 
 local signdesc = S("A sign is placed at walls. Players can write something on it.")
 local signuse = S("Point to the sign to reveal its message. Right-click the sign to edit the text.")
@@ -296,76 +298,14 @@ local export_longdesc = {
 	["walls:cobble"] = walldesc .. "\n" .. S("Cobblestone walls will slowly turn into mossy cobblestone walls when they're near water (or any other block in the @1 group).", groupname_water),
 	["walls:desertcobble"] = walldesc,
 	["walls:mossycobble"] = walldesc .. "\n" .. S("A mossy cobblestone wall is created when a cobblestone wall is near water (or any other block in the @1 group) for a while.", groupname_water),
-	["stairs:slab_wood"] = slabdesc,
-	["stairs:slab_junglewood"] = slabdesc,
-	["stairs:slab_pine_wood"] = slabdesc,
-	["stairs:slab_acacia_wood"] = slabdesc,
-	["stairs:slab_aspen_wood"] = slabdesc,
-	["stairs:slab_stone"] = slabdesc,
 	["stairs:slab_cobble"] = slabdesc .. "\n" .. S("A cobblestone slab will slowly turn into a mossy cobblestone slab when it is near water (or any other block in the @1 group).", groupname_water),
 	["stairs:slab_mossycobble"] = slabdesc .. "\n" .. S("A mossy cobblestone slab is created when a cobblestone slab is near water (or any other block in the @1 group) for a while.", groupname_water),
-	["stairs:slab_desert_cobble"] = slabdesc,
-	["stairs:slab_desert_stone"] = slabdesc,
-	["stairs:slab_stonebrick"] = slabdesc,
-	["stairs:slab_sandstone"] = slabdesc,
-	["stairs:slab_sandstonebrick"] = slabdesc,
-	["stairs:slab_desert_sandstone"] = slabdesc,
-	["stairs:slab_desert_sandstone_block"] = slabdesc,
-	["stairs:slab_desert_sandstone_brick"] = slabdesc,
-	["stairs:slab_silver_sandstone"] = slabdesc,
-	["stairs:slab_silver_sandstone_block"] = slabdesc,
-	["stairs:slab_silver_sandstone_brick"] = slabdesc,
-	["stairs:slab_ice"] = slabdesc,
-	["stairs:slab_snowblock"] = slabdesc,
-	["stairs:slab_desert_stonebrick"] = slabdesc,
-	["stairs:slab_obsidian"] = slabdesc,
-	["stairs:slab_obsidianbrick"] = slabdesc,
-	["stairs:slab_brick"] = slabdesc,
-	["stairs:slab_straw"] = slabdesc,
-	["stairs:slab_steelblock"] = slabdesc,
-	["stairs:slab_tinblock"] = slabdesc,
-	["stairs:slab_copperblock"] = slabdesc,
-	["stairs:slab_bronzeblock"] = slabdesc,
-	["stairs:slab_goldblock"] = slabdesc,
-	["stairs:slab_stone_block"] = slabdesc,
-	["stairs:slab_desert_stone_block"] = slabdesc,
-	["stairs:slab_sandstone_block"] = slabdesc,
-	["stairs:slab_obsidian_block"] = slabdesc,
-	["stairs:stair_wood"] = stairdesc,
-	["stairs:stair_junglewood"] = stairdesc,
-	["stairs:stair_pine_wood"] = stairdesc,
-	["stairs:stair_acacia_wood"] = stairdesc,
-	["stairs:stair_aspen_wood"] = stairdesc,
-	["stairs:stair_stone"] = stairdesc,
 	["stairs:stair_cobble"] = stairdesc .. "\n" .. S("A cobblestone stair will slowly turn into a mossy cobblestone stair when it is near water or any other block in the @1 group.", groupname_water),
 	["stairs:stair_mossycobble"] = stairdesc .. "\n" .. S("A mossy cobblestone stair is created when a cobblestone stair is near water (or any other block in the @1 group) for a while.", groupname_water),
-	["stairs:stair_desert_cobble"] = stairdesc,
-	["stairs:stair_desert_stone"] = stairdesc,
-	["stairs:stair_stonebrick"] = stairdesc,
-	["stairs:stair_sandstone"] = stairdesc,
-	["stairs:stair_sandstonebrick"] = stairdesc,
-	["stairs:stair_desert_sandstone"] = stairdesc,
-	["stairs:stair_desert_sandstone_block"] = stairdesc,
-	["stairs:stair_desert_sandstone_brick"] = stairdesc,
-	["stairs:stair_silver_sandstone"] = stairdesc,
-	["stairs:stair_silver_sandstone_block"] = stairdesc,
-	["stairs:stair_silver_sandstone_brick"] = stairdesc,
-	["stairs:stair_ice"] = stairdesc,
-	["stairs:stair_snowblock"] = stairdesc,
-	["stairs:stair_desert_stonebrick"] = stairdesc,
-	["stairs:stair_obsidian"] = stairdesc,
-	["stairs:stair_obsidianbrick"] = stairdesc,
-	["stairs:stair_brick"] = stairdesc,
-	["stairs:stair_straw"] = stairdesc,
-	["stairs:stair_steelblock"] = stairdesc,
-	["stairs:stair_tinblock"] = stairdesc,
-	["stairs:stair_copperblock"] = stairdesc,
-	["stairs:stair_bronzeblock"] = stairdesc,
-	["stairs:stair_goldblock"] = stairdesc,
-	["stairs:stair_stone_block"] = stairdesc,
-	["stairs:stair_desert_stone_block"] = stairdesc,
-	["stairs:stair_sandstone_block"] = stairdesc,
-	["stairs:stair_obsidian_block"] = stairdesc,
+	["stairs:stair_inner_cobble"] = innerstairdesc .. "\n" .. S("An inner cobblestone stair will slowly turn into an inner mossy cobblestone stair when it is near water or any other block in the @1 group.", groupname_water),
+	["stairs:stair_inner_mossycobble"] = innerstairdesc .. "\n" .. S("An inner mossy cobblestone stair is created when an inner cobblestone stair is near water (or any other block in the @1 group) for a while.", groupname_water),
+	["stairs:stair_outer_cobble"] = outerstairdesc .. "\n" .. S("An outer cobblestone stair will slowly turn into an outer mossy cobblestone stair when it is near water or any other block in the @1 group.", groupname_water),
+	["stairs:stair_outer_mossycobble"] = outerstairdesc .. "\n" .. S("An outer mossy cobblestone stair is created when an outer cobblestone stair is near water (or any other block in the @1 group) for a while.", groupname_water),
 	["farming:hoe_wood"] = hoedesc,
 	["farming:hoe_stone"] = hoedesc,
 	["farming:hoe_steel"] = hoedesc,
@@ -554,37 +494,8 @@ local export_usagehelp = {
 	["default:key"] = S("Wield the key and right-click on a locked thing to attempt to access it. If the key fits, you perform the action (e.g. you open a door). If it doesn't fit, the key does nothing."),
 	["default:skeleton_key"] = S("Go to the locked thing you own to match the key for. Punch it to turn the skeleton key into a key and permanently match it to the locked thing. Any player who possesses this key can now access the locked thing you have selected—but only this! Note that you don't need keys for the things you own. If the locked thing has been removed, the key will stop working."),
 
-	["stairs:slab_wood"] = slabuse,
-	["stairs:slab_junglewood"] = slabuse,
-	["stairs:slab_pine_wood"] = slabuse,
-	["stairs:slab_acacia_wood"] = slabuse,
-	["stairs:slab_aspen_wood"] = slabuse,
-	["stairs:slab_stone"] = slabuse,
 	["stairs:slab_cobble"] = slabuse .. "\n" .. S("A cobblestone slab will slowly turn into a mossy cobblestone slab when it is near water (or any other block in the @1 group).", groupname_water),
 	["stairs:slab_mossycobble"] = slabuse .. "\n" .. S("A mossy cobblestone slab is created when a cobblestone slab is near water (or any other block in the @1 group) for a while.", groupname_water),
-	["stairs:slab_desert_cobble"] = slabuse,
-	["stairs:slab_desert_stone"] = slabuse,
-	["stairs:slab_stonebrick"] = slabuse,
-	["stairs:slab_sandstone"] = slabuse,
-	["stairs:slab_sandstonebrick"] = slabuse,
-	["stairs:slab_desert_sandstone"] = slabuse,
-	["stairs:slab_desert_sandstone_block"] = slabuse,
-	["stairs:slab_desert_sandstone_brick"] = slabuse,
-	["stairs:slab_silver_sandstone"] = slabuse,
-	["stairs:slab_silver_sandstone_block"] = slabuse,
-	["stairs:slab_silver_sandstone_brick"] = slabuse,
-	["stairs:slab_ice"] = slabuse,
-	["stairs:slab_snowblock"] = slabuse,
-	["stairs:slab_desert_stonebrick"] = slabuse,
-	["stairs:slab_obsidian"] = slabuse,
-	["stairs:slab_obsidianbrick"] = slabuse,
-	["stairs:slab_brick"] = slabuse,
-	["stairs:slab_straw"] = slabuse,
-	["stairs:slab_steelblock"] = slabuse,
-	["stairs:slab_tinblock"] = slabuse,
-	["stairs:slab_copperblock"] = slabuse,
-	["stairs:slab_bronzeblock"] = slabuse,
-	["stairs:slab_goldblock"] = slabuse,
 }
 
 local export_uses = {
@@ -599,6 +510,77 @@ local export_uses = {
 	["fire:flint_and_steel"] = 66,
 }
 
+-- Stair/slab help texts
+local stairslab_materials = {
+	"wood",
+	"junglewood",
+	"pine_wood",
+	"acacia_wood",
+	"aspen_wood",
+	"stone",
+	"stone_block",
+	"cobble",
+	"mossycobble",
+	"desert_cobble",
+	"desert_stone",
+	"desert_stone_block",
+	"stonebrick",
+	"sandstone",
+	"sandstonebrick",
+	"sandstone_block",
+	"desert_sandstone",
+	"desert_sandstone_block",
+	"desert_sandstone_brick",
+	"silver_sandstone",
+	"silver_sandstone_block",
+	"silver_sandstone_brick",
+	"ice",
+	"snowblock",
+	"desert_stonebrick",
+	"obsidian",
+	"obsidianbrick",
+	"obsidian_block",
+	"brick",
+	"straw",
+	"steelblock",
+	"tinblock",
+	"copperblock",
+	"bronzeblock",
+	"goldblock",
+}
+for m=1, #stairslab_materials do
+	local mat = stairslab_materials[m]
+	local stair = "stairs:stair_"..mat
+	local stair_inner = "stairs:stair_inner_"..mat
+	local stair_outer = "stairs:stair_outer_"..mat
+	local slab = "stairs:slab_"..mat
+	if not export_longdesc[stair] then
+		export_longdesc[stair] = stairdesc
+	end
+	if not export_longdesc[stair_inner] then
+		export_longdesc[stair_inner] = innerstairdesc
+	end
+	if not export_longdesc[stair_outer] then
+		export_longdesc[stair_outer] = outerstairdesc
+	end
+	if not export_longdesc[slab] then
+		export_longdesc[slab] = slabdesc
+	end
+
+	if not export_usagehelp[stair] then
+		export_usagehelp[stair] = stairuse
+	end
+	if not export_usagehelp[stair_inner] then
+		export_usagehelp[stair_inner] = stairuse
+	end
+	if not export_usagehelp[stair_outer] then
+		export_usagehelp[stair_outer] = stairuse
+	end
+	if not export_usagehelp[slab] then
+		export_usagehelp[slab] = slabuse
+	end
+end
+
 for itemstring, longdesc in pairs(export_longdesc) do
 	if minetest.registered_items[itemstring] ~= nil then
 		minetest.override_item(itemstring, { _doc_items_longdesc = longdesc } )