/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-14 17:49:03 UTC
  • Revision ID: josh@9ix.org-20130514174903-790agtxqfvz8lnzv
player death

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
6
 
--inspect = require 'inspect'
7
6
 
8
7
require 'group'
9
8
 
16
15
require 'bullet'
17
16
require 'rock'
18
17
require 'boom'
19
 
require 'planet'
20
 
require 'trade_view'
21
 
require 'shield'
22
18
 
23
19
util = {
24
20
   signOf = function(value)
74
70
}
75
71
 
76
72
GameView = View:extend {
 
73
   lastRock = 0,
 
74
   rockInterval = 1,
 
75
   gameStart = 0,
77
76
   onNew = function (self)
78
 
              the.storage = Storage:new{filename = 'scores.lua'}
79
 
              the.storage:load()
80
 
              --if not the.storage.data.highScore then
81
 
              --   print('initializing storage')
82
 
              --   the.storage.data = {highScore = 0}
83
 
              --end
 
77
              -- for x = 1,30 do
 
78
              --    for y = 1,30 do
 
79
              --       self:add(Fill:new{x=x*400, y=y*400,
 
80
              --                         width = 32, height = 32,
 
81
              --                         fill = {0,0,255}
 
82
              --                      })
 
83
              --    end
 
84
              -- end
84
85
 
 
86
              the.rockColliders = Group:new()
85
87
              the.bullets = Group:new()
86
 
              the.interface = Group:new()
87
 
              the.planets = Group:new()
88
 
              the.indicators = Group:new()
89
88
 
90
89
              the.bg = Tile:new{
91
90
                 image = 'data/stars3.png',
92
 
                 width = 13660,
93
 
                 height = 7680
 
91
                 -- 1366x768 * 3
 
92
                 width = 4098,
 
93
                 height = 2304
94
94
              }
95
95
              self:add(the.bg)
96
96
 
97
 
              self:add(the.planets)
98
 
 
99
97
              --the.player = CrystalPlayer:new{x=400,y=300}
100
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
98
              the.player = SpacePlayer:new{x=1366,y=768}
101
99
              self:add(the.player)
102
 
              self:add(the.player.thrust)
103
 
              self:add(the.player.shield)
104
 
 
105
 
              local e = Enemy:new{x=400, y=300}
106
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
107
 
              self:add(e)
108
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
109
 
 
110
 
              self:add(the.bullets)
111
 
              self:add(the.indicators)
112
 
              self:add(the.interface)
113
 
 
114
 
              for _ = 1, math.random(6) do
115
 
                 local planet = Planet:new{
116
 
                    x = math.random(the.app.width / 2,
117
 
                                    the.bg.width - the.app.width / 2),
118
 
                    y = math.random(the.app.height / 2,
119
 
                                    the.bg.height - the.app.height / 2),
120
 
                    rotation = math.random() * math.pi
121
 
                 }
122
 
                 the.planets:add(planet)
123
 
              end
 
100
 
 
101
              --self:add(Enemy:new{x=400, y=300})
124
102
 
125
103
              the.cursor = Cursor:new()
126
104
              self:add(the.cursor)
127
105
 
128
106
              love.mouse.setGrab(true)
129
107
              love.mouse.setVisible(false)
130
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
131
108
 
 
109
              --self:loadLayers('data/map.lua')
132
110
              self.focus = the.player
 
111
              --self:clampTo(self.map)
 
112
 
 
113
              self.gameStart = love.timer.getTime()
133
114
           end,
134
115
   onUpdate = function(self, dt)
135
 
                 the.bullets:collide(the.planets)
136
 
                 the.bullets:collide(the.player)
 
116
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
117
                    local unseenRock = nil
 
118
                    while not unseenRock do
 
119
                       local rock = Rock:new{
 
120
                          x = math.random(the.app.width / 2,
 
121
                                          the.bg.width - the.app.width / 2),
 
122
                          y = math.random(the.app.height / 2,
 
123
                                          the.bg.height - the.app.height / 2),
 
124
                          velocity = {
 
125
                             x = math.random(-300, 300),
 
126
                             y = math.random(-300, 300),
 
127
                             rotation = math.random(-7, 7)
 
128
                          },
 
129
                          scale = math.random() + 0.5
 
130
                       }
 
131
 
 
132
                       local rockToPlayer = util.shortestVector(rock, the.player)
 
133
                       if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
 
134
                           math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
 
135
                         unseenRock = rock
 
136
                        end
 
137
                    end
 
138
 
 
139
                    self:add(unseenRock)
 
140
 
 
141
                    self.lastRock = love.timer.getTime()
 
142
                 end
 
143
 
 
144
                 the.bullets:collide(the.rockColliders)
137
145
              end,
138
 
   onEndFrame = function(self)
139
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
140
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
141
 
                end,
142
146
   draw = function (self, x, y)
143
147
             View.draw(self, x, y)
144
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
145
 
          end,
 
148
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
149
          end
146
150
}
147
151
 
148
152
MenuScreen = View:extend {
166
170
              math.randomseed(os.time())
167
171
 
168
172
              self.view = GameView:new()
169
 
 
170
173
              if DEBUG then
171
174
                 self.console:watch('VERSION', 'VERSION')
172
175
                 self.console:watch('updateTook', 'the.updateTook')
174
177
                 self.console:watch('the.player.y', 'the.player.y')
175
178
                 self.console:watch('the.app.width', 'the.app.width')
176
179
                 self.console:watch('the.app.height', 'the.app.height')
177
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
178
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
179
 
                 self.console:watch('num planets', '#the.planets.sprites')
180
180
                 --self.console:watch('drawTook', 'the.drawTook')
181
181
 
182
182
                 -- back off that dark overlay a bit
184
184
              end
185
185
           end,
186
186
   onUpdate = function (self, dt)
187
 
                 if not (DEBUG and the.console.visible) then
188
 
                    if the.keys:justPressed('q') then
189
 
                       self.quit()
190
 
                    elseif the.keys:justPressed('return') then
191
 
                       if the.keys:pressed('alt') then
192
 
                          love.graphics.toggleFullscreen()
193
 
                       else
194
 
                          self.view = GameView:new()
195
 
                       end
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
 
187
                 if the.keys:justPressed('escape') then
 
188
                    self.quit()
202
189
                 end
203
190
              end,
204
191
   update = function (self, dt)
209
196
               end
210
197
            end
211
198
}
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'