diff --git a/docs/mychanges_ptbr.txt b/docs/mychanges_ptbr.txt index 106ba556e2..7994b03931 100644 --- a/docs/mychanges_ptbr.txt +++ b/docs/mychanges_ptbr.txt @@ -785,4 +785,7 @@ Adicionado novos scrolls à venda no Spindle. 11 Fevereiro 2018, Corrigido bug com pet Snail sendo inexpirável (deveria ter tempo de vida de 5 horas). -Adicionado efeito de som ao atravessar portais para a maioria dos scripts de portais. \ No newline at end of file +Adicionado efeito de som ao atravessar portais para a maioria dos scripts de portais. + +14 Fevereiro 2018, +Adicionado diversos drops de skill/mastery books para mobs level 90+. \ No newline at end of file diff --git a/scripts/npc/2020005.js b/scripts/npc/2020005.js index 4e436dc49c..1904e12596 100644 --- a/scripts/npc/2020005.js +++ b/scripts/npc/2020005.js @@ -38,22 +38,19 @@ var totalcost; var item = new Array(2050003,2050004,4006000,4006001); var cost = new Array(300,400,5000,5000); var msg = new Array("that cures the state of being sealed and cursed","that cures all",", possessing magical power, that is used for high-quality skills",", possessing the power of summoning that is used for high-quality skills"); +var status; function start() { - if (cm.isQuestCompleted(3035)) { - var selStr; - for (var i = 0; i < item.length; i++){ - selStr += "\r\n#L" + i + "# #b#t" + item[i] + "# (Price: "+cost[i]+" mesos)#k#l"; - } - cm.sendSimple("Thanks to you #b#t4031056##k is safely sealed. Of course, also as a result, I used up about half of the power I have accumulated over the last 800 years or so...but now I can die in peace. Oh, by the way... are you looking for rare items by any chance? As a sign of appreciation for your hard work, I'll sell some items I have to you, and ONLY you. Pick out the one you want!"+selStr); - } - else { - cm.sendNext("If you decide to help me out, then in return, I'll make the item available for sale."); - cm.dispose(); - } + status = -1; + action(1, 0, 0); } function action(mode, type, selection) { + if (!cm.isQuestCompleted(3035)) { + cm.sendNext("If you decide to help me out, then in return, I'll make the item available for sale."); + cm.dispose(); + return; + } if(mode == 0 && status == 2) { cm.sendNext("I see. Understand that I have many different items here. Take a look around. I'm only selling these items to you, so I won't be ripping you off in any way shape or form."); cm.dispose(); @@ -63,8 +60,16 @@ function action(mode, type, selection) { cm.dispose(); return; } + status++; - if (status == 1) { + if (status == 0) { + var selStr = ""; + for (var i = 0; i < item.length; i++){ + selStr += "\r\n#L" + i + "# #b#t" + item[i] + "# (Price: "+cost[i]+" mesos)#k#l"; + } + cm.sendSimple("Thanks to you #b#t4031056##k is safely sealed. Of course, also as a result, I used up about half of the power I have accumulated over the last 800 years or so...but now I can die in peace. Oh, by the way... are you looking for rare items by any chance? As a sign of appreciation for your hard work, I'll sell some items I have to you, and ONLY you. Pick out the one you want!"+selStr); + } + else if (status == 1) { selected = selection; cm.sendGetNumber("Is #b#t"+item[selected]+"##k really the item that you need? It's the item "+msg[selected]+". It may not be the easiest item to acquire, but I'll give you a good deal on it. It'll cost you #b"+cost[selected]+" mesos#k per item. How many would you like to purchase?", 0, 1, 100); } diff --git a/scripts/npc/9209000.js b/scripts/npc/9209000.js index bd821adde1..86bc63e985 100644 --- a/scripts/npc/9209000.js +++ b/scripts/npc/9209000.js @@ -1,7 +1,7 @@ /** * @author: Ronan * @npc: Abdula - * @map: Multiple cities on Maplestory + * @map: Multiple towns on Maplestory * @func: Job Skill / Mastery Book Drop Announcer */ @@ -19,7 +19,7 @@ function action(mode, type, selection) { if (mode == -1) { cm.dispose(); } else { - if (mode == 0 && status == 0) { + if (mode == 0 && type > 0) { cm.dispose(); return; } diff --git a/scripts/portal/MD_drakeroom.js b/scripts/portal/MD_drakeroom.js index 93983577b6..96ee511d5d 100644 --- a/scripts/portal/MD_drakeroom.js +++ b/scripts/portal/MD_drakeroom.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_error.js b/scripts/portal/MD_error.js index 5febd04ae2..0d91482f3e 100644 --- a/scripts/portal/MD_error.js +++ b/scripts/portal/MD_error.js @@ -33,6 +33,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -44,6 +45,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_golem.js b/scripts/portal/MD_golem.js index 4d113736d7..b4a46ae2f9 100644 --- a/scripts/portal/MD_golem.js +++ b/scripts/portal/MD_golem.js @@ -33,6 +33,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -44,6 +45,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_high.js b/scripts/portal/MD_high.js index 2f796e3684..b13aa89c32 100644 --- a/scripts/portal/MD_high.js +++ b/scripts/portal/MD_high.js @@ -33,6 +33,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -44,6 +45,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_mushroom.js b/scripts/portal/MD_mushroom.js index 279a734529..4d15371ba3 100644 --- a/scripts/portal/MD_mushroom.js +++ b/scripts/portal/MD_mushroom.js @@ -33,6 +33,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -44,6 +45,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_pig.js b/scripts/portal/MD_pig.js index 0e273e0493..21a3c676bc 100644 --- a/scripts/portal/MD_pig.js +++ b/scripts/portal/MD_pig.js @@ -33,6 +33,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -44,6 +45,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_protect.js b/scripts/portal/MD_protect.js index 475646b9cc..4dd9fdc253 100644 --- a/scripts/portal/MD_protect.js +++ b/scripts/portal/MD_protect.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_rabbit.js b/scripts/portal/MD_rabbit.js index 98c04d23a6..7e9ad57ccd 100644 --- a/scripts/portal/MD_rabbit.js +++ b/scripts/portal/MD_rabbit.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_remember.js b/scripts/portal/MD_remember.js index 9f1c874aaa..3c4f007a6f 100644 --- a/scripts/portal/MD_remember.js +++ b/scripts/portal/MD_remember.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_roundTable.js b/scripts/portal/MD_roundTable.js index df0aec42ab..44aa8bbccd 100644 --- a/scripts/portal/MD_roundTable.js +++ b/scripts/portal/MD_roundTable.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_sand.js b/scripts/portal/MD_sand.js index d3d49f17b1..217b3efed5 100644 --- a/scripts/portal/MD_sand.js +++ b/scripts/portal/MD_sand.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/MD_treasure.js b/scripts/portal/MD_treasure.js index f4c6e4b15d..b811797c2b 100644 --- a/scripts/portal/MD_treasure.js +++ b/scripts/portal/MD_treasure.js @@ -31,6 +31,7 @@ function enter(pi) { if (pi.isLeader()) { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warpParty(dungeonid + i); return true; } @@ -42,6 +43,7 @@ function enter(pi) { } else { for (var i = 0; i < dungeons; i++) { if(pi.startDungeonInstance(dungeonid + i)) { + pi.playPortalSound(); pi.warp(dungeonid + i); return true; } diff --git a/scripts/portal/Spacegaga_out0.js b/scripts/portal/Spacegaga_out0.js index ab06950336..4f5605c14e 100644 --- a/scripts/portal/Spacegaga_out0.js +++ b/scripts/portal/Spacegaga_out0.js @@ -2,7 +2,7 @@ function enter(pi) { if (pi.getPlayer().getEvents().getGagaRescue().fallAndGet() > 3) { - pi.warp(922240200, 0); + pi.playPortalSound(); pi.warp(922240200, 0); pi.getPlayer().cancelEffect(2360002); } else pi.playPortalSound(); pi.warp(pi.getPlayer().getMapId(), 0); diff --git a/scripts/portal/Spacegaga_out1.js b/scripts/portal/Spacegaga_out1.js index ab06950336..4f5605c14e 100644 --- a/scripts/portal/Spacegaga_out1.js +++ b/scripts/portal/Spacegaga_out1.js @@ -2,7 +2,7 @@ function enter(pi) { if (pi.getPlayer().getEvents().getGagaRescue().fallAndGet() > 3) { - pi.warp(922240200, 0); + pi.playPortalSound(); pi.warp(922240200, 0); pi.getPlayer().cancelEffect(2360002); } else pi.playPortalSound(); pi.warp(pi.getPlayer().getMapId(), 0); diff --git a/scripts/portal/Spacegaga_out2.js b/scripts/portal/Spacegaga_out2.js index ab06950336..4f5605c14e 100644 --- a/scripts/portal/Spacegaga_out2.js +++ b/scripts/portal/Spacegaga_out2.js @@ -2,7 +2,7 @@ function enter(pi) { if (pi.getPlayer().getEvents().getGagaRescue().fallAndGet() > 3) { - pi.warp(922240200, 0); + pi.playPortalSound(); pi.warp(922240200, 0); pi.getPlayer().cancelEffect(2360002); } else pi.playPortalSound(); pi.warp(pi.getPlayer().getMapId(), 0); diff --git a/scripts/portal/Spacegaga_out3.js b/scripts/portal/Spacegaga_out3.js index ab06950336..4f5605c14e 100644 --- a/scripts/portal/Spacegaga_out3.js +++ b/scripts/portal/Spacegaga_out3.js @@ -2,7 +2,7 @@ function enter(pi) { if (pi.getPlayer().getEvents().getGagaRescue().fallAndGet() > 3) { - pi.warp(922240200, 0); + pi.playPortalSound(); pi.warp(922240200, 0); pi.getPlayer().cancelEffect(2360002); } else pi.playPortalSound(); pi.warp(pi.getPlayer().getMapId(), 0); diff --git a/scripts/portal/TD_neo_inTree.js b/scripts/portal/TD_neo_inTree.js index 4b469a52c5..6e68fd8295 100644 --- a/scripts/portal/TD_neo_inTree.js +++ b/scripts/portal/TD_neo_inTree.js @@ -24,5 +24,6 @@ function enter(pi) { } } + pi.message("A mysterious force won't let you in."); return false; } \ No newline at end of file diff --git a/scripts/portal/dojang_next.js b/scripts/portal/dojang_next.js index 7406ecf83c..b8741bee76 100644 --- a/scripts/portal/dojang_next.js +++ b/scripts/portal/dojang_next.js @@ -53,11 +53,11 @@ function enter(pi) { } } else { pi.getPlayer().message("You received " + pi.getPlayer().addDojoPointsByMap(pi.getMapId()) + " training points. Your total training points score is now " + pi.getPlayer().getDojoPoints() + "."); - pi.warp(pi.getPlayer().getMap().getId() + 100, 0); + pi.playPortalSound(); pi.warp(pi.getPlayer().getMap().getId() + 100, 0); } } else { pi.getPlayer().message("You received " + pi.getPlayer().addDojoPointsByMap(pi.getMapId()) + " training points. Your total training points score is now " + pi.getPlayer().getDojoPoints() + "."); - pi.warp(pi.getPlayer().getMap().getId() + 100, 0); + pi.playPortalSound(); pi.warp(pi.getPlayer().getMap().getId() + 100, 0); } } else { pi.playPortalSound(); pi.warp(925020003, 0); diff --git a/scripts/portal/enterDollWay.js b/scripts/portal/enterDollWay.js index 83d7d6a55f..a5e0884b7e 100644 --- a/scripts/portal/enterDollWay.js +++ b/scripts/portal/enterDollWay.js @@ -1,6 +1,6 @@ function enter(pi) { if(pi.isQuestCompleted(20730) || pi.isQuestCompleted(21734)) { // puppeteer defeated, newfound secret path - pi.warp(105070300,3); + pi.playPortalSound(); pi.warp(105070300,3); return true; } else if(pi.isQuestStarted(21734)) { pi.playPortalSound(); pi.warp(910510100,0); diff --git a/scripts/portal/enterNepenthes.js b/scripts/portal/enterNepenthes.js index 1709faed38..9963a6fb2f 100644 --- a/scripts/portal/enterNepenthes.js +++ b/scripts/portal/enterNepenthes.js @@ -9,7 +9,7 @@ function enter(pi) { mapobj2.spawnMonsterOnGroundBelow(Packages.server.life.MapleLifeFactory.getMonster(9300348), new Packages.java.awt.Point(591, -34)); - pi.warp(920030000,2); + pi.playPortalSound(); pi.warp(920030000,2); return true; } else { pi.message("Someone is already challenging the area."); diff --git a/scripts/portal/evanGarden0.js b/scripts/portal/evanGarden0.js index 40cbc5844b..4f92e26571 100644 --- a/scripts/portal/evanGarden0.js +++ b/scripts/portal/evanGarden0.js @@ -1,5 +1,5 @@ function enter(pi) { - pi.playPortalSound(); + pi.playPortalSound(); pi.warp(100030200, "east00"); return true; } \ No newline at end of file diff --git a/scripts/portal/evanlivingRoom.js b/scripts/portal/evanlivingRoom.js index 1c2ec4e115..845c294276 100644 --- a/scripts/portal/evanlivingRoom.js +++ b/scripts/portal/evanlivingRoom.js @@ -1,5 +1,5 @@ function enter(pi) { - pi.playPortalSound(); + pi.playPortalSound(); pi.warp(100030102, "in00"); return true; } \ No newline at end of file diff --git a/scripts/portal/gendergo.js b/scripts/portal/gendergo.js index ae8fa82ecd..33aa7de45f 100644 --- a/scripts/portal/gendergo.js +++ b/scripts/portal/gendergo.js @@ -2,7 +2,7 @@ function enter(pi) { var map = pi.getPlayer().getMap(); if(pi.getPortal().getName() == "female00") { if (pi.getPlayer().getGender() == 1) { - pi.warp(map.getId(), "female01"); + pi.playPortalSound(); pi.warp(map.getId(), "female01"); return true; } else { pi.message("This portal leads to the girls' area, try the portal at the other side."); diff --git a/scripts/portal/hontale_BR.js b/scripts/portal/hontale_BR.js index ee869d27fb..637f7661bd 100644 --- a/scripts/portal/hontale_BR.js +++ b/scripts/portal/hontale_BR.js @@ -22,7 +22,7 @@ function enter(pi) { if (pi.getPlayer().getMapId() == 240060000) { if(pi.getEventInstance().getIntProperty("defeatedHead") >= 1) { - pi.warp(240060100, 0); + pi.playPortalSound(); pi.warp(240060100, 0); return true; } else { pi.getPlayer().dropMessage(6, "Horntail\'s Seal is Blocking this Door."); diff --git a/scripts/portal/magatia_alc0.js b/scripts/portal/magatia_alc0.js index 14c53fa7fd..d665d7ffc7 100644 --- a/scripts/portal/magatia_alc0.js +++ b/scripts/portal/magatia_alc0.js @@ -20,7 +20,7 @@ function enter(pi) { if(!pi.isQuestStarted(3309) || pi.haveItem(4031708, 1)) { - pi.warp(261020700, "down00"); + pi.playPortalSound(); pi.warp(261020700, "down00"); } else { pi.playPortalSound(); pi.warp(926120000, "out00"); } diff --git a/scripts/portal/market00.js b/scripts/portal/market00.js index 6cf3d5bb36..79d428d429 100644 --- a/scripts/portal/market00.js +++ b/scripts/portal/market00.js @@ -22,7 +22,7 @@ function enter(pi) { try { var toMap = pi.getPlayer().getSavedLocation("FREE_MARKET"); - pi.warp(toMap, pi.getMarketPortalId(toMap)); + pi.playPortalSound(); pi.warp(toMap, pi.getMarketPortalId(toMap)); } catch(err) { pi.playPortalSound(); pi.warp(100000000, 0); } diff --git a/scripts/portal/minar_elli.js b/scripts/portal/minar_elli.js index 790dbe19c3..e71356e9d0 100644 --- a/scripts/portal/minar_elli.js +++ b/scripts/portal/minar_elli.js @@ -25,11 +25,11 @@ function enter(pi) { return false; } if (pi.getPlayer().getMapId() == 240010100) { - pi.gainItem(4031346, -1); - pi.warp(101010000, "minar00"); + pi.gainItem(4031346, -1); + pi.playPortalSound(); pi.warp(101010000, "minar00"); return true; } else if (pi.getPlayer().getMapId() == 101010000) { - pi.gainItem(4031346, -1); + pi.gainItem(4031346, -1); pi.playPortalSound(); pi.warp(240010100, "elli00"); return true; } diff --git a/scripts/portal/rankRoom.js b/scripts/portal/rankRoom.js index 88f7f7b948..213d9417ae 100644 --- a/scripts/portal/rankRoom.js +++ b/scripts/portal/rankRoom.js @@ -9,21 +9,21 @@ function enter(pi) { pi.warp(130000100, 4); //or 130000101 break; case 140010100: - pi.warp(140010110, 0); //or 140010111 - break; + pi.warp(140010110, 0); //or 140010111 + break; case 120000101: - pi.warp(120000105, 0); - break; + pi.warp(120000105, 0); + break; case 103000003: - pi.warp(103000008, 0); //or 103000009 - break; + pi.warp(103000008, 0); //or 103000009 + break; case 100000201: - pi.warp(100000204, 0); //or 100000205 - break; + pi.warp(100000204, 0); //or 100000205 + break; default: - pi.warp(pi.getMapId() + 1, 0); //or + 2 - break; + pi.warp(pi.getMapId() + 1, 0); //or + 2 + break; } - return true; + return true; } \ No newline at end of file diff --git a/scripts/portal/s4resur_out.js b/scripts/portal/s4resur_out.js index bf6e391c51..bce72e994d 100644 --- a/scripts/portal/s4resur_out.js +++ b/scripts/portal/s4resur_out.js @@ -27,7 +27,7 @@ function enter(pi) { if(pi.isQuestStarted(6134)) { if(pi.canHold(4031448)) { pi.gainItem(4031448, 1); - pi.warp(220070400, 3); + pi.playPortalSound(); pi.warp(220070400, 3); return true; } else { diff --git a/scripts/quest/3108.js b/scripts/quest/3108.js new file mode 100644 index 0000000000..d722973567 --- /dev/null +++ b/scripts/quest/3108.js @@ -0,0 +1,44 @@ +/* + This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server + Copyleft (L) 2017 RonanLana + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + 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(mode, type, selection) { + if (mode == -1) { + qm.dispose(); + } else { + if(mode == 0 && type > 0) { + qm.dispose(); + return; + } + + if (mode == 1) + status++; + else + status--; + + if (status == 0) { + qm.sendNext("(As you peek into the shattered statue, you might have found a clue about what happened. Better talk with #rScadur#k about this.)"); + qm.forceCompleteQuest(); + + qm.dispose(); + } + } +} diff --git a/sql/db_database.sql b/sql/db_database.sql index b434ca2d32..e9b535bb22 100644 --- a/sql/db_database.sql +++ b/sql/db_database.sql @@ -9192,7 +9192,7 @@ INSERT IGNORE INTO `temp_data` (`id`, `dropperid`, `itemid`, `minimum_quantity`, (8971, 8830000, 2050004, 1, 1, 0, 500000), (8972, 8830000, 2020001, 1, 1, 0, 200000), (8973, 8830000, 2020000, 1, 1, 0, 200000), -(8974, 8830000, 2000016, 1, 1, 0, 200000), +(8974, 8830000, 2000002, 1, 1, 0, 200000), (8975, 8830000, 2020005, 1, 1, 0, 200000), (8976, 8830000, 2020003, 1, 1, 0, 200000), (8977, 8830000, 2020009, 1, 1, 0, 200000), @@ -10713,8 +10713,8 @@ INSERT IGNORE INTO `temp_data` (`id`, `dropperid`, `itemid`, `minimum_quantity`, (10491, 8500002, 2280009, 1, 1, 0, 50000), (10492, 8500002, 2280008, 1, 1, 0, 35000), (10493, 8500002, 2280007, 1, 1, 0, 35000), -(10494, 8140701, 4031872, 1, 1, 6340, 60000), -(10495, 8140700, 4031871, 1, 1, 6350, 60000), +(10494, 8140701, 4031872, 1, 1, 6340, 100000), +(10495, 8140700, 4031871, 1, 1, 6350, 100000), (10496, 8500002, 4031869, 1, 1, 6360, 999999), (10497, 8141000, 4031873, 1, 1, 6380, 60000), (10498, 8141100, 4031874, 1, 1, 6390, 60000), diff --git a/sql/db_drops.sql b/sql/db_drops.sql index b77764e0a1..fa92ad7996 100644 --- a/sql/db_drops.sql +++ b/sql/db_drops.sql @@ -1872,7 +1872,7 @@ USE `heavenms`; (2230102, 4000020, 1, 1, 0, 200000), (2230102, 4000021, 1, 1, 0, 200000), (2230102, 4003004, 1, 1, 0, 7000), -(2230102, 4001372, 1, 1, 0, 7000), +(2230102, 4001372, 1, 1, 0, 200000), (2230102, 2000001, 1, 1, 0, 40000), (2230102, 2000003, 1, 1, 0, 40000), (2230102, 2002004, 1, 1, 0, 10000), @@ -19731,7 +19731,7 @@ USE `heavenms`; (8090000, 2022130, 1, 1, 0, 200000), (8090000, 2022191, 1, 1, 0, 200000), (8090000, 0, 1000, 1100, 0, 400000), -(9400549, 2290045, 1, 1, 0, 4000), +(9400549, 2290045, 1, 1, 0, 15000), (8160000, 2290081, 1, 1, 0, 4000), (9400575, 2290087, 1, 1, 0, 4000), (8170000, 2290109, 1, 1, 0, 4000), @@ -19815,7 +19815,7 @@ USE `heavenms`; (7120103, 4130003, 1, 1, 0, 3000), (7120103, 4130002, 1, 1, 0, 3000), (7120103, 4130021, 1, 1, 0, 3000), -(7120103, 2000016, 1, 1, 0, 40000), +(7120103, 2000002, 1, 1, 0, 40000), (7120103, 2000006, 1, 1, 0, 40000), (7120103, 2000004, 1, 1, 0, 40000), (7120103, 4006001, 1, 1, 0, 7000), @@ -20025,6 +20025,207 @@ USE `heavenms`; # (dropperid, itemid, minqty, maxqty, questid, chance) + # add more skill/mastery books + INSERT IGNORE INTO temp_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) VALUES +(9400014, 2280000, 1, 1, 0, 40000), +(8150000, 2280001, 1, 1, 0, 40000), +(9400121, 2280002, 1, 1, 0, 40000), +(9300028, 2280003, 1, 1, 0, 100000), +(8150100, 2280011, 1, 1, 0, 1000), +(8220009, 2280012, 1, 1, 0, 40000), +(8150000, 2280013, 1, 1, 0, 40000), +(8200005, 2280014, 1, 1, 0, 1000), +(9300028, 2280015, 1, 1, 0, 100000), +(8200004, 2280016, 1, 1, 0, 1000), +(9400549, 2290001, 1, 1, 0, 1000), +(8200006, 2290003, 1, 1, 0, 1000), +(9400582, 2290005, 1, 1, 0, 1000), +(9400122, 2290007, 1, 1, 0, 40000), +(9400575, 2290009, 1, 1, 0, 1000), +(8200000, 2290011, 1, 1, 0, 1000), +(8170000, 2290012, 1, 1, 0, 1000), +(8140512, 2290013, 1, 1, 0, 1000), +(8200009, 2290016, 1, 1, 0, 1000), +(8160000, 2290017, 1, 1, 0, 1000), +(9400549, 2290020, 1, 1, 0, 1000), +(8150101, 2290021, 1, 1, 0, 1000), +(9400514, 2290023, 1, 1, 0, 40000), +(9300028, 2290026, 1, 1, 0, 100000), +(9400582, 2290029, 1, 1, 0, 1000), +(8200009, 2290031, 1, 1, 0, 1000), +(8190003, 2290033, 1, 1, 0, 1000), +(8150101, 2290035, 1, 1, 0, 1000), +(9420513, 2290039, 1, 1, 0, 40000), +(8190004, 2290041, 1, 1, 0, 1000), +(9400582, 2290047, 1, 1, 0, 1000), +(9400582, 2290049, 1, 1, 0, 1000), +(8200008, 2290051, 1, 1, 0, 1000), +(8150100, 2290053, 1, 1, 0, 1000), +(8190003, 2290055, 1, 1, 0, 1000), +(9400549, 2290057, 1, 1, 0, 1000), +(8200001, 2290059, 1, 1, 0, 1000), +(9400122, 2290062, 1, 1, 0, 40000), +(9400300, 2290063, 1, 1, 0, 100000), +(9300028, 2290064, 1, 1, 0, 100000), +(8160000, 2290065, 1, 1, 0, 1000), +(8160000, 2290067, 1, 1, 0, 1000), +(9400593, 2290069, 1, 1, 0, 40000), +(8200002, 2290070, 1, 1, 0, 1000), +(8200003, 2290071, 1, 1, 0, 1000), +(8150100, 2290073, 1, 1, 0, 1000), +(9400591, 2290074, 1, 1, 0, 40000), +(9300028, 2290075, 1, 1, 0, 100000), +(9400300, 2290079, 1, 1, 0, 100000), +(8140511, 2290083, 1, 1, 0, 1000), +(8220002, 2290085, 1, 1, 0, 40000), +(9400549, 2290086, 1, 1, 0, 1000), +(9400514, 2290088, 1, 1, 0, 40000), +(8150000, 2290091, 1, 1, 0, 40000), +(9300028, 2290093, 1, 1, 0, 100000), +(9400514, 2290095, 1, 1, 0, 40000), +(9300028, 2290096, 1, 1, 0, 100000), +(9400121, 2290101, 1, 1, 0, 40000), +(9400580, 2290103, 1, 1, 0, 1000), +(9400575, 2290107, 1, 1, 0, 1000), +(8220007, 2290108, 1, 1, 0, 40000), +(9400300, 2290111, 1, 1, 0, 100000), +(9400014, 2290112, 1, 1, 0, 40000), +(8150302, 2290113, 1, 1, 0, 1000), +(8200011, 2290114, 1, 1, 0, 1000), +(9400514, 2290115, 1, 1, 0, 40000), +(9400122, 2290116, 1, 1, 0, 40000), +(8200008, 2290121, 1, 1, 0, 1000), +(8200008, 2290122, 1, 1, 0, 1000), +(9400592, 2290123, 1, 1, 0, 40000), +(8200007, 2290125, 1, 1, 0, 1000), +(8200004, 2290127, 1, 1, 0, 1000), +(8200006, 2290129, 1, 1, 0, 1000), +(8140512, 2290131, 1, 1, 0, 1000), +(8190003, 2290133, 1, 1, 0, 1000), +(8170000, 2290134, 1, 1, 0, 1000), +(9400582, 2290135, 1, 1, 0, 1000), +(9400593, 2290138, 1, 1, 0, 40000), +(8200002, 2290139, 1, 1, 0, 1000), +(8190004, 2280000, 1, 1, 0, 1000), +(9400300, 2280001, 1, 1, 0, 100000), +(8200012, 2280002, 1, 1, 0, 1000), +(8140511, 2280003, 1, 1, 0, 1000), +(8200005, 2280011, 1, 1, 0, 1000), +(9420513, 2280012, 1, 1, 0, 40000), +(8190003, 2280013, 1, 1, 0, 1000), +(9400121, 2280014, 1, 1, 0, 40000), +(8200001, 2280015, 1, 1, 0, 1000), +(8190001, 2280016, 1, 1, 0, 1000), +(8200011, 2290001, 1, 1, 0, 1000), +(8150300, 2290003, 1, 1, 0, 1000), +(8200000, 2290005, 1, 1, 0, 1000), +(8190003, 2290007, 1, 1, 0, 1000), +(8140511, 2290009, 1, 1, 0, 1000), +(8200007, 2290011, 1, 1, 0, 1000), +(8200003, 2290012, 1, 1, 0, 1000), +(8200009, 2290013, 1, 1, 0, 1000), +(8200007, 2290016, 1, 1, 0, 1000), +(8150101, 2290017, 1, 1, 0, 1000), +(8220002, 2290020, 1, 1, 0, 40000), +(8190004, 2290021, 1, 1, 0, 1000), +(8150301, 2290023, 1, 1, 0, 1000), +(8200010, 2290026, 1, 1, 0, 1000), +(8150301, 2290029, 1, 1, 0, 1000), +(8220009, 2290031, 1, 1, 0, 40000), +(8150300, 2290033, 1, 1, 0, 1000), +(8220007, 2290035, 1, 1, 0, 40000), +(9400591, 2290039, 1, 1, 0, 40000), +(8200012, 2290041, 1, 1, 0, 1000), +(9400592, 2290047, 1, 1, 0, 40000), +(8200011, 2290049, 1, 1, 0, 1000), +(9400575, 2290051, 1, 1, 0, 1000), +(9400014, 2290053, 1, 1, 0, 40000), +(9400300, 2290055, 1, 1, 0, 100000), +(9400514, 2290057, 1, 1, 0, 40000), +(8200010, 2290059, 1, 1, 0, 1000), +(8200002, 2290062, 1, 1, 0, 1000), +(8190003, 2290063, 1, 1, 0, 1000), +(8200006, 2290064, 1, 1, 0, 1000), +(8200001, 2290065, 1, 1, 0, 1000), +(8140512, 2290067, 1, 1, 0, 1000), +(8200004, 2290069, 1, 1, 0, 1000), +(8150000, 2290070, 1, 1, 0, 40000), +(8190004, 2290071, 1, 1, 0, 1000), +(8190004, 2290073, 1, 1, 0, 1000), +(9400582, 2290074, 1, 1, 0, 1000), +(8190001, 2290075, 1, 1, 0, 1000), +(9400582, 2290079, 1, 1, 0, 1000), +(9400580, 2290083, 1, 1, 0, 1000), +(8150302, 2290085, 1, 1, 0, 1000), +(8170000, 2290086, 1, 1, 0, 1000), +(9400590, 2290088, 1, 1, 0, 40000), +(8220007, 2290091, 1, 1, 0, 40000), +(9400593, 2290093, 1, 1, 0, 40000), +(8200005, 2290095, 1, 1, 0, 1000), +(8150302, 2290096, 1, 1, 0, 1000), +(8200003, 2290101, 1, 1, 0, 1000), +(8190001, 2290103, 1, 1, 0, 1000), +(8150301, 2290107, 1, 1, 0, 1000), +(9420513, 2290108, 1, 1, 0, 40000), +(8150300, 2290111, 1, 1, 0, 1000), +(8190004, 2290112, 1, 1, 0, 1000), +(9400591, 2290113, 1, 1, 0, 40000), +(8200000, 2290114, 1, 1, 0, 1000), +(8200012, 2290115, 1, 1, 0, 1000), +(8140512, 2290116, 1, 1, 0, 1000), +(9400580, 2290121, 1, 1, 0, 1000), +(9400014, 2290122, 1, 1, 0, 40000), +(9400575, 2290123, 1, 1, 0, 1000), +(9400590, 2290125, 1, 1, 0, 40000), +(8200010, 2290127, 1, 1, 0, 1000), +(8220009, 2290129, 1, 1, 0, 40000), +(9400592, 2290131, 1, 1, 0, 40000), +(8220002, 2290133, 1, 1, 0, 40000), +(8140511, 2290134, 1, 1, 0, 1000), +(9400590, 2290135, 1, 1, 0, 40000), +(9420513, 2290138, 1, 1, 0, 40000), +(9400514, 2290139, 1, 1, 0, 40000), +(8143000, 2280004, 1, 1, 0, 1000), +(8141100, 2280005, 1, 1, 0, 1000), +(9420540, 2280006, 1, 1, 0, 1000), +(8220015, 2280004, 1, 1, 0, 40000), +(8220015, 2280005, 1, 1, 0, 40000), +(8220015, 2280006, 1, 1, 0, 40000); + + # improve drop rates for skill/mastery books + UPDATE IGNORE temp_data SET chance=1000 WHERE itemid >= 2280000 and itemid < 2300000 and chance < 1000; + + # make some mobs drop unusual accessory scrolls + INSERT IGNORE INTO temp_data (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) VALUES +(6090003, 2040103, 1, 1, 0, 3000), +(6090003, 2040209, 1, 1, 0, 3000), +(6090002, 2040106, 1, 1, 0, 3000), +(6090002, 2040200, 1, 1, 0, 3000), +(6090004, 2040101, 1, 1, 0, 3000), +(6090004, 2040204, 1, 1, 0, 3000), +(6090001, 2040100, 1, 1, 0, 3000), +(6090001, 2040201, 1, 1, 0, 3000), +(6090000, 2040105, 1, 1, 0, 3000), +(6090000, 2040208, 1, 1, 0, 3000), +(5090000, 2040206, 1, 1, 0, 3000), +(5090000, 2040108, 1, 1, 0, 3000), +(8140600, 2040102, 1, 1, 0, 750), +(8140103, 2040107, 1, 1, 0, 750), +(7130102, 2040202, 1, 1, 0, 750), +(8140500, 2040207, 1, 1, 0, 750), +(7130101, 2040104, 1, 1, 0, 750), +(8143000, 2040109, 1, 1, 0, 750), +(8200009, 2040203, 1, 1, 0, 750), +(8142100, 2040205, 1, 1, 0, 750), +(9400580, 2048010, 1, 1, 0, 750), +(5110302, 2048010, 1, 1, 0, 750), +(4230118, 4240000, 1, 1, 0, 750), +(6400100, 2048011, 1, 1, 0, 750), +(5130107, 2048012, 1, 1, 0, 750), +(6230601, 2048012, 1, 1, 0, 750), +(6230500, 2048013, 1, 1, 0, 750), +(7130601, 2048013, 1, 1, 0, 750); + # delete all inexistent itemids DELETE FROM temp_data WHERE itemid=2290109; @@ -20094,7 +20295,7 @@ USE `heavenms`; DELETE FROM temp_data WHERE dropperid=9300103; DELETE FROM temp_data WHERE dropperid=9300104; -# delete item drops from Dojo summoned mobs + # delete item drops from Dojo summoned mobs DELETE FROM temp_data WHERE dropperid>=9300217 AND dropperid<=9300270; UPDATE IGNORE temp_data SET chance=700 WHERE itemid=1302056; @@ -20159,7 +20360,6 @@ USE `heavenms`; UPDATE drop_data SET chance=40000, questid=3250 WHERE itemid=4031992; UPDATE drop_data SET questid=6191 WHERE itemid=4001107; UPDATE drop_data SET questid=28344 WHERE itemid=4032475; - UPDATE drop_data SET questid=28248 WHERE itemid=4001358; UPDATE drop_data SET questid=28248 WHERE itemid=4001359; UPDATE drop_data SET questid=28175 WHERE itemid=4001342; @@ -20167,6 +20367,7 @@ USE `heavenms`; UPDATE drop_data SET chance=0 WHERE itemid=2050099; UPDATE drop_data SET questid=6191 WHERE itemid=4031477; UPDATE drop_data SET questid=6190 WHERE itemid=4001111; + UPDATE drop_data SET questid=28344 WHERE itemid=4001372; UPDATE drop_data SET questid=28282 WHERE itemid=4001373; # two items named "Sparta": remove the entries where lv100 Sparta is being dropped by low-level mobs. diff --git a/sql/db_shopupdate.sql b/sql/db_shopupdate.sql index 20e3d0769b..4e4239d65d 100644 --- a/sql/db_shopupdate.sql +++ b/sql/db_shopupdate.sql @@ -9,83 +9,97 @@ INSERT INTO `shops` (`shopid`,`npcid`) VALUES (9201082,9201082); INSERT IGNORE INTO `shopitems` (`shopid`, `itemid`, `price`, `pitch`, `position`) VALUES -(9201082, 2040025, 500000, 0, 1), -(9201082, 2040029, 500000, 0, 2), -(9201082, 2040017, 500000, 0, 3), -(9201082, 2040301, 400000, 0, 4), -(9201082, 2040317, 400000, 0, 5), -(9201082, 2040321, 400000, 0, 6), -(9201082, 2040413, 400000, 0, 7), -(9201082, 2040418, 400000, 0, 8), -(9201082, 2040501, 250000, 0, 9), -(9201082, 2040513, 250000, 0, 10), -(9201082, 2040516, 250000, 0, 11), -(9201082, 2040532, 250000, 0, 12), -(9201082, 2040613, 400000, 0, 13), -(9201082, 2040701, 450000, 0, 14), -(9201082, 2040704, 450000, 0, 15), -(9201082, 2040804, 550000, 0, 16), -(9201082, 2040817, 550000, 0, 17), -(9201082, 2040914, 300000, 0, 18), -(9201082, 2040919, 300000, 0, 19), -(9201082, 2041013, 300000, 0, 20), -(9201082, 2041016, 300000, 0, 21), -(9201082, 2041019, 300000, 0, 22), -(9201082, 2041022, 300000, 0, 23), -(9201082, 2044901, 520000, 0, 24), -(9201082, 2044701, 520000, 0, 25), -(9201082, 2043001, 520000, 0, 26), -(9201082, 2043801, 520000, 0, 27), -(9201082, 2044601, 520000, 0, 28), -(9201082, 2040727, 50000, 0, 29), -(9201082, 2041058, 50000, 0, 30), -(9201082, 2040807, 1000000, 0, 31), -(9201082, 2040026, 15000, 0, 32), -(9201082, 2040031, 15000, 0, 33), -(9201082, 2040016, 15000, 0, 34), -(9201082, 2040302, 25000, 0, 35), -(9201082, 2040318, 25000, 0, 36), -(9201082, 2040323, 25000, 0, 37), -(9201082, 2040412, 20000, 0, 38), -(9201082, 2040419, 20000, 0, 39), -(9201082, 2040502, 25000, 0, 40), -(9201082, 2040514, 25000, 0, 41), -(9201082, 2040517, 25000, 0, 42), -(9201082, 2040534, 25000, 0, 43), -(9201082, 2040612, 20000, 0, 44), -(9201082, 2040702, 20000, 0, 45), -(9201082, 2040705, 25000, 0, 46), -(9201082, 2040805, 100000, 0, 47), -(9201082, 2040816, 100000, 0, 48), -(9201082, 2040915, 55000, 0, 49), -(9201082, 2040920, 55000, 0, 50), -(9201082, 2041014, 30000, 0, 51), -(9201082, 2041017, 30000, 0, 52), -(9201082, 2041020, 30000, 0, 53), -(9201082, 2041023, 30000, 0, 54), -(9201082, 2044902, 50000, 0, 55), -(9201082, 2044702, 50000, 0, 56), -(9201082, 2043002, 50000, 0, 57), -(9201082, 2043802, 50000, 0, 58), -(9201082, 2044602, 50000, 0, 59), -(9201082, 2049200, 170000, 0, 60), -(9201082, 2049201, 220000, 0, 61), -(9201082, 2049202, 170000, 0, 62), -(9201082, 2049203, 220000, 0, 63), -(9201082, 2049204, 170000, 0, 64), -(9201082, 2049205, 220000, 0, 65), -(9201082, 2049206, 170000, 0, 66), -(9201082, 2049207, 220000, 0, 67), -(9201082, 2049208, 140000, 0, 68), -(9201082, 2049209, 170000, 0, 69), -(9201082, 2049210, 140000, 0, 70), -(9201082, 2049211, 170000, 0, 71), -(9201082, 2070016, 120000000, 0, 72), -(9201082, 2070018, 190000000, 0, 73), -(9201082, 2030007, 1800000, 0, 74), -(9201082, 4001017, 60000000, 0, 75); +(9201082, 2040004, 500000, 0, 1), +(9201082, 2040025, 500000, 0, 2), +(9201082, 2040029, 500000, 0, 3), +(9201082, 2040017, 500000, 0, 4), +(9201082, 2040301, 400000, 0, 5), +(9201082, 2040317, 400000, 0, 6), +(9201082, 2040321, 400000, 0, 7), +(9201082, 2040413, 400000, 0, 8), +(9201082, 2040418, 400000, 0, 9), +(9201082, 2040501, 250000, 0, 10), +(9201082, 2040513, 250000, 0, 11), +(9201082, 2040516, 250000, 0, 12), +(9201082, 2040532, 250000, 0, 13), +(9201082, 2040613, 400000, 0, 14), +(9201082, 2040701, 450000, 0, 15), +(9201082, 2040704, 450000, 0, 16), +(9201082, 2040804, 550000, 0, 17), +(9201082, 2040817, 550000, 0, 18), +(9201082, 2040914, 300000, 0, 19), +(9201082, 2040919, 300000, 0, 20), +(9201082, 2041007, 300000, 0, 21), +(9201082, 2041010, 300000, 0, 22), +(9201082, 2041013, 300000, 0, 23), +(9201082, 2041016, 300000, 0, 24), +(9201082, 2041019, 300000, 0, 25), +(9201082, 2041022, 300000, 0, 26), +(9201082, 2044901, 520000, 0, 27), +(9201082, 2044701, 520000, 0, 28), +(9201082, 2043001, 520000, 0, 29), +(9201082, 2043801, 520000, 0, 30), +(9201082, 2044601, 520000, 0, 31), +(9201082, 2040727, 50000, 0, 32), +(9201082, 2041058, 50000, 0, 33), +(9201082, 2040807, 1000000, 0, 34), +(9201082, 2040005, 15000, 0, 35), +(9201082, 2040026, 15000, 0, 36), +(9201082, 2040031, 15000, 0, 37), +(9201082, 2040016, 15000, 0, 38), +(9201082, 2040302, 25000, 0, 39), +(9201082, 2040318, 25000, 0, 40), +(9201082, 2040323, 25000, 0, 41), +(9201082, 2040412, 20000, 0, 42), +(9201082, 2040419, 20000, 0, 43), +(9201082, 2040502, 25000, 0, 44), +(9201082, 2040514, 25000, 0, 45), +(9201082, 2040517, 25000, 0, 46), +(9201082, 2040534, 25000, 0, 47), +(9201082, 2040612, 20000, 0, 48), +(9201082, 2040702, 20000, 0, 49), +(9201082, 2040705, 25000, 0, 50), +(9201082, 2040805, 100000, 0, 51), +(9201082, 2040816, 100000, 0, 52), +(9201082, 2040915, 55000, 0, 53), +(9201082, 2040920, 55000, 0, 54), +(9201082, 2041008, 55000, 0, 55), +(9201082, 2041011, 55000, 0, 56), +(9201082, 2041014, 30000, 0, 57), +(9201082, 2041017, 30000, 0, 58), +(9201082, 2041020, 30000, 0, 59), +(9201082, 2041023, 30000, 0, 60), +(9201082, 2044902, 50000, 0, 61), +(9201082, 2044702, 50000, 0, 62), +(9201082, 2043002, 50000, 0, 63), +(9201082, 2043802, 50000, 0, 64), +(9201082, 2044602, 50000, 0, 65), +(9201082, 2049200, 170000, 0, 66), +(9201082, 2049201, 220000, 0, 67), +(9201082, 2049202, 170000, 0, 68), +(9201082, 2049203, 220000, 0, 69), +(9201082, 2049204, 170000, 0, 70), +(9201082, 2049205, 220000, 0, 71), +(9201082, 2049206, 170000, 0, 72), +(9201082, 2049207, 220000, 0, 73), +(9201082, 2049208, 140000, 0, 74), +(9201082, 2049209, 170000, 0, 75), +(9201082, 2049210, 140000, 0, 76), +(9201082, 2049211, 170000, 0, 77), +(9201082, 2040101, 540000, 0, 78), +(9201082, 2040100, 700000, 0, 79), +(9201082, 2040106, 540000, 0, 80), +(9201082, 2040105, 700000, 0, 81), +(9201082, 2040201, 540000, 0, 82), +(9201082, 2040200, 700000, 0, 83), +(9201082, 2040206, 540000, 0, 84), +(9201082, 2040205, 700000, 0, 85), +(9201082, 2070016, 120000000, 0, 86), +(9201082, 2070018, 190000000, 0, 87), +(9201082, 2030007, 1800000, 0, 88), +(9201082, 4001017, 60000000, 0, 89); -UPDATE shopitems SET price = 11*price WHERE (`position` >= 29 and `position` <= 71 and `shopid` = 9201082); +UPDATE shopitems SET price = 11*price WHERE (`position` >= 32 and `position` <= 77 and `shopid` = 9201082); INSERT IGNORE INTO `shopitems` (`shopid`, `itemid`, `price`, `pitch`, `position`) VALUES (1031100, 3010015, 20000, 0, 100), diff --git a/tools/MapleMobBookUpdate/lib/MonsterBook_updated.img.xml b/tools/MapleMobBookUpdate/lib/MonsterBook_updated.img.xml index 769ee2b18a..efa529f9a5 100644 --- a/tools/MapleMobBookUpdate/lib/MonsterBook_updated.img.xml +++ b/tools/MapleMobBookUpdate/lib/MonsterBook_updated.img.xml @@ -5050,6 +5050,7 @@ + @@ -5926,8 +5927,10 @@ - - + + + + @@ -6255,14 +6258,15 @@ - - - - - - - - + + + + + + + + + @@ -7086,18 +7090,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + @@ -7928,8 +7933,10 @@ - - + + + + @@ -7945,9 +7952,11 @@ - - - + + + + + @@ -7961,8 +7970,10 @@ - - + + + + @@ -7978,8 +7989,10 @@ - - + + + + @@ -8863,19 +8876,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -8969,17 +8983,18 @@ - - - - - - - - - - - + + + + + + + + + + + + @@ -9257,18 +9272,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + @@ -9794,19 +9810,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -9851,33 +9868,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10314,16 +10332,17 @@ - - - - - - - - - - + + + + + + + + + + + @@ -11077,24 +11096,25 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -11317,19 +11337,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -11360,23 +11381,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -11617,23 +11639,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -11759,26 +11782,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -11813,25 +11837,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -11877,10 +11903,14 @@ - - - - + + + + + + + + @@ -11913,23 +11943,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -11963,24 +11996,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -12121,27 +12157,30 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -12170,26 +12209,29 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -12226,29 +12268,32 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12286,24 +12331,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -12342,24 +12390,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -12651,31 +12702,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12712,27 +12769,33 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12766,16 +12829,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -12800,19 +12866,22 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -12837,18 +12906,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -12876,20 +12948,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -12918,18 +12993,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -12953,16 +13031,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -12987,17 +13068,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + + @@ -13023,16 +13107,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -13056,16 +13143,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -13083,21 +13173,25 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -13117,17 +13211,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + + @@ -13149,20 +13246,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -13184,21 +13284,24 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -13368,15 +13471,18 @@ - - - - - - - - - + + + + + + + + + + + + @@ -13590,7 +13696,10 @@ - + + + + @@ -13630,7 +13739,10 @@ - + + + + @@ -14109,8 +14221,15 @@ - - + + + + + + + + + diff --git a/wz/Item.wz/Etc/0400.img.xml b/wz/Item.wz/Etc/0400.img.xml index 8f04c3ae1d..8686e1453f 100644 --- a/wz/Item.wz/Etc/0400.img.xml +++ b/wz/Item.wz/Etc/0400.img.xml @@ -9642,6 +9642,7 @@ + diff --git a/wz/Quest.wz/Act.img.xml b/wz/Quest.wz/Act.img.xml index 4fa8dd54c8..d682607c59 100644 --- a/wz/Quest.wz/Act.img.xml +++ b/wz/Quest.wz/Act.img.xml @@ -17639,6 +17639,7 @@ + @@ -17789,6 +17790,12 @@ + + + + + + @@ -17844,6 +17851,12 @@ + + + + + + @@ -17872,6 +17885,12 @@ + + + + + + @@ -17900,6 +17919,12 @@ + + + + + + @@ -17928,6 +17953,12 @@ + + + + + + @@ -55905,7 +55936,7 @@ - + diff --git a/wz/Quest.wz/Check.img.xml b/wz/Quest.wz/Check.img.xml index 5e1bec506f..98a6cc7275 100644 --- a/wz/Quest.wz/Check.img.xml +++ b/wz/Quest.wz/Check.img.xml @@ -37084,6 +37084,12 @@ + + + + + + @@ -37120,6 +37126,12 @@ + + + + + + @@ -37156,6 +37168,12 @@ + + + + + + @@ -37192,6 +37210,12 @@ + + + + + + @@ -37228,6 +37252,12 @@ + + + + + + @@ -76642,7 +76672,7 @@ - + diff --git a/wz/Quest.wz/QuestInfo.img.xml b/wz/Quest.wz/QuestInfo.img.xml index bdc69bdfc8..8f8e4edea1 100644 --- a/wz/Quest.wz/QuestInfo.img.xml +++ b/wz/Quest.wz/QuestInfo.img.xml @@ -10317,7 +10317,7 @@ Able to proceed to 'For the peace of Victoria Island...' as next quest - + diff --git a/wz/Quest.wz/Say.img.xml b/wz/Quest.wz/Say.img.xml index 3fbc6c45a1..a397fb79d0 100644 --- a/wz/Quest.wz/Say.img.xml +++ b/wz/Quest.wz/Say.img.xml @@ -64785,7 +64785,7 @@ - + diff --git a/wz/String.wz/MonsterBook.img.xml b/wz/String.wz/MonsterBook.img.xml index 769ee2b18a..efa529f9a5 100644 --- a/wz/String.wz/MonsterBook.img.xml +++ b/wz/String.wz/MonsterBook.img.xml @@ -5050,6 +5050,7 @@ + @@ -5926,8 +5927,10 @@ - - + + + + @@ -6255,14 +6258,15 @@ - - - - - - - - + + + + + + + + + @@ -7086,18 +7090,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + @@ -7928,8 +7933,10 @@ - - + + + + @@ -7945,9 +7952,11 @@ - - - + + + + + @@ -7961,8 +7970,10 @@ - - + + + + @@ -7978,8 +7989,10 @@ - - + + + + @@ -8863,19 +8876,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -8969,17 +8983,18 @@ - - - - - - - - - - - + + + + + + + + + + + + @@ -9257,18 +9272,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + @@ -9794,19 +9810,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -9851,33 +9868,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10314,16 +10332,17 @@ - - - - - - - - - - + + + + + + + + + + + @@ -11077,24 +11096,25 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -11317,19 +11337,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -11360,23 +11381,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -11617,23 +11639,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -11759,26 +11782,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -11813,25 +11837,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -11877,10 +11903,14 @@ - - - - + + + + + + + + @@ -11913,23 +11943,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -11963,24 +11996,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -12121,27 +12157,30 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -12170,26 +12209,29 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -12226,29 +12268,32 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12286,24 +12331,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -12342,24 +12390,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -12651,31 +12702,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12712,27 +12769,33 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12766,16 +12829,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -12800,19 +12866,22 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -12837,18 +12906,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -12876,20 +12948,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -12918,18 +12993,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -12953,16 +13031,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -12987,17 +13068,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + + @@ -13023,16 +13107,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -13056,16 +13143,19 @@ - - - - - - - - - - + + + + + + + + + + + + + @@ -13083,21 +13173,25 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -13117,17 +13211,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + + @@ -13149,20 +13246,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -13184,21 +13284,24 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -13368,15 +13471,18 @@ - - - - - - - - - + + + + + + + + + + + + @@ -13590,7 +13696,10 @@ - + + + + @@ -13630,7 +13739,10 @@ - + + + + @@ -14109,8 +14221,15 @@ - - + + + + + + + + +