/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
19
 
22
20
util = {
23
21
   signOf = function(value)
73
71
}
74
72
 
75
73
GameView = View:extend {
 
74
   lastRock = 0,
 
75
   rockInterval = 1,
 
76
   gameStart = 0,
76
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
 
77
87
              the.storage = Storage:new{filename = 'scores.lua'}
78
88
              the.storage:load()
79
 
              --if not the.storage.data.highScore then
80
 
              --   print('initializing storage')
81
 
              --   the.storage.data = {highScore = 0}
82
 
              --end
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
83
93
 
 
94
              the.rockColliders = Group:new()
84
95
              the.bullets = Group:new()
 
96
              the.mirrors = Group:new()
 
97
              the.rocks = Group:new()
85
98
              the.interface = Group:new()
86
 
              the.planets = Group:new()
87
 
              the.indicators = Group:new()
88
99
 
89
100
              the.bg = Tile:new{
90
101
                 image = 'data/stars3.png',
91
 
                 width = 13660,
92
 
                 height = 7680
 
102
                 -- 1366x768 * 3
 
103
                 width = 4098,
 
104
                 height = 2304
93
105
              }
94
106
              self:add(the.bg)
95
107
 
96
 
              self:add(the.planets)
97
 
 
98
108
              --the.player = CrystalPlayer:new{x=400,y=300}
99
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
109
              the.player = SpacePlayer:new{x=1366,y=768}
100
110
              self:add(the.player)
101
111
              self:add(the.player.thrust)
102
112
 
103
 
              local e = Enemy:new{x=400, y=300}
104
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
105
 
              self:add(e)
106
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
113
              --self:add(Enemy:new{x=400, y=300})
107
114
 
108
115
              self:add(the.bullets)
109
 
              self:add(the.indicators)
 
116
              self:add(the.rockColliders)
 
117
              self:add(the.mirrors)
 
118
              self:add(the.rocks)
110
119
              self:add(the.interface)
111
120
 
112
 
              for _ = 1, math.random(6) do
113
 
                 local planet = Planet:new{
114
 
                    x = math.random(the.app.width / 2,
115
 
                                    the.bg.width - the.app.width / 2),
116
 
                    y = math.random(the.app.height / 2,
117
 
                                    the.bg.height - the.app.height / 2),
118
 
                    rotation = math.random() * math.pi
119
 
                 }
120
 
                 the.planets:add(planet)
121
 
              end
122
 
 
123
121
              the.cursor = Cursor:new()
124
122
              self:add(the.cursor)
125
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
 
 
146
              the.over = Text:new{
 
147
                 y = the.app.height / 2,
 
148
                 width = the.app.width,
 
149
                 align = 'center',
 
150
                 font = 25,
 
151
                 text = "Game Over",
 
152
                 visible = false
 
153
              }
 
154
              the.interface:add(the.over)
 
155
 
 
156
 
 
157
              the.instructions = Text:new{
 
158
                 y = the.app.height / 2 + 32,
 
159
                 width = the.app.width,
 
160
                 align = 'center',
 
161
                 font = 12,
 
162
                 text = "Press Enter to start a new game\nPress Q to quit",
 
163
                 visible = false
 
164
              }
 
165
              the.interface:add(the.instructions)
 
166
 
126
167
              love.mouse.setGrab(true)
127
168
              love.mouse.setVisible(false)
128
169
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
129
170
 
 
171
              --self:loadLayers('data/map.lua')
130
172
              self.focus = the.player
 
173
              --self:clampTo(self.map)
 
174
 
 
175
              self.gameStart = love.timer.getTime()
131
176
           end,
132
177
   onUpdate = function(self, dt)
133
 
                 the.bullets:collide(the.planets)
 
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
134
214
              end,
135
215
   onEndFrame = function(self)
136
216
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
137
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
138
222
                end,
139
223
   draw = function (self, x, y)
140
224
             View.draw(self, x, y)
141
225
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
142
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
143
239
}
144
240
 
145
241
MenuScreen = View:extend {
164
260
 
165
261
              self.view = GameView:new()
166
262
 
 
263
              -- try going fullscreen.  should fail silently if it
 
264
              -- can't go to fullscreen.
 
265
              love.graphics.toggleFullscreen()
 
266
 
167
267
              if DEBUG then
168
268
                 self.console:watch('VERSION', 'VERSION')
169
269
                 self.console:watch('updateTook', 'the.updateTook')
173
273
                 self.console:watch('the.app.height', 'the.app.height')
174
274
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
175
275
                 self.console:watch('num rocks', '#the.rocks.sprites')
176
 
                 self.console:watch('num planets', '#the.planets.sprites')
177
276
                 --self.console:watch('drawTook', 'the.drawTook')
178
277
 
179
278
                 -- back off that dark overlay a bit
181
280
              end
182
281
           end,
183
282
   onUpdate = function (self, dt)
184
 
                 if not (DEBUG and the.console.visible) then
185
 
                    if the.keys:justPressed('q') then
186
 
                       self.quit()
187
 
                    elseif the.keys:justPressed('return') then
188
 
                       if the.keys:pressed('alt') then
189
 
                          love.graphics.toggleFullscreen()
190
 
                       else
191
 
                          self.view = GameView:new()
192
 
                       end
193
 
                    elseif the.keys:justPressed('f1') then
194
 
                       local ss = love.graphics.newScreenshot()
195
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
196
 
                    elseif the.keys:justPressed('f11') then
197
 
                       love.graphics.toggleFullscreen()
198
 
                    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')
199
290
                 end
200
291
              end,
201
292
   update = function (self, dt)
206
297
               end
207
298
            end
208
299
}
209
 
 
210
 
realRun = love.run
211
 
function love.run()
212
 
   -- should fail silently if it can't go to fullscreen...
213
 
   love.graphics.toggleFullscreen()
214
 
 
215
 
   realRun()
216
 
end
 
 
b'\\ No newline at end of file'