Merge branch 'experimental' into patch-4

Project.xml

@@ -110,9 +110,9 @@
 
 	<!--Psych stuff needed-->
 	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
-	<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.0.2"/>
-	<haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
-	<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
+	<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.1.0"/>
+	<haxelib name="hxvlc" if="VIDEOS_ALLOWED" version="1.8.2"/>
+	<haxelib name="hxdiscord_rpc" version="1.2.4" if="DISCORD_ALLOWED"/>
 	<haxelib name="flxanimate"/>
 
 	<!-- Disable Discord IO Thread -->
@@ -122,6 +122,7 @@
 	<!-- Enables a terminal log prompt on debug builds -->
 	<haxelib name="hxcpp-debug-server" if="debug"/>
 	<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
+	<haxedef name="HXVLC_NO_SHARE_DIRECTORY" />
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 

assets/translations/shared/data/pt-BR.lang

@@ -36,9 +36,8 @@ charting_mode: "Modo Charter"
 blueballed: "Broxadas: {1}"
 
 // Main Menu
-images/mainmenu/menu_story_mode: "images/mainmenu/menu_story_mode"
-images/mainmenu/menu_freeplay: "images/mainmenu/menu_freeplay"
-images/mainmenu/menu_credits: "images/mainmenu/menu_credits"
+images/mainmenu/menu_story_mode: "images/pt-BR/mainmenu/menu_story_mode"
+images/mainmenu/menu_credits: "images/pt-BR/mainmenu/menu_credits"
 
 // Story Mode
 images/Menu_Tracks: "images/pt-BR/Menu_Tracks"
@@ -87,6 +86,8 @@ achievement_week6_nomiss: "Novo Recorde!!"
 description_week6_nomiss: "Complete a Week 6 no Modo Difícil e sem errar."
 achievement_week7_nomiss: "Filho da P..."
 description_week7_nomiss: "Complete a Week 7 no Modo Difícil e sem errar."
+achievement_weekend1_nomiss: "Briga sem Perder Amizade"
+description_weekend1_nomiss: "Complete a Weekend 1 no Modo Difícil e sem errar."
 achievement_ur_bad: "Pontuação Desastrosa!"
 description_ur_bad: "Complete uma Música com uma precisão menor que 20%."
 achievement_ur_good: "Perfeccionista"
@@ -103,6 +104,8 @@ achievement_toastie: "PC de Torradeira"
 description_toastie: "Jogando num belo de um PC da Xuxa, hein?"
 achievement_debugger: "Modo Debug"
 description_debugger: "Complete a Música "Test" através do Chart Editor."
+achievement_pessy_easter_egg: "Garota de Programação"
+description_pessy_easter_egg: "Hihi, você me encontrou~!"
 
 // Options
 options_note_colors: "Coloração das Notas"

assets/translations/shared/images/pt-BR/mainmenu/menu_credits.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="FNF_main_menu_assets_pt-BR.png">
+	<!-- Created with Adobe Animate version 23.0.2.103 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="credits idle0000" x="2" y="542" width="502" height="124"/>
+	<SubTexture name="credits idle0001" x="2" y="542" width="502" height="124"/>
+	<SubTexture name="credits idle0002" x="2" y="542" width="502" height="124"/>
+	<SubTexture name="credits idle0003" x="2" y="668" width="502" height="124"/>
+	<SubTexture name="credits idle0004" x="2" y="668" width="502" height="124"/>
+	<SubTexture name="credits idle0005" x="2" y="668" width="502" height="124"/>
+	<SubTexture name="credits idle0006" x="2" y="794" width="502" height="124"/>
+	<SubTexture name="credits idle0007" x="2" y="794" width="502" height="124"/>
+	<SubTexture name="credits idle0008" x="2" y="794" width="502" height="124"/>
+	<SubTexture name="credits selected0000" x="2" y="2" width="630" height="179" frameX="0" frameY="-1" frameWidth="631" frameHeight="180"/>
+	<SubTexture name="credits selected0001" x="2" y="183" width="631" height="178" frameX="0" frameY="-2" frameWidth="631" frameHeight="180"/>
+	<SubTexture name="credits selected0002" x="2" y="363" width="630" height="177" frameX="0" frameY="0" frameWidth="631" frameHeight="180"/>
+</TextureAtlas>

