/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-05 22:11:35 UTC
  • Revision ID: josh@9ix.org-20130305221135-wrvf3q8vzc6xjdiy
some basic collision (and workarounds)

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--inspect = require 'inspect'
6
 
--_ = require 'underscore'
7
5
 
8
 
Player = Animation:extend {
 
6
Player = Tile:extend {
9
7
   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
 
   },
17
8
   onNew = function (self)
18
9
              self.velocity.y = 0
19
10
              self.maxVelocity.y = 400
22
13
                     -- this is all in startframe so it happens before
23
14
                     -- physics calc at beginning of update
24
15
 
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
16
                     self.velocity.x = 0
31
17
                     self.acceleration.y = 800
32
18
 
33
19
                     if the.keys:pressed('left') then
34
20
                        self.velocity.x = -200
35
 
                        if self:onGround() then self:play('walk') end
36
21
                     elseif the.keys:pressed('right') then
37
22
                        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
23
                     end
42
24
 
43
 
                     if the.keys:justPressed('up') and self:onGround() then
 
25
                     if the.keys:justPressed('up') then
44
26
                        self.velocity.y = -400
45
 
                        self.jumping = true
46
 
                        self:play('jump')
47
27
                     end
48
28
                  end,
49
 
   onEndFrame = function (self)
50
 
                   --print(self.velocity.y)
51
 
                end,
52
29
   onCollide = function (self, other, xOverlap, yOverlap)
53
30
                  -- seriously, why does this even fire?
54
31
                  if other == the.view.map then return end
66
43
                     if xov ~= 0 and yov ~= 0 then
67
44
                        self.velocity.y = 0
68
45
                        other:displace(self)
69
 
                        self.jumping = false
70
46
                     end
71
47
                  else
72
48
                     print('??')
73
49
                  end
74
50
 
75
 
               end,
76
 
   onGround = function (self)
77
 
                 return (not self.jumping) and (not self.falling)
78
 
              end
 
51
               end
79
52
}
80
53
 
81
54
GameView = View:extend {
94
67
the.app = App:new {
95
68
   onRun = function (self)
96
69
              self.view = GameView:new()
97
 
              --print(inspect(_(the.app):keys()))
98
70
           end,
99
71
   onUpdate = function (self, dt)
100
 
                 -- TODO: make this not work if debug console is active
101
 
                 if the.keys:justPressed('escape') then
102
 
                    love.event.quit()
103
 
                 end
 
72
                 -- apparently I can do this w/ C-A-q if DEBUG is on
 
73
                 -- if the.keys:justPressed('escape') then
 
74
                 --    love.event.quit()
 
75
                 -- end
104
76
              end
105
77
}
 
 
b'\\ No newline at end of file'