0.4.1

Project.xml

@@ -36,7 +36,7 @@
 
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
-	<set name="BUILD_DIR" value="export/32bit" if="32bit" />
+	<set name="BUILD_DIR" value="export/32bit" if="32" />
 
 	<classpath name="source" />
 
@@ -45,9 +45,9 @@
 
 	<!-- PSYCH ENGINE CUSTOMIZATION -->
 	<define name="MODS_ALLOWED" if="desktop" />
-	<define name="LUA_ALLOWED" if="desktop" />
+	<define name="LUA_ALLOWED" if="windows" />
 	<define name="ACHIEVEMENTS_ALLOWED" />
-	<define name="VIDEOS_ALLOWED" if="web || windows" />
+	<define name="VIDEOS_ALLOWED" if="web || windows" unless="32"/>
 
 	<!-- <define name="PRELOAD_ALL" /> -->
 	<define name="PRELOAD_ALL" unless="web" />

art/build_x32.bat

@@ -2,7 +2,7 @@
 color 0a
 cd ..
 echo BUILDING GAME
-lime build windows -release -32bit
+lime build windows -32 -release
 echo.
 echo done.
 pause

example_mods/images/dialogue/readme.txt

@@ -1 +1,4 @@
-Drop your Dialogue characters shit here
+Drop your Dialogue characters shit here
+
+If you're asking "How do i make dialogues play?" or any other questions, read this:
+https://github.com/ShadowMario/FNF-PsychEngine/wiki/Dialogues

example_mods/images/menubackgrounds/readme.txt

@@ -0,0 +1,2 @@
+Put your week backgrounds here!
+They must start with "menu_"

example_mods/images/storymenu/readme.txt

@@ -0,0 +1 @@
+Put your week image here!

source/Character.hx

@@ -94,7 +94,7 @@ class Character extends FlxSprite
 			default:
 				var characterPath:String = 'characters/' + curCharacter + '.json';
 				#if MODS_ALLOWED
-				var path:String = Paths.mods(characterPath);
+				var path:String = Paths.modFolders(characterPath);
 				if (!FileSystem.exists(path)) {
 					path = Paths.getPreloadPath(characterPath);
 				}

source/CreditsState.hx

@@ -28,11 +28,13 @@ class CreditsState extends MusicBeatState
 		['Shadow Mario',		'shadowmario',		'Main Programmer of Psych Engine',					'https://twitter.com/Shadow_Mario_',	0xFFFFDD33],
 		['RiverOaken',			'riveroaken',		'Main Artist/Animator of Psych Engine',				'https://twitter.com/river_oaken',		0xFFC30085],
 		[''],
-		['Contributors'],
+		['Engine Contributors'],
+		['shubs',				'shubs',			'New Input System Programmer',						'https://twitter.com/yoshubs',			0xFF4494E6],
 		['PolybiusProxy',		'polybiusproxy',	'.MP4 Video Loader Extension',						'https://twitter.com/polybiusproxy',	0xFFE01F32],
 		['gedehari',			'gedehari',			'Chart Editor\'s Sound Waveform base',				'https://twitter.com/gedehari',			0xFFFF9300],
 		['Keoiki',				'keoiki',			'Note Splash Animations',							'https://twitter.com/Keoiki_',			0xFFFFFFFF],
 		['SandPlanet',			'sandplanet',		'Psych Engine Preacher\nAlso cool guy lol',			'https://twitter.com/SandPlanetNG',		0xFFD10616],
+		['bubba',				'bubba',		'Guest Composer for "Hot Dilf"',	'https://www.youtube.com/channel/UCxQTnLmv0OAS63yzk9pVfaw',	0xFF61536A],
 		[''],
 		["Funkin' Crew"],
 		['ninjamuffin99',		'ninjamuffin99',	"Programmer of Friday Night Funkin'",				'https://twitter.com/ninja_muffin99',	0xFFF73838],

source/CustomFadeTransition.hx

@@ -12,10 +12,12 @@ import flixel.util.FlxColor;
 import flixel.util.FlxGradient;
 import flixel.FlxSubState;
 import flixel.FlxSprite;
