/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-16 02:07:23 UTC
  • Revision ID: josh@9ix.org-20130516020723-ntq1ydr2fczd9w5b
stick things into layers

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
18
 
25
19
util = {
26
20
   signOf = function(value)
30
24
                  return -1
31
25
               end
32
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
33
70
}
34
71
 
35
72
GameView = View:extend {
 
73
   lastRock = 0,
 
74
   rockInterval = 1,
 
75
   gameStart = 0,
36
76
   onNew = function (self)
37
 
              the.storage = Storage:new{filename = 'world.lua'}
38
 
              the.storage:load()
39
 
              --if not the.storage.data.highScore then
40
 
              --   print('initializing storage')
41
 
              --   the.storage.data = {highScore = 0}
42
 
              --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
43
85
 
 
86
              the.rockColliders = Group:new()
44
87
              the.bullets = Group:new()
45
 
              the.interface = Group:new()
46
 
              the.planets = Group:new()
47
 
              the.indicators = Group:new()
48
 
              the.enemies = Group:new()
 
88
              the.mirrors = Group:new()
 
89
              the.rocks = Group:new()
49
90
 
50
 
              -- init bg before build/load since planets need to know bg size
51
91
              the.bg = Tile:new{
52
92
                 image = 'data/stars3.png',
53
 
                 width = 27320,
54
 
                 height = 15360
 
93
                 -- 1366x768 * 3
 
94
                 width = 4098,
 
95
                 height = 2304
55
96
              }
56
97
              self:add(the.bg)
57
98
 
58
 
              if self.newWorld or not the.storage.data.player then
59
 
                 the.storage.data = {planets = {}}
60
 
 
61
 
                 -- build planets from random
62
 
                 for _ = 1, math.random(3, 6) do
63
 
                    local planet = Planet:new{
64
 
                       x = math.random(the.app.width / 2,
65
 
                                       the.bg.width - the.app.width / 2),
66
 
                       y = math.random(the.app.height / 2,
67
 
                                       the.bg.height - the.app.height / 2),
68
 
                       rotation = math.random() * math.pi
69
 
                    }
70
 
                    the.planets:add(planet)
71
 
                    table.insert(the.storage.data.planets, {
72
 
                                    x = planet.x,
73
 
                                    y = planet.y,
74
 
                                    rotation = planet.rotation,
75
 
                                    goods = planet.goods,
76
 
                                    name = planet.name
77
 
                                 })
78
 
                 end
79
 
 
80
 
                 -- build fresh player
81
 
                 local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
82
 
                 the.player = player
83
 
                 the.storage.data.player = {x = player.x,
84
 
                                            y = player.y,
85
 
                                            money = player.money,
86
 
                                            goods = player.goods,
87
 
                                            cargoSpace = player.cargoSpace
88
 
                                         }
89
 
 
90
 
                 the.storage:save()
91
 
              else
92
 
                 -- load planets with x, y, goods
93
 
                 for _, planetData in ipairs(the.storage.data.planets) do
94
 
                    the.planets:add(Planet:new(planetData))
95
 
                 end
96
 
 
97
 
                 -- load player with cargo, money, position
98
 
                 the.player = SpacePlayer:new(the.storage.data.player)
99
 
 
100
 
                 -- reload storage as we've turned it all into objects
101
 
                 the.storage:load()
102
 
              end
103
 
 
104
 
              self:add(the.planets)
105
 
 
 
99
              --the.player = CrystalPlayer:new{x=400,y=300}
 
100
              the.player = SpacePlayer:new{x=1366,y=768}
106
101
              self:add(the.player)
107
 
              self:add(the.player.thrust)
108
 
              self:add(the.player.shield)
109
 
 
110
 
              self:add(the.enemies)
111
 
 
112
 
              for _ = 1, 20 do
113
 
                 local e = Enemy:new{x = math.random(the.bg.width),
114
 
                                     y = math.random(the.bg.height)}
115
 
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
116
 
                 the.enemies:add(e)
117
 
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
118
 
                 self:add(e.shield)
119
 
              end
 
102
 
 
103
              --self:add(Enemy:new{x=400, y=300})
120
104
 
121
105
              self:add(the.bullets)
122
 
              self:add(the.indicators)
123
 
              self:add(the.interface)
 
106
              self:add(the.rockColliders)
 
107
              self:add(the.mirrors)
 
108
              self:add(the.rocks)
124
109
 
125
110
              the.cursor = Cursor:new()
126
111
              self:add(the.cursor)
127
112
 
128
113
              love.mouse.setGrab(true)
129
114
              love.mouse.setVisible(false)
130
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
131
115
 
 
116
              --self:loadLayers('data/map.lua')
132
117
              self.focus = the.player
 
118
              --self:clampTo(self.map)
 
119
 
 
120
              self.gameStart = love.timer.getTime()
133
121
           end,
134
122
   onUpdate = function(self, dt)
135
 
                 if the.keys:justPressed('escape') then
136
 
                    PauseView:new():activate()
 
123
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
124
                    local unseenRock = nil
 
125
                    while not unseenRock do
 
126
                       local rock = Rock:new{
 
127
                          x = math.random(the.app.width / 2,
 
128
                                          the.bg.width - the.app.width / 2),
 
129
                          y = math.random(the.app.height / 2,
 
130
                                          the.bg.height - the.app.height / 2),
 
131
                          velocity = {
 
132
                             x = math.random(-300, 300),
 
133
                             y = math.random(-300, 300),
 
134
                             rotation = math.random(-7, 7)
 
135
                          },
 
136
                          scale = math.random() + 0.5
 
137
                       }
 
138
 
 
139
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
140
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
141
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
142
                         unseenRock = rock
 
143
                        end
 
144
                    end
 
145
 
 
146
                    the.rocks:add(unseenRock)
 
147
 
 
148
                    self.lastRock = love.timer.getTime()
137
149
                 end
138
150
 
139
 
                 the.bullets:collide(the.planets)
140
 
                 the.bullets:collide(the.player)
141
 
                 the.bullets:collide(the.enemies)
 
151
                 the.bullets:collide(the.rockColliders)
142
152
              end,
143
 
   onEndFrame = function(self)
144
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
145
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
146
 
                end,
147
153
   draw = function (self, x, y)
148
154
             View.draw(self, x, y)
149
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
150
 
          end,
 
155
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
156
          end
151
157
}
152
158
 
