Player/NPC Shop patch + Fredrick/Duey patch + Loot w. time GMS-like

Reading approximated unitPrice value from WZ in such a fashion that the new double value can be represented in float point without losing too much data.
Fixed rechargeables with quantity 0 set on the playershop/hiredmerchant being handed back to the owner with quantity 1.
Solved many concurrecy issues related with items on the field and playershop/hiredmerchant.
Fixed anomalies with waiting time before picking up other players items, now acting GMS-like.
Added/patched copyleft claims in files that are from my own authorship. Please see backtrack_licenses/readme.txt for more info about this move.
Fixed issues with item retrieval when using bundles on playershop/hiredmerchant.
Fixed some exploits with playershop/hiredmerchant.
Fixed a glitch with npcshop when trying to recharge/buy items without having enough mesos.
Added portal sound effect for some scripted portals that still lacked it.
Fixed some exploits with NPCs Fredrick and Duey.
Fixed Body Pressure not displaying damage to other players.
Added a flag that permits town scrolls to act like a "banish" for players. This renders the antibanish scroll effect available.
This commit is contained in:
ronancpl
2018-05-10 13:09:57 -03:00
parent 727dfb2d62
commit 80b1776ad3
348 changed files with 3963 additions and 1597 deletions

View File

@@ -1,25 +1,27 @@
function enter(pi) {
if (pi.getPlayer().getMap().getId() == 103040410 && pi.isQuestCompleted(2287)) {
function enter(pi) {
var mapid = pi.getPlayer().getMap().getId();
if (mapid == 103040410 && pi.isQuestCompleted(2287)) {
pi.playPortalSound();
pi.warp(103040420, "right00");
return true;
} else if (pi.getPlayer().getMap().getId() == 103040420 && pi.isQuestCompleted(2288)) {
} else if (mapid == 103040420 && pi.isQuestCompleted(2288)) {
pi.playPortalSound();
pi.warp(103040430, "right00");
return true;
} else if (pi.getPlayer().getMap().getId() == 103040410 && pi.isQuestStarted(2287)) {
} else if (mapid == 103040410 && pi.isQuestStarted(2287)) {
pi.playPortalSound();
pi.warp(103040420, "right00");
return true;
} else if (pi.getPlayer().getMap().getId() == 103040420 && pi.isQuestStarted(2288)) {
} else if (mapid == 103040420 && pi.isQuestStarted(2288)) {
pi.playPortalSound();
pi.warp(103040430, "right00");
return true;
} else {
if (pi.getPlayer().getMap().getId() == 103040440 || pi.getPlayer().getMap().getId() == 103040450) {
pi.playPortalSound();
pi.warp(pi.getPlayer().getMap().getId() + 10, "right00");
return true;
if (mapid == 103040440 || mapid == 103040450) {
pi.playPortalSound();
pi.warp(mapid + 10, "right00");
return true;
}
pi.getPlayer().dropMessage(5, "You cannot access this area.");
return false;

View File

@@ -1,25 +1,27 @@
function enter(pi) {
if (pi.getPlayer().getMap().getId() == 103040410 && pi.isQuestCompleted(2287)) {
function enter(pi) {
var mapid = pi.getPlayer().getMap().getId();
if (mapid == 103040410 && pi.isQuestCompleted(2287)) {
pi.playPortalSound();
pi.warp(103040420, "right01");
return true;
} else if (pi.getPlayer().getMap().getId() == 103040420 && pi.isQuestCompleted(2288)) {
} else if (mapid == 103040420 && pi.isQuestCompleted(2288)) {
pi.playPortalSound();
pi.warp(103040430, "right01");
return true;
} else if (pi.getPlayer().getMap().getId() == 103040410 && pi.isQuestStarted(2287)) {
} else if (mapid == 103040410 && pi.isQuestStarted(2287)) {
pi.playPortalSound();
pi.warp(103040420, "right01");
return true;
} else if (pi.getPlayer().getMap().getId() == 103040420 && pi.isQuestStarted(2288)) {
} else if (mapid == 103040420 && pi.isQuestStarted(2288)) {
pi.playPortalSound();
pi.warp(103040430, "right01");
return true;
} else {
if (pi.getPlayer().getMap().getId() == 103040440 || pi.getPlayer().getMap().getId() == 103040450) {
pi.playPortalSound();
pi.warp(pi.getPlayer().getMap().getId() + 10, "right01");
return true;
if (mapid == 103040440 || mapid == 103040450) {
pi.playPortalSound();
pi.warp(mapid + 10, "right01");
return true;
}
pi.getPlayer().dropMessage(5, "You cannot access this area.");
return false;

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -7,7 +7,7 @@
function enter(pi){
if (pi.isQuestStarted(2180) && (pi.hasItem(4031847) || pi.hasItem(4031848) || pi.hasItem(4031849) || pi.hasItem(4031850))){
if (pi.hasItem(4031850)){
pi.warp(120000103);
pi.playPortalSound(); pi.warp(120000103);
return true;
}
else{

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ function enter(pi) {
return false;
}
pi.warp(108010600 + (10 * jobtype), "out00");
pi.playPortalSound(); pi.warp(108010600 + (10 * jobtype), "out00");
} else {
pi.playPortalSound(); pi.warp(130010010, "out00");
}

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ function enter(pi) {
return false;
}
pi.warp(108010600 + (10 * jobtype), "out00");
pi.playPortalSound(); pi.warp(108010600 + (10 * jobtype), "out00");
} else {
pi.playPortalSound(); pi.warp(130010020, "out00");
}

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ function enter(pi) {
return false;
}
pi.warp(108010600 + (10 * jobtype), "out00");
pi.playPortalSound(); pi.warp(108010600 + (10 * jobtype), "out00");
} else {
pi.playPortalSound(); pi.warp(130010110, "out00");
}

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ function enter(pi) {
return false;
}
pi.warp(108010600 + (10 * jobtype), "out00");
pi.playPortalSound(); pi.warp(108010600 + (10 * jobtype), "out00");
} else {
pi.playPortalSound(); pi.warp(130010120, "out00");
}

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -37,7 +37,7 @@ function enter(pi) {
return false;
}
pi.warp(108010600 + (10 * jobtype), "east00");
pi.playPortalSound(); pi.warp(108010600 + (10 * jobtype), "east00");
} else {
pi.playPortalSound(); pi.warp(130020000, "east00");
}

View File

@@ -13,11 +13,11 @@ function enter(pi) {
//pi.getPlayer().announce(Packages.tools.MaplePacketCreator.questProgress(21203, "21203"));
return true;
}
pi.message("The mirror is blank due to all the players currently recalling their memories. Please wait and try again.");
pi.message("The mirror is blank due to many players recalling their memories. Please wait and try again.");
return false;
} else if(pi.isQuestStarted(21302)) { // Third Job
} else if(pi.isQuestStarted(21302) && !pi.isQuestCompleted(21303)) { // Third Job
if(pi.getPlayerCount(108010701) > 0 || pi.getPlayerCount(108010702) > 0) {
pi.message("The mirror is blank due to all the players currently recalling their memories. Please wait and try again.");
pi.message("The mirror is blank due to many players recalling their memories. Please wait and try again.");
return false;
} else {
var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010702);

View File

@@ -22,7 +22,7 @@
importPackage(Packages.server.life);
function enter(pi) {
if(pi.isQuestStarted(21301)) {
if(pi.isQuestStarted(21301) && pi.getQuestProgress(21301, 9001013) == 0) {
if(pi.getPlayerCount(108010700) != 0) {
pi.message("The portal is blocked from the other side. I wonder if someone is already fighting the Thief Crow?");
return false;
@@ -34,7 +34,7 @@ function enter(pi) {
pi.warp(108010700, "west00");
}
} else {
pi.warp(140020300, 1);
pi.playPortalSound(); pi.warp(140020300, 1);
}
return true;
}

View File

@@ -20,9 +20,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
function enter(pi) {
if (pi.getPlayer().getJob().getId() == 2000 && !pi.isQuestCompleted(21014))
pi.warp(140000000, 1);
else
if (pi.getPlayer().getJob().getId() == 2000 && !pi.isQuestCompleted(21014)) {
pi.playPortalSound(); pi.warp(140000000, "st00");
} else {
pi.playPortalSound(); pi.warp(140000000, "west00");
}
return true;
}

View File

@@ -1,9 +1,9 @@
function enter(pi) {
if (pi.getQuestStatus(20407) == 2) {
pi.warp(924010200,0);
pi.playPortalSound(); pi.warp(924010200,0);
return true;
} else if (pi.getQuestStatus(20406) == 2) {
pi.warp(924010100,0);
pi.playPortalSound(); pi.warp(924010100,0);
return true;
} else if (pi.getQuestStatus(20404) == 2) {
pi.playPortalSound(); pi.warp(924010000,0);

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,9 +1,9 @@
function enter(pi) {
pi.playPortalSound();
if(pi.isQuestStarted(22005)){
pi.warp(900020100, 0);
pi.playPortalSound(); pi.warp(900020100, 0);
} else{
pi.warp(100030301, 0);
pi.playPortalSound(); pi.warp(100030301, 0);
}
return true;
}

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -11,7 +11,7 @@
pi.message("You have used the Killer Mushroom Spore to open the way.");
}
pi.warp(106020400, 2);
pi.playPortalSound(); pi.warp(106020400, 2);
return true;
} else if (pi.hasItem(2430015)) {
pi.gainItem(2430015, -1 * pi.getPlayer().getItemQuantity(2430015, false));

View File

@@ -23,7 +23,7 @@
*/
function enter(pi) {
if (!pi.isQuestStarted(21001)) {
pi.warp(914000220, 2);
pi.playPortalSound(); pi.warp(914000220, 2);
return true;
} else {
pi.playPortalSound(); pi.warp(914000400, 2);

View File

@@ -1,12 +1,12 @@
function enter(pi) {
switch(pi.getMapId()) {
case 930000000:
pi.warp(930000100,0);
pi.playPortalSound(); pi.warp(930000100,0);
return true;
break;
case 930000100:
if (pi.getMap().getMonsters().size() == 0) {
pi.warp(930000200,0);
pi.playPortalSound(); pi.warp(930000200,0);
return true;
} else {
pi.playerMessage(5, "Eliminate all the monsters.");

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -9,16 +9,16 @@ function enter(pi) {
pi.warp(130000100, 4); //or 130000101
break;
case 140010100:
pi.warp(140010110, 0); //or 140010111
pi.warp(140010110, 1); //or 140010111
break;
case 120000101:
pi.warp(120000105, 0);
pi.warp(120000105, 1);
break;
case 103000003:
pi.warp(103000008, 0); //or 103000009
pi.warp(103000008, 1); //or 103000009
break;
case 100000201:
pi.warp(100000204, 0); //or 100000205
pi.warp(100000204, 1); //or 100000205
break;
default:
pi.warp(pi.getMapId() + 1, 0); //or + 2

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -1,6 +1,6 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View File

@@ -27,7 +27,7 @@ function enter(pi) {
pi.playPortalSound();
var map = (mapid - 270010000) / 100;
//pi.getPlayer().dropMessage(5, map + " " + pi.isQuestCompleted(3534));
if(map < 5 && pi.isQuestCompleted(3500 + map)) {
if(map < 5 && pi.isQuestCompleted(3500 + map)) {
pi.warp(mapid + 10, "out00");
} else if(map == 5 && pi.isQuestCompleted(3502 + map)) {
pi.warp(270020000, "out00");

View File

@@ -1,21 +1,21 @@
function enter(pi) {
if(pi.getPlayer().getMapId() == 130030001){
if(pi.isQuestStarted(20010)){
pi.warp(130030002, 0);
pi.playPortalSound(); pi.warp(130030002, 0);
return true;
} else {
pi.message("Please click on the NPC first to receive a quest.");
}
} else if(pi.getPlayer().getMapId() == 130030002){
if(pi.isQuestCompleted(20011)){
pi.warp(130030003, 0);
pi.playPortalSound(); pi.warp(130030003, 0);
return true;
} else {
pi.message("Please complete the required quest before proceeding.");
}
} else if(pi.getPlayer().getMapId() == 130030003){
if(pi.isQuestCompleted(20012)){
pi.warp(130030004, 0);
pi.playPortalSound(); pi.warp(130030004, 0);
return true;
} else {
pi.message("Please complete the required quest before proceeding.");