/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()
 
97
              the.rocks = Group:new()
100
98
 
101
99
              the.bg = Tile:new{
102
100
                 image = 'data/stars3.png',
103
 
                 width = 13660,
104
 
                 height = 7680
 
101
                 -- 1366x768 * 3
 
102
                 width = 4098,
 
103
                 height = 2304
105
104
              }
106
105
              self:add(the.bg)
107
106
 
108
 
              self:add(the.planets)
109
 
 
110
107
              --the.player = CrystalPlayer:new{x=400,y=300}
111
108
              the.player = SpacePlayer:new{x=1366,y=768}
112
109
              self:add(the.player)
113
 
              self:add(the.player.thrust)
114
110
 
115
111
              --self:add(Enemy:new{x=400, y=300})
116
112
 
117
113
              self:add(the.bullets)
118
 
              --self:add(the.rockColliders)
 
114
              self:add(the.rockColliders)
119
115
              self:add(the.mirrors)
120
 
              --self:add(the.rocks)
121
 
              self:add(the.interface)
122
 
 
123
 
              for _ = 1, math.random(6) do
124
 
                 local planet = Tile:new{
125
 
                    image = 'data/planet1.png',
126
 
                    x = math.random(the.app.width / 2,
127
 
                                    the.bg.width - the.app.width / 2),
128
 
                    y = math.random(the.app.height / 2,
129
 
                                    the.bg.height - the.app.height / 2),
130
 
                    rotation = math.random() * math.pi
131
 
                 }
132
 
                 the.planets:add(planet)
133
 
              end
 
116
              self:add(the.rocks)
134
117
 
135
118
              the.cursor = Cursor:new()
136
119
              self:add(the.cursor)
137
120
 
138
121
              the.score = Text:new{
139
 
                 x = 8,
140
 
                 y = 8,
141
122
                 width = the.app.width,
142
 
                 --align = 'center',
 
123
                 align = 'center',
143
124
                 font = 25}
144
 
              the.interface:add(the.score)
 
125
              self:add(the.score)
145
126
 
146
127
              local hs = the.storage.data.highScore
147
128
              local m = hs / 60
148
129
              local s = hs % 60
149
130
 
150
131
              the.highScore = Text:new{
151
 
                 x = -8,
152
 
                 y = 8,
153
132
                 width = the.app.width,
154
133
                 align = 'right',
155
134
                 font = 25,
156
135
                 text = string.format('High Score: %d:%02d', m, s)
157
136
              }
158
 
              the.interface:add(the.highScore)
159
 
 
160
 
              the.over = Text:new{
161
 
                 y = the.app.height / 2,
162
 
                 width = the.app.width,
163
 
                 align = 'center',
164
 
                 font = 25,
165
 
                 text = "Game Over",
166
 
                 visible = false
167
 
              }
168
 
              the.interface:add(the.over)
169
 
 
170
 
 
171
 
              the.instructions = Text:new{
172
 
                 y = the.app.height / 2 + 32,
173
 
                 width = the.app.width,
174
 
                 align = 'center',
175
 
                 font = 12,
176
 
                 text = "Press Enter to start a new game\nPress Q to quit",
177
 
                 visible = false
178
 
              }
179
 
              the.interface:add(the.instructions)
 
137
              self:add(the.highScore)
180
138
 
181
139
              love.mouse.setGrab(true)
182
140
              love.mouse.setVisible(false)
189
147
              self.gameStart = love.timer.getTime()
190
148
           end,
191
149
   onUpdate = function(self, dt)
192
 
                 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
193
151
                    local unseenRock = nil
194
152
                    while not unseenRock do
195
153
                       local rock = Rock:new{
227
185
                 -- end
228
186
              end,
229
187
   onEndFrame = function(self)
230
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
231
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
232
 
 
233
188
                   if the.player.active then
234
189
                      self:updateScore()
235
190
                   end
236
191
                end,
237
192
   draw = function (self, x, y)
238
193
             View.draw(self, x, y)
239
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
194
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
240
195
          end,
241
196
   updateScore = function(self)
242
197
                    local t = love.timer.getTime() - self.gameStart
244
199
                    local s = t % 60
245
200
 
246
201
                    the.score.text = string.format('Score: %d:%02d', m, s)
247
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
248
 
                    --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
249
204
 
250
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
251
 
                    --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
252
207
                 end
253
208
}
254
209
 
273
228
              math.randomseed(os.time())
274
229
 
275
230
              self.view = GameView:new()
276
 
 
277
 
              -- should fail silently if it can't go to fullscreen...
278
 
              love.graphics.toggleFullscreen()
279
 
 
280
231
              if DEBUG then
281
232
                 self.console:watch('VERSION', 'VERSION')
282
233
                 self.console:watch('updateTook', 'the.updateTook')
286
237
                 self.console:watch('the.app.height', 'the.app.height')
287
238
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
288
239
                 self.console:watch('num rocks', '#the.rocks.sprites')
289
 
                 self.console:watch('num planets', '#the.planets.sprites')
290
240
                 --self.console:watch('drawTook', 'the.drawTook')
291
241
 
292
242
                 -- back off that dark overlay a bit
294
244
              end
295
245
           end,
296
246
   onUpdate = function (self, dt)
297
 
                 if not (DEBUG and the.console.visible) then
298
 
                    if the.keys:justPressed('q') then
299
 
                       self.quit()
300
 
                    elseif the.keys:justPressed('return') then
301
 
                       if the.keys:pressed('alt') then
302
 
                          love.graphics.toggleFullscreen()
303
 
                       else
304
 
                          self.view = GameView:new()
305
 
                       end
306
 
                    elseif the.keys:justPressed('f1') then
307
 
                       local ss = love.graphics.newScreenshot()
308
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
309
 
                    elseif the.keys:justPressed('f11') then
310
 
                       love.graphics.toggleFullscreen()
311
 
                    end
 
247
                 if the.keys:justPressed('escape') then
 
248
                    self.quit()
312
249
                 end
313
250
              end,
314
251
   update = function (self, dt)