From b9487dd95c830def47f636a4f02655626023af42 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 01:33:02 -0400 Subject: [PATCH 1/6] .length() -> .length --- scripts/portal/secretDoor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/portal/secretDoor.js b/scripts/portal/secretDoor.js index 8d8d9c6596..9808b20d24 100644 --- a/scripts/portal/secretDoor.js +++ b/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 { From d8e47287b01b0e057b2bac91b9327f684b23e6a6 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 01:52:26 -0400 Subject: [PATCH 2/6] Grammar fix --- scripts/quest/3314.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/quest/3314.js b/scripts/quest/3314.js index 2b0dc396e9..732776fdee 100644 --- a/scripts/quest/3314.js +++ b/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); From 9cdd46c0cd97fcbf54a4364e0b3123b2c9ca7ae9 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 02:20:27 -0400 Subject: [PATCH 3/6] Add Magic Device drop for Homun of Closed Lab for quest --- database/sql/2-db_drops.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/sql/2-db_drops.sql b/database/sql/2-db_drops.sql index 38cfc9351b..91e6ea2b1b 100644 --- a/database/sql/2-db_drops.sql +++ b/database/sql/2-db_drops.sql @@ -19279,7 +19279,8 @@ USE `cosmic`; (8810018,2290133,1,1,0,45000), (8810018,2290137,1,1,0,45000), (8810018,2290139,1,1,0,45000), -(8810018,4001094,1,1,0,999999); +(8810018,4001094,1,1,0,999999), +(9300141,4031698,1,1,0,100000); #insert things that should be present by now, but aren't yet. @@ -19993,7 +19994,6 @@ USE `cosmic`; (8220015, 1472031, 1, 1, 0, 22000), (8220015, 1482010, 1, 1, 0, 22000), (2110301, 4031568, 1, 1, 3911, 80000), -(9300141, 4031698, 1, 1, 0, 100000), (9300150, 4031774, 1, 1, 3361, 100000), (9300150, 4031796, 1, 1, 3362, 100000), (9300105, 4001118, 1, 1, 3814, 200000), From 9592b8323f8063c8b4532b13350c8643df12a3c7 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 02:38:32 -0400 Subject: [PATCH 4/6] Update Desk NPC to not require double click --- scripts/npc/2111014.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/npc/2111014.js b/scripts/npc/2111014.js index 31be1b6759..40522e37ad 100644 --- a/scripts/npc/2111014.js +++ b/scripts/npc/2111014.js @@ -41,15 +41,10 @@ function action(mode, type, selection) { if (status == 0) { if (cm.isQuestStarted(3311)) { - var progress = cm.getQuestProgressInt(3311); - - if (progress == 4) { - progress = 7; - } else { - progress = 5; - } - - cm.setQuestProgress(3311, progress); + // 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)) { From 871c8a4477225f2e3c93dc5e9d66a10605de7809 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 03:31:30 -0400 Subject: [PATCH 5/6] 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 From 4d73416952f8f83e6a0c76e26d191e9ef99e5ef1 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 03:49:34 -0400 Subject: [PATCH 6/6] Add NPC handling for quest 3322 --- scripts/npc/2111013.js | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/scripts/npc/2111013.js b/scripts/npc/2111013.js index 23936ae7f2..08011c8a18 100644 --- a/scripts/npc/2111013.js +++ b/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 . */ +// 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(); } } -} +} \ No newline at end of file