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