ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - 9f255f7e4422

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen - 3 years ago 2021-07-23 01:34:22
jason@hiddenachievement.com

Fix a crash when importing a Practical Paint reactions.txt file with empty (not-recorded) entries.

1 file changed with 44 insertions and 11 deletions:

Models/PlayerProfile.cs

0 comments (0 inline, 0 general)

Models/PlayerProfile.cs

➞

Show inline comments

@@ ... / @@ -126,42 +126,75 @@ namespace DesertPaintCodex.Models @@
+        }
         public static void ConvertFromPP(string ppFile, string dpFile)
+        {
             using StreamReader reader = new(ppFile);
             using StreamWriter writer = new(dpFile, false);
-            string?            line;
             string? line;
             while ((line = reader.ReadLine()) != null)
+            {
                 string[] tokens = line.Split('|');
                 //if ((tokens.Length > 0) && (tokens [0] != "//"))
                 if ((tokens.Length == 5) && (tokens[0].Trim() != "//"))
+                {
                     string reagent1  = tokens[0].Trim();
                     string reagent2  = tokens[1].Trim();
                     string reagent1Name  = tokens[0].Trim();
                     string reagent2Name  = tokens[1].Trim();
                     string colorCode = tokens[2].Trim();
                     string change1   = tokens[3].Trim();
                     string change2   = tokens[4].Trim();
                     Reagent reagent1 = ReagentService.GetReagent(reagent1Name);
                     Reagent reagent2 = ReagentService.GetReagent(reagent2Name);
                     if (reagent1 == null || reagent2 == null) continue;
                     bool hasChange1 = int.TryParse(change1, out _);
                     bool hasChange2 = int.TryParse(change2, out _);
                     // Write reaction.
                     switch (colorCode)
+                    {
                         case "W":
                             WriteReaction(writer, reagent1, reagent2, change1, change1, change1);
                             WriteReaction(writer, reagent2, reagent1, change2, change2, change2);
                             if (hasChange1)
+                            {
                                 WriteReaction(writer, reagent1Name, reagent2Name, change1, change1, change1);
+                            }
                             if (hasChange2)
+                            {
                                 WriteReaction(writer, reagent2Name, reagent1Name, change2, change2, change2);
+                            }
                             break;
                         case "R":
                             WriteReaction(writer, reagent1, reagent2, change1, "0", "0");
                             WriteReaction(writer, reagent2, reagent1, change2, "0", "0");
                             if (hasChange1)
+                            {
                                 WriteReaction(writer, reagent1Name, reagent2Name, change1, "0", "0");
+                            }
                             if (hasChange2)
+                            {
                                 WriteReaction(writer, reagent2Name, reagent1Name, change2, "0", "0");
+                            }
                             break;
                         case "G":
                             WriteReaction(writer, reagent1, reagent2, "0", change1, "0");
                             WriteReaction(writer, reagent2, reagent1, "0", change2, "0");
                             if (hasChange1)
+                            {
                                 WriteReaction(writer, reagent1Name, reagent2Name, "0", change1, "0");
+                            }
                             if (hasChange2)
+                            {
                                 WriteReaction(writer, reagent2Name, reagent1Name, "0", change2, "0");
+                            }
                             break;
                         case "B":
                             WriteReaction(writer, reagent1, reagent2, "0", "0", change1);
                             WriteReaction(writer, reagent2, reagent1, "0", "0", change2);
                             if (hasChange1)
+                            {
                                 WriteReaction(writer, reagent1Name, reagent2Name, "0", "0", change1);
+                            }
                             if (hasChange2)
+                            {
                                 WriteReaction(writer, reagent2Name, reagent1Name, "0", "0", change2);
+                            }
                             break;
+                    }
+                }
+            }
+        }

0 comments (0 inline, 0 general)