/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-06-09 23:09:16 UTC
  • Revision ID: josh@9ix.org-20130609230916-jdtvrn226f3vnijm
add planet, remove rocks

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
97
97
              --the.rocks = Group:new()
98
98
              the.interface = Group:new()
99
99
              the.planets = Group:new()
100
 
              the.indicators = Group:new()
101
100
 
102
101
              the.bg = Tile:new{
103
102
                 image = 'data/stars3.png',
104
 
                 width = 13660,
105
 
                 height = 7680
 
103
                 -- 1366x768 * 3
 
104
                 width = 4098,
 
105
                 height = 2304
106
106
              }
107
107
              self:add(the.bg)
108
108
 
119
119
              --self:add(the.rockColliders)
120
120
              self:add(the.mirrors)
121
121
              --self:add(the.rocks)
122
 
              self:add(the.indicators)
123
122
              self:add(the.interface)
124
123
 
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
 
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)
141
132
 
142
133
              the.cursor = Cursor:new()
143
134
              self:add(the.cursor)
148
139
                 width = the.app.width,
149
140
                 --align = 'center',
150
141
                 font = 25}
151
 
              --the.interface:add(the.score)
 
142
              the.interface:add(the.score)
152
143
 
153
144
              local hs = the.storage.data.highScore
154
145
              local m = hs / 60
162
153
                 font = 25,
163
154
                 text = string.format('High Score: %d:%02d', m, s)
164
155
              }
165
 
              --the.interface:add(the.highScore)
 
156
              the.interface:add(the.highScore)
166
157
 
167
158
              the.over = Text:new{
168
159
                 y = the.app.height / 2,
226
217
 
227
218
                 the.bullets:collide(the.rockColliders)
228
219
 
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
220
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
261
221
                 --    if not mirror.of then
262
222
                 --       print('mirror:' .. inspect(mirror))
312
272
 
313
273
              self.view = GameView:new()
314
274
 
 
275
              -- should fail silently if it can't go to fullscreen...
 
276
              love.graphics.toggleFullscreen()
 
277
 
315
278
              if DEBUG then
316
279
                 self.console:watch('VERSION', 'VERSION')
317
280
                 self.console:watch('updateTook', 'the.updateTook')
321
284
                 self.console:watch('the.app.height', 'the.app.height')
322
285
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
323
286
                 self.console:watch('num rocks', '#the.rocks.sprites')
324
 
                 self.console:watch('num planets', '#the.planets.sprites')
325
287
                 --self.console:watch('drawTook', 'the.drawTook')
326
288
 
327
289
                 -- back off that dark overlay a bit
329
291
              end
330
292
           end,
331
293
   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
 
294
                 if the.keys:justPressed('q') then
 
295
                    self.quit()
 
296
                 elseif the.keys:justPressed('return') then
 
297
                    if the.keys:pressed('alt') then
345
298
                       love.graphics.toggleFullscreen()
 
299
                    else
 
300
                       self.view = GameView:new()
346
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()
347
307
                 end
348
308
              end,
349
309
   update = function (self, dt)
354
314
               end
355
315
            end
356
316
}
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'