Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hired Merchant & Player shop fixes + Owl of Minerva

Browse Source 
Thanks to BenjixD DietStory's dev team, many bugs found by them have
been patched (pirate quests, missing drop data, fly command, etc).
Implemented Owl of Minerva. Fixed many issues with Hired Merchant and
Player Shops. Fixed an error with the slot checking system. Added Wish
Tickets (circa-2006 GMS event) to be dropped on AmoriaPQ.
This commit is contained in:
ronancpl
2017-09-29 18:35:42 -03:00
parent de7e686a92
commit ddbd679f88
129 changed files with 4564 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/map/onUserEnter/100000006.js Normal file
View File

@@ -0,0 +1,16 @@
importPackage(Packages.server.life);
function start(ms){
if(ms.getQuestStatus(2175) == 1){
var mobId = 9300156;
var player = ms.getPlayer();
var map = player.getMap();
if(map.getMonsterById(mobId) != null){
return;
}
map.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), new java.awt.Point(-1027, 216));
}
}

15
scripts/map/onUserEnter/677000001.js Normal file
View File

@@ -0,0 +1,15 @@
importPackage(Packages.server.life);
function start(ms) {
var mobId = 9400612;
var player = ms.getPlayer();
var map = player.getMap();
if(map.getMonsterById(mobId) != null){
return;
}
map.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), new java.awt.Point(461, 61));
player.message("Marbas has appeared!");
}

70
scripts/npc/1092007.js
View File

@@ -1,31 +1,51 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
Matthias Butz <matze@odinms.de>
Jan Christian Meyer <vimes@odinms.de>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License version 3
as published by the Free Software Foundation. You may not use, modify
or distribute this program under any other version of the
GNU Affero General Public License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
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: Muirhat - Nautilus' Port
Created By: Cyndicate, shortened by Moogra
Function: No specific function, useless text.
Created By: Kevin
Function: When on the quest, he warps player to Black Magician's Disciple
*/
var status;
function start() {
cm.sendOk("The Black Magician and his followers. Kyrin and the Crew of Nautilus. \n They'll be chasing one another until one of them doesn't exist, that's for sure.");
cm.dispose();
status = -1;
action(1, 0, 0);
}
function action(mode, type, selection){
if (mode == -1){
cm.dispose();
}
else{
if (mode == 0 && status == 0){
cm.dispose();
return;
}
if (mode == 1)
status++;
else
status--;
if (status == 0){
if (cm.getQuestStatus(2175) == 1){
if (cm.getPlayer().canHold(2030019)){
cm.sendOk("Please take this #b#t2030019##k, it will make your life a lot easier. #i2030019#");
cm.gainItem(2030019, 1);
}
else{
cm.sendOk("No free inventory spot available. Please make room in your USE inventory first.");
cm.dipose();
}
}
else{
cm.sendOk("The Black Magician and his followers. Kyrin and the Crew of Nautilus. \n They'll be chasing one another until one of them doesn't exist, that's for sure.");
cm.dispose();
}
}
else if (status == 1){
cm.warp(100000006);
cm.dispose();
}
}
}

4
scripts/npc/1094002.js
View File

