[Conditions] Added CONDITION_QUEST_OBJECTIVE_COMPLETE on TC master

BAndysc · Nov 22, 2021 · 3c26991 · 3c26991
1 parent 23cc21b
commit 3c26991
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 93 deletions.
diff --git a/WDE.Conditions/Data/ConditionDataJsonProvider.cs b/WDE.Conditions/Data/ConditionDataJsonProvider.cs
@@ -18,59 +18,5 @@ public ConditionDataJsonProvider(ICurrentCoreVersion currentCoreVersion)
         public string GetConditionsJson() => File.ReadAllText(currentCoreVersion.Current.ConditionFeatures.ConditionsFile);
         public string GetConditionSourcesJson() => File.ReadAllText(currentCoreVersion.Current.ConditionFeatures.ConditionSourcesFile);
         public string GetConditionGroupsJson() => File.ReadAllText(currentCoreVersion.Current.ConditionFeatures.ConditionGroupsFile);
-
-        public void SaveConditions(string json)
-        {
-            if (!string.IsNullOrWhiteSpace(json))
-            {
-                using (StreamWriter writer = File.CreateText("SmartData/conditions.json"))
-                    writer.Write(json);
-            }
-        }
-
-        public async Task SaveConditionsAsync(string json)
-        {
-            if (!string.IsNullOrWhiteSpace(json))
-            {
-                using (StreamWriter writer = File.CreateText("SmartData/conditions.json"))
-                    await writer.WriteAsync(json);
-            }
-        }
-
-        public void SaveConditionSources(string json)
-        {
-            if (!string.IsNullOrWhiteSpace(json))
-            {
-                using (StreamWriter writer = File.CreateText("SmartData/condition_sources.json"))
-                    writer.Write(json);
-            }
-        }
-
-        public async Task SaveConditionSourcesAsync(string json)
-        {
-            if (!string.IsNullOrWhiteSpace(json))
-            {
-                using (StreamWriter writer = File.CreateText("SmartData/condition_sources.json"))
-                    await writer.WriteAsync(json);
-            }
-        }
-
-        public void SaveConditionGroups(string json)
-        {
-            if (!string.IsNullOrWhiteSpace(json))
-            {
-                using (StreamWriter writer = File.CreateText("SmartData/conditions_groups.json"))
-                    writer.Write(json);
-            }
-        }
-
-        public async Task SaveConditionGroupsAsync(string json)
-        {
-            if (!string.IsNullOrWhiteSpace(json))
-            {
-                using (StreamWriter writer = File.CreateText("SmartData/conditions_groups.json"))
-                    await writer.WriteAsync(json);
-            }
-        }
     }
 }
diff --git a/WDE.Conditions/Data/ConditionDataJsonStructs.cs b/WDE.Conditions/Data/ConditionDataJsonStructs.cs
@@ -90,6 +90,9 @@ public class ConditionJsonData
         [JsonProperty(PropertyName = "name_readable")]
         public string NameReadable { get; set; } = "Missing name";
 
