Skip to content
This repository was archived by the owner on Oct 5, 2021. It is now read-only.

Commit b500a67

Browse files
MagnusStromMagnusStrom
committed
Aligned charting menu stages to correct libraries
1 parent d3dc7c0 commit b500a67

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎source/ChartingState.hx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class ChartingState extends MusicBeatState
120120
{
121121
curStage = 'spooky';
122122

123-
var hallowTex = Paths.getSparrowAtlas('halloween_bg');
123+
var hallowTex = Paths.getSparrowAtlas('halloween_bg', 'week2');
124124

125125
halloweenBG = new FlxSprite(-200, -100);
126126
halloweenBG.frames = hallowTex;
@@ -135,11 +135,11 @@ class ChartingState extends MusicBeatState
135135
{
136136
curStage = 'philly';
137137

138-
var bg:FlxSprite = new FlxSprite(-100).loadGraphic(Paths.image('philly/sky'));
138+
var bg:FlxSprite = new FlxSprite(-100).loadGraphic(Paths.image('philly/sky', 'week3'));
139139
add(bg);
140140
bg.scrollFactor.set(0, 0);
141141

142-
var city:FlxSprite = new FlxSprite(-10).loadGraphic(Paths.image('philly/city'));
142+
var city:FlxSprite = new FlxSprite(-10).loadGraphic(Paths.image('philly/city', 'week3'));
143143
city.setGraphicSize(Std.int(city.width * 0.85));
144144
city.updateHitbox();
145145
add(city);
@@ -150,7 +150,7 @@ class ChartingState extends MusicBeatState
150150

151151
for (i in 0...5)
152152
{
153-
var light:FlxSprite = new FlxSprite(city.x).loadGraphic(Paths.image('philly/win' + i));
153+
var light:FlxSprite = new FlxSprite(city.x).loadGraphic(Paths.image('philly/win' + i, 'week3'));
154154
light.visible = false;
155155
light.setGraphicSize(Std.int(light.width * 0.85));
156156
light.updateHitbox();
@@ -159,15 +159,15 @@ class ChartingState extends MusicBeatState
159159
phillyCityLights.add(light);
160160
}
161161

162-
var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(Paths.image('philly/behindTrain'));
162+
var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(Paths.image('philly/behindTrain', 'week3'));
163163
add(streetBehind);
164164
streetBehind.scrollFactor.set(0, 0);
165165

166166

167167

168168
// var cityLights:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.win0.png);
169169

170-
var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(Paths.image('philly/street'));
170+
var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(Paths.image('philly/street', 'week3'));
171171
add(street);
172172
street.scrollFactor.set(0, 0);
173173
}
@@ -176,12 +176,12 @@ class ChartingState extends MusicBeatState
176176
curStage = 'limo';
177177
defaultCamZoom = 0.90;
178178

179-
var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(Paths.image('limo/limoSunset'));
179+
var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(Paths.image('limo/limoSunset', 'week4'));
180180
add(skyBG);
181181
skyBG.scrollFactor.set(0, 0);
182182

183183
var bgLimo:FlxSprite = new FlxSprite(-200, 480);
184-
bgLimo.frames = Paths.getSparrowAtlas('limo/bgLimo');
184+
bgLimo.frames = Paths.getSparrowAtlas('limo/bgLimo', 'week4');
185185
bgLimo.animation.addByPrefix('drive', "background limo pink", 24);
186186
bgLimo.animation.play('drive');
187187
add(bgLimo);
@@ -197,7 +197,7 @@ class ChartingState extends MusicBeatState
197197
dancer.scrollFactor.set(0, 0);
198198
}
199199

200-
var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(Paths.image('limo/limoOverlay'));
200+
var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(Paths.image('limo/limoOverlay', 'week4'));
201201
overlayShit.alpha = 0.5;
202202
overlayShit.scrollFactor.set(0, 0);
203203
// add(overlayShit);
@@ -208,7 +208,7 @@ class ChartingState extends MusicBeatState
208208

209209
// overlayShit.shader = shaderBullshit;
210210

211-
var limoTex = Paths.getSparrowAtlas('limo/limoDrive');
211+
var limoTex = Paths.getSparrowAtlas('limo/limoDrive', 'week4');
212212

213213
var limo = new FlxSprite(-120, 550);
214214
limo.frames = limoTex;
@@ -217,7 +217,7 @@ class ChartingState extends MusicBeatState
217217
limo.antialiasing = true;
218218
limo.scrollFactor.set(0, 0);
219219

220-
var fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol'));
220+
var fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol', 'week4'));
221221
// add(limo);
222222
}
223223
case 4:
@@ -226,7 +226,7 @@ class ChartingState extends MusicBeatState
226226

227227
defaultCamZoom = 0.80;
228228

229-
var bg:FlxSprite = new FlxSprite(-1000, -500).loadGraphic(Paths.image('christmas/bgWalls'));
229+
var bg:FlxSprite = new FlxSprite(-1000, -500).loadGraphic(Paths.image('christmas/bgWalls', 'week5'));
230230
bg.antialiasing = true;
231231
bg.active = false;
232232
bg.setGraphicSize(Std.int(bg.width * 0.8));
@@ -235,44 +235,44 @@ class ChartingState extends MusicBeatState
235235
bg.scrollFactor.set(0, 0);
236236

