/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-30 22:36:26 UTC
  • Revision ID: josh@9ix.org-20130630223626-pgya1z6raymhzj2v
5-7 planets, tweak some goods

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
6
7
 
7
8
require 'group'
8
9
 
15
16
require 'bullet'
16
17
require 'rock'
17
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'
18
26
 
19
27
util = {
20
28
   signOf = function(value)
24
32
                  return -1
25
33
               end
26
34
            end,
27
 
   shortestVector = function(from, to)
28
 
                       if STRICT then
29
 
                          if from.x < the.app.width / 2 or
30
 
                             from.x > the.bg.width - the.app.width / 2 or
31
 
                             from.y < the.app.height / 2 or
32
 
                             from.y > the.bg.height - the.app.height / 2 then
33
 
                             error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
34
 
                          end
35
 
 
36
 
                          if to.x < the.app.width / 2 or
37
 
                             to.x > the.bg.width - the.app.width / 2 or
38
 
                             to.y < the.app.height / 2 or
39
 
                             to.y > the.bg.height - the.app.height / 2 then
40
 
                             error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
41
 
                          end
42
 
                       end
43
 
 
44
 
                       -- normalize grid to account for mirror zones
45
 
                       local fx = from.x - the.app.width / 2
46
 
                       local fy = from.y - the.app.height / 2
47
 
                       local tx = to.x - the.app.width / 2
48
 
                       local ty = to.y - the.app.height / 2
49
 
 
50
 
                       local short = {}
51
 
 
52
 
                       -- pick shorter x
53
 
                       if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
54
 
                          -- straight path is shorter
55
 
                          short.x = tx - fx
56
 
                       else
57
 
                          short.x = tx - fx - (the.bg.width - the.app.width)
58
 
                       end
59
 
 
60
 
                       -- pick shorter y
61
 
                       if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
62
 
                          -- straight path is shorter
63
 
                          short.y = ty - fy
64
 
                       else
65
 
                          short.y = ty - fy - (the.bg.height - the.app.height)
66
 
                       end
67
 
 
68
 
                       return vector.new(short.x, short.y)
69
 
                    end
70
35
}
71
36
 
