/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-05-20 16:51:19 UTC
  • Revision ID: josh@9ix.org-20130520165119-mkjh7d9408e6ig0u
extract updating score.  update score again when you calc high score - 
should mitigate a bug I saw happen when thor played that put final score 
+ high score out of sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
91
91
                 the.storage.data = {highScore = 0}
92
92
              end
93
93
 
94
 
              --the.rockColliders = Group:new()
 
94
              the.rockColliders = Group:new()
95
95
              the.bullets = Group:new()
96
96
              the.mirrors = Group:new()
97
 
              --the.rocks = Group:new()
98
 
              the.interface = Group:new()
99
 
              the.planets = Group:new()
100
 
              the.indicators = Group:new()
 
97
              the.rocks = Group:new()
101
98
 
102
99
              the.bg = Tile:new{
103
100
                 image = 'data/stars3.png',
104
 
                 width = 13660,
105
 
                 height = 7680
 
101
                 -- 1366x768 * 3
 
102
                 width = 4098,
 
103
                 height = 2304
106
104
              }
107
105
              self:add(the.bg)
108
106
 
109
 
              self:add(the.planets)
110
 
 
111
107
              --the.player = CrystalPlayer:new{x=400,y=300}
112
108
              the.player = SpacePlayer:new{x=1366,y=768}
113
109
              self:add(the.player)
114
 
              self:add(the.player.thrust)
115
110
 
116
111
              --self:add(Enemy:new{x=400, y=300})
117
112
 
118
113
              self:add(the.bullets)
119
 
              --self:add(the.rockColliders)
 
114
              self:add(the.rockColliders)
120
115
              self:add(the.mirrors)
121
 
              --self:add(the.rocks)
122
 
              self:add(the.indicators)
123
 
              self:add(the.interface)
124
 
 
125
 
              for _ = 1, math.random(6) do
126
 
                 local planet = Tile:new{
127
 
                    image = 'data/planet1.png',
128
 
                    x = math.random(the.app.width / 2,
129
 
                                    the.bg.width - the.app.width / 2),
130
 
                    y = math.random(the.app.height / 2,
131
 
                                    the.bg.height - the.app.height / 2),
132
 
                    rotation = math.random() * math.pi
133
 
                 }
134
 
                 the.planets:add(planet)
135
 
 
136
 
                 planet.indicator = Tile:new{
137
 
                    image = 'data/planet1ind.png',
138
 
                 }
139
 
                 the.indicators:add(planet.indicator)
140
 
              end
 
116
              self:add(the.rocks)
141
117
 
142
118
              the.cursor = Cursor:new()
143
119
              self:add(the.cursor)
144
120
 
145
121
              the.score = Text:new{
146
 
                 x = 8,
147
 
                 y = 8,
148
122
                 width = the.app.width,
149
 
                 --align = 'center',
 
123
                 align = 'center',
150
124
                 font = 25}
151
 
              --the.interface:add(the.score)
 
125
              self:add(the.score)
152
126
 
153
127
              local hs = the.storage.data.highScore
154
128
              local m = hs / 60
155
129
              local s = hs % 60
156
130
 
157
131
              the.highScore = Text:new{
158
 
                 x = -8,
159
 
                 y = 8,
160
132
                 width = the.app.width,
161
133
                 align = 'right',
162
134
                 font = 25,
163
135
                 text = string.format('High Score: %d:%02d', m, s)
164
136
              }
165
 
              --the.interface:add(the.highScore)
166
 
 
167
 
              the.over = Text:new{
168
 
                 y = the.app.height / 2,
169
 
                 width = the.app.width,
170
 
                 align = 'center',
171
 
                 font = 25,
172
 
                 text = "Game Over",
173
 
                 visible = false
174
 
              }
175
 
              the.interface:add(the.over)
176
 
 
177
 
 
178
 
              the.instructions = Text:new{
179
 
                 y = the.app.height / 2 + 32,
180
 
                 width = the.app.width,
181
 
                 align = 'center',
182
 
                 font = 12,
183
 
                 text = "Press Enter to start a new game\nPress Q to quit",
184
 
                 visible = false
185
 
              }
186
 
              the.interface:add(the.instructions)
 
137
              self:add(the.highScore)
187
138
 
188
139
              love.mouse.setGrab(true)
189
140
              love.mouse.setVisible(false)
196
147
              self.gameStart = love.timer.getTime()
197
148
           end,
