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 35
- compare with another revision
- download diff
- download tarball
- view history from revision 35
- Committer: Josh C
- Date: 2013-05-18 00:09:56 UTC
- Revision ID: josh@9ix.org-20130518000956-s9717aensfsq1b3c
fix double-removing sprites (and subsequent zombie mirror bullets).
also lots of debug stuff.
also lots of debug stuff.
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
for _ = 1, 5 do
109
local e = Enemy:new{x = math.random(the.bg.width),
110
y = math.random(the.bg.height)}
111
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
112
the.enemies:add(e)
113
self:add(e.thrust) -- why doesn't this work in Enemy.new?
114
self:add(e.shield)
115
end
110
111
--self:add(Enemy:new{x=400, y=300})
116
112
117
113
self:add(the.bullets)
118
self:add(the.indicators)
119
self:add(the.interface)
120
121
for _ = 1, math.random(6) do
122
local planet = Planet:new{
123
x = math.random(the.app.width / 2,
124
the.bg.width - the.app.width / 2),
125
y = math.random(the.app.height / 2,
126
the.bg.height - the.app.height / 2),
127
rotation = math.random() * math.pi
128
}
129
the.planets:add(planet)
130
end
114
self:add(the.rockColliders)
115
self:add(the.mirrors)
116
self:add(the.rocks)
131
117
132
118
the.cursor = Cursor:new()
133
119
self:add(the.cursor)
134
120
135
the.over = Text:new{
136
y = the.app.height / 2,
121
the.score = Text:new{
137
122
width = the.app.width,
138
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',
139
134
font = 25,
140
text = "Game Over",
141
visible = false
142
}
143
the.interface:add(the.over)
144
145
146
the.instructions = Text:new{
147
y = the.app.height / 2 + 32,
148
width = the.app.width,
149
align = 'center',
150
font = 12,
151
text = "Press Enter to start a new game\nPress Q to quit",
152
visible = false
153
}
154
the.interface:add(the.instructions)
135
text = string.format('High Score: %d:%02d', m, s)
136
}
137
self:add(the.highScore)
155
138
156
139
love.mouse.setGrab(true)
157
140
love.mouse.setVisible(false)
158
141
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
159
142
143
--self:loadLayers('data/map.lua')
160
144
self.focus = the.player
145
--self:clampTo(self.map)
146
147
self.gameStart = love.timer.getTime()
161
148
end,
162
149
onUpdate = function(self, dt)
163
the.bullets:collide(the.planets)
164
the.bullets:collide(the.player)
165
the.bullets:collide(the.enemies)
150
if 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
166
186
end,
167
187
onEndFrame = function(self)
168
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
169
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
188
if the.player.active then
189
local t = love.timer.getTime() - self.gameStart
190
local m = t / 60
191
local s = t % 60
192
193
the.score.text = string.format('Score: %d:%02d', m, s)
194
the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
the.score.x = the.player.x - the.app.width / 2
196
end
197
198
the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
the.highScore.x = the.player.x - the.app.width / 2
170
200
end,
171
201
draw = function (self, x, y)
172
202
View.draw(self, x, y)
173
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
174
end,
203
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
end
175
205
}
176
206
177
207
MenuScreen = View:extend {
195
225
math.randomseed(os.time())
196
226
197
227
self.view = GameView:new()
198
199
228
if DEBUG then
200
229
self.console:watch('VERSION', 'VERSION')
201
230
self.console:watch('updateTook', 'the.updateTook')
204
233
self.console:watch('the.app.width', 'the.app.width')
205
234
self.console:watch('the.app.height', 'the.app.height')
206
235
self.console:watch('num mirrors', '#the.mirrors.sprites')
207
self.console:watch('num rocks', '#the.rocks.sprites')
208
self.console:watch('num planets', '#the.planets.sprites')
209
236
--self.console:watch('drawTook', 'the.drawTook')
210
237
211
238
-- back off that dark overlay a bit
213
240
end
214
241
end,
215
242
onUpdate = function (self, dt)
216
if not (DEBUG and the.console.visible) then
217
if the.keys:justPressed('q') then
218
self.quit()
219
elseif the.keys:justPressed('return') then
220
if the.keys:pressed('alt') then
221
love.graphics.toggleFullscreen()
222
else
223
self.view = GameView:new()
224
end
225
elseif the.keys:justPressed('f1') then
226
local ss = love.graphics.newScreenshot()
227
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
228
elseif the.keys:justPressed('f11') then
229
love.graphics.toggleFullscreen()
230
end
243
if the.keys:justPressed('escape') then
244
self.quit()
231
245
end
232
246
end,
233
247
update = function (self, dt)
238
252
end
239
253
end
240
254
}
241
242
realRun = love.run
243
function love.run()
244
-- should fail silently if it can't go to fullscreen...
245
love.graphics.toggleFullscreen()
246
247
realRun()
248
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1