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 46
- compare with another revision
- download diff
- download tarball
- view history from revision 46
- Committer: Josh C
- Date: 2013-06-10 21:37:59 UTC
- Revision ID: josh@9ix.org-20130610213759-drnecjpritehmz3t
bigger area, more planets
- files removed:
- data/planet1ind.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
the.indicators = Group:new()
46
the.enemies = Group:new()
47
100
48
101
the.bg = Tile:new{
49
102
image = 'data/stars3.png',
55
108
self:add(the.planets)
56
109
57
110
--the.player = CrystalPlayer:new{x=400,y=300}
58
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
111
the.player = SpacePlayer:new{x=1366,y=768}
59
112
self:add(the.player)
60
113
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
114
115
--self:add(Enemy:new{x=400, y=300})
73
116
74
117
self:add(the.bullets)
75
self:add(the.indicators)
118
--self:add(the.rockColliders)
119
self:add(the.mirrors)
120
--self:add(the.rocks)
76
121
self:add(the.interface)
77
122
78
for _ = 1, math.random(3, 6) do
79
local planet = Planet:new{
123
for _ = 1, math.random(6) do
124
local planet = Tile:new{
125
image = 'data/planet1.png',
80
126
x = math.random(the.app.width / 2,
81
127
the.bg.width - the.app.width / 2),
82
128
y = math.random(the.app.height / 2,
89
135
the.cursor = Cursor:new()
90
136
self:add(the.cursor)
91
137
138
the.score = Text:new{
139
x = 8,
140
y = 8,
141
width = the.app.width,
142
--align = 'center',
143
font = 25}
144
the.interface:add(the.score)
145
146
local hs = the.storage.data.highScore
147
local m = hs / 60
148
local s = hs % 60
149
150
the.highScore = Text:new{
151
x = -8,
152
y = 8,
153
width = the.app.width,
154
align = 'right',
155
font = 25,
156
text = string.format('High Score: %d:%02d', m, s)
157
}
158
the.interface:add(the.highScore)
159
92
160
the.over = Text:new{
93
161
y = the.app.height / 2,
94
162
width = the.app.width,
114
182
love.mouse.setVisible(false)
115
183
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
116
184
185
--self:loadLayers('data/map.lua')
117
186
self.focus = the.player
187
--self:clampTo(self.map)
188
189
self.gameStart = love.timer.getTime()
118
190
end,
119
191
onUpdate = function(self, dt)
120
the.bullets:collide(the.planets)
121
the.bullets:collide(the.player)
122
the.bullets:collide(the.enemies)
192
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
193
local unseenRock = nil
194
while not unseenRock do
195
local rock = Rock:new{
196
x = math.random(the.app.width / 2,
197
the.bg.width - the.app.width / 2),
198
y = math.random(the.app.height / 2,
199
the.bg.height - the.app.height / 2),
200
velocity = {
201
x = math.random(-300, 300),
202
y = math.random(-300, 300),
203
rotation = math.random(-7, 7)
204
},
205
scale = math.random() + 0.5
206
}
207
208
local rockToPlayer = util.shortestVector(rock, the.player)
209
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
210
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
211
unseenRock = rock
212
end
213
end
214
215
the.rocks:add(unseenRock)
216
217
self.lastRock = love.timer.getTime()
218
end
219
220
the.bullets:collide(the.rockColliders)
221
222
-- for _, mirror in ipairs(the.mirrors.sprites) do
223
-- if not mirror.of then
224
-- print('mirror:' .. inspect(mirror))
225
-- error('mirror OF NOTHING')
226
-- end
227
-- end
123
228
end,
124
229
onEndFrame = function(self)
125
230
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
126
231
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
232
233
if the.player.active then
234
self:updateScore()
235
end
127
236
end,
128
237
draw = function (self, x, y)
129
238
View.draw(self, x, y)
130
239
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
131
240
end,
241
updateScore = function(self)
242
local t = love.timer.getTime() - self.gameStart
243
local m = t / 60
244
local s = t % 60
245
246
the.score.text = string.format('Score: %d:%02d', m, s)
247
--the.score.y = the.player.y - the.app.height / 2 + the.player.height
248
--the.score.x = the.player.x - the.app.width / 2 + the.player.width
249
250
--the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
251
--the.highScore.x = the.player.x - the.app.width / 2
252
end
132
253
}
133
254
134
255
MenuScreen = View:extend {
153
274
154
275
self.view = GameView:new()
155
276
277
-- should fail silently if it can't go to fullscreen...
278
love.graphics.toggleFullscreen()
279
156
280
if DEBUG then
157
281
self.console:watch('VERSION', 'VERSION')
158
282
self.console:watch('updateTook', 'the.updateTook')
195
319
end
196
320
end
197
321
}
198
199
realRun = love.run
200
function love.run()
201
-- should fail silently if it can't go to fullscreen...
202
love.graphics.toggleFullscreen()
203
204
realRun()
205
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1