/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 20:20:20 UTC
  • Revision ID: josh@9ix.org-20130616202020-dcra09dhl5bdx8lc
rotate enemy ship slower

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()
98
85
              the.interface = Group:new()
99
86
              the.planets = Group:new()
 
87
              the.indicators = Group:new()
100
88
 
101
89
              the.bg = Tile:new{
102
90
                 image = 'data/stars3.png',
108
96
              self:add(the.planets)
109
97
 
110
98
              --the.player = CrystalPlayer:new{x=400,y=300}
111
 
              the.player = SpacePlayer:new{x=1366,y=768}
 
99
              the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
100
              self:add(the.player)
113
101
              self:add(the.player.thrust)
114
102
 
115
 
              --self:add(Enemy:new{x=400, y=300})
 
103
              local e = Enemy:new{x=400, y=300}
 
104
              --local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
 
105
              self:add(e)
 
106
              self:add(e.thrust) -- why doesn't this work in Enemy.new?
116
107
 
117
108
              self:add(the.bullets)
118
 
              --self:add(the.rockColliders)
119
 
              self:add(the.mirrors)
120
 
              --self:add(the.rocks)
 
109
              self:add(the.indicators)
121
110
              self:add(the.interface)
122
111
 
123
112
              for _ = 1, math.random(6) do
124
 
                 local planet = Tile:new{
125
 
                    image = 'data/planet1.png',
 
113
                 local planet = Planet:new{
126
114
                    x = math.random(the.app.width / 2,
127
115
                                    the.bg.width - the.app.width / 2),
128
116
                    y = math.random(the.app.height / 2,
135
123
              the.cursor = Cursor:new()
136
124
              self:add(the.cursor)
137
125
 
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
 
 
160
 
              the.over = Text:new{
161
 
                 y = the.app.height / 2,
162
 
                 width = the.app.width,
163
 
                 align = 'center',
164
 
                 font = 25,
165
 
                 text = "Game Over",
166
 
                 visible = false
167
 
              }
168
 
              the.interface:add(the.over)
169
 
 
170
 
 
171
 
              the.instructions = Text:new{
172
 
                 y = the.app.height / 2 + 32,
173
 
                 width = the.app.width,
174
 
                 align = 'center',
175
 
                 font = 12,
176
 
                 text = "Press Enter to start a new game\nPress Q to quit",
177
 
                 visible = false
178
 
              }
179
 
              the.interface:add(the.instructions)
180
 
 
181
126
              love.mouse.setGrab(true)
182
127
              love.mouse.setVisible(false)
183
128
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
184
129
 
185
 
              --self:loadLayers('data/map.lua')
186
130
              self.focus = the.player
187
 
              --self:clampTo(self.map)
188
 
 
189
 
              self.gameStart = love.timer.getTime()
190
131
           end,
191
132
   onUpdate = function(self, dt)
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
 
133
                 the.bullets:collide(the.planets)
228
134
              end,
229
135
   onEndFrame = function(self)
230
136
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
231
137
                   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
236
138
                end,
237
139
   draw = function (self, x, y)
238
140
             View.draw(self, x, y)
239
141
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
240
142
          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
253
143
}
254
144
 
255
145
MenuScreen = View:extend {
274
164
 
275
165
              self.view = GameView:new()
276
166
 
277
 
              -- should fail silently if it can't go to fullscreen...
278
 
              love.graphics.toggleFullscreen()
279
 
 
280
167
              if DEBUG then
281
168
                 self.console:watch('VERSION', 'VERSION')
282
169
                 self.console:watch('updateTook', 'the.updateTook')
319
206
               end
320
207
            end
321
208
}
 
209
 
 
210
realRun = love.run
 
211
function love.run()
 
212
   -- should fail silently if it can't go to fullscreen...
 
213
   love.graphics.toggleFullscreen()
 
214
 
 
215
   realRun()
 
216
end
 
 
b'\\ No newline at end of file'