SEPERATE VOICES SUPPORT HOLY SHIT

also btw i moved to haxe 4.3.3 just to get this working, im very stupid like some of you guys

story of underlate

Project.xml

@@ -26,6 +26,7 @@
 	<haxedef name="NDLLS_ALLOWED" if="cpp"/>
 	<!--<define name="FREEPLAY_SECTIONS" />-->
 	<define name="ACHIEVEMENTS_ALLOWED" />
+	<!--<define name="BUTTPLUG_ALLOWED" />-->
 	<define name="LOADING_SCREEN" />
 	<define name="VIDEOS_ALLOWED" if="windows || linux || android" unless="32bits" /><!-- wait why is there some hints of an official android port wtf -->
 	<define name="ALLEYWAY_WATERMARKS" />

source/backend/ButtplugUtils.hx

@@ -7,7 +7,7 @@ import flixel.util.FlxTimer;
 
 using StringTools;
 
-class ButtplugUtils {
+#if BUTTPLUG_ALLOWED class ButtplugUtils {
     //no, i'm not kidding.
     //This class simplifies the process of setting up and using the buttplug frontend.
     //It's not perfect at the minute as I wrote this literally yesterday, but it (sorta) works.
@@ -354,3 +354,4 @@ class ButtplugUtils {
         }
     }
 }
+#end

source/backend/MusicBeatState.hx

@@ -23,11 +23,9 @@ class MusicBeatState extends FlxUIState
 	private var curDecStep:Float = 0;
 	private var curDecBeat:Float = 0;
 	public var controls(get, never):Controls;
-	private function get_controls()
-	{
+	inline private function get_controls()
 		return Controls.instance;
-	}
-
+
 	//public static var camBeat:FlxCamera;
 	var _psychCameraInitialized:Bool = false;
 

source/backend/Paths.hx

@@ -235,10 +235,12 @@ class Paths
 	{
 		return getPath('shaders/$key.frag', TEXT, library);
 	}
+
 	inline static public function shaderVertex(key:String, ?library:String)
 	{
 		return getPath('shaders/$key.vert', TEXT, library);
 	}
+
 	inline static public function lua(key:String, ?library:String)
 	{
 		return getPath('$key.lua', TEXT, library);
@@ -262,25 +264,23 @@ class Paths
 	}
 
 	inline static public function soundRandom(key:String, min:Int, max:Int, ?library:String)
-	{
 		return sound(key + FlxG.random.int(min, max), library);
-	}
 
 	inline static public function music(key:String, ?library:String):Sound
 	{
 		var file:Sound = returnSound('music', key, library);
 		return file;
 	}
 
