bzr branch
/bzr/traderous
|
3
by Josh C
basecode main.lua |
1 |
STRICT = true |
2 |
DEBUG = true |
|
3 |
||
4 |
require 'zoetrope' |
|
|
13
by Josh C
constant velocity for bullets. using hump.vector e9b86ef |
5 |
vector = require 'vector' |
|
35
by Josh C
fix double-removing sprites (and subsequent zombie mirror bullets). |
6 |
--inspect = require 'inspect'
|
|
3
by Josh C
basecode main.lua |
7 |
|
|
24
by Josh C
monkey patch group to add onRemove hook. remove mirrors on remove. |
8 |
require 'group' |
9 |
||
|
3
by Josh C
basecode main.lua |
10 |
require 'version' |
|
21
by Josh C
extract wrapping behavior, wrap bullets |
11 |
require 'wrap_tile' |
|
27
by Josh C
try to not spawn rocks where you can see them. not working if screen |
12 |
require 'mirror' |
|
4
by Josh C
trying some movement styles. derivatives on crystal quest movement. |
13 |
require 'player' |
|
7
by Josh C
enemy |
14 |
require 'enemy' |
|
8
by Josh C
targeting cursor (manual switch to start) |
15 |
require 'cursor' |
|
11
by Josh C
pew pew! |
16 |
require 'bullet' |
|
26
by Josh C
rocks! |
17 |
require 'rock' |
|
30
by Josh C
explosions |
18 |
require 'boom' |
|
52
by Josh C
break out planet |
19 |
require 'planet' |
|
53
by Josh C
beginnings of trading interface |
20 |
require 'trade_view' |
|
68
by Josh C
shield |
21 |
require 'shield' |
|
78
by Josh C
pause screen |
22 |
require 'pause_view' |
|
7
by Josh C
enemy |
23 |
|
24 |
util = { |
|
25 |
signOf = function(value) |
|
26 |
if value >= 0 then |
|
27 |
return 1 |
|
28 |
else
|
|
29 |
return -1 |
|
30 |
end
|
|
|
27
by Josh C
try to not spawn rocks where you can see them. not working if screen |
31 |
end, |
|
7
by Josh C
enemy |
32 |
}
|
|
3
by Josh C
basecode main.lua |
33 |
|
34 |
GameView = View:extend { |
|
35 |
onNew = function (self) |
|
|
81
by Josh C
load/save (not working yet) |
36 |
the.storage = Storage:new{filename = 'world.lua'} |
|
34
by Josh C
record high scores |
37 |
the.storage:load() |
|
64
by Josh C
more old code cleanup |
38 |
--if not the.storage.data.highScore then
|
39 |
-- print('initializing storage')
|
|
40 |
-- the.storage.data = {highScore = 0}
|
|
41 |
--end
|
|
|
34
by Josh C
record high scores |
42 |
|
|
29
by Josh C
shoot things! |
43 |
the.bullets = Group:new() |
|
39
by Josh C
some instructions at game over |
44 |
the.interface = Group:new() |
|
45
by Josh C
add planet, remove rocks |
45 |
the.planets = Group:new() |
|
47
by Josh C
indicators for where the planets are |
46 |
the.indicators = Group:new() |
|
69
by Josh C
enemy shields and death |
47 |
the.enemies = Group:new() |
|
28
by Josh C
prepare a collision box for the rocks |
48 |
|
|
81
by Josh C
load/save (not working yet) |
49 |
-- init bg before build/load since planets need to know bg size
|
|
19
by Josh C
move player around looping world |
50 |
the.bg = Tile:new{ |
51 |
image = 'data/stars3.png', |
|
|
75
by Josh C
bigger space, slower movement, maintain enemy density |
52 |
width = 27320, |
53 |
height = 15360 |
|
|
18
by Josh C
starry background |
54 |
}
|
|
19
by Josh C
move player around looping world |
55 |
self:add(the.bg) |
|
4
by Josh C
trying some movement styles. derivatives on crystal quest movement. |
56 |
|
|
81
by Josh C
load/save (not working yet) |
57 |
if self.newWorld or not the.storage.data.player then |
58 |
the.storage.data = {planets = {}} |
|
59 |
||
60 |
-- build planets from random
|
|
61 |
for _ = 1, math.random(3, 6) do |
|
62 |
local planet = Planet:new{ |
|
63 |
x = math.random(the.app.width / 2, |
|
64 |
the.bg.width - the.app.width / 2), |
|
65 |
y = math.random(the.app.height / 2, |
|
66 |
the.bg.height - the.app.height / 2), |
|
67 |
rotation = math.random() * math.pi |
|
68 |
}
|
|
69 |
the.planets:add(planet) |
|
70 |
table.insert(the.storage.data.planets, { |
|
71 |
x = planet.x, |
|
72 |
y = planet.y, |
|
73 |
rotation = planet.rotation, |
|
74 |
goods = planet.goods |
|
75 |
})
|
|
76 |
end
|
|
77 |
||
78 |
-- build fresh player
|
|
79 |
local player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2} |
|
80 |
the.player = player |
|
81 |
the.storage.data.player = {x = player.x, |
|
82 |
y = player.y, |
|
83 |
money = player.money, |
|
84 |
goods = player.goods, |
|
85 |
cargoSpace = player.cargoSpace |
|
86 |
}
|
|
87 |
||
88 |
the.storage:save() |
|
89 |
else
|
|
90 |
-- load planets with x, y, goods
|
|
91 |
for _, planetData in ipairs(the.storage.data.planets) do |
|
92 |
the.planets:add(Planet:new(planetData)) |
|
93 |
end
|
|
94 |
||
95 |
-- load player with cargo, money, position
|
|
96 |
the.player = SpacePlayer:new(the.storage.data.player) |
|
|
83
by Josh C
last fix for saving |
97 |
|
98 |
-- reload storage as we've turned it all into objects
|
|
99 |
the.storage:load() |
|
|
81
by Josh C
load/save (not working yet) |
100 |
end
|
101 |
||
|
45
by Josh C
add planet, remove rocks |
102 |
self:add(the.planets) |
103 |
||
|
4
by Josh C
trying some movement styles. derivatives on crystal quest movement. |
104 |
self:add(the.player) |
|
41
by Josh C
thrust indicator |
105 |
self:add(the.player.thrust) |
|
68
by Josh C
shield |
106 |
self:add(the.player.shield) |
|
4
by Josh C
trying some movement styles. derivatives on crystal quest movement. |
107 |
|
|
69
by Josh C
enemy shields and death |
108 |
self:add(the.enemies) |
109 |
||
|
75
by Josh C
bigger space, slower movement, maintain enemy density |
110 |
for _ = 1, 20 do |
|
72
by Josh C
add enemy state switch |
111 |
local e = Enemy:new{x = math.random(the.bg.width), |
112 |
y = math.random(the.bg.height)} |
|
113 |
--local e = Enemy:new{x=the.bg.width / 2, y=the.bg.height / 2}
|
|
114 |
the.enemies:add(e) |
|
115 |
self:add(e.thrust) -- why doesn't this work in Enemy.new? |
|
116 |
self:add(e.shield) |
|
117 |
end
|
|
|
7
by Josh C
enemy |
118 |
|
|
32
by Josh C
stick things into layers |
119 |
self:add(the.bullets) |
|
47
by Josh C
indicators for where the planets are |
120 |
self:add(the.indicators) |
|
39
by Josh C
some instructions at game over |
121 |
self:add(the.interface) |
|
32
by Josh C
stick things into layers |
122 |
|
|
14
by Josh C
only fire if cursor is in target area. change cursor to reflect this. |
123 |
the.cursor = Cursor:new() |
124 |
self:add(the.cursor) |
|
|
8
by Josh C
targeting cursor (manual switch to start) |
125 |
|
|
70
by Josh C
bring back game over screen |
126 |
the.over = Text:new{ |
127 |
y = the.app.height / 2, |
|
128 |
width = the.app.width, |
|
129 |
align = 'center', |
|
130 |
font = 25, |
|
131 |
text = "Game Over", |
|
132 |
visible = false |
|
133 |
}
|
|
134 |
the.interface:add(the.over) |
|
135 |
||
136 |
||
137 |
the.instructions = Text:new{ |
|
138 |
y = the.app.height / 2 + 32, |
|
139 |
width = the.app.width, |
|
140 |
align = 'center', |
|
141 |
font = 12, |
|
142 |
text = "Press Enter to start a new game\nPress Q to quit", |
|
143 |
visible = false |
|
144 |
}
|
|
145 |
the.interface:add(the.instructions) |
|
146 |
||
|
4
by Josh C
trying some movement styles. derivatives on crystal quest movement. |
147 |
love.mouse.setGrab(true) |
|
8
by Josh C
targeting cursor (manual switch to start) |
148 |
love.mouse.setVisible(false) |
|
33
by Josh C
keep score, center mouse on start |
149 |
love.mouse.setPosition(the.app.width / 2, the.app.height / 2) |
|
3
by Josh C
basecode main.lua |
150 |
|
|
4
by Josh C
trying some movement styles. derivatives on crystal quest movement. |
151 |
self.focus = the.player |
|
3
by Josh C
basecode main.lua |
152 |
end, |
|
26
by Josh C
rocks! |
153 |
onUpdate = function(self, dt) |
|
78
by Josh C
pause screen |
154 |
if the.keys:justPressed('escape') then |
155 |
PauseView:new():activate() |
|
156 |
end
|
|
157 |
||
|
62
by Josh C
clean up some old code, put planet indicators in planet class |
158 |
the.bullets:collide(the.planets) |
|
68
by Josh C
shield |
159 |
the.bullets:collide(the.player) |
|
69
by Josh C
enemy shields and death |
160 |
the.bullets:collide(the.enemies) |
|
26
by Josh C
rocks! |
161 |
end, |
|
33
by Josh C
keep score, center mouse on start |
162 |
onEndFrame = function(self) |
|
39
by Josh C
some instructions at game over |
163 |
the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2 |
164 |
the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2 |
|
|
33
by Josh C
keep score, center mouse on start |
165 |
end, |
|
3
by Josh C
basecode main.lua |
166 |
draw = function (self, x, y) |
167 |
View.draw(self, x, y) |
|
|
38
by Josh C
remove fps counter |
168 |
--love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
|
|
37
by Josh C
extract updating score. update score again when you calc high score - |
169 |
end, |
|
3
by Josh C
basecode main.lua |
170 |
}
|
171 |
||
172 |
MenuScreen = View:extend { |
|
173 |
title = Text:new{text = "Press a key to start", font = 48, wordWrap = false}, |
|
174 |
--title = Tile:new{image = 'data/title.png', x = 0, y = 0},
|
|
175 |
onNew = function(self) |
|
176 |
self:add(self.title) |
|
177 |
self.title:centerAround(400, 200) |
|
178 |
end, |
|
179 |
onUpdate = function(self, elapsed) |
|
180 |
if the.keys:allJustPressed() then |
|
181 |
the.app.view = GameView:new() |
|
182 |
end
|
|
183 |
end
|
|
184 |
}
|
|
185 |
||
186 |
the.app = App:new { |
|
187 |
onRun = function (self) |
|
188 |
print('Version: ' .. VERSION) |
|
|
26
by Josh C
rocks! |
189 |
|
190 |
math.randomseed(os.time()) |
|
191 |
||
|
3
by Josh C
basecode main.lua |
192 |
self.view = GameView:new() |
|
43
by Josh C
try to make setting screen resolution more reliable |
193 |
|
|
3
by Josh C
basecode main.lua |
194 |
if DEBUG then |
195 |
self.console:watch('VERSION', 'VERSION') |
|
196 |
self.console:watch('updateTook', 'the.updateTook') |
|
|
19
by Josh C
move player around looping world |
197 |
self.console:watch('the.player.x', 'the.player.x') |
198 |
self.console:watch('the.player.y', 'the.player.y') |
|
199 |
self.console:watch('the.app.width', 'the.app.width') |
|
200 |
self.console:watch('the.app.height', 'the.app.height') |
|
|
35
by Josh C
fix double-removing sprites (and subsequent zombie mirror bullets). |
201 |
self.console:watch('num mirrors', '#the.mirrors.sprites') |
|
36
by Josh C
don't keep spawning rocks after death. |
202 |
self.console:watch('num rocks', '#the.rocks.sprites') |
|
46
by Josh C
bigger area, more planets |
203 |
self.console:watch('num planets', '#the.planets.sprites') |
|
80
by Josh C
respawn enemies |
204 |
self.console:watch('num enemies', 'the.enemies:count()') |
|
3
by Josh C
basecode main.lua |
205 |
--self.console:watch('drawTook', 'the.drawTook')
|
|
22
by Josh C
mirror (contains a bug where things in the corner aren't getting mirrored? |
206 |
|
207 |
-- back off that dark overlay a bit
|
|
208 |
self.console.fill.fill[4] = 75 |
|
|
3
by Josh C
basecode main.lua |
209 |
end
|
210 |
end, |
|
211 |
onUpdate = function (self, dt) |
|
|
46
by Josh C
bigger area, more planets |
212 |
if not (DEBUG and the.console.visible) then |
|
78
by Josh C
pause screen |
213 |
if the.keys:justPressed('return') and the.keys:pressed('alt') then |
214 |
love.graphics.toggleFullscreen() |
|
|
46
by Josh C
bigger area, more planets |
215 |
elseif the.keys:justPressed('f1') then |
216 |
local ss = love.graphics.newScreenshot() |
|
217 |
ss:encode('screenshot-' ..love.timer.getTime()..'.png') |
|
218 |
elseif the.keys:justPressed('f11') then |
|
|
44
by Josh C
toggle fullscreen with f11 or alt-enter |
219 |
love.graphics.toggleFullscreen() |
220 |
end
|
|
|
3
by Josh C
basecode main.lua |
221 |
end
|
222 |
end, |
|
223 |
update = function (self, dt) |
|
224 |
the.updateStart = love.timer.getMicroTime() |
|
225 |
App.update(self, dt) |
|
226 |
if the.updateStart then |
|
227 |
the.updateTook = love.timer.getMicroTime() - the.updateStart |
|
228 |
end
|
|
229 |
end
|
|
230 |
}
|
|
|
48
by Josh C
move fullscreen into love.run so it doesn't keep toggling on ctl-alt-R |
231 |
|
232 |
realRun = love.run |
|
233 |
function love.run() |
|
234 |
-- should fail silently if it can't go to fullscreen...
|
|
235 |
love.graphics.toggleFullscreen() |
|
236 |
||
237 |
realRun() |
|
238 |
end
|