Merge pull request #1 from gmriggs/master

merge latest changes from gmriggs/EmoteScript -> ACEmulator/EmoteScript main repo

Author: gmriggs

EmoteScript.Tests/Scripts/AllEmotes.es

@@ -77,6 +77,8 @@ InqOwnsItems: 1234, StackSize: 5
 InqPackSpace
 InqPackSpace: 2
 InqQuest: TestQuest
+InqQuestBitsOn: TestQuest, 0x80
+InqQuestBitsOff: TestQuest, 0x80
 InqQuestSolves: TestQuest, 1-5
 InqRawAttributeStat: Strength, 50-100
 InqRawAttributeStat: Strength, 50
@@ -129,6 +131,8 @@ SetInt64Stat: TotalExperience = 500,000
 SetIntStat: NumDeaths, 5
 SetMyQuestCompletions: TestQuest, 5
 SetQuestCompletions: TestQuest, 5
+SetQuestBitsOn: TestQuest, 0x80
+SetQuestBitsOff: TestQuest, 0x80
 SetSanctuaryPosition: 0x12340001 [1 2 3] 1 0 0 0
 Sound: Sound.Wound1
 Sound: Wound1

EmoteScriptLib/Converter.cs

@@ -260,6 +260,7 @@ public static List<string> BuildScript(Emote emote, int depth)
 
             var indent = string.Concat(Enumerable.Repeat("    ", depth));
 
+            // TODO: detect when fields are used outside of fluent syntax, and fallback on kvp syntax
             scriptLines.Add($"{indent}- {emote.ToString(true)}");
 
             if (emote.Branches != null)

EmoteScriptLib/Entity/Emote.cs

@@ -846,6 +846,11 @@ public string GetFluentString()
                 case EmoteType.SetMyQuestCompletions:
                 case EmoteType.SetQuestCompletions:
                     return $"{Message}, {Amount}";
+                case EmoteType.SetQuestBitsOn:
+                case EmoteType.SetQuestBitsOff:
+                case EmoteType.InqQuestBitsOn:
+                case EmoteType.InqQuestBitsOff:
+                    return $"{Message}, 0x{Amount:X}";
 
                 case EmoteType.Turn:
                     var rotation = new Quaternion(AnglesX ?? 0, AnglesY ?? 0, AnglesZ ?? 0, AnglesW ?? 1);

EmoteScriptLib/JSON/Emote.cs

@@ -40,7 +40,7 @@ public Emote(EmoteScriptLib.Emote emote)
         {
             type = (uint)emote.Type;
             delay = emote.Delay ?? 0.0f;
-            extent = emote.Extent ?? 1.0f;
+            extent = emote.Extent ?? (emote.Type == Entity.Enum.EmoteType.Say ? 0.0f : 1.0f);
             amount = (uint?)emote.Amount;
             motion = (uint?)emote.Motion;
             msg = emote.Message;

EmoteScriptLib/Parser.cs

@@ -856,7 +856,7 @@ public static float DegreesToRads(float degrees)
             {
                 // heading
                 var rads = DegreesToRads(degrees);
-                return Quaternion.CreateFromAxisAngle(Vector3.UnitY, rads);
+                return Quaternion.CreateFromAxisAngle(Vector3.UnitZ, rads);
             }
 
             var match = Regex.Match(rotStr, @"([\d.-]+) ([\d.-]+) ([\d.-]+) ([\d.-]+)");

EmoteScriptLib/SQL/SQLReader.cs

@@ -135,7 +135,20 @@ public void PopulateFields(object record, List<string> currentColumns, List<stri
                 }
                 var value = GetValueType(prop, fields[i]);
 
-                if (DefaultValues.TryGetValue(propName, out var defaultValue) && value.ToString().Equals(defaultValue))
+                // special handling for default extent based on emote type
+                if (propName.Equals("Extent"))
+                {
+                    var defaultExtent = "1";
+
+                    var typeIdx = currentColumns.IndexOf("type");
+
+                    if (typeIdx != -1 && fields[typeIdx] == "8")  // EmoteType.Say
+                        defaultExtent = "0";
+
+                    if (value.ToString().Equals(defaultExtent))
+                        continue;
+                }
+                else if (DefaultValues.TryGetValue(propName, out var defaultValue) && value.ToString().Equals(defaultValue))
                     continue;
 
                 prop.SetValue(record, value, null);

EmoteScriptLib/SQL/SQLWriter.cs

@@ -58,7 +58,7 @@ public static List<string> GetSQL(List<Emote> emotes)
 
                 var typeStr = $"{(int)emote.Type} /* {emote.Type} */";
                 var delay = emote.Delay?.ToString() ?? "0";
-                var extent = emote.Extent?.ToString() ?? "1";
+                var extent = emote.Extent?.ToString() ?? (emote.Type == EmoteType.Say ? "0" : "1");
                 var motionStr = emote.Motion != null ? $"0x{(uint)emote.Motion:X8} /* {emote.Motion} */" : "NULL";
                 var message = GetSQLString(emote.Message);
                 var testString = GetSQLString(emote.TestString);