-	inline static public function voices(song:String):Any
-	{
+	inline static public function voices(song:String, postfix:String = null):Any {
 		var songKey:String = '${formatToSongPath(song)}/Voices';
+		if(postfix != null) songKey += '-' + postfix;
+
 		var voices = returnSound(null, songKey, 'songs');
 		return voices;
 	}
 
-	inline static public function inst(song:String):Any
-	{
+	inline static public function inst(song:String):Any {
 		var songKey:String = '${formatToSongPath(song)}/Inst';
 		var inst = returnSound(null, songKey, 'songs');
 		return inst;
@@ -503,7 +503,8 @@ class Paths
 			if(path == 'songs') folder = 'songs:';
 
 			var retKey:String = (path != null) ? '$path/$key' : key;
-			currentTrackedSounds.set(gottenPath, OpenFlAssets.getSound(folder + getPath('$retKey.$SOUND_EXT', SOUND, library)));
+			retKey = ((path == 'songs') ? 'songs:' : '') + getPath('$retKey.$SOUND_EXT', SOUND, library);
+			if(OpenFlAssets.exists(retKey, SOUND)) currentTrackedSounds.set(gottenPath, OpenFlAssets.getSound(retKey));
 		}
 		#end
 		localTrackedAssets.push(gottenPath);

source/backend/Section.hx

@@ -1,34 +1,24 @@
 package backend;
 
-typedef SwagSection =
-{
+typedef SwagSection = {
 	var sectionNotes:Array<Dynamic>;
 	var sectionBeats:Float;
-	var typeOfSection:Int;
+	//var typeOfSection:Int;
 	var mustHitSection:Bool;
 	var gfSection:Bool;
 	var bpm:Float;
 	var changeBPM:Bool;
 	var altAnim:Bool;
 }
 
-class Section
-{
+class Section {
 	public var sectionNotes:Array<Dynamic> = [];
 
 	public var sectionBeats:Float = 4;
 	public var gfSection:Bool = false;
-	public var typeOfSection:Int = 0;
+	//public var typeOfSection:Int = 0;
 	public var mustHitSection:Bool = true;
 
-	/**
-	 *	Copies the first section into the second section!
-	 */
-	public static var COPYCAT:Int = 0;
-
 	public function new(sectionBeats:Float = 4)
-	{
 		this.sectionBeats = sectionBeats;
-		trace('test created section: ' + sectionBeats);
-	}
 }

source/objects/Character.hx

@@ -26,6 +26,7 @@ typedef CharacterFile = {
 	var flip_x:Bool;
 	var no_antialiasing:Bool;
 	var healthbar_colors:Array<Int>;
+	var vocals_file:String;
 	@:optional var _editor_isPlayer:Null<Bool>;
 }
 
@@ -66,6 +67,7 @@ class Character extends FlxSprite {
 	public var healthColorArray:Array<Int> = [255, 0, 0]; // i wonder if i can turn this to hex optionally hmmmmm
 
 	public var hasMissAnimations:Bool = false;
+	public var vocalsFile:String = '';
 
 	//Used on Character Editor
 	public var imageFile:String = '';
@@ -96,6 +98,8 @@ class Character extends FlxSprite {
 				#end
 				{
 					path = Paths.getSharedPath('characters/' + DEFAULT_CHARACTER + '.json'); //If a character couldn't be found, change him to BF just to prevent a crash
+					color = FlxColor.BLACK;
+					alpha = 0.6;
 				}
 
 				try {
@@ -168,6 +172,7 @@ class Character extends FlxSprite {
 		flipX = (json.flip_x != isPlayer);
 		healthColorArray = (json.healthbar_colors != null && json.healthbar_colors.length > 2) ? json.healthbar_colors : [161, 161, 161];
 		originalFlipX = (json.flip_x == true);
+		vocalsFile = json.vocals_file ?? '';
 		editorIsPlayer = json._editor_isPlayer;
 		// antialiasing
 		noAntialiasing = (json.no_antialiasing == true);

source/options/GraphicsSettingsSubState.hx

@@ -9,7 +9,7 @@ class GraphicsSettingsSubState extends BaseOptionsMenu {
 		title = 'Graphics';
 		rpcTitle = 'Graphics Settings Menu'; //for Discord Rich Presence
 
-		boyfriend = new Character(840, 170, 'bf', true);
+		boyfriend = new Character(700, 170, 'bf', true);
 		boyfriend.setGraphicSize(Std.int(boyfriend.width * 0.75));
 		boyfriend.updateHitbox();
 		boyfriend.dance();

source/states/CharacterSelectionState.hx

@@ -5,7 +5,7 @@ import objects.HealthIcon;
 
 /**
     This is not from the Dave & Bambi source code, it's completely made by Delta.
-    Modified by Altertoriel. (Ported to Psych 0.7.3)
+    Modified by Altertoriel and CharlesCatYY. (Ported to Alleyway Engine/Psych 0.7.3)
 **/
 
 class CharacterSelectionState extends MusicBeatState {
@@ -57,7 +57,7 @@ class CharacterSelectionState extends MusicBeatState {
 	var camHUD:FlxCamera;
 
 	override function create() {
-		#if DISCORD_ALLOWED DiscordClient.changePresence('Selecting Character'); #end
+		#if desktop DiscordClient.changePresence('Selecting a Character'); #end
 
 		persistentUpdate = true;
 

source/states/CreditsState.hx

@@ -50,7 +50,7 @@ class CreditsState extends MusicBeatState {
 			['eeveelover64',				'eeveelover',					'Supporter',		 'https://www.youtube.com/channel/UCh17ETeneDIuQD5NndCHpfA',									 'A1A1A1'],
 			['GarageBandCoverGuy96',				'gbcg',					'Menu Music & Ex-Composer\n(Icon will be added later)',		 'https://www.youtube.com/channel/UCspMkVJ4GiIENSgKcoNBZYQ',									 'A1A1A1'],
 			['SugarRatio',				'sugarratio',					'Made Denotator',		 'https://twitter.com/SugarRatio',									 'A1A1A1'],
-			['GsDrunkestDriver',				'gsdd',			'Buttplug Support\n(Icon will be added later)',											 'https://github.com/GsDrunkestDriver',		 'A1A1A1'],
+			#if BUTTPLUG_ALLOWED ['GsDrunkestDriver',				'gsdd',			'Buttplug Support\n(Icon will be added later)',											 'https://github.com/GsDrunkestDriver',		 'A1A1A1'], #end
 			[''],
 			['Former Foxa Mod Devs'],
 			['JoerOnTheBlower',				'joer',					'Ex-Director of Vs. Foxa\nI don\'t support them.',		 '',									 'A1A1A1'],

source/states/MainMenuState.hx

@@ -64,7 +64,7 @@ class MainMenuState extends MusicBeatState {
 		"vile fnf (-BambiTGA)",
 		"I'm gonna stop updating Psych Engine soon. (-ShadowMario)",
 		"Its already been 1 beer... (-cyborg henry)",
-		"are you learning about rocks (-TheAmimateMan)",
+		"are you learning about rocks (-TheAnimateMan)",
 		"this is FANUM TAX! first i GYATT your brother... now i RIZZ you! SKIBIDI my friend! (-Foxa The Artist)",
 		"sorry i may have taken a bite out of your chicken (-cyborg henry)",
 		"Damn how many fnf mods are ya'll making1?!?! (-ItsToppy)",