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 50
- compare with another revision
- download diff
- download tarball
- view history from revision 50
- Committer: Josh C
- Date: 2013-06-11 00:15:54 UTC
- Revision ID: josh@9ix.org-20130611001554-tkzp73ke16buhnuy
bring indicators a little closer from edge
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
19
26
20
util = {
27
21
signOf = function(value)
31
25
return -1
32
26
end
33
27
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
34
71
}
35
72
36
73
GameView = View:extend {
74
lastRock = 0,
75
rockInterval = 1,
76
gameStart = 0,
37
77
onNew = function (self)
38
the.storage = Storage:new{filename = 'world.lua'}
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
88
the.storage:load()
40
--if not the.storage.data.highScore then
41
-- print('initializing storage')
42
-- the.storage.data = {highScore = 0}
43
--end
89
if not the.storage.data.highScore then
90
print('initializing storage')
91
the.storage.data = {highScore = 0}
92
end
44
93
94
--the.rockColliders = Group:new()
45
95
the.bullets = Group:new()
96
the.mirrors = Group:new()
97
--the.rocks = Group:new()
46
98
the.interface = Group:new()
47
99
the.planets = Group:new()
48
the.planetLabels = Group:new()
49
100
the.indicators = Group:new()
50
the.enemies = Group:new()
51
101
52
-- init bg before build/load since planets need to know bg size
53
102
the.bg = Tile:new{
54
103
image = 'data/stars3.png',
55
width = 27320,
56
height = 15360
104
width = 13660,
105
height = 7680
57
106
}
58
107
self:add(the.bg)
59
108
60
if self.newWorld or not the.storage.data.player then
61
the.storage.data = {planets = {}}
62
63
-- build planets from random
64
for _ = 1, math.random(3, 6) do
65
local planet = Planet:new{
66
x = math.random(the.app.width / 2,
67
the.bg.width - the.app.width / 2),
68
y = math.random(the.app.height / 2,
69
the.bg.height - the.app.height / 2),
70
rotation = math.random() * math.pi
71
}
72
the.planets:add(planet)
73
table.insert(the.storage.data.planets, {
74
x = planet.x,
75
y = planet.y,
76
rotation = planet.rotation,
77
goods = planet.goods,
78
name = planet.name
79
})
80
end
81
82
-- build fresh player
83
local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
84
the.player = player
85
the.storage.data.player = {x = player.x,
86
y = player.y,
87
money = player.money,
88
goods = player.goods,
89
cargoSpace = player.cargoSpace
90
}
91
92
the.storage:save()
93
else
94
-- load planets with x, y, goods
95
for _, planetData in ipairs(the.storage.data.planets) do
96
the.planets:add(Planet:new(planetData))
97
end
98
99
-- load player with cargo, money, position
100
the.player = SpacePlayer:new(the.storage.data.player)
101
102
-- reload storage as we've turned it all into objects
103
the.storage:load()
104
end
105
106
109
self:add(the.planets)
107
self:add(the.planetLabels)
108
110
111
--the.player = CrystalPlayer:new{x=400,y=300}
112
the.player = SpacePlayer:new{x=1366,y=768}
109
113
self:add(the.player)
110
114
self:add(the.player.thrust)
111
self:add(the.player.shield)
112
113
self:add(the.enemies)
114
115
for _ = 1, 20 do
116
local e = Enemy:new{x = math.random(the.bg.width),
117
y = math.random(the.bg.height)}
118
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
119
the.enemies:add(e)
120
self:add(e.thrust) -- why doesn't this work in Enemy.new?
121
self:add(e.shield)
122
end
115
116
--self:add(Enemy:new{x=400, y=300})
123
117
124
118
self:add(the.bullets)
119
--self:add(the.rockColliders)
120
self:add(the.mirrors)
121
--self:add(the.rocks)
125
122
self:add(the.indicators)
126
123
self:add(the.interface)
127
124
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
128
142
the.cursor = Cursor:new()
129
143
self:add(the.cursor)
130
144
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
131
188
love.mouse.setGrab(true)
132
189
love.mouse.setVisible(false)
133
190
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
134
191
192
--self:loadLayers('data/map.lua')
135
193
self.focus = the.player
194
--self:clampTo(self.map)
195
196
self.gameStart = love.timer.getTime()
136
197
end,
137
198
onUpdate = function(self, dt)
138
if the.keys:justPressed('escape') then
139
PauseView:new():activate()
140
end
141
142
the.bullets:collide(the.planets)
143
the.bullets:collide(the.player)
144
the.bullets:collide(the.enemies)
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 - 10) * util.signOf(pvec.x) + 8
249
indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
250
else
251
indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
252
indx = (the.app.height / 2 - 10) * 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
145
266
end,
146
267
onEndFrame = function(self)
147
268
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
148
269
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
149
274
end,
150
275
draw = function (self, x, y)
151
276
View.draw(self, x, y)
152
277
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
153
278
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
154
291
}
155
292
156
293
MenuScreen = View:extend {
185
322
self.console:watch('num mirrors', '#the.mirrors.sprites')
186
323
self.console:watch('num rocks', '#the.rocks.sprites')
187
324
self.console:watch('num planets', '#the.planets.sprites')
188
self.console:watch('num enemies', 'the.enemies:count()')
189
325
--self.console:watch('drawTook', 'the.drawTook')
190
326
191
327
-- back off that dark overlay a bit
194
330
end,
195
331
onUpdate = function (self, dt)
196
332
if not (DEBUG and the.console.visible) then
197
if the.keys:justPressed('return') and the.keys:pressed('alt') then
198
love.graphics.toggleFullscreen()
333
if the.keys:justPressed('q') then
334
self.quit()
335
elseif the.keys:justPressed('return') then
336
if the.keys:pressed('alt') then
337
love.graphics.toggleFullscreen()
338
else
339
self.view = GameView:new()
340
end
199
341
elseif the.keys:justPressed('f1') then
200
342
local ss = love.graphics.newScreenshot()
201
343
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1