/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-08 00:02:37 UTC
  • Revision ID: josh@9ix.org-20130608000237-v50hyqvrinp5g4rs
try to make setting screen resolution more reliable

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