To get this branch, use:
bzr branch
http://9ix.org/bzr/zoeplat
« back to all changes in this revision
Viewing changes to main.lua
- browse files at revision 21
- compare with another revision
- download diff
- download tarball
- view history from revision 21
- Committer: Josh C
- Date: 2013-03-12 17:21:28 UTC
- Revision ID: josh@9ix.org-20130312172128-l336vwqawo81c6sm
really easy version of knowing when we reached the top of a wall.
similar to how we're doing onGround.
similar to how we're doing onGround.
- files removed:
- data/testmap.tmx
- files modified:
- data/map.lua
added
removed
main.lua
4
4
require 'zoetrope'
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
require 'pepperprof'
8
9
util = {
10
dim = function(dir)
11
if dir == 'x' then
12
return 'width'
13
elseif dir == 'y' then
14
return 'height'
15
else
16
print 'dir ??'
17
end
18
end
19
}
20
7
21
8
Player = Animation:extend {
22
9
image = 'data/player.png',
25
12
sequences = {
26
13
stand = { frames = { 1 }, fps = 1 },
27
14
walk = { frames = { 2, 3 }, fps = 5 },
28
jump = { frames = { 4 }, fps = 1 },
29
climbLeft = { frames = { 5, 6 }, fps = 5 },
30
climbRight = { frames = { 7, 8 }, fps = 5 }
15
jump = { frames = { 4 }, fps = 1 }
31
16
},
32
17
collisions = {},
33
18
onWall = false,
34
leftWallAt = 0,
35
19
onNew = function (self)
36
20
self.velocity.y = 0
37
21
self.maxVelocity.y = 400
78
62
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
79
63
80
64
if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
81
82
if self[dir] < 0 then self[dir] = 0 end
83
local edge = the.view.map[util.dim(dir)] -
84
the.player[util.dim(dir)]
85
-- TODO: take map position into account
86
if self[dir] > edge then self[dir] = edge end
87
65
end,
88
66
onStartFrame = function (self)
89
67
-- this is all in startframe so it happens before
103
81
if self.onWall then
104
82
self.acceleration.y = 0
105
83
106
if self.onWall == 'right' then
107
self:play('climbRight')
108
elseif self.onWall == 'left' then
109
self:play('climbLeft')
110
end
111
112
84
if the.keys:pressed('up') then
113
85
self.velocity.y = -200
86
self:play('stand')
114
87
elseif the.keys:pressed('down') then
115
88
self.velocity.y = 200
89
self:play('stand')
116
90
else
117
91
self.velocity.y = 0
118
self:freeze(self.sequences[self.currentName].frames[1])
92
self:play('stand')
119
93
end
120
94
end
121
95
122
96
if the.keys:pressed('left') then
123
97
self.velocity.x = -200
124
98
if self.onGround then self:play('walk') end
125
if self.onWall == 'right' then
126
self.onWall = false
127
self.leftWallAt = love.timer.getTime()
128
end
99
if self.onWall == 'right' then self.onWall = false end
129
100
elseif the.keys:pressed('right') then
130
101
self.velocity.x = 200
131
102
if self.onGround then self:play('walk') end
132
if self.onWall == 'left' then
133
self.onWall = false
134
self.leftWallAt = love.timer.getTime()
135
end
103
if self.onWall == 'left' then self.onWall = false end
136
104
else
105
if self.onGround then self:play('stand') end
137
106
if not self.onWall then
138
if self.onGround then self:play('stand') end
139
107
self.velocity.x = 0
140
108
end
141
109
end
142
110
143
if the.keys:justPressed('up') and
144
(self.onGround or the.console.visible or
145
(love.timer.getTime() - self.leftWallAt < .1) ) then
111
if the.keys:justPressed('up') and self.onGround then
146
112
self.velocity.y = -400
147
113
self.jumping = true
148
114
end
210
176
end
211
177
else
212
178
-- handle sprites
213
local dim = util.dim(dir)
179
local dim
180
if dir == 'x' then
181
dim = 'width'
182
elseif dir == 'y' then
183
dim = 'height'
184
else
185
print 'dir ??'
186
end
214
187
215
188
local negMove = (other[dir] - self[dir]) + other[dim]
216
189
local posMove = (self[dir] + self[dim]) - other[dir]
244
217
self.view = GameView:new()
245
218
self.console:watch('onGround', 'the.player.onGround')
246
219
self.console:watch('onWall', 'the.player.onWall')
247
self.console:watch('updateTook', 'the.updateTook')
248
self.console:watch('drawTook', 'the.drawTook')
249
250
--the.profiler = newProfiler('time', 2000)
251
--the.profiler = newProfiler()
252
--the.profiler:start()
253
220
end,
254
221
onUpdate = function (self, dt)
255
if the.keys:justPressed('escape') then
256
if the.profiler then
257
the.profiler:stop()
258
local outfile = io.open( "profile.txt", "w+" )
259
the.profiler:report( outfile )
260
outfile:close()
261
end
262
222
if the.keys:justPressed('escape') and
223
not self.console.visible then
263
224
self.quit()
264
225
end
265
end,
266
update = function (self, dt)
267
the.updateStart = love.timer.getMicroTime()
268
App.update(self, dt)
269
if the.updateStart then
270
the.updateTook = love.timer.getMicroTime() - the.updateStart
271
end
272
end
273
}
226
end
227
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1