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 101
- compare with another revision
- download diff
- download tarball
- view history from revision 101
- Committer: Josh C
- Date: 2013-10-21 18:31:36 UTC
- Revision ID: josh@9ix.org-20131021183136-l3vwmptork5es02v
factor out doHit so I can try to reproduce double ships
- files added:
- data/shield.png
- files modified:
- Info.plist
added
removed
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
19
require 'planet'
20
require 'trade_view'
21
require 'shield'
22
require 'pause_view'
23
require 'game_over'
24
require 'names'
25
require 'good'
19
26
20
27
util = {
21
28
signOf = function(value)
25
32
return -1
26
33
end
27
34
end,
28
shortestVector = function(from, to)
29
if STRICT then
30
if from.x < the.app.width / 2 or
31
from.x > the.bg.width - the.app.width / 2 or
32
from.y < the.app.height / 2 or
33
from.y > the.bg.height - the.app.height / 2 then
34
error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
35
end
36
37
if to.x < the.app.width / 2 or
38
to.x > the.bg.width - the.app.width / 2 or
39
to.y < the.app.height / 2 or
40
to.y > the.bg.height - the.app.height / 2 then
41
error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
42
end
43
end
44
45
-- normalize grid to account for mirror zones
46
local fx = from.x - the.app.width / 2
47
local fy = from.y - the.app.height / 2
48
local tx = to.x - the.app.width / 2
49
local ty = to.y - the.app.height / 2
50
51
local short = {}
52
53
-- pick shorter x
54
if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
55
-- straight path is shorter
56
short.x = tx - fx
57
else
58
short.x = tx - fx - (the.bg.width - the.app.width)
59
end
60
61
-- pick shorter y
62
if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
63
-- straight path is shorter
64
short.y = ty - fy
65
else
66
short.y = ty - fy - (the.bg.height - the.app.height)
67
end
68
69
return vector.new(short.x, short.y)
70
end
71
35
}
72
36
73
37
GameView = View:extend {
74
lastRock = 0,
75
rockInterval = 1,
76
gameStart = 0,
77
38
onNew = function (self)
78
-- for x = 1,30 do
79
-- for y = 1,30 do
80
-- self:add(Fill:new{x=x*400, y=y*400,
81
-- width = 32, height = 32,
82
-- fill = {0,0,255}
83
-- })
84
-- end
85
-- end
86
87
the.storage = Storage:new{filename = 'scores.lua'}
39
the.storage = Storage:new{filename = 'world.lua'}
88
40
the.storage:load()
89
if not the.storage.data.highScore then
90
print('initializing storage')
91
the.storage.data = {highScore = 0}
92
end
41
--if not the.storage.data.highScore then
42
-- print('initializing storage')
43
-- the.storage.data = {highScore = 0}
44
--end
93
45
94
--the.rockColliders = Group:new()
95
46
the.bullets = Group:new()
96
the.mirrors = Group:new()
97
--the.rocks = Group:new()
98
47
the.interface = Group:new()
99
48
the.planets = Group:new()
49
the.planetLabels = Group:new()
100
50
the.indicators = Group:new()
51
the.enemies = Group:new()
101
52
53
-- init bg before build/load since planets need to know bg size
102
54
the.bg = Tile:new{
103
55
image = 'data/stars3.png',
104
width = 13660,
105
height = 7680
56
width = 27320,
57
height = 15360
106
58
}
107
59
self:add(the.bg)
108
60
61
if self.newWorld or not the.storage.data.player then
62
the.storage.data = {planets = {}}
63
64
-- build planets from random
65
for _ = 1, math.random(5, 7) do
66
local planet = Planet:new{
67
x = math.random(the.app.width / 2,
68
the.bg.width - the.app.width / 2),
69
y = math.random(the.app.height / 2,
70
the.bg.height - the.app.height / 2),
71
rotation = math.random() * math.pi
72
}
73
the.planets:add(planet)
74
table.insert(the.storage.data.planets, {
75
x = planet.x,
76
y = planet.y,
77
rotation = planet.rotation,
78
goods = planet.goods,
79
name = planet.name
80
})
81
end
82
83
Good:stockPlanets()
84
85
-- build fresh player
86
local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
87
the.player = player
88
the.storage.data.player = {x = player.x,
89
y = player.y,
90
money = player.money,
91
goods = player.goods,
92
cargoSpace = player.cargoSpace
93
}
94
95
the.storage:save()
96
else
97
-- load planets with x, y, goods
98
for _, planetData in ipairs(the.storage.data.planets) do
99
the.planets:add(Planet:new(planetData))
100
end
101
102
-- load player with cargo, money, position
103
the.player = SpacePlayer:new(the.storage.data.player)
104
105
-- reload storage as we've turned it all into objects
106
the.storage:load()
107
end
108
109
109
self:add(the.planets)
110
self:add(the.planetLabels)
110
111
111
--the.player = CrystalPlayer:new{x=400,y=300}
112
the.player = SpacePlayer:new{x=1366,y=768}
113
112
self:add(the.player)
114
113
self:add(the.player.thrust)
115
116
--self:add(Enemy:new{x=400, y=300})
114
self:add(the.player.shield)
115
116
self:add(the.enemies)
117
118
for _ = 1, 20 do
119
local e = Enemy:new{x = math.random(the.bg.width),
120
y = math.random(the.bg.height)}
121
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
122
the.enemies:add(e)
123
self:add(e.thrust) -- why doesn't this work in Enemy.new?
124
self:add(e.shield)
125
end
117
126
118
127
self:add(the.bullets)
119
--self:add(the.rockColliders)
120
self:add(the.mirrors)
121
--self:add(the.rocks)
122
128
self:add(the.indicators)
123
129
self:add(the.interface)
124
130
125
for _ = 1, math.random(6) do
126
local planet = Tile:new{
127
image = 'data/planet1.png',
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
136
planet.indicator = Tile:new{
137
image = 'data/planet1ind.png',
138
}
139
the.indicators:add(planet.indicator)
140
end
141
142
131
the.cursor = Cursor:new()
143
132
self:add(the.cursor)
144
133
145
the.score = Text:new{
146
x = 8,
147
y = 8,
148
width = the.app.width,
149
--align = 'center',
150
font = 25}
151
--the.interface:add(the.score)
152
153
local hs = the.storage.data.highScore
154
local m = hs / 60
155
local s = hs % 60
156
157
the.highScore = Text:new{
158
x = -8,
159
y = 8,
160
width = the.app.width,
161
align = 'right',
162
font = 25,
163
text = string.format('High Score: %d:%02d', m, s)
164
}
165
--the.interface:add(the.highScore)
166
167
the.over = Text:new{
168
y = the.app.height / 2,
169
width = the.app.width,
170
align = 'center',
171
font = 25,
172
text = "Game Over",
173
visible = false
174
}
175
the.interface:add(the.over)
176
177
178
the.instructions = Text:new{
179
y = the.app.height / 2 + 32,
180
width = the.app.width,
181
align = 'center',
182
font = 12,
183
text = "Press Enter to start a new game\nPress Q to quit",
184
visible = false
185
}
186
the.interface:add(the.instructions)
187
188
134
love.mouse.setGrab(true)
189
135
love.mouse.setVisible(false)
190
136
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
191
137
192
--self:loadLayers('data/map.lua')
193
138
self.focus = the.player
194
--self:clampTo(self.map)
195
196
self.gameStart = love.timer.getTime()
197
139
end,
198
140
onUpdate = function(self, dt)
199
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
200
local unseenRock = nil
201
while not unseenRock do
202
local rock = Rock:new{
203
x = math.random(the.app.width / 2,
204
the.bg.width - the.app.width / 2),
205
y = math.random(the.app.height / 2,
206
the.bg.height - the.app.height / 2),
207
velocity = {
208
x = math.random(-300, 300),
209
y = math.random(-300, 300),
210
rotation = math.random(-7, 7)
211
},
212
scale = math.random() + 0.5
213
}
214
215
local rockToPlayer = util.shortestVector(rock, the.player)
216
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
217
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
218
unseenRock = rock
219
end
220
end
221
222
the.rocks:add(unseenRock)
223
224
self.lastRock = love.timer.getTime()
225
end
226
227
the.bullets:collide(the.rockColliders)
228
229
-- this should really go somewhere else...
230
for _, planet in ipairs(the.planets.sprites) do
231
local indx, indy
232
local pvec = vector.new(
233
planet.x - the.player.x + planet.width / 2,
234
planet.y - the.player.y + planet.height / 2 )
235
236
-- TODO: is there a better way to specify the
237
-- screen rectangle?
238
if planet:intersects(the.player.x - the.app.width / 2,
239
the.player.y - the.app.height / 2,
240
the.app.width,
241
the.app.height) then
242
-- planet is on the screen
243
planet.indicator.visible = false
244
else
245
planet.indicator.visible = true
246
247
if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
248
indx = the.app.width / 2 * util.signOf(pvec.x) + 8
249
indy = the.app.width / 2 * pvec.y / math.abs(pvec.x)
250
else
251
indy = the.app.height / 2 * util.signOf(pvec.y) + 8
252
indx = the.app.height / 2 * pvec.x / math.abs(pvec.y)
253
end
254
255
planet.indicator.x = the.player.x + indx
256
planet.indicator.y = the.player.y + indy
257
end
258
end
259
260
-- for _, mirror in ipairs(the.mirrors.sprites) do
261
-- if not mirror.of then
262
-- print('mirror:' .. inspect(mirror))
263
-- error('mirror OF NOTHING')
264
-- end
265
-- end
141
if the.keys:justPressed('escape') then
142
PauseView:new():activate()
143
end
144
145
the.bullets:collide(the.planets)
146
the.bullets:collide(the.player)
147
the.bullets:collide(the.enemies)
266
148
end,
267
149
onEndFrame = function(self)
268
150
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
269
151
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
270
271
if the.player.active then
272
self:updateScore()
273
end
274
152
end,
275
153
draw = function (self, x, y)
276
154
View.draw(self, x, y)
277
155
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
278
156
end,
279
updateScore = function(self)
280
local t = love.timer.getTime() - self.gameStart
281
local m = t / 60
282
local s = t % 60
283
284
the.score.text = string.format('Score: %d:%02d', m, s)
285
--the.score.y = the.player.y - the.app.height / 2 + the.player.height
286
--the.score.x = the.player.x - the.app.width / 2 + the.player.width
287
288
--the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
289
--the.highScore.x = the.player.x - the.app.width / 2
290
end
291
157
}
292
158
293
159
MenuScreen = View:extend {
305
171
}
306
172
307
173
the.app = App:new {
174
name = 'Traderous',
308
175
onRun = function (self)
309
176
print('Version: ' .. VERSION)
310
177
312
179
313
180
self.view = GameView:new()
314
181
315
-- should fail silently if it can't go to fullscreen...
316
love.graphics.toggleFullscreen()
317
318
182
if DEBUG then
319
183
self.console:watch('VERSION', 'VERSION')
320
184
self.console:watch('updateTook', 'the.updateTook')
325
189
self.console:watch('num mirrors', '#the.mirrors.sprites')
326
190
self.console:watch('num rocks', '#the.rocks.sprites')
327
191
self.console:watch('num planets', '#the.planets.sprites')
192
self.console:watch('num enemies', 'the.enemies:count()')
193
self.console:watch('onPlanet', 'the.player.onPlanet')
194
self.console:watch('kills', 'the.player.kills')
328
195
--self.console:watch('drawTook', 'the.drawTook')
329
196
330
197
-- back off that dark overlay a bit
333
200
end,
334
201
onUpdate = function (self, dt)
335
202
if not (DEBUG and the.console.visible) then
336
if the.keys:justPressed('q') then
337
self.quit()
338
elseif the.keys:justPressed('return') then
339
if the.keys:pressed('alt') then
340
love.graphics.toggleFullscreen()
341
else
342
self.view = GameView:new()
343
end
203
if the.keys:justPressed('return') and the.keys:pressed('alt') then
204
love.graphics.toggleFullscreen()
344
205
elseif the.keys:justPressed('f1') then
345
206
local ss = love.graphics.newScreenshot()
346
207
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
357
218
end
358
219
end
359
220
}
221
222
realRun = love.run
223
function love.run()
224
-- should fail silently if it can't go to fullscreen...
225
love.graphics.toggleFullscreen()
226
227
realRun()
228
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1