/ld26

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

« back to all changes in this revision

Viewing changes to player.lua

  • Committer: Josh C
  • Date: 2013-04-27 23:43:03 UTC
  • Revision ID: josh@9ix.org-20130427234303-35drcx68t13gb3b8
more transitions and collisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
4
4
              the.player = self
5
5
 
6
6
              self.movementScale = self.height / 32
7
 
              print(self.movementScale)
 
7
              --print(self.movementScale)
8
8
 
9
9
              --self.scale = self.scaleHeight / self.height
10
10
              --self.width = self.height * .826
13
13
           end,
14
14
   onStartFrame = function(self)
15
15
                     local ms = self.movementScale
 
16
                     if DEBUG and the.console.visible then
 
17
                        ms = ms * 4
 
18
                     end
16
19
 
17
20
                     if the.keys:pressed('up') then
18
21
                        self.velocity.y = -100 * ms
30
33
                        self.velocity.x = 0
31
34
                     end
32
35
                  end,
 
36
   onUpdate = function(self, dt)
 
37
                 self:collide(the.view)
 
38
              end,
33
39
   onEndFrame = function(self)
34
40
                   if self.y < self.minY then
35
41
                      self.y = self.minY