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 62
- compare with another revision
- download diff
- download tarball
- view history from revision 62
- Committer: Josh C
- Date: 2013-06-16 03:50:45 UTC
- Revision ID: josh@9ix.org-20130616035045-l5nd2aa0m30gk20x
clean up some old code, put planet indicators in planet class
added
removed
main.lua
18
18
require 'boom'
19
19
require 'planet'
20
20
require 'trade_view'
21
require 'shield'
22
require 'pause_view'
23
21
24
22
util = {
25
23
signOf = function(value)
29
27
return -1
30
28
end
31
29
end,
30
shortestVector = function(from, to)
31
if STRICT then
32
if from.x < the.app.width / 2 or
33
from.x > the.bg.width - the.app.width / 2 or
34
from.y < the.app.height / 2 or
35
from.y > the.bg.height - the.app.height / 2 then
36
error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
37
end
38
39
if to.x < the.app.width / 2 or
40
to.x > the.bg.width - the.app.width / 2 or
41
to.y < the.app.height / 2 or
42
to.y > the.bg.height - the.app.height / 2 then
43
error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
44
end
45
end
46
47
-- normalize grid to account for mirror zones
48
local fx = from.x - the.app.width / 2
49
local fy = from.y - the.app.height / 2
50
local tx = to.x - the.app.width / 2
51
local ty = to.y - the.app.height / 2
52
53
local short = {}
54
55
-- pick shorter x
56
if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
57
-- straight path is shorter
58
short.x = tx - fx
59
else
60
short.x = tx - fx - (the.bg.width - the.app.width)
61
end
62
63
-- pick shorter y
64
if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
65
-- straight path is shorter
66
short.y = ty - fy
67
else
68
short.y = ty - fy - (the.bg.height - the.app.height)
69
end
70
71
return vector.new(short.x, short.y)
72
end
32
73
}
33
74
34
75
GameView = View:extend {
76
lastRock = 0,
77
rockInterval = 1,
78
gameStart = 0,
35
79
onNew = function (self)
36
the.storage = Storage:new{filename = 'world.lua'}
80
-- for x = 1,30 do
81
-- for y = 1,30 do
82
-- self:add(Fill:new{x=x*400, y=y*400,
83
-- width = 32, height = 32,
84
-- fill = {0,0,255}
85
-- })
86
-- end
87
-- end
88
89
the.storage = Storage:new{filename = 'scores.lua'}
37
90
the.storage:load()
38
--if not the.storage.data.highScore then
39
-- print('initializing storage')
40
-- the.storage.data = {highScore = 0}
41
--end
91
if not the.storage.data.highScore then
92
print('initializing storage')
93
the.storage.data = {highScore = 0}
94
end
42
95
96
--the.rockColliders = Group:new()
43
97
the.bullets = Group:new()
98
the.mirrors = Group:new()
99
--the.rocks = Group:new()
44
100
the.interface = Group:new()
45
101
the.planets = Group:new()
46
102
the.indicators = Group:new()
47
the.enemies = Group:new()
48
103
49
-- init bg before build/load since planets need to know bg size
50
104
the.bg = Tile:new{
51
105
image = 'data/stars3.png',
52
width = 27320,
53
height = 15360
106
width = 13660,
107
height = 7680
54
108
}
55
109
self:add(the.bg)
56
110
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
98
-- reload storage as we've turned it all into objects
99
the.storage:load()
100
end
101
102
111
self:add(the.planets)
103
112
113
--the.player = CrystalPlayer:new{x=400,y=300}
114
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
104
115
self:add(the.player)
105
116
self:add(the.player.thrust)
106
self:add(the.player.shield)
107
108
self:add(the.enemies)
109
110
for _ = 1, 20 do
111
local e = Enemy:new{x = math.random(the.bg.width),
112
y = math.random(the.bg.height)}
113
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
114
the.enemies:add(e)
115
self:add(e.thrust) -- why doesn't this work in Enemy.new?
116
self:add(e.shield)
117
end
117
118
--self:add(Enemy:new{x=400, y=300})
118
119
119
120
self:add(the.bullets)
121
--self:add(the.rockColliders)
122
self:add(the.mirrors)
123
--self:add(the.rocks)
120
124
self:add(the.indicators)
121
125
self:add(the.interface)
122
126
127
for _ = 1, math.random(6) do
128
local planet = Planet:new{
129
x = math.random(the.app.width / 2,
130
the.bg.width - the.app.width / 2),
131
y = math.random(the.app.height / 2,
132
the.bg.height - the.app.height / 2),
133
rotation = math.random() * math.pi
134
}
135
the.planets:add(planet)
136
end
137
123
138
the.cursor = Cursor:new()
124
139
self:add(the.cursor)
125
140
141
the.score = Text:new{
142
x = 8,
143
y = 8,
144
width = the.app.width,
145
--align = 'center',
146
font = 25}
147
--the.interface:add(the.score)
148
149
local hs = the.storage.data.highScore
150
local m = hs / 60
151
local s = hs % 60
152
153
the.highScore = Text:new{
154
x = -8,
155
y = 8,
156
width = the.app.width,
157
align = 'right',
158
font = 25,
159
text = string.format('High Score: %d:%02d', m, s)
160
}
161
--the.interface:add(the.highScore)
162
126
163
the.over = Text:new{
127
164
y = the.app.height / 2,
128
165
width = the.app.width,
148
185
love.mouse.setVisible(false)
149
186
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
150
187
188
--self:loadLayers('data/map.lua')
151
189
self.focus = the.player
190
--self:clampTo(self.map)
191
192
self.gameStart = love.timer.getTime()
152
193
end,
153
194
onUpdate = function(self, dt)
154
if the.keys:justPressed('escape') then
155
PauseView:new():activate()
156
end
157
158
195
the.bullets:collide(the.planets)
159
the.bullets:collide(the.player)
160
the.bullets:collide(the.enemies)
196
197
-- this should really go somewhere else...
198
for _, planet in ipairs(the.planets.sprites) do
199
end
200
201
-- for _, mirror in ipairs(the.mirrors.sprites) do
202
-- if not mirror.of then
203
-- print('mirror:' .. inspect(mirror))
204
-- error('mirror OF NOTHING')
205
-- end
206
-- end
161
207
end,
162
208
onEndFrame = function(self)
163
209
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
164
210
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
211
212
if the.player.active then
213
self:updateScore()
214
end
165
215
end,
166
216
draw = function (self, x, y)
167
217
View.draw(self, x, y)
168
218
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
169
219
end,
220
updateScore = function(self)
221
local t = love.timer.getTime() - self.gameStart
222
local m = t / 60
223
local s = t % 60
224
225
the.score.text = string.format('Score: %d:%02d', m, s)
226
--the.score.y = the.player.y - the.app.height / 2 + the.player.height
227
--the.score.x = the.player.x - the.app.width / 2 + the.player.width
228
229
--the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
230
--the.highScore.x = the.player.x - the.app.width / 2
231
end
170
232
}
171
233
172
234
MenuScreen = View:extend {
201
263
self.console:watch('num mirrors', '#the.mirrors.sprites')
202
264
self.console:watch('num rocks', '#the.rocks.sprites')
203
265
self.console:watch('num planets', '#the.planets.sprites')
204
self.console:watch('num enemies', 'the.enemies:count()')
205
266
--self.console:watch('drawTook', 'the.drawTook')
206
267
207
268
-- back off that dark overlay a bit
210
271
end,
211
272
onUpdate = function (self, dt)
212
273
if not (DEBUG and the.console.visible) then
213
if the.keys:justPressed('return') and the.keys:pressed('alt') then
214
love.graphics.toggleFullscreen()
274
if the.keys:justPressed('q') then
275
self.quit()
276
elseif the.keys:justPressed('return') then
277
if the.keys:pressed('alt') then
278
love.graphics.toggleFullscreen()
279
else
280
self.view = GameView:new()
281
end
215
282
elseif the.keys:justPressed('f1') then
216
283
local ss = love.graphics.newScreenshot()
217
284
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1