adding all ARR thaumaturge quests and one more loporrit

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json
index 902c1ef939763199b0054d2368ff48c6fda0640d..7672f5a5506b7d3e3f800cffaff207c8eef95b38 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json
@@ -36,7 +36,7 @@
               "Yes": true\r
             }\r
           ],\r
-          "NextQuestId": 553\r
+          "NextQuestId": 351\r
         }\r
       ]\r
     }\r

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json
index 57d4b5d1abd0566bb11e7ac1fbc4f210fbdc0e21..e0f046de1229daca3831f51f21b883615002fae8 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json
@@ -36,7 +36,8 @@
               "Prompt": "TEXT_CLSTHM020_00345_Q1_001_1",
               "Yes": true
             }
-          ]
+          ],
+          "NextQuestId": 351
         }
       ]
     }

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json
index 75d2bceba1b183f0ddb070a5f19048a55509af7c..dbd4f58c72684951f4311eb61bbfad7995a35dd4 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json
@@ -209,7 +209,8 @@
             "Z": 80.88806
           },
           "TerritoryId": 130,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 352
         }
       ]
     }

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json
index d731dcbc44163da03f6cda727ee49640091504f0..ac2e4f420cb8fe19d59c4294d74cbff6ee2f6ea1 100644 (file)
--- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json
@@ -1,7 +1,6 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "liza",
-  "Disabled": true,
+  "Author": "pot0to",
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -13,7 +12,8 @@
             "Z": -273.68756
           },
           "TerritoryId": 959,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Fly": true
         },
         {
           "DataId": 1044403,
@@ -30,6 +30,38 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1044412,
+          "Position": {
+            "X": -181.56714,
+            "Y": -49.19972,
+            "Z": -304.76843
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 959,
+          "InteractionType": "Craft",
+          "ItemId": 38871,
+          "ItemCount": 1
+        },
+        {
+          "DataId": 1044584,
+          "Position": {
+            "X": 563.8971,
+            "Y": -167.50002,
+            "Z": -594.53723
+          },
+          "TerritoryId": 959,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
       ]
     },
     {
@@ -42,7 +74,8 @@
             "Z": -273.68756
           },
           "TerritoryId": 959,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Fly": true
         },
         {
           "DataId": 1044403,

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index eefbf1eb7734ef6354e773645331f1e0e45bdfc3..aba772ace1080c03be4f1be3724aaeb2f7dd4945 100644 (file)
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -826,7 +826,8 @@
                   "battlestance",
                   "doze",
                   "box",
-                  "sundropdance"
+                  "sundropdance",
+                  "cry"
                 ]
               }
             }

diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs
index 213d909a30470833f5ed8cfc5883d8411e9cdb02..7f11a6f211d846e547f666fe6923cd98b83c9775 100644 (file)
--- a/Questionable.Model/Questing/Converter/EmoteConverter.cs
+++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs
@@ -7,35 +7,36 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
 {
     private static readonly Dictionary<EEmote, string> Values = new()
     {
-        { EEmote.Stretch, "stretch" },
+        { EEmote.Bow, "bow" },
+        { EEmote.Cheer, "cheer" },
+        { EEmote.Clap, "clap" },
+        { EEmote.Comfort, "comfort" },
+        { EEmote.Dance, "dance" },
+        { EEmote.Doubt, "doubt" },
+        { EEmote.Doze, "doze" },
         { EEmote.Wave, "wave" },
-        { EEmote.Rally, "rally" },
+        { EEmote.Kneel, "kneel" },
+        { EEmote.Lookout, "lookout" },
+        { EEmote.Me, "me" },
         { EEmote.Deny, "deny" },
-        { EEmote.Pray, "pray" },
-        { EEmote.Slap, "slap" },
-        { EEmote.Doubt, "doubt" },
-        { EEmote.Psych, "psych" },
-        { EEmote.Cheer, "cheer" },
-        { EEmote.Happy, "happy" },
         { EEmote.Poke, "poke" },
-        { EEmote.Flex, "flex" },
+        { EEmote.Psych, "psych" },
+        { EEmote.Rally, "rally" },
         { EEmote.Soothe, "soothe" },
-        { EEmote.Me, "me" },
+        { EEmote.Stretch, "stretch" },
         { EEmote.Welcome, "welcome" },
+        { EEmote.Happy, "happy" },
+        { EEmote.Pray, "pray" },
         { EEmote.ImperialSalute, "imperialsalute" },
+        { EEmote.Cry, "cry" },
         { EEmote.Pet, "pet" },
-        { EEmote.Dance, "dance" },
-        { EEmote.Respect, "respect" },
-        { EEmote.Lookout, "lookout" },
-        { EEmote.Kneel, "kneel" },
-        { EEmote.Bow, "bow" },
-        { EEmote.Uchiwasshoi, "uchiwasshoi" },
-        { EEmote.Clap, "clap" },
-        { EEmote.VictoryPose, "victorypose" },
-        { EEmote.Comfort, "comfort" },
+        { EEmote.Slap, "slap" },
+        { EEmote.SundropDance, "sundropdance"},
         { EEmote.BattleStance, "battlestance" },
-        { EEmote.Doze, "doze" },
+        { EEmote.VictoryPose, "victorypose" },
+        { EEmote.Flex, "flex" },
+        { EEmote.Respect, "respect" },
         { EEmote.Box, "box" },
-        { EEmote.SundropDance, "sundropdance"}
+        { EEmote.Uchiwasshoi, "uchiwasshoi" }
     };
 }

diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs
index 4f1b2c6f725123fdd71ce335a8797fdbf958b464..9ca0fa68c6a9872927ed5f58303927b8fb5c7d4e 100644 (file)
--- a/Questionable.Model/Questing/EEmote.cs
+++ b/Questionable.Model/Questing/EEmote.cs
@@ -8,34 +8,36 @@ public enum EEmote
 {
     None = 0,
 
-    Stretch = 37,
+    Bow = 5,
+    Cheer = 6,
+    Clap = 7,
+    Comfort = 9,
+    Dance = 11,
+    Doubt = 12,
+    Doze = 13,
     Wave = 16,
-    Rally = 34,
+    Kneel = 19,
+    Lookout = 22,
+    Me = 23,
     Deny = 25,
-    Pray = 58,
-    Slap = 111,
-    Doubt = 12,
-    Psych = 30,
-    Cheer = 6,
-    Happy = 48,
     Poke = 28,
-    Flex = 139,
+    Psych = 30,
+    Rally = 34,
     Soothe = 35,
-    Me = 23,
+    Stretch = 37,
     Welcome = 41,
+    Happy = 48,
+    Pray = 58,
     ImperialSalute = 59,
+    Cry = 74,
     Pet = 105,
-    Dance = 11,
-    Respect = 140,
-    Lookout = 22,
-    Kneel = 19,
-    Bow = 5,
-    Uchiwasshoi = 278,
-    Clap = 7,
-    VictoryPose = 122,
-    Comfort = 9,
+    Slap = 111,
+    SundropDance = 120, 
     BattleStance = 121,
-    Doze = 13,
+    VictoryPose = 122,
+    Flex = 139,
+    Respect = 140,
     Box = 166,
-    SundropDance = 120,
+    Uchiwasshoi = 278
 }
+