/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-19 01:12:39 UTC
  • Revision ID: josh@9ix.org-20130619011239-l1h3rnhphkpg0vdk
bring back game over screen

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
19
22
 
20
23
util = {
21
24
   signOf = function(value)
71
74
}
72
75
 
73
76
GameView = View:extend {
74
 
   lastRock = 0,
75
 
   rockInterval = 1,
76
 
   gameStart = 0,
77
77
   onNew = function (self)
78
 
              -- for x = 1,30 do
79
 
              --    for y = 1,30 do
80
 
              --       self:add(Fill:new{x=x*400, y=y*400,
81
 
              --                         width = 32, height = 32,
82
 
              --                         fill = {0,0,255}
83
 
              --                      })
84
 
              --    end
85
 
              -- end
86
 
 
87
78
              the.storage = Storage:new{filename = 'scores.lua'}
88
79
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
 
80
              --if not the.storage.data.highScore then
 
81
              --   print('initializing storage')
 
82
              --   the.storage.data = {highScore = 0}
 
83
              --end
93
84
 
94
 
              the.rockColliders = Group:new()
95
85
              the.bullets = Group:new()
96
 
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
98
86
              the.interface = Group:new()
 
87
              the.planets = Group:new()
 
88
              the.indicators = Group:new()
 
89
              the.enemies = Group:new()
99
90
 
100
91
              the.bg = Tile:new{
101
92
                 image = 'data/stars3.png',
102
 
                 -- 1366x768 * 3
103
 
                 width = 4098,
104
 
                 height = 2304
 
93
                 width = 13660,
 
94
                 height = 7680
105
95
              }
106
96
              self:add(the.bg)
107
97
 
 
98
              self:add(the.planets)
 
99
 
108
100
              --the.player = CrystalPlayer:new{x=400,y=300}
109
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
101
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
102
              self:add(the.player)
111
103
              self:add(the.player.thrust)
112
 
 
113
 
              --self:add(Enemy:new{x=400, y=300})
 
104
              self:add(the.player.shield)
 
105
 
 
106
              self:add(the.enemies)
 
107
 
 
108
              local e = Enemy:new{x=400, y=300}
 
109
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
110
              the.enemies:add(e)
 
111
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
112
              self:add(e.shield)
114
113
 
115
114
              self:add(the.bullets)
116
 
              self:add(the.rockColliders)
117
 
              self:add(the.mirrors)
118
 
              self:add(the.rocks)
 
115
              self:add(the.indicators)
119
116
              self:add(the.interface)
120
117
 
 
118
              for _ = 1, math.random(6) do
 
119
                 local planet = Planet:new{
 
120
                    x = math.random(the.app.width / 2,
 
121
                                    the.bg.width - the.app.width / 2),
 
122
                    y = math.random(the.app.height / 2,
 
123
                                    the.bg.height - the.app.height / 2),
 
124
                    rotation = math.random() * math.pi
 
125
                 }
 
126
                 the.planets:add(planet)
 
127
              end
 
128
 
121
129
              the.cursor = Cursor:new()
122
130
              self:add(the.cursor)
123
131
 
124
 
              the.score = Text:new{
125
 
                 x = 8,
126
 
                 y = 8,
127
 
                 width = the.app.width,
128
 
                 --align = 'center',
129
 
                 font = 25}
130
 
              the.interface:add(the.score)
131
 
 
132
 
              local hs = the.storage.data.highScore
133
 
              local m = hs / 60
134
 
              local s = hs % 60
135
 
 
136
 
              the.highScore = Text:new{
137
 
                 x = -8,
138
 
                 y = 8,
139
 
                 width = the.app.width,
140
 
                 align = 'right',
141
 
                 font = 25,
142
 
                 text = string.format('High Score: %d:%02d', m, s)
143
 
              }
144
 
              the.interface:add(the.highScore)
145
 
 
146
132
              the.over = Text:new{
147
133
                 y = the.app.height / 2,
148
134
                 width = the.app.width,
168
154
              love.mouse.setVisible(false)
169
155
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
170
156
 
171
 
              --self:loadLayers('data/map.lua')
172
157
              self.focus = the.player
173
 
              --self:clampTo(self.map)
174
 
 
175
 
              self.gameStart = love.timer.getTime()
176
158
           end,
177
159
   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()
204
 
                 end
205
 
 
206
 
                 the.bullets:collide(the.rockColliders)
207
 
 
208
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
209
 
                 --    if not mirror.of then
210
 
                 --       print('mirror:' .. inspect(mirror))
211
 
                 --       error('mirror OF NOTHING')
212
 
                 --    end
213
 
                 -- end
 
160
                 the.bullets:collide(the.planets)
 
161
                 the.bullets:collide(the.player)
 
162
                 the.bullets:collide(the.enemies)
214
163
              end,
215
164
   onEndFrame = function(self)
216
165
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
217
166
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
218
 
 
219
 
                   if the.player.active then
220
 
                      self:updateScore()
221
 
                   end
222
167
                end,
223
168
   draw = function (self, x, y)
224
169
             View.draw(self, x, y)
225
170
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
226
171
          end,
227
 
   updateScore = function(self)
228
 
                    local t = love.timer.getTime() - self.gameStart
229
 
                    local m = t / 60
230
 
                    local s = t % 60
231
 
 
232
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
233
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
234
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
235
 
 
236
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
237
 
                    --the.highScore.x = the.player.x - the.app.width / 2
238
 
                 end
239
172
}
240
173
 
241
174
MenuScreen = View:extend {
260
193
 
261
194
              self.view = GameView:new()
262
195
 
263
 
              -- try going fullscreen.  should fail silently if it
264
 
              -- can't go to fullscreen.
265
 
              love.graphics.toggleFullscreen()
266
 
 
267
196
              if DEBUG then
268
197
                 self.console:watch('VERSION', 'VERSION')
269
198
                 self.console:watch('updateTook', 'the.updateTook')
273
202
                 self.console:watch('the.app.height', 'the.app.height')
274
203
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
275
204
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
205
                 self.console:watch('num planets', '#the.planets.sprites')
276
206
                 --self.console:watch('drawTook', 'the.drawTook')
277
207
 
278
208
                 -- back off that dark overlay a bit
280
210
              end
281
211
           end,
282
212
   onUpdate = function (self, dt)
283
 
                 if the.keys:justPressed('q') then
284
 
                    self.quit()
285
 
                 elseif the.keys:justPressed('return') then
286
 
                    self.view = GameView:new()
287
 
                 elseif the.keys:justPressed('f1') then
288
 
                    local ss = love.graphics.newScreenshot()
289
 
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
213
                 if not (DEBUG and the.console.visible) then
 
214
                    if the.keys:justPressed('q') then
 
215
                       self.quit()
 
216
                    elseif the.keys:justPressed('return') then
 
217
                       if the.keys:pressed('alt') then
 
218
                          love.graphics.toggleFullscreen()
 
219
                       else
 
220
                          self.view = GameView:new()
 
221
                       end
 
222
                    elseif the.keys:justPressed('f1') then
 
223
                       local ss = love.graphics.newScreenshot()
 
224
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
225
                    elseif the.keys:justPressed('f11') then
 
226
                       love.graphics.toggleFullscreen()
 
227
                    end
290
228
                 end
291
229
              end,
292
230
   update = function (self, dt)
297
235
               end
298
236
            end
299
237
}
 
238
 
 
239
realRun = love.run
 
240
function love.run()
 
241
   -- should fail silently if it can't go to fullscreen...
 
242
   love.graphics.toggleFullscreen()
 
243
 
 
244
   realRun()
 
245
end
 
 
b'\\ No newline at end of file'