/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-16 04:27:01 UTC
  • Revision ID: josh@9ix.org-20130616042701-andlbpq3uuf679fy
enemy thrust

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'
19
21
 
20
22
util = {
21
23
   signOf = function(value)
71
73
}
72
74
 
73
75
GameView = View:extend {
74
 
   lastRock = 0,
75
 
   rockInterval = 1,
76
 
   gameStart = 0,
77
76
   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
77
              the.storage = Storage:new{filename = 'scores.lua'}
88
78
              the.storage:load()
89
 
              if not the.storage.data.highScore then
90
 
                 print('initializing storage')
91
 
                 the.storage.data = {highScore = 0}
92
 
              end
 
79
              --if not the.storage.data.highScore then
 
80
              --   print('initializing storage')
 
81
              --   the.storage.data = {highScore = 0}
 
82
              --end
93
83
 
94
 
              the.rockColliders = Group:new()
95
84
              the.bullets = Group:new()
96
 
              the.mirrors = Group:new()
97
 
              the.rocks = Group:new()
 
85
              the.interface = Group:new()
 
86
              the.planets = Group:new()
 
87
              the.indicators = Group:new()
98
88
 
99
89
              the.bg = Tile:new{
100
90
                 image = 'data/stars3.png',
101
 
                 -- 1366x768 * 3
102
 
                 width = 4098,
103
 
                 height = 2304
 
91
                 width = 13660,
 
92
                 height = 7680
104
93
              }
105
94
              self:add(the.bg)
106
95
 
 
96
              self:add(the.planets)
 
97
 
107
98
              --the.player = CrystalPlayer:new{x=400,y=300}
108
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
99
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
109
100
              self:add(the.player)
 
101
              self:add(the.player.thrust)
110
102
 
111
 
              --self:add(Enemy:new{x=400, y=300})
 
103
              local e = Enemy:new{x=400, y=300}
 
104
              self:add(e)
 
105
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
112
106
 
113
107
              self:add(the.bullets)
114
 
              self:add(the.rockColliders)
115
 
              self:add(the.mirrors)
116
 
              self:add(the.rocks)
 
108
              self:add(the.indicators)
 
109
              self:add(the.interface)
 
110
 
 
111
              for _ = 1, math.random(6) do
 
112
                 local planet = Planet:new{
 
113
                    x = math.random(the.app.width / 2,
 
114
                                    the.bg.width - the.app.width / 2),
 
115
                    y = math.random(the.app.height / 2,
 
116
                                    the.bg.height - the.app.height / 2),
 
117
                    rotation = math.random() * math.pi
 
118
                 }
 
119
                 the.planets:add(planet)
 
120
              end
117
121
 
118
122
              the.cursor = Cursor:new()
119
123
              self:add(the.cursor)
120
124
 
121
 
              the.score = Text:new{
122
 
                 width = the.app.width,
123
 
                 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
 
                 font = 25,
135
 
                 text = string.format('High Score: %d:%02d', m, s)
136
 
              }
137
 
              self:add(the.highScore)
138
 
 
139
125
              love.mouse.setGrab(true)
140
126
              love.mouse.setVisible(false)
141
127
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
142
128
 
143
 
              --self:loadLayers('data/map.lua')
144
129
              self.focus = the.player
145
 
              --self:clampTo(self.map)
146
 
 
147
 
              self.gameStart = love.timer.getTime()
148
130
           end,
149
131
   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
 
132
                 the.bullets:collide(the.planets)
186
133
              end,
187
134
   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
 
135
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
136
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
200
137
                end,
201
138
   draw = function (self, x, y)
202
139
             View.draw(self, x, y)
203
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
 
          end
 
140
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
141
          end,
205
142
}
206
143
 
207
144
MenuScreen = View:extend {
225
162
              math.randomseed(os.time())
226
163
 
227
164
              self.view = GameView:new()
 
165
 
228
166
              if DEBUG then
229
167
                 self.console:watch('VERSION', 'VERSION')
230
168
                 self.console:watch('updateTook', 'the.updateTook')
233
171
                 self.console:watch('the.app.width', 'the.app.width')
234
172
                 self.console:watch('the.app.height', 'the.app.height')
235
173
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
174
                 self.console:watch('num rocks', '#the.rocks.sprites')
 
175
                 self.console:watch('num planets', '#the.planets.sprites')
236
176
                 --self.console:watch('drawTook', 'the.drawTook')
237
177
 
238
178
                 -- back off that dark overlay a bit
240
180
              end
241
181
           end,
242
182
   onUpdate = function (self, dt)
243
 
                 if the.keys:justPressed('escape') then
244
 
                    self.quit()
 
183
                 if not (DEBUG and the.console.visible) then
 
184
                    if the.keys:justPressed('q') then
 
185
                       self.quit()
 
186
                    elseif the.keys:justPressed('return') then
 
187
                       if the.keys:pressed('alt') then
 
188
                          love.graphics.toggleFullscreen()
 
189
                       else
 
190
                          self.view = GameView:new()
 
191
                       end
 
192
                    elseif the.keys:justPressed('f1') then
 
193
                       local ss = love.graphics.newScreenshot()
 
194
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
195
                    elseif the.keys:justPressed('f11') then
 
196
                       love.graphics.toggleFullscreen()
 
197
                    end
245
198
                 end
246
199
              end,
247
200
   update = function (self, dt)
252
205
               end
253
206
            end
254
207
}
 
208
 
 
209
realRun = love.run
 
210
function love.run()
 
211
   -- should fail silently if it can't go to fullscreen...
 
212
   love.graphics.toggleFullscreen()
 
213
 
 
214
   realRun()
 
215
end
 
 
b'\\ No newline at end of file'