/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-16 02:22:30 UTC
  • Revision ID: josh@9ix.org-20130516022230-9mqgevjra6wmt3vf
keep score, center mouse on start

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
6
 
--inspect = require 'inspect'
7
6
 
8
7
require 'group'
9
8
 
84
83
              --    end
85
84
              -- end
86
85
 
87
 
              the.storage = Storage:new{filename = 'scores.lua'}
88
 
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
93
 
 
94
 
              --the.rockColliders = Group:new()
 
86
              the.rockColliders = Group:new()
95
87
              the.bullets = Group:new()
96
88
              the.mirrors = Group:new()
97
 
              --the.rocks = Group:new()
98
 
              the.interface = Group:new()
99
 
              the.planets = Group:new()
100
 
              the.indicators = Group:new()
 
89
              the.rocks = Group:new()
101
90
 
102
91
              the.bg = Tile:new{
103
92
                 image = 'data/stars3.png',
104
 
                 width = 13660,
105
 
                 height = 7680
 
93
                 -- 1366x768 * 3
 
94
                 width = 4098,
 
95
                 height = 2304
106
96
              }
107
97
              self:add(the.bg)
108
98
 
109
 
              self:add(the.planets)
110
 
 
111
99
              --the.player = CrystalPlayer:new{x=400,y=300}
112
100
              the.player = SpacePlayer:new{x=1366,y=768}
113
101
              self:add(the.player)
114
 
              self:add(the.player.thrust)
115
102
 
116
103
              --self:add(Enemy:new{x=400, y=300})
117
104
 
118
105
              self:add(the.bullets)
119
 
              --self:add(the.rockColliders)
 
106
              self:add(the.rockColliders)
120
107
              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
 
108
              self:add(the.rocks)
141
109
 
142
110
              the.cursor = Cursor:new()
143
111
              self:add(the.cursor)
144
112
 
145
113
              the.score = Text:new{
146
 
                 x = 8,
147
 
                 y = 8,
148
114
                 width = the.app.width,
149
 
                 --align = 'center',
 
115
                 align = 'center',
150
116
                 font = 25}
151
 
              --the.interface:add(the.score)
152
 
 
153
 
              local hs = the.storage.data.highScore
154
 
              local m = hs / 60
155
 
              local s = hs % 60
156
 
 
157
 
              the.highScore = Text:new{
158
 
                 x = -8,
159
 
                 y = 8,
160
 
                 width = the.app.width,
161
 
                 align = 'right',
162
 
                 font = 25,
163
 
                 text = string.format('High Score: %d:%02d', m, s)
164
 
              }
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)
 
117
              self:add(the.score)
187
118
 
188
119
              love.mouse.setGrab(true)
189
120
              love.mouse.setVisible(false)
196
127
              self.gameStart = love.timer.getTime()
197
128
           end,
198
129
   onUpdate = function(self, dt)
199
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
130
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
200
131
                    local unseenRock = nil
201
132
                    while not unseenRock do
202
133
                       local rock = Rock:new{
225
156
                 end
226
157
 
227
158
                 the.bullets:collide(the.rockColliders)
228
 
 
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
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
261
 
                 --    if not mirror.of then
262
 
                 --       print('mirror:' .. inspect(mirror))
263
 
                 --       error('mirror OF NOTHING')
264
 
                 --    end
265
 
                 -- end
266
159
              end,
267
160
   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
161
                   if the.player.active then
272
 
                      self:updateScore()
 
162
                      local t = love.timer.getTime() - self.gameStart
 
163
                      local m = t / 60
 
164
                      local s = t % 60
 
165
 
 
166
                      the.score.text = string.format('Score: %d:%02d', m, s)
 
167
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
168
                      the.score.x = the.player.x - the.app.width / 2
273
169
                   end
274
170
                end,
275
171
   draw = function (self, x, y)
276
172
             View.draw(self, x, y)
277
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
278
 
          end,
279
 
   updateScore = function(self)
280
 
                    local t = love.timer.getTime() - self.gameStart
281
 
                    local m = t / 60
282
 
                    local s = t % 60
283
 
 
284
 
                    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
287
 
 
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
290
 
                 end
 
173
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
174
          end
291
175
}
292
176
 
293
177
MenuScreen = View:extend {
311
195
              math.randomseed(os.time())
312
196
 
313
197
              self.view = GameView:new()
314
 
 
315
198
              if DEBUG then
316
199
                 self.console:watch('VERSION', 'VERSION')
317
200
                 self.console:watch('updateTook', 'the.updateTook')
319
202
                 self.console:watch('the.player.y', 'the.player.y')
320
203
                 self.console:watch('the.app.width', 'the.app.width')
321
204
                 self.console:watch('the.app.height', 'the.app.height')
322
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
323
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
324
 
                 self.console:watch('num planets', '#the.planets.sprites')
325
205
                 --self.console:watch('drawTook', 'the.drawTook')
326
206
 
327
207
                 -- back off that dark overlay a bit
329
209
              end
330
210
           end,
331
211
   onUpdate = function (self, dt)
332
 
                 if not (DEBUG and the.console.visible) then
333
 
                    if the.keys:justPressed('q') then
334
 
                       self.quit()
335
 
                    elseif the.keys:justPressed('return') then
336
 
                       if the.keys:pressed('alt') then
337
 
                          love.graphics.toggleFullscreen()
338
 
                       else
339
 
                          self.view = GameView:new()
340
 
                       end
341
 
                    elseif the.keys:justPressed('f1') then
342
 
                       local ss = love.graphics.newScreenshot()
343
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
344
 
                    elseif the.keys:justPressed('f11') then
345
 
                       love.graphics.toggleFullscreen()
346
 
                    end
 
212
                 if the.keys:justPressed('escape') then
 
213
                    self.quit()
347
214
                 end
348
215
              end,
349
216
   update = function (self, dt)
354
221
               end
355
222
            end
356
223
}
357
 
 
358
 
realRun = love.run
359
 
function love.run()
360
 
   -- should fail silently if it can't go to fullscreen...
361
 
   love.graphics.toggleFullscreen()
362
 
 
363
 
   realRun()
364
 
end
 
 
b'\\ No newline at end of file'