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 49
- compare with another revision
- download diff
- download tarball
- view history from revision 49
- Committer: Josh C
- Date: 2013-06-10 23:43:01 UTC
- Revision ID: josh@9ix.org-20130610234301-7psv1434q7dacikh
make bullets not wrap
- files removed:
- data/shield.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
19
23
20
util = {
24
21
signOf = function(value)
28
25
return -1
29
26
end
30
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
31
71
}
32
72
33
73
GameView = View:extend {
74
lastRock = 0,
75
rockInterval = 1,
76
gameStart = 0,
34
77
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
35
87
the.storage = Storage:new{filename = 'scores.lua'}
36
88
the.storage:load()
37
--if not the.storage.data.highScore then
38
-- print('initializing storage')
39
-- the.storage.data = {highScore = 0}
40
--end
89
if not the.storage.data.highScore then
90
print('initializing storage')
91
the.storage.data = {highScore = 0}
92
end
41
93
94
--the.rockColliders = Group:new()
42
95
the.bullets = Group:new()
96
the.mirrors = Group:new()
97
--the.rocks = Group:new()
43
98
the.interface = Group:new()
44
99
the.planets = Group:new()
45
100
the.indicators = Group:new()
46
the.enemies = Group:new()
47
101
48
102
the.bg = Tile:new{
49
103
image = 'data/stars3.png',
55
109
self:add(the.planets)
56
110
57
111
--the.player = CrystalPlayer:new{x=400,y=300}
58
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
the.player = SpacePlayer:new{x=1366,y=768}
59
113
self:add(the.player)
60
114
self:add(the.player.thrust)
61
self:add(the.player.shield)
62
63
self:add(the.enemies)
64
65
for _ = 1, 5 do
66
local e = Enemy:new{x = math.random(the.bg.width),
67
y = math.random(the.bg.height)}
68
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
69
the.enemies:add(e)
70
self:add(e.thrust) -- why doesn't this work in Enemy.new?
71
self:add(e.shield)
72
end
115
116
--self:add(Enemy:new{x=400, y=300})
73
117
74
118
self:add(the.bullets)
119
--self:add(the.rockColliders)
120
self:add(the.mirrors)
121
--self:add(the.rocks)
75
122
self:add(the.indicators)
76
123
self:add(the.interface)
77
124
78
for _ = 1, math.random(3, 6) do
79
local planet = Planet:new{
125
for _ = 1, math.random(6) do
126
local planet = Tile:new{
127
image = 'data/planet1.png',
80
128
x = math.random(the.app.width / 2,
81
129
the.bg.width - the.app.width / 2),
82
130
y = math.random(the.app.height / 2,
84
132
rotation = math.random() * math.pi
85
133
}
86
134
the.planets:add(planet)
135
136
planet.indicator = Tile:new{
137
image = 'data/planet1ind.png',
138
}
139
the.indicators:add(planet.indicator)
87
140
end
88
141
89
142
the.cursor = Cursor:new()
90
143
self:add(the.cursor)
91
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
92
167
the.over = Text:new{
93
168
y = the.app.height / 2,
94
169
width = the.app.width,
114
189
love.mouse.setVisible(false)
115
190
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
116
191
192
--self:loadLayers('data/map.lua')
117
193
self.focus = the.player
194
--self:clampTo(self.map)
195
196
self.gameStart = love.timer.getTime()
118
197
end,
119
198
onUpdate = function(self, dt)
120
the.bullets:collide(the.planets)
121
the.bullets:collide(the.player)
122
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 * util.signOf(pvec.x) + 8
249
indy = the.app.width / 2 * pvec.y / math.abs(pvec.x)
250
else
251
indy = the.app.height / 2 * util.signOf(pvec.y) + 8
252
indx = the.app.height / 2 * 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
123
266
end,
124
267
onEndFrame = function(self)
125
268
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
126
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
127
274
end,
128
275
draw = function (self, x, y)
129
276
View.draw(self, x, y)
130
277
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
131
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
132
291
}
133
292
134
293
MenuScreen = View:extend {
Loggerhead is a web-based interface for Breezy
Version: 2.0.1