nalc
/
tsm_pyramids
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken desert stone pyramid trap

This commit is contained in:
Wuzzy 2019-08-20 20:36:50 +02:00
parent 461326ad32
commit 7b0c42954f
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
room.lua
View File

@ -542,58 +542,54 @@ local layout_traps_template = {
local code_sandstone = { local code_sandstone = {
[" "] = "air", [" "] = "air",
["s"] = "sandstone", ["s"] = "default:sandstone",
["S"] = "sandstonebrick", ["S"] = "default:sandstonebrick",
["1"] = "deco_stone1", ["1"] = "tsm_pyramids:deco_stone1",
["2"] = "deco_stone2", ["2"] = "tsm_pyramids:deco_stone2",
["3"] = "deco_stone3", ["3"] = "tsm_pyramids:deco_stone3",
["^"] = "chest", ["^"] = "default:chest",
["<"] = "chest", ["<"] = "default:chest",
[">"] = "chest", [">"] = "default:chest",
["v"] = "chest", ["v"] = "default:chest",
["~"] = "lava_source", ["~"] = "default:lava_source",
["t"] = "trap", ["t"] = "tsm_pyramids:trap",
} }
local code_desert_sandstone = table.copy(code_sandstone) local code_desert_sandstone = table.copy(code_sandstone)
code_desert_sandstone["s"] = "desert_sandstone" code_desert_sandstone["s"] = "default:desert_sandstone"
code_desert_sandstone["1"] = "deco_stone4" code_desert_sandstone["1"] = "tsm_pyramids:deco_stone4"
code_desert_sandstone["2"] = "deco_stone5" code_desert_sandstone["2"] = "tsm_pyramids:deco_stone5"
code_desert_sandstone["3"] = "deco_stone6" code_desert_sandstone["3"] = "tsm_pyramids:deco_stone6"
code_desert_sandstone["S"] = "desert_sandstone_brick" code_desert_sandstone["S"] = "default:desert_sandstone_brick"
code_desert_sandstone["t"] = "desert_trap" code_desert_sandstone["t"] = "tsm_pyramids:desert_trap"
local code_desert_stone = table.copy(code_sandstone) local code_desert_stone = table.copy(code_sandstone)
code_desert_stone["s"] = "desert_stone_block" code_desert_stone["s"] = "default:desert_stone_block"
code_desert_stone["1"] = "desert_stone_block" code_desert_stone["1"] = "default:desert_stone_block"
code_desert_stone["2"] = "desert_stone_block" code_desert_stone["2"] = "default:desert_stone_block"
code_desert_stone["3"] = "desert_stone_block" code_desert_stone["3"] = "default:desert_stone_block"
code_desert_stone["S"] = "desert_stonebrick" code_desert_stone["S"] = "default:desert_stonebrick"
-- TODO: test -- TODO: Add desert stone trap?
code_desert_stone["t"] = "air" code_desert_stone["t"] = "air"
local function replace(str, iy, code_table, deco, column_style) local function replace(str, iy, code_table, deco, column_style)
local out = "default:"
if iy < 4 and (str == "<" or str == ">" or str == "^" or str == "v") then str = " " end if iy < 4 and (str == "<" or str == ">" or str == "^" or str == "v") then str = " " end
if column_style == 1 or column_style == 2 then if column_style == 1 or column_style == 2 then
if iy == 0 and str == "s" then out = "tsm_pyramids:" str = deco[1] end if iy == 0 and str == "s" then str = deco[1] end
if iy == 3 and str == "s" then out = "tsm_pyramids:" str = deco[2] end if iy == 3 and str == "s" then str = deco[2] end
elseif column_style == 3 then elseif column_style == 3 then
if iy == 0 and str == "s" then out = "tsm_pyramids:" str = deco[1] end if iy == 0 and str == "s" then str = deco[1] end
if iy == 2 and str == "s" then out = "tsm_pyramids:" str = deco[2] end if iy == 2 and str == "s" then str = deco[2] end
elseif column_style == 4 then elseif column_style == 4 then
if iy == 2 and str == "s" then out = "tsm_pyramids:" str = deco[1] end if iy == 2 and str == "s" then str = deco[1] end
end end
if str == " " then out = "" end return code_table[str]
return out..code_table[str]
end end
local function replace2(str, iy, code_table) local function replace2(str, iy, code_table)
local out = "default:" if iy == 0 and str == "~" then str = "t"
if iy == 0 and str == "~" then out = "tsm_pyramids:" str = "t"
elseif iy < 3 and str == "~" then str = " " end elseif iy < 3 and str == "~" then str = " " end
if str == " " then out = "" end return code_table[str]
return out..code_table[str]
end end
function tsm_pyramids.make_room(pos, stype, room_id) function tsm_pyramids.make_room(pos, stype, room_id)