[SmartScript] Add support for AreaTriggers SAI

billy1arm · Feb 6, 2021 · 85f36c3 · 85f36c3
1 parent ba1c5ea
commit 85f36c3
Show file tree

Hide file tree

Showing 28 changed files with 370 additions and 39 deletions.
diff --git a/QuestChainTest/MainWindow.xaml.cs b/QuestChainTest/MainWindow.xaml.cs
@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
+using WDE.Common.CoreVersion;
+using WDE.Common.Database;
 using WDE.Common.Tasks;
 using WDE.QuestChainEditor.Editor.ViewModels;
 using WDE.QuestChainEditor.Exporter;
@@ -28,7 +31,7 @@ public MainWindow()
 
             new TrinityMySqlDatabaseModule().OnInitialized(null);
 
-            TrinityMySqlDatabaseProvider db = new(new ConnectionSettingsProvider(), new DatabaseLogger(), new MockTaskRunner());
+            TrinityMySqlDatabaseProvider db = new(new ConnectionSettingsProvider(), new DatabaseLogger(), new MockCoreVersion());
 
             ExampleQuestsProvider exampleQuestProvider = new();
 
@@ -46,6 +49,17 @@ public MainWindow()
                 q.RequiredQuests.CollectionChanged += (sender, e) => { Update(); };
         }
 
+        public class MockCoreVersion : ICurrentCoreVersion, ICoreVersion, IDatabaseFeatures,ISmartScriptFeatures
+        {
+            public ICoreVersion Current => this;
+            public string Tag => "mock";
+            public string FriendlyName => "mock";
+            public IDatabaseFeatures DatabaseFeatures => this;
+            public ISmartScriptFeatures SmartScriptFeatures => this;
+            public ISet<Type> UnsupportedTables => new HashSet<Type>();
+            public ISet<SmartScriptType> SupportedTypes => null;
+        }
+
         private void Update()
         {
             Text.Text = new QuestChainExporter().GenerateSQL(quests);

diff --git a/WDE.AzerothCore/AzerothCoreVersion.cs b/WDE.AzerothCore/AzerothCoreVersion.cs
@@ -1,13 +1,27 @@
-using WDE.Common.CoreVersion;
+using System;
+using System.Collections.Generic;
+using WDE.Common.CoreVersion;
+using WDE.Common.Database;
 using WDE.Module.Attributes;
 
 namespace WDE.AzerothCore
 {
     [AutoRegister]
     [SingleInstance]
-    public class AzerothCoreVersion : ICoreVersion
+    public class AzerothCoreVersion : ICoreVersion, IDatabaseFeatures, ISmartScriptFeatures
     {
         public string Tag => "Azeroth";
         public string FriendlyName => "AzerothCore Wrath of the Lich King";
+        public ISmartScriptFeatures SmartScriptFeatures => this;
+        public IDatabaseFeatures DatabaseFeatures => this;
+
+        public ISet<Type> UnsupportedTables { get; } = new HashSet<Type>{typeof(IAreaTriggerTemplate)};
+        public ISet<SmartScriptType> SupportedTypes { get; } = new HashSet<SmartScriptType>
+        {
+            SmartScriptType.Creature,
+            SmartScriptType.GameObject,
+            SmartScriptType.AreaTrigger,
+            SmartScriptType.TimedActionList,
+        };
     }
 }
diff --git a/WDE.Blueprints/Providers/BlueprintItemProvider.cs b/WDE.Blueprints/Providers/BlueprintItemProvider.cs
@@ -2,13 +2,16 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using WDE.Common;
+using WDE.Common.CoreVersion;
 using WDE.Module.Attributes;
 
 namespace WDE.Blueprints.Providers
 {
     //[AutoRegister]
     public class BlueprintItemProvider : ISolutionItemProvider
     {
+        public bool IsCompatibleWithCore(ICoreVersion core) => false;
+
         public ISolutionItem CreateSolutionItem()
         {
             return new BlueprintSolutionItem();

diff --git a/WDE.SmartScriptEditor/Exporter/SmartScriptExporter.cs b/WDE.SmartScriptEditor/Exporter/SmartScriptExporter.cs
@@ -149,6 +149,12 @@ private void BuildUpdate()
                     sql.AppendLine("DELETE FROM areatrigger_scripts WHERE entry = @ENTRY;");
                     sql.AppendLine("INSERT INTO areatrigger_scripts(entry, ScriptName) VALUES(@ENTRY, \"SmartTrigger\");");
                     break;
+                case SmartScriptType.AreaTriggerEntityServerSide:
+                    sql.AppendLine("UPDATE areatrigger_template SET ScriptName = \"SmartAreaTriggerAI\" WHERE Id = @ENTRY AND IsServerSide = 1;");
+                    break;
+                case SmartScriptType.AreaTriggerEntity:
+                    sql.AppendLine("UPDATE areatrigger_template SET ScriptName = \"SmartAreaTriggerAI\" WHERE Id = @ENTRY AND IsServerSide = 0;");
+                    break;
             }
         }
 

diff --git a/WDE.SmartScriptEditor/Providers/SmartScriptNameProvider.cs b/WDE.SmartScriptEditor/Providers/SmartScriptNameProvider.cs
@@ -32,7 +32,7 @@ public string GetName(SmartScriptSolutionItem item)
                         IGameObjectTemplate g = database.GetGameObjectTemplate((uint) entry);
                         return g == null || g.Name == null ? "GameObject " + entry : g.Name;
                     case SmartScriptType.AreaTrigger:
-                        return "Areatrigger " + entry;
+                        return "Clientside area trigger " + entry;
                     case SmartScriptType.Quest:
                         IQuestTemplate q = database.GetQuestTemplate((uint) entry);
                         return q == null || q.Name == null ? "Quest " + entry : q.Name;
@@ -43,8 +43,10 @@ public string GetName(SmartScriptSolutionItem item)
                         return (item.SmartType == SmartScriptType.Aura ? "Aura " : "Spell ") + entry;
                     case SmartScriptType.TimedActionList:
                         return "Timed list " + entry;
-                    case SmartScriptType.Cinematic:
-                        return "Cinematic " + entry;
+                    case SmartScriptType.AreaTriggerEntity:
+                        return "Area trigger entity " + entry;
+                    case SmartScriptType.AreaTriggerEntityServerSide:
+                        return "Serverside area trigger entity " + entry;
                 }
             }
 