72
37
GameView = View:extend {
73
 
   lastRock = 0,
74
 
   rockInterval = 1,
75
 
   gameStart = 0,
76
38
   onNew = function (self)
77
 
              -- for x = 1,30 do
78
 
              --    for y = 1,30 do
79
 
              --       self:add(Fill:new{x=x*400, y=y*400,
80
 
              --                         width = 32, height = 32,
81
 
              --                         fill = {0,0,255}
82
 
              --                      })
83
 
              --    end
84
 
              -- end
85
 
 
86
 
              the.storage = Storage:new{filename = 'scores.lua'}
 
39
              the.storage = Storage:new{filename = 'world.lua'}
87
40
              the.storage:load()
88
 
              if not the.storage.data.highScore then
89
 
                 print('initializing storage')
90
 
                 the.storage.data = {highScore = 0}
91
 
              end
 
41
              --if not the.storage.data.highScore then
 
42
              --   print('initializing storage')
 
43
              --   the.storage.data = {highScore = 0}
 
44
              --end
92
45
 
93
 
              the.rockColliders = Group:new()
94
46
              the.bullets = Group:new()
95
 
              the.mirrors = Group:new()
96
 
              the.rocks = Group:new()
 
47
              the.interface = Group:new()
 
48
              the.planets = Group:new()
 
49
              the.planetLabels = Group:new()
 
50
              the.indicators = Group:new()
 
51
              the.enemies = Group:new()
97
52
 
 
53
              -- init bg before build/load since planets need to know bg size
98
54
              the.bg = Tile:new{
99
55
                 image = 'data/stars3.png',
100
 
                 -- 1366x768 * 3
101
 
                 width = 4098,
102
 
                 height = 2304
 
56
                 width = 27320,
 
57
                 height = 15360
103
58
              }
104
59
              self:add(the.bg)
105
60
 
106
 
              --the.player = CrystalPlayer:new{x=400,y=300}
107
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
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(5, 7) 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
              self:add(the.planets)
 
110
              self:add(the.planetLabels)
 
111
 
108
112
              self:add(the.player)
109
 
 
110
 
              --self:add(Enemy:new{x=400, y=300})
 
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
111
126
 
112
127
              self:add(the.bullets)
113
 
              self:add(the.rockColliders)
114
 
              self:add(the.mirrors)
115
 
              self:add(the.rocks)
 
128
              self:add(the.indicators)
 
129
              self:add(the.interface)
116
130
 
117
131
              the.cursor = Cursor:new()
118
132
              self:add(the.cursor)
119
133
 
120
 
              the.score = Text:new{
121
 
                 width = the.app.width,
122
 
                 align = 'center',
123
 
                 font = 25}
124
 
              self:add(the.score)
125
 
 
126
 
              local hs = the.storage.data.highScore
127
 
              local m = hs / 60
128
 
              local s = hs % 60
129
 
 
130
 
              the.highScore = Text:new{
131
 
                 width = the.app.width,
132
 
                 align = 'right',
133
 
                 font = 25,
134
 
                 text = string.format('High Score: %d:%02d', m, s)
135
 
              }
136
 
              self:add(the.highScore)
137
 
 
138
134
              love.mouse.setGrab(true)
139
135
              love.mouse.setVisible(false)
140
136
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
141
137
 
142
 
              --self:loadLayers('data/map.lua')
143
138
              self.focus = the.player
144
 
              --self:clampTo(self.map)
145
 
 
146
 
              self.gameStart = love.timer.getTime()
147
139
           end,
148
140
   onUpdate = function(self, dt)
149
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
150
 
                    local unseenRock = nil
151
 
                    while not unseenRock do
152
 
                       local rock = Rock:new{
153
 
                          x = math.random(the.app.width / 2,
154
 
                                          the.bg.width - the.app.width / 2),
155
 
                          y = math.random(the.app.height / 2,
156
 
                                          the.bg.height - the.app.height / 2),
157
 
                          velocity = {
158
 
                             x = math.random(-300, 300),
159
 
                             y = math.random(-300, 300),
160
 
                             rotation = math.random(-7, 7)
161
 
                          },
162
 
                          scale = math.random() + 0.5
163
 
                       }
164
 
 
165
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
166
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
167
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
168
 
                         unseenRock = rock
169
 
                        end
170
 
                    end
171
 
 
172
 
                    the.rocks:add(unseenRock)
173
 
 
174
 
                    self.lastRock = love.timer.getTime()
 
141
                 if the.keys:justPressed('escape') then
 
142
                    PauseView:new():activate()
175
143
                 end
176
144
 
177
 
                 the.bullets:collide(the.rockColliders)
 
145
                 the.bullets:collide(the.planets)
 
146
                 the.bullets:collide(the.player)
 
147
                 the.bullets:collide(the.enemies)
178
148
              end,
179
149
   onEndFrame = function(self)
180
 
                   if the.player.active then
181
 
                      local t = love.timer.getTime() - self.gameStart
182
 
                      local m = t / 60
183
 
                      local s = t % 60
184
 
 
185
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
186
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
187
 
                      the.score.x = the.player.x - the.app.width / 2
188
 
                   end
189
 
 
190
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
191
 
                   the.highScore.x = the.player.x - the.app.width / 2
 
150
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
151
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
192
152
                end,
193
153
   draw = function (self, x, y)
194
154
             View.draw(self, x, y)
195
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
196
 
          end
 
155
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
156
          end,
197
157
}
198
158
 
199
159
MenuScreen = View:extend {
217
177
              math.randomseed(os.time())
218
178
 
219
179
              self.view = GameView:new()
 
180
 
220
181
              if DEBUG then
221
182
                 self.console:watch('VERSION', 'VERSION')
222
183
                 self.console:watch('updateTook', 'the.updateTook')
224
185
                 self.console:watch('the.player.y', 'the.player.y')
225
186
                 self.console:watch('the.app.width', 'the.app.width')
226
187
                 self.console:watch('the.app.height', 'the.app.height')
 
188
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
189
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
190
                 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')
227
193
                 --self.console:watch('drawTook', 'the.drawTook')
228
194
 
229
195
                 -- back off that dark overlay a bit
231
197
              end
232
198
           end,
233
199
   onUpdate = function (self, dt)
234
 
                 if the.keys:justPressed('escape') then
235
 
                    self.quit()
 
200
                 if not (DEBUG and the.console.visible) then
 
201
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
 
202
                       love.graphics.toggleFullscreen()
 
203
                    elseif the.keys:justPressed('f1') then
 
204
                       local ss = love.graphics.newScreenshot()
 
205
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
206
                    elseif the.keys:justPressed('f11') then
 
207
                       love.graphics.toggleFullscreen()
 
208
                    end
236
209
                 end
237
210
              end,
238
211
   update = function (self, dt)
243
216
               end
244
217
            end
245
218
}
 
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'