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
require 'trade_view'
21
19
22
20
util = {
23
21
signOf = function(value)
99
97
--the.rocks = Group:new()
100
98
the.interface = Group:new()
101
99
the.planets = Group:new()
102
the.indicators = Group:new()
103
100
104
101
the.bg = Tile:new{
105
102
image = 'data/stars3.png',
106
width = 13660,
107
height = 7680
103
-- 1366x768 * 3
104
width = 4098,
105
height = 2304
108
106
}
109
107
self:add(the.bg)
110
108
111
109
self:add(the.planets)
112
110
113
111
--the.player = CrystalPlayer:new{x=400,y=300}
114
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
the.player = SpacePlayer:new{x=1366,y=768}
115
113
self:add(the.player)
116
114
self:add(the.player.thrust)
117
115
121
119
--self:add(the.rockColliders)
122
120
self:add(the.mirrors)
123
121
--self:add(the.rocks)
124
self:add(the.indicators)
125
122
self:add(the.interface)
126
123
127
for _ = 1, math.random(6) do
128
local planet = Planet:new{
129
x = math.random(the.app.width / 2,
130
the.bg.width - the.app.width / 2),
131
y = math.random(the.app.height / 2,
132
the.bg.height - the.app.height / 2),
133
rotation = math.random() * math.pi
134
}
135
the.planets:add(planet)
136
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)
137
132
138
133
the.cursor = Cursor:new()
139
134
self:add(the.cursor)
144
139
width = the.app.width,
145
140
--align = 'center',
146
141
font = 25}
147
--the.interface:add(the.score)
142
the.interface:add(the.score)
148
143
149
144
local hs = the.storage.data.highScore
150
145
local m = hs / 60
158
153
font = 25,
159
154
text = string.format('High Score: %d:%02d', m, s)
160
155
}
161
--the.interface:add(the.highScore)
156
the.interface:add(the.highScore)
162
157
163
158
the.over = Text:new{
164
159
y = the.app.height / 2,
192
187
self.gameStart = love.timer.getTime()
193
188
end,
194
189
onUpdate = function(self, dt)
195
the.bullets:collide(the.planets)
196
197
-- this should really go somewhere else...
198
for _, planet in ipairs(the.planets.sprites) do
190
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
191
local unseenRock = nil
192
while not unseenRock do
193
local rock = Rock:new{
194
x = math.random(the.app.width / 2,
195
the.bg.width - the.app.width / 2),
196
y = math.random(the.app.height / 2,
197
the.bg.height - the.app.height / 2),
198
velocity = {
199
x = math.random(-300, 300),
200
y = math.random(-300, 300),
201
rotation = math.random(-7, 7)
202
},
203
scale = math.random() + 0.5
204
}
205
206
local rockToPlayer = util.shortestVector(rock, the.player)
207
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
208
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
209
unseenRock = rock
210
end
211
end
212
213
the.rocks:add(unseenRock)
214
215
self.lastRock = love.timer.getTime()
199
216
end
200
217
218
the.bullets:collide(the.rockColliders)
219
201
220
-- for _, mirror in ipairs(the.mirrors.sprites) do
202
221
-- if not mirror.of then
203
222
-- print('mirror:' .. inspect(mirror))
253
272
254
273
self.view = GameView:new()
255
274
275
-- should fail silently if it can't go to fullscreen...
276
love.graphics.toggleFullscreen()
277
256
278
if DEBUG then
257
279
self.console:watch('VERSION', 'VERSION')
258
280
self.console:watch('updateTook', 'the.updateTook')
262
284
self.console:watch('the.app.height', 'the.app.height')
263
285
self.console:watch('num mirrors', '#the.mirrors.sprites')
264
286
self.console:watch('num rocks', '#the.rocks.sprites')
265
self.console:watch('num planets', '#the.planets.sprites')
266
287
--self.console:watch('drawTook', 'the.drawTook')
267
288
268
289
-- back off that dark overlay a bit
270
291
end
271
292
end,
272
293
onUpdate = function (self, dt)
273
if not (DEBUG and the.console.visible) then
274
if the.keys:justPressed('q') then
275
self.quit()
276
elseif the.keys:justPressed('return') then
277
if the.keys:pressed('alt') then
278
love.graphics.toggleFullscreen()
279
else
280
self.view = GameView:new()
281
end
282
elseif the.keys:justPressed('f1') then
283
local ss = love.graphics.newScreenshot()
284
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
285
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
286
298
love.graphics.toggleFullscreen()
299
else
300
self.view = GameView:new()
287
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()
288
307
end
289
308
end,
290
309
update = function (self, dt)
295
314
end
296
315
end
297
316
}
298
299
realRun = love.run
300
function love.run()
301
-- should fail silently if it can't go to fullscreen...
302
love.graphics.toggleFullscreen()
303
304
realRun()
305
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1