From e3964cd6328f007502111cfe5b797e7bbaa12bcb Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Tue, 17 Dec 2024 19:41:11 +0100
Subject: [PATCH] Merge pull request 'friendly-patch-2' (#115) from
 Friendly/Questionable:friendly-patch-2 into master

---
 .../FSH/1107_Way of the Fisher.json           | 135 ++++++++++--------
 .../FSH/1108_My First Fishing Rod.json        |  38 ++++-
 2 files changed, 104 insertions(+), 69 deletions(-)

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 5a771ddd7..e469fe0c9 100644
--- 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 @@
-{
-  "$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": -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
-        }
-      ]
-    }
-  ]
-}
+{
+  "$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 c994aadd7..857262b53 100644
--- 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 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "Cacahuetes",
+  "Author": ["Cacahuetes", "Friendly"],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -13,9 +13,9 @@
             "StepIf": {
               "Item": {
                 "NotInInventory": true
-              }
-            }
-          }
+               }
+             }
+           }
         },
         {
           "TerritoryId": 129,
@@ -36,6 +36,33 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "DataId": 1001016,
+          "Position": {
+            "X": -42.679565,
+            "Y": 39.999947,
+            "Z": 119.920654
+          },
+          "TerritoryId": 128,
+          "InteractionType": "PurchaseItem",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Fishermens' Guild",
+            "[Limsa Lominsa] The Aftcastle"
+          ],
+          "PurchaseMenu": {
+            "ExcelSheet": "GilShop",
+            "Key": 262186
+          },
+          "ItemId": 4870,
+          "ItemCount": 5,
+          "SkipConditions": {
+            "StepIf": {
+              "Item": {
+                "NotInInventory": false
+              }
+            }
+          }
+        },
         {
           "DataId": 1000857,
           "Position": {
@@ -50,8 +77,7 @@
             "[Limsa Lominsa] Fishermens' Guild"
           ],
           "NextQuestId": 3843,
-          "Disabled": true,
-          "Comment": "Catch/turn in fish manually"
+          "Comment": "Complete quest"
         }
       ]
     }