To get this branch, use:
bzr branch
http://9ix.org/bzr/traderous
« back to all changes in this revision
Viewing changes to main.lua
- browse files at revision 35
- compare with another revision
- download diff
- download tarball
- view history from revision 35
- Committer: Josh C
- Date: 2013-05-18 00:09:56 UTC
- Revision ID: josh@9ix.org-20130518000956-s9717aensfsq1b3c
fix double-removing sprites (and subsequent zombie mirror bullets).
also lots of debug stuff.
also lots of debug stuff.
- files removed:
- data/planet1.png
- files modified:
- bullet.lua
added
removed
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
19
require 'planet'
20
19
21
20
util = {
22
21
signOf = function(value)
92
91
the.storage.data = {highScore = 0}
93
92
end
94
93
95
--the.rockColliders = Group:new()
94
the.rockColliders = Group:new()
96
95
the.bullets = Group:new()
97
96
the.mirrors = Group:new()
98
--the.rocks = Group:new()
99
the.interface = Group:new()
100
the.planets = Group:new()
101
the.indicators = Group:new()
97
the.rocks = Group:new()
102
98
103
99
the.bg = Tile:new{
104
100
image = 'data/stars3.png',
105
width = 13660,
106
height = 7680
101
-- 1366x768 * 3
102
width = 4098,
103
height = 2304
107
104
}
108
105
self:add(the.bg)
109
106
110
self:add(the.planets)
111
112
107
--the.player = CrystalPlayer:new{x=400,y=300}
113
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
108
the.player = SpacePlayer:new{x=1366,y=768}
114
109
self:add(the.player)
115
self:add(the.player.thrust)
116
110
117
111
--self:add(Enemy:new{x=400, y=300})
118
112
119
113
self:add(the.bullets)
120
--self:add(the.rockColliders)
114
self:add(the.rockColliders)
121
115
self:add(the.mirrors)
122
--self:add(the.rocks)
123
self:add(the.indicators)
124
self:add(the.interface)
125
126
for _ = 1, math.random(6) do
127
local planet = Planet:new{
128
x = math.random(the.app.width / 2,
129
the.bg.width - the.app.width / 2),
130
y = math.random(the.app.height / 2,
131
the.bg.height - the.app.height / 2),
132
rotation = math.random() * math.pi
133
}
134
the.planets:add(planet)
135
end
116
self:add(the.rocks)
136
117
137
118
the.cursor = Cursor:new()
138
119
self:add(the.cursor)
139
120
140
121
the.score = Text:new{
141
x = 8,
142
y = 8,
143
122
width = the.app.width,
144
--align = 'center',
123
align = 'center',
145
124
font = 25}
146
--the.interface:add(the.score)
125
self:add(the.score)
147
126
148
127
local hs = the.storage.data.highScore
149
128
local m = hs / 60
150
129
local s = hs % 60
151
130
152
131
the.highScore = Text:new{
153
x = -8,
154
y = 8,
155
132
width = the.app.width,
156
133
align = 'right',
157
134
font = 25,
158
135
text = string.format('High Score: %d:%02d', m, s)
159
136
}
160
--the.interface:add(the.highScore)
161
162
the.over = Text:new{
163
y = the.app.height / 2,
164
width = the.app.width,
165
align = 'center',
166
font = 25,
167
text = "Game Over",
168
visible = false
169
}
170
the.interface:add(the.over)
171
172
173
the.instructions = Text:new{
174
y = the.app.height / 2 + 32,
175
width = the.app.width,
176
align = 'center',
177
font = 12,
178
text = "Press Enter to start a new game\nPress Q to quit",
179
visible = false
180
}
181
the.interface:add(the.instructions)
137
self:add(the.highScore)
182
138
183
139
love.mouse.setGrab(true)
184
140
love.mouse.setVisible(false)
191
147
self.gameStart = love.timer.getTime()
192
148
end,
193
149
onUpdate = function(self, dt)
194
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
150
if love.timer.getTime() > self.lastRock + self.rockInterval then
195
151
local unseenRock = nil
196
152
while not unseenRock do
197
153
local rock = Rock:new{
221
177
222
178
the.bullets:collide(the.rockColliders)
223
179
224
-- this should really go somewhere else...
225
for _, planet in ipairs(the.planets.sprites) do
226
local indx, indy
227
local pvec = vector.new(
228
planet.x - the.player.x + planet.width / 2,
229
planet.y - the.player.y + planet.height / 2 )
230
231
-- TODO: is there a better way to specify the
232
-- screen rectangle?
233
if planet:intersects(the.player.x - the.app.width / 2,
234
the.player.y - the.app.height / 2,
235
the.app.width,
236
the.app.height) then
237
-- planet is on the screen
238
planet.indicator.visible = false
239
else
240
planet.indicator.visible = true
241
242
if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
243
indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
244
indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
245
else
246
indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
247
indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
248
end
249
250
planet.indicator.x = the.player.x + indx
251
planet.indicator.y = the.player.y + indy
252
end
253
end
254
255
180
-- for _, mirror in ipairs(the.mirrors.sprites) do
256
181
-- if not mirror.of then
257
182
-- print('mirror:' .. inspect(mirror))
260
185
-- end
261
186
end,
262
187
onEndFrame = function(self)
263
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
264
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
265
266
188
if the.player.active then
267
self:updateScore()
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
268
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
269
200
end,
270
201
draw = function (self, x, y)
271
202
View.draw(self, x, y)
272
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
273
end,
274
updateScore = function(self)
275
local t = love.timer.getTime() - self.gameStart
276
local m = t / 60
277
local s = t % 60
278
279
the.score.text = string.format('Score: %d:%02d', m, s)
280
--the.score.y = the.player.y - the.app.height / 2 + the.player.height
281
--the.score.x = the.player.x - the.app.width / 2 + the.player.width
282
283
--the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
284
--the.highScore.x = the.player.x - the.app.width / 2
285
end
203
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
end
286
205
}
287
206
288
207
MenuScreen = View:extend {
306
225
math.randomseed(os.time())
307
226
308
227
self.view = GameView:new()
309
310
228
if DEBUG then
311
229
self.console:watch('VERSION', 'VERSION')
312
230
self.console:watch('updateTook', 'the.updateTook')
315
233
self.console:watch('the.app.width', 'the.app.width')
316
234
self.console:watch('the.app.height', 'the.app.height')
317
235
self.console:watch('num mirrors', '#the.mirrors.sprites')
318
self.console:watch('num rocks', '#the.rocks.sprites')
319
self.console:watch('num planets', '#the.planets.sprites')
320
236
--self.console:watch('drawTook', 'the.drawTook')
321
237
322
238
-- back off that dark overlay a bit
324
240
end
325
241
end,
326
242
onUpdate = function (self, dt)
327
if not (DEBUG and the.console.visible) then
328
if the.keys:justPressed('q') then
329
self.quit()
330
elseif the.keys:justPressed('return') then
331
if the.keys:pressed('alt') then
332
love.graphics.toggleFullscreen()
333
else
334
self.view = GameView:new()
335
end
336
elseif the.keys:justPressed('f1') then
337
local ss = love.graphics.newScreenshot()
338
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
339
elseif the.keys:justPressed('f11') then
340
love.graphics.toggleFullscreen()
341
end
243
if the.keys:justPressed('escape') then
244
self.quit()
342
245
end
343
246
end,
344
247
update = function (self, dt)
349
252
end
350
253
end
351
254
}
352
353
realRun = love.run
354
function love.run()
355
-- should fail silently if it can't go to fullscreen...
356
love.graphics.toggleFullscreen()
357
358
realRun()
359
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1