infographic color fixes

Author: cadon

ARKBreedingStats/InfoGraphic/CreatureInfoGraphic.cs

@@ -53,7 +53,9 @@ public static Task<Bitmap> InfoGraphicAsync(this Creature creature, CreatureColl
                     BackgroundImageResizing = Properties.Settings.Default.InfoGraphicBackgroundSizing,
                     widthOutlineCreature = Properties.Settings.Default.InfoGraphicCreatureOutlineWidth,
                     creatureOutlineBlurring = Properties.Settings.Default.InfoGraphicCreatureOutlineBlurring,
-                    creatureScaling = Properties.Settings.Default.InfoGraphicCreatureScaling
+                    creatureScaling = Properties.Settings.Default.InfoGraphicCreatureScaling,
+                    ColorBasedOnCreature = Properties.Settings.Default.InfographicColorByCreature,
+                    TintBackgroundImage = Properties.Settings.Default.InfographicTintBackgroundImage
                 });
 
         /// <summary>
@@ -141,19 +143,22 @@ public static async Task<Bitmap> InfoGraphicAsync(this Creature creature, Creatu
                 g.SmoothingMode = SmoothingMode.AntiAlias;
                 g.TextRenderingHint = TextRenderingHint.AntiAlias;
 
-
                 var backgroundImageIsDrawn = false;
-                if (settings.backColor.A != 255)
+                if (backColor.A != 255)
                 {
                     backgroundImageIsDrawn = DrawBackgroundImage(g, settings.backgroundImagePath, 0, yOffsetBox,
                         widthBox, heightBox, settings.BackgroundImageResizing);
                     if (settings.TintBackgroundImage)
-                        ImageTools.TintImage(bmp, Utils.ColorFromHue(colorHue, settings.backColor.GetBrightness() - .5));
+                        //ImageTools.TintImage(bmp, backColor);
+                        ImageTools.TintImage(bmp, Utils.ColorFromHsv(colorHue, settings.backColor.GetSaturation(), settings.backColor.GetValue()));
                 }
 
                 var currentYPosition = borderAndPaddings[0] + yOffsetBox;
-                using (var backgroundBrush = new SolidBrush(backColor))
+                if (backColor.A != 0)
+                {
+                    using var backgroundBrush = new SolidBrush(backColor);
                     g.FillRectangle(backgroundBrush, 0, yOffsetBox, widthBox, heightBox);
+                }
 
                 var headerText = creature.Species.Name(creature.sex, true, true) +
                                  (settings.displayCreatureName ? $" - {creature.name}" : string.Empty);
@@ -623,7 +628,8 @@ private static Color GetMainColor(Creature c)
                     r => r?.name != null && r.name.Contains("body", StringComparison.InvariantCultureIgnoreCase));
             }
 
-            if (tintColorRegionId == -1) tintColorRegionId = 0;
+            if (tintColorRegionId == -1) tintColorRegionId = Array.FindIndex(c.Species.colors, r => r?.name != null);
+            if (tintColorRegionId == -1) return Values.V.Colors.ById(0).Color;
             return Values.V.Colors.ById(c.colors[tintColorRegionId]).Color;
         }
 

ARKBreedingStats/InfoGraphic/InfoGraphicSettings.cs

@@ -35,8 +35,8 @@ public class InfoGraphicSettings
         public int widthOutlineCreature = 0;
         public float creatureOutlineBlurring = 1;
         public float creatureScaling = 1;
-        public bool ColorBasedOnCreature = true;
-        public bool TintBackgroundImage = true;
+        public bool ColorBasedOnCreature;
+        public bool TintBackgroundImage;
 
         public enum BackgroundImageResizings
         {

ARKBreedingStats/Utils.cs

@@ -128,7 +128,7 @@ public static Color ColorFromHsv(double hue, double saturation = 1, double value
             var v = (byte)(value * 255);
             if (saturation < double.Epsilon)
             {
-                return Color.FromArgb(v, v, v);
+                return Color.FromArgb(alpha, v, v, v);
             }
 
             // there are six hue sections from 0 to 360 with each having 60 degrees

ARKBreedingStats/utils/ExtensionMethods.cs

@@ -53,7 +53,7 @@ public static void SetImageAndDisposeOld(this Button bt, Bitmap bmp)
         }
 
         /// <summary>
-        /// Returns the value part of this color (HSV model).
+        /// Returns the value part of this color (HSV model) in the range 0...1.
         /// </summary>
         public static float GetValue(this Color c) => (float)Math.Max(c.R, Math.Max(c.G, c.B)) / byte.MaxValue;