ko

hmm.json

@@ -113,7 +113,7 @@
     {
       "name": "lumod",
       "type": "haxelib",
-      "version": "1.0.0"
+      "version": "2.0.0"
     },
     {
       "name": "actuate",

source/Main.hx

@@ -51,7 +51,7 @@ class Main extends Sprite
 	#end
 
 	public static final PSYCH_ONLINE_VERSION:String = "0.9.3";
-	public static final CLIENT_PROTOCOL:Float = 6;
+	public static final CLIENT_PROTOCOL:Float = 7;
 	public static final GIT_COMMIT:String = online.backend.Macros.getGitCommitHash();
 
 	// You can pretty much ignore everything from here on - your code should go in your states.
@@ -112,8 +112,15 @@ class Main extends Sprite
 
 		CoolUtil.setDarkMode(true);
 
-		Lumod.get_scriptsRootPath = () -> {
-			return Lumod.scriptsRootPath = Paths.mods(Mods.currentModDirectory + "/lumod");
+		Lumod.scriptPathHandler = scriptPath -> {
+			var defaultPath:String = 'lumod/' + scriptPath;
+
+			// check if script exists in any of loaded mods
+			var path:String = Paths.modFolders(defaultPath);
+			if (FileSystem.exists(path))
+				return path;
+
+			return defaultPath;
 		}
 		Lumod.classResolver = Deflection.resolveClass;
 

source/backend/ClientPrefs.hx

@@ -59,7 +59,8 @@ class SaveVariables {
 		'instakill' => false,
 		'practice' => false,
 		'botplay' => false,
-		'opponentplay' => false
+		'opponentplay' => false,
+		'nospecialnotes' => false,
 	];
 
 	public var comboOffset:Array<Int> = [0, 0, 0, 0];
@@ -90,6 +91,8 @@ class SaveVariables {
 	public var disableLagDetection:Bool = false;
 	public var groupSongsBy:String = 'No Grouping';
 	public var hiddenSongs:Array<String> = []; //format: 'songname-originfolder'
+	public var favSongs:Array<String> = []; //format: 'songname-originfolder'
+	public var modchartSkinChanges:Bool = false;
 
 	public function new()
 	{
@@ -120,6 +123,7 @@ class ClientPrefs {
 		'reset'			=> [R],
 		'taunt'			=> [SPACE],
 		'sidebar'		=> [GRAVEACCENT],
+		'fav'			=> [Q],
 
 		'volume_mute'	=> [ZERO],
 		'volume_up'		=> [NUMPADPLUS, PLUS],
@@ -144,7 +148,8 @@ class ClientPrefs {
 		'pause'			=> [START],
 		'reset'			=> [BACK],
 		'taunt'			=> [A],
-		'sidebar'		=> []
+		'sidebar'		=> [],
+		'fav'			=> []
 	];
 	public static var defaultKeys:Map<String, Array<FlxKey>> = null;
 	public static var defaultButtons:Map<String, Array<FlxGamepadInputID>> = null;

source/backend/Controls.hx

@@ -81,12 +81,14 @@ class Controls
 	public var RESET(get, never):Bool;
 	public var TAUNT(get, never):Bool;
 	public var SIDEBAR(get, never):Bool;
+	public var FAV(get, never):Bool;
 	private function get_ACCEPT() return justPressed('accept');
 	private function get_BACK() return justPressed('back');
 	private function get_PAUSE() return justPressed('pause');
 	private function get_RESET() return justPressed('reset');
 	private function get_TAUNT() return justPressed('taunt');
 	private function get_SIDEBAR() return justPressed('sidebar');
+	private function get_FAV() return justPressed('fav');
 
 	//Gamepad & Keyboard stuff
 	public var keyboardBinds:Map<String, Array<FlxKey>>;

source/online/GameClient.hx

@@ -196,9 +196,9 @@ class GameClient {
 			options.set("skinURL", OnlineMods.getModURL(ClientPrefs.data.modSkin[0]));
 		}
 
-		if (asHost) {
-			options.set("gameplaySettings", ClientPrefs.data.gameplaySettings);
-		}
+		// if (asHost) {
+		// 	options.set("gameplaySettings", ClientPrefs.data.gameplaySettings);
+		// }
 
 		return options;
 	}

source/online/states/OnlineState.hx

@@ -332,6 +332,17 @@ class OnlineState extends MusicBeatState {
 						// FlxG.openURL(GameClient.serverAddress + "/rooms");
 						FlxG.switchState(() -> new FindRoomState());
 					case "host":
+						var count:Float = 0;
+						for (mod in Mods.getModDirectories()) {
+							var url = OnlineMods.getModURL(mod);
+							if (url == null || !(url.startsWith('https://') || url.startsWith('http://')))
+								count++;
+						}
+
+						if (count > 0) {
+							Alert.alert('WARNING', count + ' of your mods doesn\'t have a valid URL set!');
+						}
+
 						disableInput = true;
 						GameClient.createRoom(GameClient.serverAddress, onRoomJoin);
 					case "options":

source/online/states/ResultsState.hx

@@ -199,13 +199,13 @@ class ResultsState extends MusicBeatState {
 
 		switch (GameClient.room.state.winCondition) {
 			case 0:
-				winner = (getPlayer(1).score >= getPlayer(2).score ? 0 : 1);
-				if (getPlayer(1).score == getPlayer(2).score)
-					winner = -1;
-			case 1:
 				winner = (p1Accuracy >= p2Accuracy ? 0 : 1);
 				if (p1Accuracy == p2Accuracy)
 					winner = -1;
+			case 1:
+				winner = (getPlayer(1).score >= getPlayer(2).score ? 0 : 1);
+				if (getPlayer(1).score == getPlayer(2).score)
+					winner = -1;
 			case 2:
 				winner = (getPlayer(1).misses <= getPlayer(2).misses ? 0 : 1);
 				if (getPlayer(1).misses == getPlayer(2).misses)
@@ -416,7 +416,7 @@ class ResultsState extends MusicBeatState {
 		if (FlxG.keys.justPressed.F12) {
 			trace('reloading lumod');
 			Lumod.cache.scripts.clear();
-			luaLoad();
+			lmLoad();
 		}
 
 		if (luaValue == false)

source/online/states/RoomState.hx

@@ -615,7 +615,7 @@ class RoomState extends MusicBeatState {
 		if (FlxG.keys.justPressed.F12) {
 			trace('reloading lumod');
 			Lumod.cache.scripts.clear();
-			luaLoad();
+			lmLoad();
 		}
 
 		if (!GameClient.isConnected())

source/online/states/SetupModsState.hx

@@ -151,10 +151,11 @@ class SetupModsState extends MusicBeatState {
 				item.text = "> " + item.text + " <";
 				item.alpha = 1;
 			}
-			if (modsInput[item.ID].startsWith("http://") || modsInput[item.ID].startsWith("https://"))
-				item.color = FlxColor.LIME;
-			else
+
+			if (modsInput[item.ID] == null || !(modsInput[item.ID].startsWith('https://') || modsInput[item.ID].startsWith('http://')))
 				item.color = FlxColor.RED;
+			else
+				item.color = FlxColor.LIME;
 			item.screenCenter(X);
 		}
     }

source/online/states/SkinsState.hx

@@ -374,7 +374,7 @@ class SkinsState extends MusicBeatState {
 		camFollow.setPosition(FlxG.width / 2, FlxG.height / 2);
 
 		if (stopUpdates) {
-			camFollow.y += !ClientPrefs.data.lowQuality ? 800 : 200;
+			camFollow.y += !ClientPrefs.data.lowQuality ? 600 : 200;
 			return;
 		}
 
@@ -396,6 +396,9 @@ class SkinsState extends MusicBeatState {
 				if (controls.NOTE_RIGHT) {
 					character.members[0].playAnim("singRIGHT");
 				}
+				if (controls.TAUNT) {
+					character.members[0].playAnim("taunt");
+				}
 			}
         }
         else {
@@ -433,11 +436,7 @@ class SkinsState extends MusicBeatState {
 			}));
 		}
 
-        if (controls.BACK) {
-			switchState(() -> Type.createInstance(backClass, []));
-        }
-
-        if (controls.ACCEPT) {
+		if (!FlxG.keys.pressed.SHIFT && controls.ACCEPT) {
 			var charName = charactersName[curCharacter];
 			if (charName.endsWith("-player"))
 				charName = charName.substring(0, charName.length - "-player".length);
@@ -468,6 +467,10 @@ class SkinsState extends MusicBeatState {
 				character.members[0].playAnim("hey", true);
         }
 
+		if (controls.BACK || (!FlxG.keys.pressed.SHIFT && controls.ACCEPT)) {
+			switchState(() -> Type.createInstance(backClass, []));
+		}
+
 		if (FlxG.keys.justPressed.EIGHT) {
 			Mods.currentModDirectory = charactersMod.get(charactersName[curCharacter]);
 			switchState(() -> new CharacterEditorState(charactersName[curCharacter], false, true));

source/online/substates/RoomSettingsSubstate.hx

@@ -119,9 +119,9 @@ class RoomSettingsSubstate extends MusicBeatSubstate {
 			if (GameClient.room.state.winCondition != prevCond) {
 				switch (GameClient.room.state.winCondition) {
 					case 0:
-						winCondition.descText.text = 'Player with the most Score wins!';
-					case 1:
 						winCondition.descText.text = 'Player with the highest Accuracy wins!';
+					case 1:
+						winCondition.descText.text = 'Player with the most Score wins!';
 					case 2:
 						winCondition.descText.text = 'Player with the least Misses wins!';
 					case 3:

source/options/ControlsSubState.hx

@@ -35,6 +35,7 @@ class ControlsSubState extends MusicBeatSubstate
 		[true, 'Back', 'back', 'Back'],
 		[true, 'Pause', 'pause', 'Pause'],
 		[true, 'Sidebar', 'sidebar', 'Sidebar'],
+		[true, 'Favorite', 'fav', 'Favorite'],
 		[false],
 		[false, 'VOLUME'],
 		[false, 'Mute', 'volume_mute', 'Volume Mute'],

source/options/GameplaySettingsSubState.hx

@@ -133,6 +133,12 @@ class GameplaySettingsSubState extends BaseOptionsMenu
 			'bool');
 		addOption(option);
 
+		var option:Option = new Option('Modchart Skin Changes',
+			'If enabled, the song events will change the character of your active skin',
+			'modchartSkinChanges',
+			'bool');
+		addOption(option);
+
 		super();
 	}
 

source/options/VisualsUISubState.hx

@@ -202,7 +202,7 @@ class VisualsUISubState extends BaseOptionsMenu
 			"How should songs on Freeplay menu be group by?",
 			'groupSongsBy',
 			'string',
-			['No Grouping', 'Alphabetically', 'Modpack', 'Hidden']);
+			['No Grouping', 'Alphabetically', 'Modpack', 'Favorites', 'Hidden']);
 		addOption(option);
 
 		super();