/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-05-20 01:09:55 UTC
  • Revision ID: josh@9ix.org-20130520010955-8kzcxxe7sa8pdk8e
don't keep spawning rocks after death.

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
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()
85
 
              the.interface = Group:new()
86
 
              the.planets = Group:new()
87
 
              the.indicators = Group:new()
 
96
              the.mirrors = Group:new()
 
97
              the.rocks = Group:new()
88
98
 
89
99
              the.bg = Tile:new{
90
100
                 image = 'data/stars3.png',
91
 
                 width = 13660,
92
 
                 height = 7680
 
101
                 -- 1366x768 * 3
 
102
                 width = 4098,
 
103
                 height = 2304
93
104
              }
94
105
              self:add(the.bg)
95
106
 
96
 
              self:add(the.planets)
97
 
 
98
107
              --the.player = CrystalPlayer:new{x=400,y=300}
99
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
108
              the.player = SpacePlayer:new{x=1366,y=768}
100
109
              self:add(the.player)
101
 
              self:add(the.player.thrust)
102
110
 
103
 
              local e = Enemy:new{x=400, y=300}
104
 
              self:add(e)
105
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
111
              --self:add(Enemy:new{x=400, y=300})
106
112
 
107
113
              self:add(the.bullets)
108
 
              self:add(the.indicators)
109
 
              self:add(the.interface)
110
 
 
111
 
              for _ = 1, math.random(6) do
112
 
                 local planet = Planet:new{
113
 
                    x = math.random(the.app.width / 2,
114
 
                                    the.bg.width - the.app.width / 2),
115
 
                    y = math.random(the.app.height / 2,
116
 
                                    the.bg.height - the.app.height / 2),
117
 
                    rotation = math.random() * math.pi
118
 
                 }
119
 
                 the.planets:add(planet)
120
 
              end
 
114
              self:add(the.rockColliders)
 
115
              self:add(the.mirrors)
 
116
              self:add(the.rocks)
121
117
 
122
118
              the.cursor = Cursor:new()
123
119
              self:add(the.cursor)
124
120
 
 
121
              the.score = Text:new{
 
122
                 width = the.app.width,
 
123
                 align = 'center',
 
124
                 font = 25}
 
125
              self:add(the.score)
 
126
 
 
127
              local hs = the.storage.data.highScore
 
128
              local m = hs / 60
 
129
              local s = hs % 60
 
130
 
 
131
              the.highScore = Text:new{
 
132
                 width = the.app.width,
 
133
                 align = 'right',
 
134
                 font = 25,
 
135
                 text = string.format('High Score: %d:%02d', m, s)
 
136
              }
 
137
              self:add(the.highScore)
 
138
 
125
139
              love.mouse.setGrab(true)
126
140
              love.mouse.setVisible(false)
127
141
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
128
142
 
 
143
              --self:loadLayers('data/map.lua')
129
144
              self.focus = the.player
 
145
              --self:clampTo(self.map)
 
146
 
 
147
              self.gameStart = love.timer.getTime()
130
148
           end,
131
149
   onUpdate = function(self, dt)
132
 
                 the.bullets:collide(the.planets)
 
150
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
151
                    local unseenRock = nil
 
152
                    while not unseenRock do
 
153
                       local rock = Rock:new{
 
154
                          x = math.random(the.app.width / 2,
 
155
                                          the.bg.width - the.app.width / 2),
 
156
                          y = math.random(the.app.height / 2,
 
157
                                          the.bg.height - the.app.height / 2),
 
158
                          velocity = {
 
159
                             x = math.random(-300, 300),
 
160
                             y = math.random(-300, 300),
 
161
                             rotation = math.random(-7, 7)
 
162
                          },
 
163
                          scale = math.random() + 0.5
 
164
                       }
 
165
 
 
166
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
167
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
168
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
169
                         unseenRock = rock
 
170
                        end
 
171
                    end
 
172
 
 
173
                    the.rocks:add(unseenRock)
 
174
 
 
175
                    self.lastRock = love.timer.getTime()
 
176
                 end
 
177
 
 
178
                 the.bullets:collide(the.rockColliders)
 
179
 
 
180
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
181
                 --    if not mirror.of then
 
182
                 --       print('mirror:' .. inspect(mirror))
 
183
                 --       error('mirror OF NOTHING')
 
184
                 --    end
 
185
                 -- end
133
186
              end,
134
187
   onEndFrame = function(self)
135
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
136
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
188
                   if the.player.active then
 
189
                      local t = love.timer.getTime() - self.gameStart
 
190
                      local m = t / 60
 
191
                      local s = t % 60
 
192
 
 
193
                      the.score.text = string.format('Score: %d:%02d', m, s)
 
194
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
195
                      the.score.x = the.player.x - the.app.width / 2
 
196
                   end
 
197
 
 
198
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
199
                   the.highScore.x = the.player.x - the.app.width / 2
137
200
                end,
138
201
   draw = function (self, x, y)
139
202
             View.draw(self, x, y)
140
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
141
 
          end,
 
203
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
204
          end
142
205
}
143
206
 
144
207
MenuScreen = View:extend {
162
225
              math.randomseed(os.time())
163
226
 
164
227
              self.view = GameView:new()
165
 
 
166
228
              if DEBUG then
167
229
                 self.console:watch('VERSION', 'VERSION')
168
230
                 self.console:watch('updateTook', 'the.updateTook')
172
234
                 self.console:watch('the.app.height', 'the.app.height')
173
235
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
174
236
                 self.console:watch('num rocks', '#the.rocks.sprites')
175
 
                 self.console:watch('num planets', '#the.planets.sprites')
176
237
                 --self.console:watch('drawTook', 'the.drawTook')
177
238
 
178
239
                 -- back off that dark overlay a bit
180
241
              end
181
242
           end,
182
243
   onUpdate = function (self, dt)
183
 
                 if not (DEBUG and the.console.visible) then
184
 
                    if the.keys:justPressed('q') then
185
 
                       self.quit()
186
 
                    elseif the.keys:justPressed('return') then
187
 
                       if the.keys:pressed('alt') then
188
 
                          love.graphics.toggleFullscreen()
189
 
                       else
190
 
                          self.view = GameView:new()
191
 
                       end
192
 
                    elseif the.keys:justPressed('f1') then
193
 
                       local ss = love.graphics.newScreenshot()
194
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
195
 
                    elseif the.keys:justPressed('f11') then
196
 
                       love.graphics.toggleFullscreen()
197
 
                    end
 
244
                 if the.keys:justPressed('escape') then
 
245
                    self.quit()
198
246
                 end
199
247
              end,
200
248
   update = function (self, dt)
205
253
               end
206
254
            end
207
255
}
208
 
 
209
 
realRun = love.run
210
 
function love.run()
211
 
   -- should fail silently if it can't go to fullscreen...
212
 
   love.graphics.toggleFullscreen()
213
 
 
214
 
   realRun()
215
 
end
 
 
b'\\ No newline at end of file'