Added availability selection for quality under settings. Updated presets to include both 2.0 (default) and SA

Author: DanielKote

Foreman/Foreman.csproj

@@ -385,6 +385,15 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <None Include="Presets\Factorio 2.0 Space Age.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Presets\Factorio 2.0 Space Age.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Presets\Factorio 2.0 Space Age.pjson">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Presets\Factorio 2.0 Vanilla.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Foreman/Forms/MainForm.cs

@@ -378,6 +378,7 @@ private async void SettingsButton_Click(object sender, EventArgs e)
 			options.EnabledObjects.UnionWith(GraphViewer.DCache.Assemblers.Values.Where(r => r.Enabled));
 			options.EnabledObjects.UnionWith(GraphViewer.DCache.Beacons.Values.Where(r => r.Enabled));
 			options.EnabledObjects.UnionWith(GraphViewer.DCache.Modules.Values.Where(r => r.Enabled));
+			options.EnabledObjects.UnionWith(GraphViewer.DCache.Qualities.Values.Where(r => r.Enabled));
 
 			using (SettingsForm form = new SettingsForm(options))
 			{
@@ -405,6 +406,9 @@ private async void SettingsButton_Click(object sender, EventArgs e)
 							beacon.Enabled = options.EnabledObjects.Contains(beacon);
 						foreach (Module module in GraphViewer.DCache.Modules.Values)
 							module.Enabled = options.EnabledObjects.Contains(module);
+						foreach (Quality quality in GraphViewer.DCache.Qualities.Values)
+							quality.Enabled = options.EnabledObjects.Contains(quality);
+						GraphViewer.DCache.DefaultQuality.Enabled = true;
 						GraphViewer.DCache.RocketAssembler.Enabled = GraphViewer.DCache.Assemblers["rocket-silo"]?.Enabled?? false;
 					}
 
@@ -459,6 +463,7 @@ private async void SettingsButton_Click(object sender, EventArgs e)
 					Properties.Settings.Default.ShowUnavailable = options.DEV_ShowUnavailableItems;
 					Properties.Settings.Default.Save();
 
+					GraphViewer.Graph.UpdateNodeMaxQualities();
 					GraphViewer.Graph.UpdateNodeStates(true);
 					GraphViewer.Graph.UpdateNodeValues();
 

Foreman/Forms/SettingsForm.Designer.cs

@@ -70,13 +70,15 @@ public SettingsFormOptions(DataCache cache)
 		private List<ListViewItem> unfilteredBeaconList;
 		private List<ListViewItem> unfilteredModuleList;
 		private List<ListViewItem> unfilteredRecipeList;
+		private List<ListViewItem> unfilteredQualityList;
 
 		private List<ListViewItem> filteredAssemblerList;
 		private List<ListViewItem> filteredMinerList;
 		private List<ListViewItem> filteredPowerList;
 		private List<ListViewItem> filteredBeaconList;
 		private List<ListViewItem> filteredModuleList;
 		private List<ListViewItem> filteredRecipeList;
+		private List<ListViewItem> filteredQualityList;
 
 		private MouseHoverDetector mhDetector;
 
@@ -89,25 +91,29 @@ public SettingsForm(SettingsFormOptions options)
 			MainForm.SetDoubleBuffered(MinerListView);
 			MainForm.SetDoubleBuffered(ModuleListView);
 			MainForm.SetDoubleBuffered(RecipeListView);
+			MainForm.SetDoubleBuffered(QualityListView);
 
 			AssemblerListView.Columns[0].Width = AssemblerListView.Width - 32;
 			MinerListView.Columns[0].Width = MinerListView.Width - 32;
 			ModuleListView.Columns[0].Width = ModuleListView.Width - 32;
 			RecipeListView.Columns[0].Width = RecipeListView.Width - 32;
+			QualityListView.Columns[0].Width = QualityListView.Width - 32;
 
 			unfilteredAssemblerList = new List<ListViewItem>();
 			unfilteredMinerList = new List<ListViewItem>();
 			unfilteredPowerList = new List<ListViewItem>();
 			unfilteredBeaconList = new List<ListViewItem>();
 			unfilteredModuleList = new List<ListViewItem>();
 			unfilteredRecipeList = new List<ListViewItem>();
+			unfilteredQualityList = new List<ListViewItem>();
 
 			filteredAssemblerList = new List<ListViewItem>();
 			filteredMinerList = new List<ListViewItem>();
 			filteredPowerList = new List<ListViewItem>();
 			filteredBeaconList = new List<ListViewItem>();
 			filteredModuleList = new List<ListViewItem>();
 			filteredRecipeList = new List<ListViewItem>();
+			filteredQualityList = new List<ListViewItem>();
 
 			SelectPresetMenuItem.Click += SelectPresetMenuItem_Click;
 			DeletePresetMenuItem.Click += DeletePresetMenuItem_Click;
