/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-16 03:32:01 UTC
  • Revision ID: josh@9ix.org-20130616033201-91uqlfnqa6cgo989
make sure every planet trades something

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
19
21
 
20
22
util = {
21
23
   signOf = function(value)
91
93
                 the.storage.data = {highScore = 0}
92
94
              end
93
95
 
94
 
              the.rockColliders = Group:new()
 
96
              --the.rockColliders = Group:new()
95
97
              the.bullets = Group:new()
96
98
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
 
99
              --the.rocks = Group:new()
98
100
              the.interface = Group:new()
 
101
              the.planets = Group:new()
 
102
              the.indicators = Group:new()
99
103
 
100
104
              the.bg = Tile:new{
101
105
                 image = 'data/stars3.png',
102
 
                 -- 1366x768 * 3
103
 
                 width = 4098,
104
 
                 height = 2304
 
106
                 width = 13660,
 
107
                 height = 7680
105
108
              }
106
109
              self:add(the.bg)
107
110
 
 
111
              self:add(the.planets)
 
112
 
108
113
              --the.player = CrystalPlayer:new{x=400,y=300}
109
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
114
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
115
              self:add(the.player)
111
116
              self:add(the.player.thrust)
112
117
 
113
118
              --self:add(Enemy:new{x=400, y=300})
114
119
 
115
120
              self:add(the.bullets)
116
 
              self:add(the.rockColliders)
 
121
              --self:add(the.rockColliders)
117
122
              self:add(the.mirrors)
118
 
              self:add(the.rocks)
 
123
              --self:add(the.rocks)
 
124
              self:add(the.indicators)
119
125
              self:add(the.interface)
120
126
 
 
127
              for _ = 1, math.random(6) do
 
128
                 local planet = Planet:new{
 
129
                    x = math.random(the.app.width / 2,
 
130
                                    the.bg.width - the.app.width / 2),
 
131
                    y = math.random(the.app.height / 2,
 
132
                                    the.bg.height - the.app.height / 2),
 
133
                    rotation = math.random() * math.pi
 
134
                 }
 
135
                 the.planets:add(planet)
 
136
              end
 
137
 
121
138
              the.cursor = Cursor:new()
122
139
              self:add(the.cursor)
123
140
 
127
144
                 width = the.app.width,
128
145
                 --align = 'center',
129
146
                 font = 25}
130
 
              the.interface:add(the.score)
 
147
              --the.interface:add(the.score)
131
148
 
132
149
              local hs = the.storage.data.highScore
133
150
              local m = hs / 60
141
158
                 font = 25,
142
159
                 text = string.format('High Score: %d:%02d', m, s)
143
160
              }
144
 
              the.interface:add(the.highScore)
 
161
              --the.interface:add(the.highScore)
145
162
 
146
163
              the.over = Text:new{
147
164
                 y = the.app.height / 2,
175
192
              self.gameStart = love.timer.getTime()
176
193
           end,
177
194
   onUpdate = function(self, dt)
178
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
195
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
179
196
                    local unseenRock = nil
180
197
                    while not unseenRock do
181
198
                       local rock = Rock:new{
205
222
 
206
223
                 the.bullets:collide(the.rockColliders)
207
224
 
 
225
                 -- this should really go somewhere else...
 
226
                 for _, planet in ipairs(the.planets.sprites) do
 
227
                    local indx, indy
 
228
                    local pvec = vector.new(
 
229
                       planet.x - the.player.x + planet.width / 2,
 
230
                       planet.y - the.player.y + planet.height / 2 )
 
231
 
 
232
                    -- TODO: is there a better way to specify the
 
233
                    -- screen rectangle?
 
234
                    if planet:intersects(the.player.x - the.app.width / 2,
 
235
                                         the.player.y - the.app.height / 2,
 
236
                                         the.app.width,
 
237
                                         the.app.height) then
 
238
                       -- planet is on the screen
 
239
                       planet.indicator.visible = false
 
240
                    else
 
241
                       planet.indicator.visible = true
 
242
 
 
243
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
 
244
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
 
245
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
246
                       else
 
247
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
248
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
 
249
                       end
 
250
 
 
251
                       planet.indicator.x = the.player.x + indx
 
252
                       planet.indicator.y = the.player.y + indy
 
253
                    end
 
254
                 end
 
255
 
208
256
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
209
257
                 --    if not mirror.of then
210
258
                 --       print('mirror:' .. inspect(mirror))
260
308
 
261
309
              self.view = GameView:new()
262
310
 
263
 
              -- should fail silently if it can't go to fullscreen...
264
 
              love.graphics.toggleFullscreen()
265
 
 
266
311
              if DEBUG then
267
312
                 self.console:watch('VERSION', 'VERSION')
268
313
                 self.console:watch('updateTook', 'the.updateTook')
272
317
                 self.console:watch('the.app.height', 'the.app.height')
273
318
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
274
319
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
320
                 self.console:watch('num planets', '#the.planets.sprites')
275
321
                 --self.console:watch('drawTook', 'the.drawTook')
276
322
 
277
323
                 -- back off that dark overlay a bit
279
325
              end
280
326
           end,
281
327
   onUpdate = function (self, dt)
282
 
                 if the.keys:justPressed('q') then
283
 
                    self.quit()
284
 
                 elseif the.keys:justPressed('return') then
285
 
                    if the.keys:pressed('alt') then
 
328
                 if not (DEBUG and the.console.visible) then
 
329
                    if the.keys:justPressed('q') then
 
330
                       self.quit()
 
331
                    elseif the.keys:justPressed('return') then
 
332
                       if the.keys:pressed('alt') then
 
333
                          love.graphics.toggleFullscreen()
 
334
                       else
 
335
                          self.view = GameView:new()
 
336
                       end
 
337
                    elseif the.keys:justPressed('f1') then
 
338
                       local ss = love.graphics.newScreenshot()
 
339
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
340
                    elseif the.keys:justPressed('f11') then
286
341
                       love.graphics.toggleFullscreen()
287
 
                    else
288
 
                       self.view = GameView:new()
289
342
                    end
290
 
                 elseif the.keys:justPressed('f1') then
291
 
                    local ss = love.graphics.newScreenshot()
292
 
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
293
 
                 elseif the.keys:justPressed('f11') then
294
 
                    love.graphics.toggleFullscreen()
295
343
                 end
296
344
              end,
297
345
   update = function (self, dt)
302
350
               end
303
351
            end
304
352
}
 
353
 
 
354
realRun = love.run
 
355
function love.run()
 
356
   -- should fail silently if it can't go to fullscreen...
 
357
   love.graphics.toggleFullscreen()
 
358
 
 
359
   realRun()
 
360
end
 
 
b'\\ No newline at end of file'