@@ -19,14 +19,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Author: XxOsirisxX （BubblesDev 0.75)
Author: Kevin (DietStory v1.02)
NPC: Bush - Abel Glasses Quest
*/
var rolled = 0;
function start(mode, type, selection){
//cm.sendGetText("Do you want to obtain a glasses?");
if(!cm.isQuestStarted(2186)) {
cm.sendOk("Just a pile of boxes, nothing special...");
cm.dispose();
@@ -46,6 +45,5 @@ function action(mode, type, selection) {
}
else cm.sendOk("You #balready have#k the glasses that was here!");
//cm.saveSquadMembers(cm.getText());
cm.dispose();
}

24
scripts/npc/1094003.js
View File

@@ -19,17 +19,31 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Author: XxOsirisxX （BubblesDev 0.75)
Author: Kevin (DietStory v1.02)
NPC: Bush - Abel Glasses Quest
*/
var rolled = 0;
function start(mode, type, selection){
cm.sendGetText("Do you want to obtain a glasses?");
if(!cm.isQuestStarted(2186)) {
cm.sendOk("Just a pile of boxes, nothing special...");
cm.dispose();
return;
}
cm.sendNext("Do you want to obtain a glasses?");
}
function action(mode, type, selection) {
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855)))
cm.gainItem(4031854, 1);
cm.saveSquadMembers(cm.getText());
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855))) {
rolled = Math.floor(Math.random() * 3);
if(rolled == 0) cm.gainItem(4031853, 1);
else if(rolled == 1) cm.gainItem(4031854, 1);
else cm.gainItem(4031855, 1);
}
else cm.sendOk("You #balready have#k the glasses that was here!");
cm.dispose();
}

24
scripts/npc/1094004.js
View File

@@ -19,17 +19,31 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Author: XxOsirisxX （BubblesDev 0.75)
Author: Kevin (DietStory v1.02)
NPC: Bush - Abel Glasses Quest
*/
var rolled = 0;
function start(mode, type, selection){
cm.sendGetText("Do you want to obtain a glasses?");
if(!cm.isQuestStarted(2186)) {
cm.sendOk("Just a pile of boxes, nothing special...");
cm.dispose();
return;
}
cm.sendNext("Do you want to obtain a glasses?");
}
function action(mode, type, selection) {
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855)))
cm.gainItem(4031854, 1);
cm.saveSquadMembers(cm.getText());
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855))) {
rolled = Math.floor(Math.random() * 3);
if(rolled == 0) cm.gainItem(4031853, 1);
else if(rolled == 1) cm.gainItem(4031854, 1);
else cm.gainItem(4031855, 1);
}
else cm.sendOk("You #balready have#k the glasses that was here!");
cm.dispose();
}

24
scripts/npc/1094005.js
View File

@@ -19,17 +19,31 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Author: XxOsirisxX （BubblesDev 0.75)
Author: Kevin (DietStory v1.02)
NPC: Bush - Abel Glasses Quest
*/
var rolled = 0;
function start(mode, type, selection){
cm.sendGetText("Do you want to obtain a glasses?");
if(!cm.isQuestStarted(2186)) {
cm.sendOk("Just a pile of boxes, nothing special...");
cm.dispose();
return;
}
cm.sendNext("Do you want to obtain a glasses?");
}
function action(mode, type, selection) {
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855)))
cm.gainItem(4031854, 1);
cm.saveSquadMembers(cm.getText());
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855))) {
rolled = Math.floor(Math.random() * 3);
if(rolled == 0) cm.gainItem(4031853, 1);
else if(rolled == 1) cm.gainItem(4031854, 1);
else cm.gainItem(4031855, 1);
}
else cm.sendOk("You #balready have#k the glasses that was here!");
cm.dispose();
}

24
scripts/npc/1094006.js
View File

@@ -19,17 +19,31 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Author: XxOsirisxX （BubblesDev 0.75)
Author: Kevin (DietStory v1.02)
NPC: Bush - Abel Glasses Quest
*/
var rolled = 0;
function start(mode, type, selection){
cm.sendGetText("Do you want to obtain a glasses?");
if(!cm.isQuestStarted(2186)) {
cm.sendOk("Just a pile of boxes, nothing special...");
cm.dispose();
return;
}
cm.sendNext("Do you want to obtain a glasses?");
}
function action(mode, type, selection) {
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855)))
cm.gainItem(4031854, 1);
cm.saveSquadMembers(cm.getText());
if(!(cm.haveItem(4031853) || cm.haveItem(4031854) || cm.haveItem(4031855))) {
rolled = Math.floor(Math.random() * 3);
if(rolled == 0) cm.gainItem(4031853, 1);
else if(rolled == 1) cm.gainItem(4031854, 1);
else cm.gainItem(4031855, 1);
}
else cm.sendOk("You #balready have#k the glasses that was here!");
cm.dispose();
}

