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 37
- compare with another revision
- download diff
- download tarball
- view history from revision 37
- Committer: Josh C
- Date: 2013-05-20 16:51:19 UTC
- Revision ID: josh@9ix.org-20130520165119-mkjh7d9408e6ig0u
extract updating score. update score again when you calc high score -
should mitigate a bug I saw happen when thor played that put final score
+ high score out of sync
should mitigate a bug I saw happen when thor played that put final score
+ high score out of sync
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)
74
71
}
75
72
76
73
GameView = View:extend {
74
lastRock = 0,
75
rockInterval = 1,
76
gameStart = 0,
77
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
78
87
the.storage = Storage:new{filename = 'scores.lua'}
79
88
the.storage:load()
80
--if not the.storage.data.highScore then
81
-- print('initializing storage')
82
-- the.storage.data = {highScore = 0}
83
--end
89
if not the.storage.data.highScore then
90
print('initializing storage')
91
the.storage.data = {highScore = 0}
92
end
84
93
94
the.rockColliders = Group:new()
85
95
the.bullets = Group:new()
86
the.interface = Group:new()
87
the.planets = Group:new()
88
the.indicators = Group:new()
89
the.enemies = Group:new()
96
the.mirrors = Group:new()
97
the.rocks = Group:new()
90
98
91
99
the.bg = Tile:new{
92
100
image = 'data/stars3.png',
93
width = 13660,
94
height = 7680
101
-- 1366x768 * 3
102
width = 4098,
103
height = 2304
95
104
}
96
105
self:add(the.bg)
97
106
98
self:add(the.planets)
99
100
107
--the.player = CrystalPlayer:new{x=400,y=300}
101
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
108
the.player = SpacePlayer:new{x=1366,y=768}
102
109
self:add(the.player)
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)
110
111
--self:add(Enemy:new{x=400, y=300})
113
112
114
113
self:add(the.bullets)
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
114
self:add(the.rockColliders)
115
self:add(the.mirrors)
116
self:add(the.rocks)
128
117
129
118
the.cursor = Cursor:new()
130
119
self:add(the.cursor)
131
120
132
the.over = Text:new{
133
y = the.app.height / 2,
121
the.score = Text:new{
134
122
width = the.app.width,
135
123
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',
136
134
font = 25,
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)
135
text = string.format('High Score: %d:%02d', m, s)
136
}
137
self:add(the.highScore)
152
138
153
139
love.mouse.setGrab(true)
154
140
love.mouse.setVisible(false)
155
141
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
156
142
143
--self:loadLayers('data/map.lua')
157
144
self.focus = the.player
145
--self:clampTo(self.map)
146
147
self.gameStart = love.timer.getTime()
158
148
end,
159
149
onUpdate = function(self, dt)
160
the.bullets:collide(the.planets)
161
the.bullets:collide(the.player)
162
the.bullets:collide(the.enemies)
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()
176
end
177
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
163
186
end,
164
187
onEndFrame = function(self)
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
188
if the.player.active then
189
self:updateScore()
190
end
167
191
end,
168
192
draw = function (self, x, y)
169
193
View.draw(self, x, y)
170
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
194
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
171
195
end,
196
updateScore = function(self)
197
local t = love.timer.getTime() - self.gameStart
198
local m = t / 60
199
local s = t % 60
200
201
the.score.text = string.format('Score: %d:%02d', m, s)
202
the.score.y = the.player.y - the.app.height / 2 + the.player.height
203
the.score.x = the.player.x - the.app.width / 2
204
205
the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
206
the.highScore.x = the.player.x - the.app.width / 2
207
end
172
208
}
173
209
174
210
MenuScreen = View:extend {
192
228
math.randomseed(os.time())
193
229
194
230
self.view = GameView:new()
195
196
231
if DEBUG then
197
232
self.console:watch('VERSION', 'VERSION')
198
233
self.console:watch('updateTook', 'the.updateTook')
202
237
self.console:watch('the.app.height', 'the.app.height')
203
238
self.console:watch('num mirrors', '#the.mirrors.sprites')
204
239
self.console:watch('num rocks', '#the.rocks.sprites')
205
self.console:watch('num planets', '#the.planets.sprites')
206
240
--self.console:watch('drawTook', 'the.drawTook')
207
241
208
242
-- back off that dark overlay a bit
210
244
end
211
245
end,
212
246
onUpdate = function (self, dt)
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
247
if the.keys:justPressed('escape') then
248
self.quit()
228
249
end
229
250
end,
230
251
update = function (self, dt)
235
256
end
236
257
end
237
258
}
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