@@ -198,6 +204,7 @@ private void UpdateModList()
 			}
 			RecipeDifficultyLabel.Text = presetInfo.ExpensiveRecipes ? "Expensive" : "Normal";
 			TechnologyDifficultyLabel.Text = presetInfo.ExpensiveTechnology ? "Expensive" : "Normal";
+
 		}
 
 		private void LoadUnfilteredLists()
@@ -211,13 +218,20 @@ private void LoadUnfilteredLists()
 			LoadUnfilteredList(Options.DCache.Beacons.Values, unfilteredBeaconList);
 			LoadUnfilteredList(Options.DCache.Modules.Values, unfilteredModuleList);
 			LoadUnfilteredList(Options.DCache.Recipes.Values, unfilteredRecipeList);
+			LoadUnfilteredList(Options.DCache.Qualities.Values, unfilteredQualityList);
 
 			UpdateFilteredLists();
 		}
 
 		private void LoadUnfilteredList(IEnumerable<DataObjectBase> origin, List<ListViewItem> lviList)
 		{
-			foreach (DataObjectBase dObject in origin.OrderByDescending(a => a.Available).ThenBy(a => a.FriendlyName))
+			IOrderedEnumerable<DataObjectBase> orderedList;
+			if (origin is IEnumerable<Quality>)
+				orderedList = origin.OrderByDescending(a => a.Available).ThenBy(a => a);
+			else
+				orderedList = origin.OrderByDescending(a => a.Available).ThenBy(a => a.FriendlyName);
+
+            foreach (DataObjectBase dObject in orderedList)
 			{
 				ListViewItem lvItem = new ListViewItem();
 				if (dObject.Icon != null)
@@ -248,6 +262,7 @@ private void UpdateFilteredLists()
 			UpdateFilteredList(unfilteredBeaconList, filteredBeaconList, BeaconListView);
 			UpdateFilteredList(unfilteredModuleList, filteredModuleList, ModuleListView);
 			UpdateFilteredList(unfilteredRecipeList, filteredRecipeList, RecipeListView);
+			UpdateFilteredList(unfilteredQualityList, filteredQualityList, QualityListView);
 		}
 
 		private void UpdateFilteredList(List<ListViewItem> unfilteredList, List<ListViewItem> filteredList, ListView owner)
@@ -442,6 +457,7 @@ private void ListView_MouseDoubleClick(object sender, MouseEventArgs e)
 		private void BeaconListView_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e) { e.Item = filteredBeaconList[e.ItemIndex]; }
 		private void ModuleListView_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e) { e.Item = filteredModuleList[e.ItemIndex]; }
 		private void RecipeListView_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e) { e.Item = filteredRecipeList[e.ItemIndex]; }
+		private void QualityListView_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e) {  e.Item = filteredQualityList[e.ItemIndex]; }
 
 		private void RecipeListView_StartHover(object sender, MouseEventArgs e)
 		{
@@ -616,7 +632,10 @@ private void EnableAllButton_Click(object sender, EventArgs e)
 			foreach (Recipe recipe in Options.DCache.Recipes.Values.Where(r => r.Available))
 				Options.EnabledObjects.Add(recipe);
 
-			UpdateEnabledStatus();
+            foreach (Quality quality in Options.DCache.Qualities.Values.Where(r => r.Available))
+                Options.EnabledObjects.Add(quality);
+
+            UpdateEnabledStatus();
 		}
 
 		private void UpdateEnabledStatus()
@@ -647,6 +666,10 @@ private void UpdateEnabledStatus()
 			filteredRecipeList.AddRange(unfilteredRecipeList);
 			RecipeListView.VirtualListSize = filteredRecipeList.Count;
 
+			filteredQualityList.Clear();
+			filteredQualityList.AddRange(unfilteredQualityList);
+			QualityListView.VirtualListSize += filteredQualityList.Count;
+
 
 			foreach (ListViewItem item in unfilteredAssemblerList)
 				item.Checked = Options.EnabledObjects.Contains((DataObjectBase)item.Tag);
@@ -660,8 +683,11 @@ private void UpdateEnabledStatus()
 				item.Checked = Options.EnabledObjects.Contains((DataObjectBase)item.Tag);
 			foreach (ListViewItem item in unfilteredRecipeList)
 				item.Checked = Options.EnabledObjects.Contains((DataObjectBase)item.Tag);
+            foreach (ListViewItem item in unfilteredQualityList)
+                item.Checked = Options.EnabledObjects.Contains((DataObjectBase)item.Tag);
 
-			UpdateFilteredLists();
+
+            UpdateFilteredLists();
 		}
 
 		protected override void OnClosed(EventArgs e)

Foreman/Forms/SettingsForm.cs

@@ -289,9 +289,9 @@ internal override NodeState GetUpdatedState()
 
 		}
 
