diff --git a/build/built-jar.properties b/build/built-jar.properties index 47998a9aee..855c79c01b 100644 --- a/build/built-jar.properties +++ b/build/built-jar.properties @@ -1,4 +1,4 @@ -#Mon, 10 Jul 2017 22:33:23 -0300 +#Wed, 12 Jul 2017 02:19:32 -0300 C\:\\Nexon\\MapleSolaxia\\MapleSolaxiaV2= diff --git a/build/classes/server/MapleShopFactory.class b/build/classes/server/MapleShopFactory.class index c3b3153130..10a953d44d 100644 Binary files a/build/classes/server/MapleShopFactory.class and b/build/classes/server/MapleShopFactory.class differ diff --git a/build/classes/server/MapleStatEffect$CancelEffectAction.class b/build/classes/server/MapleStatEffect$CancelEffectAction.class index 8c80cce19d..051ce0b307 100644 Binary files a/build/classes/server/MapleStatEffect$CancelEffectAction.class and b/build/classes/server/MapleStatEffect$CancelEffectAction.class differ diff --git a/build/classes/server/MapleStatEffect.class b/build/classes/server/MapleStatEffect.class index 3a6fd6b884..3a8b5077df 100644 Binary files a/build/classes/server/MapleStatEffect.class and b/build/classes/server/MapleStatEffect.class differ diff --git a/build/classes/server/maps/MapleDoor.class b/build/classes/server/maps/MapleDoor.class index 7262b9beee..04e07faa13 100644 Binary files a/build/classes/server/maps/MapleDoor.class and b/build/classes/server/maps/MapleDoor.class differ diff --git a/build/classes/server/maps/MapleMap$1.class b/build/classes/server/maps/MapleMap$1.class index b3be431e50..900e2fdeb7 100644 Binary files a/build/classes/server/maps/MapleMap$1.class and b/build/classes/server/maps/MapleMap$1.class differ diff --git a/build/classes/server/maps/MapleMap$10.class b/build/classes/server/maps/MapleMap$10.class index d251fe222f..50c631d5db 100644 Binary files a/build/classes/server/maps/MapleMap$10.class and b/build/classes/server/maps/MapleMap$10.class differ diff --git a/build/classes/server/maps/MapleMap$11.class b/build/classes/server/maps/MapleMap$11.class index 2a0372c0b9..b1a9c7f73d 100644 Binary files a/build/classes/server/maps/MapleMap$11.class and b/build/classes/server/maps/MapleMap$11.class differ diff --git a/build/classes/server/maps/MapleMap$12.class b/build/classes/server/maps/MapleMap$12.class index dc0a155051..f49cc7ae7f 100644 Binary files a/build/classes/server/maps/MapleMap$12.class and b/build/classes/server/maps/MapleMap$12.class differ diff --git a/build/classes/server/maps/MapleMap$13.class b/build/classes/server/maps/MapleMap$13.class index 7b5eadde8e..636f425bcd 100644 Binary files a/build/classes/server/maps/MapleMap$13.class and b/build/classes/server/maps/MapleMap$13.class differ diff --git a/build/classes/server/maps/MapleMap$14.class b/build/classes/server/maps/MapleMap$14.class index e81da6d13a..51017f1996 100644 Binary files a/build/classes/server/maps/MapleMap$14.class and b/build/classes/server/maps/MapleMap$14.class differ diff --git a/build/classes/server/maps/MapleMap$15.class b/build/classes/server/maps/MapleMap$15.class index 2087ecba5d..d8d10c15d4 100644 Binary files a/build/classes/server/maps/MapleMap$15.class and b/build/classes/server/maps/MapleMap$15.class differ diff --git a/build/classes/server/maps/MapleMap$16.class b/build/classes/server/maps/MapleMap$16.class index 3028e375bd..226f3e4f24 100644 Binary files a/build/classes/server/maps/MapleMap$16.class and b/build/classes/server/maps/MapleMap$16.class differ diff --git a/build/classes/server/maps/MapleMap$17.class b/build/classes/server/maps/MapleMap$17.class index 171f3ea013..042431fdad 100644 Binary files a/build/classes/server/maps/MapleMap$17.class and b/build/classes/server/maps/MapleMap$17.class differ diff --git a/build/classes/server/maps/MapleMap$18.class b/build/classes/server/maps/MapleMap$18.class index 5ce355d0e0..bd9882c94f 100644 Binary files a/build/classes/server/maps/MapleMap$18.class and b/build/classes/server/maps/MapleMap$18.class differ diff --git a/build/classes/server/maps/MapleMap$19.class b/build/classes/server/maps/MapleMap$19.class index cc7a355546..da2e22e432 100644 Binary files a/build/classes/server/maps/MapleMap$19.class and b/build/classes/server/maps/MapleMap$19.class differ diff --git a/build/classes/server/maps/MapleMap$2.class b/build/classes/server/maps/MapleMap$2.class index 2bb15b08b3..5cd2385e60 100644 Binary files a/build/classes/server/maps/MapleMap$2.class and b/build/classes/server/maps/MapleMap$2.class differ diff --git a/build/classes/server/maps/MapleMap$20.class b/build/classes/server/maps/MapleMap$20.class index 92fee7a43e..4f1c639544 100644 Binary files a/build/classes/server/maps/MapleMap$20.class and b/build/classes/server/maps/MapleMap$20.class differ diff --git a/build/classes/server/maps/MapleMap$21.class b/build/classes/server/maps/MapleMap$21.class index e93a8c213f..f10c4d1e0d 100644 Binary files a/build/classes/server/maps/MapleMap$21.class and b/build/classes/server/maps/MapleMap$21.class differ diff --git a/build/classes/server/maps/MapleMap$22.class b/build/classes/server/maps/MapleMap$22.class index 5b4e66db97..794fefd5ee 100644 Binary files a/build/classes/server/maps/MapleMap$22.class and b/build/classes/server/maps/MapleMap$22.class differ diff --git a/build/classes/server/maps/MapleMap$23.class b/build/classes/server/maps/MapleMap$23.class index 842afaf385..cc2bda0584 100644 Binary files a/build/classes/server/maps/MapleMap$23.class and b/build/classes/server/maps/MapleMap$23.class differ diff --git a/build/classes/server/maps/MapleMap$24.class b/build/classes/server/maps/MapleMap$24.class index e6176f5952..f5218b7275 100644 Binary files a/build/classes/server/maps/MapleMap$24.class and b/build/classes/server/maps/MapleMap$24.class differ diff --git a/build/classes/server/maps/MapleMap$25.class b/build/classes/server/maps/MapleMap$25.class index 6725bfea41..b9b00d0732 100644 Binary files a/build/classes/server/maps/MapleMap$25.class and b/build/classes/server/maps/MapleMap$25.class differ diff --git a/build/classes/server/maps/MapleMap$26.class b/build/classes/server/maps/MapleMap$26.class index 893481b7ca..a60b75f53c 100644 Binary files a/build/classes/server/maps/MapleMap$26.class and b/build/classes/server/maps/MapleMap$26.class differ diff --git a/build/classes/server/maps/MapleMap$27.class b/build/classes/server/maps/MapleMap$27.class index c8e42addd9..9ff6326bad 100644 Binary files a/build/classes/server/maps/MapleMap$27.class and b/build/classes/server/maps/MapleMap$27.class differ diff --git a/build/classes/server/maps/MapleMap$28$1.class b/build/classes/server/maps/MapleMap$28$1.class index 0478f70750..f61bd29250 100644 Binary files a/build/classes/server/maps/MapleMap$28$1.class and b/build/classes/server/maps/MapleMap$28$1.class differ diff --git a/build/classes/server/maps/MapleMap$28.class b/build/classes/server/maps/MapleMap$28.class index aa3c6333bc..ae36c43763 100644 Binary files a/build/classes/server/maps/MapleMap$28.class and b/build/classes/server/maps/MapleMap$28.class differ diff --git a/build/classes/server/maps/MapleMap$29.class b/build/classes/server/maps/MapleMap$29.class index 3ab3b062a0..9ce46a2721 100644 Binary files a/build/classes/server/maps/MapleMap$29.class and b/build/classes/server/maps/MapleMap$29.class differ diff --git a/build/classes/server/maps/MapleMap$3.class b/build/classes/server/maps/MapleMap$3.class index d2ae56718d..98cf65e435 100644 Binary files a/build/classes/server/maps/MapleMap$3.class and b/build/classes/server/maps/MapleMap$3.class differ diff --git a/build/classes/server/maps/MapleMap$4.class b/build/classes/server/maps/MapleMap$4.class index 150079b3fe..b251f8cf27 100644 Binary files a/build/classes/server/maps/MapleMap$4.class and b/build/classes/server/maps/MapleMap$4.class differ diff --git a/build/classes/server/maps/MapleMap$5.class b/build/classes/server/maps/MapleMap$5.class index 404bc65319..17ed6da873 100644 Binary files a/build/classes/server/maps/MapleMap$5.class and b/build/classes/server/maps/MapleMap$5.class differ diff --git a/build/classes/server/maps/MapleMap$6.class b/build/classes/server/maps/MapleMap$6.class index e5375ea2de..e37f625f5d 100644 Binary files a/build/classes/server/maps/MapleMap$6.class and b/build/classes/server/maps/MapleMap$6.class differ diff --git a/build/classes/server/maps/MapleMap$7.class b/build/classes/server/maps/MapleMap$7.class index 94362c7f46..768cd0195a 100644 Binary files a/build/classes/server/maps/MapleMap$7.class and b/build/classes/server/maps/MapleMap$7.class differ diff --git a/build/classes/server/maps/MapleMap$8.class b/build/classes/server/maps/MapleMap$8.class index c8e670d597..47dfd367da 100644 Binary files a/build/classes/server/maps/MapleMap$8.class and b/build/classes/server/maps/MapleMap$8.class differ diff --git a/build/classes/server/maps/MapleMap$9.class b/build/classes/server/maps/MapleMap$9.class index f72bae4cd6..1d559ef453 100644 Binary files a/build/classes/server/maps/MapleMap$9.class and b/build/classes/server/maps/MapleMap$9.class differ diff --git a/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class b/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class index 8075fed244..ff10373e81 100644 Binary files a/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class and b/build/classes/server/maps/MapleMap$ActivateItemReactor$1.class differ diff --git a/build/classes/server/maps/MapleMap$ActivateItemReactor.class b/build/classes/server/maps/MapleMap$ActivateItemReactor.class index 02abf2362e..081bfd7086 100644 Binary files a/build/classes/server/maps/MapleMap$ActivateItemReactor.class and b/build/classes/server/maps/MapleMap$ActivateItemReactor.class differ diff --git a/build/classes/server/maps/MapleMap$ExpireMapItemJob.class b/build/classes/server/maps/MapleMap$ExpireMapItemJob.class index 843eee128a..0f6cc3b924 100644 Binary files a/build/classes/server/maps/MapleMap$ExpireMapItemJob.class and b/build/classes/server/maps/MapleMap$ExpireMapItemJob.class differ diff --git a/build/classes/server/maps/MapleMap.class b/build/classes/server/maps/MapleMap.class index 476314f421..393a0493ef 100644 Binary files a/build/classes/server/maps/MapleMap.class and b/build/classes/server/maps/MapleMap.class differ diff --git a/build/classes/tools/MaplePacketCreator$2.class b/build/classes/tools/MaplePacketCreator$2.class index a754608829..e51e222455 100644 Binary files a/build/classes/tools/MaplePacketCreator$2.class and b/build/classes/tools/MaplePacketCreator$2.class differ diff --git a/build/classes/tools/MaplePacketCreator.class b/build/classes/tools/MaplePacketCreator.class index b7551b72ce..a21048e017 100644 Binary files a/build/classes/tools/MaplePacketCreator.class and b/build/classes/tools/MaplePacketCreator.class differ diff --git a/dist/MapleSolaxia.jar b/dist/MapleSolaxia.jar index 75767c6b2f..5d26d10c73 100644 Binary files a/dist/MapleSolaxia.jar and b/dist/MapleSolaxia.jar differ diff --git a/mychanges_ptbr.txt b/mychanges_ptbr.txt index f9ddf5fd2c..40900dbcf7 100644 --- a/mychanges_ptbr.txt +++ b/mychanges_ptbr.txt @@ -360,6 +360,9 @@ Corrigido cliente n 07 - 09 Julho 2017, Corrigido parcialmente Mystic Doors. -10 Julho 2017, +10 - 11 Julho 2017, Abertas novas quests para a região de Masteria (Phantom Woods / Crimsonwood mountain). -Codificados novos NPCs para a região de Masteria. \ No newline at end of file +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. \ No newline at end of file diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 5af0ed1acc..9c4ee12962 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,6 +2,22 @@ - + + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/RecvOpcode.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/scripts/npc/1032102.js + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/MapleServerHandler.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleDoor.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/MapleStatEffect.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/PacketProcessor.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/handlers/DoorHandler.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/constants/ServerConstants.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/provider/MapleDataTool.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleDoorObject.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/maps/MapleMap.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/client/MapleCharacter.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/net/server/channel/handlers/CharInfoRequestHandler.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/server/MapleItemInformationProvider.java + file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/src/tools/MaplePacketCreator.java + diff --git a/scripts/npc/9201095.js b/scripts/npc/9201095.js new file mode 100644 index 0000000000..e0b56b29e2 --- /dev/null +++ b/scripts/npc/9201095.js @@ -0,0 +1,178 @@ +/* + This file is part of the OdinMS Maple Story Server + Copyright (C) 2008 Patrick Huy + Matthias Butz + Jan Christian Meyer + + 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 . +*/ +/* 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(); + } +} \ No newline at end of file diff --git a/scripts/npc/9201101.js b/scripts/npc/9201101.js new file mode 100644 index 0000000000..6e008b082a --- /dev/null +++ b/scripts/npc/9201101.js @@ -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(); +} diff --git a/scripts/npc/9201114.js b/scripts/npc/9201114.js index c0fa15e75e..7173ec59c7 100644 --- a/scripts/npc/9201114.js +++ b/scripts/npc/9201114.js @@ -25,8 +25,8 @@ */ function start() { - if(cm.haveItem(3992041, 1)) cm.warp(610030020); - else cm.getPlayer().dropMessage(5, "The giant gate of iron will not budge no matter what, however there is a key-shaped socket visible."); + if(cm.haveItem(3992041, 1)) cm.warp(610030020, "out00"); + 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(); } \ No newline at end of file diff --git a/scripts/npc/9201142.js b/scripts/npc/9201142.js new file mode 100644 index 0000000000..8a9149b64b --- /dev/null +++ b/scripts/npc/9201142.js @@ -0,0 +1,27 @@ +/* + This file is part of the OdinMS Maple Story Server + Copyright (C) 2008 Patrick Huy + Matthias Butz + Jan Christian Meyer + + 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 . +*/ +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(); +} diff --git a/scripts/portal/glpqEnter.js b/scripts/portal/glpqEnter.js new file mode 100644 index 0000000000..f7de0295cb --- /dev/null +++ b/scripts/portal/glpqEnter.js @@ -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; + } +} \ No newline at end of file diff --git a/scripts/quest/8221.js b/scripts/quest/8221.js new file mode 100644 index 0000000000..07e77ed2e4 --- /dev/null +++ b/scripts/quest/8221.js @@ -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(); + } +} diff --git a/scripts/quest/8228.js b/scripts/quest/8228.js index b1352e8cd8..a17465293f 100644 --- a/scripts/quest/8228.js +++ b/scripts/quest/8228.js @@ -46,14 +46,9 @@ function end(mode, type, selection) { } } if (status == 0){ - if(!qm.canHold(4032018, 1)) { - qm.sendOk("I'm afraid you don't have a slot available on your ETC inventory."); - } - else if(qm.haveItem(4032032, 1)) { + if(qm.haveItem(4032032, 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..."); 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(); } else { qm.sendOk("I'm afraid you don't have the letter you claimed to have with you."); diff --git a/scripts/quest/8229.js b/scripts/quest/8229.js index 3573a7f136..c489299daa 100644 --- a/scripts/quest/8229.js +++ b/scripts/quest/8229.js @@ -25,11 +25,11 @@ function start(mode, type, selection) { else if (status == 1){ if(qm.haveItem(4032018, 1)) { qm.forceStartQuest(); - } else if (qm.canHold(4032018, 1)) { + } else if(qm.canHold(4032018, 1)) { qm.gainItem(4032018, 1); qm.forceStartQuest(); } 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(); diff --git a/scripts/quest/8231.js b/scripts/quest/8231.js new file mode 100644 index 0000000000..29da40c564 --- /dev/null +++ b/scripts/quest/8231.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8232.js b/scripts/quest/8232.js new file mode 100644 index 0000000000..29da40c564 --- /dev/null +++ b/scripts/quest/8232.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8233.js b/scripts/quest/8233.js new file mode 100644 index 0000000000..e6d894a7ab --- /dev/null +++ b/scripts/quest/8233.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8234.js b/scripts/quest/8234.js new file mode 100644 index 0000000000..e6d894a7ab --- /dev/null +++ b/scripts/quest/8234.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8235.js b/scripts/quest/8235.js new file mode 100644 index 0000000000..3ec42e6726 --- /dev/null +++ b/scripts/quest/8235.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8236.js b/scripts/quest/8236.js new file mode 100644 index 0000000000..3ec42e6726 --- /dev/null +++ b/scripts/quest/8236.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8237.js b/scripts/quest/8237.js new file mode 100644 index 0000000000..c756159db3 --- /dev/null +++ b/scripts/quest/8237.js @@ -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(); + } +} \ No newline at end of file diff --git a/scripts/quest/8238.js b/scripts/quest/8238.js new file mode 100644 index 0000000000..c756159db3 --- /dev/null +++ b/scripts/quest/8238.js @@ -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(); + } +} \ No newline at end of file diff --git a/sql/db_drops.sql b/sql/db_drops.sql index 0825872468..e7aa889240 100644 --- a/sql/db_drops.sql +++ b/sql/db_drops.sql @@ -4129,7 +4129,6 @@ (9400542, 2000002, 1, 1, 0, 40000), (9400542, 2002001, 1, 1, 0, 10000), (9400542, 2002008, 1, 1, 0, 10000), -(9400542, 2044709, 1, 1, 0, 750), (9400542, 2040805, 1, 1, 0, 750), (9400542, 2060004, 10, 50, 0, 10000), (9400542, 2061004, 10, 50, 0, 10000), @@ -9798,7 +9797,6 @@ (9400003, 2040522, 1, 1, 0, 750), (9400003, 2040017, 1, 1, 0, 750), (9400003, 2041043, 1, 1, 0, 750), -(9400003, 2044709, 1, 1, 0, 750), (9400003, 2043309, 1, 1, 0, 750), (9400003, 4004003, 1, 1, 0, 3000), (9400003, 4020002, 1, 1, 0, 7000), @@ -15621,7 +15619,7 @@ (8140702, 1060106, 1, 1, 0, 700), (8140702, 1492011, 1, 1, 0, 700), (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, 2000006, 1, 1, 0, 40000), (9400580, 2290004, 1, 1, 0, 1000), @@ -17164,6 +17162,7 @@ (8190003, 1072318, 1, 1, 0, 700), (8190003, 1482011, 1, 1, 0, 700), (9400575, 1032023, 1, 1, 0, 40000), +(9400575, 4032013, 1, 1, 0, 100000), (8190004, 4000273, 1, 1, 0, 200000), (8190004, 4000244, 1, 1, 0, 200000), (8190004, 4130022, 1, 1, 0, 3000), @@ -19053,7 +19052,84 @@ (9400587, 0, 210, 380, 0, 200000), (9400588, 4000018, 1, 1, 0, 200000), (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) @@ -19137,6 +19213,9 @@ UPDATE IGNORE drop_data SET itemid=1402011 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 DELETE FROM drop_data WHERE itemid>=1132000 AND itemid<=1132004; diff --git a/src/server/MapleShopFactory.java b/src/server/MapleShopFactory.java index d798b415d5..af7583950d 100644 --- a/src/server/MapleShopFactory.java +++ b/src/server/MapleShopFactory.java @@ -63,7 +63,7 @@ public class MapleShopFactory { public MapleShop getShopForNPC(int npcId) { if (npcShops.containsKey(npcId)) { - npcShops.get(npcId); + return npcShops.get(npcId); } return loadShop(npcId, false); } diff --git a/src/server/MapleStatEffect.java b/src/server/MapleStatEffect.java index 4250ce9fb0..d5ad7aeadc 100644 --- a/src/server/MapleStatEffect.java +++ b/src/server/MapleStatEffect.java @@ -846,7 +846,7 @@ public class MapleStatEffect { Point doorPosition = new Point(applyto.getPosition().x, y); MapleDoor door = new MapleDoor(applyto, doorPosition); - if(door.getOwnerId() != -1) { + if(door.getOwnerId() > -1) { if (applyto.getParty() != null) { for (MaplePartyCharacter partyMember : applyto.getParty().getMembers()) { partyMember.getPlayer().addDoor(door.getOwnerId(), door); @@ -860,7 +860,9 @@ public class MapleStatEffect { door.getTarget().spawnDoor(door.getAreaDoor()); door.getTown().spawnDoor(door.getTownDoor()); } 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.disableDoor(); diff --git a/src/server/maps/MapleDoor.java b/src/server/maps/MapleDoor.java index 5d7b86c917..3ebd0c9e1e 100644 --- a/src/server/maps/MapleDoor.java +++ b/src/server/maps/MapleDoor.java @@ -45,17 +45,21 @@ public class MapleDoor { this.ownerId = owner.getId(); this.target = owner.getMap(); - this.town = this.target.getReturnMap(); - this.townPortal = allocateFreePortal(); - - if(townPortal != null) { - 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()); + if(target.canDeployDoor(targetPosition)) { + this.town = this.target.getReturnMap(); + this.townPortal = allocateFreePortal(); + + if(townPortal != null) { + 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()); + } else { + this.ownerId = -1; + } } else { - this.ownerId = -1; + this.ownerId = -2; } } diff --git a/src/server/maps/MapleMap.java b/src/server/maps/MapleMap.java index 5879ccfb86..8e8c8e7b1c 100644 --- a/src/server/maps/MapleMap.java +++ b/src/server/maps/MapleMap.java @@ -433,6 +433,11 @@ public class MapleMap { } 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) { if (mob.dropsDisabled() || !dropsOn) { diff --git a/src/tools/MaplePacketCreator.java b/src/tools/MaplePacketCreator.java index 7398a083f2..8d8abe96a4 100644 --- a/src/tools/MaplePacketCreator.java +++ b/src/tools/MaplePacketCreator.java @@ -2386,7 +2386,9 @@ public class MaplePacketCreator { } } 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.writeInt(chr.getMount().getLevel()); //level mplew.writeInt(chr.getMount().getExp()); //exp diff --git a/wz/Map.wz/Map/Map6/610010000.img.xml b/wz/Map.wz/Map/Map6/610010000.img.xml index da406fcebf..6de6cdffe9 100644 --- a/wz/Map.wz/Map/Map6/610010000.img.xml +++ b/wz/Map.wz/Map/Map6/610010000.img.xml @@ -4435,7 +4435,7 @@ - + diff --git a/wz/Map.wz/Map/Map6/610010002.img.xml b/wz/Map.wz/Map/Map6/610010002.img.xml index fd8538ad74..67bb630f15 100644 --- a/wz/Map.wz/Map/Map6/610010002.img.xml +++ b/wz/Map.wz/Map/Map6/610010002.img.xml @@ -1,6330 +1,18 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6334,39 +22,6323 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wz/Map.wz/Map/Map6/610030010.img.xml b/wz/Map.wz/Map/Map6/610030010.img.xml index e722a25cab..52a6afd55f 100644 --- a/wz/Map.wz/Map/Map6/610030010.img.xml +++ b/wz/Map.wz/Map/Map6/610030010.img.xml @@ -5697,13 +5697,14 @@ - - - - + + + + + @@ -9377,6 +9378,14 @@ + + + + + + + + @@ -9573,6 +9582,14 @@ + + + + + + + + @@ -9631,28 +9648,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -11111,11 +11106,11 @@ - + - - - + + + @@ -11839,11 +11834,11 @@ - + - - - + + + diff --git a/wz/Quest.wz/Check.img.xml b/wz/Quest.wz/Check.img.xml index 73aa09d98f..7842a9f7a9 100644 --- a/wz/Quest.wz/Check.img.xml +++ b/wz/Quest.wz/Check.img.xml @@ -62974,19 +62974,12 @@ - - - - - - - @@ -63198,7 +63191,7 @@ - +