31
scripts/npc/9201002.js
View File

@@ -19,7 +19,34 @@
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 Base
Map Name (Map ID)
Extra NPC info.
*/
var status;
function start() {
cm.warp(109030001, 0);
cm.dispose();
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) {
cm.sendOk("Wedding is currently closed.");
cm.dispose();
}
}
}

52
scripts/npc/9201008.js Normal file
View File

@@ -0,0 +1,52 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
Matthias Butz <matze@odinms.de>
Jan Christian Meyer <vimes@odinms.de>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
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 Base
Map Name (Map ID)
Extra NPC info.
*/
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) {
cm.sendOk("Wedding is currently closed.");
cm.dispose();
}
}
}

52
scripts/npc/9201012.js Normal file
View File

@@ -0,0 +1,52 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
Matthias Butz <matze@odinms.de>
Jan Christian Meyer <vimes@odinms.de>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
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 Base
Map Name (Map ID)
Extra NPC info.
*/
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) {
cm.sendOk("Wedding is currently closed.");
cm.dispose();
}
}
}

88
scripts/npc/9201042.js
View File

@@ -19,7 +19,91 @@
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/>.
*/
/* Mr. Sandman
Amoria - Amoria (680000000)
AmoriaPQ Extras (get wish tickets in AmoriaPQ bonus stage)
Yellow Wish Ticket - Lv1 ~ 49
Green Wish Ticket - Lv50 ~ 119
Blue Wish Ticket - Lv120+
*/
var wishPrizes = [2000000, 2010004, 2020011, 2000004, 2000006, 2022015, 2000005, 1082174, 1002579, 1032039, 1002578, 1002580, 1002577, 1102078];
var wishPrizesQty = [10, 10, 5, 5, 5, 5, 10, 1, 1, 1, 1, 1, 1, 1];
var wishPrizesCst = [10, 15, 20, 30, 30, 50, 100, 400, 450, 500, 500, 530, 550, 600];
var slctTicket;
var amntTicket;
var sel;
var advance = true;
var status;
function getTierTicket(level) {
if(level < 50) {
return 4031543;
} else if(level < 120) {
return 4031544;
} else {
return 4031545;
}
}
function start() {
cm.getPlayer().getStorage().sendStorage(cm.getClient(), 9201042);
cm.dispose();
slctTicket = getTierTicket(cm.getPlayer().getLevel());
amntTicket = cm.getItemQuantity(slctTicket);
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 && advance)
status++;
else
status--;
advance = true;
if(status == 0) {
cm.sendNext("Hi there, how is it going? Since you're passing by Amoria, have you heard about the event my brother Amos is hosting? It is the #bAmorian Challenge#k, an event for everyone above level 40.\r\n\r\nThere, you may find the #i4031543# #i4031544# #i4031545# #bWish Tickets#k that can be brought here to redeem prizes.");
} else if(status == 1) {
var listStr = "";
for(var i = 0; i < wishPrizes.length; i++) {
listStr += "#b#L" + i + "#" + wishPrizesQty[i] + " #z" + wishPrizes[i] + "##k";
listStr += " - " + wishPrizesCst[i] + " wish tickets";
listStr += "#l\r\n";
}
cm.sendSimple("You currently have #b" + amntTicket + " #i" + slctTicket + "# #t" + slctTicket + "##k.\r\n\r\nPurchase a prize:\r\n\r\n" + listStr);
} else if(status == 2) {
sel = selection;
if(amntTicket < wishPrizesCst[selection]) {
cm.sendPrev("You will need #b" + wishPrizesCst[selection] + " #t" + slctTicket + "##k to purchase that! If you want this, come back another time when you have all the tickets at hand.");
advance = false;
} else {
cm.sendYesNo("You have selected #b" + wishPrizesQty[selection] + " #z" + wishPrizes[selection] + "##k, that will require #b" + wishPrizesCst[selection] + " #t" + slctTicket + "##k. Will you purchase it?");
}
} else {
if(cm.canHold(wishPrizes[sel], wishPrizesQty[sel])) {
cm.gainItem(wishPrizes[sel], wishPrizesQty[sel]);
cm.gainItem(slctTicket, -wishPrizesCst[sel]);
cm.sendOk("There you go, have a good day!");
} else {
cm.sendOk("Please have a slot available on your inventory before claiming the item.");
}
cm.dispose();
}
}
}

