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