Finale thing until school is over

CamLikesKirby · May 25, 2024 · 07e0d4f · 07e0d4f
1 parent eef1405
commit 07e0d4f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@ Extra Keys from: https://github.com/Magman03k7/VsDave-ExtraKeysAddon
 
 ## Dependencies you need to build
 flixel-addons is 2.11.0 btw
+
 You don't need polymod
 
 ![image](https://github.com/CamtheKirby/VsDave-Modable/assets/92703353/7a0c65c3-37a4-43d6-b2d5-7901436c2eb8)
@@ -12,7 +13,7 @@ You don't need polymod
 # VS DAVE (DAVE ENGINE)
 this is dave
 
-<img src="https://cdn.discordapp.com/attachments/892140166309892136/905267141299802152/dorve_reale.png" width="211" height="373">
+<img src="https://static.wikia.nocookie.net/fridaynightfunking/images/1/1e/Dave30_Static_Up_Pose.png/revision/latest?cb=20221112223155" width="211" height="373">
 
 say hi to dave
 please say hi to him

diff --git a/source/CharacterSelectState.hx b/source/CharacterSelectState.hx
@@ -207,6 +207,7 @@ class CharacterSelectState extends MusicBeatState
 			}
 
 			characters.push(new CharacterInSelect(mainName, thehotemsithink, newCharacterForms));
+			unlockCharacter(mainName);
 		}
 	}
 		if (FileSystem.exists(TitleState.modFolder + '/data/characterSelect.json')) {
@@ -220,6 +221,7 @@ class CharacterSelectState extends MusicBeatState
 			}
 
 			characters.push(new CharacterInSelect(mainName, thehotemsithink, newCharacterForms));
+			unlockCharacter(mainName);
 		}
 	}
 
@@ -592,7 +594,7 @@ class CharacterSelectState extends MusicBeatState
 			FlxG.resetState();
 		}
 
-		if (FlxG.keys.justPressed.SEVEN)
+		if (FlxG.keys.justPressed.SEVEN && FlxG.save.data.adminMode)
 		{
 			for (character in characters)
 			{

diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx
@@ -95,6 +95,7 @@ class OptionsMenu extends MusicBeatState
 			+ "\n" + (CompatTool.save.data.compatMode ? LanguageManager.getTextString('option_enable_compat') : LanguageManager.getTextString('option_disable_compat'))
 			+ "\n" + (FlxG.save.data.modchart ? 'Mod Chart OFF' : 'Mod Chart ON')
 			+ "\n" + (FlxG.save.data.lessLag ? 'Less Lag OFF' : 'Less Lag ON')
+			+ "\n" + (FlxG.save.data.freeplayCuts ? "Freeplay Cutscenes ON" : "Freeplay Cutscenes OFF")
 			);
 
 		grpControls = new FlxTypedGroup<Alphabet>();
@@ -212,17 +213,19 @@ class OptionsMenu extends MusicBeatState
 					updateGroupControls(CompatTool.save.data.compatMode ? LanguageManager.getTextString('option_enable_compat') : LanguageManager.getTextString('option_disable_compat'), 11, 'Vertical');
 				case 12:
 					if (!awaitingExploitation) FlxG.save.data.modchart = !FlxG.save.data.modchart;
-					updateGroupControls(FlxG.save.data.modchart ? 'Mod Chart OFF' : 'Mod Chart ON', 12, 'Vertical');		
-
-					case 13:
+					updateGroupControls(FlxG.save.data.modchart ? 'Mod Chart OFF' : 'Mod Chart ON', 12, 'Vertical');			
+				case 13:
 					FlxG.save.data.lessLag = !FlxG.save.data.lessLag;
 					updateGroupControls(FlxG.save.data.lessLag ? 'Less Lag OFF' : 'Less Lag ON', 12, 'Vertical');	
+				case 14:
+					FlxG.save.data.freeplayCuts = !FlxG.save.data.freeplayCuts;
+					updateGroupControls(FlxG.save.data.freeplayCuts ? 'Freeplay Cutscenes ON' : 'Freeplay Cutscenes OFF', 12, 'Vertical');	
 			}
 		}
 
 		if (FlxG.keys.justPressed.SEVEN)
 			{
-				FlxG.save.flush();
+			FlxG.save.flush();
 			CompatTool.save.flush();
 			FlxG.switchState(new AdminOptionsMenu());
 			}	

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -1154,7 +1154,7 @@ class PlayState extends MusicBeatState
 				add(tv);
 		}
 
-		var doof:DialogueBox = new DialogueBox(false, dialogue, isStoryMode || localFunny == CharacterFunnyEffect.Recurser || FreeplayState.isaCustomSong);
+		var doof:DialogueBox = new DialogueBox(false, dialogue, isStoryMode || localFunny == CharacterFunnyEffect.Recurser || FreeplayState.isaCustomSong || FlxG.save.data.freeplayCuts);
 		// doof.x += 70;
 		// doof.y = FlxG.height * 0.5;
 		doof.scrollFactor.set();
@@ -1540,7 +1540,7 @@ class PlayState extends MusicBeatState
 		{
 			startTimer.active = true;
 		}
-		if (isStoryMode || localFunny == CharacterFunnyEffect.Recurser || FreeplayState.isaCustomSong)
+		if (isStoryMode || localFunny == CharacterFunnyEffect.Recurser || FreeplayState.isaCustomSong || FlxG.save.data.freeplayCuts)
 		{
 			if (hasDialogue)
 			{

diff --git a/source/SaveDataHandler.hx b/source/SaveDataHandler.hx
@@ -75,5 +75,8 @@ class SaveDataHandler
 
 		if (FlxG.save.data.lessLag == null)
 			FlxG.save.data.lesslag = false;
+
+		if (FlxG.save.data.freeplayCuts == null)
+			FlxG.save.data.freeplayCuts = false;
     }
 }