/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 02:38:46 UTC
  • Revision ID: josh@9ix.org-20130825023846-wgea9oh4n0o16gct
separate collision box for player so it can scale

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
 
5
--require 'pepperprof'
5
6
 
6
7
--require 'group'
7
8
 
23
24
              for _, bg in ipairs(self.bgs) do bg.visible = false end
24
25
 
25
26
              self.maze1.moveMod = 1
26
 
              self.maze2.moveMod = 1
 
27
              self.maze2.moveMod = 0.55
27
28
              self.maze3.moveMod = -1
 
29
              self.maze1.playerScale = 1
 
30
              self.maze2.playerScale = 0.5
 
31
              self.maze3.playerScale = 1
 
32
 
 
33
              self.goals = {}
 
34
              for _, obj in ipairs(self.objects.sprites) do
 
35
                 if obj:instanceOf(Goal) then
 
36
                    obj.visible = false
 
37
                    self.goals[tonumber(obj.map)] = obj
 
38
                 end
 
39
              end
28
40
 
29
41
              --the.interface = Group:new()
30
42
 
32
44
 
33
45
              self:switchMaze()
34
46
 
 
47
              -- profiling...
 
48
              --the.profiler = newProfiler()
 
49
              --the.profiler:start()
 
50
 
35
51
              self.gameStart = love.timer.getMicroTime()
36
52
              self.lastChange = love.timer.getMicroTime()
37
53
           end,
41
57
                    self:switchMaze()
42
58
                 end
43
59
 
44
 
                 the.activeMaze:collide(the.player)
45
 
 
 
60
                 if not (DEBUG and the.console.visible) then
 
61
                    the.activeMaze:collide(the.player.collider)
 
62
                    the.player.collider:collide(the.activeGoal)
 
63
                 end
46
64
 
47
65
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
48
66
                 --    if not mirror.of then
62
80
 
63
81
                      the.activeBg.visible = false
64
82
                      the.activeBg = self.bgs[newMaze]
 
83
 
 
84
                      if the.activeGoal then
 
85
                         the.activeGoal.visible = false
 
86
                      end
 
87
                      the.activeGoal = self.goals[newMaze]
65
88
                   else
66
89
                      the.activeMaze = self.maze2
67
90
                      the.activeBg = self.bg
 
91
                      the.activeGoal = self.goals[2]
68
92
                   end
69
93
 
70
94
                   the.activeMaze:revive()
71
95
                   the.activeBg.visible = true
 
96
                   if the.activeGoal then
 
97
                      the.activeGoal.visible = true
 
98
                   end
 
99
                   the.player.scale = the.activeMaze.playerScale
 
100
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
 
101
                   the.player.collider.height = the.player.height * the.activeMaze.playerScale
72
102
 
73
103
                   self._fx = {0,0,0,0}
74
 
                   self.tween:start(self._fx, 4, 150, 10, 'quadIn')
 
104
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
75
105
 
76
106
                   self.lastChange = love.timer.getMicroTime()
77
107
                end,
110
140
           end,
111
141
   onUpdate = function (self, dt)
112
142
                 if the.keys:justPressed('escape') then
 
143
                    if the.profiler then
 
144
                       the.profiler:stop()
 
145
                       local outfile = io.open( "profile.txt", "w+" )
 
146
                       the.profiler:report( outfile )
 
147
                       outfile:close()
 
148
                    end
 
149
 
113
150
                    self.quit()
114
151
                 end
115
152
              end