/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-24 21:15:46 UTC
  • Revision ID: josh@9ix.org-20130824211546-713om9pp99jgd6of
more map

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
29
29
              self.maze2.playerScale = 0.5
30
30
              self.maze3.playerScale = 1
31
31
 
32
 
              self.goals = {}
33
 
              for _, obj in ipairs(self.objects.sprites) do
34
 
                 if obj:instanceOf(Goal) then
35
 
                    obj.visible = false
36
 
                    self.goals[tonumber(obj.map)] = obj
37
 
                 end
38
 
              end
39
 
 
40
32
              --the.interface = Group:new()
41
33
 
42
34
              --self:add(the.interface)
52
44
                    self:switchMaze()
53
45
                 end
54
46
 
55
 
                 if not (DEBUG and the.console.visible) then
56
 
                    the.activeMaze:collide(the.player)
57
 
                    the.player:collide(the.activeGoal)
58
 
                 end
 
47
                 the.activeMaze:collide(the.player)
 
48
 
59
49
 
60
50
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
61
51
                 --    if not mirror.of then
75
65
 
76
66
                      the.activeBg.visible = false
77
67
                      the.activeBg = self.bgs[newMaze]
78
 
 
79
 
                      if the.activeGoal then
80
 
                         the.activeGoal.visible = false
81
 
                      end
82
 
                      the.activeGoal = self.goals[newMaze]
83
68
                   else
84
69
                      the.activeMaze = self.maze2
85
70
                      the.activeBg = self.bg
86
 
                      the.activeGoal = self.goals[2]
87
71
                   end
88
72
 
89
73
                   the.activeMaze:revive()
90
74
                   the.activeBg.visible = true
91
 
                   if the.activeGoal then
92
 
                      the.activeGoal.visible = true
93
 
                   end
94
75
                   the.player.scale = the.activeMaze.playerScale
95
76
 
96
77
                   self._fx = {0,0,0,0}
97
 
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
 
78
                   self.tween:start(self._fx, 4, 150, 10, 'quadIn')
98
79
 
99
80
                   self.lastChange = love.timer.getMicroTime()
100
81
                end,