Merge pull request #102 from cpurules/bugfix/magatia-quests

Fix broken Magatia quests

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();
         }
     }

scripts/npc/2111013.js

@@ -17,6 +17,9 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+// NPC - Picture frame
+// Location: Magatia - Home of the Missing Alchemist
+// Used to handle quest 3322 - Phyllia's Pendant
 
 var status;
 
@@ -39,22 +42,24 @@ function action(mode, type, selection) {
             status--;
         }
 
+        if (!cm.isQuestStarted(3322) || cm.haveItem(4031697, 1)) {
+            cm.dispose();
+            return;
+        }
+
         if (status == 0) {
-            if (cm.isQuestStarted(3311)) {
-                var progress = cm.getQuestProgressInt(3311);
-
-                if (progress == 4) {
-                    progress = 7;
-                } else {
-                    progress = 5;
-                }
-
-                cm.setQuestProgress(3311, progress);
-
-                cm.sendOk("This is a mug picture of Dr. De Lang. It seems he is adorning a locket with the emblem of the Alcadno academy, he is a retainer of the Alcadno society.", 2);
+            cm.sendOk("The hook behind the frame was unhooked, revealing a secret space within the frame. There inside, a silver pendant was found. After carefully removing the pendant, the frame was closed and placed back onto the table.");
+        }
+        else if (status == 1) {
+            if (cm.canHold(4031697, 1)) {
+                cm.gainItem(4031697);
             }
-
+            else {
+                cm.sendNext("Your inventory is full, please make sure you have an ETC slot available.");
+            }
+        }
+        else {
             cm.dispose();
         }
     }
-}
+}

scripts/npc/2111014.js

@@ -21,46 +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)) {
-                var progress = cm.getQuestProgressInt(3311);
-
-                if (progress == 4) {
-                    progress = 7;
-                } else {
-                    progress = 5;
-                }
-
-                cm.setQuestProgress(3311, progress);
-
-                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();
+}

scripts/portal/secretDoor.js

@@ -32,7 +32,7 @@ function enter(pi) {
         return doorCross(pi);
     } else if (pi.isQuestStarted(3360)) {
         var pw = pi.getQuestProgress(3360);
-        if (pw.length() > 1) {
+        if (pw.length > 1) {
             pi.openNpc(2111024, "MagatiaPassword");
             return false;
         } else {

scripts/quest/3314.js

@@ -43,7 +43,7 @@ function end(mode, type, selection) {
         if (status == 0) {
             if (isPillUsed(qm.getPlayer())) {
                 if (qm.canHoldAll([2050004, 2022224], [10, 20])) {
-                    qm.sendNext("You did took my experiments. Hmm, so THAT is the result of it, hehehehe... Ok, take that as compensation will you? And oh, you can #rspew that#k right away (#bright-click on the pill icon at the top-right corner of the screen#k), no worries.");
+                    qm.sendNext("You did take my experiments. Hmm, so THAT is the result of it, hehehehe... Ok, take that as compensation will you? And oh, you can #rspew that#k right away (#bright-click on the pill icon at the top-right corner of the screen#k), no worries.");
 
                     qm.gainExp(12500);
                     qm.gainItem(2050004, 10);