/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-24 14:44:15 UTC
  • Revision ID: josh@9ix.org-20130824144415-xzsu07vmws2jx7vk
fade in to let you know change is coming

Show diffs side-by-side

added added

removed removed

17
17
              self:clampTo(self.bg)
18
18
 
19
19
              self.mazes = {self.maze1, self.maze2}
20
 
              self.maze1:revive()
21
 
              self.maze2:die()
 
20
              --self.maze1:revive()
 
21
              --self.maze2:die()
22
22
              the.activeMaze = self.maze1
23
23
 
24
24
              --the.interface = Group:new()
25
25
 
26
26
              --self:add(the.interface)
27
27
 
 
28
              self:switchMaze()
 
29
 
28
30
              self.gameStart = love.timer.getMicroTime()
29
31
              self.lastChange = love.timer.getMicroTime()
30
32
           end,
31
33
   onUpdate = function(self, dt)
32
34
                 if the.player.active and love.timer.getMicroTime() > self.lastChange + 10 then
33
35
                    -- switch maze
34
 
                    the.activeMaze:die()
35
 
                    if the.activeMaze == self.maze1 then
36
 
                       the.activeMaze = self.maze2
37
 
                    else
38
 
                       the.activeMaze = self.maze1
39
 
                    end
40
 
                    the.activeMaze:revive()
41
 
 
42
 
                    self.lastChange = love.timer.getMicroTime()
 
36
                    self:switchMaze()
43
37
                 end
44
38
 
45
39
                 the.activeMaze:collide(the.player)
52
46
                 --    end
53
47
                 -- end
54
48
              end,
 
49
   switchMaze = function(self)
 
50
                   the.activeMaze:die()
 
51
                   if the.activeMaze == self.maze1 then
 
52
                      the.activeMaze = self.maze2
 
53
                   else
 
54
                      the.activeMaze = self.maze1
 
55
                   end
 
56
                   the.activeMaze:revive()
 
57
 
 
58
                   self._fx = {255,255,255,0}
 
59
                   self.tween:start(self._fx, 4, 150, 10, 'quadIn')
 
60
 
 
61
                   self.lastChange = love.timer.getMicroTime()
 
62
                end,
55
63
   onEndFrame = function(self)
56
64
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
57
65
                   --the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2