/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-09 23:09:16 UTC
  • Revision ID: josh@9ix.org-20130609230916-jdtvrn226f3vnijm
add planet, remove rocks

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
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
19
 
24
20
util = {
25
21
   signOf = function(value)
29
25
                  return -1
30
26
               end
31
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
32
71
}
33
72
 
34
73
GameView = View:extend {
 
74
   lastRock = 0,
 
75
   rockInterval = 1,
 
76
   gameStart = 0,
35
77
   onNew = function (self)
 
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
 
36
87
              the.storage = Storage:new{filename = 'scores.lua'}
37
88
              the.storage:load()
38
 
              --if not the.storage.data.highScore then
39
 
              --   print('initializing storage')
40
 
              --   the.storage.data = {highScore = 0}
41
 
              --end
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
42
93
 
 
94
              --the.rockColliders = Group:new()
43
95
              the.bullets = Group:new()
 
96
              the.mirrors = Group:new()
 
97
              --the.rocks = Group:new()
44
98
              the.interface = Group:new()
45
99
              the.planets = Group:new()
46
 
              the.indicators = Group:new()
47
 
              the.enemies = Group:new()
48
100
 
49
101
              the.bg = Tile:new{
50
102
                 image = 'data/stars3.png',
51
 
                 width = 27320,
52
 
                 height = 15360
 
103
                 -- 1366x768 * 3
 
104
                 width = 4098,
 
105
                 height = 2304
53
106
              }
54
107
              self:add(the.bg)
55
108
 
56
109
              self:add(the.planets)
57
110
 
58
111
              --the.player = CrystalPlayer:new{x=400,y=300}
59
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
112
              the.player = SpacePlayer:new{x=1366,y=768}
60
113
              self:add(the.player)
61
114
              self:add(the.player.thrust)
62
 
              self:add(the.player.shield)
63
 
 
64
 
              self:add(the.enemies)
65
 
 
66
 
              for _ = 1, 20 do
67
 
                 local e = Enemy:new{x = math.random(the.bg.width),
68
 
                                     y = math.random(the.bg.height)}
69
 
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
70
 
                 the.enemies:add(e)
71
 
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
72
 
                 self:add(e.shield)
73
 
              end
 
115
 
 
116
              --self:add(Enemy:new{x=400, y=300})
74
117
 
75
118
              self:add(the.bullets)
76
 
              self:add(the.indicators)
 
119
              --self:add(the.rockColliders)
 
120
              self:add(the.mirrors)
 
121
              --self:add(the.rocks)
77
122
              self:add(the.interface)
78
123
 
79
 
              for _ = 1, math.random(3, 6) do
80
 
                 local planet = Planet:new{
81
 
                    x = math.random(the.app.width / 2,
82
 
                                    the.bg.width - the.app.width / 2),
83
 
                    y = math.random(the.app.height / 2,
84
 
                                    the.bg.height - the.app.height / 2),
85
 
                    rotation = math.random() * math.pi
86
 
                 }
87
 
                 the.planets:add(planet)
88
 
              end
 
124
              local planet = Tile:new{
 
125
                 image = 'data/planet1.png',
 
126
                 x = math.random(the.app.width / 2,
 
127
                                 the.bg.width - the.app.width / 2),
 
128
                 y = math.random(the.app.height / 2,
 
129
                                 the.bg.height - the.app.height / 2),
 
130
              }
 
131
              the.planets:add(planet)
89
132
 
90
133
              the.cursor = Cursor:new()
91
134
              self:add(the.cursor)
92
135
 
 
136
              the.score = Text:new{
 
137
                 x = 8,
 
138
                 y = 8,
 
139
                 width = the.app.width,
 
140
                 --align = 'center',
 
141
                 font = 25}
 
142
              the.interface:add(the.score)
 
143
 
 
144
              local hs = the.storage.data.highScore
 
145
              local m = hs / 60
 
146
              local s = hs % 60
 
147
 
 
148
              the.highScore = Text:new{
 
149
                 x = -8,
 
150
                 y = 8,
 
151
                 width = the.app.width,
 
152
                 align = 'right',
 
153
                 font = 25,
 
154
                 text = string.format('High Score: %d:%02d', m, s)
 
155
              }
 
156
              the.interface:add(the.highScore)
 
157
 
93
158
              the.over = Text:new{
94
159
                 y = the.app.height / 2,
95
160
                 width = the.app.width,
115
180
              love.mouse.setVisible(false)
116
181
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
117
182
 
 
183
              --self:loadLayers('data/map.lua')
118
184
              self.focus = the.player
 
185
              --self:clampTo(self.map)
 
186
 
 
187
              self.gameStart = love.timer.getTime()
119
188
           end,
120
189
   onUpdate = function(self, dt)
121
 
                 if the.keys:justPressed('escape') then
122
 
                    PauseView:new():activate()
 
190
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
191
                    local unseenRock = nil
 
192
                    while not unseenRock do
 
193
                       local rock = Rock:new{
 
194
                          x = math.random(the.app.width / 2,
 
195
                                          the.bg.width - the.app.width / 2),
 
196
                          y = math.random(the.app.height / 2,
 
197
                                          the.bg.height - the.app.height / 2),
 
198
                          velocity = {
 
199
                             x = math.random(-300, 300),
 
200
                             y = math.random(-300, 300),
 
201
                             rotation = math.random(-7, 7)
 
202
                          },
 
203
                          scale = math.random() + 0.5
 
204
                       }
 
205
 
 
206
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
207
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
208
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
209
                         unseenRock = rock
 
210
                        end
 
211
                    end
 
212
 
 
213
                    the.rocks:add(unseenRock)
 
214
 
 
215
                    self.lastRock = love.timer.getTime()
123
216
                 end
124
217
 
125
 
                 the.bullets:collide(the.planets)
126
 
                 the.bullets:collide(the.player)
127
 
                 the.bullets:collide(the.enemies)
 
218
                 the.bullets:collide(the.rockColliders)
 
219
 
 
220
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
221
                 --    if not mirror.of then
 
222
                 --       print('mirror:' .. inspect(mirror))
 
223
                 --       error('mirror OF NOTHING')
 
224
                 --    end
 
225
                 -- end
128
226
              end,
129
227
   onEndFrame = function(self)
130
228
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
131
229
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
230
 
 
231
                   if the.player.active then
 
232
                      self:updateScore()
 
233
                   end
132
234
                end,
133
235
   draw = function (self, x, y)
134
236
             View.draw(self, x, y)
135
237
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
136
238
          end,
 
239
   updateScore = function(self)
 
240
                    local t = love.timer.getTime() - self.gameStart
 
241
                    local m = t / 60
 
242
                    local s = t % 60
 
243
 
 
244
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
245
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
246
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
247
 
 
248
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
249
                    --the.highScore.x = the.player.x - the.app.width / 2
 
250
                 end
137
251
}
138
252
 
139
253
MenuScreen = View:extend {
158
272
 
159
273
              self.view = GameView:new()
160
274
 
 
275
              -- should fail silently if it can't go to fullscreen...
 
276
              love.graphics.toggleFullscreen()
 
277
 
161
278
              if DEBUG then
162
279
                 self.console:watch('VERSION', 'VERSION')
163
280
                 self.console:watch('updateTook', 'the.updateTook')
167
284
                 self.console:watch('the.app.height', 'the.app.height')
168
285
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
169
286
                 self.console:watch('num rocks', '#the.rocks.sprites')
170
 
                 self.console:watch('num planets', '#the.planets.sprites')
171
 
                 self.console:watch('num enemies', 'the.enemies:count()')
172
287
                 --self.console:watch('drawTook', 'the.drawTook')
173
288
 
174
289
                 -- back off that dark overlay a bit
176
291
              end
177
292
           end,
178
293
   onUpdate = function (self, dt)
179
 
                 if not (DEBUG and the.console.visible) then
180
 
                    if the.keys:justPressed('return') and the.keys:pressed('alt') then
181
 
                       love.graphics.toggleFullscreen()
182
 
                    elseif the.keys:justPressed('f1') then
183
 
                       local ss = love.graphics.newScreenshot()
184
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
185
 
                    elseif the.keys:justPressed('f11') then
186
 
                       love.graphics.toggleFullscreen()
 
294
                 if the.keys:justPressed('q') then
 
295
                    self.quit()
 
296
                 elseif the.keys:justPressed('return') then
 
297
                    if the.keys:pressed('alt') then
 
298
                       love.graphics.toggleFullscreen()
 
299
                    else
 
300
                       self.view = GameView:new()
187
301
                    end
 
302
                 elseif the.keys:justPressed('f1') then
 
303
                    local ss = love.graphics.newScreenshot()
 
304
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
305
                 elseif the.keys:justPressed('f11') then
 
306
                    love.graphics.toggleFullscreen()
188
307
                 end
189
308
              end,
190
309
   update = function (self, dt)
195
314
               end
196
315
            end
197
316
}
198
 
 
199
 
realRun = love.run
200
 
function love.run()
201
 
   -- should fail silently if it can't go to fullscreen...
202
 
   love.graphics.toggleFullscreen()
203
 
 
204
 
   realRun()
205
 
end
 
 
b'\\ No newline at end of file'