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 removed:
- data/planet1ind.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'
26
19
27
20
util = {
28
21
signOf = function(value)
32
25
return -1
33
26
end
34
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
35
71
}
36
72
37
73
GameView = View:extend {
74
lastRock = 0,
75
rockInterval = 1,
76
gameStart = 0,
38
77
onNew = function (self)
39
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'}
40
88
the.storage:load()
41
--if not the.storage.data.highScore then
42
-- print('initializing storage')
43
-- the.storage.data = {highScore = 0}
44
--end
89
if not the.storage.data.highScore then
90
print('initializing storage')
91
the.storage.data = {highScore = 0}
92
end
45
93
94
--the.rockColliders = Group:new()
46
95
the.bullets = Group:new()
96
the.mirrors = Group:new()
97
--the.rocks = Group:new()
47
98
the.interface = Group:new()
48
99
the.planets = Group:new()
49
the.planetLabels = Group:new()
50
the.indicators = Group:new()
51
the.enemies = Group:new()
52
100
53
-- init bg before build/load since planets need to know bg size
54
101
the.bg = Tile:new{
55
102
image = 'data/stars3.png',
56
width = 27320,
57
height = 15360
103
-- 1366x768 * 3
104
width = 4098,
105
height = 2304
58
106
}
59
107
self:add(the.bg)
60
108
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)
111
110
111
--the.player = CrystalPlayer:new{x=400,y=300}
112
the.player = SpacePlayer:new{x=1366,y=768}
112
113
self:add(the.player)
113
114
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
115
116
--self:add(Enemy:new{x=400, y=300})
126
117
127
118
self:add(the.bullets)
128
self:add(the.indicators)
119
--self:add(the.rockColliders)
120
self:add(the.mirrors)
121
--self:add(the.rocks)
129
122
self:add(the.interface)
130
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)
132
131
133
the.cursor = Cursor:new()
132
134
self:add(the.cursor)
133
135
136
the.score = Text:new{
137
x = 8,
138
y = 8,
139
width = the.app.width,
140
--align = 'center',
141
font = 25}
142
the.interface:add(the.score)
143
144
local hs = the.storage.data.highScore
145
local m = hs / 60
146
local s = hs % 60
147
148
the.highScore = Text:new{
149
x = -8,
150
y = 8,
151
width = the.app.width,
152
align = 'right',
153
font = 25,
154
text = string.format('High Score: %d:%02d', m, s)
155
}
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)
178
134
179
love.mouse.setGrab(true)
135
180
love.mouse.setVisible(false)
136
181
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
137
182
183
--self:loadLayers('data/map.lua')
138
184
self.focus = the.player
185
--self:clampTo(self.map)
186
187
self.gameStart = love.timer.getTime()
139
188
end,
140
189
onUpdate = function(self, dt)
141
if the.keys:justPressed('escape') then
142
PauseView:new():activate()
190
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
191
local unseenRock = nil
192
while not unseenRock do
193
local rock = Rock:new{
194
x = math.random(the.app.width / 2,
195
the.bg.width - the.app.width / 2),
196
y = math.random(the.app.height / 2,
197
the.bg.height - the.app.height / 2),
198
velocity = {
199
x = math.random(-300, 300),
200
y = math.random(-300, 300),
201
rotation = math.random(-7, 7)
202
},
203
scale = math.random() + 0.5
204
}
205
206
local rockToPlayer = util.shortestVector(rock, the.player)
207
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
208
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
209
unseenRock = rock
210
end
211
end
212
213
the.rocks:add(unseenRock)
214
215
self.lastRock = love.timer.getTime()
143
216
end
144
217
145
the.bullets:collide(the.planets)
146
the.bullets:collide(the.player)
147
the.bullets:collide(the.enemies)
218
the.bullets:collide(the.rockColliders)
219
220
-- for _, mirror in ipairs(the.mirrors.sprites) do
221
-- if not mirror.of then
222
-- print('mirror:' .. inspect(mirror))
223
-- error('mirror OF NOTHING')
224
-- end
225
-- end
148
226
end,
149
227
onEndFrame = function(self)
150
228
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
151
229
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
230
231
if the.player.active then
232
self:updateScore()
233
end
152
234
end,
153
235
draw = function (self, x, y)
154
236
View.draw(self, x, y)
155
237
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
156
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
157
251
}
158
252
159
253
MenuScreen = View:extend {
178
272
179
273
self.view = GameView:new()
180
274
275
-- should fail silently if it can't go to fullscreen...
276
love.graphics.toggleFullscreen()
277
181
278
if DEBUG then
182
279
self.console:watch('VERSION', 'VERSION')
183
280
self.console:watch('updateTook', 'the.updateTook')
187
284
self.console:watch('the.app.height', 'the.app.height')
188
285
self.console:watch('num mirrors', '#the.mirrors.sprites')
189
286
self.console:watch('num rocks', '#the.rocks.sprites')
190
self.console:watch('num planets', '#the.planets.sprites')
191
self.console:watch('num enemies', 'the.enemies:count()')
192
self.console:watch('onPlanet', 'the.player.onPlanet')
193
self.console:watch('kills', 'the.player.kills')
194
287
--self.console:watch('drawTook', 'the.drawTook')
195
288
196
289
-- back off that dark overlay a bit
198
291
end
199
292
end,
200
293
onUpdate = function (self, dt)
201
if not (DEBUG and the.console.visible) then
202
if the.keys:justPressed('return') and the.keys:pressed('alt') then
203
love.graphics.toggleFullscreen()
204
elseif the.keys:justPressed('f1') then
205
local ss = love.graphics.newScreenshot()
206
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
207
elseif the.keys:justPressed('f11') then
208
love.graphics.toggleFullscreen()
294
if the.keys:justPressed('q') then
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()
209
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()
210
307
end
211
308
end,
212
309
update = function (self, dt)
217
314
end
218
315
end
219
316
}
220
221
realRun = love.run
222
function love.run()
223
-- should fail silently if it can't go to fullscreen...
224
love.graphics.toggleFullscreen()
225
226
realRun()
227
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1