From 554361bea5e11d1e4ad6196cb4ca3dffa1bb0962 Mon Sep 17 00:00:00 2001 From: GMatrixGames Date: Tue, 25 May 2021 14:37:11 -0400 Subject: [PATCH] Remove Party Royale landmarks from map viewer --- FModel/ViewModels/MapViewerViewModel.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FModel/ViewModels/MapViewerViewModel.cs b/FModel/ViewModels/MapViewerViewModel.cs index dc57dde4..f121190a 100644 --- a/FModel/ViewModels/MapViewerViewModel.cs +++ b/FModel/ViewModels/MapViewerViewModel.cs @@ -198,14 +198,16 @@ namespace FModel.ViewModels _landmarksBitmap = new SKBitmap(_mapBitmap.Width, _mapBitmap.Height, SKColorType.Rgba8888, SKAlphaType.Premul); using var cities = new SKCanvas(_citiesBitmap); using var landmarks = new SKCanvas(_landmarksBitmap); - if (Utils.TryLoadObject("FortniteGame/Content/Quests/QuestIndicatorData", out UObject indicatorData) && + if (Utils.TryLoadObject("FortniteGame/Content/Quests/QuestIndicatorData.QuestIndicatorData", out UObject indicatorData) && indicatorData.TryGetValue(out FStructFallback[] challengeMapPoiData, "ChallengeMapPoiData")) { foreach (var poiData in challengeMapPoiData) { if (!poiData.TryGetValue(out FSoftObjectPath discoveryQuest, "DiscoveryQuest") || !poiData.TryGetValue(out FText text, "Text") || string.IsNullOrEmpty(text.Text) || - !poiData.TryGetValue(out FVector worldLocation, "WorldLocation")) continue; + !poiData.TryGetValue(out FVector worldLocation, "WorldLocation") || + !poiData.TryGetValue(out FName discoverBackend, "DiscoverObjectiveBackendName") || + discoverBackend.Text.Contains("papaya", StringComparison.OrdinalIgnoreCase)) continue; var shaper = new CustomSKShaper(_imagePaint.Typeface); var shapedText = shaper.Shape(text.Text, _imagePaint);