whar

Joalor64GH · Jul 5, 2024 · 041c44c · 041c44c
1 parent d3fa18a
commit 041c44c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git a/Project.xml b/Project.xml
@@ -51,6 +51,8 @@
 	<assets path="assets/artemis" library="artemis" if="windows"/>
 	<assets path="assets/videos"  library="videos"  if="VIDEOS_ALLOWED || WEBM_ALLOWED || FLASH_MOVIE"/>
 
+	<!-- <library path="assets/videos/movie.swf" preload="true" id="movieid"/> --> <!-- template for swf -->
+
 	<assets path="mods" embed="false" type="template" if="MODS_ALLOWED" />
 	<assets path="modsList.txt" if="MODS_ALLOWED" />
 

diff --git a/README.md b/README.md
@@ -78,7 +78,6 @@ You can check planned/upcoming features [here](/TODO).
 
 ### Former Members
 * [bbpanzu](https://twitter.com/bbpanzu) - Ex-Programmer
-* [Yoshubs](https://gamebanana.com/members/1908070) - Ex-Programmer
 
 ### Special Thanks
 * [gedehari](https://github.com/gedehari) - Crash Handler and Base code for Chart Editor's Waveform

diff --git a/source/meta/data/options/LanguageState.hx b/source/meta/data/options/LanguageState.hx
@@ -76,10 +76,17 @@ class LanguageState extends MusicBeatState
             coolGrp.add(label);
 
             var icon:AttachedSprite = new AttachedSprite();
-            icon.frames = Paths.getSparrowAtlas('flags/' + langStrings[i].code);
-            icon.animation.addByPrefix('idle', langStrings[i].code, 24);
-            icon.animation.play('idle');
-            icon.xAdd = -icon.width - 10;
+			try {
+            	icon.frames = Paths.getSparrowAtlas('flags/' + langStrings[i].code);
+            	icon.animation.addByPrefix('idle', langStrings[i].code, 24);
+            	icon.animation.play('idle');
+			} catch (e) {
+				trace('oops! flag returned null!');
+				icon.frames = Paths.getSparrowAtlas('flags/null');
+            	icon.animation.addByPrefix('idle', 'flag_base', 24);
+            	icon.animation.play('idle');
+			}
+			icon.xAdd = -icon.width - 10;
             icon.sprTracker = label;
             iconArray.push(icon);
             add(icon);

diff --git a/source/meta/data/options/OptionsSubState.hx b/source/meta/data/options/OptionsSubState.hx
@@ -834,7 +834,7 @@ class GameplaySubState extends BaseOptionsMenu
 
 		super();
 
-		windowBar = new FlxSprite((FlxG.width / 4) * 3 - 40, FlxG.height / 4 - 100).makeGraphic(80, 220, 0x00ffffff);
+		windowBar = new FlxSprite((FlxG.width / 4) * 3 + 150, FlxG.height / 4 - 100).makeGraphic(80, 220, 0x00ffffff);
 		windowBar.visible = false;
 		windowBar.setGraphicSize(80, 440);
 		windowBar.updateHitbox();

diff --git a/source/meta/state/CreditsState.hx b/source/meta/state/CreditsState.hx
@@ -23,8 +23,6 @@ class CreditsState extends MusicBeatState
 
 	var noLink:Bool;
 
-	var keoikiStr:String = ""; // funny
-
 	override function create()
 	{
 		#if desktop
@@ -49,8 +47,7 @@ class CreditsState extends MusicBeatState
 		for (mod in Mods.parseList().enabled) pushModCreditsToList(mod);
 		#end
 
-		keoikiStr = (FlxG.random.bool(30)) ? 'keoiki2' : 'keoiki';
-
+		var keoikiStr:String = (FlxG.random.bool(30)) ? 'keoiki2' : 'keoiki'; // funny
 		var pisspoop:Array<Array<String>> = [
 			// name, icon, description, link, color, sound
 			['Joalor64 Engine Team'],

diff --git a/source/meta/state/PlayState.hx b/source/meta/state/PlayState.hx
@@ -160,7 +160,6 @@ class PlayState extends MusicBeatState
 		["bad", 0.5, 100, false],
 		["shit", 0, 50, false]
 	];
-
 	public var ratingsData:Array<Rating> = [];
 	public var sicks:Int = 0;
 	public var goods:Int = 0;
@@ -356,9 +355,6 @@ class PlayState extends MusicBeatState
 	public var comboFunction:Void->Void = null;
 	public static var inMini:Bool = false;
 
-	var texty:String = '';
-	var dialogueLangSuffix:String = '';
-
 	public static var gainedCredit:Int = 0;
 
 	public static function truncateFloat(number:Float, precision:Int):Float
@@ -371,8 +367,6 @@ class PlayState extends MusicBeatState
 
 	override public function create()
 	{
-		dialogueLangSuffix = (ClientPrefs.language != 'en') ? '-' + Localization.currentLanguage : '';
-
 		PauseSubState.fromPlayState = false;
 
 		if (curStage != 'schoolEvil')
@@ -1369,6 +1363,7 @@ class PlayState extends MusicBeatState
 				tintMap.set('roses', addATint(0.15, FlxColor.fromRGB(90, 20, 10))); 
 		}
 
+		var dialogueLangSuffix:String = (ClientPrefs.language != 'en') ? '-' + Localization.currentLanguage : '';
 		var file:String = Paths.json(songName + '/dialogue' + dialogueLangSuffix); //Checks for json/Psych Engine dialogue
 		if (Assets.exists(file))
 			dialogueJson = DialogueBoxPsych.parseDialogue(file);
@@ -1503,12 +1498,9 @@ class PlayState extends MusicBeatState
 		add(botplayTxt);
 		if (ClientPrefs.downScroll)
 			botplayTxt.y = timeBar.y - 78;
-
-		if (inMini)
-			texty = '${SONG.song} - Joalor64 Engine Rewrite v${MainMenuState.joalor64EngineVersion}';
-		else
-			texty = '${SONG.song} ${CoolUtil.difficultyString()} - Joalor64 Engine Rewrite v${MainMenuState.joalor64EngineVersion}';
 
+		var texty:String = (inMini) ? '${SONG.song} - Joalor64 Engine Rewrite v${MainMenuState.joalor64EngineVersion}'
+			: '${SONG.song} ${CoolUtil.difficultyString()} - Joalor64 Engine Rewrite v${MainMenuState.joalor64EngineVersion}';
 		var versionTxt:FlxText = new FlxText(4, FlxG.height - 24, 0, texty, 12);
 		versionTxt.scrollFactor.set();
 		versionTxt.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
@@ -4818,8 +4810,9 @@ class PlayState extends MusicBeatState
 
 	public function endSong():Void
 	{
+		Application.current.window.title = Application.current.meta.get('name');
+
 		System.gc();
-
 		ButtplugUtils.stop();
 
 		gainedCredit = FlxG.random.int(1, 100);

diff --git a/source/meta/substate/PasswordPrompt.hx b/source/meta/substate/PasswordPrompt.hx
@@ -3,22 +3,26 @@ package meta.substate;
 import flixel.addons.ui.FlxUIInputText;
 
 /**
+ * A simple password prompt meant to be used in mods.
  * @author bbpanzu
  * @see https://github.com/bbpanzu/vswhitty-public
  */
 
-class PasswordPrompt extends meta.MusicBeatSubstate
+class PasswordPrompt extends FlxSubState
 {
+	var callback:Void->Void = null;
 	var input:FlxUIInputText;
 
-	public function new() 
+	public function new(callback:Void->Void = null) 
 	{
 		super();
 
+		this.callback = callback;
+
 		var black:FlxSprite = new FlxSprite(0, 0).makeGraphic(1280, 400, FlxColor.BLACK);
 		black.screenCenter();
 
-		var txt:FlxText = new FlxText(0, 0, 0, "Enter Password", 32);
+		var txt:FlxText = new FlxText(0, 0, 0, 'Enter Password', 32);
 		txt.screenCenter();
 		input = new FlxUIInputText(10, 10, FlxG.width, '', 8);
 		input.setFormat(Paths.font("vcr.ttf"), 96, FlxColor.WHITE, FlxTextAlign.CENTER);
@@ -42,7 +46,8 @@ class PasswordPrompt extends meta.MusicBeatSubstate
 		super.update(elapsed);
 		input.hasFocus = true;
 
-		if (controls.ACCEPT) { // add custom functions here
+		if (controls.ACCEPT) {
+			if (callback != null) callback();
 			FlxG.mouse.visible = false;
 			FlxG.state.closeSubState();
 		}