/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',
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.interface)
123
 
 
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
 
              }
131
 
              the.planets:add(planet)
 
116
              self:add(the.rocks)
132
117
 
133
118
              the.cursor = Cursor:new()
134
119
              self:add(the.cursor)
135
120
 
136
121
              the.score = Text:new{
137
 
                 x = 8,
138
 
                 y = 8,
139
122
                 width = the.app.width,
140
 
                 --align = 'center',
 
123
                 align = 'center',
141
124
                 font = 25}
142
 
              the.interface:add(the.score)
 
125
              self:add(the.score)
143
126
 
144
127
              local hs = the.storage.data.highScore
145
128
              local m = hs / 60
146
129
              local s = hs % 60
147
130
 
148
131
              the.highScore = Text:new{
149
 
                 x = -8,
150
 
                 y = 8,
151
132
                 width = the.app.width,
152
133
                 align = 'right',
153
134
                 font = 25,
154
135
                 text = string.format('High Score: %d:%02d', m, s)
155
136
              }
156
 
              the.interface:add(the.highScore)
157
 
 
158
 
              the.over = Text:new{
159
 
                 y = the.app.height / 2,
160
 
                 width = the.app.width,
161
 
                 align = 'center',
162
 
                 font = 25,
163
 
                 text = "Game Over",
164
 
                 visible = false
165
 
              }
166
 
              the.interface:add(the.over)
167
 
 
168
 
 
169
 
              the.instructions = Text:new{
170
 
                 y = the.app.height / 2 + 32,
171
 
                 width = the.app.width,
172
 
                 align = 'center',
173
 
                 font = 12,
174
 
                 text = "Press Enter to start a new game\nPress Q to quit",
175
 
                 visible = false
176
 
              }
177
 
              the.interface:add(the.instructions)
 
137
              self:add(the.highScore)
178
138
 
179
139
              love.mouse.setGrab(true)
180
140
              love.mouse.setVisible(false)
187
147
              self.gameStart = love.timer.getTime()
188
148
           end,
189
149
   onUpdate = function(self, dt)
190
 
                 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
191
151
                    local unseenRock = nil
192
152
                    while not unseenRock do
193
153
                       local rock = Rock:new{
225
185
                 -- end
226
186
              end,
227
187
   onEndFrame = function(self)
228
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
229
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
230
 
 
231
188
                   if the.player.active then
232
189
                      self:updateScore()
233
190
                   end
234
191
                end,
235
192
   draw = function (self, x, y)
236
193
             View.draw(self, x, y)
237
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
194
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
238
195
          end,
239
196
   updateScore = function(self)
240
197
                    local t = love.timer.getTime() - self.gameStart
242
199
                    local s = t % 60
243
200
 
244
201
                    the.score.text = string.format('Score: %d:%02d', m, s)
245
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
246
 
                    --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
247
204
 
248
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
249
 
                    --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
250
207
                 end
251
208
}
252
209
 
271
228
              math.randomseed(os.time())
272
229
 
273
230
              self.view = GameView:new()
274
 
 
275
 
              -- should fail silently if it can't go to fullscreen...
276
 
              love.graphics.toggleFullscreen()
277
 
 
278
231
              if DEBUG then
279
232
                 self.console:watch('VERSION', 'VERSION')
280
233
                 self.console:watch('updateTook', 'the.updateTook')
291
244
              end
292
245
           end,
293
246
   onUpdate = function (self, dt)
294
 
                 if the.keys:justPressed('q') then
 
247
                 if the.keys:justPressed('escape') then
295
248
                    self.quit()
296
 
                 elseif the.keys:justPressed('return') then
297
 
                    if the.keys:pressed('alt') then
298
 
                       love.graphics.toggleFullscreen()
299
 
                    else
300
 
                       self.view = GameView:new()
301
 
                    end
302
 
                 elseif the.keys:justPressed('f1') then
303
 
                    local ss = love.graphics.newScreenshot()
304
 
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
305
 
                 elseif the.keys:justPressed('f11') then
306
 
                    love.graphics.toggleFullscreen()
307
249
                 end
308
250
              end,
309
251
   update = function (self, dt)