/ld27

To get this branch, use:
bzr branch /bzr/ld27

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-08-25 00:32:21 UTC
  • Revision ID: josh@9ix.org-20130825003221-632jbug07yhqabuo
pick up goals

Show diffs side-by-side

added added

removed removed

main.lua
54
54
 
55
55
                 if not (DEBUG and the.console.visible) then
56
56
                    the.activeMaze:collide(the.player)
 
57
                    the.player:collide(the.activeGoal)
57
58
                 end
58
59
 
59
60
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
75
76
                      the.activeBg.visible = false
76
77
                      the.activeBg = self.bgs[newMaze]
77
78
 
78
 
                      the.activeGoal.visible = false
 
79
                      if the.activeGoal then
 
80
                         the.activeGoal.visible = false
 
81
                      end
79
82
                      the.activeGoal = self.goals[newMaze]
80
83
                   else
81
84
                      the.activeMaze = self.maze2
85
88
 
86
89
                   the.activeMaze:revive()
87
90
                   the.activeBg.visible = true
88
 
                   the.activeGoal.visible = true
 
91
                   if the.activeGoal then
 
92
                      the.activeGoal.visible = true
 
93
                   end
89
94
                   the.player.scale = the.activeMaze.playerScale
90
95
 
91
96
                   self._fx = {0,0,0,0}