/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)
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,
189
192
              self.gameStart = love.timer.getTime()
190
193
           end,
191
194
   onUpdate = function(self, dt)
192
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
193
 
                    local unseenRock = nil
194
 
                    while not unseenRock do
195
 
                       local rock = Rock:new{
196
 
                          x = math.random(the.app.width / 2,
197
 
                                          the.bg.width - the.app.width / 2),
198
 
                          y = math.random(the.app.height / 2,
199
 
                                          the.bg.height - the.app.height / 2),
200
 
                          velocity = {
201
 
                             x = math.random(-300, 300),
202
 
                             y = math.random(-300, 300),
203
 
                             rotation = math.random(-7, 7)
204
 
                          },
205
 
                          scale = math.random() + 0.5
206
 
                       }
207
 
 
208
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
209
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
210
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
211
 
                         unseenRock = rock
212
 
                        end
213
 
                    end
214
 
 
215
 
                    the.rocks:add(unseenRock)
216
 
 
217
 
                    self.lastRock = love.timer.getTime()
 
195
                 the.bullets:collide(the.planets)
 
196
 
 
197
                 -- this should really go somewhere else...
 
198
                 for _, planet in ipairs(the.planets.sprites) do
218
199
                 end
219
200
 
220
 
                 the.bullets:collide(the.rockColliders)
221
 
 
222
201
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
223
202
                 --    if not mirror.of then
224
203
                 --       print('mirror:' .. inspect(mirror))
274
253
 
275
254
              self.view = GameView:new()
276
255
 
277
 
              -- should fail silently if it can't go to fullscreen...
278
 
              love.graphics.toggleFullscreen()
279
 
 
280
256
              if DEBUG then
281
257
                 self.console:watch('VERSION', 'VERSION')
282
258
                 self.console:watch('updateTook', 'the.updateTook')
319
295
               end
320
296
            end
321
297
}
 
298
 
 
299
realRun = love.run
 
300
function love.run()
 
301
   -- should fail silently if it can't go to fullscreen...
 
302
   love.graphics.toggleFullscreen()
 
303
 
 
304
   realRun()
 
305
end
 
 
b'\\ No newline at end of file'