Commit a557cce0c6b353bfdd3f643ffec915797b43af29 - animaltransiro

+9

-6

board.lua less more

33	33	for y = 0, consts.boardHeight - 1 do
34	34	for x = 0, consts.boardWidth - 1 do
35	35	local n = y * consts.boardWidth + x
36		print(n, data[n+1])
37	36	for k, v in pairs(data[n+1]) do
38	37	if k == 1 then
39		t.base[n-1] = tile.getTile(v)
	38	t.base[n] = tile.getTile(v)
40	39	elseif k == 2 then
41		t.entity[n~~-1] = tile.get~~Tile(v)
	40	t.entity[n] = tile.copyTile(v)
42	41	else
43		t.entity[n-1][k] = v
	42	t.entity[n][k] = v
44	43	end
45	44	end
46	45	end

52	51	end
53	52
54	53	function Board:lookup(x, y)
55		~~return self.base[y * consts.boardWidth + x]~~
	54	if 0 <= x and x < consts.boardWidth then
	55	return self.base[y * consts.boardWidth + x]
	56	end
56	57	end
57	58
58	59	function Board:set(x, y, r)

60	61	end
61	62
62	63	function Board:lookupEntity(x, y)
63		~~return self.entity[y * consts.boardWidth + x]~~
	64	if 0 <= x and x < consts.boardWidth then
	65	return self.entity[y * consts.boardWidth + x]
	66	end
64	67	end
65	68
66	69	function Board:setEntity(x, y, r)

+1

-17

main.lua less more

17	17	state.t = 0
18	18	state.message = nil
19	19	debug = ''
20		-- state.board = board.Board:new()
	20
21	21	state.board = board.loadBoard('sample.map')
22	22	state.char = entity.Entity:new(state.board, 3 * 24, 3 * 24, tile.getTile('character'))
23
24		-- state.board:set(2, 3, tile.getTile('water'))
25		-- state.board:set(2, 4, tile.getTile('water'))
26		-- state.board:set(2, 5, tile.getTile('water'))
27
28		-- state.board:set(8, 3, tile.getTile('water'))
29		-- state.board:set(9, 3, tile.getTile('stonepath'))
30		-- state.board:set(8, 4, tile.getTile('water'))
31		-- state.board:set(8, 5, tile.getTile('water'))
32		-- state.board:setEntity(9, 6, tile.getTile('sign'))
33
34		-- state.board:setEntity(10, 3, tile.getTile('tree_lower'))
35		-- state.board:setEntity(10, 2, tile.getTile('tree_upper'))
36
37		-- state.board:setEntity(12, 3, tile.getTile('lamp_lower'))
38		-- state.board:setEntity(12, 2, tile.getTile('lamp_upper'))
39	23
40	24	state.canvas = love.graphics.newCanvas(
41	25	consts.boardWidth * consts.tileSize,

+12

-17

sample.map less more

1	1	{
2		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
3		{"grass"}, {"water"}, {"water"}, {"water"}, {"water"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
4		{"grass"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
5		{"grass"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
6		{"grass"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
7		{"grass"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "sign"}, {"grass"}, {"grass", "sign", signText="Hello!"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
8		{"grass"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "tree_upper"}, {"grass"}, {"grass"}, {"grass"},
9		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "tree_lower"}, {"grass"}, {"grass"}, {"grass"},
10		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
11		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
12		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
13		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
14		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
15		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
16		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
17		{"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
18		{"grass"}, {"grass"}, {"grass"}, {"~~grass"}, {"grass"}, {"grass"}, {"grass~~"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	2	{"grass"}, {"grass"}, {"grass"}, {"stonepath"}, {"grass"}, {"water"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	3	{"grass"}, {"grass"}, {"water"}, {"stonepath"}, {"water"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	4	{"grass"}, {"water"}, {"water"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	5	{"grass"}, {"water"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	6	{"grass"}, {"water"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	7	{"grass"}, {"water"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass", "sign"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	8	{"water"}, {"water"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "sign", signText="This is an example of entity-specific\ninformation contained in the map file."}, {"grass"}, {"grass"}, {"grass", "tree_upper"}, {"grass"}, {"grass"}, {"grass"},
	9	{"water"}, {"grass"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "tree_lower"}, {"grass"}, {"grass"}, {"grass"},
	10	{"water"}, {"grass"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	11	{"grass"}, {"stonepath"}, {"stonepath", "lamp_upper"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	12	{"grass"}, {"stonepath"}, {"stonepath", "lamp_lower"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	13	{"grass"}, {"stonepath"}, {"stonepath"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
19	14	}

+5

-0

tile.lua less more

79	79	return tileCache[name]
80	80	end
81	81
	82	local function copyTile(name)
	83	return Tile:new(name)
	84	end
	85
82	86	local function allTiles()
83	87	return tileCache
84	88	end

93	97
94	98	return {
95	99	getTile = getTile,
	100	copyTile = copyTile,
96	101	allTiles = allTiles,
97	102	nilTile = nilTile,
98	103	}