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

@@ ... / @@ -554,163 +554,167 @@ namespace DesertPaintCodex.Models @@
         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)