/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-09 04:59:50 UTC
  • Revision ID: josh@9ix.org-20130309045950-ufjp2txry3c0cc05
only jump when you're on the ground

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
 
6
 
TERM_VEL = 400
7
 
 
8
 
Player = Tile:extend {
 
5
--inspect = require 'inspect'
 
6
--_ = require 'underscore'
 
7
 
 
8
Player = Animation:extend {
9
9
   image = 'data/player.png',
 
10
   height = 32,
 
11
   width = 32,
 
12
   sequences = {
 
13
      stand = { frames = { 1 }, fps = 1 },
 
14
      walk = { frames = { 2, 3 }, fps = 5 },
 
15
      jump = { frames = { 4 }, fps = 1 }
 
16
   },
10
17
   onNew = function (self)
11
18
              self.velocity.y = 0
 
19
              self.maxVelocity.y = 400
12
20
           end,
13
21
   onStartFrame = function (self)
14
22
                     -- this is all in startframe so it happens before
15
23
                     -- physics calc at beginning of update
16
24
 
17
 
                 self.velocity.x = 0
18
 
                 -- TODO: this can be replaced with sprite.maxVel.y    
19
 
                 if self.velocity.y >= TERM_VEL then
20
 
                    self.velocity.y = TERM_VEL
21
 
                    self.acceleration.y = 0
22
 
                 else
23
 
                    self.acceleration.y = 800
24
 
                 end
25
 
 
26
 
                 if the.keys:pressed('left') then
27
 
                    self.velocity.x = -200
28
 
                 elseif the.keys:pressed('right') then
29
 
                    self.velocity.x = 200
30
 
                 end
31
 
 
32
 
                 if the.keys:justPressed('up') then
33
 
                    self.velocity.y = -400
34
 
                 end
35
 
              end,
36
 
   onUpdate = function (self)
37
 
                 -- this is called after physics, so this makes sense here
38
 
                 the.view.map:subdisplace(self)
 
25
                     -- jumping/falling updates could go in EndFrame...
 
26
                     self.falling = self.velocity.y > 0
 
27
                     if self.falling then self.jumping = false end
 
28
                     --print(self.jumping, self.falling)
 
29
 
 
30
                     self.velocity.x = 0
 
31
                     self.acceleration.y = 800
 
32
 
 
33
                     if the.keys:pressed('left') then
 
34
                        self.velocity.x = -200
 
35
                        if self:onGround() then self:play('walk') end
 
36
                     elseif the.keys:pressed('right') then
 
37
                        self.velocity.x = 200
 
38
                        if self:onGround() then self:play('walk') end
 
39
                     else
 
40
                        if self:onGround() then self:play('stand') end
 
41
                     end
 
42
 
 
43
                     if the.keys:justPressed('up') and self:onGround() then
 
44
                        self.velocity.y = -400
 
45
                        self.jumping = true
 
46
                        self:play('jump')
 
47
                     end
 
48
                  end,
 
49
   onEndFrame = function (self)
 
50
                   --print(self.velocity.y)
 
51
                end,
 
52
   onCollide = function (self, other, xOverlap, yOverlap)
 
53
                  -- seriously, why does this even fire?
 
54
                  if other == the.view.map then return end
 
55
 
 
56
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
 
57
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
 
58
 
 
59
                  -- assumption: any other collision is with a solid map tile
 
60
                  if yOverlap > xOverlap then
 
61
                     other:displace(self)
 
62
                  elseif xOverlap > yOverlap then
 
63
                     -- check if we've moved since collisions were generated
 
64
                     local xov, yov = self:overlap(other.x, other.y,
 
65
                                                   other.width, other.height)
 
66
                     if xov ~= 0 and yov ~= 0 then
 
67
                        self.velocity.y = 0
 
68
                        other:displace(self)
 
69
                        self.jumping = false
 
70
                     end
 
71
                  else
 
72
                     print('??')
 
73
                  end
 
74
 
 
75
               end,
 
76
   onGround = function (self)
 
77
                 return (not self.jumping) and (not self.falling)
39
78
              end
40
79
}
41
80
 
44
83
              self:loadLayers('data/map.lua')
45
84
              self.focus = the.player
46
85
              self:clampTo(self.map)
47
 
           end
 
86
           end,
 
87
   onUpdate = function (self)
 
88
                 --print('tick')
 
89
                 the.player:collide(self.map)
 
90
                 --self.map:collide(the.player)
 
91
              end
48
92
}
49
93
 
50
94
the.app = App:new {
51
95
   onRun = function (self)
52
96
              self.view = GameView:new()
 
97
              --print(inspect(_(the.app):keys()))
53
98
           end,
54
99
   onUpdate = function (self, dt)
 
100
                 -- TODO: make this not work if debug console is active
55
101
                 if the.keys:justPressed('escape') then
56
102
                    love.event.quit()
57
103
                 end