/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-20 17:54:50 UTC
  • Revision ID: josh@9ix.org-20130520175450-1p2jpuadg24xutlk
some instructions at game over

Show diffs side-by-side

added added

removed removed

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