/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 05:02:20 UTC
  • Revision ID: josh@9ix.org-20130309050220-bd1ybunyhk8fhwyw
reapply jump animation after Y collision.  (there's a frame of no 
jumping no falling that I can't do anything about w/o doing better 
collision handling)

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
27
27
                     if self.falling then self.jumping = false end
28
28
                     --print(self.jumping, self.falling)
29
29
 
30
 
                     if not self.onGround then
 
30
                     if not self:onGround() then
31
31
                        self:play('jump')
32
32
                     end
33
33
 
36
36
 
37
37
                     if the.keys:pressed('left') then
38
38
                        self.velocity.x = -200
39
 
                        if self.onGround then self:play('walk') end
 
39
                        if self:onGround() then self:play('walk') end
40
40
                     elseif the.keys:pressed('right') then
41
41
                        self.velocity.x = 200
42
 
                        if self.onGround then self:play('walk') end
 
42
                        if self:onGround() then self:play('walk') end
43
43
                     else
44
 
                        if self.onGround then self:play('stand') end
 
44
                        if self:onGround() then self:play('stand') end
45
45
                     end
46
46
 
47
 
                     if the.keys:justPressed('up') and self.onGround then
 
47
                     if the.keys:justPressed('up') and self:onGround() then
48
48
                        self.velocity.y = -400
49
49
                        self.jumping = true
50
50
                     end
51
51
                  end,
52
 
   onUpdate = function (self)
53
 
                 -- needs to happen right before collision
54
 
                 self.onGround = false
 
52
   onEndFrame = function (self)
 
53
                   --print(self.velocity.y)
55
54
                end,
56
55
   onCollide = function (self, other, xOverlap, yOverlap)
57
56
                  -- seriously, why does this even fire?
63
62
                  -- assumption: any other collision is with a solid map tile
64
63
                  if yOverlap > xOverlap then
65
64
                     other:displace(self)
66
 
 
67
 
                     if self.velocity.x > 0 then
68
 
                        self.onWall = 'right'
69
 
                     elseif self.velocity.x < 0 then
70
 
                        self.onWall = 'left'
71
 
                     else
72
 
                        print '??'
73
 
                     end
74
65
                  elseif xOverlap > yOverlap then
75
66
                     -- check if we've moved since collisions were generated
76
67
                     local xov, yov = self:overlap(other.x, other.y,
77
68
                                                   other.width, other.height)
78
69
                     if xov ~= 0 and yov ~= 0 then
79
 
                        --print('y collision')
80
 
                        if self.velocity.y > 0 then
81
 
                           self.onGround = true
82
 
                        end
83
 
 
84
70
                        self.velocity.y = 0
85
71
                        other:displace(self)
86
72
                        self.jumping = false
90
76
                  end
91
77
 
92
78
               end,
 
79
   onGround = function (self)
 
80
                 return (not self.jumping) and (not self.falling)
 
81
              end
93
82
}
94
83
 
95
84
GameView = View:extend {
109
98
   onRun = function (self)
110
99
              self.view = GameView:new()
111
100
              --print(inspect(_(the.app):keys()))
112
 
              self.console:watch('onGround', 'the.player.onGround')
113
 
              self.console:watch('onWall', 'the.player.onWall')
114
101
           end,
115
102
   onUpdate = function (self, dt)
116
 
                 if the.keys:justPressed('escape') and 
117
 
                   not self.console.visible then
 
103
                 -- TODO: make this not work if debug console is active
 
104
                 if the.keys:justPressed('escape') then
118
105
                    love.event.quit()
119
106
                 end
120
107
              end