ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 19b1680b1a64

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen - 5 years ago 2019-11-02 11:33:19
jason@hiddenachievement.com

Handle a few profile load errors better.

1 file changed with 16 insertions and 6 deletions:

ReagentManager.cs

0 comments (0 inline, 0 general)

ReagentManager.cs

➞

Show inline comments

@@ ... / @@ -94,72 +94,84 @@ namespace DesertPaintLab @@
                             string ppname = match.Groups["ppname"].Value;
                             reagents.Add(name, new Reagent(ppname, ppname));
                             nameStore.AppendValues(name);
                             names.Add(name);
                             nameLookup.Add(ppname, name);
+                        }
+                    }
+                }
+            }
+        }
 		public static void LoadProfileReagents(string file)
+		{
 			Match match;
 			string line;
 			using (StreamReader reader = new StreamReader(file))
+			{
 				while ((line = reader.ReadLine()) != null)
+                {
 					match = reagentRegex.Match(line);
 					if (match.Success)
+					{
 						string ppname = match.Groups["name"].Value;
                         string name = null;
                         nameLookup.TryGetValue(ppname, out name);
                         if (nameLookup.TryGetValue(ppname, out name))
+                        {
                         Reagent reagent = GetReagent(name);
                         if (reagent != null && !reagent.IsCatalyst)
+                        {
                             reagent.Enabled = match.Groups["enabled"].Value.Equals("Y");
                             reagent.Cost = uint.Parse(match.Groups["cost"].Value);
                             reagent.RecipeMax = uint.Parse(match.Groups["max"].Value);
+                        }
+					}
 					else
+					{
                             // bad name?
+                        }
+					}
 					else
+					{
 						match = catalystRegex.Match(line);
 						if (match.Success)
+						{
 							string ppname = match.Groups["name"].Value;
                             string name = null;
                             nameLookup.TryGetValue(ppname, out name);
                             if (nameLookup.TryGetValue(ppname, out name))
+                            {
                             Reagent reagent = GetReagent(name);
                             if (reagent != null && reagent.IsCatalyst)
+                            {
                                 reagent.Enabled = match.Groups["enabled"].Value.Equals("Y");
                                 reagent.Cost = uint.Parse(match.Groups["cost"].Value);
+                            }
+						}
                             else
+                            {
                                 // bad name?
+                            }
+						}
+					}
+                }
+			}
+		}
         public static void SaveProfileReagents(string file)
+        {
             using (StreamWriter writer = new StreamWriter(file))
+            {
                 writer.WriteLine("// Ingredients are in the form:");
                 writer.WriteLine("// Name | RGB values | cost | enabled (Y/N) | bulk/normal | max items per paint (1-20)");
                 writer.WriteLine("//");
                 writer.WriteLine("// It is recommended to only change the cost value");
                 writer.WriteLine("// It is not recommended to set many of the ingredients above 10 per paint");
                 List<Reagent> sortedReagents = new List<Reagent>(reagents.Count);
                 foreach (KeyValuePair<string, Reagent> pair in reagents)
+                {
                     sortedReagents.Add(pair.Value);
+                }
                 sortedReagents.Sort( (x,y) => ((x.IsCatalyst && !y.IsCatalyst) ? 1 : ((y.IsCatalyst && !x.IsCatalyst) ? -1 : x.PracticalPaintName.CompareTo(y.PracticalPaintName))) );
                 foreach (Reagent reagent in sortedReagents)
+                {
                     if (!reagent.IsCatalyst)
@@ ... / @@ -219,41 +231,39 @@ namespace DesertPaintLab @@
 		public static void PopulatePigments(ref Gtk.ComboBox comboBox)
+		{
 			comboBox.Clear();
 			Gtk.CellRendererText cell = new Gtk.CellRendererText();
 	        comboBox.PackStart(cell, false);
 	        comboBox.AddAttribute(cell, "text", 0);
 	        Gtk.ListStore store = new Gtk.ListStore(typeof(string));
 	        comboBox.Model = store;
 			store.AppendValues("");
 			foreach (KeyValuePair<string, Reagent> pair in reagents)
+			{
 				if (!pair.Value.IsCatalyst)
+				{
 					store.AppendValues(pair.Key);
+				}
+			}
+		}
 		*/
 		public static Reagent GetReagent(string reagentName)
+		{
 			Reagent returnVal;
 			reagents.TryGetValue(reagentName, out returnVal);
             if (returnVal == null)
 			if (!reagents.TryGetValue(reagentName, out returnVal))
+            {
                 // convert pp name to our internal name
                 string otherName = null;
                 nameLookup.TryGetValue(reagentName, out otherName);
                 if (otherName != null)
                 if (nameLookup.TryGetValue(reagentName, out otherName))
+                {
                     reagents.TryGetValue(otherName, out returnVal);
+                }
+            }
 			return returnVal;
+		}
+	}
+}

0 comments (0 inline, 0 general)