153
159
MenuScreen = View:extend {
171
177
              math.randomseed(os.time())
172
178
 
173
179
              self.view = GameView:new()
174
 
 
175
180
              if DEBUG then
176
181
                 self.console:watch('VERSION', 'VERSION')
177
182
                 self.console:watch('updateTook', 'the.updateTook')
179
184
                 self.console:watch('the.player.y', 'the.player.y')
180
185
                 self.console:watch('the.app.width', 'the.app.width')
181
186
                 self.console:watch('the.app.height', 'the.app.height')
182
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
183
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
184
 
                 self.console:watch('num planets', '#the.planets.sprites')
185
 
                 self.console:watch('num enemies', 'the.enemies:count()')
186
187
                 --self.console:watch('drawTook', 'the.drawTook')
187
188
 
188
189
                 -- back off that dark overlay a bit
190
191
              end
191
192
           end,
192
193
   onUpdate = function (self, dt)
193
 
                 if not (DEBUG and the.console.visible) then
194
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
195
 
                       love.graphics.toggleFullscreen()
196
 
                    elseif the.keys:justPressed('f1') then
197
 
                       local ss = love.graphics.newScreenshot()
198
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
199
 
                    elseif the.keys:justPressed('f11') then
200
 
                       love.graphics.toggleFullscreen()
201
 
                    end
 
194
                 if the.keys:justPressed('escape') then
 
195
                    self.quit()
202
196
                 end
203
197
              end,
204
198
   update = function (self, dt)
209
203
               end
210
204
            end
211
205
}
212
 
 
213
 
realRun = love.run
214
 
function love.run()
215
 
   -- should fail silently if it can't go to fullscreen...
216
 
   love.graphics.toggleFullscreen()
217
 
 
218
 
   realRun()
219
 
end
 
 
b'\\ No newline at end of file'