/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 15:58:43 UTC
  • Revision ID: josh@9ix.org-20130825155843-quc2317jh92awkmx
win screen (no trigger)

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