/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-18 00:09:56 UTC
  • Revision ID: josh@9ix.org-20130518000956-s9717aensfsq1b3c
fix double-removing sprites (and subsequent zombie mirror bullets).  
also lots of debug stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
95
95
              the.bullets = Group:new()
96
96
              the.mirrors = Group:new()
97
97
              the.rocks = Group:new()
98
 
              the.interface = Group:new()
99
98
 
100
99
              the.bg = Tile:new{
101
100
                 image = 'data/stars3.png',
108
107
              --the.player = CrystalPlayer:new{x=400,y=300}
109
108
              the.player = SpacePlayer:new{x=1366,y=768}
110
109
              self:add(the.player)
111
 
              self:add(the.player.thrust)
112
110
 
113
111
              --self:add(Enemy:new{x=400, y=300})
114
112
 
116
114
              self:add(the.rockColliders)
117
115
              self:add(the.mirrors)
118
116
              self:add(the.rocks)
119
 
              self:add(the.interface)
120
117
 
121
118
              the.cursor = Cursor:new()
122
119
              self:add(the.cursor)
123
120
 
124
121
              the.score = Text:new{
125
 
                 x = 8,
126
 
                 y = 8,
127
122
                 width = the.app.width,
128
 
                 --align = 'center',
 
123
                 align = 'center',
129
124
                 font = 25}
130
 
              the.interface:add(the.score)
 
125
              self:add(the.score)
131
126
 
132
127
              local hs = the.storage.data.highScore
133
128
              local m = hs / 60
134
129
              local s = hs % 60
135
130
 
136
131
              the.highScore = Text:new{
137
 
                 x = -8,
138
 
                 y = 8,
139
132
                 width = the.app.width,
140
133
                 align = 'right',
141
134
                 font = 25,
142
135
                 text = string.format('High Score: %d:%02d', m, s)
143
136
              }
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)
 
137
              self:add(the.highScore)
166
138
 
167
139
              love.mouse.setGrab(true)
168
140
              love.mouse.setVisible(false)
175
147
              self.gameStart = love.timer.getTime()
176
148
           end,
177
149
   onUpdate = function(self, dt)
178
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
150
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
179
151
                    local unseenRock = nil
180
152
                    while not unseenRock do
181
153
                       local rock = Rock:new{
213
185
                 -- end
214
186
              end,
215
187
   onEndFrame = function(self)
216
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
217
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
218
 
 
219
188
                   if the.player.active then
220
 
                      self:updateScore()
 
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
221
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
222
200
                end,
223
201
   draw = function (self, x, y)
224
202
             View.draw(self, x, y)
225
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
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
 
203
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
204
          end
239
205
}
240
206
 
241
207
MenuScreen = View:extend {
267
233
                 self.console:watch('the.app.width', 'the.app.width')
268
234
                 self.console:watch('the.app.height', 'the.app.height')
269
235
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
270
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
271
236
                 --self.console:watch('drawTook', 'the.drawTook')
272
237
 
273
238
                 -- back off that dark overlay a bit
275
240
              end
276
241
           end,
277
242
   onUpdate = function (self, dt)
278
 
                 if the.keys:justPressed('q') then
 
243
                 if the.keys:justPressed('escape') then
279
244
                    self.quit()
280
 
                 elseif the.keys:justPressed('return') then
281
 
                    self.view = GameView:new()
282
245
                 end
283
246
              end,
284
247
   update = function (self, dt)