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