Modify profile fallback behaviour

Author: Perdition-117

CostumeEdit.cs

@@ -96,13 +96,13 @@ private static Configuration.Costume CreateCostume(Maid maid, CostumeScene scene
 		Configuration.Costume newCostume;
 		if (requestedProfile == CostumeProfile.Personal && DressCode.TryGetMaidProfile(maid, scene, out var maidProfile) && maidProfile.HasCostume) {
 			DressCode.LogDebug("Creating costume from maid profile...");
-			newCostume = DressCode.CloneCostume(maidProfile.Costume);
-		} else if (DressCode.TryGetSceneProfile(scene, out var sceneProfile) && sceneProfile.HasCostume) {
+			newCostume = CloneCostume(maidProfile.Costume);
+		} else if (requestedProfile == CostumeProfile.Shared && DressCode.TryGetSceneProfile(scene, out var sceneProfile) && sceneProfile.HasCostume) {
 			DressCode.LogDebug("Creating costume from scene profile...");
-			newCostume = DressCode.CloneCostume(sceneProfile.Costume);
+			newCostume = CloneCostume(sceneProfile.Costume);
 		} else {
 			DressCode.LogDebug("Creating costume from maid props...");
-			newCostume = DressCode.CloneCostume(maid);
+			newCostume = CloneCostume(maid);
 		}
 		_enabledMpn.Clear();
 		foreach (var item in newCostume.Items) {
@@ -111,6 +111,24 @@ private static Configuration.Costume CreateCostume(Maid maid, CostumeScene scene
 		return newCostume;
 	}
 
+	private static Configuration.Costume CloneCostume(Configuration.Costume costume) {
+		DressCode.LogDebug($"CloneCostume");
+		var newCostume = new Configuration.Costume();
+		foreach (var item in costume.Items) {
+			newCostume.AddItem(item.Slot, item.FileName, item.IsEnabled);
+		}
+		return newCostume;
+	}
+
+	private static Configuration.Costume CloneCostume(Maid maid) {
+		var newCostume = new Configuration.Costume();
+		foreach (var mpn in AvailableMpn) {
+			var prop = maid.GetProp(mpn);
+			newCostume.AddItem((MPN)prop.idx, prop.strFileName);
+		}
+		return newCostume;
+	}
+
 	private static void SaveCostume(Maid maid, CostumeScene scene) {
 		var newCostume = new Configuration.Costume();
 

DressCode.cs

@@ -70,40 +70,28 @@ internal static bool TryGetSceneProfile(CostumeScene scene, out Configuration.Sc
 		return _config.TryGetSceneProfile(scene, out profile);
 	}
 
-	private static Configuration.Costume GetEffectiveCostume(Maid maid, CostumeScene scene) {
-		var hasMaidProfile = _config.TryGetMaidProfile(maid, scene, out var profile);
-
-		if (hasMaidProfile && profile.PreferredProfile == CostumeProfile.Personal && profile.HasCostume) {
-			return profile.Costume;
-		}
-
+	private static bool TryGetEffectiveCostume(Maid maid, CostumeScene scene, out Configuration.Costume costume) {
+		var hasMaidProfile = _config.TryGetMaidProfile(maid, scene, out var maidProfile);
 		var hasSceneProfile = _config.TryGetSceneProfile(scene, out var sceneProfile);
-		var tryScene = !hasMaidProfile || (profile.PreferredProfile == CostumeProfile.Personal && !profile.HasCostume) || profile.PreferredProfile == CostumeProfile.Shared;
-		var hasSceneCostume = hasSceneProfile && sceneProfile.PreferredProfile == CostumeProfile.Shared && sceneProfile.HasCostume;
-
-		if ((!(hasMaidProfile && !tryScene)) && hasSceneCostume) {
-			return sceneProfile.Costume;
-		}
-
-		return CloneCostume(maid);
-	}
 
-	internal static Configuration.Costume CloneCostume(Configuration.Costume costume) {
-		LogDebug($"CloneCostume");
-		var newCostume = new Configuration.Costume();
-		foreach (var item in costume.Items) {
-			newCostume.AddItem(item.Slot, item.FileName, item.IsEnabled);
+		if (hasMaidProfile) {
+			if (maidProfile.PreferredProfile == CostumeProfile.Personal && maidProfile.HasCostume) {
+				costume = maidProfile.Costume;
+				return true;
+			}
+			if (maidProfile.PreferredProfile == CostumeProfile.Shared && hasSceneProfile && sceneProfile.HasCostume) {
+				costume = sceneProfile.Costume;
+				return true;
+			}
+		} else if (hasSceneProfile) {
+			if (sceneProfile.PreferredProfile == CostumeProfile.Shared && sceneProfile.HasCostume) {
+				costume = sceneProfile.Costume;
+				return true;
+			}
 		}
-		return newCostume;
-	}
 
-	internal static Configuration.Costume CloneCostume(Maid maid) {
-		var newCostume = new Configuration.Costume();
-		foreach (var mpn in CostumeEdit.AvailableMpn) {
-			var prop = maid.GetProp(mpn);
-			newCostume.AddItem((MPN)prop.idx, prop.strFileName);
-		}
-		return newCostume;
+		costume = null;
+		return false;
 	}
 
 	internal static CostumeProfile GetPreferredProfile(Maid maid, CostumeScene scene) {
@@ -139,11 +127,14 @@ internal static void LoadCostume(Maid maid, Configuration.Costume costume, bool
 	}
 
 	private static void SetCostume(Maid maid, CostumeScene scene) {
+		if (!TryGetEffectiveCostume(maid, scene, out var costume)) {
+			return;
+		}
+
 		LogDebug($"Setting costume for {maid.name}");
 
-		var costume = GetEffectiveCostume(maid, scene);
-		if (costume == null) return;
 		GameMain.instance.StartCoroutine(WaitMaidPropBusy(maid, () => {
+			BackupCostume(maid);
 			LoadCostume(maid, costume);
 			maid.AllProcPropSeqStart();
 		}));
@@ -235,7 +226,6 @@ private static void OnSceneLoaded(Scene scene, LoadSceneMode mode) {
 		for (var i = 0; i < numMaids; i++) {
 			var maid = GameMain.Instance.CharacterMgr.GetMaid(i);
 			if (maid != null && maid.body0 && !_originalCostume.ContainsKey(maid.status.guid)) {
-				BackupCostume(maid);
 				SetCostume(maid, costumeScene);
 			}
 		}
@@ -274,7 +264,6 @@ private static void YotogiSubCharacterSelectManager_OnFinish(YotogiSubCharacterS
 		// secondary yotogi maids are not yet loaded on sceneLoaded, so we fix them here
 		foreach (var maid in __instance.loaded_check_maid_) {
 			if (maid != null && !_originalCostume.ContainsKey(maid.status.guid)) {
-				BackupCostume(maid);
 				SetCostume(maid, CostumeScene.Yotogi);
 			}
 		}