/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-09 23:09:16 UTC
  • Revision ID: josh@9ix.org-20130609230916-jdtvrn226f3vnijm
add planet, remove rocks

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
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
99
              the.planets = Group:new()
88
 
              the.indicators = Group:new()
89
 
              the.enemies = Group:new()
90
100
 
91
101
              the.bg = Tile:new{
92
102
                 image = 'data/stars3.png',
93
 
                 width = 13660,
94
 
                 height = 7680
 
103
                 -- 1366x768 * 3
 
104
                 width = 4098,
 
105
                 height = 2304
95
106
              }
96
107
              self:add(the.bg)
97
108
 
98
109
              self:add(the.planets)
99
110
 
100
111
              --the.player = CrystalPlayer:new{x=400,y=300}
101
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
112
              the.player = SpacePlayer:new{x=1366,y=768}
102
113
              self:add(the.player)
103
114
              self:add(the.player.thrust)
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)
 
115
 
 
116
              --self:add(Enemy:new{x=400, y=300})
113
117
 
114
118
              self:add(the.bullets)
115
 
              self:add(the.indicators)
 
119
              --self:add(the.rockColliders)
 
120
              self:add(the.mirrors)
 
121
              --self:add(the.rocks)
116
122
              self:add(the.interface)
117
123
 
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
 
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)
128
132
 
129
133
              the.cursor = Cursor:new()
130
134
              self:add(the.cursor)
131
135
 
 
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
 
132
158
              the.over = Text:new{
133
159
                 y = the.app.height / 2,
134
160
                 width = the.app.width,
154
180
              love.mouse.setVisible(false)
155
181
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
156
182
 
 
183
              --self:loadLayers('data/map.lua')
157
184
              self.focus = the.player
 
185
              --self:clampTo(self.map)
 
186
 
 
187
              self.gameStart = love.timer.getTime()
158
188
           end,
159
189
   onUpdate = function(self, dt)
160
 
                 the.bullets:collide(the.planets)
161
 
                 the.bullets:collide(the.player)
162
 
                 the.bullets:collide(the.enemies)
 
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
226
              end,
164
227
   onEndFrame = function(self)
165
228
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
166
229
                   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
167
234
                end,
168
235
   draw = function (self, x, y)
169
236
             View.draw(self, x, y)
170
237
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
171
238
          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
172
251
}
173
252
 
174
253
MenuScreen = View:extend {
193
272
 
194
273
              self.view = GameView:new()
195
274
 
 
275
              -- should fail silently if it can't go to fullscreen...
 
276
              love.graphics.toggleFullscreen()
 
277
 
196
278
              if DEBUG then
197
279
                 self.console:watch('VERSION', 'VERSION')
198
280
                 self.console:watch('updateTook', 'the.updateTook')
202
284
                 self.console:watch('the.app.height', 'the.app.height')
203
285
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
204
286
                 self.console:watch('num rocks', '#the.rocks.sprites')
205
 
                 self.console:watch('num planets', '#the.planets.sprites')
206
287
                 --self.console:watch('drawTook', 'the.drawTook')
207
288
 
208
289
                 -- back off that dark overlay a bit
210
291
              end
211
292
           end,
212
293
   onUpdate = function (self, dt)
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
 
294
                 if the.keys:justPressed('q') then
 
295
                    self.quit()
 
296
                 elseif the.keys:justPressed('return') then
 
297
                    if the.keys:pressed('alt') then
226
298
                       love.graphics.toggleFullscreen()
 
299
                    else
 
300
                       self.view = GameView:new()
227
301
                    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()
228
307
                 end
229
308
              end,
230
309
   update = function (self, dt)
235
314
               end
236
315
            end
237
316
}
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'