/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:07:23 UTC
  • Revision ID: josh@9ix.org-20130516020723-ntq1ydr2fczd9w5b
stick things into layers

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
83
83
              --    end
84
84
              -- end
85
85
 
86
 
              the.storage = Storage:new{filename = 'scores.lua'}
87
 
              the.storage:load()
88
 
              if not the.storage.data.highScore then
89
 
                 print('initializing storage')
90
 
                 the.storage.data = {highScore = 0}
91
 
              end
92
 
 
93
86
              the.rockColliders = Group:new()
94
87
              the.bullets = Group:new()
95
88
              the.mirrors = Group:new()
117
110
              the.cursor = Cursor:new()
118
111
              self:add(the.cursor)
119
112
 
120
 
              the.score = Text:new{
121
 
                 width = the.app.width,
122
 
                 align = 'center',
123
 
                 font = 25}
124
 
              self:add(the.score)
125
 
 
126
 
              local hs = the.storage.data.highScore
127
 
              local m = hs / 60
128
 
              local s = hs % 60
129
 
 
130
 
              the.highScore = Text:new{
131
 
                 width = the.app.width,
132
 
                 align = 'right',
133
 
                 font = 25,
134
 
                 text = string.format('High Score: %d:%02d', m, s)
135
 
              }
136
 
              self:add(the.highScore)
137
 
 
138
113
              love.mouse.setGrab(true)
139
114
              love.mouse.setVisible(false)
140
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
141
115
 
142
116
              --self:loadLayers('data/map.lua')
143
117
              self.focus = the.player
176
150
 
177
151
                 the.bullets:collide(the.rockColliders)
178
152
              end,
179
 
   onEndFrame = function(self)
180
 
                   if the.player.active then
181
 
                      local t = love.timer.getTime() - self.gameStart
182
 
                      local m = t / 60
183
 
                      local s = t % 60
184
 
 
185
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
186
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
187
 
                      the.score.x = the.player.x - the.app.width / 2
188
 
                   end
189
 
 
190
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
191
 
                   the.highScore.x = the.player.x - the.app.width / 2
192
 
                end,
193
153
   draw = function (self, x, y)
194
154
             View.draw(self, x, y)
195
155
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)