/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-15 01:54:31 UTC
  • Revision ID: josh@9ix.org-20130315015431-torvm0zhbk1rvkn3
wall jump

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
 
_ = require 'underscore'
 
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
 
8
8
Player = Animation:extend {
12
12
   sequences = {
13
13
      stand = { frames = { 1 }, fps = 1 },
14
14
      walk = { frames = { 2, 3 }, fps = 5 },
15
 
      jump = { frames = { 4 }, fps = 1 }
 
15
      jump = { frames = { 4 }, fps = 1 },
 
16
      climbLeft = { frames = { 5, 6 }, fps = 5 },
 
17
      climbRight = { frames = { 7, 8 }, fps = 5 }
16
18
   },
 
19
   collisions = {},
 
20
   onWall = false,
 
21
   leftWallAt = 0,
17
22
   onNew = function (self)
18
23
              self.velocity.y = 0
19
24
              self.maxVelocity.y = 400
33
38
                     assert(drag, 'active sprite has no drag property')
34
39
                     assert(minVel, 'active sprite has no minVelocity property')
35
40
                     assert(maxVel, 'active sprite has no maxVelocity property')
36
 
                     assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
41
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
37
42
                  end
38
43
 
39
44
                  vel.x = vel.x or 0
70
75
                     if self.falling then self.jumping = false end
71
76
                     --print(self.jumping, self.falling)
72
77
 
73
 
                     if not self.onGround then
 
78
                     if (not self.onGround) and (not self.onWall) then
74
79
                        self:play('jump')
75
80
                     end
76
81
 
77
 
                     self.velocity.x = 0
78
82
                     self.acceleration.y = 800
79
83
 
 
84
                     if self.onWall then
 
85
                        self.acceleration.y = 0
 
86
 
 
87
                        if self.onWall == 'right' then
 
88
                           self:play('climbRight')
 
89
                        elseif self.onWall == 'left' then
 
90
                           self:play('climbLeft')
 
91
                        end
 
92
 
 
93
                        if the.keys:pressed('up') then
 
94
                           self.velocity.y = -200
 
95
                        elseif the.keys:pressed('down') then
 
96
                           self.velocity.y = 200
 
97
                        else
 
98
                           self.velocity.y = 0
 
99
                           self:freeze(self.sequences[self.currentName].frames[1])
 
100
                        end
 
101
                     end
 
102
 
80
103
                     if the.keys:pressed('left') then
81
104
                        self.velocity.x = -200
82
105
                        if self.onGround then self:play('walk') end
 
106
                        if self.onWall == 'right' then
 
107
                           self.onWall = false
 
108
                           self.leftWallAt = love.timer.getTime()
 
109
                        end
83
110
                     elseif the.keys:pressed('right') then
84
111
                        self.velocity.x = 200
85
112
                        if self.onGround then self:play('walk') end
 
113
                        if self.onWall == 'left' then
 
114
                           self.onWall = false
 
115
                           self.leftWallAt = love.timer.getTime()
 
116
                        end
86
117
                     else
87
 
                        if self.onGround then self:play('stand') end
 
118
                        if not self.onWall then
 
119
                           if self.onGround then self:play('stand') end
 
120
                           self.velocity.x = 0
 
121
                        end
88
122
                     end
89
123
 
90
 
                     if the.keys:justPressed('up') and self.onGround then
 
124
                     if the.keys:justPressed('up') and
 
125
                      (self.onGround or
 
126
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
91
127
                        self.velocity.y = -400
92
128
                        self.jumping = true
93
129
                     end
96
132
               -- NOTE: this is an override, not a callback
97
133
 
98
134
               self:doPhysics('x', elapsed)
 
135
               self:collide(the.view.map)
 
136
 
 
137
               -- handle X collisions
 
138
               self.onWall = false
 
139
               for _, col in ipairs(self.collisions) do
 
140
                  col.other:displaceDir(self, 'x')
 
141
                  if self.velocity.x > 0 then
 
142
                     self.onWall = 'right'
 
143
                  elseif self.velocity.x < 0 then
 
144
                     self.onWall = 'left'
 
145
                  else
 
146
                     print 'x ??'
 
147
                  end
 
148
               end
99
149
 
100
150
               self.onGround = false -- right before Y collision callbacks
101
151
               self:doPhysics('y', elapsed)
102
 
 
103
152
               self:collide(the.view.map)
104
153
 
 
154
               -- handle Y collisions
 
155
               for _, col in ipairs(self.collisions) do
 
156
                  if self.velocity.y > 0 then
 
157
                     self.onGround = true
 
158
                  end
 
159
 
 
160
                  col.other:displaceDir(self, 'y')
 
161
                  self.velocity.y = 0
 
162
                  self.jumping = false
 
163
               end
 
164
 
105
165
               Animation.update(self, elapsed)
106
166
            end,
 
167
   collide = function (self, ...)
 
168
                self.collisions = {}
 
169
                Animation.collide(self, ...)
 
170
                -- I could return a true/false value here if I wanted to...
 
171
             end,
107
172
   onCollide = function (self, other, xOverlap, yOverlap)
108
 
                  -- seriously, why does this even fire?
109
173
                  if other == the.view.map then return end
110
174
 
111
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
112
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
113
 
 
114
 
                  -- assumption: any other collision is with a solid map tile
115
 
                  if yOverlap > xOverlap then
116
 
                     other:displace(self)
117
 
 
118
 
                     if self.velocity.x > 0 then
119
 
                        self.onWall = 'right'
120
 
                     elseif self.velocity.x < 0 then
121
 
                        self.onWall = 'left'
122
 
                     else
123
 
                        print 'x ??'
124
 
                     end
125
 
                  elseif xOverlap > yOverlap then
126
 
                     -- check if we've moved since collisions were generated
127
 
                     local xov, yov = self:overlap(other.x, other.y,
128
 
                                                   other.width, other.height)
129
 
                     if xov ~= 0 and yov ~= 0 then
130
 
                        --print('y collision')
131
 
                        if self.velocity.y > 0 then
132
 
                           self.onGround = true
133
 
                        end
134
 
 
135
 
                        self.velocity.y = 0
136
 
                        other:displace(self)
137
 
                        self.jumping = false
138
 
                     end
139
 
                  else
140
 
                     print('xy ??')
141
 
                  end
142
 
 
143
 
               end,
 
175
                  table.insert(self.collisions, {other = other,
 
176
                                                 xOverlap = xOverlap,
 
177
                                                 yOverlap = yOverlap })
 
178
               end
144
179
}
145
180
 
 
181
-- displace on a specific axis (monkey patch Sprite)
 
182
function Sprite:displaceDir(other, dir)
 
183
   if not self.solid or self == other or not other.solid then return end
 
184
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
 
185
 
 
186
   if other.sprites then
 
187
      -- handle groups
 
188
 
 
189
      for _, spr in pairs(other.sprites) do
 
190
         self:displace(spr, dir)
 
191
      end
 
192
   else
 
193
      -- handle sprites
 
194
      local dim
 
195
      if dir == 'x' then
 
196
         dim = 'width'
 
197
      elseif dir == 'y' then
 
198
         dim = 'height'
 
199
      else
 
200
         print 'dir ??'
 
201
      end
 
202
 
 
203
      local negMove = (other[dir] - self[dir]) + other[dim]
 
204
      local posMove = (self[dir] + self[dim]) - other[dir]
 
205
 
 
206
      -- TODO: re-add hinting?
 
207
      if negMove < posMove then
 
208
         chg = - negMove
 
209
      else
 
210
         chg = posMove
 
211
      end
 
212
   end
 
213
 
 
214
   other[dir] = other[dir] + chg
 
215
end
 
216
 
146
217
GameView = View:extend {
147
218
   onNew = function (self)
148
219
              self:loadLayers('data/map.lua')
159
230
the.app = App:new {
160
231
   onRun = function (self)
161
232
              self.view = GameView:new()
162
 
              --print(inspect(_(the.app):keys()))
163
233
              self.console:watch('onGround', 'the.player.onGround')
164
234
              self.console:watch('onWall', 'the.player.onWall')
165
235
           end,