/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:50:45 UTC
  • Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class

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)
91
93
                 the.storage.data = {highScore = 0}
92
94
              end
93
95
 
94
 
              the.rockColliders = Group:new()
 
96
              --the.rockColliders = Group:new()
95
97
              the.bullets = Group:new()
96
98
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
 
99
              --the.rocks = Group:new()
98
100
              the.interface = Group:new()
 
101
              the.planets = Group:new()
 
102
              the.indicators = Group:new()
99
103
 
100
104
              the.bg = Tile:new{
101
105
                 image = 'data/stars3.png',
102
 
                 -- 1366x768 * 3
103
 
                 width = 4098,
104
 
                 height = 2304
 
106
                 width = 13660,
 
107
                 height = 7680
105
108
              }
106
109
              self:add(the.bg)
107
110
 
 
111
              self:add(the.planets)
 
112
 
108
113
              --the.player = CrystalPlayer:new{x=400,y=300}
109
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
114
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
115
              self:add(the.player)
111
116
              self:add(the.player.thrust)
112
117
 
113
118
              --self:add(Enemy:new{x=400, y=300})
114
119
 
115
120
              self:add(the.bullets)
116
 
              self:add(the.rockColliders)
 
121
              --self:add(the.rockColliders)
117
122
              self:add(the.mirrors)
118
 
              self:add(the.rocks)
 
123
              --self:add(the.rocks)
 
124
              self:add(the.indicators)
119
125
              self:add(the.interface)
120
126
 
 
127
              for _ = 1, math.random(6) do
 
128
                 local planet = Planet:new{
 
129
                    x = math.random(the.app.width / 2,
 
130
                                    the.bg.width - the.app.width / 2),
 
131
                    y = math.random(the.app.height / 2,
 
132
                                    the.bg.height - the.app.height / 2),
 
133
                    rotation = math.random() * math.pi
 
134
                 }
 
135
                 the.planets:add(planet)
 
136
              end
 
137
 
121
138
              the.cursor = Cursor:new()
122
139
              self:add(the.cursor)
123
140
 
127
144
                 width = the.app.width,
128
145
                 --align = 'center',
129
146
                 font = 25}
130
 
              the.interface:add(the.score)
 
147
              --the.interface:add(the.score)
131
148
 
132
149
              local hs = the.storage.data.highScore
133
150
              local m = hs / 60
141
158
                 font = 25,
142
159
                 text = string.format('High Score: %d:%02d', m, s)
143
160
              }
144
 
              the.interface:add(the.highScore)
 
161
              --the.interface:add(the.highScore)
145
162
 
146
163
              the.over = Text:new{
147
164
                 y = the.app.height / 2,
175
192
              self.gameStart = love.timer.getTime()
176
193
           end,
177
194
   onUpdate = function(self, dt)
178
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
179
 
                    local unseenRock = nil
180
 
                    while not unseenRock do
181
 
                       local rock = Rock:new{
182
 
                          x = math.random(the.app.width / 2,
183
 
                                          the.bg.width - the.app.width / 2),
184
 
                          y = math.random(the.app.height / 2,
185
 
                                          the.bg.height - the.app.height / 2),
186
 
                          velocity = {
187
 
                             x = math.random(-300, 300),
188
 
                             y = math.random(-300, 300),
189
 
                             rotation = math.random(-7, 7)
190
 
                          },
191
 
                          scale = math.random() + 0.5
192
 
                       }
193
 
 
194
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
195
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
196
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
197
 
                         unseenRock = rock
198
 
                        end
199
 
                    end
200
 
 
201
 
                    the.rocks:add(unseenRock)
202
 
 
203
 
                    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
204
199
                 end
205
200
 
206
 
                 the.bullets:collide(the.rockColliders)
207
 
 
208
201
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
209
202
                 --    if not mirror.of then
210
203
                 --       print('mirror:' .. inspect(mirror))
259
252
              math.randomseed(os.time())
260
253
 
261
254
              self.view = GameView:new()
 
255
 
262
256
              if DEBUG then
263
257
                 self.console:watch('VERSION', 'VERSION')
264
258
                 self.console:watch('updateTook', 'the.updateTook')
268
262
                 self.console:watch('the.app.height', 'the.app.height')
269
263
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
270
264
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
265
                 self.console:watch('num planets', '#the.planets.sprites')
271
266
                 --self.console:watch('drawTook', 'the.drawTook')
272
267
 
273
268
                 -- back off that dark overlay a bit
275
270
              end
276
271
           end,
277
272
   onUpdate = function (self, dt)
278
 
                 if the.keys:justPressed('q') then
279
 
                    self.quit()
280
 
                 elseif the.keys:justPressed('return') then
281
 
                    self.view = GameView:new()
 
273
                 if not (DEBUG and the.console.visible) then
 
274
                    if the.keys:justPressed('q') then
 
275
                       self.quit()
 
276
                    elseif the.keys:justPressed('return') then
 
277
                       if the.keys:pressed('alt') then
 
278
                          love.graphics.toggleFullscreen()
 
279
                       else
 
280
                          self.view = GameView:new()
 
281
                       end
 
282
                    elseif the.keys:justPressed('f1') then
 
283
                       local ss = love.graphics.newScreenshot()
 
284
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
285
                    elseif the.keys:justPressed('f11') then
 
286
                       love.graphics.toggleFullscreen()
 
287
                    end
282
288
                 end
283
289
              end,
284
290
   update = function (self, dt)
289
295
               end
290
296
            end
291
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'