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

Lua modules

This commit is contained in:
Linus Probert 2017-12-11 20:07:05 +01:00
parent 9eab032a71
commit 88bcc9c5ad
2 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/mapgen.lua
View File

@ -1,4 +1,4 @@
require "data/maproombuilder"
local room_builder = require "data/maproombuilder"
-- Setting up some functions
local time = os.time
@ -35,7 +35,7 @@ local function generate_path ()
for i=1,10 do
map_matrix[i] = {}
for j=1,10 do
map_matrix[i][j] = create_room()
map_matrix[i][j] = room_builder.create_room()
end
end
@ -116,7 +116,7 @@ end
-- BEGIN SCRIPT
map = create_map() -- 'map' needs to be global
load_textures(map)
room_builder.load_textures(map)
local map_matrix = generate_path()
-- Print path [Debug]
@ -128,9 +128,9 @@ for i=1,10 do
if room.active then
set_current_room(map, i-1, j-1);
if room.type == "room" then
build_square_room(map, room)
room_builder.build_square_room(map, room)
elseif room.type == "coridoor" then
build_coridoor_room(map, room)
room_builder.build_coridoor_room(map, room)
end
end
end

106
data/maproombuilder.lua
View File

@ -101,48 +101,6 @@ local function load_decor_textures()
lightDecor.candle2 = { td0, td1, 32, 8 * 16, true, true }
end
function load_textures(map)
t_floor = add_texture(map, "assets/Objects/Floor.png")
t_wall = add_texture(map, "assets/Objects/Wall.png")
math.randomseed(os.time())
local xo = (random(3) - 1) * 112
local yo = (random(7)) * 48
floor.center = { t_floor, -1, xo + 16, yo + 16, false }
floor.top = { t_floor, -1, xo + 16, yo + 0, false }
floor.bottom = { t_floor, -1, xo + 16, yo + 32, false }
floor.left = { t_floor, -1, xo + 0, yo + 16, false }
floor.right = { t_floor, -1, xo + 32, yo + 16, false }
floor.topleft = { t_floor, -1, xo + 0, yo + 0, false }
floor.topright = { t_floor, -1, xo + 32, yo + 0, false }
floor.bottomleft = { t_floor, -1, xo + 0, yo + 32, false }
floor.bottomright = { t_floor, -1, xo + 32, yo + 32, false }
floor.singletop = { t_floor, -1, xo + 48, yo + 0, false }
floor.singlebottom = { t_floor, -1, xo + 48, yo + 32, false }
floor.singleleft = { t_floor, -1, xo + 64, yo + 16, false }
floor.singleright = { t_floor, -1, xo + 96, yo + 16, false }
wall.topleft = { t_wall, -1, xo + 0, yo + 0, true }
wall.topright = { t_wall, -1, xo + 32, yo + 0, true }
wall.bottomleft = { t_wall, -1, xo + 0, yo + 32, true }
wall.bottomright = { t_wall, -1, xo + 32, yo + 32, true }
wall.vertical = { t_wall, -1, xo + 0, yo + 16, true }
wall.horizontal = { t_wall, -1, xo + 16, yo + 0, true }
load_decor_textures()
end
function create_room ()
return {
exits = {},
active = false,
goal = false,
path_dir = 0,
type = "room"
}
end
local function repack(data)
return {
textureIndex0 = data[1],
@ -244,14 +202,6 @@ local function add_exit(map, direction)
end
end
function build_square_room(map, room)
add_tiles_to_room(map);
add_walls_to_room(map);
for exit=1, #room.exits do
add_exit(map, room.exits[exit]);
end
end
local function build_vert_center_coridoor(map, offset)
for j=0,4 do
add_tile(map, 6, offset+j, repack(wall.vertical));
@ -315,7 +265,9 @@ local function build_center_corner_walls(map, exits)
end
end
function build_coridoor_room(map, room)
local module = {}
function module.build_coridoor_room(map, room)
local exits = {
up = false,
down = false,
@ -353,3 +305,55 @@ function build_coridoor_room(map, room)
build_center_corner_walls(map, exits)
end
function module.create_room ()
return {
exits = {},
active = false,
goal = false,
path_dir = 0,
type = "room"
}
end
function module.build_square_room(map, room)
add_tiles_to_room(map);
add_walls_to_room(map);
for exit=1, #room.exits do
add_exit(map, room.exits[exit]);
end
end
function module.load_textures(map)
t_floor = add_texture(map, "assets/Objects/Floor.png")
t_wall = add_texture(map, "assets/Objects/Wall.png")
math.randomseed(os.time())
local xo = (random(3) - 1) * 112
local yo = (random(7)) * 48
floor.center = { t_floor, -1, xo + 16, yo + 16, false }
floor.top = { t_floor, -1, xo + 16, yo + 0, false }
floor.bottom = { t_floor, -1, xo + 16, yo + 32, false }
floor.left = { t_floor, -1, xo + 0, yo + 16, false }
floor.right = { t_floor, -1, xo + 32, yo + 16, false }
floor.topleft = { t_floor, -1, xo + 0, yo + 0, false }
floor.topright = { t_floor, -1, xo + 32, yo + 0, false }
floor.bottomleft = { t_floor, -1, xo + 0, yo + 32, false }
floor.bottomright = { t_floor, -1, xo + 32, yo + 32, false }
floor.singletop = { t_floor, -1, xo + 48, yo + 0, false }
floor.singlebottom = { t_floor, -1, xo + 48, yo + 32, false }
floor.singleleft = { t_floor, -1, xo + 64, yo + 16, false }
floor.singleright = { t_floor, -1, xo + 96, yo + 16, false }
wall.topleft = { t_wall, -1, xo + 0, yo + 0, true }
wall.topright = { t_wall, -1, xo + 32, yo + 0, true }
wall.bottomleft = { t_wall, -1, xo + 0, yo + 32, true }
wall.bottomright = { t_wall, -1, xo + 32, yo + 32, true }
wall.vertical = { t_wall, -1, xo + 0, yo + 16, true }
wall.horizontal = { t_wall, -1, xo + 16, yo + 0, true }
load_decor_textures()
end
return module