/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-28 18:51:02 UTC
  • Revision ID: josh@9ix.org-20130428185102-2gekwj8pzvlnwvhb
collision tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
player.lua
1
1
Player = Tile:extend {
2
 
   image = 'data/player1.png',
 
2
   image = 'data/player-null.png',
 
3
   minY = 0, maxY = 600,
3
4
   onNew = function(self)
 
5
              the.player = self
 
6
 
 
7
              self.movementScale = self.height / 32
 
8
              --print(self.movementScale)
 
9
 
 
10
              --self.scale = self.scaleHeight / self.height
 
11
              --self.width = self.height * .826
 
12
              --self.width = self.width * self.scale
 
13
              --self:updateQuad()
4
14
           end,
5
15
   onStartFrame = function(self)
 
16
                     local ms = self.movementScale
 
17
                     if DEBUG and the.console.visible then
 
18
                        ms = ms * 4
 
19
                     end
 
20
 
6
21
                     if the.keys:pressed('up') then
7
 
                        self.velocity.y = -100
 
22
                        self.velocity.y = -100 * ms
8
23
                     elseif the.keys:pressed('down') then
9
 
                        self.velocity.y = 100
 
24
                        self.velocity.y = 100 * ms
10
25
                     else
11
26
                        self.velocity.y = 0
12
27
                     end
13
28
 
14
29
                     if the.keys:pressed('right') then
15
 
                        self.velocity.x = 100
 
30
                        self.velocity.x = 100 * ms
16
31
                     elseif the.keys:pressed('left') then
17
 
                        self.velocity.x = -100
 
32
                        self.velocity.x = -100 * ms
18
33
                     else
19
34
                        self.velocity.x = 0
20
35
                     end
21
 
                  end
 
36
                  end,
 
37
   onUpdate = function(self, dt)
 
38
                 self:collide(the.view)
 
39
              end,
 
40
   onEndFrame = function(self)
 
41
                   if self.y < self.minY then
 
42
                      self.y = self.minY
 
43
                   end
 
44
                   if self.y > self.maxY then
 
45
                      self.y = self.maxY
 
46
                   end
 
47
                end
22
48
}
 
 
b'\\ No newline at end of file'