/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:
main.lua
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
 
              the.enemies = Group:new()
90
88
 
91
89
              the.bg = Tile:new{
92
90
                 image = 'data/stars3.png',
93
 
                 width = 13660,
94
 
                 height = 7680
 
91
                 -- 1366x768 * 3
 
92
                 width = 4098,
 
93
                 height = 2304
95
94
              }
96
95
              self:add(the.bg)
97
96
 
98
 
              self:add(the.planets)
99
 
 
100
97
              --the.player = CrystalPlayer:new{x=400,y=300}
101
 
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
98
              the.player = SpacePlayer:new{x=1366,y=768}
102
99
              self:add(the.player)
103
 
              self:add(the.player.thrust)
104
 
              self:add(the.player.shield)
105
 
 
106
 
              self:add(the.enemies)
107
 
 
108
 
              local e = Enemy:new{x=400, y=300}
109
 
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
 
              the.enemies:add(e)
111
 
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
112
 
              self:add(e.shield)
113
 
 
114
 
              self:add(the.bullets)
115
 
              self:add(the.indicators)
116
 
              self:add(the.interface)
117
 
 
118
 
              for _ = 1, math.random(6) do
119
 
                 local planet = Planet: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
 
                    rotation = math.random() * math.pi
125
 
                 }
126
 
                 the.planets:add(planet)
127
 
              end
 
100
 
 
101
              --self:add(Enemy:new{x=400, y=300})
128
102
 
129
103
              the.cursor = Cursor:new()
130
104
              self:add(the.cursor)
131
105
 
132
 
              the.over = Text:new{
133
 
                 y = the.app.height / 2,
134
 
                 width = the.app.width,
135
 
                 align = 'center',
136
 
                 font = 25,
137
 
                 text = "Game Over",
138
 
                 visible = false
139
 
              }
140
 
              the.interface:add(the.over)
141
 
 
142
 
 
143
 
              the.instructions = Text:new{
144
 
                 y = the.app.height / 2 + 32,
145
 
                 width = the.app.width,
146
 
                 align = 'center',
147
 
                 font = 12,
148
 
                 text = "Press Enter to start a new game\nPress Q to quit",
149
 
                 visible = false
150
 
              }
151
 
              the.interface:add(the.instructions)
152
 
 
153
106
              love.mouse.setGrab(true)
154
107
              love.mouse.setVisible(false)
155
 
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
156
108
 
 
109
              --self:loadLayers('data/map.lua')
157
110
              self.focus = the.player
 
111
              --self:clampTo(self.map)
 
112
 
 
113
              self.gameStart = love.timer.getTime()
158
114
           end,
159
115
   onUpdate = function(self, dt)
160
 
                 the.bullets:collide(the.planets)
161
 
                 the.bullets:collide(the.player)
162
 
                 the.bullets:collide(the.enemies)
 
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)
163
145
              end,
164
 
   onEndFrame = function(self)
165
 
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
166
 
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
167
 
                end,
168
146
   draw = function (self, x, y)
169
147
             View.draw(self, x, y)
170
 
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
171
 
          end,
 
148
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
149
          end
172
150
}
173
151
 
174
152
MenuScreen = View:extend {
192
170
              math.randomseed(os.time())
193
171
 
194
172
              self.view = GameView:new()
195
 
 
196
173
              if DEBUG then
197
174
                 self.console:watch('VERSION', 'VERSION')
198
175
                 self.console:watch('updateTook', 'the.updateTook')
200
177
                 self.console:watch('the.player.y', 'the.player.y')
201
178
                 self.console:watch('the.app.width', 'the.app.width')
202
179
                 self.console:watch('the.app.height', 'the.app.height')
203
 
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
204
 
                 self.console:watch('num rocks', '#the.rocks.sprites')
205
 
                 self.console:watch('num planets', '#the.planets.sprites')
206
180
                 --self.console:watch('drawTook', 'the.drawTook')
207
181
 
208
182
                 -- back off that dark overlay a bit
210
184
              end
211
185
           end,
212
186
   onUpdate = function (self, dt)
213
 
                 if not (DEBUG and the.console.visible) then
214
 
                    if the.keys:justPressed('q') then
215
 
                       self.quit()
216
 
                    elseif the.keys:justPressed('return') then
217
 
                       if the.keys:pressed('alt') then
218
 
                          love.graphics.toggleFullscreen()
219
 
                       else
220
 
                          self.view = GameView:new()
221
 
                       end
222
 
                    elseif the.keys:justPressed('f1') then
223
 
                       local ss = love.graphics.newScreenshot()
224
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
225
 
                    elseif the.keys:justPressed('f11') then
226
 
                       love.graphics.toggleFullscreen()
227
 
                    end
 
187
                 if the.keys:justPressed('escape') then
 
188
                    self.quit()
228
189
                 end
229
190
              end,
230
191
   update = function (self, dt)
235
196
               end
236
197
            end
237
198
}
238
 
 
239
 
realRun = love.run
240
 
function love.run()
241
 
   -- should fail silently if it can't go to fullscreen...
242
 
   love.graphics.toggleFullscreen()
243
 
 
244
 
   realRun()
245
 
end
 
 
b'\\ No newline at end of file'