/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 01:11:27 UTC
  • Revision ID: josh@9ix.org-20130626011127-7e7z5ed0r0xmtva3
show planet labels, get better names

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'
 
22
require 'pause_view'
 
23
require 'game_over'
 
24
require 'names'
19
25
 
20
26
util = {
21
27
   signOf = function(value)
25
31
                  return -1
26
32
               end
27
33
            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
34
}
72
35
 
73
36
GameView = View:extend {
74
 
   lastRock = 0,
75
 
   rockInterval = 1,
76
 
   gameStart = 0,
77
37
   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
 
              the.storage = Storage:new{filename = 'scores.lua'}
 
38
              the.storage = Storage:new{filename = 'world.lua'}
88
39
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
 
40
              --if not the.storage.data.highScore then
 
41
              --   print('initializing storage')
 
42
              --   the.storage.data = {highScore = 0}
 
43
              --end
93
44
 
94
 
              --the.rockColliders = Group:new()
95
45
              the.bullets = Group:new()
96
 
              the.mirrors = Group:new()
97
 
              --the.rocks = Group:new()
98
46
              the.interface = Group:new()
99
47
              the.planets = Group:new()
 
48
              the.planetLabels = Group:new()
 
49
              the.indicators = Group:new()
 
50
              the.enemies = Group:new()
100
51
 
 
52
              -- init bg before build/load since planets need to know bg size
101
53
              the.bg = Tile:new{
102
54
                 image = 'data/stars3.png',
103
 
                 width = 13660,
104
 
                 height = 7680
 
55
                 width = 27320,
 
56
                 height = 15360
105
57
              }
106
58
              self:add(the.bg)
107
59
 
 
60
              if self.newWorld or not the.storage.data.player then
 
61
                 the.storage.data = {planets = {}}
 
62
 
 
63
                 -- build planets from random
 
64
                 for _ = 1, math.random(3, 6) do
 
65
                    local planet = Planet:new{
 
66
                       x = math.random(the.app.width / 2,
 
67
                                       the.bg.width - the.app.width / 2),
 
68
                       y = math.random(the.app.height / 2,
 
69
                                       the.bg.height - the.app.height / 2),
 
70
                       rotation = math.random() * math.pi
 
71
                    }
 
72
                    the.planets:add(planet)
 
73
                    table.insert(the.storage.data.planets, {
 
74
                                    x = planet.x,
 
75
                                    y = planet.y,
 
76
                                    rotation = planet.rotation,
 
77
                                    goods = planet.goods,
 
78
                                    name = planet.name
 
79
                                 })
 
80
                 end
 
81
 
 
82
                 -- build fresh player
 
83
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
84
                 the.player = player
 
85
                 the.storage.data.player = {x = player.x,
 
86
                                            y = player.y,
 
87
                                            money = player.money,
 
88
                                            goods = player.goods,
 
89
                                            cargoSpace = player.cargoSpace
 
90
                                         }
 
91
 
 
92
                 the.storage:save()
 
93
              else
 
94
                 -- load planets with x, y, goods
 
95
                 for _, planetData in ipairs(the.storage.data.planets) do
 
96
                    the.planets:add(Planet:new(planetData))
 
97
                 end
 
98
 
 
99
                 -- load player with cargo, money, position
 
100
                 the.player = SpacePlayer:new(the.storage.data.player)
 
101
 
 
102
                 -- reload storage as we've turned it all into objects
 
103
                 the.storage:load()
 
104
              end
 
105
 
108
106
              self:add(the.planets)
 
107
              self:add(the.planetLabels)
109
108
 
110
 
              --the.player = CrystalPlayer:new{x=400,y=300}
111
 
              the.player = SpacePlayer:new{x=1366,y=768}
112
109
              self:add(the.player)
113
110
              self:add(the.player.thrust)
114
 
 
115
 
              --self:add(Enemy:new{x=400, y=300})
 
111
              self:add(the.player.shield)
 
112
 
 
113
              self:add(the.enemies)
 
114
 
 
115
              for _ = 1, 20 do
 
116
                 local e = Enemy:new{x = math.random(the.bg.width),
 
117
                                     y = math.random(the.bg.height)}
 
118
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
119
                 the.enemies:add(e)
 
120
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
121
                 self:add(e.shield)
 
122
              end
116
123
 
117
124
              self:add(the.bullets)
118
 
              --self:add(the.rockColliders)
119
 
              self:add(the.mirrors)
120
 
              --self:add(the.rocks)
 
125
              self:add(the.indicators)
121
126
              self:add(the.interface)
122
127
 
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
 
 
135
128
              the.cursor = Cursor:new()
136
129
              self:add(the.cursor)
137
130
 
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
 
 
181
131
              love.mouse.setGrab(true)
182
132
              love.mouse.setVisible(false)
183
133
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
184
134
 
185
 
              --self:loadLayers('data/map.lua')
186
135
              self.focus = the.player
187
 
              --self:clampTo(self.map)
188
 
 
189
 
              self.gameStart = love.timer.getTime()
190
136
           end,
191
137
   onUpdate = function(self, dt)
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()
 
138
                 if the.keys:justPressed('escape') then
 
139
                    PauseView:new():activate()
218
140
                 end
219
141
 
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
 
142
                 the.bullets:collide(the.planets)
 
143
                 the.bullets:collide(the.player)
 
144
                 the.bullets:collide(the.enemies)
228
145
              end,
229
146
   onEndFrame = function(self)
230
147
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
231
148
                   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
236
149
                end,
237
150
   draw = function (self, x, y)
238
151
             View.draw(self, x, y)
239
152
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
240
153
          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
253
154
}
254
155
 
255
156
MenuScreen = View:extend {
274
175
 
275
176
              self.view = GameView:new()
276
177
 
277
 
              -- should fail silently if it can't go to fullscreen...
278
 
              love.graphics.toggleFullscreen()
279
 
 
280
178
              if DEBUG then
281
179
                 self.console:watch('VERSION', 'VERSION')
282
180
                 self.console:watch('updateTook', 'the.updateTook')
287
185
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
288
186
                 self.console:watch('num rocks', '#the.rocks.sprites')
289
187
                 self.console:watch('num planets', '#the.planets.sprites')
 
188
                 self.console:watch('num enemies', 'the.enemies:count()')
290
189
                 --self.console:watch('drawTook', 'the.drawTook')
291
190
 
292
191
                 -- back off that dark overlay a bit
295
194
           end,
296
195
   onUpdate = function (self, dt)
297
196
                 if not (DEBUG and the.console.visible) then
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
 
197
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
198
                       love.graphics.toggleFullscreen()
306
199
                    elseif the.keys:justPressed('f1') then
307
200
                       local ss = love.graphics.newScreenshot()
308
201
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
319
212
               end
320
213
            end
321
214
}
 
215
 
 
216
realRun = love.run
 
217
function love.run()
 
218
   -- should fail silently if it can't go to fullscreen...
 
219
   love.graphics.toggleFullscreen()
 
220
 
 
221
   realRun()
 
222
end
 
 
b'\\ No newline at end of file'