New Progression

4zy1 · Sep 8, 2022 · bbb7414 · bbb7414
1 parent 643bfde
commit bbb7414
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 76 deletions.
diff --git a/assets/preload/characters/leaker1.json b/assets/preload/characters/leaker1.json
@@ -91,7 +91,7 @@
 	],
 	"dataType": "JSON",
 	"no_antialiasing": false,
-	"image": "wcharacters/leakers/LEAKER 1",
+	"image": "characters/leakers/LEAKER 1",
 	"position": [
 		0,
 		370

diff --git a/assets/preload/data/sunsets/script.hx b/assets/preload/data/sunsets/script.hx
diff --git a/assets/videos/BadEnding.mp4 b/assets/videos/BadEnding.mp4
diff --git a/assets/videos/good ending oh no.mp4 b/assets/videos/good ending oh no.mp4
diff --git a/source/states/game/CutsceneState.hx b/source/states/game/CutsceneState.hx
@@ -78,6 +78,9 @@ class CutsceneState extends MusicBeatState // PlayState is alreadly laggy enough
 				case 'unknown suffering':
 					video = "TransformUN";
 					skippable = Progression.beatMainWeek;
+				case 'versiculus iratus':
+					video = "good ending oh no";
+					skippable = Progression.goodEnding;
 				case 'dook':
 					video = "LIL DROPTOP - DOOK";
 					skippable = false;

diff --git a/source/states/game/PlayState.hx b/source/states/game/PlayState.hx
@@ -1252,7 +1252,10 @@ class PlayState extends MusicBeatState
 				{
 					case 'wistfulness':
 						fadeIn(1);
-
+					case 'sunsets':
+						fadeIn(1);
+					case 'lastday':
+						fadeIn(1.5);
 					case 'hellhole':
 						fadeIn(0.6);
 
@@ -3583,6 +3586,10 @@ class PlayState extends MusicBeatState
 								Progression.beatMainWeek = true;
 
 								Progression.save();
+							case 'sunsets':
+								storyPlaylist[storyPlaylist.length] = 'versiculus-iratus';
+							case 'last-day' | 'last day':
+								storyPlaylist[storyPlaylist.length] = 'hellhole';
 						}
 					}
 				}
@@ -3617,15 +3624,13 @@ class PlayState extends MusicBeatState
 
 					if (WeekData.getWeekFileName() == 'Week Suicide')
 					{
-						switch (Paths.formatToSongPath(SONG.song))
+						switch (Paths.formatToSongPath(SONG.song).toLowerCase())
 						{
-							case 'sunsets':
+							case 'versiculus iratus' | 'versiculus-iratus':
 								Progression.goodEnding = true;
 
-							case 'last-day':
-								Progression.badEnding = true;
-
 							case 'hellhole':
+								Progression.badEnding = true;
 								Progression.beatHell = true;
 						}
 

diff --git a/source/states/menus/FreeplayState.hx b/source/states/menus/FreeplayState.hx
@@ -102,72 +102,7 @@ class FreeplayState extends MusicBeatState
 
 	override function create()
 	{
-		keyCombos = [
-			[FlxKey.SIX, FlxKey.SIX, FlxKey.SIX] => function()
-			{
-				selectedSomethin = true;
-
-				songs.remove(songs[curSelected]);
-				songs.insert(curSelected, new SongMetadata("Hellhole", 0, "icon-hellholemickey", FlxColor.fromRGB(42, 46, 40)));
-
-				grpSongs.remove(grpSongs.members[curSelected]);
-
-				iconArray[curSelected].visible = false;
-				iconArray.remove(iconArray[curSelected]);
-
-				var songText:Alphabet = new Alphabet(0, (70 * curSelected) + 30, songs[curSelected].songName, true, false);
-				songText.isMenuItem = true;
-				songText.instaLerp = true;
-				songText.targetY = 0; // yeah idk either
-				grpSongs.insert(curSelected, songText);
-
-				for (letter in songText.lettersArray)
-				{
-					FlxFlicker.flicker(letter, 1.6, 0.06, false);
-				}
-
-				if (songText.width > 980)
-				{
-					var textScale:Float = 980 / songText.width;
-					songText.scale.x = textScale;
-					for (letter in songText.lettersArray)
-					{
-						letter.x *= textScale;
-						letter.offset.x *= textScale;
-					}
-				}
-
-				Paths.currentModDirectory = songs[curSelected].folder;
-				var icon:HealthIcon = new HealthIcon(songs[curSelected].songCharacter);
-				icon.sprTracker = songText;
-
-				iconArray.insert(curSelected, icon);
-				add(icon);
-
-				FlxFlicker.flicker(icon, 1.6, 0.06, false);
-
-				// Lib.application.window.title = "66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666";
-
-				FlxG.sound.music.volume = 0;
-				stopmusic = true;
-				FlxG.camera.flash(FlxColor.BLACK, 1.2);
-				FlxG.sound.play(Paths.sound('hellholeSFX'));
-
-				remove(daStatic);
-				insert(members.indexOf(icon) + 1, daStatic);
-
-				FlxTween.tween(daStatic, {alpha: 0.5}, 1.4);
-
-				FlxTween.tween(FlxG.camera, {zoom: 1.7}, 1.4, {ease: FlxEase.circIn});
-
-				new FlxTimer().start(1.4, function(tmr:FlxTimer)
-				{
-					selectSong(true, true);
-				});
-
-				destroyFreeplayVocals();
-			}
-		];
+		keyCombos = [];
 
 		Paths.clearStoredMemory();
 		Paths.clearUnusedMemory();
@@ -548,7 +483,6 @@ class FreeplayState extends MusicBeatState
 
 			if (Progression.beatMainWeek && Progression.badEnding && !Progression.beatHell)
 			{
-				checkCombos();
 			}
 		}
 

diff --git a/source/states/menus/MainMenuState.hx b/source/states/menus/MainMenuState.hx
@@ -447,8 +447,6 @@ class MainMenuState extends MusicBeatState
 		if (curSelected < 0)
 			curSelected = menuItems.length - 1;
 
-		trace(camFollow.x, camFollow.y);
-
 		menuItems.forEach(function(spr:FlxSprite)
 		{
 			spr.animation.play('idle');