/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 21:05:20 UTC
  • Revision ID: josh@9ix.org-20130825210520-2of9iq2uemncp336
overhaul collision and physics to fix an annoying collision resolution 
bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
16
16
 
17
17
GameView = View:extend {
18
18
   gameStart = 0,
19
 
   switchSounds = {},
20
19
   onNew = function (self)
21
20
              self:loadLayers('data/map.lua')
22
21
              self.focus = the.player
34
33
              self.maze2.playerScale = 0.5
35
34
              self.maze3.playerScale = 1
36
35
 
37
 
              self.goals = {{},{},{}}
 
36
              self.goals = {}
38
37
              the.goalsAchieved = 0
39
38
              for _, obj in ipairs(self.objects.sprites) do
40
39
                 if obj:instanceOf(Goal) then
41
40
                    obj.visible = false
42
 
                    table.insert(self.goals[tonumber(obj.map)], obj)
 
41
                    self.goals[tonumber(obj.map)] = obj
43
42
                 end
44
43
              end
45
44
 
46
 
              local sndFiles = {'data/Explosion2.wav', 'data/Explosion3.wav', 'data/Hit_Hurt3.wav'}
47
 
 
48
 
              for _, sndFile in ipairs(sndFiles) do
49
 
                 local snd = love.audio.newSource(sndFile, 'static')
50
 
                 table.insert(self.switchSounds, snd)
51
 
              end
52
 
 
53
45
              --the.interface = Group:new()
54
46
 
55
47
              --self:add(the.interface)
70
62
                 end
71
63
 
72
64
                 if not (DEBUG and the.console.visible) then
73
 
                    for _, goal in ipairs(the.activeGoals) do
74
 
                       the.player.collider:collide(goal)
75
 
                    end
 
65
                    --the.player.collider:collide(the.activeMaze)
 
66
                    the.player.collider:collide(the.activeGoal)
76
67
                 end
77
68
 
78
69
                 if the.keys:justPressed('escape', 'q') then
93
84
                      the.activeBg.visible = false
94
85
                      the.activeBg = self.bgs[newMaze]
95
86
 
96
 
                      for _, goal in ipairs(the.activeGoals) do
97
 
                         goal.visible = false
 
87
                      if the.activeGoal then
 
88
                         the.activeGoal.visible = false
98
89
                      end
99
 
                      the.activeGoals = self.goals[newMaze]
100
 
 
101
 
                      love.audio.play(self.switchSounds[math.random(#self.switchSounds)])
 
90
                      the.activeGoal = self.goals[newMaze]
102
91
                   else
103
92
                      the.activeMaze = self.maze2
104
93
                      the.activeBg = self.bg
105
 
                      the.activeGoals = self.goals[2]
 
94
                      the.activeGoal = self.goals[2]
106
95
                   end
107
96
 
108
97
                   the.activeMaze:revive()
109
98
                   the.activeBg.visible = true
110
 
                   for _, goal in ipairs(the.activeGoals) do
111
 
                      goal.visible = true
 
99
                   if the.activeGoal then
 
100
                      the.activeGoal.visible = true
112
101
                   end
113
102
                   the.player.scale = the.activeMaze.playerScale
114
103
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
126
115
}
127
116
 
128
117
MenuScreen = View:extend {
129
 
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
 
118
   title = Text:new{text = "Press a key to start", font = 48, wordWrap = false},
 
119
   --title = Tile:new{image = 'data/title.png', x = 0, y = 0},
130
120
   onNew = function(self)
131
 
              self:add(self.bg)
132
 
              --self.title:centerAround(400, 200)
133
 
 
134
 
              local nr = 'data/NewRocker-Regular.otf'
135
 
              self:add(Text:new{
136
 
                          text = 'Treasures of the Decimaze',
137
 
                          --x = 0,
138
 
                          y = 100,
139
 
                          width = self.bg.width,
140
 
                          font = {nr, 48},
141
 
                          align = 'center',
142
 
                          tint = {0,0,0}
143
 
                       })
144
 
 
145
 
              self:add(Text:new{
146
 
                          text = 'Find the 4 lost shinies!',
147
 
                          y = 170,
148
 
                          width = self.bg.width,
149
 
                          font = {nr, 28},
150
 
                          align = 'center',
151
 
                          tint = {0,0,0}
152
 
                       })
153
 
 
154
 
              self:add(Text:new{
155
 
                          text = 'Use the arrow keys to move',
156
 
                          y = 375,
157
 
                          width = self.bg.width,
158
 
                          font = {nr, 24},
159
 
                          align = 'center',
160
 
                          tint = {0,0,0}
161
 
                       })
162
 
 
163
 
              self:add(Text:new{
164
 
                          text = 'Press a key to start',
165
 
                          y = 425,
166
 
                          width = self.bg.width,
167
 
                          font = {nr, 24},
168
 
                          align = 'center',
169
 
                          tint = {0,0,0}
170
 
                       })
171
 
 
172
 
 
 
121
              self:add(self.title)
 
122
              self.title:centerAround(400, 200)
173
123
           end,
174
124
   onUpdate = function(self, elapsed)
175
125
                 if the.keys:allJustPressed() then
179
129
}
180
130
 
181
131
the.app = App:new {
182
 
   name = "Treasures of the Decimaze",
183
132
   onRun = function (self)
184
133
              print('Version: ' .. VERSION)
185
134
 
186
 
              self.view = MenuScreen:new()
 
135
              self.view = GameView:new()
187
136
 
188
137
              if DEBUG then
189
138
                 self.console:watch('VERSION', 'VERSION')
195
144
              end
196
145
           end,
197
146
   onUpdate = function (self, dt)
198
 
                 if the.keys:justPressed('f1') then
199
 
                    local ss = love.graphics.newScreenshot()
200
 
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
201
 
                 end
202
147
              end
203
148
}