+import flixel.FlxCamera;
 
 class CustomFadeTransition extends MusicBeatSubstate {
 	public static var finishCallback:Void->Void;
 	private var leTween:FlxTween = null;
+	public static var nextCamera:FlxCamera;
 	var isTransIn:Bool = false;
 	var transBlack:FlxSprite;
 	var transGradient:FlxSprite;
@@ -54,6 +56,12 @@ class CustomFadeTransition extends MusicBeatSubstate {
 				},
 			ease: FlxEase.linear});
 		}
+
+		if(nextCamera != null) {
+			transBlack.cameras = [nextCamera];
+			transGradient.cameras = [nextCamera];
+		}
+		nextCamera = null;
 	}
 
 	override function update(elapsed:Float) {

source/DialogueBox.hx

@@ -28,6 +28,7 @@ class DialogueBox extends FlxSpriteGroup
 
 	public var finishThing:Void->Void;
 	public var nextDialogueThing:Void->Void = null;
+	public var skipDialogueThing:Void->Void = null;
 
 	var portraitLeft:FlxSprite;
 	var portraitRight:FlxSprite;
@@ -226,6 +227,10 @@ class DialogueBox extends FlxSpriteGroup
 			{
 				FlxG.sound.play(Paths.sound('clickText'), 0.8);
 				swagDialogue.skip();
+
+				if(skipDialogueThing != null) {
+					skipDialogueThing();
+				}
 			}
 		}
 

source/DialogueBoxPsych.hx

@@ -85,7 +85,7 @@ class DialogueCharacter extends FlxSprite
 		var rawJson = null;
 
 		#if MODS_ALLOWED
-		var path:String = Paths.mods(characterPath);
+		var path:String = Paths.modFolders(characterPath);
 		if (!FileSystem.exists(path)) {
 			path = Paths.getPreloadPath(characterPath);
 		}
@@ -125,6 +125,13 @@ class DialogueCharacter extends FlxSprite
 				leAnim = arrayAnims[FlxG.random.int(0, arrayAnims.length-1)];
 			}
 		}
+
+		if(dialogueAnimations.exists(leAnim) &&
+		(dialogueAnimations.get(leAnim).loop_name == null ||
+		dialogueAnimations.get(leAnim).loop_name.length < 1 ||
+		dialogueAnimations.get(leAnim).loop_name == dialogueAnimations.get(leAnim).idle_name)) {
+			playIdle = true;
+		}
 		animation.play(playIdle ? leAnim + IDLE_SUFFIX : leAnim, false);
 
 		if(dialogueAnimations.exists(leAnim)) {
@@ -156,6 +163,7 @@ class DialogueBoxPsych extends FlxSpriteGroup
 
 	public var finishThing:Void->Void;
 	public var nextDialogueThing:Void->Void = null;
+	public var skipDialogueThing:Void->Void = null;
 	var bgFade:FlxSprite = null;
 	var box:FlxSprite;
 	var textToType:String = '';
@@ -253,6 +261,8 @@ class DialogueBoxPsych extends FlxSpriteGroup
 					x = FlxG.width - char.width + RIGHT_CHAR_X;
 					char.x = x - offsetPos;
 			}
+			x += char.jsonFile.position[0];
+			y += char.jsonFile.position[1];
 			char.x += char.jsonFile.position[0];
 			char.y += char.jsonFile.position[1];
 			char.startingPos = (saveY ? y : x);
@@ -280,6 +290,10 @@ class DialogueBoxPsych extends FlxSpriteGroup
 					}
 					daText = new Alphabet(DEFAULT_TEXT_X, DEFAULT_TEXT_Y, textToType, false, true, 0.0, 0.7);
 					add(daText);
