/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:06:35 UTC
  • Revision ID: josh@9ix.org-20130623020635-31ov2mbrb67xe0h0
more mirror cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
 
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
19
22
 
20
23
util = {
21
24
   signOf = function(value)
25
28
                  return -1
26
29
               end
27
30
            end,
28
 
   shortestVector = function(from, to)
29
 
                       if STRICT then
30
 
                          if from.x < the.app.width / 2 or
31
 
                             from.x > the.bg.width - the.app.width / 2 or
32
 
                             from.y < the.app.height / 2 or
33
 
                             from.y > the.bg.height - the.app.height / 2 then
34
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
35
 
                          end
36
 
 
37
 
                          if to.x < the.app.width / 2 or
38
 
                             to.x > the.bg.width - the.app.width / 2 or
39
 
                             to.y < the.app.height / 2 or
40
 
                             to.y > the.bg.height - the.app.height / 2 then
41
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
42
 
                          end
43
 
                       end
44
 
 
45
 
                       -- normalize grid to account for mirror zones
46
 
                       local fx = from.x - the.app.width / 2
47
 
                       local fy = from.y - the.app.height / 2
48
 
                       local tx = to.x - the.app.width / 2
49
 
                       local ty = to.y - the.app.height / 2
50
 
 
51
 
                       local short = {}
52
 
 
53
 
                       -- pick shorter x
54
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
55
 
                          -- straight path is shorter
56
 
                          short.x = tx - fx
57
 
                       else
58
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
59
 
                       end
60
 
 
61
 
                       -- pick shorter y
62
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
63
 
                          -- straight path is shorter
64
 
                          short.y = ty - fy
65
 
                       else
66
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
67
 
                       end
68
 
 
69
 
                       return vector.new(short.x, short.y)
70
 
                    end
71
31
}
72
32
 
