/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-23 02:28:12 UTC
  • Revision ID: josh@9ix.org-20130623022812-zhz3azvff45bgsw1
bigger space, slower movement, maintain enemy density

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'
19
22
 
20
23
util = {
21
24
   signOf = function(value)
25
28
                  return -1
26
29
               end
27
30
            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
71
31
}
72
32
 
73
33
GameView = View:extend {
74
 
   lastRock = 0,
75
 
   rockInterval = 1,
76
 
   gameStart = 0,
77
34
   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
 
 
87
35
              the.storage = Storage:new{filename = 'scores.lua'}
88
36
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
 
37
              --if not the.storage.data.highScore then
 
38
              --   print('initializing storage')
 
39
              --   the.storage.data = {highScore = 0}
 
40
              --end
93
41
 
94
 
              the.rockColliders = Group:new()
95
42
              the.bullets = Group:new()
96
 
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
 
43
              the.interface = Group:new()
 
44
              the.planets = Group:new()
 
45
              the.indicators = Group:new()
 
46
              the.enemies = Group:new()
98
47
 
99
48
              the.bg = Tile:new{
100
49
                 image = 'data/stars3.png',
101
 
                 -- 1366x768 * 3
102
 
                 width = 4098,
103
 
                 height = 2304
 
50
                 width = 27320,
 
51
                 height = 15360
104
52
              }
105
53
              self:add(the.bg)
106
54
 
 
55
              self:add(the.planets)
 
56
 
107
57
              --the.player = CrystalPlayer:new{x=400,y=300}
108
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
58
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
109
59
              self:add(the.player)
110
 
 
111
 
              --self:add(Enemy:new{x=400, y=300})
 
60
              self:add(the.player.thrust)
 
61
              self:add(the.player.shield)
 
62
 
 
63
              self:add(the.enemies)
 
64
 
 
65
              for _ = 1, 20 do
 
66
                 local e = Enemy:new{x = math.random(the.bg.width),
 
67
                                     y = math.random(the.bg.height)}
 
68
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
69
                 the.enemies:add(e)
 
70
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
 
71
                 self:add(e.shield)
 
72
              end
112
73
 
113
74
              self:add(the.bullets)
114
 
              self:add(the.rockColliders)
115
 
              self:add(the.mirrors)
116
 
              self:add(the.rocks)
 
75
              self:add(the.indicators)
 
76
              self:add(the.interface)
 
77
 
 
78
              for _ = 1, math.random(3, 6) do
 
79
                 local planet = Planet:new{
 
80
                    x = math.random(the.app.width / 2,
 
81
                                    the.bg.width - the.app.width / 2),
 
82
                    y = math.random(the.app.height / 2,
 
83
                                    the.bg.height - the.app.height / 2),
 
84
                    rotation = math.random() * math.pi
 
85
                 }
 
86
                 the.planets:add(planet)
 
87
              end
117
88
 
118
89
              the.cursor = Cursor:new()
119
90
              self:add(the.cursor)
120
91
 
121
 
              the.score = Text:new{
 
92
              the.over = Text:new{
 
93
                 y = the.app.height / 2,
122
94
                 width = the.app.width,
123
95
                 align = 'center',
124
 
                 font = 25}
125
 
              self:add(the.score)
126
 
 
127
 
              local hs = the.storage.data.highScore
128
 
              local m = hs / 60
129
 
              local s = hs % 60
130
 
 
131
 
              the.highScore = Text:new{
132
 
                 width = the.app.width,
133
 
                 align = 'right',
134
96
                 font = 25,
135
 
                 text = string.format('High Score: %d:%02d', m, s)
136
 
              }
137
 
              self:add(the.highScore)
 
97
                 text = "Game Over",
 
98
                 visible = false
 
99
              }
 
100
              the.interface:add(the.over)
 
101
 
 
102
 
 
103
              the.instructions = Text:new{
 
104
                 y = the.app.height / 2 + 32,
 
105
                 width = the.app.width,
 
106
                 align = 'center',
 
107
                 font = 12,
 
108
                 text = "Press Enter to start a new game\nPress Q to quit",
 
109
                 visible = false
 
110
              }
 
111
              the.interface:add(the.instructions)
138
112
 
139
113
              love.mouse.setGrab(true)
140
114
              love.mouse.setVisible(false)
141
115
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
142
116
 
143
 
              --self:loadLayers('data/map.lua')
144
117
              self.focus = the.player
145
 
              --self:clampTo(self.map)
146
 
 
147
 
              self.gameStart = love.timer.getTime()
148
118
           end,
149
119
   onUpdate = function(self, dt)
150
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
151
 
                    local unseenRock = nil
152
 
                    while not unseenRock do
153
 
                       local rock = Rock:new{
154
 
                          x = math.random(the.app.width / 2,
155
 
                                          the.bg.width - the.app.width / 2),
156
 
                          y = math.random(the.app.height / 2,
157
 
                                          the.bg.height - the.app.height / 2),
158
 
                          velocity = {
159
 
                             x = math.random(-300, 300),
160
 
                             y = math.random(-300, 300),
161
 
                             rotation = math.random(-7, 7)
162
 
                          },
163
 
                          scale = math.random() + 0.5
164
 
                       }
165
 
 
166
 
                       local rockToPlayer = util.shortestVector(rock, the.player)
167
 
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
168
 
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
169
 
                         unseenRock = rock
170
 
                        end
171
 
                    end
172
 
 
173
 
                    the.rocks:add(unseenRock)
174
 
 
175
 
                    self.lastRock = love.timer.getTime()
176
 
                 end
177
 
 
178
 
                 the.bullets:collide(the.rockColliders)
179
 
 
180
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
181
 
                 --    if not mirror.of then
182
 
                 --       print('mirror:' .. inspect(mirror))
183
 
                 --       error('mirror OF NOTHING')
184
 
                 --    end
185
 
                 -- end
 
120
                 the.bullets:collide(the.planets)
 
121
                 the.bullets:collide(the.player)
 
122
                 the.bullets:collide(the.enemies)
186
123
              end,
187
124
   onEndFrame = function(self)
188
 
                   if the.player.active then
189
 
                      local t = love.timer.getTime() - self.gameStart
190
 
                      local m = t / 60
191
 
                      local s = t % 60
192
 
 
193
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
194
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
 
                      the.score.x = the.player.x - the.app.width / 2
196
 
                   end
197
 
 
198
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
 
                   the.highScore.x = the.player.x - the.app.width / 2
 
125
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
126
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
200
127
                end,
201
128
   draw = function (self, x, y)
202
129
             View.draw(self, x, y)
203
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
 
          end
 
130
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
131
          end,
205
132
}
206
133
 
