/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-10 21:37:59 UTC
  • Revision ID: josh@9ix.org-20130610213759-drnecjpritehmz3t
bigger area, more planets

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
              the.interface = Group:new()
 
99
              the.planets = Group:new()
98
100
 
99
101
              the.bg = Tile:new{
100
102
                 image = 'data/stars3.png',
101
 
                 -- 1366x768 * 3
102
 
                 width = 4098,
103
 
                 height = 2304
 
103
                 width = 13660,
 
104
                 height = 7680
104
105
              }
105
106
              self:add(the.bg)
106
107
 
 
108
              self:add(the.planets)
 
109
 
107
110
              --the.player = CrystalPlayer:new{x=400,y=300}
108
111
              the.player = SpacePlayer:new{x=1366,y=768}
109
112
              self:add(the.player)
 
113
              self:add(the.player.thrust)
110
114
 
111
115
              --self:add(Enemy:new{x=400, y=300})
112
116
 
113
117
              self:add(the.bullets)
114
 
              self:add(the.rockColliders)
 
118
              --self:add(the.rockColliders)
115
119
              self:add(the.mirrors)
116
 
              self:add(the.rocks)
 
120
              --self:add(the.rocks)
 
121
              self:add(the.interface)
 
122
 
 
123
              for _ = 1, math.random(6) do
 
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
                    rotation = math.random() * math.pi
 
131
                 }
 
132
                 the.planets:add(planet)
 
133
              end
117
134
 
118
135
              the.cursor = Cursor:new()
119
136
              self:add(the.cursor)
120
137
 
121
138
              the.score = Text:new{
 
139
                 x = 8,
 
140
                 y = 8,
122
141
                 width = the.app.width,
123
 
                 align = 'center',
 
142
                 --align = 'center',
124
143
                 font = 25}
125
 
              self:add(the.score)
 
144
              the.interface:add(the.score)
126
145
 
127
146
              local hs = the.storage.data.highScore
128
147
              local m = hs / 60
129
148
              local s = hs % 60
130
149
 
131
150
              the.highScore = Text:new{
 
151
                 x = -8,
 
152
                 y = 8,
132
153
                 width = the.app.width,
133
154
                 align = 'right',
134
155
                 font = 25,
135
156
                 text = string.format('High Score: %d:%02d', m, s)
136
157
              }
137
 
              self:add(the.highScore)
 
158
              the.interface:add(the.highScore)
 
159
 
 
160
              the.over = Text:new{
 
161
                 y = the.app.height / 2,
 
162
                 width = the.app.width,
 
163
                 align = 'center',
 
164
                 font = 25,
 
165
                 text = "Game Over",
 
166
                 visible = false
 
167
              }
 
168
              the.interface:add(the.over)
 
169
 
 
170
 
 
171
              the.instructions = Text:new{
 
172
                 y = the.app.height / 2 + 32,
 
173
                 width = the.app.width,
 
174
                 align = 'center',
 
175
                 font = 12,
 
176
                 text = "Press Enter to start a new game\nPress Q to quit",
 
177
                 visible = false
 
178
              }
 
179
              the.interface:add(the.instructions)
138
180
 
139
181
              love.mouse.setGrab(true)
140
182
              love.mouse.setVisible(false)
147
189
              self.gameStart = love.timer.getTime()
148
190
           end,
149
191
   onUpdate = function(self, dt)
150
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
192
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
151
193
                    local unseenRock = nil
152
194
                    while not unseenRock do
153
195
                       local rock = Rock:new{
185
227
                 -- end
186
228
              end,
187
229
   onEndFrame = function(self)
 
230
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
231
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
232
 
188
233
                   if the.player.active then
189
 
                      local t = love.timer.getTime() - self.gameStart
190
 
                      local m = t / 60
191
 
                      local s = t % 60
192
 
 
193
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
194
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
 
                      the.score.x = the.player.x - the.app.width / 2
 
234
                      self:updateScore()
196
235
                   end
197
 
 
198
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
 
                   the.highScore.x = the.player.x - the.app.width / 2
200
236
                end,
201
237
   draw = function (self, x, y)
202
238
             View.draw(self, x, y)
203
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
 
          end
 
239
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
240
          end,
 
241
   updateScore = function(self)
 
242
                    local t = love.timer.getTime() - self.gameStart
 
243
                    local m = t / 60
 
244
                    local s = t % 60
 
245
 
 
246
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
247
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
248
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
249
 
 
250
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
251
                    --the.highScore.x = the.player.x - the.app.width / 2
 
252
                 end
205
253
}
206
254
 
207
255
MenuScreen = View:extend {
225
273
              math.randomseed(os.time())
226
274
 
227
275
              self.view = GameView:new()
 
276
 
 
277
              -- should fail silently if it can't go to fullscreen...
 
278
              love.graphics.toggleFullscreen()
 
279
 
228
280
              if DEBUG then
229
281
                 self.console:watch('VERSION', 'VERSION')
230
282
                 self.console:watch('updateTook', 'the.updateTook')
234
286
                 self.console:watch('the.app.height', 'the.app.height')
235
287
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
236
288
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
289
                 self.console:watch('num planets', '#the.planets.sprites')
237
290
                 --self.console:watch('drawTook', 'the.drawTook')
238
291
 
239
292
                 -- back off that dark overlay a bit
241
294
              end
242
295
           end,
243
296
   onUpdate = function (self, dt)
244
 
                 if the.keys:justPressed('escape') then
245
 
                    self.quit()
 
297
                 if not (DEBUG and the.console.visible) then
 
298
                    if the.keys:justPressed('q') then
 
299
                       self.quit()
 
300
                    elseif the.keys:justPressed('return') then
 
301
                       if the.keys:pressed('alt') then
 
302
                          love.graphics.toggleFullscreen()
 
303
                       else
 
304
                          self.view = GameView:new()
 
305
                       end
 
306
                    elseif the.keys:justPressed('f1') then
 
307
                       local ss = love.graphics.newScreenshot()
 
308
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
309
                    elseif the.keys:justPressed('f11') then
 
310
                       love.graphics.toggleFullscreen()
 
311
                    end
246
312
                 end
247
313
              end,
248
314
   update = function (self, dt)