From 871c8a4477225f2e3c93dc5e9d66a10605de7809 Mon Sep 17 00:00:00 2001
From: Charlie Unfricht <dzcharlie@gmail.com>
Date: Wed, 17 Aug 2022 03:31:30 -0400
Subject: [PATCH] Update NPC handling for quest 3311

---
 scripts/npc/2111011.js | 16 ++++++++++++++++
 scripts/npc/2111014.js | 41 ++++-------------------------------------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/scripts/npc/2111011.js b/scripts/npc/2111011.js
index 3b00ddc030..9c163775e1 100644
--- a/scripts/npc/2111011.js
+++ b/scripts/npc/2111011.js
@@ -1,3 +1,7 @@
+// NPC - Wall
+// Location: Magatia - Home of the Missing Alchemist
+// Used to handle quest 3311 - Clue
+
 var status;
 
 function start() {
@@ -19,7 +23,19 @@ function action(mode, type, selection) {
             status--;
         }
 
+        if (!cm.isQuestStarted(3311)) {
+            cm.dispose();
+            return;
+        }
+
         if (status == 0) {
+            cm.sendYesNo("Amidst the throng of spider webs, there's a wall behind it that seems to have something written on it. Perhaps you should take a closer look at the wall?");
+        }
+        else if (status == 1) {
+            cm.setQuestProgress(3311, 5);
+            cm.sendOk("On a wall full of graffiti, there seems to be a phrase that really stands out above the rest. #bIt's in a form of a pendant...#k What does that mean?");
+        }
+        else {
             cm.dispose();
         }
     }
diff --git a/scripts/npc/2111014.js b/scripts/npc/2111014.js
index 40522e37ad..53a7429b23 100644
--- a/scripts/npc/2111014.js
+++ b/scripts/npc/2111014.js
@@ -21,41 +21,8 @@
 var status;
 
 function start() {
-    status = -1;
-    action(1, 0, 0);
-}
-
-function action(mode, type, selection) {
-    if (mode == -1) {
-        cm.dispose();
-    } else {
-        if (mode == 0 && type > 0) {
-            cm.dispose();
-            return;
-        }
-        if (mode == 1) {
-            status++;
-        } else {
-            status--;
-        }
-
-        if (status == 0) {
-            if (cm.isQuestStarted(3311)) {
-                // For some reason this quest has to go 4 -> 7 -> 5?
-                // Let's bypass this to avoid having to double-click the NPC
-                cm.setQuestProgress(3311, 7);
-                cm.setQuestProgress(3311, 5);
-
-                cm.sendOk("The diary of Dr. De Lang. A lot of formulas and pompous scientific texts can be found all way through the pages, but it is worth noting that in the last entry (3 weeks ago), it is written that he concluded the researches on an improvement on the blueprints for the Neo Huroids, thus making the last preparations to show it to the 'society'... No words after this...", 2);
-            } else if (cm.isQuestStarted(3322) && !cm.haveItem(4031697, 1)) {
-                if (cm.canHold(4031697, 1)) {
-                    cm.gainItem(4031697, 1);
-                } else {
-                    cm.sendNext("Your inventory is full, make sure a ETC slot is available for the item.");
-                }
-            }
-
-            cm.dispose();
-        }
+    if (cm.isQuestStarted(3311)) {
+        cm.sendOk("The diary of Dr. De Lang. A lot of formulas and pompous scientific texts can be found all way through the pages.", 2);
     }
-}
+    cm.dispose();
+}
\ No newline at end of file