1.31.1

Assembly-CSharp.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{F8AB6DF3-BF59-4900-BAE6-3AF59354D9E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{18B247DE-FD2E-4C3A-9604-A5E91FA66E09}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F8AB6DF3-BF59-4900-BAE6-3AF59354D9E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8AB6DF3-BF59-4900-BAE6-3AF59354D9E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8AB6DF3-BF59-4900-BAE6-3AF59354D9E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8AB6DF3-BF59-4900-BAE6-3AF59354D9E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18B247DE-FD2E-4C3A-9604-A5E91FA66E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18B247DE-FD2E-4C3A-9604-A5E91FA66E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18B247DE-FD2E-4C3A-9604-A5E91FA66E09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18B247DE-FD2E-4C3A-9604-A5E91FA66E09}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Assembly-CSharp/Assembly-CSharp.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F8AB6DF3-BF59-4900-BAE6-3AF59354D9E8}</ProjectGuid>
+    <ProjectGuid>{18B247DE-FD2E-4C3A-9604-A5E91FA66E09}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Assembly-CSharp</RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>

Assembly-CSharp/MaidStatus/Status.cs

@@ -1658,6 +1658,24 @@ namespace MaidStatus
 				this.additionalRelation_ = (AdditionalRelation)binary.ReadInt16();
 				this.nickName_ = binary.ReadString();
 				this.age = binary.ReadInt32();
+				if (this.additionalRelation_ == AdditionalRelation.Vigilance)
+				{
+					if (this.relation == Relation.Trust || this.relation == Relation.Lover)
+					{
+						this.additionalRelation_ = AdditionalRelation.Null;
+					}
+					if (this.relation == Relation.Lover)
+					{
+						if ((this.personal.uniqueName == "Muku" && this.GetEventEndFlag(5040)) || (this.personal.uniqueName == "Majime" && this.GetEventEndFlag(5140)) || (this.personal.uniqueName == "Rindere" && this.GetEventEndFlag(5240)))
+						{
+							this.additionalRelation_ = AdditionalRelation.LoverPlus;
+						}
+					}
+					else if (this.relation == Relation.Contact && ((this.personal.uniqueName == "Muku" && this.GetEventEndFlag(5030)) || (this.personal.uniqueName == "Majime" && this.GetEventEndFlag(5130)) || (this.personal.uniqueName == "Rindere" && this.GetEventEndFlag(5230))))
+					{
+						this.additionalRelation_ = AdditionalRelation.Null;
+					}
+				}
 			}
 			uint num9 = binary.ReadUInt32();
 			NDebug.Assert(2177629204u == num9, "メイドパラメータのロードに失敗しました");

Assembly-CSharp/ProfileCtrl.cs

@@ -523,7 +523,10 @@ public class ProfileCtrl : MonoBehaviour
 		if (ProfileCtrl.m_dicPersonal.TryGetValue(selectValue, out personal))
 		{
 			this.m_maidStatus.SetPersonal(personal);
-			this.m_maidStatus.additionalRelation = AdditionalRelation.Vigilance;
+			if (SceneEdit.Instance != null && (SceneEdit.Instance.modeType == SceneEdit.ModeType.OriginalChara || SceneEdit.Instance.modeType == SceneEdit.ModeType.MainChara))
+			{
+				this.m_maidStatus.additionalRelation = AdditionalRelation.Vigilance;
+			}
 			Debug.Log(string.Concat(new object[]
 			{
 				"保存された性格:",

Assembly-CSharp/SceneFreeModeSelectManager.cs

@@ -194,6 +194,7 @@ public class SceneFreeModeSelectManager : WfScreenManager
 				value.seikeiken = status.seikeiken;
 				value.init_seikeiken = status.initSeikeiken;
 				value.relation = status.relation;
+				value.addRelation = status.additionalRelation;
 				value.feature_set = new HashSet<Feature.Data>();
 				foreach (int key2 in status.features.GetKeyArray())
 				{
@@ -239,6 +240,7 @@ public class SceneFreeModeSelectManager : WfScreenManager
 				status.seikeiken = backupData.seikeiken;
 				status.initSeikeiken = backupData.init_seikeiken;
 				status.relation = backupData.relation;
+				status.additionalRelation = backupData.addRelation;
 				int[] keyArray2 = status.features.GetKeyArray();
 				foreach (int featureId in keyArray2)
 				{
@@ -432,5 +434,7 @@ public class SceneFreeModeSelectManager : WfScreenManager
 		public Seikeiken init_seikeiken;
 
 		public Relation relation;
+
+		public AdditionalRelation addRelation;
 	}
 }