assets/translations/shared/images/pt-BR/mainmenu/menu_story_mode.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="FNF_main_menu_assets_pt-BR.png">
+	<!-- Created with Adobe Animate version 23.0.2.103 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="story_mode idle0000" x="2" y="552" width="690" height="135"/>
+	<SubTexture name="story_mode idle0001" x="2" y="552" width="690" height="135"/>
+	<SubTexture name="story_mode idle0002" x="2" y="552" width="690" height="135"/>
+	<SubTexture name="story_mode idle0003" x="2" y="689" width="690" height="135"/>
+	<SubTexture name="story_mode idle0004" x="2" y="689" width="690" height="135"/>
+	<SubTexture name="story_mode idle0005" x="2" y="689" width="690" height="135"/>
+	<SubTexture name="story_mode idle0006" x="2" y="826" width="690" height="135"/>
+	<SubTexture name="story_mode idle0007" x="2" y="826" width="690" height="135"/>
+	<SubTexture name="story_mode idle0008" x="2" y="826" width="690" height="135"/>
+	<SubTexture name="story_mode selected0000" x="2" y="2" width="816" height="183" frameX="-1" frameY="-1" frameWidth="821" frameHeight="184"/>
+	<SubTexture name="story_mode selected0001" x="2" y="370" width="820" height="180" frameX="0" frameY="0" frameWidth="821" frameHeight="184"/>
+	<SubTexture name="story_mode selected0002" x="2" y="187" width="818" height="181" frameX="-3" frameY="-2" frameWidth="821" frameHeight="184"/>
+</TextureAtlas>

setup/unix.sh

@@ -3,19 +3,21 @@
 # REMINDER THAT YOU NEED HAXE INSTALLED PRIOR TO USING THIS
 # https://haxe.org/download
 cd ..
+echo Makking the main haxelib and setuping folder in same time..
+mkdir ~/haxelib && haxelib setup ~/haxelib
 echo Installing dependencies...
 echo This might take a few moments depending on your internet speed.
 haxelib install lime 8.1.2
 haxelib install openfl 9.3.3
 haxelib install flixel 5.6.1
 haxelib install flixel-addons 3.2.2
-haxelib install flixel-tools 1.5.1	
-haxelib install hscript-iris 1.0.2
+haxelib install flixel-tools 1.5.1
+haxelib install hscript-iris 1.1.0
 haxelib install tjson 1.4.0
+haxelib install hxdiscord_rpc 1.2.4
+haxelib install hxvlc 1.8.2
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
-haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 633fcc051399afed6781dd60cbf30ed8c3fe2c5a
-haxelib git hxdiscord_rpc https://github.com/MAJigsaw77/hxdiscord_rpc 3538a1c2bb07b04208cd014220207f8173acdb21
-haxelib git hxvlc https://github.com/MAJigsaw77/hxvlc 70e7f5f3e76d526ac6fb8f0e6665efe7dfda589d
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis d5361037efa3a02c4ab20b5bd14ca11e7d00f519
+haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
+haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
 haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
 echo Finished!

setup/windows.bat

@@ -9,13 +9,13 @@ haxelib install openfl 9.3.3
 haxelib install flixel 5.6.1
 haxelib install flixel-addons 3.2.2
 haxelib install flixel-tools 1.5.1
-haxelib install hscript-iris 1.0.2
+haxelib install hscript-iris 1.1.0
 haxelib install tjson 1.4.0
+haxelib install hxdiscord_rpc 1.2.4
+haxelib install hxvlc 1.8.2
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
-haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 633fcc051399afed6781dd60cbf30ed8c3fe2c5a
-haxelib git hxdiscord_rpc https://github.com/MAJigsaw77/hxdiscord_rpc 3538a1c2bb07b04208cd014220207f8173acdb21
-haxelib git hxvlc https://github.com/MAJigsaw77/hxvlc 70e7f5f3e76d526ac6fb8f0e6665efe7dfda589d
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis d5361037efa3a02c4ab20b5bd14ca11e7d00f519
+haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
+haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
 haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
 echo Finished!
 pause

source/backend/Achievements.hx

