walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'dev' into shops

This commit is contained in:
Linus Probert 2019-03-04 16:06:58 +01:00
parent 68f44090ed ca41520c06
commit bab5fd7980
3 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
data/layoutparser.lua
View File

@ -152,7 +152,7 @@ function module.load_textures(map)
fences = { fences = {
topleft = { t_fence, nil, 0, yoffset, true }, topleft = { t_fence, nil, 0, yoffset, true },
top = { t_fence, nil, 16, yoffset, true }, top = { t_fence, nil, 16, yoffset, true },
single = { t_wall, nil, 16, yoffset + 16, true }, single = { t_fence, nil, 16, yoffset + 16, true },
topright = { t_fence, nil, 32, yoffset, true }, topright = { t_fence, nil, 32, yoffset, true },
left = { t_fence, nil, 0, yoffset + 16, true }, left = { t_fence, nil, 0, yoffset + 16, true },
bottomleft = { t_fence, nil, 0, yoffset + 32, true }, bottomleft = { t_fence, nil, 0, yoffset + 32, true },
@ -166,21 +166,11 @@ function module.load_textures(map)
} }
end end
function module.add_pits_to_room(room) function draw_layout_to_room(room, matrix)
--if CURRENT_LEVEL < 2 or random(5) ~= 1 then
--return false
--end
local matrix = readLayoutFile("walllayouts.dat")
--local matrix = readLayoutFile("pitlayouts.dat")
-- Chose a random layout -- Chose a random layout
matrix = matrix[random(#matrix)] matrix = matrix[random(#matrix)]
for i=2,13 do for i=2,13 do
for j=2,10 do for j=2,10 do
if matrix[i][j] ~= nil then
io.write("" .. matrix[i][j])
end
if matrix[i][j] == "p" then if matrix[i][j] == "p" then
setPitTile(room, matrix, i, j); setPitTile(room, matrix, i, j);
elseif matrix[i][j] == "#" then elseif matrix[i][j] == "#" then
@ -189,9 +179,24 @@ function module.add_pits_to_room(room)
setBlockTile(room, matrix, i, j, fences, "f", true) setBlockTile(room, matrix, i, j, fences, "f", true)
end end
end end
print("") end
end
function module.add_walls_to_room(room)
if random(4) ~= 1 then
return false
end end
draw_layout_to_room(room, readLayoutFile("walllayouts.dat"))
return true
end
function module.add_pits_to_room(room)
if CURRENT_LEVEL < 2 or random(5) ~= 1 then
return false
end
draw_layout_to_room(room, readLayoutFile("pitlayouts.dat"))
return true return true
end end

1
data/maproombuilder.lua
View File

@ -353,6 +353,7 @@ local function build_normal_room(room)
add_walls_to_room(room) add_walls_to_room(room)
add_exits_to_room(room) add_exits_to_room(room)
local pitsAdded = crumbling or layoutparser.add_pits_to_room(room) local pitsAdded = crumbling or layoutparser.add_pits_to_room(room)
layoutparser.add_walls_to_room(room)
if room.goal then if room.goal then
add_level_exit(room) add_level_exit(room)

61
data/walllayouts.dat
View File

@ -1,25 +1,38 @@
---------------- ++++++++++++++++
---------------- ++++++++++++++++
--#####---###--- ++##--------##++
--#---#---###--- ++##--------##++
--#--###--###--- ++------------++
------#--#------ ++------------++
------####------ ++------------++
------------#--- ++------------++
------------#--- ++##--------##++
---#---####-#--- ++##--------##++
---------------- ++++++++++++++++
---------------- ++++++++++++++++
---------------- ++++++++++++++++
---------------- ++++++++++++++++
--fffff---fff--- ++############++
--f---f---fff--- ++#----------#++
--f--fff--fff--- ++#-########-#++
------f--f------ ++--#------#-#++
------ffff------ ++--#--------#++
------------f--- ++#-########-#++
------------f--- ++#----------#++
---f---ffff-f--- ++############++
---------------- ++++++++++++++++
---------------- ++++++++++++++++
++++++++++++++++
++++++++++++++++
++##--------##++
++##-ffffff-##++
++---f----f---++
++--------f---++
++--------f---++
++---f----f---++
++##-ffffff-##++
++##--------##++
++++++++++++++++
++++++++++++++++