73
33
GameView = View:extend {
74
 
   lastRock = 0,
75
 
   rockInterval = 1,
76
 
   gameStart = 0,
77
34
   onNew = function (self)
78
 
              -- for x = 1,30 do
79
 
              --    for y = 1,30 do
80
 
              --       self:add(Fill:new{x=x*400, y=y*400,
81
 
              --                         width = 32, height = 32,
82
 
              --                         fill = {0,0,255}
83
 
              --                      })
84
 
              --    end
85
 
              -- end
86
 
 
87
35
              the.storage = Storage:new{filename = 'scores.lua'}
88
36
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
 
37
              --if not the.storage.data.highScore then
 
38
              --   print('initializing storage')
 
39
              --   the.storage.data = {highScore = 0}
 
40
              --end
93
41
 
94
 
              --the.rockColliders = Group:new()
95
42
              the.bullets = Group:new()
96
 
              the.mirrors = Group:new()
97
 
              --the.rocks = Group:new()
98
43
              the.interface = Group:new()
99
44
              the.planets = Group:new()
100
45
              the.indicators = Group:new()
 
46
              the.enemies = Group:new()
101
47
 
102
48
              the.bg = Tile:new{
103
49
                 image = 'data/stars3.png',
109
55
              self:add(the.planets)
110
56
 
111
57
              --the.player = CrystalPlayer:new{x=400,y=300}
112
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
58
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
113
59
              self:add(the.player)
114
60
              self:add(the.player.thrust)
115
 
 
116
 
              --self:add(Enemy:new{x=400, y=300})
 
61
              self:add(the.player.shield)
 
62
 
 
63
              self:add(the.enemies)
 
64
 
 
65
              for _ = 1, 5 do
 
66
                 local e = Enemy:new{x = math.random(the.bg.width),
 
67
                                     y = math.random(the.bg.height)}
 
68
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
69
                 the.enemies:add(e)
 
70
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
71
                 self:add(e.shield)
 
72
              end
117
73
 
118
74
              self:add(the.bullets)
119
 
              --self:add(the.rockColliders)
120
 
              self:add(the.mirrors)
121
 
              --self:add(the.rocks)
122
75
              self:add(the.indicators)
123
76
              self:add(the.interface)
124
77
 
125
 
              for _ = 1, math.random(6) do
126
 
                 local planet = Tile:new{
127
 
                    image = 'data/planet1.png',
 
78
              for _ = 1, math.random(3, 6) do
 
79
                 local planet = Planet:new{
128
80
                    x = math.random(the.app.width / 2,
129
81
                                    the.bg.width - the.app.width / 2),
130
82
                    y = math.random(the.app.height / 2,
132
84
                    rotation = math.random() * math.pi
133
85
                 }
134
86
                 the.planets:add(planet)
135
 
 
136
 
                 planet.indicator = Tile:new{
137
 
                    image = 'data/planet1ind.png',
138
 
                 }
139
 
                 the.indicators:add(planet.indicator)
140
87
              end
141
88
 
142
89
              the.cursor = Cursor:new()
143
90
              self:add(the.cursor)
144
91
 
145
 
              the.score = Text:new{
146
 
                 x = 8,
147
 
                 y = 8,
148
 
                 width = the.app.width,
149
 
                 --align = 'center',
150
 
                 font = 25}
151
 
              --the.interface:add(the.score)
152
 
 
153
 
              local hs = the.storage.data.highScore
154
 
              local m = hs / 60
155
 
              local s = hs % 60
156
 
 
157
 
              the.highScore = Text:new{
158
 
                 x = -8,
159
 
                 y = 8,
160
 
                 width = the.app.width,
161
 
                 align = 'right',
162
 
                 font = 25,
163
 
                 text = string.format('High Score: %d:%02d', m, s)
164
 
              }
165
 
              --the.interface:add(the.highScore)
166
 
 
167
92
              the.over = Text:new{
168
93
                 y = the.app.height / 2,
169
94
                 width = the.app.width,
189
114
              love.mouse.setVisible(false)
190
115
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
191
116
 
192
 
              --self:loadLayers('data/map.lua')
193
117
              self.focus = the.player
194
 
              --self:clampTo(self.map)
195
 
 
196
 
              self.gameStart = love.timer.getTime()
197
118
           end,
198
119
   onUpdate = function(self, dt)
199
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
200
 
                    local unseenRock = nil
201
 
                    while not unseenRock do
202
 
                       local rock = Rock:new{
203
 
                          x = math.random(the.app.width / 2,
204
 
                                          the.bg.width - the.app.width / 2),
205
 
                          y = math.random(the.app.height / 2,
206
 
                                          the.bg.height - the.app.height / 2),
207
 
                          velocity = {
208
 
                             x = math.random(-300, 300),
209
 
                             y = math.random(-300, 300),
210
 
                             rotation = math.random(-7, 7)
211
 
                          },
212
 
                          scale = math.random() + 0.5
213
 
                       }
214
 
 
215
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
216
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
217
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
218
 
                         unseenRock = rock
219
 
                        end
220
 
                    end
221
 
 
222
 
                    the.rocks:add(unseenRock)
223
 
 
224
 
                    self.lastRock = love.timer.getTime()
225
 
                 end
226
 
 
227
 
                 the.bullets:collide(the.rockColliders)
228
 
 
229
 
                 -- this should really go somewhere else...
230
 
                 for _, planet in ipairs(the.planets.sprites) do
231
 
                    local indx, indy
232
 
                    local pvec = vector.new(
233
 
                       planet.x - the.player.x + planet.width / 2,
234
 
                       planet.y - the.player.y + planet.height / 2 )
235
 
 
236
 
                    -- TODO: is there a better way to specify the
237
 
                    -- screen rectangle?
238
 
                    if planet:intersects(the.player.x - the.app.width / 2,
239
 
                                         the.player.y - the.app.height / 2,
240
 
                                         the.app.width,
241
 
                                         the.app.height) then
242
 
                       -- planet is on the screen
243
 
                       planet.indicator.visible = false
244
 
                    else
245
 
                       planet.indicator.visible = true
246
 
 
247
 
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
248
 
                          indx = the.app.width / 2 * util.signOf(pvec.x) + 8
249
 
                          indy = the.app.width / 2 * pvec.y / math.abs(pvec.x)
250
 
                       else
251
 
                          indy = the.app.height / 2 * util.signOf(pvec.y) + 8
252
 
                          indx = the.app.height / 2 * pvec.x / math.abs(pvec.y)
253
 
                       end
254
 
 
255
 
                       planet.indicator.x = the.player.x + indx
256
 
                       planet.indicator.y = the.player.y + indy
257
 
                    end
258
 
                 end
259
 
 
260
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
261
 
                 --    if not mirror.of then
262
 
                 --       print('mirror:' .. inspect(mirror))
263
 
                 --       error('mirror OF NOTHING')
264
 
                 --    end
265
 
                 -- end
 
120
                 the.bullets:collide(the.planets)
 
121
                 the.bullets:collide(the.player)
 
122
                 the.bullets:collide(the.enemies)
266
123
              end,
267
124
   onEndFrame = function(self)
268
125
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
269
126
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
270
 
 
271
 
                   if the.player.active then
272
 
                      self:updateScore()
273
 
                   end
274
127
                end,
275
128
   draw = function (self, x, y)
276
129
             View.draw(self, x, y)
277
130
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
278
131
          end,
279
 
   updateScore = function(self)
280
 
                    local t = love.timer.getTime() - self.gameStart
281
 
                    local m = t / 60
282
 
                    local s = t % 60
283
 
 
284
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
285
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
286
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
287
 
 
288
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
289
 
                    --the.highScore.x = the.player.x - the.app.width / 2
290
 
                 end
291
132
}
292
133
 
293
134
MenuScreen = View:extend {
312
153
 
313
154
              self.view = GameView:new()
314
155
 
315
 
              -- should fail silently if it can't go to fullscreen...
316
 
              love.graphics.toggleFullscreen()
317
 
 
318
156
              if DEBUG then
319
157
                 self.console:watch('VERSION', 'VERSION')
320
158
                 self.console:watch('updateTook', 'the.updateTook')
357
195
               end
358
196
            end
359
197
}
 
198
 
 
199
realRun = love.run
 
200
function love.run()
 
201
   -- should fail silently if it can't go to fullscreen...
 
202
   love.graphics.toggleFullscreen()
 
203
 
 
204
   realRun()
 
205
end
 
 
b'\\ No newline at end of file'