-        public void UpdateInputsAndOutputs()
+        public void UpdateInputsAndOutputs(bool forceUpdate = false)
         {
-			if (!ioUpdateRequired)
+			if (!ioUpdateRequired && !forceUpdate)
 				return;
 			ioUpdateRequired = false;
 
@@ -358,13 +358,13 @@ public void UpdateInputsAndOutputs()
 							currentProduct = new ItemQualityPair(item, currentProduct.Quality.NextQuality);
 							if (currentMultiplier == 0)
 								break;
+							if (!currentProduct.Quality.Enabled || !currentProduct.Quality.Available)
+								break;
 
 							outputList.Add(currentProduct);
 							outputSet.Add(currentProduct, Math.Min(currentMultiplier, 1.0) * amount);
 							outputSet[lastProduct] -= outputSet[currentProduct];
 
-							if (!currentProduct.Quality.Enabled || !currentProduct.Quality.Available)
-								break;
 						}
 					}
 				}

Foreman/Models/Nodes/RecipeNode.cs

@@ -296,6 +296,15 @@ public void ClearGraph()
 			lastNodeID = 0;
 		}
 
+		public void UpdateNodeMaxQualities()
+		{
+			foreach(RecipeNode rnode in nodes.Where(n => n is RecipeNode).Cast<RecipeNode>())
+			{
+				rnode.UpdateInputsAndOutputs(true);
+				rnode.UpdateState();
+			}
+		}
+
 		public void UpdateNodeStates(bool markAllAsDirty)
 		{
 			foreach (BaseNode node in nodes)

Foreman/Models/ProductionGraph.cs

@@ -12,54 +12,14 @@
       "name": "base",
       "version": "2.0.13"
     },
-    {
-      "name": "belt-visualizer",
-      "version": "2.0.2"
-    },
-    {
-      "name": "vehicle-corpses",
-      "version": "0.1.1"
-    },
-    {
-      "name": "VehicleSnap",
-      "version": "2.0.0"
-    },
     {
       "name": "elevated-rails",
       "version": "2.0.13"
     },
-    {
-      "name": "even-distribution",
-      "version": "2.0.2"
-    },
-    {
-      "name": "flib",
-      "version": "0.15.0"
-    },
-    {
-      "name": "playtime",
-      "version": "1.1.1"
-    },
     {
       "name": "quality",
       "version": "2.0.13"
     },
-    {
-      "name": "Trashcan",
-      "version": "1.0.5"
-    },
-    {
-      "name": "Wr_Enhanced_Map_Colors",
-      "version": "1.5.7"
-    },
-    {
-      "name": "BottleneckLite",
-      "version": "1.3.0"
-    },
-    {
-      "name": "customizable-quality-names",
-      "version": "1.0.0"
-    },
     {
       "name": "space-age",
       "version": "2.0.13"
@@ -10070,20 +10030,6 @@
       ],
       "research_unit_count": 2500,
       "localised_name": "Spidertron"
-    },
-    {
-      "name": "enable-logistics-tab",
-      "icon_name": "icon.t.enable-logistics-tab",
-      "enabled": false,
-      "essential": true,
-      "hidden": true,
-      "prerequisites": {},
-      "successors": {},
-      "recipes": {},
-      "alt_modifiers": {},
-      "research_unit_ingredients": {},
-      "research_unit_count": 1,
-      "localised_name": "Even Distribution"
     }
   ],
   "recipes": [
@@ -39297,7 +39243,7 @@
       "mining_drill_resource_drain_multiplier": 1,
       "next_probability": 0.1,
       "next": "uncommon",
-      "localised_name": "Standard"
+      "localised_name": "Normal"
     },
     {
       "name": "uncommon",
@@ -39309,7 +39255,7 @@
       "mining_drill_resource_drain_multiplier": 0.83333331346511841,
       "next_probability": 0.1,
       "next": "rare",
-      "localised_name": "Improved"
+      "localised_name": "Uncommon"
     },
     {
       "name": "rare",
@@ -39321,7 +39267,7 @@
       "mining_drill_resource_drain_multiplier": 0.66666668653488159,
       "next_probability": 0.1,
       "next": "epic",
-      "localised_name": "Superior"
+      "localised_name": "Rare"
     },
     {
       "name": "epic",
@@ -39333,7 +39279,7 @@
       "mining_drill_resource_drain_multiplier": 0.5,
       "next_probability": 0.1,
       "next": "legendary",
-      "localised_name": "Exceptional"
+      "localised_name": "Epic"
     },
     {
       "name": "legendary",
@@ -39343,7 +39289,7 @@
       "level": 5,
       "beacon_power_multiplier": 0.1666666716337204,
       "mining_drill_resource_drain_multiplier": 0.1666666716337204,
-      "localised_name": "Flawless"
+      "localised_name": "Legendary"
     },
     {
       "name": "quality-unknown",

Foreman/Presets/Factorio 2.0 Space Age.dat

@@ -10,7 +10,7 @@
     },
     {
       "name": "base",
-      "version": "2.0.9"
+      "version": "2.0.13"
     }
   ],
   "technologies": [