Merge pull request 'friendly-patch-2' (#115) from Friendly/Questionable:friendly...

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json
index 5a771ddd7529e49266aa0308f1c419345158b8bf..e469fe0c9e39c48b6f69da4e989f66981380874d 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json
@@ -1,63 +1,72 @@
-{\r
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",\r
-  "Author": "Cacahuetes",\r
-  "QuestSequence": [\r
-    {\r
-      "Sequence": 0,\r
-      "Steps": [\r
-        {\r
-          "DataId": 1000859,\r
-          "Position": {\r
-            "X": -166.76587,\r
-            "Y": 4.5496645,\r
-            "Z": 150.04187\r
-          },\r
-          "TerritoryId": 129,\r
-          "InteractionType": "AcceptQuest",\r
-          "AetheryteShortcut": "Limsa Lominsa",\r
-          "AethernetShortcut": [\r
-            "[Limsa Lominsa] Aetheryte Plaza",\r
-            "[Limsa Lominsa] Fishermens' Guild"\r
-          ],\r
-          "SkipConditions": {\r
-            "AetheryteShortcutIf": {\r
-              "InSameTerritory": true\r
-            }\r
-          }\r
-        }\r
-      ]\r
-    },\r
-    {\r
-      "Sequence": 255,\r
-      "Steps": [\r
-        {\r
-          "Position": {\r
-            "X": -167.60791,\r
-            "Y": 4.550005,\r
-            "Z": 165.35986\r
-          },\r
-          "TerritoryId": 129,\r
-          "InteractionType": "WalkTo"\r
-        },\r
-        {\r
-          "DataId": 1000857,\r
-          "Position": {\r
-            "X": -165.27051,\r
-            "Y": 5.2500057,\r
-            "Z": 164.29382\r
-          },\r
-          "TerritoryId": 129,\r
-          "DialogueChoices": [\r
-            {\r
-              "Type": "YesNo",\r
-              "Prompt": "TEXT_CLSFSH011_01107_Q1_000_001",\r
-              "Yes": true\r
-            }\r
-          ],\r
-          "InteractionType": "CompleteQuest",\r
-          "NextQuestId": 1108\r
-        }\r
-      ]\r
-    }\r
-  ]\r
-}\r
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Cacahuetes",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000859,
+          "Position": {
+            "X": -166.76587,
+            "Y": 4.5496645,
+            "Z": 150.04187
+          },
+          "TerritoryId": 129,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Fishermens' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": -168.20791,
+            "Y": 4.550005,
+            "Z": 167.85986
+          },
+          "TerritoryId": 129,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": -167.60791,
+            "Y": 4.550005,
+            "Z": 165.35986
+          },
+          "TerritoryId": 129,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 1000857,
+          "Position": {
+            "X": -165.27051,
+            "Y": 5.2500057,
+            "Z": 164.29382
+          },
+          "TerritoryId": 129,
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_CLSFSH011_01107_Q1_000_001",
+              "Yes": true
+            }
+          ],
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 1108
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json
index c994aadd7afb23f98f3b820075d6f3e55ec35394..857262b537aef9342c27cf94c60b62916cf7d310 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json
@@ -1,6 +1,6 @@
 {\r
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",\r
-  "Author": "Cacahuetes",\r
+  "Author": ["Cacahuetes", "Friendly"],\r
   "QuestSequence": [\r
     {\r
       "Sequence": 0,\r
@@ -13,9 +13,9 @@
             "StepIf": {\r
               "Item": {\r
                 "NotInInventory": true\r
-              }\r
-            }\r
-          }\r
+               }\r
+             }\r
+           }\r
         },\r
         {\r
           "TerritoryId": 129,\r
@@ -36,6 +36,33 @@
     {\r
       "Sequence": 255,\r
       "Steps": [\r
+        {\r
+          "DataId": 1001016,\r
+          "Position": {\r
+            "X": -42.679565,\r
+            "Y": 39.999947,\r
+            "Z": 119.920654\r
+          },\r
+          "TerritoryId": 128,\r
+          "InteractionType": "PurchaseItem",\r
+          "AethernetShortcut": [\r
+            "[Limsa Lominsa] Fishermens' Guild",\r
+            "[Limsa Lominsa] The Aftcastle"\r
+          ],\r
+          "PurchaseMenu": {\r
+            "ExcelSheet": "GilShop",\r
+            "Key": 262186\r
+          },\r
+          "ItemId": 4870,\r
+          "ItemCount": 5,\r
+          "SkipConditions": {\r
+            "StepIf": {\r
+              "Item": {\r
+                "NotInInventory": false\r
+              }\r
+            }\r
+          }\r
+        },\r
         {\r
           "DataId": 1000857,\r
           "Position": {\r
@@ -50,8 +77,7 @@
             "[Limsa Lominsa] Fishermens' Guild"\r
           ],\r
           "NextQuestId": 3843,\r
-          "Disabled": true,\r
-          "Comment": "Catch/turn in fish manually"\r
+          "Comment": "Complete quest"\r
         }\r
       ]\r
     }\r