198
149
   onUpdate = function(self, dt)
199
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
150
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
200
151
                    local unseenRock = nil
201
152
                    while not unseenRock do
202
153
                       local rock = Rock:new{
226
177
 
227
178
                 the.bullets:collide(the.rockColliders)
228
179
 
229
 
                 -- this should really go somewhere else...
230
 
                 for _, planet in ipairs(the.planets.sprites) do
231
 
                    local indx, indy
232
 
                    local pvec = vector.new(
233
 
                       planet.x - the.player.x + planet.width / 2,
234
 
                       planet.y - the.player.y + planet.height / 2 )
235
 
 
236
 
                    -- TODO: is there a better way to specify the
237
 
                    -- screen rectangle?
238
 
                    if planet:intersects(the.player.x - the.app.width / 2,
239
 
                                         the.player.y - the.app.height / 2,
240
 
                                         the.app.width,
241
 
                                         the.app.height) then
242
 
                       -- planet is on the screen
243
 
                       planet.indicator.visible = false
244
 
                    else
245
 
                       planet.indicator.visible = true
246
 
 
247
 
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
248
 
                          indx = the.app.width / 2 * util.signOf(pvec.x) + 8
249
 
                          indy = the.app.width / 2 * pvec.y / math.abs(pvec.x)
250
 
                       else
251
 
                          indy = the.app.height / 2 * util.signOf(pvec.y) + 8
252
 
                          indx = the.app.height / 2 * pvec.x / math.abs(pvec.y)
253
 
                       end
254
 
 
255
 
                       planet.indicator.x = the.player.x + indx
256
 
                       planet.indicator.y = the.player.y + indy
257
 
                    end
258
 
                 end
259
 
 
260
180
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
261
181
                 --    if not mirror.of then
262
182
                 --       print('mirror:' .. inspect(mirror))
265
185
                 -- end
266
186
              end,
267
187
   onEndFrame = function(self)
268
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
269
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
270
 
 
271
188
                   if the.player.active then
272
189
                      self:updateScore()
273
190
                   end
274
191
                end,
275
192
   draw = function (self, x, y)
276
193
             View.draw(self, x, y)
277
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
194
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
278
195
          end,
279
196
   updateScore = function(self)
280
197
                    local t = love.timer.getTime() - self.gameStart
282
199
                    local s = t % 60
283
200
 
284
201
                    the.score.text = string.format('Score: %d:%02d', m, s)
285
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
286
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
202
                    the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
203
                    the.score.x = the.player.x - the.app.width / 2
287
204
 
288
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
289
 
                    --the.highScore.x = the.player.x - the.app.width / 2
 
205
                    the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
206
                    the.highScore.x = the.player.x - the.app.width / 2
290
207
                 end
291
208
}
292
209
 
311
228
              math.randomseed(os.time())
312
229
 
313
230
              self.view = GameView:new()
314
 
 
315
 
              -- should fail silently if it can't go to fullscreen...
316
 
              love.graphics.toggleFullscreen()
317
 
 
318
231
              if DEBUG then
319
232
                 self.console:watch('VERSION', 'VERSION')
320
233
                 self.console:watch('updateTook', 'the.updateTook')
324
237
                 self.console:watch('the.app.height', 'the.app.height')
325
238
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
326
239
                 self.console:watch('num rocks', '#the.rocks.sprites')
327
 
                 self.console:watch('num planets', '#the.planets.sprites')
328
240
                 --self.console:watch('drawTook', 'the.drawTook')
329
241
 
330
242
                 -- back off that dark overlay a bit
332
244
              end
333
245
           end,
334
246
   onUpdate = function (self, dt)
335
 
                 if not (DEBUG and the.console.visible) then
336
 
                    if the.keys:justPressed('q') then
337
 
                       self.quit()
338
 
                    elseif the.keys:justPressed('return') then
339
 
                       if the.keys:pressed('alt') then
340
 
                          love.graphics.toggleFullscreen()
341
 
                       else
342
 
                          self.view = GameView:new()
343
 
                       end
344
 
                    elseif the.keys:justPressed('f1') then
345
 
                       local ss = love.graphics.newScreenshot()
346
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
347
 
                    elseif the.keys:justPressed('f11') then
348
 
                       love.graphics.toggleFullscreen()
349
 
                    end
 
247
                 if the.keys:justPressed('escape') then
 
248
                    self.quit()
350
249
                 end
351
250
              end,
352
251
   update = function (self, dt)