diff --git a/WDE.SmartScriptEditor/SmartData/events.json b/WDE.SmartScriptEditor/SmartData/events.json
@@ -1838,7 +1838,9 @@
     {
         "id": 46,
         "valid_types": [
-            "AreaTrigger"
+            "AreaTrigger",
+            "AreaTriggerEntity",
+            "AreaTriggerEntityServerSide"
         ],
         "name": "SMART_EVENT_AREATRIGGER_ONTRIGGER",
         "parameters": [

diff --git a/WDE.SmartScriptEditor/SmartScriptSolutionItemProvider.cs b/WDE.SmartScriptEditor/SmartScriptSolutionItemProvider.cs
@@ -1,8 +1,13 @@
 using System;
+using System.Linq;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using WDE.Common;
+using WDE.Common.CoreVersion;
 using WDE.Common.Database;
+using WDE.Common.DBC;
+using WDE.Common.Parameters;
+using WDE.Common.Providers;
 using WDE.Module.Attributes;
 
 namespace WDE.SmartScriptEditor
@@ -36,6 +41,9 @@ public string GetDescription()
         {
             return desc;
         }
+
+        public bool IsCompatibleWithCore(ICoreVersion core) => 
+            core.SmartScriptFeatures.SupportedTypes.Contains(type);
 
         public abstract ISolutionItem CreateSolutionItem();
     }
@@ -172,4 +180,101 @@ public override ISolutionItem CreateSolutionItem()
             return new SmartScriptSolutionItem((int) entry.Value, SmartScriptType.TimedActionList);
         }
     }
