/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)
97
99
              --the.rocks = Group:new()
98
100
              the.interface = Group:new()
99
101
              the.planets = Group:new()
 
102
              the.indicators = Group:new()
100
103
 
101
104
              the.bg = Tile:new{
102
105
                 image = 'data/stars3.png',
108
111
              self:add(the.planets)
109
112
 
110
113
              --the.player = CrystalPlayer:new{x=400,y=300}
111
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
114
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
115
              self:add(the.player)
113
116
              self:add(the.player.thrust)
114
117
 
118
121
              --self:add(the.rockColliders)
119
122
              self:add(the.mirrors)
120
123
              --self:add(the.rocks)
 
124
              self:add(the.indicators)
121
125
              self:add(the.interface)
122
126
 
123
127
              for _ = 1, math.random(6) do
124
 
                 local planet = Tile:new{
125
 
                    image = 'data/planet1.png',
 
128
                 local planet = Planet:new{
126
129
                    x = math.random(the.app.width / 2,
127
130
                                    the.bg.width - the.app.width / 2),
128
131
                    y = math.random(the.app.height / 2,
141
144
                 width = the.app.width,
142
145
                 --align = 'center',
143
146
                 font = 25}
144
 
              the.interface:add(the.score)
 
147
              --the.interface:add(the.score)
145
148
 
146
149
              local hs = the.storage.data.highScore
147
150
              local m = hs / 60
155
158
                 font = 25,
156
159
                 text = string.format('High Score: %d:%02d', m, s)
157
160
              }
158
 
              the.interface:add(the.highScore)
 
161
              --the.interface:add(the.highScore)
159
162
 
160
163
              the.over = Text:new{
161
164
                 y = the.app.height / 2,
219
222
 
220
223
                 the.bullets:collide(the.rockColliders)
221
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
 
222
256
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
223
257
                 --    if not mirror.of then
224
258
                 --       print('mirror:' .. inspect(mirror))
274
308
 
275
309
              self.view = GameView:new()
276
310
 
277
 
              -- should fail silently if it can't go to fullscreen...
278
 
              love.graphics.toggleFullscreen()
279
 
 
280
311
              if DEBUG then
281
312
                 self.console:watch('VERSION', 'VERSION')
282
313
                 self.console:watch('updateTook', 'the.updateTook')
319
350
               end
320
351
            end
321
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'