/spacey

To get this branch, use:
bzr branch http://9ix.org/bzr/spacey

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-05-14 17:49:03 UTC
  • Revision ID: josh@9ix.org-20130514174903-790agtxqfvz8lnzv
player death

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
85
85
 
86
86
              the.rockColliders = Group:new()
87
87
              the.bullets = Group:new()
88
 
              the.mirrors = Group:new()
89
 
              the.rocks = Group:new()
90
88
 
91
89
              the.bg = Tile:new{
92
90
                 image = 'data/stars3.png',
102
100
 
103
101
              --self:add(Enemy:new{x=400, y=300})
104
102
 
105
 
              self:add(the.bullets)
106
 
              self:add(the.rockColliders)
107
 
              self:add(the.mirrors)
108
 
              self:add(the.rocks)
109
 
 
110
103
              the.cursor = Cursor:new()
111
104
              self:add(the.cursor)
112
105
 
113
 
              the.score = Text:new{
114
 
                 width = the.app.width,
115
 
                 align = 'center',
116
 
                 font = 25}
117
 
              self:add(the.score)
118
 
 
119
106
              love.mouse.setGrab(true)
120
107
              love.mouse.setVisible(false)
121
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
122
108
 
123
109
              --self:loadLayers('data/map.lua')
124
110
              self.focus = the.player
150
136
                        end
151
137
                    end
152
138
 
153
 
                    the.rocks:add(unseenRock)
 
139
                    self:add(unseenRock)
154
140
 
155
141
                    self.lastRock = love.timer.getTime()
156
142
                 end
157
143
 
158
144
                 the.bullets:collide(the.rockColliders)
159
145
              end,
160
 
   onEndFrame = function(self)
161
 
                   if the.player.active then
162
 
                      local t = love.timer.getTime() - self.gameStart
163
 
                      local m = t / 60
164
 
                      local s = t % 60
165
 
 
166
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
167
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
168
 
                      the.score.x = the.player.x - the.app.width / 2
169
 
                   end
170
 
                end,
171
146
   draw = function (self, x, y)
172
147
             View.draw(self, x, y)
173
148
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)