/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-26 00:45:08 UTC
  • Revision ID: josh@9ix.org-20130626004508-6in13i6vjpu77els
give planets names

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
require 'rock'
18
18
require 'boom'
19
19
require 'planet'
 
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
 
23
require 'game_over'
20
24
 
21
25
util = {
22
26
   signOf = function(value)
26
30
                  return -1
27
31
               end
28
32
            end,
29
 
   shortestVector = function(from, to)
30
 
                       if STRICT then
31
 
                          if from.x < the.app.width / 2 or
32
 
                             from.x > the.bg.width - the.app.width / 2 or
33
 
                             from.y < the.app.height / 2 or
34
 
                             from.y > the.bg.height - the.app.height / 2 then
35
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
36
 
                          end
37
 
 
38
 
                          if to.x < the.app.width / 2 or
39
 
                             to.x > the.bg.width - the.app.width / 2 or
40
 
                             to.y < the.app.height / 2 or
41
 
                             to.y > the.bg.height - the.app.height / 2 then
42
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
43
 
                          end
44
 
                       end
45
 
 
46
 
                       -- normalize grid to account for mirror zones
47
 
                       local fx = from.x - the.app.width / 2
48
 
                       local fy = from.y - the.app.height / 2
49
 
                       local tx = to.x - the.app.width / 2
50
 
                       local ty = to.y - the.app.height / 2
51
 
 
52
 
                       local short = {}
53
 
 
54
 
                       -- pick shorter x
55
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
56
 
                          -- straight path is shorter
57
 
                          short.x = tx - fx
58
 
                       else
59
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
60
 
                       end
61
 
 
62
 
                       -- pick shorter y
63
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
64
 
                          -- straight path is shorter
65
 
                          short.y = ty - fy
66
 
                       else
67
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
68
 
                       end
69
 
 
70
 
                       return vector.new(short.x, short.y)
71
 
                    end
72
33
}
73
34
 