237237
var upperBoppers = new FlxSprite(-240, -90);
238-
upperBoppers.frames = Paths.getSparrowAtlas('christmas/upperBop');
238+
upperBoppers.frames = Paths.getSparrowAtlas('christmas/upperBop', 'week5');
239239
upperBoppers.animation.addByPrefix('bop', "Upper Crowd Bob", 24, false);
240240
upperBoppers.antialiasing = true;
241241
upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.85));
242242
upperBoppers.updateHitbox();
243243
add(upperBoppers);
244244
upperBoppers.scrollFactor.set(0, 0);
245245

246-
var bgEscalator:FlxSprite = new FlxSprite(-1100, -600).loadGraphic(Paths.image('christmas/bgEscalator'));
246+
var bgEscalator:FlxSprite = new FlxSprite(-1100, -600).loadGraphic(Paths.image('christmas/bgEscalator', 'week5'));
247247
bgEscalator.antialiasing = true;
248248
bgEscalator.active = false;
249249
bgEscalator.setGraphicSize(Std.int(bgEscalator.width * 0.9));
250250
bgEscalator.updateHitbox();
251251
add(bgEscalator);
252252
bgEscalator.scrollFactor.set(0, 0);
253253

254-
var tree:FlxSprite = new FlxSprite(370, -250).loadGraphic(Paths.image('christmas/christmasTree'));
254+
var tree:FlxSprite = new FlxSprite(370, -250).loadGraphic(Paths.image('christmas/christmasTree', 'week5'));
255255
tree.antialiasing = true;
256256
add(tree);
257257
tree.scrollFactor.set(0, 0);
258258

259259
var bottomBoppers = new FlxSprite(-300, 140);
260-
bottomBoppers.frames = Paths.getSparrowAtlas('christmas/bottomBop');
260+
bottomBoppers.frames = Paths.getSparrowAtlas('christmas/bottomBop', 'week5');
261261
bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false);
262262
bottomBoppers.antialiasing = true;
263263
bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 1));
264264
bottomBoppers.updateHitbox();
265265
add(bottomBoppers);
266266
bottomBoppers.scrollFactor.set(0, 0);
267267

268-
var fgSnow:FlxSprite = new FlxSprite(-600, 700).loadGraphic(Paths.image('christmas/fgSnow'));
268+
var fgSnow:FlxSprite = new FlxSprite(-600, 700).loadGraphic(Paths.image('christmas/fgSnow', 'week5'));
269269
fgSnow.active = false;
270270
fgSnow.antialiasing = true;
271271
add(fgSnow);
272272
fgSnow.scrollFactor.set(0, 0);
273273

274274
var santa = new FlxSprite(-840, 150);
275-
santa.frames = Paths.getSparrowAtlas('christmas/santa');
275+
santa.frames = Paths.getSparrowAtlas('christmas/santa', 'week5');
276276
santa.animation.addByPrefix('idle', 'santa idle in fear', 24, false);
277277
santa.antialiasing = true;
278278
add(santa);
@@ -281,7 +281,7 @@ class ChartingState extends MusicBeatState
281281
case 5:
282282
{
283283
curStage = 'mallEvil';
284-
var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG'));
284+
var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG', 'week5'));
285285
bg.antialiasing = true;
286286
bg.active = false;
287287
bg.setGraphicSize(Std.int(bg.width * 0.8));
@@ -290,12 +290,12 @@ class ChartingState extends MusicBeatState
290290
bg.scrollFactor.set(0, 0);
291291

292292

293-
var evilTree:FlxSprite = new FlxSprite(300, -300).loadGraphic(Paths.image('christmas/evilTree'));
293+
var evilTree:FlxSprite = new FlxSprite(300, -300).loadGraphic(Paths.image('christmas/evilTree', 'week5'));
294294
evilTree.antialiasing = true;
295295
add(evilTree);
296296
evilTree.scrollFactor.set(0, 0);
297297

298-
var evilSnow:FlxSprite = new FlxSprite(-200, 700).loadGraphic(Paths.image("christmas/evilSnow"));
298+
var evilSnow:FlxSprite = new FlxSprite(-200, 700).loadGraphic(Paths.image("christmas/evilSnow", 'week5'));
299299
evilSnow.antialiasing = true;
300300
add(evilSnow);
301301
evilSnow.scrollFactor.set(0, 0);
@@ -390,21 +390,21 @@ class ChartingState extends MusicBeatState
390390
{
391391
{
392392
curStage = 'stage';
393-
var bg = new FlxSprite(-600, -400).loadGraphic(Paths.image('stageback'));
393+
var bg = new FlxSprite(-600, -400).loadGraphic(Paths.image('stageback', 'shared'));
394394
bg.antialiasing = true;
395395
bg.active = false;
396396
add(bg);
397397
bg.scrollFactor.set(0, 0);
398398

399-
var stageFront = new FlxSprite(-650, 400).loadGraphic(Paths.image('stagefront'));
399+
var stageFront = new FlxSprite(-650, 400).loadGraphic(Paths.image('stagefront', 'shared'));
400400
stageFront.setGraphicSize(Std.int(stageFront.width * 1.1));
401401
stageFront.updateHitbox();
402402
stageFront.antialiasing = true;
403403
stageFront.active = false;
404404
add(stageFront);
405405
stageFront.scrollFactor.set(0, 0);
406406

407-
var stageCurtains = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains'));
407+
var stageCurtains = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains', 'shared'));
408408
stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9));
409409
stageCurtains.updateHitbox();
410410
stageCurtains.antialiasing = true;

0 commit comments

Comments
 (0)