/traderous

To get this branch, use:
bzr branch /bzr/traderous

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-06-16 03:58:19 UTC
  • Revision ID: josh@9ix.org-20130616035819-y3jhfpuogpmy7se4
more old code cleanup

Show diffs side-by-side

added added

removed removed

main.lua
73
73
}
74
74
 
75
75
GameView = View:extend {
76
 
   lastRock = 0,
77
 
   rockInterval = 1,
78
 
   gameStart = 0,
79
76
   onNew = function (self)
80
 
              -- for x = 1,30 do
81
 
              --    for y = 1,30 do
82
 
              --       self:add(Fill:new{x=x*400, y=y*400,
83
 
              --                         width = 32, height = 32,
84
 
              --                         fill = {0,0,255}
85
 
              --                      })
86
 
              --    end
87
 
              -- end
88
 
 
89
77
              the.storage = Storage:new{filename = 'scores.lua'}
90
78
              the.storage:load()
91
 
              if not the.storage.data.highScore then
92
 
                 print('initializing storage')
93
 
                 the.storage.data = {highScore = 0}
94
 
              end
 
79
              --if not the.storage.data.highScore then
 
80
              --   print('initializing storage')
 
81
              --   the.storage.data = {highScore = 0}
 
82
              --end
95
83
 
96
 
              --the.rockColliders = Group:new()
97
84
              the.bullets = Group:new()
98
 
              the.mirrors = Group:new()
99
 
              --the.rocks = Group:new()
100
85
              the.interface = Group:new()
101
86
              the.planets = Group:new()
102
87
              the.indicators = Group:new()
118
103
              --self:add(Enemy:new{x=400, y=300})
119
104
 
120
105
              self:add(the.bullets)
121
 
              --self:add(the.rockColliders)
122
 
              self:add(the.mirrors)
123
 
              --self:add(the.rocks)
124
106
              self:add(the.indicators)
125
107
              self:add(the.interface)
126
108
 
138
120
              the.cursor = Cursor:new()
139
121
              self:add(the.cursor)
140
122
 
141
 
              the.score = Text:new{
142
 
                 x = 8,
143
 
                 y = 8,
144
 
                 width = the.app.width,
145
 
                 --align = 'center',
146
 
                 font = 25}
147
 
              --the.interface:add(the.score)
148
 
 
149
 
              local hs = the.storage.data.highScore
150
 
              local m = hs / 60
151
 
              local s = hs % 60
152
 
 
153
 
              the.highScore = Text:new{
154
 
                 x = -8,
155
 
                 y = 8,
156
 
                 width = the.app.width,
157
 
                 align = 'right',
158
 
                 font = 25,
159
 
                 text = string.format('High Score: %d:%02d', m, s)
160
 
              }
161
 
              --the.interface:add(the.highScore)
162
 
 
163
 
              the.over = Text:new{
164
 
                 y = the.app.height / 2,
165
 
                 width = the.app.width,
166
 
                 align = 'center',
167
 
                 font = 25,
168
 
                 text = "Game Over",
169
 
                 visible = false
170
 
              }
171
 
              the.interface:add(the.over)
172
 
 
173
 
 
174
 
              the.instructions = Text:new{
175
 
                 y = the.app.height / 2 + 32,
176
 
                 width = the.app.width,
177
 
                 align = 'center',
178
 
                 font = 12,
179
 
                 text = "Press Enter to start a new game\nPress Q to quit",
180
 
                 visible = false
181
 
              }
182
 
              the.interface:add(the.instructions)
183
 
 
184
123
              love.mouse.setGrab(true)
185
124
              love.mouse.setVisible(false)
186
125
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
187
126
 
188
 
              --self:loadLayers('data/map.lua')
189
127
              self.focus = the.player
190
 
              --self:clampTo(self.map)
191
 
 
192
 
              self.gameStart = love.timer.getTime()
193
128
           end,
194
129
   onUpdate = function(self, dt)
195
130
                 the.bullets:collide(the.planets)
196
 
 
197
 
                 -- this should really go somewhere else...
198
 
                 for _, planet in ipairs(the.planets.sprites) do
199
 
                 end
200
 
 
201
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
202
 
                 --    if not mirror.of then
203
 
                 --       print('mirror:' .. inspect(mirror))
204
 
                 --       error('mirror OF NOTHING')
205
 
                 --    end
206
 
                 -- end
207
131
              end,
208
132
   onEndFrame = function(self)
209
133
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
210
134
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
211
 
 
212
 
                   if the.player.active then
213
 
                      self:updateScore()
214
 
                   end
215
135
                end,
216
136
   draw = function (self, x, y)
217
137
             View.draw(self, x, y)
218
138
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
219
139
          end,
220
 
   updateScore = function(self)
221
 
                    local t = love.timer.getTime() - self.gameStart
222
 
                    local m = t / 60
223
 
                    local s = t % 60
224
 
 
225
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
226
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
227
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
228
 
 
229
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
230
 
                    --the.highScore.x = the.player.x - the.app.width / 2
231
 
                 end
232
140
}
233
141
 
234
142
MenuScreen = View:extend {