/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-05-14 17:49:03 UTC
  • Revision ID: josh@9ix.org-20130514174903-790agtxqfvz8lnzv
player death

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
6
 
--inspect = require 'inspect'
7
6
 
8
7
require 'group'
9
8
 
16
15
require 'bullet'
17
16
require 'rock'
18
17
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'
26
18
 
27
19
util = {
28
20
   signOf = function(value)
32
24
                  return -1
33
25
               end
34
26
            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
35
70
}
36
71
 
37
72
GameView = View:extend {
 
73
   lastRock = 0,
 
74
   rockInterval = 1,
 
75
   gameStart = 0,
38
76
   onNew = function (self)
39
 
              the.storage = Storage:new{filename = 'world.lua'}
40
 
              the.storage:load()
41
 
              --if not the.storage.data.highScore then
42
 
              --   print('initializing storage')
43
 
              --   the.storage.data = {highScore = 0}
44
 
              --end
 
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
45
85
 
 
86
              the.rockColliders = Group:new()
46
87
              the.bullets = 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()
52
88
 
53
 
              -- init bg before build/load since planets need to know bg size
54
89
              the.bg = Tile:new{
55
90
                 image = 'data/stars3.png',
56
 
                 width = 27320,
57
 
                 height = 15360
 
91
                 -- 1366x768 * 3
 
92
                 width = 4098,
 
93
                 height = 2304
58
94
              }
59
95
              self:add(the.bg)
60
96
 
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
 
 
 
97
              --the.player = CrystalPlayer:new{x=400,y=300}
 
98
              the.player = SpacePlayer:new{x=1366,y=768}
112
99
              self:add(the.player)
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
126
 
 
127
 
              self:add(the.bullets)
128
 
              self:add(the.indicators)
129
 
              self:add(the.interface)
 
100
 
 
101
              --self:add(Enemy:new{x=400, y=300})
130
102
 
131
103
              the.cursor = Cursor:new()
132
104
              self:add(the.cursor)
133
105
 
134
106
              love.mouse.setGrab(true)
135
107
              love.mouse.setVisible(false)
136
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
137
108
 
 
109
              --self:loadLayers('data/map.lua')
138
110
              self.focus = the.player
 
111
              --self:clampTo(self.map)
 
112
 
 
113
              self.gameStart = love.timer.getTime()
139
114
           end,
140
115
   onUpdate = function(self, dt)
141
 
                 if the.keys:justPressed('escape') then
142
 
                    PauseView:new():activate()
 
116
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
117
                    local unseenRock = nil
 
118
                    while not unseenRock do
 
119
                       local rock = Rock: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
                          velocity = {
 
125
                             x = math.random(-300, 300),
 
126
                             y = math.random(-300, 300),
 
127
                             rotation = math.random(-7, 7)
 
128
                          },
 
129
                          scale = math.random() + 0.5
 
130
                       }
 
131
 
 
132
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
133
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
134
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
135
                         unseenRock = rock
 
136
                        end
 
137
                    end
 
138
 
 
139
                    self:add(unseenRock)
 
140
 
 
141
                    self.lastRock = love.timer.getTime()
143
142
                 end
144
143
 
145
 
                 the.bullets:collide(the.planets)
146
 
                 the.bullets:collide(the.player)
147
 
                 the.bullets:collide(the.enemies)
 
144
                 the.bullets:collide(the.rockColliders)
148
145
              end,
149
 
   onEndFrame = function(self)
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
152
 
                end,
153
146
   draw = function (self, x, y)
154
147
             View.draw(self, x, y)
155
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
156
 
          end,
 
148
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
149
          end
157
150
}
158
151
 
159
152
MenuScreen = View:extend {
171
164
}
172
165
 
173
166
the.app = App:new {
174
 
   name = 'Traderous',
175
167
   onRun = function (self)
176
168
              print('Version: ' .. VERSION)
177
169
 
178
170
              math.randomseed(os.time())
179
171
 
180
172
              self.view = GameView:new()
181
 
 
182
173
              if DEBUG then
183
174
                 self.console:watch('VERSION', 'VERSION')
184
175
                 self.console:watch('updateTook', 'the.updateTook')
186
177
                 self.console:watch('the.player.y', 'the.player.y')
187
178
                 self.console:watch('the.app.width', 'the.app.width')
188
179
                 self.console:watch('the.app.height', 'the.app.height')
189
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
190
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
191
 
                 self.console:watch('num planets', '#the.planets.sprites')
192
 
                 self.console:watch('num enemies', 'the.enemies:count()')
193
 
                 self.console:watch('onPlanet', 'the.player.onPlanet')
194
 
                 self.console:watch('kills', 'the.player.kills')
195
180
                 --self.console:watch('drawTook', 'the.drawTook')
196
181
 
197
182
                 -- back off that dark overlay a bit
199
184
              end
200
185
           end,
201
186
   onUpdate = function (self, dt)
202
 
                 if not (DEBUG and the.console.visible) then
203
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
204
 
                       love.graphics.toggleFullscreen()
205
 
                    elseif the.keys:justPressed('f1') then
206
 
                       local ss = love.graphics.newScreenshot()
207
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
208
 
                    elseif the.keys:justPressed('f11') then
209
 
                       love.graphics.toggleFullscreen()
210
 
                    end
 
187
                 if the.keys:justPressed('escape') then
 
188
                    self.quit()
211
189
                 end
212
190
              end,
213
191
   update = function (self, dt)
218
196
               end
219
197
            end
220
198
}
221
 
 
222
 
realRun = love.run
223
 
function love.run()
224
 
   -- should fail silently if it can't go to fullscreen...
225
 
   love.graphics.toggleFullscreen()
226
 
 
227
 
   realRun()
228
 
end
 
 
b'\\ No newline at end of file'