/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
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
6
 
--inspect = require 'inspect'
7
6
 
8
7
require 'group'
9
8
 
84
83
              --    end
85
84
              -- end
86
85
 
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
 
 
94
86
              the.rockColliders = Group:new()
95
87
              the.bullets = Group:new()
96
88
              the.mirrors = Group:new()
118
110
              the.cursor = Cursor:new()
119
111
              self:add(the.cursor)
120
112
 
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
 
 
139
113
              love.mouse.setGrab(true)
140
114
              love.mouse.setVisible(false)
141
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
142
115
 
143
116
              --self:loadLayers('data/map.lua')
144
117
              self.focus = the.player
147
120
              self.gameStart = love.timer.getTime()
148
121
           end,
149
122
   onUpdate = function(self, dt)
150
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
123
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
151
124
                    local unseenRock = nil
152
125
                    while not unseenRock do
153
126
                       local rock = Rock:new{
176
149
                 end
177
150
 
178
151
                 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
186
152
              end,
187
 
   onEndFrame = function(self)
188
 
                   if the.player.active then
189
 
                      self:updateScore()
190
 
                   end
191
 
                end,
192
153
   draw = function (self, x, y)
193
154
             View.draw(self, x, y)
194
155
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
195
 
          end,
196
 
   updateScore = function(self)
197
 
                    local t = love.timer.getTime() - self.gameStart
198
 
                    local m = t / 60
199
 
                    local s = t % 60
200
 
 
201
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
202
 
                    the.score.y = the.player.y - the.app.height / 2 + the.player.height
203
 
                    the.score.x = the.player.x - the.app.width / 2
204
 
 
205
 
                    the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
206
 
                    the.highScore.x = the.player.x - the.app.width / 2
207
 
                 end
 
156
          end
208
157
}
209
158
 
210
159
MenuScreen = View:extend {
235
184
                 self.console:watch('the.player.y', 'the.player.y')
236
185
                 self.console:watch('the.app.width', 'the.app.width')
237
186
                 self.console:watch('the.app.height', 'the.app.height')
238
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
239
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
240
187
                 --self.console:watch('drawTook', 'the.drawTook')
241
188
 
242
189
                 -- back off that dark overlay a bit