diff --git a/assets/preload/data/introText.txt b/assets/preload/data/introText.txt
index 8e2a6ba89..d3e7391f4 100644
--- a/assets/preload/data/introText.txt
+++ b/assets/preload/data/introText.txt
@@ -39,3 +39,4 @@ pico funny--pico funny
updates each friday--on time every time
shoutouts to mason--for da homies
bonk--get in the discord call
+youtube search--DAnMLkteUHk
diff --git a/assets/week7/images/smokeLeft.png b/assets/week7/images/smokeLeft.png
new file mode 100644
index 000000000..d58777f11
Binary files /dev/null and b/assets/week7/images/smokeLeft.png differ
diff --git a/assets/week7/images/smokeLeft.xml b/assets/week7/images/smokeLeft.xml
new file mode 100644
index 000000000..b38fa759a
--- /dev/null
+++ b/assets/week7/images/smokeLeft.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/week7/images/smokeRight.png b/assets/week7/images/smokeRight.png
new file mode 100644
index 000000000..c4416e995
Binary files /dev/null and b/assets/week7/images/smokeRight.png differ
diff --git a/assets/week7/images/smokeRight.xml b/assets/week7/images/smokeRight.xml
new file mode 100644
index 000000000..9f33c7970
--- /dev/null
+++ b/assets/week7/images/smokeRight.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/week7/images/tankBuildings.png b/assets/week7/images/tankBuildings.png
new file mode 100644
index 000000000..1265e5882
Binary files /dev/null and b/assets/week7/images/tankBuildings.png differ
diff --git a/assets/week7/images/tankClouds.png b/assets/week7/images/tankClouds.png
new file mode 100644
index 000000000..85b7267d9
Binary files /dev/null and b/assets/week7/images/tankClouds.png differ
diff --git a/assets/week7/images/tankGround.png b/assets/week7/images/tankGround.png
new file mode 100644
index 000000000..6db8c409b
Binary files /dev/null and b/assets/week7/images/tankGround.png differ
diff --git a/assets/week7/images/tankMountains.png b/assets/week7/images/tankMountains.png
new file mode 100644
index 000000000..d120b23c6
Binary files /dev/null and b/assets/week7/images/tankMountains.png differ
diff --git a/assets/week7/images/tankRuins.png b/assets/week7/images/tankRuins.png
new file mode 100644
index 000000000..a7657dbfc
Binary files /dev/null and b/assets/week7/images/tankRuins.png differ
diff --git a/assets/week7/images/tankSky.png b/assets/week7/images/tankSky.png
new file mode 100644
index 000000000..4beebc55b
Binary files /dev/null and b/assets/week7/images/tankSky.png differ
diff --git a/assets/week7/images/tankWatchtower.png b/assets/week7/images/tankWatchtower.png
new file mode 100644
index 000000000..d317691bb
Binary files /dev/null and b/assets/week7/images/tankWatchtower.png differ
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 7d8190477..ffa3e1edb 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -174,272 +174,256 @@ class PlayState extends MusicBeatState
dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
}
- if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
+ switch (Song.song.toLowerCase())
{
- curStage = "spooky";
- halloweenLevel = true;
+ case 'spookeez' | 'monster' | 'south':
+ curStage = "spooky";
+ halloweenLevel = true;
- var hallowTex = Paths.getSparrowAtlas('halloween_bg');
+ var hallowTex = Paths.getSparrowAtlas('halloween_bg');
- halloweenBG = new FlxSprite(-200, -100);
- halloweenBG.frames = hallowTex;
- halloweenBG.animation.addByPrefix('idle', 'halloweem bg0');
- halloweenBG.animation.addByPrefix('lightning', 'halloweem bg lightning strike', 24, false);
- halloweenBG.animation.play('idle');
- halloweenBG.antialiasing = true;
- add(halloweenBG);
+ halloweenBG = new FlxSprite(-200, -100);
+ halloweenBG.frames = hallowTex;
+ halloweenBG.animation.addByPrefix('idle', 'halloweem bg0');
+ halloweenBG.animation.addByPrefix('lightning', 'halloweem bg lightning strike', 24, false);
+ halloweenBG.animation.play('idle');
+ halloweenBG.antialiasing = true;
+ add(halloweenBG);
- isHalloween = true;
- }
- else if (SONG.song.toLowerCase() == 'pico' || SONG.song.toLowerCase() == 'blammed' || SONG.song.toLowerCase() == 'philly')
- {
- curStage = 'philly';
+ isHalloween = true;
+ case 'pico' | 'blammed' | 'philly':
+ curStage = 'philly';
- var bg:FlxSprite = new FlxSprite(-100).loadGraphic(Paths.image('philly/sky'));
- bg.scrollFactor.set(0.1, 0.1);
- add(bg);
+ var bg:FlxSprite = new FlxSprite(-100).loadGraphic(Paths.image('philly/sky'));
+ bg.scrollFactor.set(0.1, 0.1);
+ add(bg);
- var city:FlxSprite = new FlxSprite(-10).loadGraphic(Paths.image('philly/city'));
- city.scrollFactor.set(0.3, 0.3);
- city.setGraphicSize(Std.int(city.width * 0.85));
- city.updateHitbox();
- add(city);
+ var city:FlxSprite = new FlxSprite(-10).loadGraphic(Paths.image('philly/city'));
+ city.scrollFactor.set(0.3, 0.3);
+ city.setGraphicSize(Std.int(city.width * 0.85));
+ city.updateHitbox();
+ add(city);
- phillyCityLights = new FlxTypedGroup();
- add(phillyCityLights);
+ phillyCityLights = new FlxTypedGroup();
+ add(phillyCityLights);
- for (i in 0...5)
- {
- var light:FlxSprite = new FlxSprite(city.x).loadGraphic(Paths.image('philly/win' + i));
- light.scrollFactor.set(0.3, 0.3);
- light.visible = false;
- light.setGraphicSize(Std.int(light.width * 0.85));
- light.updateHitbox();
- light.antialiasing = true;
- phillyCityLights.add(light);
- }
+ for (i in 0...5)
+ {
+ var light:FlxSprite = new FlxSprite(city.x).loadGraphic(Paths.image('philly/win' + i));
+ light.scrollFactor.set(0.3, 0.3);
+ light.visible = false;
+ light.setGraphicSize(Std.int(light.width * 0.85));
+ light.updateHitbox();
+ light.antialiasing = true;
+ phillyCityLights.add(light);
+ }
- var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(Paths.image('philly/behindTrain'));
- add(streetBehind);
+ var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(Paths.image('philly/behindTrain'));
+ add(streetBehind);
- phillyTrain = new FlxSprite(2000, 360).loadGraphic(Paths.image('philly/train'));
- add(phillyTrain);
+ phillyTrain = new FlxSprite(2000, 360).loadGraphic(Paths.image('philly/train'));
+ add(phillyTrain);
- trainSound = new FlxSound().loadEmbedded(Paths.sound('train_passes'));
- FlxG.sound.list.add(trainSound);
+ trainSound = new FlxSound().loadEmbedded(Paths.sound('train_passes'));
+ FlxG.sound.list.add(trainSound);
- // var cityLights:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.win0.png);
+ // var cityLights:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.win0.png);
- var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(Paths.image('philly/street'));
- add(street);
- }
- else if (SONG.song.toLowerCase() == 'milf' || SONG.song.toLowerCase() == 'satin-panties' || SONG.song.toLowerCase() == 'high')
- {
- curStage = 'limo';
- defaultCamZoom = 0.90;
+ var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(Paths.image('philly/street'));
+ add(street);
+ case "milf" | 'satin-panties' | 'high':
+ curStage = 'limo';
+ defaultCamZoom = 0.90;
- var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(Paths.image('limo/limoSunset'));
- skyBG.scrollFactor.set(0.1, 0.1);
- add(skyBG);
+ var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(Paths.image('limo/limoSunset'));
+ skyBG.scrollFactor.set(0.1, 0.1);
+ add(skyBG);
- var bgLimo:FlxSprite = new FlxSprite(-200, 480);
- bgLimo.frames = Paths.getSparrowAtlas('limo/bgLimo');
- bgLimo.animation.addByPrefix('drive', "background limo pink", 24);
- bgLimo.animation.play('drive');
- bgLimo.scrollFactor.set(0.4, 0.4);
- add(bgLimo);
+ var bgLimo:FlxSprite = new FlxSprite(-200, 480);
+ bgLimo.frames = Paths.getSparrowAtlas('limo/bgLimo');
+ bgLimo.animation.addByPrefix('drive', "background limo pink", 24);
+ bgLimo.animation.play('drive');
+ bgLimo.scrollFactor.set(0.4, 0.4);
+ add(bgLimo);
- grpLimoDancers = new FlxTypedGroup();
- add(grpLimoDancers);
+ grpLimoDancers = new FlxTypedGroup();
+ add(grpLimoDancers);
- for (i in 0...5)
- {
- var dancer:BackgroundDancer = new BackgroundDancer((370 * i) + 130, bgLimo.y - 400);
- dancer.scrollFactor.set(0.4, 0.4);
- grpLimoDancers.add(dancer);
- }
+ for (i in 0...5)
+ {
+ var dancer:BackgroundDancer = new BackgroundDancer((370 * i) + 130, bgLimo.y - 400);
+ dancer.scrollFactor.set(0.4, 0.4);
+ grpLimoDancers.add(dancer);
+ }
- var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(Paths.image('limo/limoOverlay'));
- overlayShit.alpha = 0.5;
- // add(overlayShit);
+ var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(Paths.image('limo/limoOverlay'));
+ overlayShit.alpha = 0.5;
+ // add(overlayShit);
+ // var shaderBullshit = new BlendModeEffect(new OverlayShader(), FlxColor.RED);
+ // FlxG.camera.setFilters([new ShaderFilter(cast shaderBullshit.shader)]);
+ // overlayShit.shader = shaderBullshit;
- // var shaderBullshit = new BlendModeEffect(new OverlayShader(), FlxColor.RED);
+ limo = new FlxSprite(-120, 550);
+ limo.frames = Paths.getSparrowAtlas('limo/limoDrive');
+ limo.animation.addByPrefix('drive', "Limo stage", 24);
+ limo.animation.play('drive');
+ limo.antialiasing = true;
- // FlxG.camera.setFilters([new ShaderFilter(cast shaderBullshit.shader)]);
-
- // overlayShit.shader = shaderBullshit;
-
- var limoTex = Paths.getSparrowAtlas('limo/limoDrive');
-
- limo = new FlxSprite(-120, 550);
- limo.frames = limoTex;
- limo.animation.addByPrefix('drive', "Limo stage", 24);
- limo.animation.play('drive');
- limo.antialiasing = true;
-
- fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol'));
+ fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol'));
// add(limo);
- }
- else if (SONG.song.toLowerCase() == 'cocoa' || SONG.song.toLowerCase() == 'eggnog')
- {
- curStage = 'mall';
+ case "cocoa" | 'eggnog':
+ curStage = 'mall';
- defaultCamZoom = 0.80;
+ defaultCamZoom = 0.80;
- var bg:FlxSprite = new FlxSprite(-1000, -500).loadGraphic(Paths.image('christmas/bgWalls'));
- bg.antialiasing = true;
- bg.scrollFactor.set(0.2, 0.2);
- bg.active = false;
- bg.setGraphicSize(Std.int(bg.width * 0.8));
- bg.updateHitbox();
- add(bg);
+ var bg:FlxSprite = new FlxSprite(-1000, -500).loadGraphic(Paths.image('christmas/bgWalls'));
+ bg.antialiasing = true;
+ bg.scrollFactor.set(0.2, 0.2);
+ bg.active = false;
+ bg.setGraphicSize(Std.int(bg.width * 0.8));
+ bg.updateHitbox();
+ add(bg);
- upperBoppers = new FlxSprite(-240, -90);
- upperBoppers.frames = Paths.getSparrowAtlas('christmas/upperBop');
- upperBoppers.animation.addByPrefix('bop', "Upper Crowd Bob", 24, false);
- upperBoppers.antialiasing = true;
- upperBoppers.scrollFactor.set(0.33, 0.33);
- upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.85));
- upperBoppers.updateHitbox();
- add(upperBoppers);
+ upperBoppers = new FlxSprite(-240, -90);
+ upperBoppers.frames = Paths.getSparrowAtlas('christmas/upperBop');
+ upperBoppers.animation.addByPrefix('bop', "Upper Crowd Bob", 24, false);
+ upperBoppers.antialiasing = true;
+ upperBoppers.scrollFactor.set(0.33, 0.33);
+ upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.85));
+ upperBoppers.updateHitbox();
+ add(upperBoppers);
- var bgEscalator:FlxSprite = new FlxSprite(-1100, -600).loadGraphic(Paths.image('christmas/bgEscalator'));
- bgEscalator.antialiasing = true;
- bgEscalator.scrollFactor.set(0.3, 0.3);
- bgEscalator.active = false;
- bgEscalator.setGraphicSize(Std.int(bgEscalator.width * 0.9));
- bgEscalator.updateHitbox();
- add(bgEscalator);
+ var bgEscalator:FlxSprite = new FlxSprite(-1100, -600).loadGraphic(Paths.image('christmas/bgEscalator'));
+ bgEscalator.antialiasing = true;
+ bgEscalator.scrollFactor.set(0.3, 0.3);
+ bgEscalator.active = false;
+ bgEscalator.setGraphicSize(Std.int(bgEscalator.width * 0.9));
+ bgEscalator.updateHitbox();
+ add(bgEscalator);
- var tree:FlxSprite = new FlxSprite(370, -250).loadGraphic(Paths.image('christmas/christmasTree'));
- tree.antialiasing = true;
- tree.scrollFactor.set(0.40, 0.40);
- add(tree);
+ var tree:FlxSprite = new FlxSprite(370, -250).loadGraphic(Paths.image('christmas/christmasTree'));
+ tree.antialiasing = true;
+ tree.scrollFactor.set(0.40, 0.40);
+ add(tree);
- bottomBoppers = new FlxSprite(-300, 140);
- bottomBoppers.frames = Paths.getSparrowAtlas('christmas/bottomBop');
- bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false);
- bottomBoppers.antialiasing = true;
- bottomBoppers.scrollFactor.set(0.9, 0.9);
- bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 1));
- bottomBoppers.updateHitbox();
- add(bottomBoppers);
+ bottomBoppers = new FlxSprite(-300, 140);
+ bottomBoppers.frames = Paths.getSparrowAtlas('christmas/bottomBop');
+ bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false);
+ bottomBoppers.antialiasing = true;
+ bottomBoppers.scrollFactor.set(0.9, 0.9);
+ bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 1));
+ bottomBoppers.updateHitbox();
+ add(bottomBoppers);
- var fgSnow:FlxSprite = new FlxSprite(-600, 700).loadGraphic(Paths.image('christmas/fgSnow'));
- fgSnow.active = false;
- fgSnow.antialiasing = true;
- add(fgSnow);
+ var fgSnow:FlxSprite = new FlxSprite(-600, 700).loadGraphic(Paths.image('christmas/fgSnow'));
+ fgSnow.active = false;
+ fgSnow.antialiasing = true;
+ add(fgSnow);
- santa = new FlxSprite(-840, 150);
- santa.frames = Paths.getSparrowAtlas('christmas/santa');
- santa.animation.addByPrefix('idle', 'santa idle in fear', 24, false);
- santa.antialiasing = true;
- add(santa);
- }
- else if (SONG.song.toLowerCase() == 'winter-horrorland')
- {
- curStage = 'mallEvil';
- var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG'));
- bg.antialiasing = true;
- bg.scrollFactor.set(0.2, 0.2);
- bg.active = false;
- bg.setGraphicSize(Std.int(bg.width * 0.8));
- bg.updateHitbox();
- add(bg);
+ santa = new FlxSprite(-840, 150);
+ santa.frames = Paths.getSparrowAtlas('christmas/santa');
+ santa.animation.addByPrefix('idle', 'santa idle in fear', 24, false);
+ santa.antialiasing = true;
+ add(santa);
+ case 'winter-horrorland':
+ curStage = 'mallEvil';
+ var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG'));
+ bg.antialiasing = true;
+ bg.scrollFactor.set(0.2, 0.2);
+ bg.active = false;
+ bg.setGraphicSize(Std.int(bg.width * 0.8));
+ bg.updateHitbox();
+ add(bg);
- var evilTree:FlxSprite = new FlxSprite(300, -300).loadGraphic(Paths.image('christmas/evilTree'));
- evilTree.antialiasing = true;
- evilTree.scrollFactor.set(0.2, 0.2);
- add(evilTree);
+ var evilTree:FlxSprite = new FlxSprite(300, -300).loadGraphic(Paths.image('christmas/evilTree'));
+ evilTree.antialiasing = true;
+ evilTree.scrollFactor.set(0.2, 0.2);
+ add(evilTree);
- var evilSnow:FlxSprite = new FlxSprite(-200, 700).loadGraphic(Paths.image("christmas/evilSnow"));
- evilSnow.antialiasing = true;
- add(evilSnow);
- }
- else if (SONG.song.toLowerCase() == 'senpai' || SONG.song.toLowerCase() == 'roses')
- {
- curStage = 'school';
+ var evilSnow:FlxSprite = new FlxSprite(-200, 700).loadGraphic(Paths.image("christmas/evilSnow"));
+ evilSnow.antialiasing = true;
+ add(evilSnow);
+ case 'senpai' | 'roses':
+ curStage = 'school';
- // defaultCamZoom = 0.9;
+ // defaultCamZoom = 0.9;
- var bgSky = new FlxSprite().loadGraphic(Paths.image('weeb/weebSky'));
- bgSky.scrollFactor.set(0.1, 0.1);
- add(bgSky);
+ var bgSky = new FlxSprite().loadGraphic(Paths.image('weeb/weebSky'));
+ bgSky.scrollFactor.set(0.1, 0.1);
+ add(bgSky);
- var repositionShit = -200;
+ var repositionShit = -200;
- var bgSchool:FlxSprite = new FlxSprite(repositionShit, 0).loadGraphic(Paths.image('weeb/weebSchool'));
- bgSchool.scrollFactor.set(0.6, 0.90);
- add(bgSchool);
+ var bgSchool:FlxSprite = new FlxSprite(repositionShit, 0).loadGraphic(Paths.image('weeb/weebSchool'));
+ bgSchool.scrollFactor.set(0.6, 0.90);
+ add(bgSchool);
- var bgStreet:FlxSprite = new FlxSprite(repositionShit).loadGraphic(Paths.image('weeb/weebStreet'));
- bgStreet.scrollFactor.set(0.95, 0.95);
- add(bgStreet);
+ var bgStreet:FlxSprite = new FlxSprite(repositionShit).loadGraphic(Paths.image('weeb/weebStreet'));
+ bgStreet.scrollFactor.set(0.95, 0.95);
+ add(bgStreet);
- var fgTrees:FlxSprite = new FlxSprite(repositionShit + 170, 130).loadGraphic(Paths.image('weeb/weebTreesBack'));
- fgTrees.scrollFactor.set(0.9, 0.9);
- add(fgTrees);
+ var fgTrees:FlxSprite = new FlxSprite(repositionShit + 170, 130).loadGraphic(Paths.image('weeb/weebTreesBack'));
+ fgTrees.scrollFactor.set(0.9, 0.9);
+ add(fgTrees);
- var bgTrees:FlxSprite = new FlxSprite(repositionShit - 380, -800);
- var treetex = Paths.getPackerAtlas('weeb/weebTrees');
- bgTrees.frames = treetex;
- bgTrees.animation.add('treeLoop', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18], 12);
- bgTrees.animation.play('treeLoop');
- bgTrees.scrollFactor.set(0.85, 0.85);
- add(bgTrees);
+ var bgTrees:FlxSprite = new FlxSprite(repositionShit - 380, -800);
+ var treetex = Paths.getPackerAtlas('weeb/weebTrees');
+ bgTrees.frames = treetex;
+ bgTrees.animation.add('treeLoop', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18], 12);
+ bgTrees.animation.play('treeLoop');
+ bgTrees.scrollFactor.set(0.85, 0.85);
+ add(bgTrees);
- var treeLeaves:FlxSprite = new FlxSprite(repositionShit, -40);
- treeLeaves.frames = Paths.getSparrowAtlas('weeb/petals');
- treeLeaves.animation.addByPrefix('leaves', 'PETALS ALL', 24, true);
- treeLeaves.animation.play('leaves');
- treeLeaves.scrollFactor.set(0.85, 0.85);
- add(treeLeaves);
+ var treeLeaves:FlxSprite = new FlxSprite(repositionShit, -40);
+ treeLeaves.frames = Paths.getSparrowAtlas('weeb/petals');
+ treeLeaves.animation.addByPrefix('leaves', 'PETALS ALL', 24, true);
+ treeLeaves.animation.play('leaves');
+ treeLeaves.scrollFactor.set(0.85, 0.85);
+ add(treeLeaves);
- var widShit = Std.int(bgSky.width * 6);
+ var widShit = Std.int(bgSky.width * 6);
- bgSky.setGraphicSize(widShit);
- bgSchool.setGraphicSize(widShit);
- bgStreet.setGraphicSize(widShit);
- bgTrees.setGraphicSize(Std.int(widShit * 1.4));
- fgTrees.setGraphicSize(Std.int(widShit * 0.8));
- treeLeaves.setGraphicSize(widShit);
+ bgSky.setGraphicSize(widShit);
+ bgSchool.setGraphicSize(widShit);
+ bgStreet.setGraphicSize(widShit);
+ bgTrees.setGraphicSize(Std.int(widShit * 1.4));
+ fgTrees.setGraphicSize(Std.int(widShit * 0.8));
+ treeLeaves.setGraphicSize(widShit);
- fgTrees.updateHitbox();
- bgSky.updateHitbox();
- bgSchool.updateHitbox();
- bgStreet.updateHitbox();
- bgTrees.updateHitbox();
- treeLeaves.updateHitbox();
+ fgTrees.updateHitbox();
+ bgSky.updateHitbox();
+ bgSchool.updateHitbox();
+ bgStreet.updateHitbox();
+ bgTrees.updateHitbox();
+ treeLeaves.updateHitbox();
- bgGirls = new BackgroundGirls(-100, 190);
- bgGirls.scrollFactor.set(0.9, 0.9);
+ bgGirls = new BackgroundGirls(-100, 190);
+ bgGirls.scrollFactor.set(0.9, 0.9);
- if (SONG.song.toLowerCase() == 'roses')
- {
- bgGirls.getScared();
- }
+ if (SONG.song.toLowerCase() == 'roses')
+ {
+ bgGirls.getScared();
+ }
- bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom));
- bgGirls.updateHitbox();
- add(bgGirls);
- }
- else if (SONG.song.toLowerCase() == 'thorns')
- {
- curStage = 'schoolEvil';
+ bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom));
+ bgGirls.updateHitbox();
+ add(bgGirls);
+ case 'thorns':
+ curStage = 'schoolEvil';
- var waveEffectBG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 3, 2);
- var waveEffectFG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 5, 2);
+ var waveEffectBG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 3, 2);
+ var waveEffectFG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 5, 2);
- var posX = 400;
- var posY = 200;
+ var posX = 400;
+ var posY = 200;
- var bg:FlxSprite = new FlxSprite(posX, posY);
- bg.frames = Paths.getSparrowAtlas('weeb/animatedEvilSchool');
- bg.animation.addByPrefix('idle', 'background 2', 24);
- bg.animation.play('idle');
- bg.scrollFactor.set(0.8, 0.9);
- bg.scale.set(6, 6);
- add(bg);
+ var bg:FlxSprite = new FlxSprite(posX, posY);
+ bg.frames = Paths.getSparrowAtlas('weeb/animatedEvilSchool');
+ bg.animation.addByPrefix('idle', 'background 2', 24);
+ bg.animation.play('idle');
+ bg.scrollFactor.set(0.8, 0.9);
+ bg.scale.set(6, 6);
+ add(bg);
/*
var bg:FlxSprite = new FlxSprite(posX, posY).loadGraphic(Paths.image('weeb/evilSchoolBG'));
@@ -484,33 +468,32 @@ class PlayState extends MusicBeatState
add(waveSprite);
add(waveSpriteFG);
*/
- }
- else
- {
- defaultCamZoom = 0.9;
- curStage = 'stage';
- var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback'));
- bg.antialiasing = true;
- bg.scrollFactor.set(0.9, 0.9);
- bg.active = false;
- add(bg);
- var stageFront:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront'));
- stageFront.setGraphicSize(Std.int(stageFront.width * 1.1));
- stageFront.updateHitbox();
- stageFront.antialiasing = true;
- stageFront.scrollFactor.set(0.9, 0.9);
- stageFront.active = false;
- add(stageFront);
+ default:
+ defaultCamZoom = 0.9;
+ curStage = 'stage';
+ var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback'));
+ bg.antialiasing = true;
+ bg.scrollFactor.set(0.9, 0.9);
+ bg.active = false;
+ add(bg);
- var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains'));
- stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9));
- stageCurtains.updateHitbox();
- stageCurtains.antialiasing = true;
- stageCurtains.scrollFactor.set(1.3, 1.3);
- stageCurtains.active = false;
+ var stageFront:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront'));
+ stageFront.setGraphicSize(Std.int(stageFront.width * 1.1));
+ stageFront.updateHitbox();
+ stageFront.antialiasing = true;
+ stageFront.scrollFactor.set(0.9, 0.9);
+ stageFront.active = false;
+ add(stageFront);
- add(stageCurtains);
+ var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains'));
+ stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9));
+ stageCurtains.updateHitbox();
+ stageCurtains.antialiasing = true;
+ stageCurtains.scrollFactor.set(1.3, 1.3);
+ stageCurtains.active = false;
+
+ add(stageCurtains);
}
var gfVersion:String = 'gf';