/zoeplat

To get this branch, use:
bzr branch http://9ix.org/bzr/zoeplat

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-03-12 17:48:42 UTC
  • Revision ID: josh@9ix.org-20130312174842-co8zn0hy0v6u18qf
climbing animation

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
4
4
require 'zoetrope'
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
 
require 'pepperprof'
8
7
 
9
8
Player = Animation:extend {
10
9
   image = 'data/player.png',
19
18
   },
20
19
   collisions = {},
21
20
   onWall = false,
22
 
   leftWallAt = 0,
23
21
   onNew = function (self)
24
22
              self.velocity.y = 0
25
23
              self.maxVelocity.y = 400
104
102
                     if the.keys:pressed('left') then
105
103
                        self.velocity.x = -200
106
104
                        if self.onGround then self:play('walk') end
107
 
                        if self.onWall == 'right' then
108
 
                           self.onWall = false
109
 
                           self.leftWallAt = love.timer.getTime()
110
 
                        end
 
105
                        if self.onWall == 'right' then self.onWall = false end
111
106
                     elseif the.keys:pressed('right') then
112
107
                        self.velocity.x = 200
113
108
                        if self.onGround then self:play('walk') end
114
 
                        if self.onWall == 'left' then
115
 
                           self.onWall = false
116
 
                           self.leftWallAt = love.timer.getTime()
117
 
                        end
 
109
                        if self.onWall == 'left' then self.onWall = false end
118
110
                     else
119
111
                        if not self.onWall then
120
112
                           if self.onGround then self:play('stand') end
122
114
                        end
123
115
                     end
124
116
 
125
 
                     if the.keys:justPressed('up') and
126
 
                      (self.onGround or the.console.visible or
127
 
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
 
117
                     if the.keys:justPressed('up') and self.onGround then
128
118
                        self.velocity.y = -400
129
119
                        self.jumping = true
130
120
                     end
233
223
              self.view = GameView:new()
234
224
              self.console:watch('onGround', 'the.player.onGround')
235
225
              self.console:watch('onWall', 'the.player.onWall')
236
 
              self.console:watch('updateTook', 'the.updateTook')
237
 
              self.console:watch('drawTook', 'the.drawTook')
238
 
 
239
 
              --the.profiler = newProfiler('time', 2000)
240
 
              --the.profiler = newProfiler()
241
 
              --the.profiler:start()
242
226
           end,
243
227
   onUpdate = function (self, dt)
244
 
                 if the.keys:justPressed('escape') then
245
 
                    if the.profiler then
246
 
                       the.profiler:stop()
247
 
                       local outfile = io.open( "profile.txt", "w+" )
248
 
                       the.profiler:report( outfile )
249
 
                       outfile:close()
250
 
                    end
251
 
 
 
228
                 if the.keys:justPressed('escape') and 
 
229
                   not self.console.visible then
252
230
                    self.quit()
253
231
                 end
254
 
              end,
255
 
   update = function (self, dt)
256
 
               the.updateStart = love.timer.getMicroTime()
257
 
               App.update(self, dt)
258
 
               if the.updateStart then
259
 
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
260
 
               end
261
 
            end
262
 
}
 
232
              end
 
233
}
 
 
b'\\ No newline at end of file'