More changes

Added Stefan2008's credits The Android keyboard now works with most of the input texts Removed Optimized Chart Loading. If you're using JSE 1.12.0, I recommend turning this off!
JordanSantiagoYT · Oct 24, 2023 · 597996e · 597996e · Stefan2008Git · Oct 26, 2023
1 parent ca70ca7
commit 597996e
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 185 deletions.
diff --git a/assets/preload/data/botplayText.txt b/assets/preload/data/botplayText.txt
@@ -1,3 +1,4 @@
+Hey don't blame him, beating it was probably outside his skill level
 that's some nice botplay you got there! can i have it?
 skill issue
 congrats, you turned on botplay

diff --git a/assets/preload/images/credits/stef.png b/assets/preload/images/credits/stef.png
diff --git a/source/ClientPrefs.hx b/source/ClientPrefs.hx
@@ -61,6 +61,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y
 	public static var opponentLightStrum:Bool = true;
 	public static var complexAccuracy:Bool = false;
 	public static var resyncType:String = 'Psych';
+	public static var scoreTxtSize:Int = 0;
 	public static var botLightStrum:Bool = true;
 	public static var violence:Bool = true;
 	public static var camZooms:Bool = true;
@@ -224,6 +225,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y
 		FlxG.save.data.oppNoteSplashes = oppNoteSplashes;
 		FlxG.save.data.songLoading = songLoading;
 		FlxG.save.data.debugInfo = debugInfo;
+		FlxG.save.data.scoreTxtSize = scoreTxtSize;
 		FlxG.save.data.lowQuality = lowQuality;
 		FlxG.save.data.shaders = shaders;
 		FlxG.save.data.ezSpam = ezSpam;
