ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - 62d349a8db2f

Parent rev.

Child rev.

[Not reviewed]

R_T10_1.7 default

0 1 0

Jason Maltzen - 3 years ago 2021-08-27 21:58:31
jason@hiddenachievement.com

Fix the PaintMix export format - use the PracticalPaint internal names for ingredients, and remove excess whitespace. Also, don't export a recipe for colors that don't have a recipe.

1 file changed with 10 insertions and 6 deletions:

Models/PlayerProfile.cs

0 comments (0 inline, 0 general)

Models/PlayerProfile.cs

➞

Show inline comments

@@ ... / @@ -266,451 +266,455 @@ namespace DesertPaintCodex.Models @@
                     reaction2 = Reactions.Find(reagent2, reagent1);
                     if (reaction2 != null)
+                    {
                         reaction2.Exported = false;
+                    }
+                }
+            }
             return true;
+        }
         public void ImportFromPP(string reactionsFile)
+        {
             // Convert old file.
             ConvertFromPP(reactionsFile, _reactFile);
             try
+            {
                 // If there is an ingredients file, move it in.
                 string importDir = Path.GetDirectoryName(reactionsFile) ?? "";
                 File.Copy(
                     Path.Combine(importDir, "ingredients.txt"),
                     Path.Combine(Directory, "ingredients.txt"),
                     true);
+            }
             catch (Exception)
+            {
                 // If there is no ingredients file, we don't really care.
+            }
+        }
         public void Import(string file)
+        {
             if (!File.Exists(file))
+            {
                 Debug.WriteLine("Import file does not exist: " + file);
                 // TODO: Show message dialog.
+            }
             ZipFile.ExtractToDirectory(file, Directory, true);
+        }
         public void Export(string file)
+        {
             ZipFile.CreateFromDirectory(Directory, file);
+        }
         public bool Load()
+        {
             string? line;
             ProfileSettings.Reset();
             ProfileSettings.Load(_settingsFile);
             Reactions.Clear();
             if (File.Exists(ReagentFile))
+            {
                 ReagentService.LoadProfileReagents(ReagentFile);
+            }
             else
+            {
                 return false;
+            }
             ReagentService.InitializeReactions(Reactions);
             if (!File.Exists(_reactFile))
+            {
                 return false;
+            }
             using (StreamReader reader = new(_reactFile))
+            {
                 while ((line = reader.ReadLine()) != null)
+                {
                     string[] tokens = line.Split(' ');
                     if (tokens.Length == 5)
+                    {
                         Reagent reagent1 = ReagentService.GetReagent(tokens[0].Trim());
                         Reagent reagent2 = ReagentService.GetReagent(tokens[1].Trim());
                         Reaction reaction = new(
                             int.Parse(tokens[2].Trim()),
                             int.Parse(tokens[3].Trim()),
                             int.Parse(tokens[4].Trim())
                             );
                         Reactions.Set(reagent1, reagent2, reaction);
+                    }
+                }
+            }
             if (!File.Exists(_clipFile)) return true;
+            {
                 using StreamReader reader = new(_clipFile);
                 while ((line = reader.ReadLine()) != null)
+                {
                     string[] tokens = line.Split(' ');
                     if (tokens.Length != 3) continue;
                     string reagent1 = tokens[0].Trim();
                     if (!Clippers.ContainsKey(reagent1))
+                    {
                         Clippers.Add(reagent1, new Dictionary<string, ClipType>());
+                    }
                     Clippers[reagent1][tokens[1].Trim()] = (ClipType)int.Parse(tokens[2].Trim());
+                }
+            }
             return true;
+        }
         public void Save()
+        {
             ProfileSettings.Save(_settingsFile);
             Reaction? reaction;
             using (StreamWriter writer = new(_reactFile, false))
+            {
                 foreach (string reagentName1 in ReagentService.Names)
+                {
                     // TODO: could be more efficient by only iterating over the names after reagent1
                     foreach (string reagentName2 in ReagentService.Names)
+                    {
                         if (reagentName1.Equals(reagentName2))
+                        {
                             continue;
+                        }
                         Reagent reagent1 = ReagentService.GetReagent(reagentName1);
                         Reagent reagent2 = ReagentService.GetReagent(reagentName2);
                         reaction = Reactions.Find(reagent1, reagent2);
                         if (reaction != null)
+                        {
                             writer.WriteLine(reagent1.PracticalPaintName + " " + reagent2.PracticalPaintName + " " +
                             reaction.Red + " " + reaction.Green + " " + reaction.Blue);
+                        }
+                    }
+                }
+            }
             using (StreamWriter writer = new(_clipFile, false))
+            {
                 foreach (var item1 in Clippers)
+                {
                     foreach (var item2 in item1.Value)
+                    {
                         if (item2.Value == ClipType.None) continue;
                         writer.WriteLine(item1.Key + " " + item2.Key + " " + (int)item2.Value);
+                    }
+                }
+            }
+        }
         public ClipType PairClipStatus(Reagent reagent1, Reagent reagent2)
