/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
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
6
7
 
7
8
require 'group'
8
9
 
83
84
              --    end
84
85
              -- end
85
86
 
 
87
              the.storage = Storage:new{filename = 'scores.lua'}
 
88
              the.storage:load()
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
 
93
 
86
94
              the.rockColliders = Group:new()
87
95
              the.bullets = Group:new()
88
96
              the.mirrors = Group:new()
110
118
              the.cursor = Cursor:new()
111
119
              self:add(the.cursor)
112
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
 
113
139
              love.mouse.setGrab(true)
114
140
              love.mouse.setVisible(false)
 
141
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
115
142
 
116
143
              --self:loadLayers('data/map.lua')
117
144
              self.focus = the.player
149
176
                 end
150
177
 
151
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
152
186
              end,
 
187
   onEndFrame = function(self)
 
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
 
200
                end,
153
201
   draw = function (self, x, y)
154
202
             View.draw(self, x, y)
155
203
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
184
232
                 self.console:watch('the.player.y', 'the.player.y')
185
233
                 self.console:watch('the.app.width', 'the.app.width')
186
234
                 self.console:watch('the.app.height', 'the.app.height')
 
235
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
187
236
                 --self.console:watch('drawTook', 'the.drawTook')
188
237
 
189
238
                 -- back off that dark overlay a bit