diff --git a/FModel/App.config b/FModel/App.config index d44d1e43..6bd7ce1f 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -157,6 +157,9 @@ + + False + diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 98137a18..32454958 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -265,6 +265,16 @@ + + + + + + + + + + diff --git a/FModel/Forms/Settings.Designer.cs b/FModel/Forms/Settings.Designer.cs index afc1bf0e..5ced695a 100644 --- a/FModel/Forms/Settings.Designer.cs +++ b/FModel/Forms/Settings.Designer.cs @@ -38,6 +38,7 @@ namespace FModel.Forms this.label1 = new System.Windows.Forms.Label(); this.OKButton = new System.Windows.Forms.Button(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.label10 = new System.Windows.Forms.Label(); this.button2 = new System.Windows.Forms.Button(); @@ -152,6 +153,7 @@ namespace FModel.Forms // // groupBox4 // + this.groupBox4.Controls.Add(this.checkBox1); this.groupBox4.Controls.Add(this.comboBox1); this.groupBox4.Controls.Add(this.label10); this.groupBox4.Controls.Add(this.button2); @@ -171,6 +173,17 @@ namespace FModel.Forms this.groupBox4.TabStop = false; this.groupBox4.Text = "Icon Creation"; // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(244, 47); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(139, 17); + this.checkBox1.TabIndex = 30; + this.checkBox1.Text = "New Rarity Background"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1_CheckedChanged); + // // comboBox1 // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -321,7 +334,6 @@ namespace FModel.Forms this.groupBox1.TabIndex = 17; this.groupBox1.TabStop = false; this.groupBox1.Text = "Merger"; - this.groupBox1.Enter += new System.EventHandler(this.GroupBox1_Enter); // // checkBoxSaveAsMergeImages // @@ -386,7 +398,6 @@ namespace FModel.Forms this.groupBox6.TabIndex = 19; this.groupBox6.TabStop = false; this.groupBox6.Text = "Challenges"; - this.groupBox6.Enter += new System.EventHandler(this.GroupBox6_Enter); // // checkBox2 // @@ -483,5 +494,6 @@ namespace FModel.Forms private System.Windows.Forms.Label label12; private System.Windows.Forms.CheckBox checkBox_tryToOpen; private System.Windows.Forms.CheckBox checkBoxSaveAsMergeImages; + private System.Windows.Forms.CheckBox checkBox1; } } diff --git a/FModel/Forms/Settings.cs b/FModel/Forms/Settings.cs index c5ed9b2e..fd297a4a 100644 --- a/FModel/Forms/Settings.cs +++ b/FModel/Forms/Settings.cs @@ -19,6 +19,8 @@ namespace FModel.Forms textBox2.Text = Properties.Settings.Default.PAKsPath; textBox1.Text = Properties.Settings.Default.ExtractOutput; + checkBox1.Checked = Properties.Settings.Default.rarityNew; + textBox6.Text = Properties.Settings.Default.challengesWatermark; checkBox2.Checked = Properties.Settings.Default.challengesDebug; if (string.IsNullOrWhiteSpace(textBox6.Text)) @@ -48,7 +50,15 @@ namespace FModel.Forms { filenameLabel.Text = @"File Name: " + Path.GetFileName(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(Properties.Settings.Default.rarityNew ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1)); + } + else + { + bmp = new Bitmap(Properties.Settings.Default.rarityNew ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1)); + } Graphics g = Graphics.FromImage(bmp); Image watermark = Image.FromFile(Properties.Settings.Default.wFilename); @@ -90,6 +100,8 @@ namespace FModel.Forms Properties.Settings.Default.tryToOpenAssets = checkBox_tryToOpen.Checked; + Properties.Settings.Default.rarityNew = checkBox1.Checked; + //MERGER Properties.Settings.Default.mergerFileName = textBox3.Text; Properties.Settings.Default.mergerImagesSaveAs = checkBoxSaveAsMergeImages.Checked; @@ -187,7 +199,7 @@ namespace FModel.Forms { if (!checkBox8.Checked) { - Bitmap bmp = new Bitmap(Resources.wTemplate); + Bitmap bmp = checkBox1.Checked ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1); Graphics g = Graphics.FromImage(bmp); if (File.Exists(Properties.Settings.Default.wFilename)) { @@ -199,7 +211,7 @@ namespace FModel.Forms } if (checkBox8.Checked) { - Bitmap bmp = new Bitmap(Resources.wTemplateF); + Bitmap bmp = checkBox1.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1); Graphics g = Graphics.FromImage(bmp); if (File.Exists(Properties.Settings.Default.wFilename)) { @@ -224,14 +236,32 @@ namespace FModel.Forms } } - private void GroupBox6_Enter(object sender, EventArgs e) + private void CheckBox1_CheckedChanged(object sender, EventArgs e) { - - } - - private void GroupBox1_Enter(object sender, EventArgs e) - { - + if (!checkBox1.Checked) + { + Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateFv1) : new Bitmap(Resources.wTemplatev1); + Graphics g = Graphics.FromImage(bmp); + if (File.Exists(Properties.Settings.Default.wFilename)) + { + Image watermark = Image.FromFile(Properties.Settings.Default.wFilename); + var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100); + g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value); + } + wPictureBox.Image = bmp; + } + if (checkBox1.Checked) + { + Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplate); + Graphics g = Graphics.FromImage(bmp); + if (File.Exists(Properties.Settings.Default.wFilename)) + { + Image watermark = Image.FromFile(Properties.Settings.Default.wFilename); + var opacityImage = ImageUtilities.SetImageOpacity(watermark, (float)trackBar1.Value / 100); + g.DrawImage(ImageUtilities.ResizeImage(opacityImage, trackBar2.Value, trackBar2.Value), (522 - trackBar2.Value) / 2, (522 - trackBar2.Value) / 2, trackBar2.Value, trackBar2.Value); + } + wPictureBox.Image = bmp; + } } } } diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 655bddf4..77f0cb46 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -1204,14 +1204,18 @@ namespace FModel ItemIcon.DrawWatermark(g); - 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(); - g.FillPath(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), p); + if (Settings.Default.rarityNew) + { + 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(); + g.FillPath(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), p); + } + else { g.FillRectangle(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), new Rectangle(5, 383, 512, 134)); } DrawText.DrawTexts(theItem, g, specialMode); diff --git a/FModel/Methods/ChallengeGenerator/DrawingRewards.cs b/FModel/Methods/ChallengeGenerator/DrawingRewards.cs index 9920954d..94a7aec5 100644 --- a/FModel/Methods/ChallengeGenerator/DrawingRewards.cs +++ b/FModel/Methods/ChallengeGenerator/DrawingRewards.cs @@ -174,7 +174,7 @@ namespace FModel { case "athenabattlestar": { - rewardIcon = Resources.T_FNBR_BattlePoints_L; + rewardIcon = Resources.BattlePoints; BundleDesign.toDrawOn.DrawImage(ImageUtilities.ResizeImage(rewardIcon, 75, 75), new Point(2325, BundleDesign.theY + 22)); graphicsPath = new GraphicsPath(); @@ -183,7 +183,7 @@ namespace FModel } case "AthenaSeasonalXP": { - rewardIcon = Resources.T_FNBR_SeasonalXP_L; + rewardIcon = Resources.SeasonalXP; BundleDesign.toDrawOn.DrawImage(ImageUtilities.ResizeImage(rewardIcon, 75, 75), new Point(2325, BundleDesign.theY + 22)); graphicsPath = new GraphicsPath(); @@ -192,7 +192,7 @@ namespace FModel } case "MtxGiveaway": { - rewardIcon = Resources.T_Items_MTX_L; + rewardIcon = Resources.ItemsMTX; BundleDesign.toDrawOn.DrawImage(ImageUtilities.ResizeImage(rewardIcon, 75, 75), new Point(2325, BundleDesign.theY + 22)); graphicsPath = new GraphicsPath(); diff --git a/FModel/Methods/IconGenerator/DrawText.cs b/FModel/Methods/IconGenerator/DrawText.cs index dc8f60b1..5f6ec5c2 100644 --- a/FModel/Methods/IconGenerator/DrawText.cs +++ b/FModel/Methods/IconGenerator/DrawText.cs @@ -223,17 +223,17 @@ namespace FModel if (CosmeticUff != null) { if (CosmeticUff.Contains("Animated")) - imageLogo = Resources.T_Icon_Animated_64; + imageLogo = Resources.Animated64; else if (CosmeticUff.Contains("HasUpgradeQuests") && theItem.ExportType != "AthenaPetCarrierItemDefinition") - imageLogo = Resources.T_Icon_Quests_64; + imageLogo = Resources.Quests64; else if (CosmeticUff.Contains("HasUpgradeQuests") && theItem.ExportType == "AthenaPetCarrierItemDefinition") - imageLogo = Resources.T_Icon_Pets_64; + imageLogo = Resources.Pets64; else if (CosmeticUff.Contains("HasVariants")) - imageLogo = Resources.T_Icon_Variant_64; + imageLogo = Resources.Variant64; else if (CosmeticUff.Contains("Reactive")) - imageLogo = Resources.T_Icon_Adaptive_64; + imageLogo = Resources.Adaptive64; else if (CosmeticUff.Contains("Traversal")) - imageLogo = Resources.T_Icon_Traversal_64; + imageLogo = Resources.Traversal64; } if (imageLogo != null) @@ -256,8 +256,16 @@ namespace FModel string text = SearchResource.getTextByKey(theItem.DisplayName.Key, theItem.DisplayName.SourceString); - Font goodFont = FontUtilities.FindFont(myGraphic, text, new Rectangle(5, 405, 512, 55).Size, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[0], 35)); - myGraphic.DrawString(text, goodFont, new SolidBrush(Color.White), new Point(522, 405), FontUtilities.rightString); + if (Settings.Default.rarityNew) + { + Font goodFont = FontUtilities.FindFont(myGraphic, text, new Rectangle(5, 405, 512, 55).Size, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[0], 35)); + myGraphic.DrawString(text, goodFont, new SolidBrush(Color.White), new Point(522, 405), FontUtilities.rightString); + } + else + { + Font goodFont = FontUtilities.FindFont(myGraphic, text, new Rectangle(5, 395, 512, 49).Size, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[0], 35)); + myGraphic.DrawString(text, goodFont, new SolidBrush(Color.White), new Point(522 / 2, 395), FontUtilities.centeredString); + } } } @@ -281,7 +289,15 @@ namespace FModel text += theSet; } } - myGraphic.DrawString(text, new Font("Arial", 9), new SolidBrush(Color.White), new RectangleF(5, 455, 512, 42), FontUtilities.rightString); + + if (Settings.Default.rarityNew) + { + myGraphic.DrawString(text, new Font("Arial", 9), new SolidBrush(Color.White), new RectangleF(5, 455, 512, 42), FontUtilities.rightString); + } + else + { + myGraphic.DrawString(text, new Font("Arial", 10), new SolidBrush(Color.White), new RectangleF(5, 441, 512, 49), FontUtilities.centeredStringLine); + } } } diff --git a/FModel/Methods/IconGenerator/Rarity.cs b/FModel/Methods/IconGenerator/Rarity.cs index daa6c1c8..fcc54b5b 100644 --- a/FModel/Methods/IconGenerator/Rarity.cs +++ b/FModel/Methods/IconGenerator/Rarity.cs @@ -16,20 +16,20 @@ namespace FModel switch (theItem.Rarity) { case "EFortRarity::Transcendent": - return Resources.T512; + return Settings.Default.rarityNew ? Resources.T512 : Resources.T512v1; case "EFortRarity::Mythic": - return Resources.M512; + return Settings.Default.rarityNew ? Resources.M512 : Resources.M512v1; case "EFortRarity::Legendary": - return Resources.L512; + return Settings.Default.rarityNew ? Resources.L512 : Resources.L512v1; case "EFortRarity::Epic": case "EFortRarity::Quality": - return Resources.E512; + return Settings.Default.rarityNew ? Resources.E512 : Resources.E512v1; case "EFortRarity::Rare": - return Resources.R512; + return Settings.Default.rarityNew ? Resources.R512 : Resources.R512v1; case "EFortRarity::Common": - return Resources.C512; + return Settings.Default.rarityNew ? Resources.C512 : Resources.C512v1; default: - return Resources.U512; + return Settings.Default.rarityNew ? Resources.U512 : Resources.U512v1; } } @@ -43,7 +43,7 @@ namespace FModel { if (theItem.Series == "MarvelSeries") { - return Resources.Marvel512; + return Settings.Default.rarityNew ? Resources.Marvel512 : Resources.Marvel512v1; } else { diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 5bda9169..6b1012f3 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -60,6 +60,36 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Adaptive64 { + get { + object obj = ResourceManager.GetObject("Adaptive64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Animated64 { + get { + object obj = ResourceManager.GetObject("Animated64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap BattlePoints { + get { + object obj = ResourceManager.GetObject("BattlePoints", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Byte[]. /// @@ -100,6 +130,16 @@ 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. /// @@ -140,6 +180,16 @@ 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,6 +230,16 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ItemsMTX { + get { + object obj = ResourceManager.GetObject("ItemsMTX", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -190,6 +250,16 @@ 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. /// @@ -210,6 +280,16 @@ 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. /// @@ -220,6 +300,26 @@ namespace FModel.Properties { } } + /// + /// 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. + /// + internal static System.Drawing.Bitmap Pets64 { + get { + object obj = ResourceManager.GetObject("Pets64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -230,6 +330,16 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Quests64 { + get { + object obj = ResourceManager.GetObject("Quests64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -240,6 +350,16 @@ 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. /// @@ -250,6 +370,16 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SeasonalXP { + get { + object obj = ResourceManager.GetObject("SeasonalXP", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -260,96 +390,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_FNBR_BattlePoints_L { - get { - object obj = ResourceManager.GetObject("T_FNBR_BattlePoints_L", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_FNBR_SeasonalXP_L { - get { - object obj = ResourceManager.GetObject("T_FNBR_SeasonalXP_L", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Icon_Adaptive_64 { - get { - object obj = ResourceManager.GetObject("T_Icon_Adaptive_64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Icon_Animated_64 { - get { - object obj = ResourceManager.GetObject("T_Icon_Animated_64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Icon_Pets_64 { - get { - object obj = ResourceManager.GetObject("T_Icon_Pets_64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Icon_Quests_64 { - get { - object obj = ResourceManager.GetObject("T_Icon_Quests_64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Icon_Traversal_64 { - get { - object obj = ResourceManager.GetObject("T_Icon_Traversal_64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Icon_Variant_64 { - get { - object obj = ResourceManager.GetObject("T_Icon_Variant_64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap T_Items_MTX_L { - get { - object obj = ResourceManager.GetObject("T_Items_MTX_L", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -360,6 +400,26 @@ 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.Bitmap. + /// + internal static System.Drawing.Bitmap Traversal64 { + get { + object obj = ResourceManager.GetObject("Traversal64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône). /// @@ -380,6 +440,16 @@ 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. /// @@ -390,6 +460,16 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Variant64 { + get { + object obj = ResourceManager.GetObject("Variant64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// @@ -409,5 +489,25 @@ namespace FModel.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap wTemplateFv1 { + get { + object obj = ResourceManager.GetObject("wTemplateFv1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap wTemplatev1 { + get { + object obj = ResourceManager.GetObject("wTemplatev1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index 0ddf82e7..16d13cee 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -160,22 +160,22 @@ ..\Resources\FModel_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Icon-Adaptive-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Icon-Animated-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Icon-Traversal-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Icon-Variant-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Icon-Quests-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Icon-Pets-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,13 +187,13 @@ ..\Resources\BurbankBigCondensed-Bold.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ..\Resources\T-FNBR-BattlePoints-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-FNBR-SeasonalXP-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\T-Items-MTX-L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -223,4 +223,34 @@ ..\Resources\FModel.ico;System.Drawing.Icon, 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 + + + ..\Resources\wTemplateFv1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wTemplatev1.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/Properties/Settings.Designer.cs b/FModel/Properties/Settings.Designer.cs index 8c5f34d0..3ab31095 100644 --- a/FModel/Properties/Settings.Designer.cs +++ b/FModel/Properties/Settings.Designer.cs @@ -610,5 +610,17 @@ namespace FModel.Properties { this["tTokenSecret"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool rarityNew { + get { + return ((bool)(this["rarityNew"])); + } + set { + this["rarityNew"] = value; + } + } } } diff --git a/FModel/Properties/Settings.settings b/FModel/Properties/Settings.settings index 672b2b6f..940fca05 100644 --- a/FModel/Properties/Settings.settings +++ b/FModel/Properties/Settings.settings @@ -149,5 +149,8 @@ + + False + \ No newline at end of file