+
+    [AutoRegister]
+    public class SmartScriptClientAreaTriggerEntityListProvider : SmartScriptSolutionItemProvider
+    {
+        private readonly Lazy<IItemFromListProvider> itemFromListProvider;
+        private readonly Lazy<IDbcStore> dbcStore;
+
+        public SmartScriptClientAreaTriggerEntityListProvider(
+            Lazy<IItemFromListProvider> itemFromListProvider,
+            Lazy<IDbcStore> dbcStore
+        ) : base("Client Area Trigger",
+            "The script from AreaTrigger from client database (DBC)",
+            "SmartScriptGeneric",
+            SmartScriptType.AreaTrigger)
+        {
+            this.itemFromListProvider = itemFromListProvider;
+            this.dbcStore = dbcStore;
+        }
+
+        public override ISolutionItem CreateSolutionItem()
+        {
+            var areaTriggers =
+                dbcStore.Value.AreaTriggerStore.ToDictionary(at => at.Key, at => new SelectOption($"Client areatrigger {at.Key}"));
+            int? entry = itemFromListProvider.Value.GetItemFromList(areaTriggers, false);
+            if (!entry.HasValue)
+                return null;
+            return new SmartScriptSolutionItem(entry.Value, SmartScriptType.AreaTrigger);
+        }
+    }
+
+    public abstract class SmartScriptAreaTriggerEntityListProviderBase : SmartScriptSolutionItemProvider
+    {
+        private readonly Lazy<IItemFromListProvider> itemFromListProvider;
+        private readonly Lazy<IDatabaseProvider> database;
+        private readonly SmartScriptType type;
+        private readonly bool serverSide;
+
+        public SmartScriptAreaTriggerEntityListProviderBase(
+            Lazy<IItemFromListProvider> itemFromListProvider,
+            Lazy<IDatabaseProvider> database,
+            string name,
+            string desc,
+            string icon,
+            SmartScriptType type,
+            bool serverSide
+        ) : base(name, desc, icon, type)
+        {
+            this.itemFromListProvider = itemFromListProvider;
+            this.database = database;
+            this.type = type;
+            this.serverSide = serverSide;
+        }
+
+        public override ISolutionItem CreateSolutionItem()
+        {
+            var areaTriggers = database.Value.GetAreaTriggerTemplates()
+                .Where(trigger => trigger.IsServerSide == serverSide)
+                .ToDictionary(at => (int)at.Id, at => new SelectOption($"Area trigger {at.Id}"));
+
+            int? entry = itemFromListProvider.Value.GetItemFromList(areaTriggers, false);
+            if (!entry.HasValue)
+                return null;
+            return new SmartScriptSolutionItem(entry.Value, type);
+        }
+    }
+
+    [AutoRegister]
+    public class SmartScriptAreaTriggerEntityListProvider : SmartScriptAreaTriggerEntityListProviderBase
+    {
+        public SmartScriptAreaTriggerEntityListProvider(
+            Lazy<IItemFromListProvider> itemFromListProvider,
+            Lazy<IDatabaseProvider> database
+        ) : base(
+            itemFromListProvider,
+            database,
+            "Area Trigger Entity",
+            "The script from AreaTrigger defined in areatrigger_template",
+            "SmartScriptGeneric",
+            SmartScriptType.AreaTriggerEntity,
+            false) {}
+    }
+
+    [AutoRegister]
+    public class SmartScriptServerSideAreaTriggerEntityListProvider : SmartScriptAreaTriggerEntityListProviderBase
+    {
+        public SmartScriptServerSideAreaTriggerEntityListProvider(
+            Lazy<IItemFromListProvider> itemFromListProvider,
+            Lazy<IDatabaseProvider> database
+        ) : base(
+            itemFromListProvider,
+            database,
+            "Area Trigger Server-side Entity",
+            "The script from server side AreaTrigger defined in areatrigger_template",
+            "SmartScriptGeneric",
+            SmartScriptType.AreaTriggerEntityServerSide,
+            true) {}
+    }
 }
diff --git a/WDE.Solutions/SolutionFolderItemProvider.cs b/WDE.Solutions/SolutionFolderItemProvider.cs
@@ -3,13 +3,16 @@
 using System.Windows.Media.Imaging;
 using Microsoft.VisualBasic;
 using WDE.Common;
