Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-04-25 07:21:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed challenge counter of '...a single match'

Browse Source
This commit is contained in:
MaikyM 2019-06-14 15:17:10 -06:00
parent dcacef3969
commit 69d158320a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FModel/Methods/ChallengeGenerator/BundleInfos.cs
View File

@ -1,4 +1,4 @@
using csharp_wick; using csharp_wick;
using FModel.Parser.Challenges; using FModel.Parser.Challenges;
using FModel.Parser.Items; using FModel.Parser.Items;
using FModel.Parser.Quests; using FModel.Parser.Quests;
@ -96,6 +96,9 @@ namespace FModel
string newQuest = questParser[x].Objectives[p].Description; string newQuest = questParser[x].Objectives[p].Description;
long newCount = questParser[x].Objectives[p].Count; long newCount = questParser[x].Objectives[p].Count;
if (questParser[x].BAthenaMustCompleteInSingleMatch != false && questParser[x].ObjectiveCompletionCount > 0)
newCount = questParser[x].ObjectiveCompletionCount;
if (newQuest != oldQuest && newCount != oldCount) if (newQuest != oldQuest && newCount != oldCount)
{ {
if (questParser[x].Rewards != null) if (questParser[x].Rewards != null)

7
FModel/Parser/Quests/QuestParser.cs
View File

@ -1,4 +1,4 @@
using System.Globalization; using System.Globalization;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
@ -12,11 +12,14 @@ namespace FModel.Parser.Quests
[JsonProperty("QuestType")] [JsonProperty("QuestType")]
public string QuestType { get; set; } public string QuestType { get; set; }
[JsonProperty("bAthenaMustCompleteInSingleMatch")]
public bool BAthenaMustCompleteInSingleMatch { get; set; }
[JsonProperty("bIncludedInCategories")] [JsonProperty("bIncludedInCategories")]
public bool BIncludedInCategories { get; set; } public bool BIncludedInCategories { get; set; }
[JsonProperty("ObjectiveCompletionCount")] [JsonProperty("ObjectiveCompletionCount")]
public string ObjectiveCompletionCount { get; set; } public long ObjectiveCompletionCount { get; set; }
[JsonProperty("Rewards")] [JsonProperty("Rewards")]
public Reward[] Rewards { get; set; } public Reward[] Rewards { get; set; }