@@ -389,6 +391,9 @@ class ClientPrefs { //default settings if it can't find a save file containing y
 		if(FlxG.save.data.debugInfo != null) {
 			debugInfo = FlxG.save.data.debugInfo;
 		}
+ 		if(FlxG.save.data.scoreTxtSize != null) {
+			scoreTxtSize = FlxG.save.data.scoreTxtSize;
+		}
 		if(FlxG.save.data.ezSpam != null) {
 			ezSpam = FlxG.save.data.ezSpam;
 		}

diff --git a/source/CreditsState.hx b/source/CreditsState.hx
@@ -84,8 +84,9 @@ class CreditsState extends MusicBeatState
 		#end
 
 		var pisspoop:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color
-			['No Botplay Lag Person'],
-			['Jordan Santiago',			'jor',				'Coded everything into Psych Engine: No Botplay Lag Edition',								'https://twitter.com/JordansTweetsYT',			'FF9300'],
+			['JS Engine People'],
+			['Jordan Santiago',			'jor',				'Coded everything into JS Engine',								'https://twitter.com/JordansTweetsYT',			'FF9300'],
+			['Stefan2008',			'stef',				"Granted permission to use the Results Screen code, and helped\nwith the Android version's development",								'https://www.youtube.com/channel/UC9Nwf21GbaEm_h0Ka9gxZjQ', '800080'],
 			[''],
 			['Psych Engine Team'],
 			['Shadow Mario',		'shadowmario',		'Main Programmer of Psych Engine',								'https://twitter.com/Shadow_Mario_',	'444444'],

diff --git a/source/PlayState.hx b/source/PlayState.hx
diff --git a/source/editors/CharacterEditorState.hx b/source/editors/CharacterEditorState.hx
@@ -523,6 +523,7 @@ class CharacterEditorState extends MusicBeatState
 		tab_group.name = "Character";
 
 		imageInputText = new FlxUIInputText(15, 30, 200, 'characters/BOYFRIEND', 8);
+		imageInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		var reloadImage:FlxButton = new FlxButton(imageInputText.x + 210, imageInputText.y - 3, "Reload Image", function()
 		{
 			char.imageFile = imageInputText.text;
@@ -550,6 +551,7 @@ class CharacterEditorState extends MusicBeatState
 		*/
 
 		healthIconInputText = new FlxUIInputText(15, imageInputText.y + 35, 75, leHealthIcon.getCharacter(), 8);
+		healthIconInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		singDurationStepper = new FlxUINumericStepper(15, healthIconInputText.y + 45, 0.1, 4, 0, 999, 1);
 
@@ -629,8 +631,11 @@ class CharacterEditorState extends MusicBeatState
 		tab_group.name = "Animations";
 
 		animationInputText = new FlxUIInputText(15, 85, 80, '', 8);
+		animationInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		animationNameInputText = new FlxUIInputText(animationInputText.x, animationInputText.y + 35, 150, '', 8);
+		animationNameInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		animationIndicesInputText = new FlxUIInputText(animationNameInputText.x, animationNameInputText.y + 40, 250, '', 8);
+		animationIndicesInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		animationNameFramerate = new FlxUINumericStepper(animationInputText.x + 170, animationInputText.y, 1, 24, 0, 240, 0);
 		animationLoopCheckBox = new FlxUICheckBox(animationNameInputText.x + 170, animationNameInputText.y - 1, null, null, "Should it Loop?", 100);
 

diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx
@@ -533,6 +533,7 @@ class ChartingState extends MusicBeatState
 	function addSongUI():Void
 	{
 		UI_songTitle = new FlxUIInputText(10, 10, 70, _song.song, 8);
+		UI_songTitle.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		blockPressWhileTypingOn.push(UI_songTitle);
 
 
@@ -728,9 +729,11 @@ class ChartingState extends MusicBeatState
 		if(skin == null) skin = '';
 		noteSkinInputText = new FlxUIInputText(player2DropDown.x, player2DropDown.y + 50, 150, skin, 8);
 		blockPressWhileTypingOn.push(noteSkinInputText);
+		noteSkinInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		noteSplashesInputText = new FlxUIInputText(noteSkinInputText.x, noteSkinInputText.y + 35, 150, _song.splashSkin, 8);
 		blockPressWhileTypingOn.push(noteSplashesInputText);
+		noteSplashesInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		var reloadNotesButton:FlxButton = new FlxButton(noteSplashesInputText.x + 5, noteSplashesInputText.y + 20, 'Change Notes', function() {
 			_song.arrowSkin = noteSkinInputText.text;
@@ -783,6 +786,7 @@ class ChartingState extends MusicBeatState
 
 		creditInputText = new FlxUIInputText(10, 30, 100, _song.songCredit, 8);
 		blockPressWhileTypingOn.push(creditInputText);
+		creditInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		tab_group_songdata.add(creditInputText);
 		tab_group_songdata.add(new FlxText(creditInputText.x, creditInputText.y - 15, 0, 'Song Credit:'));
@@ -1359,11 +1363,13 @@ class ChartingState extends MusicBeatState
 		tab_group_event.add(text);
 		value1InputText = new FlxUIInputText(20, 110, 100, "");
 		blockPressWhileTypingOn.push(value1InputText);
+		value1InputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		var text:FlxText = new FlxText(20, 130, 0, "Value 2:");
 		tab_group_event.add(text);
 		value2InputText = new FlxUIInputText(20, 150, 100, "");
 		blockPressWhileTypingOn.push(value2InputText);
+		value2InputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		// New event buttons
 		var removeButton:FlxButton = new FlxButton(eventDropDown.x + eventDropDown.width + 10, eventDropDown.y, '-', function()

diff --git a/source/editors/DialogueCharacterEditorState.hx b/source/editors/DialogueCharacterEditorState.hx
@@ -278,10 +278,13 @@ class DialogueCharacterEditorState extends MusicBeatState
 
 		animationInputText = new FlxUIInputText(15, 85, 80, '', 8);
 		blockPressWhileTypingOn.push(animationInputText);
+		animationInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		loopInputText = new FlxUIInputText(animationInputText.x, animationInputText.y + 35, 150, '', 8);
 		blockPressWhileTypingOn.push(loopInputText);
+		loopInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		idleInputText = new FlxUIInputText(loopInputText.x, loopInputText.y + 40, 150, '', 8);
 		blockPressWhileTypingOn.push(idleInputText);
+		idleInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		var addUpdateButton:FlxButton = new FlxButton(10, idleInputText.y + 30, "Add/Update", function() {
 			var theAnim:String = animationInputText.text.trim();
@@ -383,6 +386,7 @@ class DialogueCharacterEditorState extends MusicBeatState
 
 		imageInputText = new FlxUIInputText(10, 30, 80, character.jsonFile.image, 8);
 		blockPressWhileTypingOn.push(imageInputText);
+		imageInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		xStepper = new FlxUINumericStepper(imageInputText.x, imageInputText.y + 50, 10, character.jsonFile.position[0], -2000, 2000, 0);
 		yStepper = new FlxUINumericStepper(imageInputText.x + 80, xStepper.y, 10, character.jsonFile.position[1], -2000, 2000, 0);
 		scaleStepper = new FlxUINumericStepper(imageInputText.x, xStepper.y + 50, 0.05, character.jsonFile.scale, 0.1, 10, 2);

diff --git a/source/editors/DialogueEditorState.hx b/source/editors/DialogueEditorState.hx
@@ -153,6 +153,7 @@ class DialogueEditorState extends MusicBeatState
 
 		characterInputText = new FlxUIInputText(10, 20, 80, DialogueCharacter.DEFAULT_CHARACTER, 8);
 		blockPressWhileTypingOn.push(characterInputText);
+		characterInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		speedStepper = new FlxUINumericStepper(10, characterInputText.y + 40, 0.005, 0.05, 0, 0.5, 3);
 
@@ -165,9 +166,11 @@ class DialogueEditorState extends MusicBeatState
 
 		soundInputText = new FlxUIInputText(10, speedStepper.y + 40, 150, '', 8);
 		blockPressWhileTypingOn.push(soundInputText);
+		soundInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		lineInputText = new FlxUIInputText(10, soundInputText.y + 35, 200, DEFAULT_TEXT, 8);
 		blockPressWhileTypingOn.push(lineInputText);
+		lineInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		#if !android
 		var loadButton:FlxButton = new FlxButton(20, lineInputText.y + 25, "Load Dialogue", function() {

diff --git a/source/editors/MenuCharacterEditorState.hx b/source/editors/MenuCharacterEditorState.hx
@@ -188,10 +188,13 @@ class MenuCharacterEditorState extends MusicBeatState
 
 		imageInputText = new FlxUIInputText(10, 20, 80, characterFile.image, 8);
 		blockPressWhileTypingOn.push(imageInputText);
+		imageInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		idleInputText = new FlxUIInputText(10, imageInputText.y + 35, 100, characterFile.idle_anim, 8);
 		blockPressWhileTypingOn.push(idleInputText);
+		idleInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		confirmInputText = new FlxUIInputText(10, idleInputText.y + 35, 100, characterFile.confirm_anim, 8);
 		blockPressWhileTypingOn.push(confirmInputText);
+		confirmInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		flipXCheckbox = new FlxUICheckBox(10, confirmInputText.y + 30, null, null, "Flip X", 100);
 		flipXCheckbox.callback = function()

diff --git a/source/editors/WeekEditorState.hx b/source/editors/WeekEditorState.hx
@@ -178,26 +178,33 @@ class WeekEditorState extends MusicBeatState
 
 		songsInputText = new FlxUIInputText(10, 30, 200, '', 8);
 		blockPressWhileTypingOn.push(songsInputText);
+		songsInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		opponentInputText = new FlxUIInputText(10, songsInputText.y + 40, 70, '', 8);
 		blockPressWhileTypingOn.push(opponentInputText);
+		opponentInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		boyfriendInputText = new FlxUIInputText(opponentInputText.x + 75, opponentInputText.y, 70, '', 8);
 		blockPressWhileTypingOn.push(boyfriendInputText);
+		boyfriendInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		girlfriendInputText = new FlxUIInputText(boyfriendInputText.x + 75, opponentInputText.y, 70, '', 8);
 		blockPressWhileTypingOn.push(girlfriendInputText);
+		girlfriendInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		backgroundInputText = new FlxUIInputText(10, opponentInputText.y + 40, 120, '', 8);
 		blockPressWhileTypingOn.push(backgroundInputText);
-
+		backgroundInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		displayNameInputText = new FlxUIInputText(10, backgroundInputText.y + 60, 200, '', 8);
 		blockPressWhileTypingOn.push(backgroundInputText);
+		displayNameInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		weekNameInputText = new FlxUIInputText(10, displayNameInputText.y + 60, 150, '', 8);
 		blockPressWhileTypingOn.push(weekNameInputText);
+		weekNameInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		weekFileInputText = new FlxUIInputText(10, weekNameInputText.y + 40, 100, '', 8);
 		blockPressWhileTypingOn.push(weekFileInputText);
+		weekFileInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 		reloadWeekThing();
 
 		hideCheckbox = new FlxUICheckBox(10, weekFileInputText.y + 40, null, null, "Hide Week from Story Mode?", 100);
@@ -252,9 +259,11 @@ class WeekEditorState extends MusicBeatState
 
 		weekBeforeInputText = new FlxUIInputText(10, hiddenUntilUnlockCheckbox.y + 55, 100, '', 8);
 		blockPressWhileTypingOn.push(weekBeforeInputText);
+		weekBeforeInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		difficultiesInputText = new FlxUIInputText(10, weekBeforeInputText.y + 60, 200, '', 8);
 		blockPressWhileTypingOn.push(difficultiesInputText);
+		difficultiesInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		tab_group.add(new FlxText(weekBeforeInputText.x, weekBeforeInputText.y - 28, 0, 'Week File name of the Week you have\nto finish for Unlocking:'));
 		tab_group.add(new FlxText(difficultiesInputText.x, difficultiesInputText.y - 20, 0, 'Difficulties:'));
@@ -729,6 +738,7 @@ class WeekEditorFreeplayState extends MusicBeatState
 		});
 
 		iconInputText = new FlxUIInputText(10, bgColorStepperR.y + 70, 100, '', 8);
+		iconInputText.focusGained = () -> FlxG.stage.window.textInputEnabled = true;
 
 		var hideFreeplayCheckbox:FlxUICheckBox = new FlxUICheckBox(10, iconInputText.y + 30, null, null, "Hide Week from Freeplay?", 100);
 		hideFreeplayCheckbox.checked = weekFile.hideFreeplay;

diff --git a/source/options/OptimizationSubState.hx b/source/options/OptimizationSubState.hx
@@ -100,13 +100,15 @@ class OptimizationSubState extends BaseOptionsMenu
 			true);
 		addOption(option);
 
+		/* //ok i was GOING to keep this but note types break if you turn it on
 		var option:Option = new Option('Optimized Chart Loading', //Name
 			'If checked, hopefully tries to get charts to load faster.', //Description
 			'fasterChartLoad', //Save data variable name
 			'bool', //Variable type
 			false); //Default value
 		addOption(option);
-
+		*/
+
 		super();
 	}
 }
diff --git a/source/options/Option.hx b/source/options/Option.hx
@@ -49,7 +49,7 @@ class Option
 	public var displayFormat:String = '%v'; //How String/Float/Percent/Int values are shown, %v = Current value, %d = Default value
 	public var description:String = '';
 	public var name:String = 'Unknown';
-	public var isNote:Bool = false;
+	public var specialOption:Bool = false;
 
 	public function new(name:String, description:String = '', variable:String, type:String = 'bool', defaultValue:Dynamic = 'null variable value', ?options:Array<String> = null)
 	{

diff --git a/source/options/VisualsUISubState.hx b/source/options/VisualsUISubState.hx
@@ -156,6 +156,16 @@ class VisualsUISubState extends BaseOptionsMenu
 			'bool',
 			false);
 		addOption(option);
+
+		var option:Option = new Option('ScoreTxt Size: ',
+			"Sets the size of scoreTxt. Logically, higher values mean\nthe scoreTxt is bigger. If set to 0, then it will\nuse the default size for each HUD type.",
+			'scoreTxtSize',
+			'int',
+			'0');
+		addOption(option);
+
+		option.minValue = 0;
+		option.maxValue = 100;
 
 		/* ignore this i was just making a joke about fnf's naughtiness option
 		var option:Option = new Option('Family Friendly Mode',