/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-25 19:55:40 UTC
  • Revision ID: josh@9ix.org-20130625195540-f4nwz7ffj9f6658a
patch zoetrope storage so it can save lists (arrays indexed by number)

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