+        [JsonProperty(PropertyName = "tags")]
+        public IList<string>? Tags { get; set; }
+
         public override string ToString()
         {
             return $"{NameReadable} {Id}";

diff --git a/WDE.Conditions/Data/ConditionDataProvider.cs b/WDE.Conditions/Data/ConditionDataProvider.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using WDE.Common.CoreVersion;
 using WDE.Module.Attributes;
 
 namespace WDE.Conditions.Data
@@ -14,36 +16,25 @@ public class ConditionDataProvider : IConditionDataProvider
         private readonly IConditionDataJsonProvider provider;
         private readonly IConditionDataSerializationProvider serializationProvider;
 
-        public ConditionDataProvider(IConditionDataJsonProvider provider, IConditionDataSerializationProvider serializationProvider)
+        public ConditionDataProvider(IConditionDataJsonProvider provider, 
+            IConditionDataSerializationProvider serializationProvider,
+            ICurrentCoreVersion currentCoreVersion)
         {
             this.provider = provider;
             this.serializationProvider = serializationProvider;
-
-            conditions = serializationProvider.DeserializeConditionData<ConditionJsonData>(provider.GetConditionsJson());
+
+            var currentTag = currentCoreVersion.Current.Tag;
+
+            conditions = serializationProvider
+                .DeserializeConditionData<ConditionJsonData>(provider.GetConditionsJson())
+                .Where(c => c.Tags == null || c.Tags.Contains(currentTag))
+                .ToList();
             conditionSources = serializationProvider.DeserializeConditionData<ConditionSourcesJsonData>(provider.GetConditionSourcesJson());
             conditionGroups = serializationProvider.DeserializeConditionData<ConditionGroupsJsonData>(provider.GetConditionGroupsJson());
         }
 
         public IEnumerable<ConditionJsonData> GetConditions() => conditions;
         public IEnumerable<ConditionSourcesJsonData> GetConditionSources() => conditionSources;
         public IEnumerable<ConditionGroupsJsonData> GetConditionGroups() => conditionGroups;
-
-        public async Task SaveConditions(List<ConditionJsonData> collection)
-        {
-            await provider.SaveConditionsAsync(serializationProvider.SerializeConditionData(collection));
-            conditions = collection;
-        }
-
-        public async Task SaveConditionSources(List<ConditionSourcesJsonData> collection)
-        {
-            await provider.SaveConditionSourcesAsync(serializationProvider.SerializeConditionData(collection));
-            conditionSources = collection;
-        }
-
-        public async Task SaveConditionGroups(List<ConditionGroupsJsonData> collection)
-        {
-            await provider.SaveConditionSourcesAsync(serializationProvider.SerializeConditionData(collection));
-            conditionGroups = collection;
-        }
     }
 }
diff --git a/WDE.Conditions/Data/IConditionDataProvider.cs b/WDE.Conditions/Data/IConditionDataProvider.cs
@@ -8,23 +8,12 @@ public interface IConditionDataJsonProvider
         string GetConditionsJson();
         string GetConditionSourcesJson();
         string GetConditionGroupsJson();
-
-        void SaveConditions(string json);
-        Task SaveConditionsAsync(string json);
-        void SaveConditionSources(string json);
-        Task SaveConditionSourcesAsync(string json);
-        void SaveConditionGroups(string json);
-        Task SaveConditionGroupsAsync(string json);
     }
 
     public interface IConditionDataProvider
     {
         IEnumerable<ConditionJsonData> GetConditions();
         IEnumerable<ConditionSourcesJsonData> GetConditionSources();
         IEnumerable<ConditionGroupsJsonData> GetConditionGroups();
-
-        Task SaveConditions(List<ConditionJsonData> collection);
-        Task SaveConditionSources(List<ConditionSourcesJsonData> collection);
-        Task SaveConditionGroups(List<ConditionGroupsJsonData> collection);
     }
 }
