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 82
- compare with another revision
- download diff
- download tarball
- view history from revision 82
- Committer: Josh C
- Date: 2013-06-25 19:55:40 UTC
- Revision ID: josh@9ix.org-20130625195540-f4nwz7ffj9f6658a
patch zoetrope storage so it can save lists (arrays indexed by number)
- files added:
- data/planet1.png
- files modified:
- boom.lua
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'
19
23
20
24
util = {
21
25
signOf = function(value)
25
29
return -1
26
30
end
27
31
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
32
}
72
33
73
34
GameView = View:extend {
74
lastRock = 0,
75
rockInterval = 1,
76
gameStart = 0,
77
35
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'}
36
the.storage = Storage:new{filename = 'world.lua'}
88
37
the.storage:load()
89
if not the.storage.data.highScore then
90
print('initializing storage')
91
the.storage.data = {highScore = 0}
92
end
38
--if not the.storage.data.highScore then
39
-- print('initializing storage')
40
-- the.storage.data = {highScore = 0}
41
--end
93
42
94
the.rockColliders = Group:new()
95
43
the.bullets = Group:new()
96
the.mirrors = Group:new()
97
the.rocks = Group:new()
44
the.interface = Group:new()
45
the.planets = Group:new()
46
the.indicators = Group:new()
47
the.enemies = Group:new()
98
48
49
-- init bg before build/load since planets need to know bg size
99
50
the.bg = Tile:new{
100
51
image = 'data/stars3.png',
101
-- 1366x768 * 3
102
width = 4098,
103
height = 2304
52
width = 27320,
53
height = 15360
104
54
}
105
55
self:add(the.bg)
106
56
107
--the.player = CrystalPlayer:new{x=400,y=300}
108
the.player = SpacePlayer:new{x=1366,y=768}
57
if self.newWorld or not the.storage.data.player then
58
the.storage.data = {planets = {}}
59
60
-- build planets from random
61
for _ = 1, math.random(3, 6) do
62
local planet = Planet:new{
63
x = math.random(the.app.width / 2,
64
the.bg.width - the.app.width / 2),
65
y = math.random(the.app.height / 2,
66
the.bg.height - the.app.height / 2),
67
rotation = math.random() * math.pi
68
}
69
the.planets:add(planet)
70
table.insert(the.storage.data.planets, {
71
x = planet.x,
72
y = planet.y,
73
rotation = planet.rotation,
74
goods = planet.goods
75
})
76
end
77
78
-- build fresh player
79
local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
80
the.player = player
81
the.storage.data.player = {x = player.x,
82
y = player.y,
83
money = player.money,
84
goods = player.goods,
85
cargoSpace = player.cargoSpace
86
}
87
88
the.storage:save()
89
else
90
-- load planets with x, y, goods
91
for _, planetData in ipairs(the.storage.data.planets) do
92
the.planets:add(Planet:new(planetData))
93
end
94
95
-- load player with cargo, money, position
96
the.player = SpacePlayer:new(the.storage.data.player)
97
end
98
99
self:add(the.planets)
100
109
101
self:add(the.player)
110
111
--self:add(Enemy:new{x=400, y=300})
102
self:add(the.player.thrust)
103
self:add(the.player.shield)
104
105
self:add(the.enemies)
106
107
for _ = 1, 20 do
108
local e = Enemy:new{x = math.random(the.bg.width),
109
y = math.random(the.bg.height)}
110
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
111
the.enemies:add(e)
112
self:add(e.thrust) -- why doesn't this work in Enemy.new?
113
self:add(e.shield)
114
end
112
115
113
116
self:add(the.bullets)
114
self:add(the.rockColliders)
115
self:add(the.mirrors)
116
self:add(the.rocks)
117
self:add(the.indicators)
118
self:add(the.interface)
117
119
118
120
the.cursor = Cursor:new()
119
121
self:add(the.cursor)
120
122
121
the.score = Text:new{
123
the.over = Text:new{
124
y = the.app.height / 2,
122
125
width = the.app.width,
123
126
align = 'center',
124
font = 25}
125
self:add(the.score)
126
127
local hs = the.storage.data.highScore
128
local m = hs / 60
129
local s = hs % 60
130
131
the.highScore = Text:new{
132
width = the.app.width,
133
align = 'right',
134
127
font = 25,
135
text = string.format('High Score: %d:%02d', m, s)
136
}
137
self:add(the.highScore)
128
text = "Game Over",
129
visible = false
130
}
131
the.interface:add(the.over)
132
133
134
the.instructions = Text:new{
135
y = the.app.height / 2 + 32,
136
width = the.app.width,
137
align = 'center',
138
font = 12,
139
text = "Press Enter to start a new game\nPress Q to quit",
140
visible = false
141
}
142
the.interface:add(the.instructions)
138
143
139
144
love.mouse.setGrab(true)
140
145
love.mouse.setVisible(false)
141
146
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
142
147
143
--self:loadLayers('data/map.lua')
144
148
self.focus = the.player
145
--self:clampTo(self.map)
146
147
self.gameStart = love.timer.getTime()
148
149
end,
149
150
onUpdate = function(self, dt)
150
if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
151
local unseenRock = nil
152
while not unseenRock do
153
local rock = Rock:new{
154
x = math.random(the.app.width / 2,
155
the.bg.width - the.app.width / 2),
156
y = math.random(the.app.height / 2,
157
the.bg.height - the.app.height / 2),
158
velocity = {
159
x = math.random(-300, 300),
160
y = math.random(-300, 300),
161
rotation = math.random(-7, 7)
162
},
163
scale = math.random() + 0.5
164
}
165
166
local rockToPlayer = util.shortestVector(rock, the.player)
167
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
168
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
169
unseenRock = rock
170
end
171
end
172
173
the.rocks:add(unseenRock)
174
175
self.lastRock = love.timer.getTime()
151
if the.keys:justPressed('escape') then
152
PauseView:new():activate()
176
153
end
177
154
178
the.bullets:collide(the.rockColliders)
179
180
-- for _, mirror in ipairs(the.mirrors.sprites) do
181
-- if not mirror.of then
182
-- print('mirror:' .. inspect(mirror))
183
-- error('mirror OF NOTHING')
184
-- end
185
-- end
155
the.bullets:collide(the.planets)
156
the.bullets:collide(the.player)
157
the.bullets:collide(the.enemies)
186
158
end,
187
159
onEndFrame = function(self)
188
if the.player.active then
189
local t = love.timer.getTime() - self.gameStart
190
local m = t / 60
191
local s = t % 60
192
193
the.score.text = string.format('Score: %d:%02d', m, s)
194
the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
the.score.x = the.player.x - the.app.width / 2
196
end
197
198
the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
the.highScore.x = the.player.x - the.app.width / 2
160
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
161
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
200
162
end,
201
163
draw = function (self, x, y)
202
164
View.draw(self, x, y)
203
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
end
165
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
166
end,
205
167
}
206
168
207
169
MenuScreen = View:extend {
225
187
math.randomseed(os.time())
226
188
227
189
self.view = GameView:new()
190
228
191
if DEBUG then
229
192
self.console:watch('VERSION', 'VERSION')
230
193
self.console:watch('updateTook', 'the.updateTook')
234
197
self.console:watch('the.app.height', 'the.app.height')
235
198
self.console:watch('num mirrors', '#the.mirrors.sprites')
236
199
self.console:watch('num rocks', '#the.rocks.sprites')
200
self.console:watch('num planets', '#the.planets.sprites')
201
self.console:watch('num enemies', 'the.enemies:count()')
237
202
--self.console:watch('drawTook', 'the.drawTook')
238
203
239
204
-- back off that dark overlay a bit
241
206
end
242
207
end,
243
208
onUpdate = function (self, dt)
244
if the.keys:justPressed('escape') then
245
self.quit()
209
if not (DEBUG and the.console.visible) then
210
if the.keys:justPressed('return') and the.keys:pressed('alt') then
211
love.graphics.toggleFullscreen()
212
elseif the.keys:justPressed('f1') then
213
local ss = love.graphics.newScreenshot()
214
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
215
elseif the.keys:justPressed('f11') then
216
love.graphics.toggleFullscreen()
217
end
246
218
end
247
219
end,
248
220
update = function (self, dt)
253
225
end
254
226
end
255
227
}
228
229
realRun = love.run
230
function love.run()
231
-- should fail silently if it can't go to fullscreen...
232
love.graphics.toggleFullscreen()
233
234
realRun()
235
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1