/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-10 21:37:59 UTC
  • Revision ID: josh@9ix.org-20130610213759-drnecjpritehmz3t
bigger area, more planets

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
 
require 'shield'
22
 
require 'pause_view'
23
 
require 'game_over'
24
 
require 'names'
25
 
require 'good'
26
19
 
27
20
util = {
28
21
   signOf = function(value)
32
25
                  return -1
33
26
               end
34
27
            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
35
71
}
36
72
 
37
73
GameView = View:extend {
 
74
   lastRock = 0,
 
75
   rockInterval = 1,
 
76
   gameStart = 0,
38
77
   onNew = function (self)
39
 
              the.storage = Storage:new{filename = 'world.lua'}
 
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
              the.storage = Storage:new{filename = 'scores.lua'}
40
88
              the.storage:load()
41
 
              --if not the.storage.data.highScore then
42
 
              --   print('initializing storage')
43
 
              --   the.storage.data = {highScore = 0}
44
 
              --end
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
45
93
 
 
94
              --the.rockColliders = Group:new()
46
95
              the.bullets = Group:new()
 
96
              the.mirrors = Group:new()
 
97
              --the.rocks = Group:new()
47
98
              the.interface = Group:new()
48
99
              the.planets = Group:new()
49
 
              the.planetLabels = Group:new()
50
 
              the.indicators = Group:new()
51
 
              the.enemies = Group:new()
52
100
 
53
 
              -- init bg before build/load since planets need to know bg size
54
101
              the.bg = Tile:new{
55
102
                 image = 'data/stars3.png',
56
 
                 width = 27320,
57
 
                 height = 15360
 
103
                 width = 13660,
 
104
                 height = 7680
58
105
              }
59
106
              self:add(the.bg)
60
107
 
61
 
              if self.newWorld or not the.storage.data.player then
62
 
                 the.storage.data = {planets = {}}
63
 
 
64
 
                 -- build planets from random
65
 
                 for _ = 1, math.random(3, 6) do
66
 
                    local planet = Planet:new{
67
 
                       x = math.random(the.app.width / 2,
68
 
                                       the.bg.width - the.app.width / 2),
69
 
                       y = math.random(the.app.height / 2,
70
 
                                       the.bg.height - the.app.height / 2),
71
 
                       rotation = math.random() * math.pi
72
 
                    }
73
 
                    the.planets:add(planet)
74
 
                    table.insert(the.storage.data.planets, {
75
 
                                    x = planet.x,
76
 
                                    y = planet.y,
77
 
                                    rotation = planet.rotation,
78
 
                                    goods = planet.goods,
79
 
                                    name = planet.name
80
 
                                 })
81
 
                 end
82
 
 
83
 
                 Good:stockPlanets()
84
 
 
85
 
                 -- build fresh player
86
 
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
87
 
                 the.player = player
88
 
                 the.storage.data.player = {x = player.x,
89
 
                                            y = player.y,
90
 
                                            money = player.money,
91
 
                                            goods = player.goods,
92
 
                                            cargoSpace = player.cargoSpace
93
 
                                         }
94
 
 
95
 
                 the.storage:save()
96
 
              else
97
 
                 -- load planets with x, y, goods
98
 
                 for _, planetData in ipairs(the.storage.data.planets) do
99
 
                    the.planets:add(Planet:new(planetData))
100
 
                 end
101
 
 
102
 
                 -- load player with cargo, money, position
103
 
                 the.player = SpacePlayer:new(the.storage.data.player)
104
 
 
105
 
                 -- reload storage as we've turned it all into objects
106
 
                 the.storage:load()
107
 
              end
108
 
 
109
108
              self:add(the.planets)
110
 
              self:add(the.planetLabels)
111
109
 
 
110
              --the.player = CrystalPlayer:new{x=400,y=300}
 
111
              the.player = SpacePlayer:new{x=1366,y=768}
112
112
              self:add(the.player)
113
113
              self:add(the.player.thrust)
114
 
              self:add(the.player.shield)
115
 
 
116
 
              self:add(the.enemies)
117
 
 
118
 
              for _ = 1, 20 do
119
 
                 local e = Enemy:new{x = math.random(the.bg.width),
120
 
                                     y = math.random(the.bg.height)}
121
 
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
122
 
                 the.enemies:add(e)
123
 
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
124
 
                 self:add(e.shield)
125
 
              end
 
114
 
 
115
              --self:add(Enemy:new{x=400, y=300})
126
116
 
127
117
              self:add(the.bullets)
128
 
              self:add(the.indicators)
 
118
              --self:add(the.rockColliders)
 
119
              self:add(the.mirrors)
 
120
              --self:add(the.rocks)
129
121
              self:add(the.interface)
130
122
 
 
123
              for _ = 1, math.random(6) do
 
124
                 local planet = Tile:new{
 
125
                    image = 'data/planet1.png',
 
126
                    x = math.random(the.app.width / 2,
 
127
                                    the.bg.width - the.app.width / 2),
 
128
                    y = math.random(the.app.height / 2,
 
129
                                    the.bg.height - the.app.height / 2),
 
130
                    rotation = math.random() * math.pi
 
131
                 }
 
132
                 the.planets:add(planet)
 
133
              end
 
134
 
131
135
              the.cursor = Cursor:new()
132
136
              self:add(the.cursor)
133
137
 
 
138
              the.score = Text:new{
 
139
                 x = 8,
 
140
                 y = 8,
 
141
                 width = the.app.width,
 
142
                 --align = 'center',
 
143
                 font = 25}
 
144
              the.interface:add(the.score)
 
145
 
 
146
              local hs = the.storage.data.highScore
 
147
              local m = hs / 60
 
148
              local s = hs % 60
 
149
 
 
150
              the.highScore = Text:new{
 
151
                 x = -8,
 
152
                 y = 8,
 
153
                 width = the.app.width,
 
154
                 align = 'right',
 
155
                 font = 25,
 
156
                 text = string.format('High Score: %d:%02d', m, s)
 
157
              }
 
158
              the.interface:add(the.highScore)
 
159
 
 
160
              the.over = Text:new{
 
161
                 y = the.app.height / 2,
 
162
                 width = the.app.width,
 
163
                 align = 'center',
 
164
                 font = 25,
 
165
                 text = "Game Over",
 
166
                 visible = false
 
167
              }
 
168
              the.interface:add(the.over)
 
169
 
 
170
 
 
171
              the.instructions = Text:new{
 
172
                 y = the.app.height / 2 + 32,
 
173
                 width = the.app.width,
 
174
                 align = 'center',
 
175
                 font = 12,
 
176
                 text = "Press Enter to start a new game\nPress Q to quit",
 
177
                 visible = false
 
178
              }
 
179
              the.interface:add(the.instructions)
 
180
 
134
181
              love.mouse.setGrab(true)
135
182
              love.mouse.setVisible(false)
136
183
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
137
184
 
 
185
              --self:loadLayers('data/map.lua')
138
186
              self.focus = the.player
 
187
              --self:clampTo(self.map)
 
188
 
 
189
              self.gameStart = love.timer.getTime()
139
190
           end,
140
191
   onUpdate = function(self, dt)
141
 
                 if the.keys:justPressed('escape') then
142
 
                    PauseView:new():activate()
 
192
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
193
                    local unseenRock = nil
 
194
                    while not unseenRock do
 
195
                       local rock = Rock:new{
 
196
                          x = math.random(the.app.width / 2,
 
197
                                          the.bg.width - the.app.width / 2),
 
198
                          y = math.random(the.app.height / 2,
 
199
                                          the.bg.height - the.app.height / 2),
 
200
                          velocity = {
 
201
                             x = math.random(-300, 300),
 
202
                             y = math.random(-300, 300),
 
203
                             rotation = math.random(-7, 7)
 
204
                          },
 
205
                          scale = math.random() + 0.5
 
206
                       }
 
207
 
 
208
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
209
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
210
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
211
                         unseenRock = rock
 
212
                        end
 
213
                    end
 
214
 
 
215
                    the.rocks:add(unseenRock)
 
216
 
 
217
                    self.lastRock = love.timer.getTime()
143
218
                 end
144
219
 
145
 
                 the.bullets:collide(the.planets)
146
 
                 the.bullets:collide(the.player)
147
 
                 the.bullets:collide(the.enemies)
 
220
                 the.bullets:collide(the.rockColliders)
 
221
 
 
222
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
223
                 --    if not mirror.of then
 
224
                 --       print('mirror:' .. inspect(mirror))
 
225
                 --       error('mirror OF NOTHING')
 
226
                 --    end
 
227
                 -- end
148
228
              end,
149
229
   onEndFrame = function(self)
150
230
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
151
231
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
232
 
 
233
                   if the.player.active then
 
234
                      self:updateScore()
 
235
                   end
152
236
                end,
153
237
   draw = function (self, x, y)
154
238
             View.draw(self, x, y)
155
239
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
156
240
          end,
 
241
   updateScore = function(self)
 
242
                    local t = love.timer.getTime() - self.gameStart
 
243
                    local m = t / 60
 
244
                    local s = t % 60
 
245
 
 
246
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
247
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
248
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
249
 
 
250
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
251
                    --the.highScore.x = the.player.x - the.app.width / 2
 
252
                 end
157
253
}
158
254
 
