Commit ebab62a13929095d74bc6839f0e7da3f7818e6a9 - animaltransiro

+10

-0

entities/character.lua less more

	1	{
	2	pass = true,
	3	name = 'character',
	4	sprites = {
	5	down = 'character_down',
	6	left = 'character_left',
	7	right = 'character_right',
	8	up = 'character_up',
	9	}
	10	}

+18

-3

entity.lua less more

1	1	local consts = require 'constants'
	2	local tile = require 'tile'
2	3
3	4	local Entity = {}
4	5	Entity.__index = Entity
5	6
6		function Entity:new(board, x, y, s)
	7	function Entity:new(board, x, y, name)
	8	local file = io.open('entities/' .. name .. '.lua')
	9	local char_data = loadstring('return' .. file:read('*all'))()
	10
	11	local sprites = {}
	12	for name, sprite in pairs(char_data.sprites) do
	13	sprites[name] = tile.getTile(sprite)
	14	end
	15
7	16	local t = {
8	17	board = board,
9	18	x = x,
10	19	y = y,
11	20	dx = 0,
12	21	dy = 0,
13		sprite = s,
	22	sprites = sprites,
14	23	direction = {0, 1},
	24	facing = 'down',
15	25	}
	26
16	27	return setmetatable(t, Entity)
17	28	end
18	29

57	68
58	69	if self.dx > 0 then
59	70	self.direction[1] = 1
	71	self.facing = 'right'
60	72	elseif self.dx < 0 then
61	73	self.direction[1] = -1
	74	self.facing = 'left'
62	75	elseif self.dy ~= 0 then
63	76	self.direction[1] = 0
64	77	end
65	78
66	79	if self.dy > 0 then
67	80	self.direction[2] = 1
	81	self.facing = 'down'
68	82	elseif self.dy < 0 then
69	83	self.direction[2] = -1
	84	self.facing = 'up'
70	85	elseif self.dx ~= 0 then
71	86	self.direction[2] = 0
72	87	end

106	121	end
107	122
108	123	function Entity:draw()
109		self.sprite:drawPx(self.x, self.y)
	124	self.sprites[self.facing]:drawPx(self.x, self.y)
110	125	end
111	126
112	127	function Entity:gameCoords()

+2

-1

main.lua less more

19	19	debug = ''
20	20
21	21	state.board = board.loadBoard('sample.map')
22		state.char = entity.Entity:new(~~state.board, 3 * 24, 3 * 24, tile.getTile('character'))~~
	22	state.char = entity.Entity:new(
	23	state.board, 3 * 24, 3 * 24, 'character')
23	24
24	25	state.canvas = love.graphics.newCanvas(
25	26	consts.boardWidth * consts.tileSize,

+5

-5

sample.map less more

1	1	{
2	2	{"grass"}, {"grass"}, {"grass"}, {"stonepath"}, {"grass"}, {"water"}, {"water"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
3	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"},
	4	{"grass"}, {"water"}, {"water", "pine_upper"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
	5	{"grass"}, {"water"}, {"grass", "pine_lower"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
6	6	{"grass"}, {"water"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
7	7	{"grass"}, {"water"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass", "sign"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
8	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"},
	9	{"water"}, {"grass"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "tree_lower"}, {"grass", "tree_upper"}, {"grass"}, {"grass"},
	10	{"water"}, {"grass"}, {"grass"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass", "tree_lower"}, {"grass"}, {"grass"},
11	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"},
	12	{"grass"}, {"stonepath"}, {"stonepath", "lamp_lower" }, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
13	13	{"grass"}, {"stonepath"}, {"stonepath"}, {"stonepath"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"}, {"grass"},
14	14	}

+4

-1

tile.lua less more

69	69	end
70	70
71	71	function Tile:drawPx(x, y)
72		love.graphics.draw(s~~elf.sprite, x, y)~~
	72	love.graphics.draw(spritesheet,
	73	self.quad,
	74	x,
	75	y)
73	76	end
74	77
75	78	local tileCache = {}

+6

-0

tiles/character_down.lua less more

	1	{
	2	pass = true,
	3	name = 'character',
	4	spriteX = 8,
	5	spriteY = 0,
	6	}

+6

-0

tiles/character_left.lua less more

	1	{
	2	pass = true,
	3	name = 'character',
	4	spriteX = 9,
	5	spriteY = 0,
	6	}

+6

-0

tiles/character_right.lua less more

	1	{
	2	pass = true,
	3	name = 'character',
	4	spriteX = 10,
	5	spriteY = 0,
	6	}

+6

-0

tiles/character_up.lua less more

	1	{
	2	pass = true,
	3	name = 'character',
	4	spriteX = 11,
	5	spriteY = 0,
	6	}

+6

-0

tiles/pine_lower.lua less more

	1	{
	2	pass = false,
	3	name = 'pine_lower',
	4	spriteX = 4,
	5	spriteY = 1,
	6	}

+6

-0

tiles/pine_upper.lua less more

	1	{
	2	pass = true,
	3	name = 'pine_upper',
	4	spriteX = 4,
	5	spriteY = 0,
	6	}

tiles/spritesheet.ase less more

Binary diff not shown

tiles/spritesheet.png less more

Binary diff not shown

+1

-1

tiles/tree_lower.lua less more

1	1	{
2	2	pass = false,
3	3	name = 'tree_lower',
4		spriteX = 4,
	4	spriteX = 2,
5	5	spriteY = 1,
6	6	}

+1

-1

tiles/tree_upper.lua less more

1	1	{
2	2	pass = true,
3	3	name = 'tree_upper',
4		spriteX = 4,
	4	spriteX = 2,
5	5	spriteY = 0,
6	6	}