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 70
- compare with another revision
- download diff
- download tarball
- view history from revision 70
- Committer: Josh C
- Date: 2013-06-19 01:12:39 UTC
- Revision ID: josh@9ix.org-20130619011239-l1h3rnhphkpg0vdk
bring back game over screen
- files added:
- data/planet1.png
- files modified:
- boom.lua
added
removed
main.lua
3
3
4
4
require 'zoetrope'
5
5
vector = require 'vector'
6
--inspect = require 'inspect'
6
7
7
8
require 'group'
8
9
15
16
require 'bullet'
16
17
require 'rock'
17
18
require 'boom'
19
require 'planet'
20
require 'trade_view'
21
require 'shield'
18
22
19
23
util = {
20
24
signOf = function(value)
70
74
}
71
75
72
76
GameView = View:extend {
73
lastRock = 0,
74
rockInterval = 1,
75
gameStart = 0,
76
77
onNew = function (self)
77
-- for x = 1,30 do
78
-- for y = 1,30 do
79
-- self:add(Fill:new{x=x*400, y=y*400,
80
-- width = 32, height = 32,
81
-- fill = {0,0,255}
82
-- })
83
-- end
84
-- end
85
86
78
the.storage = Storage:new{filename = 'scores.lua'}
87
79
the.storage:load()
88
if not the.storage.data.highScore then
89
print('initializing storage')
90
the.storage.data = {highScore = 0}
91
end
80
--if not the.storage.data.highScore then
81
-- print('initializing storage')
82
-- the.storage.data = {highScore = 0}
83
--end
92
84
93
the.rockColliders = Group:new()
94
85
the.bullets = Group:new()
95
the.mirrors = Group:new()
96
the.rocks = Group:new()
86
the.interface = Group:new()
87
the.planets = Group:new()
88
the.indicators = Group:new()
89
the.enemies = Group:new()
97
90
98
91
the.bg = Tile:new{
99
92
image = 'data/stars3.png',
100
-- 1366x768 * 3
101
width = 4098,
102
height = 2304
93
width = 13660,
94
height = 7680
103
95
}
104
96
self:add(the.bg)
105
97
98
self:add(the.planets)
99
106
100
--the.player = CrystalPlayer:new{x=400,y=300}
107
the.player = SpacePlayer:new{x=1366,y=768}
101
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
108
102
self:add(the.player)
109
110
--self:add(Enemy:new{x=400, y=300})
103
self:add(the.player.thrust)
104
self:add(the.player.shield)
105
106
self:add(the.enemies)
107
108
local e = Enemy:new{x=400, y=300}
109
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
110
the.enemies:add(e)
111
self:add(e.thrust) -- why doesn't this work in Enemy.new?
112
self:add(e.shield)
111
113
112
114
self:add(the.bullets)
113
self:add(the.rockColliders)
114
self:add(the.mirrors)
115
self:add(the.rocks)
115
self:add(the.indicators)
116
self:add(the.interface)
117
118
for _ = 1, math.random(6) do
119
local planet = Planet:new{
120
x = math.random(the.app.width / 2,
121
the.bg.width - the.app.width / 2),
122
y = math.random(the.app.height / 2,
123
the.bg.height - the.app.height / 2),
124
rotation = math.random() * math.pi
125
}
126
the.planets:add(planet)
127
end
116
128
117
129
the.cursor = Cursor:new()
118
130
self:add(the.cursor)
119
131
120
the.score = Text:new{
132
the.over = Text:new{
133
y = the.app.height / 2,
121
134
width = the.app.width,
122
135
align = 'center',
123
font = 25}
124
self:add(the.score)
125
126
local hs = the.storage.data.highScore
127
local m = hs / 60
128
local s = hs % 60
129
130
the.highScore = Text:new{
131
width = the.app.width,
132
align = 'right',
133
136
font = 25,
134
text = string.format('High Score: %d:%02d', m, s)
135
}
136
self:add(the.highScore)
137
text = "Game Over",
138
visible = false
139
}
140
the.interface:add(the.over)
141
142
143
the.instructions = Text:new{
144
y = the.app.height / 2 + 32,
145
width = the.app.width,
146
align = 'center',
147
font = 12,
148
text = "Press Enter to start a new game\nPress Q to quit",
149
visible = false
150
}
151
the.interface:add(the.instructions)
137
152
138
153
love.mouse.setGrab(true)
139
154
love.mouse.setVisible(false)
140
155
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
141
156
142
--self:loadLayers('data/map.lua')
143
157
self.focus = the.player
144
--self:clampTo(self.map)
145
146
self.gameStart = love.timer.getTime()
147
158
end,
148
159
onUpdate = function(self, dt)
149
if love.timer.getTime() > self.lastRock + self.rockInterval then
150
local unseenRock = nil
151
while not unseenRock do
152
local rock = Rock:new{
153
x = math.random(the.app.width / 2,
154
the.bg.width - the.app.width / 2),
155
y = math.random(the.app.height / 2,
156
the.bg.height - the.app.height / 2),
157
velocity = {
158
x = math.random(-300, 300),
159
y = math.random(-300, 300),
160
rotation = math.random(-7, 7)
161
},
162
scale = math.random() + 0.5
163
}
164
165
local rockToPlayer = util.shortestVector(rock, the.player)
166
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
167
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
168
unseenRock = rock
169
end
170
end
171
172
the.rocks:add(unseenRock)
173
174
self.lastRock = love.timer.getTime()
175
end
176
177
the.bullets:collide(the.rockColliders)
160
the.bullets:collide(the.planets)
161
the.bullets:collide(the.player)
162
the.bullets:collide(the.enemies)
178
163
end,
179
164
onEndFrame = function(self)
180
if the.player.active then
181
local t = love.timer.getTime() - self.gameStart
182
local m = t / 60
183
local s = t % 60
184
185
the.score.text = string.format('Score: %d:%02d', m, s)
186
the.score.y = the.player.y - the.app.height / 2 + the.player.height
187
the.score.x = the.player.x - the.app.width / 2
188
end
189
190
the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
191
the.highScore.x = the.player.x - the.app.width / 2
165
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
166
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
192
167
end,
193
168
draw = function (self, x, y)
194
169
View.draw(self, x, y)
195
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
196
end
170
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
171
end,
197
172
}
198
173
199
174
MenuScreen = View:extend {
217
192
math.randomseed(os.time())
218
193
219
194
self.view = GameView:new()
195
220
196
if DEBUG then
221
197
self.console:watch('VERSION', 'VERSION')
222
198
self.console:watch('updateTook', 'the.updateTook')
224
200
self.console:watch('the.player.y', 'the.player.y')
225
201
self.console:watch('the.app.width', 'the.app.width')
226
202
self.console:watch('the.app.height', 'the.app.height')
203
self.console:watch('num mirrors', '#the.mirrors.sprites')
204
self.console:watch('num rocks', '#the.rocks.sprites')
205
self.console:watch('num planets', '#the.planets.sprites')
227
206
--self.console:watch('drawTook', 'the.drawTook')
228
207
229
208
-- back off that dark overlay a bit
231
210
end
232
211
end,
233
212
onUpdate = function (self, dt)
234
if the.keys:justPressed('escape') then
235
self.quit()
213
if not (DEBUG and the.console.visible) then
214
if the.keys:justPressed('q') then
215
self.quit()
216
elseif the.keys:justPressed('return') then
217
if the.keys:pressed('alt') then
218
love.graphics.toggleFullscreen()
219
else
220
self.view = GameView:new()
221
end
222
elseif the.keys:justPressed('f1') then
223
local ss = love.graphics.newScreenshot()
224
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
225
elseif the.keys:justPressed('f11') then
226
love.graphics.toggleFullscreen()
227
end
236
228
end
237
229
end,
238
230
update = function (self, dt)
243
235
end
244
236
end
245
237
}
238
239
realRun = love.run
240
function love.run()
241
-- should fail silently if it can't go to fullscreen...
242
love.graphics.toggleFullscreen()
243
244
realRun()
245
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1