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 45
- compare with another revision
- download diff
- download tarball
- view history from revision 45
- Committer: Josh C
- Date: 2013-06-09 23:09:16 UTC
- Revision ID: josh@9ix.org-20130609230916-jdtvrn226f3vnijm
add planet, remove rocks
- files removed:
- data/planet1ind.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)
98
97
--the.rocks = Group:new()
99
98
the.interface = Group:new()
100
99
the.planets = Group:new()
101
the.indicators = Group:new()
102
100
103
101
the.bg = Tile:new{
104
102
image = 'data/stars3.png',
105
width = 13660,
106
height = 7680
103
-- 1366x768 * 3
104
width = 4098,
105
height = 2304
107
106
}
108
107
self:add(the.bg)
109
108
110
109
self:add(the.planets)
111
110
112
111
--the.player = CrystalPlayer:new{x=400,y=300}
113
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
the.player = SpacePlayer:new{x=1366,y=768}
114
113
self:add(the.player)
115
114
self:add(the.player.thrust)
116
115
120
119
--self:add(the.rockColliders)
121
120
self:add(the.mirrors)
122
121
--self:add(the.rocks)
123
self:add(the.indicators)
124
122
self:add(the.interface)
125
123
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
124
local planet = Tile:new{
125
image = 'data/planet1.png',
126
x = math.random(the.app.width / 2,
127
the.bg.width - the.app.width / 2),
128
y = math.random(the.app.height / 2,
129
the.bg.height - the.app.height / 2),
130
}
131
the.planets:add(planet)
136
132
137
133
the.cursor = Cursor:new()
138
134
self:add(the.cursor)
143
139
width = the.app.width,
144
140
--align = 'center',
145
141
font = 25}
146
--the.interface:add(the.score)
142
the.interface:add(the.score)
147
143
148
144
local hs = the.storage.data.highScore
149
145
local m = hs / 60
157
153
font = 25,
158
154
text = string.format('High Score: %d:%02d', m, s)
159
155
}
160
--the.interface:add(the.highScore)
156
the.interface:add(the.highScore)
161
157
162
158
the.over = Text:new{
163
159
y = the.app.height / 2,
221
217
222
218
the.bullets:collide(the.rockColliders)
223
219
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
220
-- for _, mirror in ipairs(the.mirrors.sprites) do
256
221
-- if not mirror.of then
257
222
-- print('mirror:' .. inspect(mirror))
307
272
308
273
self.view = GameView:new()
309
274
275
-- should fail silently if it can't go to fullscreen...
276
love.graphics.toggleFullscreen()
277
310
278
if DEBUG then
311
279
self.console:watch('VERSION', 'VERSION')
312
280
self.console:watch('updateTook', 'the.updateTook')
316
284
self.console:watch('the.app.height', 'the.app.height')
317
285
self.console:watch('num mirrors', '#the.mirrors.sprites')
318
286
self.console:watch('num rocks', '#the.rocks.sprites')
319
self.console:watch('num planets', '#the.planets.sprites')
320
287
--self.console:watch('drawTook', 'the.drawTook')
321
288
322
289
-- back off that dark overlay a bit
324
291
end
325
292
end,
326
293
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
294
if the.keys:justPressed('q') then
295
self.quit()
296
elseif the.keys:justPressed('return') then
297
if the.keys:pressed('alt') then
340
298
love.graphics.toggleFullscreen()
299
else
300
self.view = GameView:new()
341
301
end
302
elseif the.keys:justPressed('f1') then
303
local ss = love.graphics.newScreenshot()
304
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
305
elseif the.keys:justPressed('f11') then
306
love.graphics.toggleFullscreen()
342
307
end
343
308
end,
344
309
update = function (self, dt)
349
314
end
350
315
end
351
316
}
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