Merge pull request #12 from tobitege/master

v0.640 Added About dialog. Byproducts as links now. Fixed plasma recipes.
Dimencia · Aug 28, 2022 · b0b72c4 · b0b72c4
2 parents 6fcdf4f + cec3314
commit b0b72c4
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 208 deletions.
diff --git a/DU Industry Tool/AboutForm.Designer.cs b/DU Industry Tool/AboutForm.Designer.cs
diff --git a/DU Industry Tool/AboutForm.cs b/DU Industry Tool/AboutForm.cs
@@ -16,11 +16,13 @@ public partial class AboutForm : Form
         public AboutForm()
         {
             InitializeComponent();
+
             discordLink.Click += LinkOnClick;
-            githubLink.Click += LinkOnClick;
+            DimenciaGithubLink.Click += LinkOnClick;
+            TobiReleasesLink.Click += LinkOnClick;
         }
 
-        private void LinkOnClick(object sender, EventArgs e)
+        private static void LinkOnClick(object sender, EventArgs e)
         {
             if (sender is KryptonLinkLabel klb)
             {

diff --git a/DU Industry Tool/AboutForm.resx b/DU Industry Tool/AboutForm.resx
@@ -185,9 +185,6 @@
         RDTh5+Sf6+hfdotWjRr/B1gyqbQxi59TAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAA

diff --git a/DU Industry Tool/IndustryManager.cs b/DU Industry Tool/IndustryManager.cs
@@ -960,23 +960,25 @@ public IndustryManager(ProgressBar progressBar = null)
 
             if (dmpRcp)
             {
+                /*
                 var missingRec = _luaRecipes.Values.Where(x =>
                         x.Products?.Count > 0 && Recipes.Values.All(y => y.NqId != x.Products[0].Id))
-                    .OrderBy(x => x.Products[0].DisplayNameWithSize);
+                        .OrderBy(x => x.Products[0].DisplayNameWithSize);
                 foreach (var missing in missingRec)
                 {
                     Debug.WriteLine(missing.Products[0].Id.ToString().PadRight(30) + " " +
                                     missing.Products[0].DisplayNameWithSize);
                 }
 
                 // Check for missing Plasma in recipes' ingredients
-                List<ulong> plasmaIds = new List<ulong> {
+                var plasmaIds = new List<ulong> {
                     1769135512, 1831558336, 1831557945, 1831558342,
                     1831558338, 1831558341, 1831558343, 1831558340,
                     1831558339, 1831558337
                 };
                 var plas = _luaRecipes.Values.Where(x => x.Ingredients.Count > 0 &&
-                                                         x.Ingredients.Any(y => plasmaIds.Contains(y.Id))).OrderBy(x => x.Products[0].DisplayNameWithSize).ToList();
+                                                         x.Ingredients.Any(y => plasmaIds.Contains(y.Id)))
+                                .OrderBy(x => x.Products[0].DisplayNameWithSize).ToList();
                 foreach (var pl in plas)
                 {
                     var ingName = pl.Ingredients.First(x => x.DisplayNameWithSize.StartsWith("Relic Plasma")).DisplayNameWithSize;
@@ -988,9 +990,10 @@ public IndustryManager(ProgressBar progressBar = null)
                     }
                     if (rec.Value.Ingredients.All(x => x.Name != ingName))
                     {
-                        Debug.WriteLine(rec.Key + " " + rec.Value.Name + " missing " + ingName);
+                        Debug.WriteLine(rec.Key + " " + rec.Value.Name + " is missing " + ingName);
                     }
                 }
+                */
             }
 
             //SaveRecipes();