Update source gen

Version Bump
Merge pull request '[ShB][Allied Society][Qitari] Added new story quests' (#61 ) from plogon_enjoyer/Questionable:qitari into master
2024-09-23 20:32:54 +02:00 · 2024-09-23 20:27:07 +02:00 · 2024-09-23 18:16:04 +00:00 · 2024-09-23 18:14:23 +00:00 · 2024-09-23 18:13:40 +00:00 · 2024-09-23 18:13:17 +00:00
9 changed files with 412 additions and 3 deletions
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,5 +1,5 @@
 <Project>
    <PropertyGroup>
-        <Version>3.6</Version>
+        <Version>3.7</Version>
    </PropertyGroup>
 </Project>
--- a/QuestPathGenerator/RoslynElements/PurchaseMenuExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/PurchaseMenuExtensions.cs
@ -0,0 +1,28 @@
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Questionable.Model.Questing;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using static Questionable.QuestPathGenerator.RoslynShortcuts;
+
+namespace Questionable.QuestPathGenerator.RoslynElements;
+
+internal static class PurchaseMenuExtensions
+{
+    public static ExpressionSyntax ToExpressionSyntax(this PurchaseMenu purchaseMenu)
+    {
+        PurchaseMenu emptyMenu = new();
+        return ObjectCreationExpression(
+                IdentifierName(nameof(PurchaseMenu)))
+            .WithInitializer(
+                InitializerExpression(
+                    SyntaxKind.ObjectInitializerExpression,
+                    SeparatedList<ExpressionSyntax>(
+                        SyntaxNodeList(
+                            Assignment(nameof(PurchaseMenu.ExcelSheet), purchaseMenu.ExcelSheet,
+                                    emptyMenu.ExcelSheet)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(PurchaseMenu.Key), purchaseMenu.Key,
+                                    emptyMenu.Key)
+                                .AsSyntaxNodeOrToken()))));
+    }
+}
--- a/QuestPathGenerator/RoslynShortcuts.cs
+++ b/QuestPathGenerator/RoslynShortcuts.cs
@ -57,6 +57,7 @@ public static class RoslynShortcuts
                DialogueChoice dialogueChoice => dialogueChoice.ToExpressionSyntax(),
                JumpDestination jumpDestination => jumpDestination.ToExpressionSyntax(),
                ExcelRef excelRef => excelRef.ToExpressionSyntax(),
+                PurchaseMenu purchaseMenu => purchaseMenu.ToExpressionSyntax(),
                ComplexCombatData complexCombatData => complexCombatData.ToExpressionSyntax(),
                QuestWorkValue questWorkValue => questWorkValue.ToExpressionSyntax(),
                List<QuestWorkValue> list => list.ToExpressionSyntax(), // TODO fix in AssignmentList
