/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-10 21:37:59 UTC
  • Revision ID: josh@9ix.org-20130610213759-drnecjpritehmz3t
bigger area, more planets

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
19
 
23
20
util = {
24
21
   signOf = function(value)
74
71
}
75
72
 
76
73
GameView = View:extend {
 
74
   lastRock = 0,
 
75
   rockInterval = 1,
 
76
   gameStart = 0,
77
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
 
78
87
              the.storage = Storage:new{filename = 'scores.lua'}
79
88
              the.storage:load()
80
 
              --if not the.storage.data.highScore then
81
 
              --   print('initializing storage')
82
 
              --   the.storage.data = {highScore = 0}
83
 
              --end
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
84
93
 
 
94
              --the.rockColliders = Group:new()
85
95
              the.bullets = Group:new()
 
96
              the.mirrors = Group:new()
 
97
              --the.rocks = Group:new()
86
98
              the.interface = Group:new()
87
99
              the.planets = Group:new()
88
 
              the.indicators = Group:new()
89
 
              the.enemies = Group:new()
90
100
 
91
101
              the.bg = Tile:new{
92
102
                 image = 'data/stars3.png',
98
108
              self:add(the.planets)
99
109
 
100
110
              --the.player = CrystalPlayer:new{x=400,y=300}
101
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
111
              the.player = SpacePlayer:new{x=1366,y=768}
102
112
              self:add(the.player)
103
113
              self:add(the.player.thrust)
104
 
              self:add(the.player.shield)
105
 
 
106
 
              self:add(the.enemies)
107
 
 
108
 
              for _ = 1, 5 do
109
 
                 local e = Enemy:new{x = math.random(the.bg.width),
110
 
                                     y = math.random(the.bg.height)}
111
 
                 --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
 
                 the.enemies:add(e)
113
 
                 self:add(e.thrust) -- why doesn't this work in Enemy.new?
114
 
                 self:add(e.shield)
115
 
              end
 
114
 
 
115
              --self:add(Enemy:new{x=400, y=300})
116
116
 
117
117
              self:add(the.bullets)
118
 
              self:add(the.indicators)
 
118
              --self:add(the.rockColliders)
 
119
              self:add(the.mirrors)
 
120
              --self:add(the.rocks)
119
121
              self:add(the.interface)
120
122
 
121
123
              for _ = 1, math.random(6) do
122
 
                 local planet = Planet:new{
 
124
                 local planet = Tile:new{
 
125
                    image = 'data/planet1.png',
123
126
                    x = math.random(the.app.width / 2,
124
127
                                    the.bg.width - the.app.width / 2),
125
128
                    y = math.random(the.app.height / 2,
132
135
              the.cursor = Cursor:new()
133
136
              self:add(the.cursor)
134
137
 
 
138
              the.score = Text:new{
 
139
                 x = 8,
 
140
                 y = 8,
 
141
                 width = the.app.width,
 
142
                 --align = 'center',
 
143
                 font = 25}
 
144
              the.interface:add(the.score)
 
145
 
 
146
              local hs = the.storage.data.highScore
 
147
              local m = hs / 60
 
148
              local s = hs % 60
 
149
 
 
150
              the.highScore = Text:new{
 
151
                 x = -8,
 
152
                 y = 8,
 
153
                 width = the.app.width,
 
154
                 align = 'right',
 
155
                 font = 25,
 
156
                 text = string.format('High Score: %d:%02d', m, s)
 
157
              }
 
158
              the.interface:add(the.highScore)
 
159
 
135
160
              the.over = Text:new{
136
161
                 y = the.app.height / 2,
137
162
                 width = the.app.width,
157
182
              love.mouse.setVisible(false)
158
183
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
159
184
 
 
185
              --self:loadLayers('data/map.lua')
160
186
              self.focus = the.player
 
187
              --self:clampTo(self.map)
 
188
 
 
189
              self.gameStart = love.timer.getTime()
161
190
           end,
162
191
   onUpdate = function(self, dt)
163
 
                 the.bullets:collide(the.planets)
164
 
                 the.bullets:collide(the.player)
165
 
                 the.bullets:collide(the.enemies)
 
192
                 if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
 
193
                    local unseenRock = nil
 
194
                    while not unseenRock do
 
195
                       local rock = Rock:new{
 
196
                          x = math.random(the.app.width / 2,
 
197
                                          the.bg.width - the.app.width / 2),
 
198
                          y = math.random(the.app.height / 2,
 
199
                                          the.bg.height - the.app.height / 2),
 
200
                          velocity = {
 
201
                             x = math.random(-300, 300),
 
202
                             y = math.random(-300, 300),
 
203
                             rotation = math.random(-7, 7)
 
204
                          },
 
205
                          scale = math.random() + 0.5
 
206
                       }
 
207
 
 
208
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
209
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
210
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
211
                         unseenRock = rock
 
212
                        end
 
213
                    end
 
214
 
 
215
                    the.rocks:add(unseenRock)
 
216
 
 
217
                    self.lastRock = love.timer.getTime()
 
218
                 end
 
219
 
 
220
                 the.bullets:collide(the.rockColliders)
 
221
 
 
222
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
223
                 --    if not mirror.of then
 
224
                 --       print('mirror:' .. inspect(mirror))
 
225
                 --       error('mirror OF NOTHING')
 
226
                 --    end
 
227
                 -- end
166
228
              end,
167
229
   onEndFrame = function(self)
168
230
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
169
231
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
232
 
 
233
                   if the.player.active then
 
234
                      self:updateScore()
 
235
                   end
170
236
                end,
171
237
   draw = function (self, x, y)
172
238
             View.draw(self, x, y)
173
239
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
174
240
          end,
 
241
   updateScore = function(self)
 
242
                    local t = love.timer.getTime() - self.gameStart
 
243
                    local m = t / 60
 
244
                    local s = t % 60
 
245
 
 
246
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
247
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
248
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
249
 
 
250
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
251
                    --the.highScore.x = the.player.x - the.app.width / 2
 
252
                 end
175
253
}
176
254
 
177
255
MenuScreen = View:extend {
196
274
 
197
275
              self.view = GameView:new()
198
276
 
 
277
              -- should fail silently if it can't go to fullscreen...
 
278
              love.graphics.toggleFullscreen()
 
279
 
199
280
              if DEBUG then
200
281
                 self.console:watch('VERSION', 'VERSION')
201
282
                 self.console:watch('updateTook', 'the.updateTook')
238
319
               end
239
320
            end
240
321
}
241
 
 
242
 
realRun = love.run
243
 
function love.run()
244
 
   -- should fail silently if it can't go to fullscreen...
245
 
   love.graphics.toggleFullscreen()
246
 
 
247
 
   realRun()
248
 
end
 
 
b'\\ No newline at end of file'