@@ -33,6 +33,7 @@ class Achievements {
 		createAchievement('week5_nomiss',			{name: "Missless Christmas", description: "Beat Week 5 on Hard with no Misses."});
 		createAchievement('week6_nomiss',			{name: "Highscore!!", description: "Beat Week 6 on Hard with no Misses."});
 		createAchievement('week7_nomiss',			{name: "God Effing Damn It!", description: "Beat Week 7 on Hard with no Misses."});
+		createAchievement('weekend1_nomiss',		{name: "Just a Friendly Sparring", description: "Beat Weekend 1 on Hard with no Misses."});
 		createAchievement('ur_bad',					{name: "What a Funkin' Disaster!", description: "Complete a Song with a rating lower than 20%."});
 		createAchievement('ur_good',				{name: "Perfectionist", description: "Complete a Song with a rating of 100%."});
 		createAchievement('roadkill_enthusiast',	{name: "Roadkill Enthusiast", description: "Watch the Henchmen die 50 times.", maxScore: 50, maxDecimals: 0});
@@ -41,6 +42,7 @@ class Achievements {
 		createAchievement('two_keys',				{name: "Just the Two of Us", description: "Finish a Song pressing only two keys."});
 		createAchievement('toastie',				{name: "Toaster Gamer", description: "Have you tried to run the game on a toaster?"});
 		createAchievement('debugger',				{name: "Debugger", description: "Beat the \"Test\" Stage from the Chart Editor.", hidden: true});
+		createAchievement('pessy_easter_egg',		{name: "Engine Gal Pal", description: "Teehee, you found me~!", hidden: true});
 
 		//dont delete this thing below
 		_originalLength = _sortID + 1;

source/backend/Language.hx

@@ -77,8 +77,10 @@ class Language
 	// More optimized for file loading
 	inline public static function getFileTranslation(key:String)
 	{
+		#if TRANSLATIONS_ALLOWED
 		var str:String = phrases.get(key.trim().toLowerCase());
 		if(str != null) key = str;
+		#end
 		return key;
 	}
 

source/backend/Paths.hx

@@ -173,9 +173,7 @@ class Paths
 	public static var currentTrackedAssets:Map<String, FlxGraphic> = [];
 	static public function image(key:String, ?parentFolder:String = null, ?allowGPU:Bool = true):FlxGraphic
 	{
-		key = Language.getFileTranslation('images/$key');
-		if(key.lastIndexOf('.') < 0) key += '.png';
-
+		key = Language.getFileTranslation('images/$key') + '.png';
 		var bitmap:BitmapData = null;
 		if (currentTrackedAssets.exists(key))
 		{
@@ -303,9 +301,9 @@ class Paths
 		var xml:String = modsXml(key);
 		if(FileSystem.exists(xml)) xmlExists = true;
 
-		return FlxAtlasFrames.fromSparrow(imageLoaded, (xmlExists ? File.getContent(xml) : getPath('images/$key.xml', TEXT, parentFolder)));
+		return FlxAtlasFrames.fromSparrow(imageLoaded, (xmlExists ? File.getContent(xml) : getPath(Language.getFileTranslation('images/$key') + '.xml', TEXT, parentFolder)));
 		#else
-		return FlxAtlasFrames.fromSparrow(imageLoaded, getPath('images/$key.xml', TEXT, parentFolder));
+		return FlxAtlasFrames.fromSparrow(imageLoaded, getPath(Language.getFileTranslation('images/$key') + '.xml', TEXT, parentFolder));
 		#end
 	}
 
@@ -318,9 +316,9 @@ class Paths
 		var txt:String = modsTxt(key);
 		if(FileSystem.exists(txt)) txtExists = true;
 
-		return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, (txtExists ? File.getContent(txt) : getPath('images/$key.txt', TEXT, parentFolder)));
+		return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, (txtExists ? File.getContent(txt) : getPath(Language.getFileTranslation('images/$key') + '.txt', TEXT, parentFolder)));
 		#else
-		return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, getPath('images/$key.txt', TEXT, parentFolder));
+		return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, getPath(Language.getFileTranslation('images/$key') + '.txt', TEXT, parentFolder));
 		#end
 	}
 
@@ -333,9 +331,9 @@ class Paths
 		var json:String = modsImagesJson(key);
 		if(FileSystem.exists(json)) jsonExists = true;
 
-		return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, (jsonExists ? File.getContent(json) : getPath('images/$key.json', TEXT, parentFolder)));
+		return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, (jsonExists ? File.getContent(json) : getPath(Language.getFileTranslation('images/$key') + '.json', TEXT, parentFolder)));
 		#else
-		return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, getPath('images/$key.json', TEXT, parentFolder));
+		return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, getPath(Language.getFileTranslation('images/$key') + '.json', TEXT, parentFolder));
 		#end
 	}
 

source/debug/FPSCounter.hx

@@ -46,19 +46,18 @@ class FPSCounter extends TextField
 	// Event Handlers
 	private override function __enterFrame(deltaTime:Float):Void
 	{
-		// prevents the overlay from updating every frame, why would you need to anyways
-		if (deltaTimeout > 1000) {
-			deltaTimeout = 0.0;
-			return;
-		}
-
 		final now:Float = haxe.Timer.stamp() * 1000;
 		times.push(now);
 		while (times[0] < now - 1000) times.shift();
+		// prevents the overlay from updating every frame, why would you need to anyways @crowplexus
+		if (deltaTimeout < 1000) {
+			deltaTimeout += deltaTime;
+			return;
+		}
 
 		currentFPS = times.length < FlxG.updateFramerate ? times.length : FlxG.updateFramerate;		
 		updateText();
-		deltaTimeout += deltaTime;
+		deltaTimeout = 0.0;
 	}
 
 	public dynamic function updateText():Void { // so people can override it in hscript