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 added:
- data/planet1.png
- files modified:
- conf.lua
added
removed
main.lua
91
91
the.storage.data = {highScore = 0}
92
92
end
93
93
94
the.rockColliders = Group:new()
94
--the.rockColliders = Group:new()
95
95
the.bullets = Group:new()
96
96
the.mirrors = Group:new()
97
the.rocks = Group:new()
97
--the.rocks = Group:new()
98
the.interface = Group:new()
99
the.planets = Group:new()
98
100
99
101
the.bg = Tile:new{
100
102
image = 'data/stars3.png',
104
106
}
105
107
self:add(the.bg)
106
108
109
self:add(the.planets)
110
107
111
--the.player = CrystalPlayer:new{x=400,y=300}
108
112
the.player = SpacePlayer:new{x=1366,y=768}
109
113
self:add(the.player)
114
self:add(the.player.thrust)
110
115
111
116
--self:add(Enemy:new{x=400, y=300})
112
117
113
118
self:add(the.bullets)
114
self:add(the.rockColliders)
119
--self:add(the.rockColliders)
115
120
self:add(the.mirrors)
116
self:add(the.rocks)
121
--self:add(the.rocks)
122
self:add(the.interface)
123
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)
117
132
118
133
the.cursor = Cursor:new()
119
134
self:add(the.cursor)
120
135
121
136
the.score = Text:new{
137
x = 8,
138
y = 8,
122
139
width = the.app.width,
123
align = 'center',
140
--align = 'center',
124
141
font = 25}
125
self:add(the.score)
142
the.interface:add(the.score)
126
143
127
144
local hs = the.storage.data.highScore
128
145
local m = hs / 60
129
146
local s = hs % 60
130
147
131
148
the.highScore = Text:new{
149
x = -8,
150
y = 8,
132
151
width = the.app.width,
133
152
align = 'right',
134
153
font = 25,
135
154
text = string.format('High Score: %d:%02d', m, s)
136
155
}
137
self:add(the.highScore)
156
the.interface:add(the.highScore)
157
158
the.over = Text:new{
159
y = the.app.height / 2,
160
width = the.app.width,
161
align = 'center',
162
font = 25,
163
text = "Game Over",
164
visible = false
165
}
166
the.interface:add(the.over)
167
168
169
the.instructions = Text:new{
170
y = the.app.height / 2 + 32,
171
width = the.app.width,
172
align = 'center',
173
font = 12,
174
text = "Press Enter to start a new game\nPress Q to quit",
175
visible = false
176
}
177
the.interface:add(the.instructions)
138
178
139
179
love.mouse.setGrab(true)
140
180
love.mouse.setVisible(false)
147
187
self.gameStart = love.timer.getTime()
148
188
end,
149
189
onUpdate = function(self, dt)
150
if love.timer.getTime() > self.lastRock + self.rockInterval then
190
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
151
191
local unseenRock = nil
152
192
while not unseenRock do
153
193
local rock = Rock:new{
185
225
-- end
186
226
end,
187
227
onEndFrame = function(self)
228
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
229
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
230
188
231
if the.player.active then
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
232
self:updateScore()
196
233
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
200
234
end,
201
235
draw = function (self, x, y)
202
236
View.draw(self, x, y)
203
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
end
237
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
238
end,
239
updateScore = function(self)
240
local t = love.timer.getTime() - self.gameStart
241
local m = t / 60
242
local s = t % 60
243
244
the.score.text = string.format('Score: %d:%02d', m, s)
245
--the.score.y = the.player.y - the.app.height / 2 + the.player.height
246
--the.score.x = the.player.x - the.app.width / 2 + the.player.width
247
248
--the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
249
--the.highScore.x = the.player.x - the.app.width / 2
250
end
205
251
}
206
252
207
253
MenuScreen = View:extend {
225
271
math.randomseed(os.time())
226
272
227
273
self.view = GameView:new()
274
275
-- should fail silently if it can't go to fullscreen...
276
love.graphics.toggleFullscreen()
277
228
278
if DEBUG then
229
279
self.console:watch('VERSION', 'VERSION')
230
280
self.console:watch('updateTook', 'the.updateTook')
233
283
self.console:watch('the.app.width', 'the.app.width')
234
284
self.console:watch('the.app.height', 'the.app.height')
235
285
self.console:watch('num mirrors', '#the.mirrors.sprites')
286
self.console:watch('num rocks', '#the.rocks.sprites')
236
287
--self.console:watch('drawTook', 'the.drawTook')
237
288
238
289
-- back off that dark overlay a bit
240
291
end
241
292
end,
242
293
onUpdate = function (self, dt)
243
if the.keys:justPressed('escape') then
294
if the.keys:justPressed('q') then
244
295
self.quit()
296
elseif the.keys:justPressed('return') then
297
if the.keys:pressed('alt') then
298
love.graphics.toggleFullscreen()
299
else
300
self.view = GameView:new()
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()
245
307
end
246
308
end,
247
309
update = function (self, dt)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1