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()
96
the.mirrors = Group:new()
97
the.rocks = Group:new()
89
98
90
99
the.bg = Tile:new{
91
100
image = 'data/stars3.png',
92
width = 13660,
93
height = 7680
101
-- 1366x768 * 3
102
width = 4098,
103
height = 2304
94
104
}
95
105
self:add(the.bg)
96
106
97
self:add(the.planets)
98
99
107
--the.player = CrystalPlayer:new{x=400,y=300}
100
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
108
the.player = SpacePlayer:new{x=1366,y=768}
101
109
self:add(the.player)
102
self:add(the.player.thrust)
103
self:add(the.player.shield)
104
110
105
local e = Enemy:new{x=400, y=300}
106
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
107
self:add(e)
108
self:add(e.thrust) -- why doesn't this work in Enemy.new?
111
--self:add(Enemy:new{x=400, y=300})
109
112
110
113
self:add(the.bullets)
111
self:add(the.indicators)
112
self:add(the.interface)
113
114
for _ = 1, math.random(6) do
115
local planet = Planet:new{
116
x = math.random(the.app.width / 2,
117
the.bg.width - the.app.width / 2),
118
y = math.random(the.app.height / 2,
119
the.bg.height - the.app.height / 2),
120
rotation = math.random() * math.pi
121
}
122
the.planets:add(planet)
123
end
114
self:add(the.rockColliders)
115
self:add(the.mirrors)
116
self:add(the.rocks)
124
117
125
118
the.cursor = Cursor:new()
126
119
self:add(the.cursor)
127
120
121
the.score = Text:new{
122
width = the.app.width,
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',
134
font = 25,
135
text = string.format('High Score: %d:%02d', m, s)
136
}
137
self:add(the.highScore)
138
128
139
love.mouse.setGrab(true)
129
140
love.mouse.setVisible(false)
130
141
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
131
142
143
--self:loadLayers('data/map.lua')
132
144
self.focus = the.player
145
--self:clampTo(self.map)
146
147
self.gameStart = love.timer.getTime()
133
148
end,
134
149
onUpdate = function(self, dt)
135
the.bullets:collide(the.planets)
136
the.bullets:collide(the.player)
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
137
186
end,
138
187
onEndFrame = function(self)
139
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
140
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
141
200
end,
142
201
draw = function (self, x, y)
143
202
View.draw(self, x, y)
144
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
145
end,
203
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
end
146
205
}
147
206
148
207
MenuScreen = View:extend {
166
225
math.randomseed(os.time())
167
226
168
227
self.view = GameView:new()
169
170
228
if DEBUG then
171
229
self.console:watch('VERSION', 'VERSION')
172
230
self.console:watch('updateTook', 'the.updateTook')
175
233
self.console:watch('the.app.width', 'the.app.width')
176
234
self.console:watch('the.app.height', 'the.app.height')
177
235
self.console:watch('num mirrors', '#the.mirrors.sprites')
178
self.console:watch('num rocks', '#the.rocks.sprites')
179
self.console:watch('num planets', '#the.planets.sprites')
180
236
--self.console:watch('drawTook', 'the.drawTook')
181
237
182
238
-- back off that dark overlay a bit
184
240
end
185
241
end,
186
242
onUpdate = function (self, dt)
187
if not (DEBUG and the.console.visible) then
188
if the.keys:justPressed('q') then
189
self.quit()
190
elseif the.keys:justPressed('return') then
191
if the.keys:pressed('alt') then
192
love.graphics.toggleFullscreen()
193
else
194
self.view = GameView:new()
195
end
196
elseif the.keys:justPressed('f1') then
197
local ss = love.graphics.newScreenshot()
198
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
199
elseif the.keys:justPressed('f11') then
200
love.graphics.toggleFullscreen()
201
end
243
if the.keys:justPressed('escape') then
244
self.quit()
202
245
end
203
246
end,
204
247
update = function (self, dt)
209
252
end
210
253
end
211
254
}
212
213
realRun = love.run
214
function love.run()
215
-- should fail silently if it can't go to fullscreen...
216
love.graphics.toggleFullscreen()
217
218
realRun()
219
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1