+        {
             if (Clippers.TryGetValue(reagent1.PracticalPaintName, out var item1))
+            {
                 if (item1.TryGetValue(reagent2.PracticalPaintName, out var clipType))
+                {
                     return clipType;
+                }
+            }
             return ClipType.None;
+        }
         public void SetPairClipStatus(Reagent reagent1, Reagent reagent2, ClipType clip)
+        {
             if (Clippers.TryGetValue(reagent1.PracticalPaintName, out var item1))
+            {
                 if (item1.TryGetValue(reagent2.PracticalPaintName, out var clipType))
+                {
                     if (clipType == clip) return;
+                }
+            }
             else
+            {
                 item1 = new Dictionary<string, ClipType>();
                 Clippers.Add(reagent1.PracticalPaintName, item1);
+            }
             item1[reagent2.PracticalPaintName] = clip;
             Save();
+        }
         private void LoadRecipes(Dictionary<string, PaintRecipe> recipeDict, string filename, uint concentration)
+        {
             foreach (PaintRecipe recipe in recipeDict.Values)
+            {
                 recipe.Clear();
+            }
             string      recipeFile         = Path.Combine(Directory, filename);
             bool        inRecipe           = false;
             PaintRecipe testRecipe         = new();
             string?     currentRecipeColor = null;
             if (!File.Exists(recipeFile)) return;
             using StreamReader reader = new(recipeFile);
             string? line;
             while ((line = reader.ReadLine()) != null)
+            {
                 Match match = _recipeHeaderRegex.Match(line);
                 if (match.Success)
+                {
                     // Store previous recipe.
                     if ((currentRecipeColor != null) && testRecipe.IsValidForConcentration(concentration))
+                    {
                         SetRecipe(currentRecipeColor, testRecipe);
+                    }
                     testRecipe.Clear();
                     currentRecipeColor = match.Groups["colorname"].Value;
                     inRecipe  = true;
+                }
                 else if (inRecipe)
+                {
                     match = _recipeIngredientRegex.Match(line);
                     if (!match.Success) continue;
                     string ingredient = match.Groups["ingredient"].Value;
                     uint   quantity   = uint.Parse(match.Groups["quantity"].Value);
                     testRecipe.AddReagent(ingredient, quantity);
+                }
+            }
             if (!inRecipe || (currentRecipeColor == null)) return;
             // Store final recipe.
             if (testRecipe.IsValidForConcentration(concentration))
+            {
                 SetRecipe(currentRecipeColor, testRecipe);
+            }
+        }
         private void SaveRecipes(Dictionary<string, PaintRecipe> recipeDict, string filename)
+        {
             string recipeFile = Path.Combine(Directory, filename);
             using StreamWriter writer = new(recipeFile, false);
             foreach (KeyValuePair<string, PaintRecipe> pair in recipeDict)
+            {
                 writer.WriteLine("--- Recipe: {0}", pair.Key);
                 foreach (PaintRecipe.ReagentQuantity ingredient in pair.Value.Reagents)
+                {
                     writer.WriteLine("{0,-14} | {1}", ingredient.Name, ingredient.Quantity);
+                }
+            }
+        }
         private void DeleteRecipes(Dictionary<string, PaintRecipe> recipeDict, string filename)
+        {
             string recipeFile = Path.Combine(Directory, filename);
             File.Delete(recipeFile);
             recipeDict.Clear();
+        }
         public void LoadRecipes()
+        {
             LoadRecipes(Recipes, PaintRecipeFile, PaintRecipe.PaintRecipeMinConcentration);
             LoadRecipes(RibbonRecipes, RibbonRecipeFile, PaintRecipe.RibbonRecipeMinConcentration);
+        }
         public void SaveRecipes()
+        {
             SaveRecipes(Recipes, PaintRecipeFile);
             SaveRecipes(RibbonRecipes, RibbonRecipeFile);
+        }
         public void ClearRecipes()
+        {
             DeleteRecipes(Recipes, PaintRecipeFile);
             DeleteRecipes(RibbonRecipes, RibbonRecipeFile);
+        }
         public void ClearPaintRecipes()
+        {
             DeleteRecipes(Recipes, PaintRecipeFile);
+        }
         public void ClearRibbonRecipes()
+        {
             DeleteRecipes(RibbonRecipes, RibbonRecipeFile);
+        }
         public void ExportWikiRecipes(string file)
+        {
             StreamWriter writer = new(file);
             ExportWikiFormat(writer, Recipes);
+        }
         public void ExportWikiRibbons(string file)
+        {
             StreamWriter writer = new StreamWriter(file);
             ExportWikiFormat(writer, this.RibbonRecipes);
+        }
         public void ExportWikiRecipes(TextWriter writer)
+        {
             ExportWikiFormat(writer, this.Recipes);
+        }
         public void ExportWikiRibbons(TextWriter writer)
+        {
             ExportWikiFormat(writer, this.RibbonRecipes);
+        }
         public static void ExportWikiFormat(TextWriter writer, Dictionary<string, PaintRecipe> recipeDict)
