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