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