diff --git a/WDE.Conditions/SmartData/conditions.json b/WDE.Conditions/SmartData/conditions.json
@@ -771,6 +771,7 @@
 
 	{
 		"id": 48,
+		"tags": ["Azeroth", "TrinityWrath"],
 		"name": "CONDITION_QUEST_OBJECTIVE_PROGRESS",
 		"name_readable": "Has quest objective progress",
 		"parameters": [
@@ -790,7 +791,20 @@
 		"help": "Condition is met if target player has reached the specified objectiveCount quest progress for the objectiveIndex for the specified quest",
 		"description": "{target} {pram2} quest {pram1} objective {negate:==|!=} {pram3}"
 	},
-
+	{
+		"id": 48,
+		"tags": ["TrinityMaster"],
+		"name": "CONDITION_QUEST_OBJECTIVE_COMPLETE",
+		"name_readable": "Has quest objective completed",
+		"parameters": [
+			{
+				"type": "Parameter",
+				"name": "Objective ID"
+			}
+		],
+		"help": "Condition is met if target player has completed quest objective",
+		"description": "{target} {negate:has completed objective {pram1} (but hasn't rewarded quest yet)|hasn't completed objective {pram1} or has rewarded the quest}"
+	},
 	{
 		"id": 49,
 		"name": "CONDITION_DIFFICULTY_ID",
@@ -807,6 +821,7 @@
 
 	{
 		"id": 50,
+		"tags": ["TrinityWrath"],
 		"name": "CONDITION_GAMEMASTER",
 		"name_readable": "Is gamemaster",
 		"parameters": [
@@ -825,8 +840,9 @@
 
 	{
 		"id": 51,
+		"tags": ["TrinityMaster"],
 		"name": "CONDITION_OBJECT_ENTRY_GUID_MASTER",
-		"name_readable": "[TC 9.x] Is entry/guid/type",
+		"name_readable": "Is entry/guid/type",
 		"help": "[TC 9.x] Condition is met if target has given entry, given guid or is given type",
 		"parameters": [
 			{
@@ -859,8 +875,9 @@
 
 	{
 		"id": 52,
+		"tags": ["TrinityMaster"],
 		"name": "CONDITION_TYPE_MASK_MASTER",
-		"name_readable": "[TC 9.x] Has typemask",
+		"name_readable": "Has typemask",
 		"help": "[TC 9.x] Condition is met if target is in given typemask",
 		"parameters": [
 			{

diff --git a/WDE.Conditions/SmartData/conditions_groups.json b/WDE.Conditions/SmartData/conditions_groups.json
@@ -15,7 +15,8 @@
             "CONDITION_QUEST_NONE",
             "CONDITION_DAILY_QUEST_DONE",
             "CONDITION_QUESTSTATE",
-            "CONDITION_QUEST_OBJECTIVE_PROGRESS"
+            "CONDITION_QUEST_OBJECTIVE_PROGRESS",
+            "CONDITION_QUEST_OBJECTIVE_COMPLETE"
         ]
     },
     {

diff --git a/WDE.Conditions/ViewModels/DefinitionEditor/ConditionGroupsEditorViewModel.cs b/WDE.Conditions/ViewModels/DefinitionEditor/ConditionGroupsEditorViewModel.cs
@@ -121,7 +121,7 @@ await messageBoxService.ShowDialog(new MessageBoxFactory<bool>().SetTitle("Error
 
         private async Task SaveGroupsToFile()
         {
-            await conditionDataProvider.SaveConditionGroups(SourceItems.Select(x => x.ToConditionGroupsJsonData()).ToList());
+            //await conditionDataProvider.SaveConditionGroups(SourceItems.Select(x => x.ToConditionGroupsJsonData()).ToList());
             History.MarkAsSaved();
         }
 

diff --git a/WDE.Conditions/ViewModels/DefinitionEditor/ConditionSourcesListEditorViewModel.cs b/WDE.Conditions/ViewModels/DefinitionEditor/ConditionSourcesListEditorViewModel.cs
@@ -99,7 +99,7 @@ private async Task OpenEditor(ConditionSourcesJsonData item, bool isCreating)
 
         private async Task SaveSources()
         {
-            await conditionDataProvider.SaveConditionSources(SourceItems.ToList());
+            //await conditionDataProvider.SaveConditionSources(SourceItems.ToList());
             History.MarkAsSaved();
         }
 

diff --git a/WDE.Conditions/ViewModels/DefinitionEditor/ConditionsDefinitionEditorViewModel.cs b/WDE.Conditions/ViewModels/DefinitionEditor/ConditionsDefinitionEditorViewModel.cs
@@ -99,7 +99,7 @@ private async Task OpenEditor(ConditionJsonData item, bool isCreating)
 
         private async Task SaveConditions()
         {
-            await conditionDataProvider.SaveConditions(SourceItems.ToList());
+            //await conditionDataProvider.SaveConditions(SourceItems.ToList());
             History.MarkAsSaved();
         }