/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-06-16 03:50:45 UTC
  • Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
73
73
}
74
74
 
75
75
GameView = View:extend {
 
76
   lastRock = 0,
 
77
   rockInterval = 1,
 
78
   gameStart = 0,
76
79
   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
 
77
89
              the.storage = Storage:new{filename = 'scores.lua'}
78
90
              the.storage:load()
79
 
              --if not the.storage.data.highScore then
80
 
              --   print('initializing storage')
81
 
              --   the.storage.data = {highScore = 0}
82
 
              --end
 
91
              if not the.storage.data.highScore then
 
92
                 print('initializing storage')
 
93
                 the.storage.data = {highScore = 0}
 
94
              end
83
95
 
 
96
              --the.rockColliders = Group:new()
84
97
              the.bullets = Group:new()
 
98
              the.mirrors = Group:new()
 
99
              --the.rocks = Group:new()
85
100
              the.interface = Group:new()
86
101
              the.planets = Group:new()
87
102
              the.indicators = Group:new()
100
115
              self:add(the.player)
101
116
              self:add(the.player.thrust)
102
117
 
103
 
              local e = Enemy:new{x=400, y=300}
104
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
105
 
              self:add(e)
106
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
118
              --self:add(Enemy:new{x=400, y=300})
107
119
 
108
120
              self:add(the.bullets)
 
121
              --self:add(the.rockColliders)
 
122
              self:add(the.mirrors)
 
123
              --self:add(the.rocks)
109
124
              self:add(the.indicators)
110
125
              self:add(the.interface)
111
126
 
123
138
              the.cursor = Cursor:new()
124
139
              self:add(the.cursor)
125
140
 
 
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
 
126
184
              love.mouse.setGrab(true)
127
185
              love.mouse.setVisible(false)
128
186
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
129
187
 
 
188
              --self:loadLayers('data/map.lua')
130
189
              self.focus = the.player
 
190
              --self:clampTo(self.map)
 
191
 
 
192
              self.gameStart = love.timer.getTime()
131
193
           end,
132
194
   onUpdate = function(self, dt)
133
195
                 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
134
207
              end,
135
208
   onEndFrame = function(self)
136
209
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
137
210
                   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
138
215
                end,
139
216
   draw = function (self, x, y)
140
217
             View.draw(self, x, y)
141
218
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
142
219
          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
143
232
}
144
233
 
145
234
MenuScreen = View:extend {