/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:56:26 UTC
  • Revision ID: josh@9ix.org-20130625195626-00x63mxdyk1k6ud7
last fix for saving

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
require 'planet'
20
20
require 'trade_view'
21
21
require 'shield'
 
22
require 'pause_view'
22
23
 
23
24
util = {
24
25
   signOf = function(value)
28
29
                  return -1
29
30
               end
30
31
            end,
31
 
   shortestVector = function(from, to)
32
 
                       if STRICT then
33
 
                          if from.x < the.app.width / 2 or
34
 
                             from.x > the.bg.width - the.app.width / 2 or
35
 
                             from.y < the.app.height / 2 or
36
 
                             from.y > the.bg.height - the.app.height / 2 then
37
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
38
 
                          end
39
 
 
40
 
                          if to.x < the.app.width / 2 or
41
 
                             to.x > the.bg.width - the.app.width / 2 or
42
 
                             to.y < the.app.height / 2 or
43
 
                             to.y > the.bg.height - the.app.height / 2 then
44
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
45
 
                          end
46
 
                       end
47
 
 
48
 
                       -- normalize grid to account for mirror zones
49
 
                       local fx = from.x - the.app.width / 2
50
 
                       local fy = from.y - the.app.height / 2
51
 
                       local tx = to.x - the.app.width / 2
52
 
                       local ty = to.y - the.app.height / 2
53
 
 
54
 
                       local short = {}
55
 
 
56
 
                       -- pick shorter x
57
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
58
 
                          -- straight path is shorter
59
 
                          short.x = tx - fx
60
 
                       else
61
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
62
 
                       end
63
 
 
64
 
                       -- pick shorter y
65
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
66
 
                          -- straight path is shorter
67
 
                          short.y = ty - fy
68
 
                       else
69
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
70
 
                       end
71
 
 
72
 
                       return vector.new(short.x, short.y)
73
 
                    end
74
32
}
75
33
 
76
34
GameView = View:extend {
77
35
   onNew = function (self)
78
 
              the.storage = Storage:new{filename = 'scores.lua'}
 
36
              the.storage = Storage:new{filename = 'world.lua'}
79
37
              the.storage:load()
80
38
              --if not the.storage.data.highScore then
81
39
              --   print('initializing storage')
88
46
              the.indicators = Group:new()
89
47
              the.enemies = Group:new()
90
48
 
 
49
              -- init bg before build/load since planets need to know bg size
91
50
              the.bg = Tile:new{
92
51
                 image = 'data/stars3.png',
93
 
                 width = 13660,
94
 
                 height = 7680
 
52
                 width = 27320,
 
53
                 height = 15360
95
54
              }
96
55
              self:add(the.bg)
97
56
 
 
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
 
 
98
                 -- reload storage as we've turned it all into objects
 
99
                 the.storage:load()
 
100
              end
 
101
 
98
102
              self:add(the.planets)
99
103
 
100
 
              --the.player = CrystalPlayer:new{x=400,y=300}
101
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
102
104
              self:add(the.player)
103
105
              self:add(the.player.thrust)
104
106
              self:add(the.player.shield)
105
107
 
106
108
              self:add(the.enemies)
107
109
 
108
 
              --local e = Enemy:new{x=400, y=300}
109
 
              local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
 
              the.enemies:add(e)
111
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
112
 
              self:add(e.shield)
 
110
              for _ = 1, 20 do
 
111
                 local e = Enemy:new{x = math.random(the.bg.width),
 
112
                                     y = math.random(the.bg.height)}
 
113
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
114
                 the.enemies:add(e)
 
115
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
116
                 self:add(e.shield)
 
117
              end
113
118
 
114
119
              self:add(the.bullets)
115
120
              self:add(the.indicators)
116
121
              self:add(the.interface)
117
122
 
118
 
              for _ = 1, math.random(6) do
119
 
                 local planet = Planet:new{
120
 
                    x = math.random(the.app.width / 2,
121
 
                                    the.bg.width - the.app.width / 2),
122
 
                    y = math.random(the.app.height / 2,
123
 
                                    the.bg.height - the.app.height / 2),
124
 
                    rotation = math.random() * math.pi
125
 
                 }
126
 
                 the.planets:add(planet)
127
 
              end
128
 
 
129
123
              the.cursor = Cursor:new()
130
124
              self:add(the.cursor)
131
125
 
157
151
              self.focus = the.player
158
152
           end,
159
153
   onUpdate = function(self, dt)
 
154
                 if the.keys:justPressed('escape') then
 
155
                    PauseView:new():activate()
 
156
                 end
 
157
 
160
158
                 the.bullets:collide(the.planets)
161
159
                 the.bullets:collide(the.player)
162
160
                 the.bullets:collide(the.enemies)
203
201
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
204
202
                 self.console:watch('num rocks', '#the.rocks.sprites')
205
203
                 self.console:watch('num planets', '#the.planets.sprites')
 
204
                 self.console:watch('num enemies', 'the.enemies:count()')
206
205
                 --self.console:watch('drawTook', 'the.drawTook')
207
206
 
208
207
                 -- back off that dark overlay a bit
211
210
           end,
212
211
   onUpdate = function (self, dt)
213
212
                 if not (DEBUG and the.console.visible) then
214
 
                    if the.keys:justPressed('q') then
215
 
                       self.quit()
216
 
                    elseif the.keys:justPressed('return') then
217
 
                       if the.keys:pressed('alt') then
218
 
                          love.graphics.toggleFullscreen()
219
 
                       else
220
 
                          self.view = GameView:new()
221
 
                       end
 
213
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
214
                       love.graphics.toggleFullscreen()
222
215
                    elseif the.keys:justPressed('f1') then
223
216
                       local ss = love.graphics.newScreenshot()
224
217
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')