74
35
GameView = View:extend {
75
 
   lastRock = 0,
76
 
   rockInterval = 1,
77
 
   gameStart = 0,
78
36
   onNew = function (self)
79
 
              -- for x = 1,30 do
80
 
              --    for y = 1,30 do
81
 
              --       self:add(Fill:new{x=x*400, y=y*400,
82
 
              --                         width = 32, height = 32,
83
 
              --                         fill = {0,0,255}
84
 
              --                      })
85
 
              --    end
86
 
              -- end
87
 
 
88
 
              the.storage = Storage:new{filename = 'scores.lua'}
 
37
              the.storage = Storage:new{filename = 'world.lua'}
89
38
              the.storage:load()
90
 
              if not the.storage.data.highScore then
91
 
                 print('initializing storage')
92
 
                 the.storage.data = {highScore = 0}
93
 
              end
 
39
              --if not the.storage.data.highScore then
 
40
              --   print('initializing storage')
 
41
              --   the.storage.data = {highScore = 0}
 
42
              --end
94
43
 
95
 
              --the.rockColliders = Group:new()
96
44
              the.bullets = Group:new()
97
 
              the.mirrors = Group:new()
98
 
              --the.rocks = Group:new()
99
45
              the.interface = Group:new()
100
46
              the.planets = Group:new()
101
47
              the.indicators = Group:new()
 
48
              the.enemies = Group:new()
102
49
 
 
50
              -- init bg before build/load since planets need to know bg size
103
51
              the.bg = Tile:new{
104
52
                 image = 'data/stars3.png',
105
 
                 width = 13660,
106
 
                 height = 7680
 
53
                 width = 27320,
 
54
                 height = 15360
107
55
              }
108
56
              self:add(the.bg)
109
57
 
 
58
              if self.newWorld or not the.storage.data.player then
 
59
                 the.storage.data = {planets = {}}
 
60
 
 
61
                 -- build planets from random
 
62
                 for _ = 1, math.random(3, 6) do
 
63
                    local planet = Planet:new{
 
64
                       x = math.random(the.app.width / 2,
 
65
                                       the.bg.width - the.app.width / 2),
 
66
                       y = math.random(the.app.height / 2,
 
67
                                       the.bg.height - the.app.height / 2),
 
68
                       rotation = math.random() * math.pi
 
69
                    }
 
70
                    the.planets:add(planet)
 
71
                    table.insert(the.storage.data.planets, {
 
72
                                    x = planet.x,
 
73
                                    y = planet.y,
 
74
                                    rotation = planet.rotation,
 
75
                                    goods = planet.goods,
 
76
                                    name = planet.name
 
77
                                 })
 
78
                 end
 
79
 
 
80
                 -- build fresh player
 
81
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
82
                 the.player = player
 
83
                 the.storage.data.player = {x = player.x,
 
84
                                            y = player.y,
 
85
                                            money = player.money,
 
86
                                            goods = player.goods,
 
87
                                            cargoSpace = player.cargoSpace
 
88
                                         }
 
89
 
 
90
                 the.storage:save()
 
91
              else
 
92
                 -- load planets with x, y, goods
 
93
                 for _, planetData in ipairs(the.storage.data.planets) do
 
94
                    the.planets:add(Planet:new(planetData))
 
95
                 end
 
96
 
 
97
                 -- load player with cargo, money, position
 
98
                 the.player = SpacePlayer:new(the.storage.data.player)
 
99
 
 
100
                 -- reload storage as we've turned it all into objects
 
101
                 the.storage:load()
 
102
              end
 
103
 
110
104
              self:add(the.planets)
111
105
 
112
 
              --the.player = CrystalPlayer:new{x=400,y=300}
113
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
114
106
              self:add(the.player)
115
107
              self:add(the.player.thrust)
116
 
 
117
 
              --self:add(Enemy:new{x=400, y=300})
 
108
              self:add(the.player.shield)
 
109
 
 
110
              self:add(the.enemies)
 
111
 
 
112
              for _ = 1, 20 do
 
113
                 local e = Enemy:new{x = math.random(the.bg.width),
 
114
                                     y = math.random(the.bg.height)}
 
115
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
116
                 the.enemies:add(e)
 
117
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
118
                 self:add(e.shield)
 
119
              end
118
120
 
119
121
              self:add(the.bullets)
120
 
              --self:add(the.rockColliders)
121
 
              self:add(the.mirrors)
122
 
              --self:add(the.rocks)
123
122
              self:add(the.indicators)
124
123
              self:add(the.interface)
125
124
 
126
 
              for _ = 1, math.random(6) do
127
 
                 local planet = Planet:new{
128
 
                    x = math.random(the.app.width / 2,
129
 
                                    the.bg.width - the.app.width / 2),
130
 
                    y = math.random(the.app.height / 2,
131
 
                                    the.bg.height - the.app.height / 2),
132
 
                    rotation = math.random() * math.pi
133
 
                 }
134
 
                 the.planets:add(planet)
135
 
              end
136
 
 
137
125
              the.cursor = Cursor:new()
138
126
              self:add(the.cursor)
139
127
 
140
 
              the.score = Text:new{
141
 
                 x = 8,
142
 
                 y = 8,
143
 
                 width = the.app.width,
144
 
                 --align = 'center',
145
 
                 font = 25}
146
 
              --the.interface:add(the.score)
147
 
 
148
 
              local hs = the.storage.data.highScore
149
 
              local m = hs / 60
150
 
              local s = hs % 60
151
 
 
152
 
              the.highScore = Text:new{
153
 
                 x = -8,
154
 
                 y = 8,
155
 
                 width = the.app.width,
156
 
                 align = 'right',
157
 
                 font = 25,
158
 
                 text = string.format('High Score: %d:%02d', m, s)
159
 
              }
160
 
              --the.interface:add(the.highScore)
161
 
 
162
 
              the.over = Text:new{
163
 
                 y = the.app.height / 2,
164
 
                 width = the.app.width,
165
 
                 align = 'center',
166
 
                 font = 25,
167
 
                 text = "Game Over",
168
 
                 visible = false
169
 
              }
170
 
              the.interface:add(the.over)
171
 
 
172
 
 
173
 
              the.instructions = Text:new{
174
 
                 y = the.app.height / 2 + 32,
175
 
                 width = the.app.width,
176
 
                 align = 'center',
177
 
                 font = 12,
178
 
                 text = "Press Enter to start a new game\nPress Q to quit",
179
 
                 visible = false
180
 
              }
181
 
              the.interface:add(the.instructions)
182
 
 
183
128
              love.mouse.setGrab(true)
184
129
              love.mouse.setVisible(false)
185
130
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
186
131
 
187
 
              --self:loadLayers('data/map.lua')
188
132
              self.focus = the.player
189
 
              --self:clampTo(self.map)
190
 
 
191
 
              self.gameStart = love.timer.getTime()
192
133
           end,
193
134
   onUpdate = function(self, dt)
194
 
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
195
 
                    local unseenRock = nil
196
 
                    while not unseenRock do
197
 
                       local rock = Rock:new{
198
 
                          x = math.random(the.app.width / 2,
199
 
                                          the.bg.width - the.app.width / 2),
200
 
                          y = math.random(the.app.height / 2,
201
 
                                          the.bg.height - the.app.height / 2),
202
 
                          velocity = {
203
 
                             x = math.random(-300, 300),
204
 
                             y = math.random(-300, 300),
205
 
                             rotation = math.random(-7, 7)
206
 
                          },
207
 
                          scale = math.random() + 0.5
208
 
                       }
209
 
 
210
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
211
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
212
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
213
 
                         unseenRock = rock
214
 
                        end
215
 
                    end
216
 
 
217
 
                    the.rocks:add(unseenRock)
218
 
 
219
 
                    self.lastRock = love.timer.getTime()
220
 
                 end
221
 
 
222
 
                 the.bullets:collide(the.rockColliders)
223
 
 
224
 
                 -- this should really go somewhere else...
225
 
                 for _, planet in ipairs(the.planets.sprites) do
226
 
                    local indx, indy
227
 
                    local pvec = vector.new(
228
 
                       planet.x - the.player.x + planet.width / 2,
229
 
                       planet.y - the.player.y + planet.height / 2 )
230
 
 
231
 
                    -- TODO: is there a better way to specify the
232
 
                    -- screen rectangle?
233
 
                    if planet:intersects(the.player.x - the.app.width / 2,
234
 
                                         the.player.y - the.app.height / 2,
235
 
                                         the.app.width,
236
 
                                         the.app.height) then
237
 
                       -- planet is on the screen
238
 
                       planet.indicator.visible = false
239
 
                    else
240
 
                       planet.indicator.visible = true
241
 
 
242
 
                       if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
243
 
                          indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
244
 
                          indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
245
 
                       else
246
 
                          indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
247
 
                          indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
248
 
                       end
249
 
 
250
 
                       planet.indicator.x = the.player.x + indx
251
 
                       planet.indicator.y = the.player.y + indy
252
 
                    end
253
 
                 end
254
 
 
255
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
256
 
                 --    if not mirror.of then
257
 
                 --       print('mirror:' .. inspect(mirror))
258
 
                 --       error('mirror OF NOTHING')
259
 
                 --    end
260
 
                 -- end
 
135
                 if the.keys:justPressed('escape') then
 
136
                    PauseView:new():activate()
 
137
                 end
 
138
 
 
139
                 the.bullets:collide(the.planets)
 
140
                 the.bullets:collide(the.player)
 
141
                 the.bullets:collide(the.enemies)
261
142
              end,
262
143
   onEndFrame = function(self)
263
144
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
264
145
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
265
 
 
266
 
                   if the.player.active then
267
 
                      self:updateScore()
268
 
                   end
269
146
                end,
270
147
   draw = function (self, x, y)
271
148
             View.draw(self, x, y)
272
149
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
273
150
          end,
274
 
   updateScore = function(self)
275
 
                    local t = love.timer.getTime() - self.gameStart
276
 
                    local m = t / 60
277
 
                    local s = t % 60
278
 
 
279
 
                    the.score.text = string.format('Score: %d:%02d', m, s)
280
 
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
281
 
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
282
 
 
283
 
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
284
 
                    --the.highScore.x = the.player.x - the.app.width / 2
285
 
                 end
286
151
}
287
152
 
288
153
MenuScreen = View:extend {
317
182
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
318
183
                 self.console:watch('num rocks', '#the.rocks.sprites')
319
184
                 self.console:watch('num planets', '#the.planets.sprites')
 
185
                 self.console:watch('num enemies', 'the.enemies:count()')
320
186
                 --self.console:watch('drawTook', 'the.drawTook')
321
187
 
322
188
                 -- back off that dark overlay a bit
325
191
           end,
326
192
   onUpdate = function (self, dt)
327
193
                 if not (DEBUG and the.console.visible) then
328
 
                    if the.keys:justPressed('q') then
329
 
                       self.quit()
330
 
                    elseif the.keys:justPressed('return') then
331
 
                       if the.keys:pressed('alt') then
332
 
                          love.graphics.toggleFullscreen()
333
 
                       else
334
 
                          self.view = GameView:new()
335
 
                       end
 
194
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
195
                       love.graphics.toggleFullscreen()
336
196
                    elseif the.keys:justPressed('f1') then
337
197
                       local ss = love.graphics.newScreenshot()
338
198
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')