/ld27

To get this branch, use:
bzr branch http://9ix.org/bzr/ld27

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-08-25 21:05:20 UTC
  • Revision ID: josh@9ix.org-20130825210520-2of9iq2uemncp336
overhaul collision and physics to fix an annoying collision resolution 
bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
 
6
--inspect = require 'inspect'
 
7
 
 
8
require 'sprite'
 
9
require 'util'
6
10
 
7
11
require 'version'
8
12
require 'player'
30
34
              self.maze3.playerScale = 1
31
35
 
32
36
              self.goals = {}
 
37
              the.goalsAchieved = 0
33
38
              for _, obj in ipairs(self.objects.sprites) do
34
39
                 if obj:instanceOf(Goal) then
35
40
                    obj.visible = false
57
62
                 end
58
63
 
59
64
                 if not (DEBUG and the.console.visible) then
60
 
                    the.activeMaze:collide(the.player.collider)
 
65
                    --the.player.collider:collide(the.activeMaze)
61
66
                    the.player.collider:collide(the.activeGoal)
62
67
                 end
63
68
 
131
136
 
132
137
              if DEBUG then
133
138
                 self.console:watch('VERSION', 'VERSION')
 
139
                 self.console:watch('player.x', 'the.player.x')
 
140
                 self.console:watch('player.y', 'the.player.y')
134
141
 
135
142
                 -- back off that dark overlay a bit
136
143
                 self.console.fill.fill[4] = 75