/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:24:12 UTC
  • Revision ID: josh@9ix.org-20130825152412-t0uzxw6fd92i81rj
pause/quit screen

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
6
 
8
 
require 'sprite'
9
 
require 'util'
 
7
--require 'group'
10
8
 
11
9
require 'version'
 
10
--require 'wrap_tile'
12
11
require 'player'
13
12
require 'goal'
14
13
require 'pause_view'
15
 
require 'win_view'
16
14
 
17
15
GameView = View:extend {
18
16
   gameStart = 0,
34
32
              self.maze3.playerScale = 1
35
33
 
36
34
              self.goals = {}
37
 
              the.goalsAchieved = 0
38
35
              for _, obj in ipairs(self.objects.sprites) do
39
36
                 if obj:instanceOf(Goal) then
40
37
                    obj.visible = false
62
59
                 end
63
60
 
64
61
                 if not (DEBUG and the.console.visible) then
65
 
                    --the.player.collider:collide(the.activeMaze)
 
62
                    the.activeMaze:collide(the.player.collider)
66
63
                    the.player.collider:collide(the.activeGoal)
67
64
                 end
68
65
 
69
66
                 if the.keys:justPressed('escape', 'q') then
70
67
                    PauseView:new():activate()
71
 
                 --elseif the.keys:justPressed('w') then
72
 
                 --   WinView:new():activate()
73
68
                 end
74
69
              end,
75
70
   switchMaze = function(self)
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