Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-25 02:44:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add icon generation for Ammo

Browse Source 
- Added "SpecialMode" parameters for CreateItemIcon and GetItemRarity to force different behavior for different asset types, such as ammo, as ammo is always Common
- Added icon generation support for ammo
This commit is contained in:
TSG
2019-05-10 22:48:08 -04:00
parent 544d15af19
commit 6b6e2153e3
6 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FModel/App.config
View File

@@ -112,6 +112,9 @@
<setting name="UpdateSettings" serializeAs="String">
<value>True</value>
</setting>
<setting name="createIconForAmmo" serializeAs="String">
<value>True</value>
</setting>
</FModel.Properties.Settings>
</userSettings>
</configuration>

3
FModel/Forms/IconGeneratorAssets.Designer.cs generated
View File

@@ -54,7 +54,8 @@
"Consumables & Weapons",
"Cosmetics",
"Traps",
"Variants"});
"Variants",
"Ammo"});
this.checkedAssets.Location = new System.Drawing.Point(12, 12);
this.checkedAssets.Name = "checkedAssets";
this.checkedAssets.Size = new System.Drawing.Size(307, 274);

2
FModel/Forms/IconGeneratorAssets.cs
View File

@@ -20,6 +20,7 @@ namespace FModel.Forms
checkedAssets.SetItemChecked(2, Properties.Settings.Default.createIconForCosmetics);
checkedAssets.SetItemChecked(3, Properties.Settings.Default.createIconForTraps);
checkedAssets.SetItemChecked(4, Properties.Settings.Default.createIconForVariants);
checkedAssets.SetItemChecked(5, Properties.Settings.Default.createIconForAmmo);
}
private void OKButton_Click(object sender, EventArgs e)
@@ -30,6 +31,7 @@ namespace FModel.Forms
Properties.Settings.Default.createIconForCosmetics = checkedAssets.GetItemChecked(2);
Properties.Settings.Default.createIconForTraps = checkedAssets.GetItemChecked(3);
Properties.Settings.Default.createIconForVariants = checkedAssets.GetItemChecked(4);
Properties.Settings.Default.createIconForAmmo = checkedAssets.GetItemChecked(5);
Properties.Settings.Default.Save(); //SAVE
Close();

19
FModel/MainWindow.cs
View File

@@ -1461,6 +1461,8 @@ namespace FModel
CreateItemIcon(itemId[i]);
else if (Settings.Default.createIconForVariants && (itemId[i].ExportType == "FortVariantTokenType"))
CreateItemIcon(itemId[i], false, false, true);
else if (Settings.Default.createIconForAmmo && (itemId[i].ExportType == "FortAmmoItemDefinition"))
CreateItemIcon(itemId[i], false, false, false, "ammo");
else if (itemId[i].ExportType == "FortChallengeBundleItemDefinition")
CreateChallengesIcon(itemId[i], parsedJson, questJson);
else if (itemId[i].ExportType == "Texture2D")
@@ -1476,7 +1478,7 @@ namespace FModel
Console.WriteLine(ex.Message);
}
}
private void CreateItemIcon(ItemsIdParser theItem, bool athIteDef = false, bool consAndWeap = false, bool variant = false)
private void CreateItemIcon(ItemsIdParser theItem, bool athIteDef = false, bool consAndWeap = false, bool variant = false, string SpecialMode = null)
{
UpdateConsole(CurrentUsedItem + " is a Cosmetic ID", Color.FromArgb(255, 66, 244, 66), "Success");
@@ -1487,7 +1489,11 @@ namespace FModel
if (theItem.Series != null)
GetSeriesRarity(theItem, g);
else
GetItemRarity(theItem, g);
// Special ammo force-rarity check
if (SpecialMode == "ammo")
GetItemRarity(theItem, g, "ammo");
else
GetItemRarity(theItem, g);
ItemIconPath = string.Empty;
if (Settings.Default.loadFeaturedImage == false)
@@ -1715,7 +1721,7 @@ namespace FModel
toDrawOn.DrawImage(rarityBg, new Point(0, 0));
}
}
private void GetItemRarity(ItemsIdParser theItem, Graphics toDrawOn)
private void GetItemRarity(ItemsIdParser theItem, Graphics toDrawOn, string SpecialMode = null)
{
if (theItem.Rarity == "EFortRarity::Transcendent")
{
@@ -1752,6 +1758,13 @@ namespace FModel
Image rarityBg = Resources.U512;
toDrawOn.DrawImage(rarityBg, new Point(0, 0));
}
// Force common rarity if ammo, as ammo is always common in FN
if (SpecialMode == "ammo")
{
Image rarityBg = Resources.C512;
toDrawOn.DrawImage(rarityBg, new Point(0, 0));
}
}
private void GetItemIcon(ItemsIdParser theItem, bool featured = false)
{

12
FModel/Properties/Settings.Designer.cs generated
View File

@@ -430,5 +430,17 @@ namespace FModel.Properties {
this["UpdateSettings"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool createIconForAmmo {
get {
return ((bool)(this["createIconForAmmo"]));
}
set {
this["createIconForAmmo"] = value;
}
}
}
}

3
FModel/Properties/Settings.settings
View File

@@ -104,5 +104,8 @@
<Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="createIconForAmmo" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>