/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-23 02:05:10 UTC
  • Revision ID: josh@9ix.org-20130623020510-i4t86yocvbjab19o
higher planet floor, recharge shields when you land, stop moving when you land

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()
99
87
              the.planets = Group:new()
 
88
              the.indicators = Group:new()
 
89
              the.enemies = Group:new()
100
90
 
101
91
              the.bg = Tile:new{
102
92
                 image = 'data/stars3.png',
103
 
                 -- 1366x768 * 3
104
 
                 width = 4098,
105
 
                 height = 2304
 
93
                 width = 13660,
 
94
                 height = 7680
106
95
              }
107
96
              self:add(the.bg)
108
97
 
109
98
              self:add(the.planets)
110
99
 
111
100
              --the.player = CrystalPlayer:new{x=400,y=300}
112
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
101
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
113
102
              self:add(the.player)
114
103
              self:add(the.player.thrust)
115
 
 
116
 
              --self:add(Enemy:new{x=400, y=300})
 
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
117
116
 
118
117
              self:add(the.bullets)
119
 
              --self:add(the.rockColliders)
120
 
              self:add(the.mirrors)
121
 
              --self:add(the.rocks)
 
118
              self:add(the.indicators)
122
119
              self:add(the.interface)
123
120
 
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
 
              }
131
 
              the.planets:add(planet)
 
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
132
131
 
133
132
              the.cursor = Cursor:new()
134
133
              self:add(the.cursor)
135
134
 
136
 
              the.score = Text:new{
137
 
                 x = 8,
138
 
                 y = 8,
139
 
                 width = the.app.width,
140
 
                 --align = 'center',
141
 
                 font = 25}
142
 
              the.interface:add(the.score)
143
 
 
144
 
              local hs = the.storage.data.highScore
145
 
              local m = hs / 60
146
 
              local s = hs % 60
147
 
 
148
 
              the.highScore = Text:new{
149
 
                 x = -8,
150
 
                 y = 8,
151
 
                 width = the.app.width,
152
 
                 align = 'right',
153
 
                 font = 25,
154
 
                 text = string.format('High Score: %d:%02d', m, s)
155
 
              }
156
 
              the.interface:add(the.highScore)
157
 
 
158
135
              the.over = Text:new{
159
136
                 y = the.app.height / 2,
160
137
                 width = the.app.width,
180
157
              love.mouse.setVisible(false)
181
158
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
182
159
 
183
 
              --self:loadLayers('data/map.lua')
184
160
              self.focus = the.player
185
 
              --self:clampTo(self.map)
186
 
 
187
 
              self.gameStart = love.timer.getTime()
188
161
           end,
189
162
   onUpdate = function(self, dt)
190
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
191
 
                    local unseenRock = nil
192
 
                    while not unseenRock do
193
 
                       local rock = Rock:new{
194
 
                          x = math.random(the.app.width / 2,
195
 
                                          the.bg.width - the.app.width / 2),
196
 
                          y = math.random(the.app.height / 2,
197
 
                                          the.bg.height - the.app.height / 2),
198
 
                          velocity = {
199
 
                             x = math.random(-300, 300),
200
 
                             y = math.random(-300, 300),
201
 
                             rotation = math.random(-7, 7)
202
 
                          },
203
 
                          scale = math.random() + 0.5
204
 
                       }
205
 
 
206
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
207
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
208
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
209
 
                         unseenRock = rock
210
 
                        end
211
 
                    end
212
 
 
213
 
                    the.rocks:add(unseenRock)
214
 
 
215
 
                    self.lastRock = love.timer.getTime()
216
 
                 end
217
 
 
218
 
                 the.bullets:collide(the.rockColliders)
219
 
 
220
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
221
 
                 --    if not mirror.of then
222
 
                 --       print('mirror:' .. inspect(mirror))
223
 
                 --       error('mirror OF NOTHING')
224
 
                 --    end
225
 
                 -- end
 
163
                 the.bullets:collide(the.planets)
 
164
                 the.bullets:collide(the.player)
 
165
                 the.bullets:collide(the.enemies)
226
166
              end,
227
167
   onEndFrame = function(self)
228
168
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
229
169
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
230
 
 
231
 
                   if the.player.active then
232
 
                      self:updateScore()
233
 
                   end
234
170
                end,
235
171
   draw = function (self, x, y)
236
172
             View.draw(self, x, y)
237
173
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
238
174
          end,
239
 
   updateScore = function(self)
240
 
                    local t = love.timer.getTime() - self.gameStart
241
 
                    local m = t / 60
242
 
                    local s = t % 60
243
 
 
244
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
245
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
246
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
247
 
 
248
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
249
 
                    --the.highScore.x = the.player.x - the.app.width / 2
250
 
                 end
251
175
}
252
176
 
253
177
MenuScreen = View:extend {
272
196
 
273
197
              self.view = GameView:new()
274
198
 
275
 
              -- should fail silently if it can't go to fullscreen...
276
 
              love.graphics.toggleFullscreen()
277
 
 
278
199
              if DEBUG then
279
200
                 self.console:watch('VERSION', 'VERSION')
280
201
                 self.console:watch('updateTook', 'the.updateTook')
284
205
                 self.console:watch('the.app.height', 'the.app.height')
285
206
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
286
207
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
208
                 self.console:watch('num planets', '#the.planets.sprites')
287
209
                 --self.console:watch('drawTook', 'the.drawTook')
288
210
 
289
211
                 -- back off that dark overlay a bit
291
213
              end
292
214
           end,
293
215
   onUpdate = function (self, dt)
294
 
                 if the.keys:justPressed('q') then
295
 
                    self.quit()
296
 
                 elseif the.keys:justPressed('return') then
297
 
                    if the.keys:pressed('alt') then
 
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
298
229
                       love.graphics.toggleFullscreen()
299
 
                    else
300
 
                       self.view = GameView:new()
301
230
                    end
302
 
                 elseif the.keys:justPressed('f1') then
303
 
                    local ss = love.graphics.newScreenshot()
304
 
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
305
 
                 elseif the.keys:justPressed('f11') then
306
 
                    love.graphics.toggleFullscreen()
307
231
                 end
308
232
              end,
309
233
   update = function (self, dt)
314
238
               end
315
239
            end
316
240
}
 
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'