+        {
             using (writer)
+            {
                 writer.WriteLine("{| class='wikitable sortable' border=\"1\" style=\"background-color:#DEB887;\"");
                 writer.WriteLine("! Color !! Recipe !! Missing Reactions? || Verified");
                 foreach (PaintColor color in PaletteService.Colors)
+                {
                     writer.WriteLine("|-");
                     string colorLine = "| ";
                     colorLine += "style=\"font-weight: bold; background-color: #" + color.Red.ToString("X2") + color.Green.ToString("X2") + color.Blue.ToString("X2") + ";";
                     if (color.UseWhiteText)
+                    {
                         // dark color gets light text
                         colorLine += " color: #FFFFFF;";
+                    }
                     else
+                    {
                         colorLine += "color: #000000;";
+                    }
                     colorLine += "\" | " + color.Name + " || ";
                     if (recipeDict.TryGetValue(color.Name, out PaintRecipe? recipe))
+                    {
                         foreach (PaintRecipe.ReagentQuantity ingredient in recipe.Reagents)
+                        {
                             colorLine += " " + ingredient;
+                        }
+                    }
                     else
+                    {
                         // no recipe
+                    }
                     colorLine += " || ";
                     if (recipe == null)
+                    {
                         colorLine += "?";
+                    }
                     else if (recipe.HasMissingReactions())
+                    {
                         colorLine += "Y";
+                    }
                     else
+                    {
                         colorLine += "N";
+                    }
                     colorLine += " || N";
                     writer.WriteLine(colorLine);
+                }
                 writer.WriteLine("|}");
+            }
+        }
         public void ExportPaintMixRecipes(string file)
+        {
             StreamWriter writer = new(file);
             ExportPaintMixFormat(writer, Recipes);
+        }
         public void ExportPaintMixRibbons(string file)
+        {
             StreamWriter writer = new StreamWriter(file);
             ExportPaintMixFormat(writer, this.RibbonRecipes);
+        }
         public void ExportPaintMixRecipes(TextWriter writer)
+        {
             ExportPaintMixFormat(writer, this.Recipes);
+        }
         public void ExportPaintMixRibbons(TextWriter writer)
+        {
             ExportWikiFormat(writer, this.RibbonRecipes);
+        }
         public static void ExportPaintMixFormat(TextWriter writer, Dictionary<string, PaintRecipe> recipeDict)
+        {
             using (writer)
+            {
                 foreach (PaintColor color in PaletteService.Colors)
+                {
                     if (recipeDict.TryGetValue(color.Name, out PaintRecipe? recipe))
+                    {
                         string colorLine = $"{color.Name} : ";
                         foreach (PaintRecipe.ReagentQuantity ingredient in recipe.Reagents)
                         if (recipe.Reagents.Count > 0)
+                        {
                             colorLine += $" {ingredient.Name} {ingredient.Quantity}";
                             string colorLine = $"{color.Name} :";
                             foreach (PaintRecipe.ReagentQuantity ingredient in recipe.Reagents)
+                            {
                                 Reagent reagent = ReagentService.GetReagent(ingredient.Name);
                                 colorLine += $" {reagent.PracticalPaintName} {ingredient.Quantity}";
+                            }
                             colorLine += $" - #{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
                             writer.WriteLine(colorLine);
+                        }
                         colorLine += $"  - #{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
                         writer.WriteLine(colorLine);
+                    }
                     else
+                    {
                         // no recipe
+                        // no recipe - skip
+                    }
+                }
+            }
+        }
         public Reaction? FindReaction(Reagent? reagent1, Reagent? reagent2)
+        {
             if ((reagent1 == null) || (reagent2 == null)) return null;
             return Reactions.Find(reagent1, reagent2);
+        }
         public void SetReaction(Reagent reagent1, Reagent reagent2, Reaction reaction)
+        {
             Reactions.Set(reagent1, reagent2, reaction);
+        }
         public void ClearReaction(Reagent reagent1, Reagent reagent2)
+        {
             Reactions.Remove(reagent1, reagent2);
+        }
         public void SetRecipe(PaintRecipe recipe)
+        {
             SetRecipe(PaletteService.FindNearest(recipe.ReactedColor), recipe);
+        }
         public void SetRecipe(string colorName, PaintRecipe recipe)
+        {
             if (Recipes.TryGetValue(colorName, out PaintRecipe? profileRecipe))
+            {
                 profileRecipe.CopyFrom(recipe);
+            }
             else
+            {
                 Recipes.Add(colorName, new PaintRecipe(recipe));
+            }
+        }
         public void SetRibbonRecipe(PaintRecipe recipe)
+        {
             SetRibbonRecipe(PaletteService.FindNearest(recipe.ReactedColor), recipe);
+        }
         public void SetRibbonRecipe(string colorName, PaintRecipe recipe)
+        {
             if (RibbonRecipes.TryGetValue(colorName, out PaintRecipe? profileRecipe))
+            {
                 profileRecipe.CopyFrom(recipe);
+            }
             else
+            {
                 RibbonRecipes.Add(colorName, new PaintRecipe(recipe));
+            }
+        }
+    }
+}

0 comments (0 inline, 0 general)