+using WDE.Common.CoreVersion;
 using WDE.Module.Attributes;
 
 namespace WDE.Solutions
 {
     [AutoRegister]
     public class SolutionFolderItemProvider : ISolutionItemProvider
     {
+        public bool IsCompatibleWithCore(ICoreVersion core) => true;
+
         public string GetName()
         {
             return "Folder";

diff --git a/WDE.Trinity/TrinityCataclysmVersion.cs b/WDE.Trinity/TrinityCataclysmVersion.cs
@@ -1,13 +1,28 @@
-using WDE.Common.CoreVersion;
+using System;
+using System.Collections.Generic;
+using WDE.Common.CoreVersion;
+using WDE.Common.Database;
 using WDE.Module.Attributes;
 
 namespace WDE.Trinity
 {
     [AutoRegister]
     [SingleInstance]
-    public class TrinityCataclysmVersion : ICoreVersion
+    public class TrinityCataclysmVersion : ICoreVersion, IDatabaseFeatures, ISmartScriptFeatures
     {
         public string Tag => "TrinityCata";
         public string FriendlyName => "The Cataclysm Preservation Project";
+
+        public IDatabaseFeatures DatabaseFeatures => this;
+        public ISmartScriptFeatures SmartScriptFeatures => this;
+
+        public ISet<Type> UnsupportedTables { get; } = new HashSet<Type>{typeof(IAreaTriggerTemplate)};
+        public ISet<SmartScriptType> SupportedTypes { get; } = new HashSet<SmartScriptType>
+        {
+            SmartScriptType.Creature,
+            SmartScriptType.GameObject,
+            SmartScriptType.AreaTrigger,
+            SmartScriptType.TimedActionList,
+        };
     }
 }
diff --git a/WDE.Trinity/TrinityMasterVersion.cs b/WDE.Trinity/TrinityMasterVersion.cs
@@ -1,14 +1,30 @@
-using WDE.Common.CoreVersion;
-using WDE.Common.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using WDE.Common.CoreVersion;
+using WDE.Common.Database;
 using WDE.Module.Attributes;
 
 namespace WDE.Trinity
 {
     [AutoRegister]
     [SingleInstance]
-    public class TrinityMasterVersion : ICoreVersion
+    public class TrinityMasterVersion : ICoreVersion, IDatabaseFeatures, ISmartScriptFeatures
     {
         public string Tag => "TrinityMaster";
         public string FriendlyName => "TrinityCore Shadowlands";
+        public ISmartScriptFeatures SmartScriptFeatures => this;
+        public IDatabaseFeatures DatabaseFeatures => this;
+
+        public ISet<Type> UnsupportedTables { get; } = new HashSet<Type>();
+        public ISet<SmartScriptType> SupportedTypes { get; } = new HashSet<SmartScriptType>
+        {
+            SmartScriptType.Creature,
+            SmartScriptType.GameObject,
+            SmartScriptType.AreaTrigger,
+            SmartScriptType.TimedActionList,
+            SmartScriptType.AreaTriggerEntity,
+            SmartScriptType.AreaTriggerEntityServerSide
+        };
     }
 }
diff --git a/WDE.Trinity/TrinityWrathVersion.cs b/WDE.Trinity/TrinityWrathVersion.cs
@@ -1,13 +1,27 @@
-using WDE.Common.CoreVersion;
+using System;
+using System.Collections.Generic;
+using WDE.Common.CoreVersion;
+using WDE.Common.Database;
 using WDE.Module.Attributes;
 
 namespace WDE.Trinity
 {
     [AutoRegister]
     [SingleInstance]
-    public class TrinityWrathVersion : ICoreVersion
+    public class TrinityWrathVersion : ICoreVersion, IDatabaseFeatures, ISmartScriptFeatures
     {
         public string Tag => "TrinityWrath";
         public string FriendlyName => "TrinityCore Wrath of the Lich King";
+        public ISmartScriptFeatures SmartScriptFeatures => this;
+        public IDatabaseFeatures DatabaseFeatures => this;
+
+        public ISet<Type> UnsupportedTables { get; } = new HashSet<Type>{typeof(IAreaTriggerTemplate)};
+        public ISet<SmartScriptType> SupportedTypes { get; } = new HashSet<SmartScriptType>
+        {
+            SmartScriptType.Creature,
+            SmartScriptType.GameObject,
+            SmartScriptType.AreaTrigger,
+            SmartScriptType.TimedActionList,
+        };
     }
 }