/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:53:05 UTC
  • Revision ID: josh@9ix.org-20130616035305-33ca39wd4q3q4v13
bullets don't go through planets

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)
123
125
              self:add(the.interface)
124
126
 
125
127
              for _ = 1, math.random(6) do
126
 
                 local planet = Tile:new{
127
 
                    image = 'data/planet1.png',
 
128
                 local planet = Planet:new{
128
129
                    x = math.random(the.app.width / 2,
129
130
                                    the.bg.width - the.app.width / 2),
130
131
                    y = math.random(the.app.height / 2,
132
133
                    rotation = math.random() * math.pi
133
134
                 }
134
135
                 the.planets:add(planet)
135
 
 
136
 
                 planet.indicator = Tile:new{
137
 
                    image = 'data/planet1ind.png',
138
 
                 }
139
 
                 the.indicators:add(planet.indicator)
140
136
              end
141
137
 
142
138
              the.cursor = Cursor:new()
196
192
              self.gameStart = love.timer.getTime()
197
193
           end,
198
194
   onUpdate = function(self, dt)
199
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
200
 
                    local unseenRock = nil
201
 
                    while not unseenRock do
202
 
                       local rock = Rock:new{
203
 
                          x = math.random(the.app.width / 2,
204
 
                                          the.bg.width - the.app.width / 2),
205
 
                          y = math.random(the.app.height / 2,
206
 
                                          the.bg.height - the.app.height / 2),
207
 
                          velocity = {
208
 
                             x = math.random(-300, 300),
209
 
                             y = math.random(-300, 300),
210
 
                             rotation = math.random(-7, 7)
211
 
                          },
212
 
                          scale = math.random() + 0.5
213
 
                       }
214
 
 
215
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
216
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
217
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
218
 
                         unseenRock = rock
219
 
                        end
220
 
                    end
221
 
 
222
 
                    the.rocks:add(unseenRock)
223
 
 
224
 
                    self.lastRock = love.timer.getTime()
225
 
                 end
226
 
 
227
 
                 the.bullets:collide(the.rockColliders)
 
195
                 the.bullets:collide(the.planets)
228
196
 
229
197
                 -- this should really go somewhere else...
230
198
                 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
199
                 end
259
200
 
260
201
                 -- for _, mirror in ipairs(the.mirrors.sprites) do