/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-14 17:49:03 UTC
  • Revision ID: josh@9ix.org-20130514174903-790agtxqfvz8lnzv
player death

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
 
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
98
88
 
99
89
              the.bg = Tile:new{
100
90
                 image = 'data/stars3.png',
110
100
 
111
101
              --self:add(Enemy:new{x=400, y=300})
112
102
 
113
 
              self:add(the.bullets)
114
 
              self:add(the.rockColliders)
115
 
              self:add(the.mirrors)
116
 
              self:add(the.rocks)
117
 
 
118
103
              the.cursor = Cursor:new()
119
104
              self:add(the.cursor)
120
105
 
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
106
              love.mouse.setGrab(true)
140
107
              love.mouse.setVisible(false)
141
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
142
108
 
143
109
              --self:loadLayers('data/map.lua')
144
110
              self.focus = the.player
170
136
                        end
171
137
                    end
172
138
 
173
 
                    the.rocks:add(unseenRock)
 
139
                    self:add(unseenRock)
174
140
 
175
141
                    self.lastRock = love.timer.getTime()
176
142
                 end
177
143
 
178
144
                 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
145
              end,
187
 
   onEndFrame = function(self)
188
 
                   if the.player.active then
189
 
                      local t = love.timer.getTime() - self.gameStart
190
 
                      local m = t / 60
191
 
                      local s = t % 60
192
 
 
193
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
194
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
 
                      the.score.x = the.player.x - the.app.width / 2
196
 
                   end
197
 
 
198
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
 
                   the.highScore.x = the.player.x - the.app.width / 2
200
 
                end,
201
146
   draw = function (self, x, y)
202
147
             View.draw(self, x, y)
203
148
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
232
177
                 self.console:watch('the.player.y', 'the.player.y')
233
178
                 self.console:watch('the.app.width', 'the.app.width')
234
179
                 self.console:watch('the.app.height', 'the.app.height')
235
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
236
180
                 --self.console:watch('drawTook', 'the.drawTook')
237
181
 
238
182
                 -- back off that dark overlay a bit