159
255
MenuScreen = View:extend {
178
274
 
179
275
              self.view = GameView:new()
180
276
 
 
277
              -- should fail silently if it can't go to fullscreen...
 
278
              love.graphics.toggleFullscreen()
 
279
 
181
280
              if DEBUG then
182
281
                 self.console:watch('VERSION', 'VERSION')
183
282
                 self.console:watch('updateTook', 'the.updateTook')
188
287
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
189
288
                 self.console:watch('num rocks', '#the.rocks.sprites')
190
289
                 self.console:watch('num planets', '#the.planets.sprites')
191
 
                 self.console:watch('num enemies', 'the.enemies:count()')
192
 
                 self.console:watch('onPlanet', 'the.player.onPlanet')
193
290
                 --self.console:watch('drawTook', 'the.drawTook')
194
291
 
195
292
                 -- back off that dark overlay a bit
198
295
           end,
199
296
   onUpdate = function (self, dt)
200
297
                 if not (DEBUG and the.console.visible) then
201
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
202
 
                       love.graphics.toggleFullscreen()
 
298
                    if the.keys:justPressed('q') then
 
299
                       self.quit()
 
300
                    elseif the.keys:justPressed('return') then
 
301
                       if the.keys:pressed('alt') then
 
302
                          love.graphics.toggleFullscreen()
 
303
                       else
 
304
                          self.view = GameView:new()
 
305
                       end
203
306
                    elseif the.keys:justPressed('f1') then
204
307
                       local ss = love.graphics.newScreenshot()
205
308
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
216
319
               end
217
320
            end
218
321
}
219
 
 
220
 
realRun = love.run
221
 
function love.run()
222
 
   -- should fail silently if it can't go to fullscreen...
223
 
   love.graphics.toggleFullscreen()
224
 
 
225
 
   realRun()
226
 
end
 
 
b'\\ No newline at end of file'