/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-11 00:18:49 UTC
  • Revision ID: josh@9ix.org-20130611001849-jqr0t1zzhhvcjxjo
put player in center of map

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()
 
97
              --the.rocks = Group:new()
98
98
              the.interface = Group:new()
 
99
              the.planets = Group:new()
 
100
              the.indicators = Group:new()
99
101
 
100
102
              the.bg = Tile:new{
101
103
                 image = 'data/stars3.png',
102
 
                 -- 1366x768 * 3
103
 
                 width = 4098,
104
 
                 height = 2304
 
104
                 width = 13660,
 
105
                 height = 7680
105
106
              }
106
107
              self:add(the.bg)
107
108
 
 
109
              self:add(the.planets)
 
110
 
108
111
              --the.player = CrystalPlayer:new{x=400,y=300}
109
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
112
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
113
              self:add(the.player)
111
114
              self:add(the.player.thrust)
112
115
 
113
116
              --self:add(Enemy:new{x=400, y=300})
114
117
 
115
118
              self:add(the.bullets)
116
 
              self:add(the.rockColliders)
 
119
              --self:add(the.rockColliders)
117
120
              self:add(the.mirrors)
118
 
              self:add(the.rocks)
 
121
              --self:add(the.rocks)
 
122
              self:add(the.indicators)
119
123
              self:add(the.interface)
120
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
 
141
 
121
142
              the.cursor = Cursor:new()
122
143
              self:add(the.cursor)
123
144
 
127
148
                 width = the.app.width,
128
149
                 --align = 'center',
129
150
                 font = 25}
130
 
              the.interface:add(the.score)
 
151
              --the.interface:add(the.score)
131
152
 
132
153
              local hs = the.storage.data.highScore
133
154
              local m = hs / 60
141
162
                 font = 25,
142
163
                 text = string.format('High Score: %d:%02d', m, s)
143
164
              }
144
 
              the.interface:add(the.highScore)
 
165
              --the.interface:add(the.highScore)
145
166
 
146
167
              the.over = Text:new{
147
168
                 y = the.app.height / 2,
175
196
              self.gameStart = love.timer.getTime()
176
197
           end,
177
198
   onUpdate = function(self, dt)
178
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
199
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
179
200
                    local unseenRock = nil
180
201
                    while not unseenRock do
181
202
                       local rock = Rock:new{
205
226
 
206
227
                 the.bullets:collide(the.rockColliders)
207
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 - 10) * util.signOf(pvec.x) + 8
 
249
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
 
250
                       else
 
251
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
252
                          indx = (the.app.height / 2 - 10) * 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
 
208
260
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
209
261
                 --    if not mirror.of then
210
262
                 --       print('mirror:' .. inspect(mirror))
260
312
 
261
313
              self.view = GameView:new()
262
314
 
263
 
              -- should fail silently if it can't go to fullscreen...
264
 
              love.graphics.toggleFullscreen()
265
 
 
266
315
              if DEBUG then
267
316
                 self.console:watch('VERSION', 'VERSION')
268
317
                 self.console:watch('updateTook', 'the.updateTook')
272
321
                 self.console:watch('the.app.height', 'the.app.height')
273
322
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
274
323
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
324
                 self.console:watch('num planets', '#the.planets.sprites')
275
325
                 --self.console:watch('drawTook', 'the.drawTook')
276
326
 
277
327
                 -- back off that dark overlay a bit
279
329
              end
280
330
           end,
281
331
   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
 
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
286
345
                       love.graphics.toggleFullscreen()
287
 
                    else
288
 
                       self.view = GameView:new()
289
346
                    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
347
                 end
296
348
              end,
297
349
   update = function (self, dt)
302
354
               end
303
355
            end
304
356
}
 
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'