207
134
MenuScreen = View:extend {
225
152
              math.randomseed(os.time())
226
153
 
227
154
              self.view = GameView:new()
 
155
 
228
156
              if DEBUG then
229
157
                 self.console:watch('VERSION', 'VERSION')
230
158
                 self.console:watch('updateTook', 'the.updateTook')
233
161
                 self.console:watch('the.app.width', 'the.app.width')
234
162
                 self.console:watch('the.app.height', 'the.app.height')
235
163
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
164
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
165
                 self.console:watch('num planets', '#the.planets.sprites')
236
166
                 --self.console:watch('drawTook', 'the.drawTook')
237
167
 
238
168
                 -- back off that dark overlay a bit
240
170
              end
241
171
           end,
242
172
   onUpdate = function (self, dt)
243
 
                 if the.keys:justPressed('escape') then
244
 
                    self.quit()
 
173
                 if not (DEBUG and the.console.visible) then
 
174
                    if the.keys:justPressed('q') then
 
175
                       self.quit()
 
176
                    elseif the.keys:justPressed('return') then
 
177
                       if the.keys:pressed('alt') then
 
178
                          love.graphics.toggleFullscreen()
 
179
                       else
 
180
                          self.view = GameView:new()
 
181
                       end
 
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()
 
187
                    end
245
188
                 end
246
189
              end,
247
190
   update = function (self, dt)
252
195
               end
253
196
            end
254
197
}
 
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'