61
scripts/npc/9201129.js Normal file
View File

@@ -0,0 +1,61 @@
/*
Demon's Doorway
Marbas the Demon! Quest
Victoria Road: The Tree That Grew III
*/
var status;
function start(){
status = -1;
action(1, 0, 0);
}
function action(mode, type, selection){
if (mode == -1){
cm.dispose();
}
else{
if (mode == 0 && status ==0){
cm.dispose();
return;
}
if (mode == 1)
status++;
else
status--;
if (status == 0){
cm.sendNext("#r\t[Requirements to Enter]\r\n\r\n\t\t1.#k Job must be Magician or Blaze Wizard.\r\n\t\t#r2.#k Must be under level 40.\r\n\t\t#r3.#k Must have #b#t4032495##k.");
}
else if (status == 1){
var jobId = cm.getJobId();
if ((jobId >= 200 && jobId <= 232) || (jobId >= 1100 && jobId <= 1112)){
if (cm.getLevel() < 40){
if (cm.hasItem(4032495)){
cm.sendYesNo("#kAll conditions have been satisfied. Do you wish to enter?");
}
else{
cm.sendOk("\t\tYou do not have #b#t4032495# #i4032495#");
cm.dispose();
}
}
else{
cm.sendOk("\tYour #blevel#k is too high.");
cm.dispose();
}
}
else{
cm.sendOk("\tThis is not for you! #rBegone#k you fool!");
cm.dispose();
}
}
else if (status == 2){
cm.warp(677000000, 2);
cm.dispose();
}
}
}

1
scripts/npc/commands.js
View File

@@ -99,6 +99,7 @@ function writeSolaxiaCommandsLv3() { //GM
comm_cursor = comm_lv3;
desc_cursor = desc_lv3;
addCommand("fly", "");
addCommand("spawn", "");
addCommand("mutemap", "");
addCommand("checkdmg", "");

3
scripts/portal/gotocastle.js
View File

@@ -1,5 +1,8 @@
function enter(pi) {
if (pi.isQuestActive(2324)) {
var player = pi.getPlayer();
player.gainExp(3300 * player.getExpRate());
pi.forceCompleteQuest(2324);
pi.removeAll(2430015);
pi.playerMessage(5, "Quest complete.");

18
scripts/portal/obstacle.js Normal file
View File

@@ -0,0 +1,18 @@
/*
Author: Kevin
Map: Mushroom Castle - Deep Inside Mushroom Forest (106020300)
Right Portal
*/
function enter(pi){
if (pi.isQuestCompleted(2316)){
if (pi.hasItem(2430014)){
pi.gainItem(2430014, -1 * pi.getPlayer().getItemQuantity(2430014, false));
}
pi.warp(106020400, 2);
return true;
}
return false;
}

21
scripts/quest/2251.js Normal file
View File

@@ -0,0 +1,21 @@
/*
Author: Kevin
Quest: Zombie Mushroom Signal 3 (2251)
NPC: The Rememberer (1061011)
Item: Recording Charm (4032399)
*/
function end(mode, type, selection) {
if(!qm.haveItem(4032399, 20)) {
qm.sendOk("Please bring me 20 #b#t4032399##k... #i4032399#");
}
else {
qm.gainItem(4032399, -20);
qm.sendOk("Oh, you brought 20 #b#t4032399##k! Thank you.");
qm.gainExp(8000 * qm.getPlayer().getExpRate());
qm.forceCompleteQuest();
}
qm.dispose();
}