/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
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()
97
89
              the.rocks = Group:new()
98
 
              the.interface = Group:new()
99
90
 
100
91
              the.bg = Tile:new{
101
92
                 image = 'data/stars3.png',
108
99
              --the.player = CrystalPlayer:new{x=400,y=300}
109
100
              the.player = SpacePlayer:new{x=1366,y=768}
110
101
              self:add(the.player)
111
 
              self:add(the.player.thrust)
112
102
 
113
103
              --self:add(Enemy:new{x=400, y=300})
114
104
 
116
106
              self:add(the.rockColliders)
117
107
              self:add(the.mirrors)
118
108
              self:add(the.rocks)
119
 
              self:add(the.interface)
120
109
 
121
110
              the.cursor = Cursor:new()
122
111
              self:add(the.cursor)
123
112
 
124
113
              the.score = Text:new{
125
 
                 x = 8,
126
 
                 y = 8,
127
114
                 width = the.app.width,
128
 
                 --align = 'center',
 
115
                 align = 'center',
129
116
                 font = 25}
130
 
              the.interface:add(the.score)
131
 
 
132
 
              local hs = the.storage.data.highScore
133
 
              local m = hs / 60
134
 
              local s = hs % 60
135
 
 
136
 
              the.highScore = Text:new{
137
 
                 x = -8,
138
 
                 y = 8,
139
 
                 width = the.app.width,
140
 
                 align = 'right',
141
 
                 font = 25,
142
 
                 text = string.format('High Score: %d:%02d', m, s)
143
 
              }
144
 
              the.interface:add(the.highScore)
145
 
 
146
 
              the.over = Text:new{
147
 
                 y = the.app.height / 2,
148
 
                 width = the.app.width,
149
 
                 align = 'center',
150
 
                 font = 25,
151
 
                 text = "Game Over",
152
 
                 visible = false
153
 
              }
154
 
              the.interface:add(the.over)
155
 
 
156
 
 
157
 
              the.instructions = Text:new{
158
 
                 y = the.app.height / 2 + 32,
159
 
                 width = the.app.width,
160
 
                 align = 'center',
161
 
                 font = 12,
162
 
                 text = "Press Enter to start a new game\nPress Q to quit",
163
 
                 visible = false
164
 
              }
165
 
              the.interface:add(the.instructions)
 
117
              self:add(the.score)
166
118
 
167
119
              love.mouse.setGrab(true)
168
120
              love.mouse.setVisible(false)
175
127
              self.gameStart = love.timer.getTime()
176
128
           end,
177
129
   onUpdate = function(self, dt)
178
 
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
130
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
179
131
                    local unseenRock = nil
180
132
                    while not unseenRock do
181
133
                       local rock = Rock:new{
204
156
                 end
205
157
 
206
158
                 the.bullets:collide(the.rockColliders)
207
 
 
208
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
209
 
                 --    if not mirror.of then
210
 
                 --       print('mirror:' .. inspect(mirror))
211
 
                 --       error('mirror OF NOTHING')
212
 
                 --    end
213
 
                 -- end
214
159
              end,
215
160
   onEndFrame = function(self)
216
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
217
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
218
 
 
219
161
                   if the.player.active then
220
 
                      self:updateScore()
 
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
221
169
                   end
222
170
                end,
223
171
   draw = function (self, x, y)
224
172
             View.draw(self, x, y)
225
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
226
 
          end,
227
 
   updateScore = function(self)
228
 
                    local t = love.timer.getTime() - self.gameStart
229
 
                    local m = t / 60
230
 
                    local s = t % 60
231
 
 
232
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
233
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
234
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
235
 
 
236
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
237
 
                    --the.highScore.x = the.player.x - the.app.width / 2
238
 
                 end
 
173
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
174
          end
239
175
}
240
176
 
241
177
MenuScreen = View:extend {
266
202
                 self.console:watch('the.player.y', 'the.player.y')
267
203
                 self.console:watch('the.app.width', 'the.app.width')
268
204
                 self.console:watch('the.app.height', 'the.app.height')
269
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
270
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
271
205
                 --self.console:watch('drawTook', 'the.drawTook')
272
206
 
273
207
                 -- back off that dark overlay a bit
275
209
              end
276
210
           end,
277
211
   onUpdate = function (self, dt)
278
 
                 if the.keys:justPressed('q') then
 
212
                 if the.keys:justPressed('escape') then
279
213
                    self.quit()
280
 
                 elseif the.keys:justPressed('return') then
281
 
                    self.view = GameView:new()
282
214
                 end
283
215
              end,
284
216
   update = function (self, dt)