nalc/moreblocks
1
0
Fork 0
forked from minetest-mods/moreblocks
Code Issues Pull Requests Releases Wiki Activity

Fix slab descriptions.

Browse Source 
A regression caused the description of slabs to revert to the source block's description.  This commit fixes the regression and adds descriptions which were missing for the recently added slabs (two_sides, three_sides, and three_sides_u).

Closes minetest-mods/moreblocks#96
This commit is contained in:
Foz 2017-12-21 14:02:01 -05:00 committed by sofar
parent 6f1ee946a0
commit d91da8b442
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
stairsplus/slabs.lua
View File

@ -66,30 +66,25 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
local defs = stairsplus.copytable(slabs_defs) local defs = stairsplus.copytable(slabs_defs)
local desc_base = S("%s Slab"):format(fields.description) local desc_base = S("%s Slab"):format(fields.description)
for alternate, shape in pairs(defs) do for alternate, shape in pairs(defs) do
local def = {} local def = {}
if type(shape) ~= "table" then
def = {
node_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, (shape/16)-0.5, 0.5},
},
description = ("%s (%d/16)"):format(desc_base, shape)
}
else
def = {
node_box = {
type = "fixed",
fixed = shape,
},
description = desc_base
}
end
for k, v in pairs(fields) do for k, v in pairs(fields) do
def[k] = v def[k] = v
end end
if type(shape) ~= "table" then
def.node_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, (shape/16)-0.5, 0.5},
}
def.description = ("%s (%d/16)"):format(desc_base, shape)
else
def.node_box = {
type = "fixed",
fixed = shape,
}
local desc_x = alternate:gsub("_", " ")
desc_x = desc_x:gsub("(%a)(%S*)", function(a, b) return a:upper() .. b end)
def.description = desc_base .. desc_x
end
def.drawtype = "nodebox" def.drawtype = "nodebox"
def.paramtype = "light" def.paramtype = "light"