diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 48ddc559..3424ec33 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -265,14 +265,6 @@ - - - - - - - - diff --git a/FModel/Forms/Settings.cs b/FModel/Forms/Settings.cs index de85cdeb..466a9fa7 100644 --- a/FModel/Forms/Settings.cs +++ b/FModel/Forms/Settings.cs @@ -40,6 +40,8 @@ namespace FModel.Forms // Check if watermark exists Utilities.CheckWatermark(); + comboBox2.SelectedIndex = comboBox2.FindStringExact(Properties.Settings.Default.rarityDesign); + //WATERMARK button1.Enabled = Properties.Settings.Default.isWatermark; checkBox7.Checked = Properties.Settings.Default.isWatermark; @@ -48,8 +50,6 @@ namespace FModel.Forms trackBar1.Value = Properties.Settings.Default.wOpacity; trackBar2.Value = Properties.Settings.Default.wSize; - comboBox2.SelectedIndex = comboBox2.FindStringExact(Properties.Settings.Default.rarityDesign); - //CHALLENGES button3.Enabled = Properties.Settings.Default.isChallengesTheme; button4.Enabled = Properties.Settings.Default.isChallengesTheme; @@ -162,7 +162,15 @@ namespace FModel.Forms if (!string.IsNullOrEmpty(Properties.Settings.Default.wFilename)) { - Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate); + Bitmap bmp = null; + if (Properties.Settings.Default.loadFeaturedImage) + { + bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1)); + } + else + { + bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1)); + } Graphics g = Graphics.FromImage(bmp); Image watermark = Image.FromFile(Properties.Settings.Default.wFilename); @@ -180,7 +188,15 @@ namespace FModel.Forms { if (!string.IsNullOrEmpty(Properties.Settings.Default.wFilename)) { - Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate); + Bitmap bmp = null; + if (checkBox8.Checked) + { + bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1)); + } + else + { + bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1)); + } Graphics g = Graphics.FromImage(bmp); Image watermark = Image.FromFile(Properties.Settings.Default.wFilename); @@ -195,7 +211,15 @@ namespace FModel.Forms { if (!string.IsNullOrEmpty(Properties.Settings.Default.wFilename)) { - Bitmap bmp = new Bitmap(checkBox8.Checked ? Resources.wTemplateF : Resources.wTemplate); + Bitmap bmp = null; + if (checkBox8.Checked) + { + bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1)); + } + else + { + bmp = new Bitmap(string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1)); + } Graphics g = Graphics.FromImage(bmp); Image watermark = Image.FromFile(Properties.Settings.Default.wFilename); diff --git a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs index 152a9719..0c32dce5 100644 --- a/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs +++ b/FModel/Methods/IconGenerator/ItemGenerator/Rarity.cs @@ -7,36 +7,55 @@ namespace FModel { static class Rarity { - #region flat design - private static void DrawFlatBackground(Graphics toDrawOn, Color background, Color backgroundUpDown, Color border) + private static void DrawBackground(Graphics toDrawOn, Color background, Color backgroundUpDown, Color border) { - toDrawOn.FillRectangle(new SolidBrush(background), new Rectangle(-1, -1, 522, 522)); + switch (Settings.Default.rarityDesign) + { + case "Flat": + toDrawOn.FillRectangle(new SolidBrush(background), new Rectangle(-1, -1, 522, 522)); - GraphicsPath p = new GraphicsPath(); - p.StartFigure(); - p.AddLine(4, 438, 517, 383); - p.AddLine(517, 383, 517, 383 + 134); - p.AddLine(4, 383 + 134, 4, 383 + 134); - p.AddLine(4, 383 + 134, 4, 438); - p.CloseFigure(); - toDrawOn.FillPath(new SolidBrush(backgroundUpDown), p); + GraphicsPath p = new GraphicsPath(); + p.StartFigure(); + p.AddLine(4, 438, 517, 383); + p.AddLine(517, 383, 517, 383 + 134); + p.AddLine(4, 383 + 134, 4, 383 + 134); + p.AddLine(4, 383 + 134, 4, 438); + p.CloseFigure(); + toDrawOn.FillPath(new SolidBrush(Utilities.ChangeLightness(background, (float) 0.8)), p); - p.StartFigure(); - p.AddLine(4, 4, 4, 38); - p.AddLine(4, 38, 325, 4); - p.CloseFigure(); - toDrawOn.FillPath(new SolidBrush(backgroundUpDown), p); + p.StartFigure(); + p.AddLine(4, 4, 4, 38); + p.AddLine(4, 38, 325, 4); + p.CloseFigure(); + toDrawOn.FillPath(new SolidBrush(Utilities.ChangeLightness(background, (float) 0.8)), p); - Pen pen = new Pen(border, 5); - pen.Alignment = PenAlignment.Inset; - toDrawOn.DrawRectangle(pen, new Rectangle(-1, -1, 522, 522)); + Pen pen = new Pen(border, 5); + pen.Alignment = PenAlignment.Inset; + toDrawOn.DrawRectangle(pen, new Rectangle(-1, -1, 522, 522)); + break; + case "Default": + GraphicsPath path = new GraphicsPath(); + path.AddEllipse(-266, -266, 1044, 1044); + + PathGradientBrush pthGrBrush = new PathGradientBrush(path); + pthGrBrush.CenterColor = background; + Color[] colors = { backgroundUpDown }; + pthGrBrush.SurroundColors = colors; + + toDrawOn.FillEllipse(pthGrBrush, -266, -266, 1044, 1044); + + Pen pen2 = new Pen(border, 5); + pen2.Alignment = PenAlignment.Inset; + toDrawOn.DrawRectangle(pen2, new Rectangle(-1, -1, 522, 522)); + break; + } } private static void DrawSeriesBackground(JToken theItem, Graphics toDrawOn, string theSeries) { if (theSeries.Equals("MarvelSeries")) { - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 165, 29, 30), Color.FromArgb(255, 128, 22, 31), Color.FromArgb(255, 237, 52, 52)); + DrawBackground(toDrawOn, Color.FromArgb(255, 203, 35, 45), Color.FromArgb(255, 127, 14, 29), Color.FromArgb(255, 255, 67, 61)); } else { @@ -48,7 +67,7 @@ namespace FModel { if (specialMode == "ammo") { - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 84, 84, 84), Color.FromArgb(255, 144, 144, 144)); + DrawBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 70, 70, 70), Color.FromArgb(255, 158, 158, 158)); } else { @@ -68,97 +87,29 @@ namespace FModel switch (raritiesToken != null ? raritiesToken.Value() : "") { case "EFortRarity::Transcendent": - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 155, 39, 69), Color.FromArgb(255, 120, 30, 60), Color.FromArgb(255, 223, 65, 104)); + DrawBackground(toDrawOn, Color.FromArgb(255, 213, 25, 68), Color.FromArgb(255, 134, 7, 45), Color.FromArgb(255, 255, 63, 88)); break; case "EFortRarity::Mythic": - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 170, 143, 47), Color.FromArgb(255, 132, 105, 37), Color.FromArgb(255, 217, 192, 72)); + DrawBackground(toDrawOn, Color.FromArgb(255, 186, 156, 54), Color.FromArgb(255, 115, 88, 26), Color.FromArgb(255, 238, 217, 81)); break; case "EFortRarity::Legendary": - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 170, 96, 47), Color.FromArgb(255, 132, 69, 37), Color.FromArgb(255, 217, 132, 72)); + DrawBackground(toDrawOn, Color.FromArgb(255, 192, 106, 56), Color.FromArgb(255, 115, 51, 26), Color.FromArgb(255, 236, 150, 80)); break; case "EFortRarity::Epic": case "EFortRarity::Quality": - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 96, 47, 170), Color.FromArgb(255, 69, 37, 132), Color.FromArgb(255, 141, 67, 195)); + DrawBackground(toDrawOn, Color.FromArgb(255, 129, 56, 194), Color.FromArgb(255, 66, 26, 115), Color.FromArgb(255, 178, 81, 237)); break; case "EFortRarity::Rare": - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 55, 92, 163), Color.FromArgb(255, 42, 77, 126), Color.FromArgb(255, 72, 121, 217)); + DrawBackground(toDrawOn, Color.FromArgb(255, 54, 105, 187), Color.FromArgb(255, 26, 68, 115), Color.FromArgb(255, 81, 128, 238)); break; case "EFortRarity::Common": - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 84, 84, 84), Color.FromArgb(255, 144, 144, 144)); + DrawBackground(toDrawOn, Color.FromArgb(255, 109, 109, 109), Color.FromArgb(255, 70, 70, 70), Color.FromArgb(255, 158, 158, 158)); break; default: - DrawFlatBackground(toDrawOn, Color.FromArgb(255, 87, 155, 39), Color.FromArgb(255, 75, 120, 30), Color.FromArgb(255, 109, 219, 73)); + DrawBackground(toDrawOn, Color.FromArgb(255, 94, 188, 54), Color.FromArgb(255, 60, 115, 26), Color.FromArgb(255, 116, 239, 82)); break; } } - #endregion - - #region default image - /// - /// check the rarity and return the right image - /// - /// - /// the resource image depending on the rarity - private static Image GetRarityImage(JToken theItem) - { - JToken raritiesToken = theItem["Rarity"]; - switch (raritiesToken != null ? raritiesToken.Value() : "") - { - case "EFortRarity::Transcendent": - return Resources.T512v1; - case "EFortRarity::Mythic": - return Resources.M512v1; - case "EFortRarity::Legendary": - return Resources.L512v1; - case "EFortRarity::Epic": - case "EFortRarity::Quality": - return Resources.E512v1; - case "EFortRarity::Rare": - return Resources.R512v1; - case "EFortRarity::Common": - return Resources.C512v1; - default: - return Resources.U512v1; - } - } - - /// - /// check the series and return the right image - /// if no series known, return the normal item rarity image with GetRarityImage - /// - /// - /// the resource image depending on the series - private static Image GetSeriesImage(JToken theItem, string theSeries) - { - if (theSeries.Equals("MarvelSeries")) - { - return Resources.Marvel512v1; - } - else - { - return GetRarityImage(theItem); - } - } - - /// - /// if specialMode isn't null and is known return the right image - /// if specialMode is unknown, return the normal item rarity image with GetRarityImage - /// - /// - /// - /// the resource image depending on specialMode - private static Image GetSpecialModeImage(JToken theItem, string specialMode) - { - if (specialMode == "ammo") - { - return Resources.C512v1; - } - else - { - return GetRarityImage(theItem); - } - } - #endregion /// /// just draw the rarity @@ -169,39 +120,17 @@ namespace FModel public static void DrawRarity(JToken theItem, Graphics toDrawOn, string specialMode = null) { JToken seriesToken = theItem["Series"]; - switch (Settings.Default.rarityDesign) + if (!string.IsNullOrEmpty(seriesToken != null ? seriesToken.Value() : "")) { - case "Flat": - if (!string.IsNullOrEmpty(seriesToken != null ? seriesToken.Value() : "")) - { - DrawSeriesBackground(theItem, toDrawOn, seriesToken.Value()); - } - else if (specialMode != null) - { - DrawSpecialModeBackground(theItem, toDrawOn, specialMode); - } - else - { - DrawRarityBackground(theItem, toDrawOn); - } - break; - default: - Image rarityBg; - if (!string.IsNullOrEmpty(seriesToken != null ? seriesToken.Value() : "")) - { - rarityBg = GetSeriesImage(theItem, seriesToken.Value()); - } - else if (specialMode != null) - { - rarityBg = GetSpecialModeImage(theItem, specialMode); - } - else - { - rarityBg = GetRarityImage(theItem); - } - toDrawOn.DrawImage(rarityBg, new Point(0, 0)); - break; - + DrawSeriesBackground(theItem, toDrawOn, seriesToken.Value()); + } + else if (specialMode != null) + { + DrawSpecialModeBackground(theItem, toDrawOn, specialMode); + } + else + { + DrawRarityBackground(theItem, toDrawOn); } } } diff --git a/FModel/Methods/IconGenerator/SchematicGenerator/SchematicIconDesign.cs b/FModel/Methods/IconGenerator/SchematicGenerator/SchematicIconDesign.cs index 680dafa3..3193fc74 100644 --- a/FModel/Methods/IconGenerator/SchematicGenerator/SchematicIconDesign.cs +++ b/FModel/Methods/IconGenerator/SchematicGenerator/SchematicIconDesign.cs @@ -111,20 +111,20 @@ namespace FModel switch (rarity.Value()) { case "EFortRarity::Transcendent": - rarityColor = Color.FromArgb(255, 155, 39, 69); + rarityColor = Color.FromArgb(255, 213, 25, 68); break; case "EFortRarity::Mythic": - rarityColor = Color.FromArgb(255, 170, 143, 47); + rarityColor = Color.FromArgb(255, 186, 156, 54); break; case "EFortRarity::Legendary": - rarityColor = Color.FromArgb(255, 170, 96, 47); + rarityColor = Color.FromArgb(255, 192, 106, 56); break; case "EFortRarity::Epic": case "EFortRarity::Quality": - rarityColor = Color.FromArgb(255, 96, 47, 170); + rarityColor = Color.FromArgb(255, 129, 56, 194); break; case "EFortRarity::Rare": - rarityColor = Color.FromArgb(255, 55, 92, 163); + rarityColor = Color.FromArgb(255, 54, 105, 187); break; case "EFortRarity::Common": rarityColor = Color.FromArgb(255, 109, 109, 109); @@ -135,7 +135,7 @@ namespace FModel toDrawOn.FillRectangle(new SolidBrush(rarityColor), new Rectangle(0, 522 + (75 * i), schematicBitmap.Width, 75)); Pen pen = new Pen(ControlPaint.Light(rarityColor), 4); - pen.Alignment = PenAlignment.Inset; //<-- this + pen.Alignment = PenAlignment.Inset; toDrawOn.DrawRectangle(pen, new Rectangle(0, 522 + (75 * i), schematicBitmap.Width, 75)); } diff --git a/FModel/Methods/Utilities/Utilities.cs b/FModel/Methods/Utilities/Utilities.cs index 23983f85..dd8324fa 100644 --- a/FModel/Methods/Utilities/Utilities.cs +++ b/FModel/Methods/Utilities/Utilities.cs @@ -214,5 +214,11 @@ namespace FModel yield return curItem; } } + + public static Color ChangeLightness(this Color color, float coef) + { + return Color.FromArgb((int)(color.R * coef), (int)(color.G * coef), + (int)(color.B * coef)); + } } } diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 040753ad..880d7723 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -90,16 +90,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap C512v1 { - get { - object obj = ResourceManager.GetObject("C512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -130,16 +120,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap E512v1 { - get { - object obj = ResourceManager.GetObject("E512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône). /// @@ -180,16 +160,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap L512v1 { - get { - object obj = ResourceManager.GetObject("L512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -200,26 +170,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap M512v1 { - get { - object obj = ResourceManager.GetObject("M512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Marvel512v1 { - get { - object obj = ResourceManager.GetObject("Marvel512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -250,16 +200,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap R512v1 { - get { - object obj = ResourceManager.GetObject("R512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -280,16 +220,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T512v1 { - get { - object obj = ResourceManager.GetObject("T512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône). /// @@ -300,16 +230,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap U512v1 { - get { - object obj = ResourceManager.GetObject("U512v1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index 891d868c..df58a1d8 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -184,28 +184,4 @@ ..\Resources\cTemplate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\C512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\E512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\L512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\M512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Marvel512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\R512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\T512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\U512v1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/FModel/Resources/C512v1.png b/FModel/Resources/C512v1.png deleted file mode 100644 index 0e56c211..00000000 Binary files a/FModel/Resources/C512v1.png and /dev/null differ diff --git a/FModel/Resources/E512v1.png b/FModel/Resources/E512v1.png deleted file mode 100644 index e44603c7..00000000 Binary files a/FModel/Resources/E512v1.png and /dev/null differ diff --git a/FModel/Resources/L512v1.png b/FModel/Resources/L512v1.png deleted file mode 100644 index c459c641..00000000 Binary files a/FModel/Resources/L512v1.png and /dev/null differ diff --git a/FModel/Resources/M512v1.png b/FModel/Resources/M512v1.png deleted file mode 100644 index 2a5f2f5f..00000000 Binary files a/FModel/Resources/M512v1.png and /dev/null differ diff --git a/FModel/Resources/Marvel512v1.png b/FModel/Resources/Marvel512v1.png deleted file mode 100644 index 7f1d4e64..00000000 Binary files a/FModel/Resources/Marvel512v1.png and /dev/null differ diff --git a/FModel/Resources/R512v1.png b/FModel/Resources/R512v1.png deleted file mode 100644 index 4bdf5a99..00000000 Binary files a/FModel/Resources/R512v1.png and /dev/null differ diff --git a/FModel/Resources/T512v1.png b/FModel/Resources/T512v1.png deleted file mode 100644 index 040c5365..00000000 Binary files a/FModel/Resources/T512v1.png and /dev/null differ diff --git a/FModel/Resources/U512v1.png b/FModel/Resources/U512v1.png deleted file mode 100644 index 3013fcc0..00000000 Binary files a/FModel/Resources/U512v1.png and /dev/null differ