/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-05-20 16:58:11 UTC
  • Revision ID: josh@9ix.org-20130520165811-wt18btbst2h0ftr6
remove fps counter

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'
21
19
 
22
20
util = {
23
21
   signOf = function(value)
93
91
                 the.storage.data = {highScore = 0}
94
92
              end
95
93
 
96
 
              --the.rockColliders = Group:new()
 
94
              the.rockColliders = Group:new()
97
95
              the.bullets = Group:new()
98
96
              the.mirrors = Group:new()
99
 
              --the.rocks = Group:new()
100
 
              the.interface = Group:new()
101
 
              the.planets = Group:new()
102
 
              the.indicators = Group:new()
 
97
              the.rocks = Group:new()
103
98
 
104
99
              the.bg = Tile:new{
105
100
                 image = 'data/stars3.png',
106
 
                 width = 13660,
107
 
                 height = 7680
 
101
                 -- 1366x768 * 3
 
102
                 width = 4098,
 
103
                 height = 2304
108
104
              }
109
105
              self:add(the.bg)
110
106
 
111
 
              self:add(the.planets)
112
 
 
113
107
              --the.player = CrystalPlayer:new{x=400,y=300}
114
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
108
              the.player = SpacePlayer:new{x=1366,y=768}
115
109
              self:add(the.player)
116
 
              self:add(the.player.thrust)
117
110
 
118
111
              --self:add(Enemy:new{x=400, y=300})
119
112
 
120
113
              self:add(the.bullets)
121
 
              --self:add(the.rockColliders)
 
114
              self:add(the.rockColliders)
122
115
              self:add(the.mirrors)
123
 
              --self:add(the.rocks)
124
 
              self:add(the.indicators)
125
 
              self:add(the.interface)
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
 
116
              self:add(the.rocks)
137
117
 
138
118
              the.cursor = Cursor:new()
139
119
              self:add(the.cursor)
140
120
 
141
121
              the.score = Text:new{
142
 
                 x = 8,
143
 
                 y = 8,
144
122
                 width = the.app.width,
145
123
                 --align = 'center',
146
124
                 font = 25}
147
 
              --the.interface:add(the.score)
 
125
              self:add(the.score)
148
126
 
149
127
              local hs = the.storage.data.highScore
150
128
              local m = hs / 60
151
129
              local s = hs % 60
152
130
 
153
131
              the.highScore = Text:new{
154
 
                 x = -8,
155
 
                 y = 8,
156
132
                 width = the.app.width,
157
133
                 align = 'right',
158
134
                 font = 25,
159
135
                 text = string.format('High Score: %d:%02d', m, s)
160
136
              }
161
 
              --the.interface:add(the.highScore)
162
 
 
163
 
              the.over = Text:new{
164
 
                 y = the.app.height / 2,
165
 
                 width = the.app.width,
166
 
                 align = 'center',
167
 
                 font = 25,
168
 
                 text = "Game Over",
169
 
                 visible = false
170
 
              }
171
 
              the.interface:add(the.over)
172
 
 
173
 
 
174
 
              the.instructions = Text:new{
175
 
                 y = the.app.height / 2 + 32,
176
 
                 width = the.app.width,
177
 
                 align = 'center',
178
 
                 font = 12,
179
 
                 text = "Press Enter to start a new game\nPress Q to quit",
180
 
                 visible = false
181
 
              }
182
 
              the.interface:add(the.instructions)
 
137
              self:add(the.highScore)
183
138
 
184
139
              love.mouse.setGrab(true)
185
140
              love.mouse.setVisible(false)
192
147
              self.gameStart = love.timer.getTime()
193
148
           end,
194
149
   onUpdate = function(self, dt)
195
 
                 the.bullets:collide(the.planets)
196
 
 
197
 
                 -- this should really go somewhere else...
198
 
                 for _, planet in ipairs(the.planets.sprites) do
 
150
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
151
                    local unseenRock = nil
 
152
                    while not unseenRock do
 
153
                       local rock = Rock:new{
 
154
                          x = math.random(the.app.width / 2,
 
155
                                          the.bg.width - the.app.width / 2),
 
156
                          y = math.random(the.app.height / 2,
 
157
                                          the.bg.height - the.app.height / 2),
 
158
                          velocity = {
 
159
                             x = math.random(-300, 300),
 
160
                             y = math.random(-300, 300),
 
161
                             rotation = math.random(-7, 7)
 
162
                          },
 
163
                          scale = math.random() + 0.5
 
164
                       }
 
165
 
 
166
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
167
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
168
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
169
                         unseenRock = rock
 
170
                        end
 
171
                    end
 
172
 
 
173
                    the.rocks:add(unseenRock)
 
174
 
 
175
                    self.lastRock = love.timer.getTime()
199
176
                 end
200
177
 
 
178
                 the.bullets:collide(the.rockColliders)
 
179
 
201
180
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
202
181
                 --    if not mirror.of then
203
182
                 --       print('mirror:' .. inspect(mirror))
206
185
                 -- end
207
186
              end,
208
187
   onEndFrame = function(self)
209
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
210
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
211
 
 
212
188
                   if the.player.active then
213
189
                      self:updateScore()
214
190
                   end
223
199
                    local s = t % 60
224
200
 
225
201
                    the.score.text = string.format('Score: %d:%02d', m, s)
226
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
227
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
202
                    the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
203
                    the.score.x = the.player.x - the.app.width / 2 + the.player.width
228
204
 
229
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
230
 
                    --the.highScore.x = the.player.x - the.app.width / 2
 
205
                    the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
206
                    the.highScore.x = the.player.x - the.app.width / 2
231
207
                 end
232
208
}
233
209
 
252
228
              math.randomseed(os.time())
253
229
 
254
230
              self.view = GameView:new()
255
 
 
256
231
              if DEBUG then
257
232
                 self.console:watch('VERSION', 'VERSION')
258
233
                 self.console:watch('updateTook', 'the.updateTook')
262
237
                 self.console:watch('the.app.height', 'the.app.height')
263
238
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
264
239
                 self.console:watch('num rocks', '#the.rocks.sprites')
265
 
                 self.console:watch('num planets', '#the.planets.sprites')
266
240
                 --self.console:watch('drawTook', 'the.drawTook')
267
241
 
268
242
                 -- back off that dark overlay a bit
270
244
              end
271
245
           end,
272
246
   onUpdate = function (self, dt)
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
 
247
                 if the.keys:justPressed('escape') then
 
248
                    self.quit()
288
249
                 end
289
250
              end,
290
251
   update = function (self, dt)
295
256
               end
296
257
            end
297
258
}
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'