--- a/Societies/Vath/Dailies/2278_A
+++ b/Societies/Vath/Dailies/2278_A
@ -0,0 +1,117 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1016803,
+          "Position": {
+            "X": 57.297607,
+            "Y": -47.842846,
+            "Z": -174.63953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1016875,
+          "Position": {
+            "X": -274.09784,
+            "Y": -22.971008,
+            "Z": 22.812195
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1016876,
+          "Position": {
+            "X": 148.48547,
+            "Y": 65.56322,
+            "Z": -644.09863
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1016877,
+          "Position": {
+            "X": 212.23767,
+            "Y": 52.205494,
+            "Z": -777.676
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1016878,
+          "Position": {
+            "X": 210.31506,
+            "Y": 59.655575,
+            "Z": -919.06616
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1016875,
+          "Position": {
+            "X": -274.09784,
+            "Y": -22.971008,
+            "Z": 22.812195
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1016803,
+          "Position": {
+            "X": 57.297607,
+            "Y": -47.842846,
+            "Z": -174.63953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "CompleteQuest",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Vath/Dailies/2279_Neighborhood
+++ b/Societies/Vath/Dailies/2279_Neighborhood
@ -0,0 +1,91 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1016803,
+          "Position": {
+            "X": 57.297607,
+            "Y": -47.842846,
+            "Z": -174.63953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2006945,
+          "Position": {
+            "X": 204.63867,
+            "Y": -106.43176,
+            "Z": 360.55542
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        },
+        {
+          "DataId": 2006947,
+          "Position": {
+            "X": 205.98145,
+            "Y": -109.544556,
+            "Z": 389.7306
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [5549],
+          "Fly": true
+        },
+        {
+          "DataId": 2006948,
+          "Position": {
+            "X": 154.43652,
+            "Y": -112.50476,
+            "Z": 445.15137
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [5549],
+          "Fly": true
+        },
+        {
+          "DataId": 2006946,
+          "Position": {
+            "X": 153.0022,
+            "Y": -86.289795,
+            "Z": 418.44812
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1016803,
+          "Position": {
+            "X": 57.297607,
+            "Y": -47.842846,
+            "Z": -174.63953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Qitari/Story/3797_A
+++ b/Societies/Qitari/Story/3797_A
@ -0,0 +1,84 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1032735,
+          "Position": {
+            "X": 803.7993,
+            "Y": -45.924515,
+            "Z": -217.94464
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1032659,
+          "Position": {
+            "X": 802.79236,
+            "Y": -45.91779,
+            "Z": -218.58557
+          },
+          "TerritoryId": 817,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 817,
+          "InteractionType": "Gather",
+          "ItemsToGather": [
+            {
+              "QuestAcceptedAsClass": "Miner",
+              "ItemId": 29515,
+              "ItemCount": 3
+            },
+            {
+              "QuestAcceptedAsClass": "Botanist",
+              "ItemId": 29541,
+              "ItemCount": 3
+            }
+          ]
+        },
+        {
+          "DataId": 1032862,
+          "Position": {
+            "X": 777.06555,
+            "Y": -45.76794,
+            "Z": -209.21649
+          },
+          "TerritoryId": 817,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Rak'tika - Fanow"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1032659,
+          "Position": {
+            "X": 802.79236,
+            "Y": -45.91779,
+            "Z": -218.58557
+          },
+          "TerritoryId": 817,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Qitari/Story/3804_The
+++ b/Societies/Qitari/Story/3804_The
@ -0,0 +1,36 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1032660,
+          "Position": {
+            "X": 804.4098,
+            "Y": -45.9255,
+            "Z": -216.41876
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1032660,
+          "Position": {
+            "X": 804.4098,
+            "Y": -45.9255,
+            "Z": -216.41876
+          },
+          "TerritoryId": 817,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Qitari/Story/3805_The
+++ b/Societies/Qitari/Story/3805_The
@ -0,0 +1,36 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1032659,
+          "Position": {
+            "X": 802.79236,
+            "Y": -45.91779,
+            "Z": -218.58557
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1032659,
+          "Position": {
+            "X": 802.79236,
+            "Y": -45.91779,
+            "Z": -218.58557
+          },
+          "TerritoryId": 817,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Loporrits/Dailies/4693_Carrotlight,
+++ b/Societies/Loporrits/Dailies/4693_Carrotlight,
@ -1,7 +1,6 @@
 {
  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "liza",
-  "Disabled": true,
+  "Author": "kaiser",
  "QuestSequence": [
    {
      "Sequence": 0,
@ -30,11 +29,28 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1044412,
+          "Position": {
+            "X": -181.56714,
+            "Y": -49.19972,
+            "Z": -304.76843
+          },
+          "StopDistance": 5,
+          "TerritoryId": 959,
+          "InteractionType": "Interact"
+        }
      ]
    },
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "TerritoryId": 959,
+          "InteractionType": "Craft",
+          "ItemId": 38863,
+          "ItemCount": 3
+        },
        {
          "Position": {
            "X": -201.42024,
Author	SHA1	Message	Date
Liza Carvelli	4bd0b990b9	Update source gen	2024-09-23 20:32:54 +02:00
Liza Carvelli	01ad85e243	Version Bump	2024-09-23 20:27:07 +02:00
Liza	07dd0705e0	Merge pull request '[ShB][Allied Society][Qitari] Added new story quests' (#61 ) from plogon_enjoyer/Questionable:qitari into master Reviewed-on: liza/Questionable#61	2024-09-23 18:16:04 +00:00
Liza	b72a49ccd5	Merge pull request '[HW][Allied Society][Vanu Vanu] Added a few daily quests' (#58 ) from plogon_enjoyer/Questionable:vanuvanu into master Reviewed-on: liza/Questionable#58	2024-09-23 18:14:23 +00:00
Liza	da8117848d	Merge pull request '[HW][Allied Society][Vath] Added a few daily quests' (#57 ) from plogon_enjoyer/Questionable:vath into master Reviewed-on: liza/Questionable#57	2024-09-23 18:13:40 +00:00
Liza	6aca596c67	Merge pull request '[EW][Allied Society][Loporrits] Add Carrotlight, Carrot Bright quest.' (#56 ) from kaiserbh/Questionable:feat/ew-allied-society-loporrits into master Reviewed-on: liza/Questionable#56	2024-09-23 18:13:17 +00:00
kaiser	878f0b1ad1	chore: review amends. Remove disabled, and changed author.	2024-09-24 02:51:04 +10:00
Plogon Enjoyer	098a19fec2	Added the following story quests: - A Chilling Fate - The Third Stella: A Famine for Fishermen - The Third Stella: A Feast for Fishermen	2024-09-24 00:01:24 +08:00
Plogon Enjoyer	1c4fb29205	Added the following daily quests: - A Romp around the Foothills - Neighborhood Squabbles	2024-09-23 00:29:15 +08:00
kaiser	a96cdc99f6	feat: add Carrotlight, Carrot Bright quest.	2024-09-22 18:49:52 +10:00