/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-15 15:58:55 UTC
  • Revision ID: josh@9ix.org-20130615155855-3i8a1hotsohsi82g
break out planet

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'
19
20
 
20
21
util = {
21
22
   signOf = function(value)
109
110
              self:add(the.planets)
110
111
 
111
112
              --the.player = CrystalPlayer:new{x=400,y=300}
112
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
113
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
113
114
              self:add(the.player)
114
115
              self:add(the.player.thrust)
115
116
 
123
124
              self:add(the.interface)
124
125
 
125
126
              for _ = 1, math.random(6) do
126
 
                 local planet = Tile:new{
127
 
                    image = 'data/planet1.png',
 
127
                 local planet = Planet:new{
128
128
                    x = math.random(the.app.width / 2,
129
129
                                    the.bg.width - the.app.width / 2),
130
130
                    y = math.random(the.app.height / 2,
132
132
                    rotation = math.random() * math.pi
133
133
                 }
134
134
                 the.planets:add(planet)
135
 
 
136
 
                 planet.indicator = Tile:new{
137
 
                    image = 'data/planet1ind.png',
138
 
                 }
139
 
                 the.indicators:add(planet.indicator)
140
135
              end
141
136
 
142
137
              the.cursor = Cursor:new()
245
240
                       planet.indicator.visible = true
246
241
 
247
242
                       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)
 
243
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
 
244
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
250
245
                       else
251
 
                          indy = the.app.height / 2 * util.signOf(pvec.y) + 8
252
 
                          indx = the.app.height / 2 * pvec.x / math.abs(pvec.y)
 
246
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
 
247
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
253
248
                       end
254
249
 
255
250
                       planet.indicator.x = the.player.x + indx
312
307
 
313
308
              self.view = GameView:new()
314
309
 
315
 
              -- should fail silently if it can't go to fullscreen...
316
 
              love.graphics.toggleFullscreen()
317
 
 
318
310
              if DEBUG then
319
311
                 self.console:watch('VERSION', 'VERSION')
320
312
                 self.console:watch('updateTook', 'the.updateTook')
357
349
               end
358
350
            end
359
351
}
 
352
 
 
353
realRun = love.run
 
354
function love.run()
 
355
   -- should fail silently if it can't go to fullscreen...
 
356
   love.graphics.toggleFullscreen()
 
357
 
 
358
   realRun()
 
359
end
 
 
b'\\ No newline at end of file'