/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-16 02:22:30 UTC
  • Revision ID: josh@9ix.org-20130516022230-9mqgevjra6wmt3vf
keep score, center mouse on start

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()
88
90
 
89
91
              the.bg = Tile:new{
90
92
                 image = 'data/stars3.png',
100
102
 
101
103
              --self:add(Enemy:new{x=400, y=300})
102
104
 
 
105
              self:add(the.bullets)
 
106
              self:add(the.rockColliders)
 
107
              self:add(the.mirrors)
 
108
              self:add(the.rocks)
 
109
 
103
110
              the.cursor = Cursor:new()
104
111
              self:add(the.cursor)
105
112
 
 
113
              the.score = Text:new{
 
114
                 width = the.app.width,
 
115
                 align = 'center',
 
116
                 font = 25}
 
117
              self:add(the.score)
 
118
 
106
119
              love.mouse.setGrab(true)
107
120
              love.mouse.setVisible(false)
 
121
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
108
122
 
109
123
              --self:loadLayers('data/map.lua')
110
124
              self.focus = the.player
136
150
                        end
137
151
                    end
138
152
 
139
 
                    self:add(unseenRock)
 
153
                    the.rocks:add(unseenRock)
140
154
 
141
155
                    self.lastRock = love.timer.getTime()
142
156
                 end
143
157
 
144
158
                 the.bullets:collide(the.rockColliders)
145
159
              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,
146
171
   draw = function (self, x, y)
147
172
             View.draw(self, x, y)
148
173
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)