/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 17:57:53 UTC
  • Revision ID: josh@9ix.org-20130520175753-yvanutc9jnm8lzbt
quit and restart

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
95
95
              the.bullets = Group:new()
96
96
              the.mirrors = Group:new()
97
97
              the.rocks = Group:new()
 
98
              the.interface = Group:new()
98
99
 
99
100
              the.bg = Tile:new{
100
101
                 image = 'data/stars3.png',
114
115
              self:add(the.rockColliders)
115
116
              self:add(the.mirrors)
116
117
              self:add(the.rocks)
 
118
              self:add(the.interface)
117
119
 
118
120
              the.cursor = Cursor:new()
119
121
              self:add(the.cursor)
120
122
 
121
123
              the.score = Text:new{
 
124
                 x = 8,
 
125
                 y = 8,
122
126
                 width = the.app.width,
123
 
                 align = 'center',
 
127
                 --align = 'center',
124
128
                 font = 25}
125
 
              self:add(the.score)
 
129
              the.interface:add(the.score)
126
130
 
127
131
              local hs = the.storage.data.highScore
128
132
              local m = hs / 60
129
133
              local s = hs % 60
130
134
 
131
135
              the.highScore = Text:new{
 
136
                 x = -8,
 
137
                 y = 8,
132
138
                 width = the.app.width,
133
139
                 align = 'right',
134
140
                 font = 25,
135
141
                 text = string.format('High Score: %d:%02d', m, s)
136
142
              }
137
 
              self:add(the.highScore)
 
143
              the.interface:add(the.highScore)
 
144
 
 
145
              the.over = Text:new{
 
146
                 y = the.app.height / 2,
 
147
                 width = the.app.width,
 
148
                 align = 'center',
 
149
                 font = 25,
 
150
                 text = "Game Over",
 
151
                 visible = false
 
152
              }
 
153
              the.interface:add(the.over)
 
154
 
 
155
 
 
156
              the.instructions = Text:new{
 
157
                 y = the.app.height / 2 + 32,
 
158
                 width = the.app.width,
 
159
                 align = 'center',
 
160
                 font = 12,
 
161
                 text = "Press Enter to start a new game\nPress Q to quit",
 
162
                 visible = false
 
163
              }
 
164
              the.interface:add(the.instructions)
138
165
 
139
166
              love.mouse.setGrab(true)
140
167
              love.mouse.setVisible(false)
147
174
              self.gameStart = love.timer.getTime()
148
175
           end,
149
176
   onUpdate = function(self, dt)
150
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
177
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
151
178
                    local unseenRock = nil
152
179
                    while not unseenRock do
153
180
                       local rock = Rock:new{
185
212
                 -- end
186
213
              end,
187
214
   onEndFrame = function(self)
 
215
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
216
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
217
 
188
218
                   if the.player.active then
189
 
                      local t = love.timer.getTime() - self.gameStart
190
 
                      local m = t / 60
191
 
                      local s = t % 60
192
 
 
193
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
194
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
 
                      the.score.x = the.player.x - the.app.width / 2
 
219
                      self:updateScore()
196
220
                   end
197
 
 
198
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
 
                   the.highScore.x = the.player.x - the.app.width / 2
200
221
                end,
201
222
   draw = function (self, x, y)
202
223
             View.draw(self, x, y)
203
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
 
          end
 
224
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
225
          end,
 
226
   updateScore = function(self)
 
227
                    local t = love.timer.getTime() - self.gameStart
 
228
                    local m = t / 60
 
229
                    local s = t % 60
 
230
 
 
231
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
232
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
233
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
234
 
 
235
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
236
                    --the.highScore.x = the.player.x - the.app.width / 2
 
237
                 end
205
238
}
206
239
 
207
240
MenuScreen = View:extend {
233
266
                 self.console:watch('the.app.width', 'the.app.width')
234
267
                 self.console:watch('the.app.height', 'the.app.height')
235
268
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
269
                 self.console:watch('num rocks', '#the.rocks.sprites')
236
270
                 --self.console:watch('drawTook', 'the.drawTook')
237
271
 
238
272
                 -- back off that dark overlay a bit
240
274
              end
241
275
           end,
242
276
   onUpdate = function (self, dt)
243
 
                 if the.keys:justPressed('escape') then
 
277
                 if the.keys:justPressed('q') then
244
278
                    self.quit()
 
279
                 elseif the.keys:justPressed('return') then
 
280
                    self.view = GameView:new()
245
281
                 end
246
282
              end,
247
283
   update = function (self, dt)