Implemented GetChallengeStageContinuation.

- A more logical way for the challenge stages. - Fixed QuestBundle_Event_Sourdropper stages.
4sval · Feb 6, 2020 · 1b6cb54 · 1b6cb54
1 parent 9cb603d
commit 1b6cb54
Showing 1 changed file with 12 additions and 19 deletions.
diff --git a/FModel/Methods/Assets/IconCreator/ChallengeID/ChallengeBundleInfos.cs b/FModel/Methods/Assets/IconCreator/ChallengeID/ChallengeBundleInfos.cs
@@ -271,25 +271,7 @@ private static void GetQuestData(JArray BundleProperties, string assetPath)
                                     JToken primaryAssetNameToken = token["struct_type"]["properties"][0]["tag_data"]["struct_type"]["properties"][1]["tag_data"];
                                     if (primaryAssetNameToken != null)
                                     {
-                                        string primaryAssetName = primaryAssetNameToken.Value<string>();
-
-                                        // Manual fix: QuestBundle_Event_Galileo Stages
-                                        if (assetPath.StartsWith("/FortniteGame/Content/Athena/Items/Quests/BattlePass/Season11/Galileo/"))
-                                        {
-                                            JArray objectivesGalileoArray = AssetsUtility.GetPropertyTagText<JArray>(AssetProperties, "Objectives", "data");
-                                            if (objectivesGalileoArray != null)
-                                            {
-                                                JToken questGalileoToken = objectivesGalileoArray[0]["struct_type"]["properties"][0]["tag_data"];
-                                                if (questGalileoToken != null)
-                                                {
-                                                    if (!string.Equals(primaryAssetName, questGalileoToken.Value<string>()))
-                                                    {
-                                                        int questGalileoStageId = int.Parse(questGalileoToken.Value<string>().Substring(questGalileoToken.Value<string>().Length - 1, 1)) + 1;
-                                                        primaryAssetName = questGalileoToken.Value<string>().Remove(questGalileoToken.Value<string>().Length - 1).Replace("questobj", "quest").Replace("_npc_or_player", "") + "_" + questGalileoStageId;
-                                                    }
-                                                }
-                                            }
-                                        }
+                                        string primaryAssetName = GetChallengeStageContinuation(assetPath, primaryAssetNameToken.Value<string>(), AssetProperties);
 
                                         //this will catch the full path if asset exists to be able to grab his PakReader and List<FPakEntry>
                                         string primaryAssetNameFullPath = AssetEntries.AssetEntriesDict.Where(x => x.Key.ToLowerInvariant().Contains("/" + primaryAssetName.ToLowerInvariant())).Select(d => d.Key).FirstOrDefault();
@@ -310,5 +292,16 @@ private static void GetQuestData(JArray BundleProperties, string assetPath)
                 }
             }
         }
+
+        static string GetChallengeStageContinuation(string assetPath, string assetName, JArray AssetProperties)
+        {
+            string assetPathTemp = System.IO.Path.GetFileNameWithoutExtension(assetPath);
+            string assetPathTempN = assetPathTemp.Substring(assetPathTemp.LastIndexOf("_") + 1);
+            string assetNameTemp = assetName.Substring(assetName.LastIndexOf("_") + 1);
+            if (int.TryParse(assetPathTempN, out int assetNumber) && !int.TryParse(assetNameTemp, out _) && assetPathTemp.StartsWith(assetName))
+                assetName += $"_{assetNumber + 1}";
+
+            return assetName;
+        }
     }
 }