+
+					if(skipDialogueThing != null) {
+						skipDialogueThing();
+					}
 				} else if(currentText >= dialogueList.dialogue.length) {
 					dialogueEnded = true;
 					for (i in 0...textBoxTypes.length) {
@@ -340,7 +354,7 @@ class DialogueBoxPsych extends FlxSpriteGroup
 									if(char.x < char.startingPos + offsetPos) char.x = char.startingPos + offsetPos;
 								case 'center':
 									char.y += scrollSpeed * elapsed;
-									if(char.y > FlxG.height + 50) char.y = FlxG.height + 50;
+									if(char.y > char.startingPos + FlxG.height) char.y = char.startingPos + FlxG.height;
 								case 'right':
 									char.x += scrollSpeed * elapsed;
 									if(char.x > char.startingPos - offsetPos) char.x = char.startingPos - offsetPos;
@@ -428,7 +442,7 @@ class DialogueBoxPsych extends FlxSpriteGroup
 		if(curDialogue.boxState == null) curDialogue.boxState = 'normal';
 		if(curDialogue.speed == null || Math.isNaN(curDialogue.speed)) curDialogue.speed = 0.05;
 
-		var animName:String = curDialogue.expression;
+		var animName:String = curDialogue.boxState;
 		var boxType:String = textBoxTypes[0];
 		for (i in 0...textBoxTypes.length) {
 			if(textBoxTypes[i] == animName) {

source/FreeplayState.hx

@@ -47,21 +47,25 @@ class FreeplayState extends MusicBeatState
 
 	override function create()
 	{
+		#if MODS_ALLOWED
+		Paths.destroyLoadedImages(true);
+		#end
 		WeekData.reloadWeekFiles(false);
 		#if desktop
 		// Updating Discord Rich Presence
 		DiscordClient.changePresence("In the Menus", null);
 		#end
 
 		for (i in 0...WeekData.weeksList.length) {
-			var leWeek:WeekFile = WeekData.weeksLoaded.get(WeekData.weeksList[i]);
+			var leWeek:WeekData = WeekData.weeksLoaded.get(WeekData.weeksList[i]);
 			var leSongs:Array<String> = [];
 			var leChars:Array<String> = [];
 			for (j in 0...leWeek.songs.length) {
 				leSongs.push(leWeek.songs[j][0]);
 				leChars.push(leWeek.songs[j][1]);
 			}
 
+			WeekData.setDirectoryFromWeek(leWeek);
 			for (song in leWeek.songs) {
 				var colors:Array<Int> = song[2];
 				if(colors == null || colors.length < 3) {
@@ -70,6 +74,7 @@ class FreeplayState extends MusicBeatState
 				addSong(song[0], i, song[1], FlxColor.fromRGB(colors[0], colors[1], colors[2]));
 			}
 		}
+		WeekData.setDirectoryFromWeek();
 
 		var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));
 		for (i in 0...initSonglist.length)
@@ -98,6 +103,7 @@ class FreeplayState extends MusicBeatState
 			songText.targetY = i;
 			grpSongs.add(songText);
 
+			Paths.currentModDirectory = songs[i].folder;
 			var icon:HealthIcon = new HealthIcon(songs[i].songCharacter);
 			icon.sprTracker = songText;
 
@@ -109,6 +115,7 @@ class FreeplayState extends MusicBeatState
 			// DONT PUT X IN THE FIRST PARAMETER OF new ALPHABET() !!
 			// songText.screenCenter(X);
 		}
+		WeekData.setDirectoryFromWeek();
 
 		scoreText = new FlxText(FlxG.width * 0.7, 5, 0, "", 32);
 		scoreText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, RIGHT);
@@ -244,6 +251,7 @@ class FreeplayState extends MusicBeatState
 		if(space && instPlaying != curSelected)
 		{
 			destroyFreeplayVocals();
+			Paths.currentModDirectory = songs[curSelected].folder;
 			var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty);
 			PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase());
 			if (PlayState.SONG.needsVoices)
@@ -379,6 +387,7 @@ class FreeplayState extends MusicBeatState
 			}
 		}
 		changeDiff();
+		Paths.currentModDirectory = songs[curSelected].folder;
 	}
 
 	private function positionHighscore() {
@@ -397,12 +406,15 @@ class SongMetadata
 	public var week:Int = 0;
 	public var songCharacter:String = "";
 	public var color:Int = -7179779;
+	public var folder:String = "";
 
 	public function new(song:String, week:Int, songCharacter:String, color:Int)
 	{
 		this.songName = song;
 		this.week = week;
 		this.songCharacter = songCharacter;
 		this.color = color;
+		this.folder = Paths.currentModDirectory;
+		if(this.folder == null) this.folder = '';
 	}
 }