Changeset - 19b1680b1a64
[Not reviewed]
default
0 1 0
Jason Maltzen - 4 years ago 2019-11-02 11:33:19
jason@hiddenachievement.com
Handle a few profile load errors better.
1 file changed with 25 insertions and 15 deletions:
0 comments (0 inline, 0 general)
ReagentManager.cs
Show inline comments
...
 
@@ -115,13 +115,19 @@ namespace DesertPaintLab
 
					{
 
						string ppname = match.Groups["name"].Value;
 
                        string name = null;
 
                        nameLookup.TryGetValue(ppname, out name);
 
                        Reagent reagent = GetReagent(name);
 
                        if (reagent != null && !reagent.IsCatalyst)
 
                        if (nameLookup.TryGetValue(ppname, out name))
 
                        {
 
                            reagent.Enabled = match.Groups["enabled"].Value.Equals("Y");
 
                            reagent.Cost = uint.Parse(match.Groups["cost"].Value);
 
                            reagent.RecipeMax = uint.Parse(match.Groups["max"].Value);
 
                            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
...
 
@@ -131,12 +137,18 @@ namespace DesertPaintLab
 
						{
 
							string ppname = match.Groups["name"].Value;
 
                            string name = null;
 
                            nameLookup.TryGetValue(ppname, out name);
 
                            Reagent reagent = GetReagent(name);
 
                            if (reagent != null && reagent.IsCatalyst)
 
                            if (nameLookup.TryGetValue(ppname, out name))
 
                            {
 
                                reagent.Enabled = match.Groups["enabled"].Value.Equals("Y");
 
                                reagent.Cost = uint.Parse(match.Groups["cost"].Value);
 
                                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?
 
                            }
 
						}
 
					}
...
 
@@ -240,13 +252,11 @@ namespace DesertPaintLab
 
		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);
 
                }
0 comments (0 inline, 0 general)