From f0e7efbb754b16de54ccbc7d7298343bb3997097 Mon Sep 17 00:00:00 2001 From: TSG Date: Fri, 21 Jun 2019 17:51:43 -0400 Subject: [PATCH] Add icon generation support for Creative Galleries Add icon generation support for Creative Galleries found in /Game/Content/Athena/Items/Consumables/PlaysetGrenade/PlaysetGrenadeInstances/ --- FModel/App.config | 3 +++ FModel/Forms/IconGeneratorAssets.Designer.cs | 3 ++- FModel/Forms/IconGeneratorAssets.cs | 2 ++ FModel/MainWindow.cs | 4 ++++ FModel/Properties/Settings.Designer.cs | 22 +++++++++++++++----- FModel/Properties/Settings.settings | 3 +++ 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/FModel/App.config b/FModel/App.config index 805bdf3e..5c299c5f 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -139,6 +139,9 @@ + + False + diff --git a/FModel/Forms/IconGeneratorAssets.Designer.cs b/FModel/Forms/IconGeneratorAssets.Designer.cs index a52fe278..5ff7863c 100644 --- a/FModel/Forms/IconGeneratorAssets.Designer.cs +++ b/FModel/Forms/IconGeneratorAssets.Designer.cs @@ -58,7 +58,8 @@ "Ammo", "STW Heroes", "STW Defenders", - "STW Card Packs"}); + "STW Card Packs", + "Creative Galleries"}); this.checkedAssets.Location = new System.Drawing.Point(12, 12); this.checkedAssets.Name = "checkedAssets"; this.checkedAssets.Size = new System.Drawing.Size(307, 274); diff --git a/FModel/Forms/IconGeneratorAssets.cs b/FModel/Forms/IconGeneratorAssets.cs index 142c8b73..3bb75756 100644 --- a/FModel/Forms/IconGeneratorAssets.cs +++ b/FModel/Forms/IconGeneratorAssets.cs @@ -19,6 +19,7 @@ namespace FModel.Forms checkedAssets.SetItemChecked(6, Properties.Settings.Default.createIconForSTWHeroes); checkedAssets.SetItemChecked(7, Properties.Settings.Default.createIconForSTWDefenders); checkedAssets.SetItemChecked(8, Properties.Settings.Default.createIconForSTWCardPacks); + checkedAssets.SetItemChecked(9, Properties.Settings.Default.createIconForCreativeGalleries); } private void OKButton_Click(object sender, EventArgs e) @@ -33,6 +34,7 @@ namespace FModel.Forms Properties.Settings.Default.createIconForSTWHeroes = checkedAssets.GetItemChecked(6); Properties.Settings.Default.createIconForSTWDefenders = checkedAssets.GetItemChecked(7); Properties.Settings.Default.createIconForSTWCardPacks = checkedAssets.GetItemChecked(8); + Properties.Settings.Default.createIconForCreativeGalleries = checkedAssets.GetItemChecked(9); Properties.Settings.Default.Save(); //SAVE Close(); diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 0c4cac2a..4605d9ca 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -1261,6 +1261,10 @@ namespace FModel { pictureBox1.Image = CreateItemIcon(itemId[i]); } + else if (Settings.Default.createIconForCreativeGalleries && (itemId[i].ExportType == "FortPlaysetGrenadeItemDefinition")) + { + pictureBox1.Image = CreateItemIcon(itemId[i]); + } else if (itemId[i].ExportType == "FortChallengeBundleItemDefinition") { CreateBundleChallengesIcon(itemId[i], parsedJson, questJson); diff --git a/FModel/Properties/Settings.Designer.cs b/FModel/Properties/Settings.Designer.cs index fd7e56d1..c424f461 100644 --- a/FModel/Properties/Settings.Designer.cs +++ b/FModel/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace FModel.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -538,5 +538,17 @@ namespace FModel.Properties { this["challengesWatermark"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool createIconForCreativeGalleries { + get { + return ((bool)(this["createIconForCreativeGalleries"])); + } + set { + this["createIconForCreativeGalleries"] = value; + } + } } } diff --git a/FModel/Properties/Settings.settings b/FModel/Properties/Settings.settings index 78071891..777df40b 100644 --- a/FModel/Properties/Settings.settings +++ b/FModel/Properties/Settings.settings @@ -131,5 +131,8 @@ + + False + \ No newline at end of file