From 3889fbfb696a147eb06ebaa08a621890b365b6a8 Mon Sep 17 00:00:00 2001
From: Stefan Belmont <stefan@goatzone.net>
Date: Thu, 9 Jan 2025 05:51:09 +0000
Subject: [PATCH] +1980, de-rust 1979

---
 .../Azys Lla/1979_Basic Training.json         | 114 +++++++++---------
 .../Azys Lla/1980_Good Clean Fun.json         |  60 +++++++++
 2 files changed, 119 insertions(+), 55 deletions(-)
 create mode 100644 QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1980_Good Clean Fun.json

diff --git a/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1979_Basic Training.json b/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1979_Basic Training.json
index 2403b49b..2955b31f 100644
--- a/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1979_Basic Training.json	
+++ b/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1979_Basic Training.json	
@@ -1,57 +1,61 @@
 {
-	"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-	"Author": "goatzone",
-	"QuestSequence": [
-		{
-			"Sequence": 0,
-			"Steps": [
-				{
-					"DataId": 1012145,
-					"Position": {
-						"X": -607.7516,
-						"Y": -176.4502,
-						"Z": -527.5502
-					},
-					"TerritoryId": 402,
-					"InteractionType": "AcceptQuest"
-				}
-			]
-		},
-		{
-			"Sequence": 1,
-			"Steps": [
-				{
-					"Position": {
-						"X": -441.42657,
-						"Y": -167.25401,
-						"Z": -432.4462
-					},
-					"TerritoryId": 402,
-					"InteractionType": "Combat",
-					"EnemySpawnType": "OverworldEnemies",
-					"KillEnemyDataIds": [4093],
-					"MinimumKillCount": "5",
-					"Fly": true,
-					"$": "5 in close range here, so if any dead it might be a little slower.",
-					"$.1": "this is the area the quest suggests; there /are/ spinner-rooks sooner, and walking there at level w/o flying might cause interruption, but they're more spread out everywhere else - YMMV."
-				}
-			]
-		},
-		{
-			"Sequence": 255,
-			"Steps": [
-				{
-					"DataId": 1012145,
-					"Position": {
-						"X": -607.7516,
-						"Y": -176.4502,
-						"Z": -527.5502
-					},
-					"TerritoryId": 402,
-					"InteractionType": "CompleteQuest",
-					"Fly": true
-				}
-			]
-		}
-	]
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "goatzone",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1012145,
+          "Position": {
+            "X": -607.7516,
+            "Y": -176.4502,
+            "Z": -527.5502
+          },
+          "TerritoryId": 402,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -441.42657,
+            "Y": -167.25401,
+            "Z": -432.4462
+          },
+          "TerritoryId": 402,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "ComplexCombatData": [
+            {
+              "DataId": 4093,
+              "MinimumKillCount": 5
+            }
+          ],
+          "Fly": true,
+          "$": "5 in close range here, so if any dead it might be a little slower.",
+          "$.1": "this is the area the quest suggests; there /are/ spinner-rooks sooner, and walking there at level w/o flying might cause interruption, but they're more spread out everywhere else - YMMV."
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1012145,
+          "Position": {
+            "X": -607.7516,
+            "Y": -176.4502,
+            "Z": -527.5502
+          },
+          "TerritoryId": 402,
+          "InteractionType": "CompleteQuest",
+          "Fly": true
+        }
+      ]
+    }
+  ]
 }
diff --git a/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1980_Good Clean Fun.json b/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1980_Good Clean Fun.json
new file mode 100644
index 00000000..be941a7e
--- /dev/null
+++ b/QuestPaths/3.x - Heavensward/Side Quests/Azys Lla/1980_Good Clean Fun.json	
@@ -0,0 +1,60 @@
+{
+	"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+	"Author": "goatzone",
+	"QuestSequence": [
+		{
+			"Sequence": 0,
+			"Steps": [
+				{
+					"DataId": 1012146,
+					"Position": {
+						"X": -643.76294,
+						"Y": -176.4502,
+						"Z": -527.3976
+					},
+					"TerritoryId": 402,
+					"InteractionType": "AcceptQuest"
+				}
+			]
+		},
+		{
+			"Sequence": 1,
+			"Steps": [
+				{
+					"Position": {
+						"X": -439.6144,
+						"Y": -186.3405,
+						"Z": -617.2911
+					},
+					"TerritoryId": 402,
+					"InteractionType": "Combat",
+					"EnemySpawnType": "OverworldEnemies",
+					"ComplexCombatData": [
+						{
+							"DataId": 4092,
+							"MinimumKillCount": 5
+						}
+					],
+					"Fly": true,
+					"$": "by starting here we can guarantee a more sane straightline progression instead of starting in the middle, going all the way to one side, then running all the way to the other side."
+				}
+			]
+		},
+		{
+			"Sequence": 255,
+			"Steps": [
+				{
+					"DataId": 1012146,
+					"Position": {
+						"X": -643.76294,
+						"Y": -176.4502,
+						"Z": -527.3976
+					},
+					"TerritoryId": 402,
+					"InteractionType": "CompleteQuest",
+					"AetheryteShortcut": "Azys Lla - Helix"
+				}
+			]
+		}
+	]
+}