/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
18
18
require 'boom'
19
19
require 'planet'
20
20
require 'trade_view'
 
21
require 'shield'
 
22
require 'pause_view'
21
23
 
22
24
util = {
23
25
   signOf = function(value)
27
29
                  return -1
28
30
               end
29
31
            end,
30
 
   shortestVector = function(from, to)
31
 
                       if STRICT then
32
 
                          if from.x < the.app.width / 2 or
33
 
                             from.x > the.bg.width - the.app.width / 2 or
34
 
                             from.y < the.app.height / 2 or
35
 
                             from.y > the.bg.height - the.app.height / 2 then
36
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
37
 
                          end
38
 
 
39
 
                          if to.x < the.app.width / 2 or
40
 
                             to.x > the.bg.width - the.app.width / 2 or
41
 
                             to.y < the.app.height / 2 or
42
 
                             to.y > the.bg.height - the.app.height / 2 then
43
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
44
 
                          end
45
 
                       end
46
 
 
47
 
                       -- normalize grid to account for mirror zones
48
 
                       local fx = from.x - the.app.width / 2
49
 
                       local fy = from.y - the.app.height / 2
50
 
                       local tx = to.x - the.app.width / 2
51
 
                       local ty = to.y - the.app.height / 2
52
 
 
53
 
                       local short = {}
54
 
 
55
 
                       -- pick shorter x
56
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
57
 
                          -- straight path is shorter
58
 
                          short.x = tx - fx
59
 
                       else
60
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
61
 
                       end
62
 
 
63
 
                       -- pick shorter y
64
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
65
 
                          -- straight path is shorter
66
 
                          short.y = ty - fy
67
 
                       else
68
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
69
 
                       end
70
 
 
71
 
                       return vector.new(short.x, short.y)
72
 
                    end
73
32
}
74
33
 
75
34
GameView = View:extend {
76
35
   onNew = function (self)
77
 
              the.storage = Storage:new{filename = 'scores.lua'}
 
36
              the.storage = Storage:new{filename = 'world.lua'}
78
37
              the.storage:load()
79
38
              --if not the.storage.data.highScore then
80
39
              --   print('initializing storage')
85
44
              the.interface = Group:new()
86
45
              the.planets = Group:new()
87
46
              the.indicators = Group:new()
 
47
              the.enemies = Group:new()
88
48
 
 
49
              -- init bg before build/load since planets need to know bg size
89
50
              the.bg = Tile:new{
90
51
                 image = 'data/stars3.png',
91
 
                 width = 13660,
92
 
                 height = 7680
 
52
                 width = 27320,
 
53
                 height = 15360
93
54
              }
94
55
              self:add(the.bg)
95
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
              end
 
98
 
96
99
              self:add(the.planets)
97
100
 
98
 
              --the.player = CrystalPlayer:new{x=400,y=300}
99
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
100
101
              self:add(the.player)
101
102
              self:add(the.player.thrust)
102
 
 
103
 
              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
104
115
 
105
116
              self:add(the.bullets)
106
117
              self:add(the.indicators)
107
118
              self:add(the.interface)
108
119
 
109
 
              for _ = 1, math.random(6) do
110
 
                 local planet = Planet:new{
111
 
                    x = math.random(the.app.width / 2,
112
 
                                    the.bg.width - the.app.width / 2),
113
 
                    y = math.random(the.app.height / 2,
114
 
                                    the.bg.height - the.app.height / 2),
115
 
                    rotation = math.random() * math.pi
116
 
                 }
117
 
                 the.planets:add(planet)
118
 
              end
119
 
 
120
120
              the.cursor = Cursor:new()
121
121
              self:add(the.cursor)
122
122
 
 
123
              the.over = Text:new{
 
124
                 y = the.app.height / 2,
 
125
                 width = the.app.width,
 
126
                 align = 'center',
 
127
                 font = 25,
 
128
                 text = "Game Over",
 
129
                 visible = false
 
130
              }
 
131
              the.interface:add(the.over)
 
132
 
 
133
 
 
134
              the.instructions = Text:new{
 
135
                 y = the.app.height / 2 + 32,
 
136
                 width = the.app.width,
 
137
                 align = 'center',
 
138
                 font = 12,
 
139
                 text = "Press Enter to start a new game\nPress Q to quit",
 
140
                 visible = false
 
141
              }
 
142
              the.interface:add(the.instructions)
 
143
 
123
144
              love.mouse.setGrab(true)
124
145
              love.mouse.setVisible(false)
125
146
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
127
148
              self.focus = the.player
128
149
           end,
129
150
   onUpdate = function(self, dt)
 
151
                 if the.keys:justPressed('escape') then
 
152
                    PauseView:new():activate()
 
153
                 end
 
154
 
130
155
                 the.bullets:collide(the.planets)
 
156
                 the.bullets:collide(the.player)
 
157
                 the.bullets:collide(the.enemies)
131
158
              end,
132
159
   onEndFrame = function(self)
133
160
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
171
198
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
172
199
                 self.console:watch('num rocks', '#the.rocks.sprites')
173
200
                 self.console:watch('num planets', '#the.planets.sprites')
 
201
                 self.console:watch('num enemies', 'the.enemies:count()')
174
202
                 --self.console:watch('drawTook', 'the.drawTook')
175
203
 
176
204
                 -- back off that dark overlay a bit
179
207
           end,
180
208
   onUpdate = function (self, dt)
181
209
                 if not (DEBUG and the.console.visible) then
182
 
                    if the.keys:justPressed('q') then
183
 
                       self.quit()
184
 
                    elseif the.keys:justPressed('return') then
185
 
                       if the.keys:pressed('alt') then
186
 
                          love.graphics.toggleFullscreen()
187
 
                       else
188
 
                          self.view = GameView:new()
189
 
                       end
 
210
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
211
                       love.graphics.toggleFullscreen()
190
212
                    elseif the.keys:justPressed('f1') then
191
213
                       local ss = love.graphics.newScreenshot()
192
214
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')