More Masteria quests + several minor fixes

Added more quests on Masteria and updated drop data in the region. Fixed
mystic door on slopes deploying players unproperly. Fixed mounts
equipped by low level players crashing the client.
This commit is contained in:
ronancpl
2017-07-12 02:36:20 -03:00
parent 57125a70ce
commit 7f80f45553
70 changed files with 7004 additions and 6420 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
#Mon, 10 Jul 2017 22:33:23 -0300 #Wed, 12 Jul 2017 02:19:32 -0300
C\:\\Nexon\\MapleSolaxia\\MapleSolaxiaV2= C\:\\Nexon\\MapleSolaxia\\MapleSolaxiaV2=
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
+5 -2
View File
@@ -360,6 +360,9 @@ Corrigido cliente n
07 - 09 Julho 2017, 07 - 09 Julho 2017,
Corrigido parcialmente Mystic Doors. Corrigido parcialmente Mystic Doors.
10 Julho 2017, 10 - 11 Julho 2017,
Abertas novas quests para a região de Masteria (Phantom Woods / Crimsonwood mountain). Abertas novas quests para a região de Masteria (Phantom Woods / Crimsonwood mountain).
Codificados novos NPCs para a região de Masteria. Codificados novos NPCs para a região de Masteria.
Adicionado drop data para mobs na Pendergast Mansion.
Corrigido Mystic Doors podendo ser lançadas em declives, potencialmente mal-colocando players em mapas-alvo.
Corrigido mount equipado por player de nivel baixo potencialmente crashando o client.
+17 -1
View File
@@ -2,6 +2,22 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1"/> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/> <group>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/RecvOpcode.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/1032102.js</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/MapleServerHandler.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleDoor.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/MapleStatEffect.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/PacketProcessor.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/handlers/DoorHandler.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/constants/ServerConstants.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/provider/MapleDataTool.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleDoorObject.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleMap.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/client/MapleCharacter.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/handlers/CharInfoRequestHandler.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/MapleItemInformationProvider.java</file>
<file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/tools/MaplePacketCreator.java</file>
</group>
</open-files> </open-files>
</project-private> </project-private>
+178
View File
@@ -0,0 +1,178 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 Patrick Huy <[email protected]>
Matthias Butz <[email protected]>
Jan Christian Meyer <[email protected]>
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/>.
*/
/* Fiona
Phantom Forest - Dead Man's Gorge (610010004)
Refining NPC:
* Raven Claw items
* Raven Claw upgrades
*/
var status = 0;
var selectedType = -1;
var selectedItem = -1;
var item;
var mats;
var matQty;
var cost;
var qty;
function start() {
if (cm.getQuestStatus(8225) != 2) {
cm.sendOk("Step aside, novice, we're doing business here.");
cm.dispose();
return;
}
cm.getPlayer().setCS(true);
status = -1;
action(1, 0, 0);
}
function action(mode, type, selection) {
if (mode == 1)
status++;
else
cm.dispose();
if (status == 0 && mode == 1) {
var selStr = "Hey, partner! If you have the right goods, I can turn it into something very nice...#b"
var options = new Array("Weapon Forging","Weapon Upgrading");
for (var i = 0; i < options.length; i++)
selStr += "\r\n#L" + i + "# " + options[i] + "#l";
cm.sendSimple(selStr);
}
else if (status == 1 && mode == 1) {
selectedType = selection;
if (selectedType == 0){ //weapon forge
var selStr = "So, what kind of weapon would you like me to forge?#b";
var weapon = new Array ("#t2070018#","#t1382060#","#t1442068#","#t1452060#");
for (var i = 0; i < weapon.length; i++)
selStr += "\r\n#L" + i + "# " + weapon[i] + "#l";
cm.sendSimple(selStr);
}
else if (selectedType == 1){ //weapon upgrade
var selStr = "An upgraded weapon? Of course, but note that upgrades won't carry over to the new item... #b";
var weapon = new Array ("#t1472074#","#t1472073#","#t1472075#","#t1332079#","#t1332078#","#t1332080#","#t1462054#","#t1462053#","#t1462055#","#t1402050#","#t1402049#","#t1402051#");
for (var i = 0; i < weapon.length; i++)
selStr += "\r\n#L" + i + "# " + weapon[i] + "#l";
cm.sendSimple(selStr);
}
}
else if (status == 2 && mode == 1) {
qty = 1;
selectedItem = selection;
if (selectedType == 0){ // weapon forge
var itemSet = new Array(2070018,1382060,1442068,1452060);
var matSet = new Array(new Array(4032015, 4032016, 4032017, 4021008, 4032005), new Array(4032016,4032017,4032004,4032005,4032012,4005001), new Array(4032015,4032017,4032004,4032005,4032012,4005000), new Array(4032015,4032016,4032004,4032005,4032012,4005002));
var matQtySet = new Array(new Array(1,1,1,100,30), new Array(1,1,400,10,30,4), new Array(1,1,500,40,20,4), new Array(1,1,300,75,10,4));
var costSet = new Array(70000,70000,70000,70000);
item = itemSet[selectedItem];
mats = matSet[selectedItem];
matQty = matQtySet[selectedItem];
cost = costSet[selectedItem];
}
else if (selectedType == 1){ // weapon upgrade
var itemSet = new Array(1472074,1472073,1472075,1332079,1332078,1332080,1462054,1462053,1462055,1402050,1402049,1402051);
var matSet = new Array(new Array(4032017,4005001,4021008), new Array(4032015,4005002,4021008), new Array(4032016,4005000,4021008),new Array(4032017,4005001,4021008), new Array(4032015,4005002,4021008), new Array(4032016,4005000,4021008), new Array(4032017,4005001,4021008), new Array(4032015,4005002,4021008), new Array(4032016,4005000,4021008), new Array(4032017,4005001,4021008), new Array(4032015,4005002,4021008), new Array(4032016,4005000,4021008));
var matQtySet = new Array(new Array(1,10,20),new Array(1,10,30),new Array(1,5,20),new Array(1,10,20),new Array(1,10,30),new Array(1,5,20),new Array(1,10,20),new Array(1,10,30),new Array(1,5,20),new Array(1,10,20),new Array(1,10,30),new Array(1,5,20));
var costSet = new Array (75000,50000,50000,75000,50000,50000,75000,50000,50000,75000,50000,50000);
item = itemSet[selectedItem];
mats = matSet[selectedItem];
matQty = matQtySet[selectedItem];
cost = costSet[selectedItem];
}
var prompt = "You want me to make ";
if (qty == 1)
prompt += "a #t" + item + "#?";
else
prompt += qty + " #t" + item + "#?";
prompt += " In that case, I'm going to need specific items from you in order to make it. Make sure you have room in your inventory, though!#b";
if (mats instanceof Array){
for(var i = 0; i < mats.length; i++){
prompt += "\r\n#i"+mats[i]+"# " + matQty[i] * qty + " #t" + mats[i] + "#";
}
}
else {
prompt += "\r\n#i"+mats+"# " + matQty * qty + " #t" + mats + "#";
}
if (cost > 0)
prompt += "\r\n#i4031138# " + cost * qty + " meso";
cm.sendYesNo(prompt);
}
else if (status == 3 && mode == 1) {
var complete = true;
var recvItem = item, recvQty;
recvQty = qty;
if(!cm.canHold(recvItem, recvQty)) {
cm.sendOk("Check your inventory for a free slot first.");
cm.dispose();
return;
}
else if (cm.getMeso() < cost * qty)
{
cm.sendOk("I am afraid you don't have enough to pay me, partner. Please check this out first, ok?");
cm.dispose();
return;
}
else
{
if (mats instanceof Array) {
for(var i = 0; complete && i < mats.length; i++)
if (!cm.haveItem(mats[i], matQty[i]))
complete = false;
}
else if (!cm.haveItem(mats, matQty))
complete = false;
}
if (!complete)
cm.sendOk("Hey, I need those items to craft properly, you know?");
else {
if (mats instanceof Array) {
for (var i = 0; i < mats.length; i++){
cm.gainItem(mats[i], -matQty[i] * qty);
}
}
else
cm.gainItem(mats, -matQty * qty);
if (cost > 0)
cm.gainMeso(-cost * qty);
cm.gainItem(recvItem, recvQty);
cm.sendOk("All done. If you need anything else... Well, I'm not going anywhere.");
}
cm.dispose();
}
}
+9
View File
@@ -0,0 +1,9 @@
/**
*9201083 - T-1337
*@author Ronan
*/
function start() {
cm.sendOk("The patrol in New Leaf City is always ready. No creatures are able to break through to the city.");
cm.dispose();
}
+2 -2
View File
@@ -25,8 +25,8 @@
*/ */
function start() { function start() {
if(cm.haveItem(3992041, 1)) cm.warp(610030020); if(cm.haveItem(3992041, 1)) cm.warp(610030020, "out00");
else cm.getPlayer().dropMessage(5, "The giant gate of iron will not budge no matter what, however there is a key-shaped socket visible."); else cm.playerMessage(5, "The giant gate of iron will not budge no matter what, however there is a visible key-shaped socket.");
cm.dispose(); cm.dispose();
} }
+27
View File
@@ -0,0 +1,27 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 Patrick Huy <[email protected]>
Matthias Butz <[email protected]>
Jan Christian Meyer <[email protected]>
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/>.
*/
var status = -1;
function start() {
cm.sendOk("Young one, you seem very proud of yourself, don't you? Can you face the real nightmare that is this place? If you think you can do it, then go ahead, ehehehehehe.");
cm.dispose();
}
+9
View File
@@ -0,0 +1,9 @@
function enter(pi) {
if (pi.haveItem(3992041, 1)) {
pi.warp(610030020, "out00");
return true;
} else {
pi.playerMessage(5, "The giant gate of iron will not budge no matter what, however there is a visible key-shaped socket.");
return false;
}
}
+31
View File
@@ -0,0 +1,31 @@
/* ===========================================================
Ronan Lana
NPC Name: Jack
Description: Quest - Mark of Heroism
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0){
qm.sendAcceptDecline("It's about time! We need to make you a way to travel safely to the summit of the Crimsonwood Valley, or else all we've been doing was for naught. You have to lay hands on the #b#t3992039##k. Are you ready to go?");
}
else if (status == 1){
qm.sendOk("Okay, I need you to have these items on hand first: #b10 #t4010006##k, #b4 #t4032005##k and #b1 #t4004000##k. Go!");
qm.forceStartQuest();
qm.dispose();
}
}
+2 -7
View File
@@ -46,14 +46,9 @@ function end(mode, type, selection) {
} }
} }
if (status == 0){ if (status == 0){
if(!qm.canHold(4032018, 1)) { if(qm.haveItem(4032032, 1)) {
qm.sendOk("I'm afraid you don't have a slot available on your ETC inventory."); qm.sendOk("Hello, native of this world. So you have a message that needs translation? My people back in Versal is known for mastering many foreign languages, this one may very well be some we know. Please stand by...");
}
else if(qm.haveItem(4032032, 1)) {
qm.gainItem(4032032, -1); qm.gainItem(4032032, -1);
qm.gainItem(4032018, 1);
qm.sendOk("Hello, native of this world. So you have a message that needs translation? My people back in Versal is known for mastering many foreign languages, this one may very well be some we know. Please stand by... Here, the translated transcript.");
qm.forceCompleteQuest(); qm.forceCompleteQuest();
} else { } else {
qm.sendOk("I'm afraid you don't have the letter you claimed to have with you."); qm.sendOk("I'm afraid you don't have the letter you claimed to have with you.");
+2 -2
View File
@@ -25,11 +25,11 @@ function start(mode, type, selection) {
else if (status == 1){ else if (status == 1){
if(qm.haveItem(4032018, 1)) { if(qm.haveItem(4032018, 1)) {
qm.forceStartQuest(); qm.forceStartQuest();
} else if (qm.canHold(4032018, 1)) { } else if(qm.canHold(4032018, 1)) {
qm.gainItem(4032018, 1); qm.gainItem(4032018, 1);
qm.forceStartQuest(); qm.forceStartQuest();
} else { } else {
qm.sendOk("Hey. There's no slot on your ETC."); qm.sendOk("Oy, you need a slot in your ETC to get the communique.");
} }
qm.dispose(); qm.dispose();
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - Fool's Gold
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "are Leprechauns";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r30 #t4032031##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - Fool's Gold
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "are Leprechauns";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r30 #t4032031##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - Rags to Riches
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "are Elderwraiths";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r30 #t4032011##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - Rags to Riches
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "are Elderwraiths";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r30 #t4032011##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - One Step A-Head
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "is the Headless Horseman";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r1 #t4031903##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - One Step A-Head
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "is the Headless Horseman";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r1 #t4031903##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - Catch a Bigfoot by the Toe
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "is the Bigfoot";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r1 #t4032013##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+33
View File
@@ -0,0 +1,33 @@
/* ===========================================================
Ronan Lana
NPC Name: Lita Lawless
Description: Quest - Bounty Hunter - Catch a Bigfoot by the Toe
=============================================================
Version 1.0 - Script Done.(11/7/2017)
=============================================================
*/
var status = -1;
function start(mode, type, selection) {
status++;
if (mode != 1) {
if(type == 1 && mode == 0)
status -= 2;
else{
qm.sendOk("Okay, then. See you around.");
qm.dispose();
return;
}
}
if (status == 0) {
var target = "is the Bigfoot";
qm.sendAcceptDecline("Hey, traveler! I need your help. A new threat has appeared to the citizens of the New Leaf City. I'm currently recruiting anyone, and this time's target #r" + target + "#k. Are you in?");
}
else if (status == 1) {
var reqs = "#r1 #t4032013##k";
qm.sendOk("Very well. Get me #r" + reqs + "#k, asap. The NLC is counting on you.");
qm.forceStartQuest();
qm.dispose();
}
}
+83 -4
View File
@@ -4129,7 +4129,6 @@
(9400542, 2000002, 1, 1, 0, 40000), (9400542, 2000002, 1, 1, 0, 40000),
(9400542, 2002001, 1, 1, 0, 10000), (9400542, 2002001, 1, 1, 0, 10000),
(9400542, 2002008, 1, 1, 0, 10000), (9400542, 2002008, 1, 1, 0, 10000),
(9400542, 2044709, 1, 1, 0, 750),
(9400542, 2040805, 1, 1, 0, 750), (9400542, 2040805, 1, 1, 0, 750),
(9400542, 2060004, 10, 50, 0, 10000), (9400542, 2060004, 10, 50, 0, 10000),
(9400542, 2061004, 10, 50, 0, 10000), (9400542, 2061004, 10, 50, 0, 10000),
@@ -9798,7 +9797,6 @@
(9400003, 2040522, 1, 1, 0, 750), (9400003, 2040522, 1, 1, 0, 750),
(9400003, 2040017, 1, 1, 0, 750), (9400003, 2040017, 1, 1, 0, 750),
(9400003, 2041043, 1, 1, 0, 750), (9400003, 2041043, 1, 1, 0, 750),
(9400003, 2044709, 1, 1, 0, 750),
(9400003, 2043309, 1, 1, 0, 750), (9400003, 2043309, 1, 1, 0, 750),
(9400003, 4004003, 1, 1, 0, 3000), (9400003, 4004003, 1, 1, 0, 3000),
(9400003, 4020002, 1, 1, 0, 7000), (9400003, 4020002, 1, 1, 0, 7000),
@@ -15621,7 +15619,7 @@
(8140702, 1060106, 1, 1, 0, 700), (8140702, 1060106, 1, 1, 0, 700),
(8140702, 1492011, 1, 1, 0, 700), (8140702, 1492011, 1, 1, 0, 700),
(9400580, 4032010, 1, 1, 0, 10000), (9400580, 4032010, 1, 1, 0, 10000),
(9400580, 4032011, 1, 1, 0, 10000), (9400580, 4032011, 1, 1, 0, 80000),
(9400580, 2000005, 1, 1, 0, 40000), (9400580, 2000005, 1, 1, 0, 40000),
(9400580, 2000006, 1, 1, 0, 40000), (9400580, 2000006, 1, 1, 0, 40000),
(9400580, 2290004, 1, 1, 0, 1000), (9400580, 2290004, 1, 1, 0, 1000),
@@ -17164,6 +17162,7 @@
(8190003, 1072318, 1, 1, 0, 700), (8190003, 1072318, 1, 1, 0, 700),
(8190003, 1482011, 1, 1, 0, 700), (8190003, 1482011, 1, 1, 0, 700),
(9400575, 1032023, 1, 1, 0, 40000), (9400575, 1032023, 1, 1, 0, 40000),
(9400575, 4032013, 1, 1, 0, 100000),
(8190004, 4000273, 1, 1, 0, 200000), (8190004, 4000273, 1, 1, 0, 200000),
(8190004, 4000244, 1, 1, 0, 200000), (8190004, 4000244, 1, 1, 0, 200000),
(8190004, 4130022, 1, 1, 0, 3000), (8190004, 4130022, 1, 1, 0, 3000),
@@ -19053,7 +19052,84 @@
(9400587, 0, 210, 380, 0, 200000), (9400587, 0, 210, 380, 0, 200000),
(9400588, 4000018, 1, 1, 0, 200000), (9400588, 4000018, 1, 1, 0, 200000),
(9400588, 4032003, 1, 1, 0, 150000), (9400588, 4032003, 1, 1, 0, 150000),
(9400588, 0, 210, 380, 0, 200000); (9400588, 0, 210, 380, 0, 200000),
(9400583, 0, 562, 1096, 0, 200000),
(9400583, 4032031, 1, 1, 0, 80000),
(9400583, 4030012, 1, 1, 0, 300),
(9400583, 4010006, 1, 1, 0, 40000),
(9400583, 4020007, 1, 1, 0, 40000),
(9400583, 4007004, 1, 1, 0, 40000),
(9400583, 2000003, 1, 1, 0, 40000),
(9400583, 2000005, 1, 1, 0, 20000),
(9400583, 2050004, 1, 1, 0, 20000),
(9400583, 2041041, 1, 1, 0, 4000),
(9400583, 2041030, 1, 1, 0, 5000),
(9400583, 4006000, 1, 1, 0, 20000),
(9400583, 2070005, 1, 1, 0, 400),
(9400583, 1042013, 1, 1, 0, 2000),
(9400583, 1002391, 1, 1, 0, 2000),
(9400583, 1302096, 1, 1, 0, 2000),
(9400583, 1041099, 1, 1, 0, 2000),
(9400583, 1422012, 1, 1, 0, 2000),
(9400583, 1412004, 1, 1, 0, 2000),
(9400583, 1051010, 1, 1, 0, 2000),
(9400583, 1051058, 1, 1, 0, 2000),
(9400583, 1082056, 1, 1, 0, 2000),
(9400583, 1092029, 1, 1, 0, 2000),
(9400583, 1382010, 1, 1, 0, 2000),
(9400583, 1072114, 1, 1, 0, 2000),
(9400583, 1050064, 1, 1, 0, 2000),
(9400583, 1002276, 1, 1, 0, 2000),
(9400583, 1050077, 1, 1, 0, 2000),
(9400583, 1061101, 1, 1, 0, 2000),
(9400583, 1002328, 1, 1, 0, 2000),
(9400549, 0, 2000, 3000, 0, 400000),
(9400638, 0, 100, 200, 0, 400000),
(9400638, 4011007, 1, 1, 0, 1000),
(9400638, 4007001, 1, 1, 0, 40000),
(9400638, 4007000, 1, 1, 0, 40000),
(9400638, 2000001, 1, 1, 0, 40000),
(9400638, 2022244, 1, 1, 0, 40000),
(9400638, 2010003, 1, 1, 0, 40000),
(9400638, 2060000, 1, 1, 0, 40000),
(9400638, 2061000, 1, 1, 0, 40000),
(9400638, 1332008, 1, 1, 0, 2000),
(9400638, 1041008, 1, 1, 0, 2000),
(9400639, 0, 200, 250, 0, 400000),
(9400639, 4000018, 1, 1, 0, 400000),
(9400639, 4130018, 1, 1, 0, 40000),
(9400639, 4130009, 1, 1, 0, 40000),
(9400639, 4007003, 1, 1, 0, 40000),
(9400639, 2000002, 1, 1, 0, 40000),
(9400639, 2000006, 1, 1, 0, 40000),
(9400639, 2000002, 1, 1, 0, 40000),
(9400639, 2040602, 1, 1, 0, 5000),
(9400639, 4006001, 1, 1, 0, 40000),
(9400639, 2022244, 1, 1, 0, 40000),
(9400639, 1050021, 1, 1, 0, 2000),
(9400639, 1072127, 1, 1, 0, 2000),
(9400639, 1002021, 1, 1, 0, 2000),
(9400639, 1027090, 1, 1, 0, 2000),
(9400639, 1092029, 1, 1, 0, 2000),
(9400639, 1002143, 1, 1, 0, 2000),
(9400639, 1472021, 1, 1, 0, 2000),
(9400639, 1082074, 1, 1, 0, 2000),
(9400640, 0, 250, 400, 0, 400000),
(9400640, 2000006, 1, 1, 0, 40000),
(9400640, 2043700, 1, 1, 0, 5000),
(9400640, 4006001, 1, 1, 0, 20000),
(9400640, 1072154, 1, 1, 0, 2000),
(9400640, 1061086, 1, 1, 0, 2000),
(9400640, 1082061, 1, 1, 0, 2000),
(9400640, 1051054, 1, 1, 0, 2000),
(9400640, 1082091, 1, 1, 0, 2000),
(9400640, 1002286, 1, 1, 0, 2000),
(9400640, 1040096, 1, 1, 0, 2000),
(9400640, 1060085, 1, 1, 0, 2000),
(9400640, 1002281, 1, 1, 0, 1500),
(9400640, 1082074, 1, 1, 0, 2000),
(9400640, 1002285, 1, 1, 0, 1500),
(9400640, 1002210, 1, 1, 0, 2000);
# (dropperid, itemid, minqty, maxqty, questid, chance) # (dropperid, itemid, minqty, maxqty, questid, chance)
@@ -19137,6 +19213,9 @@
UPDATE IGNORE drop_data SET itemid=1402011 WHERE itemid=1302056 AND dropperid < 8000000; UPDATE IGNORE drop_data SET itemid=1402011 WHERE itemid=1302056 AND dropperid < 8000000;
DELETE FROM drop_data WHERE itemid=1302056 AND dropperid < 8000000; DELETE FROM drop_data WHERE itemid=1302056 AND dropperid < 8000000;
# patch Masteria drops being very rare
UPDATE drop_data SET chance=200000 WHERE itemid>=4032003 AND itemid<=4032033 AND chance=10000;
# remove belts dropping from mobs # remove belts dropping from mobs
DELETE FROM drop_data WHERE itemid>=1132000 AND itemid<=1132004; DELETE FROM drop_data WHERE itemid>=1132000 AND itemid<=1132004;
+1 -1
View File
@@ -63,7 +63,7 @@ public class MapleShopFactory {
public MapleShop getShopForNPC(int npcId) { public MapleShop getShopForNPC(int npcId) {
if (npcShops.containsKey(npcId)) { if (npcShops.containsKey(npcId)) {
npcShops.get(npcId); return npcShops.get(npcId);
} }
return loadShop(npcId, false); return loadShop(npcId, false);
} }
+4 -2
View File
@@ -846,7 +846,7 @@ public class MapleStatEffect {
Point doorPosition = new Point(applyto.getPosition().x, y); Point doorPosition = new Point(applyto.getPosition().x, y);
MapleDoor door = new MapleDoor(applyto, doorPosition); MapleDoor door = new MapleDoor(applyto, doorPosition);
if(door.getOwnerId() != -1) { if(door.getOwnerId() > -1) {
if (applyto.getParty() != null) { if (applyto.getParty() != null) {
for (MaplePartyCharacter partyMember : applyto.getParty().getMembers()) { for (MaplePartyCharacter partyMember : applyto.getParty().getMembers()) {
partyMember.getPlayer().addDoor(door.getOwnerId(), door); partyMember.getPlayer().addDoor(door.getOwnerId(), door);
@@ -860,7 +860,9 @@ public class MapleStatEffect {
door.getTarget().spawnDoor(door.getAreaDoor()); door.getTarget().spawnDoor(door.getAreaDoor());
door.getTown().spawnDoor(door.getTownDoor()); door.getTown().spawnDoor(door.getTownDoor());
} else { } else {
applyto.dropMessage(5, "There are no door portals available for the town at this moment. Try again later."); if(door.getOwnerId() == -1) applyto.dropMessage(5, "There are no door portals available for the town at this moment. Try again later.");
else applyto.dropMessage(5, "This position is not suitable for a Mystic Door, try elsewhere.");
applyto.cancelBuffStats(MapleBuffStat.SOULARROW); // cancel door buff applyto.cancelBuffStats(MapleBuffStat.SOULARROW); // cancel door buff
} }
applyto.disableDoor(); applyto.disableDoor();
+14 -10
View File
@@ -45,17 +45,21 @@ public class MapleDoor {
this.ownerId = owner.getId(); this.ownerId = owner.getId();
this.target = owner.getMap(); this.target = owner.getMap();
this.town = this.target.getReturnMap(); if(target.canDeployDoor(targetPosition)) {
this.townPortal = allocateFreePortal(); this.town = this.target.getReturnMap();
this.townPortal = allocateFreePortal();
if(townPortal != null) {
this.areaDoor = new MapleDoorObject(ownerId, town, target, false, targetPosition, townPortal.getPosition()); if(townPortal != null) {
this.townDoor = new MapleDoorObject(ownerId, target, town, true, townPortal.getPosition(), targetPosition); this.areaDoor = new MapleDoorObject(ownerId, town, target, false, targetPosition, townPortal.getPosition());
this.townDoor = new MapleDoorObject(ownerId, target, town, true, townPortal.getPosition(), targetPosition);
this.areaDoor.setPairOid(this.townDoor.getObjectId());
this.townDoor.setPairOid(this.areaDoor.getObjectId()); this.areaDoor.setPairOid(this.townDoor.getObjectId());
this.townDoor.setPairOid(this.areaDoor.getObjectId());
} else {
this.ownerId = -1;
}
} else { } else {
this.ownerId = -1; this.ownerId = -2;
} }
} }
+5
View File
@@ -433,6 +433,11 @@ public class MapleMap {
} }
return ret; return ret;
} }
public boolean canDeployDoor(Point pos) {
Point toStep = calcPointBelow(pos);
return toStep != null && toStep.distance(pos) < 20;
}
private void dropFromMonster(final MapleCharacter chr, final MapleMonster mob) { private void dropFromMonster(final MapleCharacter chr, final MapleMonster mob) {
if (mob.dropsDisabled() || !dropsOn) { if (mob.dropsDisabled() || !dropsOn) {
+3 -1
View File
@@ -2386,7 +2386,9 @@ public class MaplePacketCreator {
} }
} }
mplew.write(0); //end of pets mplew.write(0); //end of pets
if (chr.getMount() != null && chr.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -18) != null) {
Item mount; //mounts can potentially crash the client if the player's level is not properly checked
if (chr.getMount() != null && (mount = chr.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -18)) != null && MapleItemInformationProvider.getInstance().getEquipStats(mount.getItemId()).get("reqLevel") <= chr.getLevel()) {
mplew.write(chr.getMount().getId()); //mount mplew.write(chr.getMount().getId()); //mount
mplew.writeInt(chr.getMount().getLevel()); //level mplew.writeInt(chr.getMount().getLevel()); //level
mplew.writeInt(chr.getMount().getExp()); //exp mplew.writeInt(chr.getMount().getExp()); //exp
+1 -1
View File
@@ -4435,7 +4435,7 @@
<int name="x" value="-1106"/> <int name="x" value="-1106"/>
<int name="y" value="143"/> <int name="y" value="143"/>
<int name="tm" value="682000000"/> <int name="tm" value="682000000"/>
<string name="tn" value="right00"/> <string name="tn" value="right01"/>
</imgdir> </imgdir>
</imgdir> </imgdir>
</imgdir> </imgdir>
File diff suppressed because it is too large Load Diff
+29 -34
View File
@@ -5697,13 +5697,14 @@
</imgdir> </imgdir>
<imgdir name="9"> <imgdir name="9">
<int name="x" value="2384"/> <int name="x" value="2384"/>
<int name="y" value="-805"/> <int name="y" value="-803"/>
<int name="pt" value="1"/> <int name="pt" value="8"/>
<int name="tm" value="610030020"/> <int name="tm" value="999999999"/>
<string name="tn" value="out00"/> <string name="tn" value=""/>
<string name="pn" value="in06"/> <string name="pn" value="in06"/>
<int name="hideTooltip" value="0"/> <int name="hideTooltip" value="0"/>
<int name="onlyOnce" value="0"/> <int name="onlyOnce" value="0"/>
<string name="script" value="glpqEnter"/>
</imgdir> </imgdir>
</imgdir> </imgdir>
<imgdir name="reactor"> <imgdir name="reactor">
@@ -9377,6 +9378,14 @@
<int name="prev" value="167"/> <int name="prev" value="167"/>
<int name="next" value="196"/> <int name="next" value="196"/>
</imgdir> </imgdir>
<imgdir name="196">
<int name="x1" value="733"/>
<int name="y1" value="-912"/>
<int name="x2" value="733"/>
<int name="y2" value="-871"/>
<int name="prev" value="188"/>
<int name="next" value="0"/>
</imgdir>
</imgdir> </imgdir>
<imgdir name="14"> <imgdir name="14">
<imgdir name="131"> <imgdir name="131">
@@ -9573,6 +9582,14 @@
<int name="prev" value="181"/> <int name="prev" value="181"/>
<int name="next" value="210"/> <int name="next" value="210"/>
</imgdir> </imgdir>
<imgdir name="210">
<int name="x1" value="797"/>
<int name="y1" value="-38"/>
<int name="x2" value="797"/>
<int name="y2" value="3"/>
<int name="prev" value="206"/>
<int name="next" value="0"/>
</imgdir>
</imgdir> </imgdir>
<imgdir name="18"> <imgdir name="18">
<imgdir name="177"> <imgdir name="177">
@@ -9631,28 +9648,6 @@
<int name="prev" value="187"/> <int name="prev" value="187"/>
<int name="next" value="225"/> <int name="next" value="225"/>
</imgdir> </imgdir>
</imgdir>
<imgdir name="25">
<imgdir name="196">
<int name="x1" value="733"/>
<int name="y1" value="-912"/>
<int name="x2" value="733"/>
<int name="y2" value="-871"/>
<int name="prev" value="188"/>
<int name="next" value="0"/>
</imgdir>
</imgdir>
<imgdir name="8">
<imgdir name="210">
<int name="x1" value="797"/>
<int name="y1" value="-38"/>
<int name="x2" value="797"/>
<int name="y2" value="3"/>
<int name="prev" value="206"/>
<int name="next" value="0"/>
</imgdir>
</imgdir>
<imgdir name="19">
<imgdir name="225"> <imgdir name="225">
<int name="x1" value="883"/> <int name="x1" value="883"/>
<int name="y1" value="-551"/> <int name="y1" value="-551"/>
@@ -11111,11 +11106,11 @@
</imgdir> </imgdir>
<imgdir name="110"> <imgdir name="110">
<int name="x1" value="395"/> <int name="x1" value="395"/>
<int name="y1" value="-1440"/> <int name="y1" value="-1380"/>
<int name="x2" value="395"/> <int name="x2" value="395"/>
<int name="y2" value="-1380"/> <int name="y2" value="-1440"/>
<int name="prev" value="108"/> <int name="prev" value="0"/>
<int name="next" value="0"/> <int name="next" value="108"/>
</imgdir> </imgdir>
<imgdir name="126"> <imgdir name="126">
<int name="x1" value="450"/> <int name="x1" value="450"/>
@@ -11839,11 +11834,11 @@
</imgdir> </imgdir>
<imgdir name="483"> <imgdir name="483">
<int name="x1" value="1945"/> <int name="x1" value="1945"/>
<int name="y1" value="-1380"/> <int name="y1" value="-1440"/>
<int name="x2" value="1945"/> <int name="x2" value="1945"/>
<int name="y2" value="-1440"/> <int name="y2" value="-1380"/>
<int name="prev" value="0"/> <int name="prev" value="482"/>
<int name="next" value="482"/> <int name="next" value="0"/>
</imgdir> </imgdir>
<imgdir name="495"> <imgdir name="495">
<int name="x1" value="1980"/> <int name="x1" value="1980"/>
+1 -8
View File
@@ -62974,19 +62974,12 @@
<imgdir name="8220"> <imgdir name="8220">
<imgdir name="0"> <imgdir name="0">
<int name="npc" value="9201055"/> <int name="npc" value="9201055"/>
<int name="interval" value="0"/>
<imgdir name="quest"> <imgdir name="quest">
<imgdir name="0"> <imgdir name="0">
<int name="id" value="8228"/> <int name="id" value="8228"/>
<int name="state" value="2"/> <int name="state" value="2"/>
</imgdir> </imgdir>
</imgdir> </imgdir>
<imgdir name="item">
<imgdir name="0">
<int name="id" value="4032018"/>
<int name="count" value="0"/>
</imgdir>
</imgdir>
</imgdir> </imgdir>
<imgdir name="1"> <imgdir name="1">
<int name="npc" value="9201055"/> <int name="npc" value="9201055"/>
@@ -63198,7 +63191,7 @@
<string name="startscript" value="q8229s"/> <string name="startscript" value="q8229s"/>
<imgdir name="quest"> <imgdir name="quest">
<imgdir name="0"> <imgdir name="0">
<int name="id" value="8228"/> <int name="id" value="8220"/>
<int name="state" value="2"/> <int name="state" value="2"/>
</imgdir> </imgdir>
</imgdir> </imgdir>