Fallout 4 1.5.157.0 support

Added support for the latest Fallout 4 version.
Nexus-Mods · Apr 27, 2016 · e5e76cc · e5e76cc
1 parent 19e3788
commit e5e76cc
Showing 1 changed file with 14 additions and 22 deletions.
diff --git a/GamebryoBase/PluginManagement/LoadOrderManager/PluginOrderManager.cs b/GamebryoBase/PluginManagement/LoadOrderManager/PluginOrderManager.cs
@@ -27,7 +27,7 @@ public class PluginOrderManager : ILoadOrderManager, IDisposable
 		private ThreadSafeObservableList<WriteLoadOrderTask> TaskList = new ThreadSafeObservableList<WriteLoadOrderTask>();
 		private IBackgroundTask RunningTask = null;
 		private IBackgroundTask ExternalTask = null;
-		private bool GamePathPluginManagement = false;
+		private bool Fallout4PluginManagement = false;
 
 		#region Events
 
@@ -239,25 +239,25 @@ private void InitializeManager()
 					TimestampOrder = true;
 					ForcedReadOnly = false;
 					SingleFileManagement = false;
-					GamePathPluginManagement = false;
+					Fallout4PluginManagement = false;
 					break;
 				case "Fallout3":
 					TimestampOrder = true;
 					ForcedReadOnly = false;
 					SingleFileManagement = false;
-					GamePathPluginManagement = false;
+					Fallout4PluginManagement = false;
 					break;
 				case "FalloutNV":
 					TimestampOrder = true;
 					ForcedReadOnly = false;
 					SingleFileManagement = false;
-					GamePathPluginManagement = false;
+					Fallout4PluginManagement = false;
 					break;
 				case "Skyrim":
 					TimestampOrder = false;
 					ForcedReadOnly = false;
 					SingleFileManagement = false;
-					GamePathPluginManagement = false;
+					Fallout4PluginManagement = false;
 					break;
 				case "Fallout4":
 					if (GameMode.GameVersion >= new Version(1, 5, 0, 0))
@@ -266,7 +266,7 @@ private void InitializeManager()
 						SingleFileManagement = true;
 						if (GameMode.GameVersion >= new Version(1, 5, 154, 0))
 						{
-							GamePathPluginManagement = true;
+							Fallout4PluginManagement = true;
 							ForcedReadOnly = false;
 						}
 						else
@@ -277,7 +277,7 @@ private void InitializeManager()
 						TimestampOrder = false;
 						ForcedReadOnly = true;
 						SingleFileManagement = false;
-						GamePathPluginManagement = false;
+						Fallout4PluginManagement = false;
 					}
 					break;
 				default:
@@ -305,11 +305,6 @@ private void InitializeManager()
 			else if (SingleFileManagement)
 			{
 				LoadOrderFilePath = Path.Combine(strGameModeLocalAppData, "plugins.txt");
-				if (GamePathPluginManagement)
-					LoadOrderFilePath = Path.Combine(GameMode.ExecutablePath, "plugins.txt");
-				else
-					LoadOrderFilePath = Path.Combine(strGameModeLocalAppData, "plugins.txt");
-
 			}
 			else
 			{
@@ -318,10 +313,7 @@ private void InitializeManager()
 					m_dtiMasterDate = File.GetLastWriteTime(strMasterPlugin);
 			}
 
-			if (GamePathPluginManagement)
-				PluginsFilePath = Path.Combine(GameMode.ExecutablePath, "plugins.txt");
-			else
-				PluginsFilePath = Path.Combine(strGameModeLocalAppData, "plugins.txt");
+			PluginsFilePath = Path.Combine(strGameModeLocalAppData, "plugins.txt");
 
 			Backup(strGameModeLocalAppData);
 
@@ -594,7 +586,7 @@ public string[] GetActivePlugins()
 			{
 				List<string> lstActivePlugins = new List<string>();
 
-				if (GamePathPluginManagement)
+				if (Fallout4PluginManagement)
 				{
 					lstActivePlugins.AddRange(GameMode.OrderedCriticalPluginNames);
 					lstActivePlugins.AddRange(GameMode.OrderedOfficialPluginNames);
@@ -686,7 +678,7 @@ private List<string> GetActiveList()
 			{
 				List<string> lstActivePlugins = new List<string>();
 
-				if (GamePathPluginManagement)
+				if (Fallout4PluginManagement)
 				{
 					lstActivePlugins.AddRange(GameMode.OrderedCriticalPluginNames);
 					lstActivePlugins.AddRange(GameMode.OrderedOfficialPluginNames);
@@ -759,7 +751,7 @@ private void SetActivePluginsTask(string[] p_strActivePlugins)
 				int offset = 0;
 				string[] strPlugins;
 
-				if (GamePathPluginManagement)
+				if (Fallout4PluginManagement)
 				{
 					strPlugins = StripPluginDirectory((LastValidLoadOrder.Except(GameMode.OrderedCriticalPluginNames).Except(GameMode.OrderedOfficialPluginNames)).ToArray());
 					offset = 2;
@@ -858,7 +850,7 @@ private string[] GetSortedListLoadOrder()
 			{
 				List<string> lstOrderedPlugins = new List<string>();
 
-				if (GamePathPluginManagement)
+				if (Fallout4PluginManagement)
 				{
 					lstOrderedPlugins.AddRange(GameMode.OrderedCriticalPluginNames);
 					lstOrderedPlugins.AddRange(GameMode.OrderedOfficialPluginNames);
@@ -1009,7 +1001,7 @@ public void SetLoadOrder(string[] p_strPlugins)
 				string[] strPluginNames;
 				int offset = 0;
 
-				if (GamePathPluginManagement)
+				if (Fallout4PluginManagement)
 				{
 					strOrderedPluginNames = StripPluginDirectory((strOrderedPluginNames.Except(GameMode.OrderedCriticalPluginNames).Except(GameMode.OrderedOfficialPluginNames)).ToArray());
 					offset = 2;
@@ -1083,7 +1075,7 @@ public bool IsPluginActive(string p_strPlugin)
 		{
 			string strPlugin = StripPluginDirectory(p_strPlugin);
 
-			if (GamePathPluginManagement)
+			if (Fallout4PluginManagement)
 			{
 				if (OrderedCriticalPluginNames.Contains(strPlugin, StringComparer.CurrentCultureIgnoreCase))
 					return true;