Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-08-26 03:14:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed EID_Dunk featured image + added featured image on wraps to get that nice weapon icon

Browse Source
This commit is contained in:
Asval
2019-05-22 17:33:37 +02:00
parent 3890db712b
commit 022be0ad04
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FModel/FModel.csproj
View File

@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8FABCD3A-9D55-4B54-B237-B259D815DEB8}</ProjectGuid>
<OutputType>Exe</OutputType>
<OutputType>WinExe</OutputType>
<RootNamespace>FModel</RootNamespace>
<AssemblyName>FModel</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>

28
FModel/MainWindow.cs
View File

@@ -24,7 +24,6 @@ using FModel.Parser.Challenges;
using FModel.Parser.Featured;
using FModel.Parser.Items;
using FModel.Parser.Quests;
using FModel.Parser.RenderMat;
using FModel.Properties;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -1672,12 +1671,12 @@ namespace FModel
}
if (featured)
{
if (theItem.DisplayAssetPath != null && theItem.DisplayAssetPath.AssetPathName.Contains("/Game/Catalog/DisplayAssets/") && theItem.ExportType != "AthenaItemWrapDefinition")
if (theItem.DisplayAssetPath != null && theItem.DisplayAssetPath.AssetPathName.Contains("/Game/Catalog/DisplayAssets/"))
{
string catalogName = theItem.DisplayAssetPath.AssetPathName;
SearchFeaturedCharacterIcon(theItem, catalogName);
}
else if (theItem.DisplayAssetPath == null && theItem.ExportType != "AthenaItemWrapDefinition")
else if (theItem.DisplayAssetPath == null)
{
SearchFeaturedCharacterIcon(theItem, "DA_Featured_" + ThePak.CurrentUsedItem, true);
}
@@ -1888,7 +1887,8 @@ namespace FModel
catName == "DA_Featured_Glider_ID_017_Assassin" ||
catName == "DA_Featured_Pickaxe_ID_027_Scavenger" ||
catName == "DA_Featured_Pickaxe_ID_028_Space" ||
catName == "DA_Featured_Pickaxe_ID_029_Assassin")
catName == "DA_Featured_Pickaxe_ID_029_Assassin" ||
catName == "DA_Featured_EID_Dunk")
GetItemIcon(theItem);
else if (ThePak.AllpaksDictionary.ContainsKey(catName))
{
@@ -2430,24 +2430,18 @@ namespace FModel
}
private void DrawV2(ChallengeBundleIdParser myBundle, ItemsIdParser theItem, string questJson, Graphics toDrawOn, Bitmap myBitmap)
{
int sRed;
int sGreen;
int sBlue;
string seasonFolder = questJson.Substring(questJson.Substring(0, questJson.LastIndexOf("\\", StringComparison.Ordinal)).LastIndexOf("\\", StringComparison.Ordinal) + 1).ToUpper();
sRed = (int)(myBundle.DisplayStyle.AccentColor.R * 255);
sGreen = (int)(myBundle.DisplayStyle.AccentColor.G * 255);
sBlue = (int)(myBundle.DisplayStyle.AccentColor.B * 255);
int sRed = (int)(myBundle.DisplayStyle.SecondaryColor.R * 255);
int sGreen = (int)(myBundle.DisplayStyle.SecondaryColor.G * 255);
int sBlue = (int)(myBundle.DisplayStyle.SecondaryColor.B * 255);
if (sRed <= 25 && sGreen <= 25 && sBlue <= 25)
if (string.Equals(seasonFolder.Substring(0, seasonFolder.LastIndexOf("\\", StringComparison.Ordinal)), "LTM") || sRed + sGreen + sBlue <= 75)
{
sRed = (int)(myBundle.DisplayStyle.SecondaryColor.R * 255);
sGreen = (int)(myBundle.DisplayStyle.SecondaryColor.G * 255);
sBlue = (int)(myBundle.DisplayStyle.SecondaryColor.B * 255);
sRed = (int)(myBundle.DisplayStyle.AccentColor.R * 255);
sGreen = (int)(myBundle.DisplayStyle.AccentColor.G * 255);
sBlue = (int)(myBundle.DisplayStyle.AccentColor.B * 255);
}
Console.WriteLine(sRed + " " + sGreen + " " + sBlue);
int seasonRed = Convert.ToInt32(sRed / 1.5);
int seasonGreen = Convert.ToInt32(sGreen / 1.5);
int seasonBlue = Convert.ToInt32(sBlue / 1.5);

3
FModel/Methods/JohnWick/JohnWick.cs
View File

@@ -4,7 +4,6 @@ using FModel.Properties;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Drawing;
using System.IO;
using System.Linq;
@@ -73,7 +72,7 @@ namespace FModel
string TexturePath = string.Empty;
if (textureFilePath != null && (textureFilePath.Contains("MI_UI_FeaturedRenderSwitch_") || textureFilePath.Contains("M_UI_ChallengeTile_PCB")))
if (textureFilePath != null && (textureFilePath.Contains("MI_UI_FeaturedRenderSwitch_") || textureFilePath.Contains("M_UI_ChallengeTile_PCB") || textureFilePath.Contains("Wraps\\FeaturedMaterials\\")))
{
return GetRenderSwitchMaterialTexture(AssetName, textureFilePath);
}