diff --git a/FModel/Creator/Bases/SB/BaseSpellIcon.cs b/FModel/Creator/Bases/SB/BaseSpellIcon.cs index 770e6b81..cc37fcad 100644 --- a/FModel/Creator/Bases/SB/BaseSpellIcon.cs +++ b/FModel/Creator/Bases/SB/BaseSpellIcon.cs @@ -24,8 +24,8 @@ namespace FModel.Creator.Bases.SB { Background = new[] {SKColor.Parse("FFFFFF"), SKColor.Parse("636363")}; Border = new[] {SKColor.Parse("D0D0D0"), SKColor.Parse("FFFFFF")}; - Width = Object.ExportType.StartsWith("BP_Cosmetic_Card") ? 1536 : 512; - Height = Object.ExportType.StartsWith("BP_Cosmetic_Card") ? 450 : 512; + Width = Object.ExportType.StartsWith("GCosmeticCard") ? 1536 : 512; + Height = Object.ExportType.StartsWith("GCosmeticCard") ? 450 : 512; } public override void ParseForInfo() @@ -33,12 +33,12 @@ namespace FModel.Creator.Bases.SB if (Object.TryGetValue(out FName rarity, "Rarity")) GetRarity(rarity); - if (Object.TryGetValue(out FSoftObjectPath preview, "IconTexture")) + if (Object.TryGetValue(out FSoftObjectPath preview, "IconTexture", "OfferTexture", "PortraitTexture")) Preview = Utils.GetBitmap(preview); - else if (Object.TryGetValue(out FPackageIndex icon, "IconTexture")) + else if (Object.TryGetValue(out FPackageIndex icon, "IconTexture", "OfferTexture", "PortraitTexture")) Preview = Utils.GetBitmap(icon); - if (Object.TryGetValue(out FText displayName, "DisplayName", "Title")) + if (Object.TryGetValue(out FText displayName, "DisplayName", "Title", "Name")) DisplayName = displayName.Text; if (Object.TryGetValue(out FText description, "Description")) Description = description.Text; diff --git a/FModel/Creator/CreatorPackage.cs b/FModel/Creator/CreatorPackage.cs index dc523078..48a97404 100644 --- a/FModel/Creator/CreatorPackage.cs +++ b/FModel/Creator/CreatorPackage.cs @@ -193,18 +193,31 @@ namespace FModel.Creator creator = new BaseBreakersIcon(_object, EIconStyle.Default); return true; // Spellbreak - case "GQuest": - case "GAccolade": - case "GCosmeticCard": - case "GCosmeticSkin": + case "GTargetedTeleportActiveSkill": + case "GChronomasterV2ActiveSkill": + case "GShadowstepActiveSkill": + case "GGatewayActiveSkill": + case "GStealthActiveSkill": + case "GFeatherActiveSkill": + case "GCosmeticDropTrail": + case "GFlightActiveSkill": + case "GCosmeticRunTrail": + case "GCosmeticArtifact": + case "GCosmeticTriumph": + case "GWolfsbloodSkill": + case "GDashActiveSkill": case "GCharacterPerk": case "GCosmeticTitle": case "GCosmeticBadge": + case "GRMTStoreOffer": case "GCosmeticEmote": - case "GCosmeticTriumph": - case "GCosmeticRunTrail": - case "GCosmeticArtifact": - case "GCosmeticDropTrail": + case "GCosmeticCard": + case "GGameModeInfo": + case "GCosmeticSkin": + case "GStoreOffer": + case "GAccolade": + case "GRuneItem": + case "GQuest": creator = new BaseSpellIcon(_object, EIconStyle.Default); return true; case "GLeagueTier":