/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-23 02:05:10 UTC
  • Revision ID: josh@9ix.org-20130623020510-i4t86yocvbjab19o
higher planet floor, recharge shields when you land, stop moving when you land

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
18
18
require 'boom'
19
19
require 'planet'
20
20
require 'trade_view'
 
21
require 'shield'
21
22
 
22
23
util = {
23
24
   signOf = function(value)
73
74
}
74
75
 
75
76
GameView = View:extend {
76
 
   lastRock = 0,
77
 
   rockInterval = 1,
78
 
   gameStart = 0,
79
77
   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
78
              the.storage = Storage:new{filename = 'scores.lua'}
90
79
              the.storage:load()
91
 
              if not the.storage.data.highScore then
92
 
                 print('initializing storage')
93
 
                 the.storage.data = {highScore = 0}
94
 
              end
 
80
              --if not the.storage.data.highScore then
 
81
              --   print('initializing storage')
 
82
              --   the.storage.data = {highScore = 0}
 
83
              --end
95
84
 
96
 
              --the.rockColliders = Group:new()
97
85
              the.bullets = Group:new()
98
 
              the.mirrors = Group:new()
99
 
              --the.rocks = Group:new()
100
86
              the.interface = Group:new()
101
87
              the.planets = Group:new()
102
88
              the.indicators = Group:new()
 
89
              the.enemies = Group:new()
103
90
 
104
91
              the.bg = Tile:new{
105
92
                 image = 'data/stars3.png',
114
101
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
115
102
              self:add(the.player)
116
103
              self:add(the.player.thrust)
117
 
 
118
 
              --self:add(Enemy:new{x=400, y=300})
 
104
              self:add(the.player.shield)
 
105
 
 
106
              self:add(the.enemies)
 
107
 
 
108
              for _ = 1, 5 do
 
109
                 local e = Enemy:new{x = math.random(the.bg.width),
 
110
                                     y = math.random(the.bg.height)}
 
111
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
112
                 the.enemies:add(e)
 
113
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
114
                 self:add(e.shield)
 
115
              end
119
116
 
120
117
              self:add(the.bullets)
121
 
              --self:add(the.rockColliders)
122
 
              self:add(the.mirrors)
123
 
              --self:add(the.rocks)
124
118
              self:add(the.indicators)
125
119
              self:add(the.interface)
126
120
 
127
 
              for _ = 1, math.random(6) do
 
121
              for _ = 1, math.random(3, 6) do
128
122
                 local planet = Planet:new{
129
123
                    x = math.random(the.app.width / 2,
130
124
                                    the.bg.width - the.app.width / 2),
138
132
              the.cursor = Cursor:new()
139
133
              self:add(the.cursor)
140
134
 
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
135
              the.over = Text:new{
164
136
                 y = the.app.height / 2,
165
137
                 width = the.app.width,
185
157
              love.mouse.setVisible(false)
186
158
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
187
159
 
188
 
              --self:loadLayers('data/map.lua')
189
160
              self.focus = the.player
190
 
              --self:clampTo(self.map)
191
 
 
192
 
              self.gameStart = love.timer.getTime()
193
161
           end,
194
162
   onUpdate = function(self, dt)
195
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
196
 
                    local unseenRock = nil
197
 
                    while not unseenRock do
198
 
                       local rock = Rock:new{
199
 
                          x = math.random(the.app.width / 2,
200
 
                                          the.bg.width - the.app.width / 2),
201
 
                          y = math.random(the.app.height / 2,
202
 
                                          the.bg.height - the.app.height / 2),
203
 
                          velocity = {
204
 
                             x = math.random(-300, 300),
205
 
                             y = math.random(-300, 300),
206
 
                             rotation = math.random(-7, 7)
207
 
                          },
208
 
                          scale = math.random() + 0.5
209
 
                       }
210
 
 
211
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
212
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
213
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
214
 
                         unseenRock = rock
215
 
                        end
216
 
                    end
217
 
 
218
 
                    the.rocks:add(unseenRock)
219
 
 
220
 
                    self.lastRock = love.timer.getTime()
221
 
                 end
222
 
 
223
 
                 the.bullets:collide(the.rockColliders)
224
 
 
225
 
                 -- this should really go somewhere else...
226
 
                 for _, planet in ipairs(the.planets.sprites) do
227
 
                    local indx, indy
228
 
                    local pvec = vector.new(
229
 
                       planet.x - the.player.x + planet.width / 2,
230
 
                       planet.y - the.player.y + planet.height / 2 )
231
 
 
232
 
                    -- TODO: is there a better way to specify the
233
 
                    -- screen rectangle?
234
 
                    if planet:intersects(the.player.x - the.app.width / 2,
235
 
                                         the.player.y - the.app.height / 2,
236
 
                                         the.app.width,
237
 
                                         the.app.height) then
238
 
                       -- planet is on the screen
239
 
                       planet.indicator.visible = false
240
 
                    else
241
 
                       planet.indicator.visible = true
242
 
 
243
 
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
244
 
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
245
 
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
246
 
                       else
247
 
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
248
 
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
249
 
                       end
250
 
 
251
 
                       planet.indicator.x = the.player.x + indx
252
 
                       planet.indicator.y = the.player.y + indy
253
 
                    end
254
 
                 end
255
 
 
256
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
257
 
                 --    if not mirror.of then
258
 
                 --       print('mirror:' .. inspect(mirror))
259
 
                 --       error('mirror OF NOTHING')
260
 
                 --    end
261
 
                 -- end
 
163
                 the.bullets:collide(the.planets)
 
164
                 the.bullets:collide(the.player)
 
165
                 the.bullets:collide(the.enemies)
262
166
              end,
263
167
   onEndFrame = function(self)
264
168
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
265
169
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
266
 
 
267
 
                   if the.player.active then
268
 
                      self:updateScore()
269
 
                   end
270
170
                end,
271
171
   draw = function (self, x, y)
272
172
             View.draw(self, x, y)
273
173
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
274
174
          end,
275
 
   updateScore = function(self)
276
 
                    local t = love.timer.getTime() - self.gameStart
277
 
                    local m = t / 60
278
 
                    local s = t % 60
279
 
 
280
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
281
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
282
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
283
 
 
284
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
285
 
                    --the.highScore.x = the.player.x - the.app.width / 2
286
 
                 end
287
175
}
288
176
 
289
177
MenuScreen = View:extend {