/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-09 23:09:16 UTC
  • Revision ID: josh@9ix.org-20130609230916-jdtvrn226f3vnijm
add planet, remove rocks

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()
99
100
 
100
101
              the.bg = Tile:new{
101
102
                 image = 'data/stars3.png',
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
112
              the.player = SpacePlayer:new{x=1366,y=768}
110
113
              self:add(the.player)
 
114
              self:add(the.player.thrust)
111
115
 
112
116
              --self:add(Enemy:new{x=400, y=300})
113
117
 
114
118
              self:add(the.bullets)
115
 
              self:add(the.rockColliders)
 
119
              --self:add(the.rockColliders)
116
120
              self:add(the.mirrors)
117
 
              self:add(the.rocks)
 
121
              --self:add(the.rocks)
118
122
              self:add(the.interface)
119
123
 
 
124
              local planet = Tile:new{
 
125
                 image = 'data/planet1.png',
 
126
                 x = math.random(the.app.width / 2,
 
127
                                 the.bg.width - the.app.width / 2),
 
128
                 y = math.random(the.app.height / 2,
 
129
                                 the.bg.height - the.app.height / 2),
 
130
              }
 
131
              the.planets:add(planet)
 
132
 
120
133
              the.cursor = Cursor:new()
121
134
              self:add(the.cursor)
122
135
 
174
187
              self.gameStart = love.timer.getTime()
175
188
           end,
176
189
   onUpdate = function(self, dt)
177
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
190
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
178
191
                    local unseenRock = nil
179
192
                    while not unseenRock do
180
193
                       local rock = Rock:new{
258
271
              math.randomseed(os.time())
259
272
 
260
273
              self.view = GameView:new()
 
274
 
 
275
              -- should fail silently if it can't go to fullscreen...
 
276
              love.graphics.toggleFullscreen()
 
277
 
261
278
              if DEBUG then
262
279
                 self.console:watch('VERSION', 'VERSION')
263
280
                 self.console:watch('updateTook', 'the.updateTook')
274
291
              end
275
292
           end,
276
293
   onUpdate = function (self, dt)
277
 
                 if the.keys:justPressed('escape') then
 
294
                 if the.keys:justPressed('q') then
278
295
                    self.quit()
 
296
                 elseif the.keys:justPressed('return') then
 
297
                    if the.keys:pressed('alt') then
 
298
                       love.graphics.toggleFullscreen()
 
299
                    else
 
300
                       self.view = GameView:new()
 
301
                    end
 
302
                 elseif the.keys:justPressed('f1') then
 
303
                    local ss = love.graphics.newScreenshot()
 
304
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
305
                 elseif the.keys:justPressed('f11') then
 
306
                    love.graphics.toggleFullscreen()
279
307
                 end
280
308
              end,
281
309
   update = function (self, dt)