From 138689118299a7e696026d0a64f26ea346d12cdc Mon Sep 17 00:00:00 2001 From: ronancpl Date: Sun, 10 Dec 2017 11:11:16 -0200 Subject: [PATCH] Removed useless popup + 3rd job Cygnus revamp + droplimit command Removed the Stat Upgrade UI that would popup when leveling up to 15/20/25/30. Improved 3rd job advancement for Cygnus Knights, now working GMS-like. Added "droplimit" command. When issued, it will show to the player the current drop count on the map. --- docs/mychanges_ptbr.txt | 7 ++- scripts/map/onUserEnter/108010600.js | 30 ++++++++++++ scripts/map/onUserEnter/108010610.js | 30 ++++++++++++ scripts/map/onUserEnter/108010620.js | 30 ++++++++++++ scripts/map/onUserEnter/108010630.js | 30 ++++++++++++ scripts/map/onUserEnter/108010640.js | 30 ++++++++++++ scripts/npc/1104100.js | 70 ++++++++++++++++++++++++++++ scripts/npc/1104101.js | 70 ++++++++++++++++++++++++++++ scripts/npc/1104102.js | 70 ++++++++++++++++++++++++++++ scripts/npc/1104103.js | 70 ++++++++++++++++++++++++++++ scripts/npc/1104104.js | 70 ++++++++++++++++++++++++++++ scripts/npc/commands.js | 1 + scripts/portal/enterDisguise1.js | 21 +++++++-- scripts/portal/enterDisguise2.js | 25 +++------- scripts/portal/enterDisguise3.js | 23 ++++++--- scripts/portal/enterDisguise4.js | 23 ++++++--- scripts/portal/enterDisguise5.js | 25 ++++++++-- scripts/quest/20102.js | 4 +- scripts/quest/20103.js | 4 +- scripts/quest/20104.js | 4 +- scripts/quest/20105.js | 4 +- src/client/command/Commands.java | 10 ++++ src/server/maps/MapleMap.java | 4 ++ wz/UI.wz/UIWindow.img.xml | 16 +++---- 24 files changed, 614 insertions(+), 57 deletions(-) create mode 100644 scripts/map/onUserEnter/108010600.js create mode 100644 scripts/map/onUserEnter/108010610.js create mode 100644 scripts/map/onUserEnter/108010620.js create mode 100644 scripts/map/onUserEnter/108010630.js create mode 100644 scripts/map/onUserEnter/108010640.js create mode 100644 scripts/npc/1104100.js create mode 100644 scripts/npc/1104101.js create mode 100644 scripts/npc/1104102.js create mode 100644 scripts/npc/1104103.js create mode 100644 scripts/npc/1104104.js diff --git a/docs/mychanges_ptbr.txt b/docs/mychanges_ptbr.txt index 28e871fa07..e1ab506f35 100644 --- a/docs/mychanges_ptbr.txt +++ b/docs/mychanges_ptbr.txt @@ -713,4 +713,9 @@ Adicionado quests para a regi Nova ferramenta: MapleQuestMesoFetcher. Busca nos WZs por checagens perdidas em quests onde se precisa pagar uma certa quantia para completá-las. 07 Dezembro 2017, -Reatores que buscam itens no chão agora buscam por itens ao mudar de estado. \ No newline at end of file +Reatores que buscam itens no chão agora buscam por itens ao mudar de estado. +Corrigido 3o job de Cygnus. + +08 - 09 Dezembro 2017, +Removido UI que aponta erroneamente "Stat Upgrade" nos níveis 15, 20, 25 e 30. +Adicionado comando "droplimit", cuja funcionalidade é informar ao jogador a quantidade de drops no mapa em contraste com o limite permitido. \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010600.js b/scripts/map/onUserEnter/108010600.js new file mode 100644 index 0000000000..bec594dd1f --- /dev/null +++ b/scripts/map/onUserEnter/108010600.js @@ -0,0 +1,30 @@ +/* + 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 npcid = 1104100; +var spawnPos = new Packages.java.awt.Point(2830, 78); + +function start(ms) { + var mapobj = ms.getMap(); + + if(!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } +} \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010610.js b/scripts/map/onUserEnter/108010610.js new file mode 100644 index 0000000000..7a8c9f7041 --- /dev/null +++ b/scripts/map/onUserEnter/108010610.js @@ -0,0 +1,30 @@ +/* + 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 npcid = 1104101; +var spawnPos = new Packages.java.awt.Point(3395, -322); + +function start(ms) { + var mapobj = ms.getMap(); + + if(!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } +} \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010620.js b/scripts/map/onUserEnter/108010620.js new file mode 100644 index 0000000000..d97d335f9e --- /dev/null +++ b/scripts/map/onUserEnter/108010620.js @@ -0,0 +1,30 @@ +/* + 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 npcid = 1104102; +var spawnPos = new Packages.java.awt.Point(500, -522); + +function start(ms) { + var mapobj = ms.getMap(); + + if(!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } +} \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010630.js b/scripts/map/onUserEnter/108010630.js new file mode 100644 index 0000000000..6d5cce8b24 --- /dev/null +++ b/scripts/map/onUserEnter/108010630.js @@ -0,0 +1,30 @@ +/* + 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 npcid = 1104103; +var spawnPos = new Packages.java.awt.Point(-2263, -582); + +function start(ms) { + var mapobj = ms.getMap(); + + if(!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } +} \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010640.js b/scripts/map/onUserEnter/108010640.js new file mode 100644 index 0000000000..0d9205f2ed --- /dev/null +++ b/scripts/map/onUserEnter/108010640.js @@ -0,0 +1,30 @@ +/* + 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 npcid = 1104104; +var spawnPos = new Packages.java.awt.Point(372, 70); + +function start(ms) { + var mapobj = ms.getMap(); + + if(!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } +} \ No newline at end of file diff --git a/scripts/npc/1104100.js b/scripts/npc/1104100.js new file mode 100644 index 0000000000..d8f99a2232 --- /dev/null +++ b/scripts/npc/1104100.js @@ -0,0 +1,70 @@ +/* + 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 . +*/ + +importPackage(Packages.server.life); + +var npcid = 1104100; +var baseJob = 11; +var status; + +function start() { + status = -1; + action(1, 0, 0); +} + +function action(mode, type, selection) { + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && type > 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if(status == 0) { + if(Math.floor(cm.getJobId() / 100) != baseJob) { + cm.sendOk("Hello there, #h0#. Are you helping us finding the intruder? He is not in this area, I've already searched here."); + cm.dispose(); + return; + } + + cm.sendOk("Darn, you found me! Then, there's only one way out! Let's fight, like #rBlack Wings#k should!"); + } else if(status == 1) { + var mapobj = cm.getMap(); + var npcpos = mapobj.getMapObject(cm.getNpcObjectId()).getPosition(); + + spawnMob(npcpos.x, npcpos.y, 9001009, mapobj); + mapobj.destroyNPC(npcid); + cm.dispose(); + } + } +} + +function spawnMob(x, y, id, map) { + if(map.getMonsterById(id) != null) + return; + + var mob = MapleLifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(x, y)); +} \ No newline at end of file diff --git a/scripts/npc/1104101.js b/scripts/npc/1104101.js new file mode 100644 index 0000000000..56681fffea --- /dev/null +++ b/scripts/npc/1104101.js @@ -0,0 +1,70 @@ +/* + 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 . +*/ + +importPackage(Packages.server.life); + +var npcid = 1104101; +var baseJob = 12; +var status; + +function start() { + status = -1; + action(1, 0, 0); +} + +function action(mode, type, selection) { + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && type > 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if(status == 0) { + if(Math.floor(cm.getJobId() / 100) != baseJob) { + cm.sendOk("Hello there, #h0#. Are you helping us finding the intruder? He is not in this area, I've already searched here."); + cm.dispose(); + return; + } + + cm.sendOk("Darn, you found me! Then, there's only one way out! Let's fight, like #rBlack Wings#k should!"); + } else if(status == 1) { + var mapobj = cm.getMap(); + var npcpos = mapobj.getMapObject(cm.getNpcObjectId()).getPosition(); + + spawnMob(npcpos.x, npcpos.y, 9001009, mapobj); + mapobj.destroyNPC(npcid); + cm.dispose(); + } + } +} + +function spawnMob(x, y, id, map) { + if(map.getMonsterById(id) != null) + return; + + var mob = MapleLifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(x, y)); +} \ No newline at end of file diff --git a/scripts/npc/1104102.js b/scripts/npc/1104102.js new file mode 100644 index 0000000000..2eca8ed9c2 --- /dev/null +++ b/scripts/npc/1104102.js @@ -0,0 +1,70 @@ +/* + 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 . +*/ + +importPackage(Packages.server.life); + +var npcid = 1104102; +var baseJob = 13; +var status; + +function start() { + status = -1; + action(1, 0, 0); +} + +function action(mode, type, selection) { + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && type > 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if(status == 0) { + if(Math.floor(cm.getJobId() / 100) != baseJob) { + cm.sendOk("Hello there, #h0#. Are you helping us finding the intruder? He is not in this area, I've already searched here."); + cm.dispose(); + return; + } + + cm.sendOk("Darn, you found me! Then, there's only one way out! Let's fight, like #rBlack Wings#k should!"); + } else if(status == 1) { + var mapobj = cm.getMap(); + var npcpos = mapobj.getMapObject(cm.getNpcObjectId()).getPosition(); + + spawnMob(npcpos.x, npcpos.y, 9001009, mapobj); + mapobj.destroyNPC(npcid); + cm.dispose(); + } + } +} + +function spawnMob(x, y, id, map) { + if(map.getMonsterById(id) != null) + return; + + var mob = MapleLifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(x, y)); +} \ No newline at end of file diff --git a/scripts/npc/1104103.js b/scripts/npc/1104103.js new file mode 100644 index 0000000000..39ecef826e --- /dev/null +++ b/scripts/npc/1104103.js @@ -0,0 +1,70 @@ +/* + 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 . +*/ + +importPackage(Packages.server.life); + +var npcid = 1104103; +var baseJob = 14; +var status; + +function start() { + status = -1; + action(1, 0, 0); +} + +function action(mode, type, selection) { + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && type > 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if(status == 0) { + if(Math.floor(cm.getJobId() / 100) != baseJob) { + cm.sendOk("Hello there, #h0#. Are you helping us finding the intruder? He is not in this area, I've already searched here."); + cm.dispose(); + return; + } + + cm.sendOk("Darn, you found me! Then, there's only one way out! Let's fight, like #rBlack Wings#k should!"); + } else if(status == 1) { + var mapobj = cm.getMap(); + var npcpos = mapobj.getMapObject(cm.getNpcObjectId()).getPosition(); + + spawnMob(npcpos.x, npcpos.y, 9001009, mapobj); + mapobj.destroyNPC(npcid); + cm.dispose(); + } + } +} + +function spawnMob(x, y, id, map) { + if(map.getMonsterById(id) != null) + return; + + var mob = MapleLifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(x, y)); +} \ No newline at end of file diff --git a/scripts/npc/1104104.js b/scripts/npc/1104104.js new file mode 100644 index 0000000000..6ba011629b --- /dev/null +++ b/scripts/npc/1104104.js @@ -0,0 +1,70 @@ +/* + 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 . +*/ + +importPackage(Packages.server.life); + +var npcid = 1104104; +var baseJob = 15; +var status; + +function start() { + status = -1; + action(1, 0, 0); +} + +function action(mode, type, selection) { + if (mode == -1) { + cm.dispose(); + } else { + if (mode == 0 && type > 0) { + cm.dispose(); + return; + } + if (mode == 1) + status++; + else + status--; + + if(status == 0) { + if(Math.floor(cm.getJobId() / 100) != baseJob) { + cm.sendOk("Hello there, #h0#. Are you helping us finding the intruder? He is not in this area, I've already searched here."); + cm.dispose(); + return; + } + + cm.sendOk("Darn, you found me! Then, there's only one way out! Let's fight, like #rBlack Wings#k should!"); + } else if(status == 1) { + var mapobj = cm.getMap(); + var npcpos = mapobj.getMapObject(cm.getNpcObjectId()).getPosition(); + + spawnMob(npcpos.x, npcpos.y, 9001009, mapobj); + mapobj.destroyNPC(npcid); + cm.dispose(); + } + } +} + +function spawnMob(x, y, id, map) { + if(map.getMonsterById(id) != null) + return; + + var mob = MapleLifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(x, y)); +} \ No newline at end of file diff --git a/scripts/npc/commands.js b/scripts/npc/commands.js index 41b0f2ec40..502116b747 100644 --- a/scripts/npc/commands.js +++ b/scripts/npc/commands.js @@ -197,6 +197,7 @@ function writeSolaxiaCommandsLv0() { //Common desc_cursor = desc_lv0; addCommand("commands", ""); + addCommand("droplimit", ""); addCommand("time", ""); addCommand("credits", ""); addCommand("uptime", ""); diff --git a/scripts/portal/enterDisguise1.js b/scripts/portal/enterDisguise1.js index 28aac2d372..0e4f8bca3f 100644 --- a/scripts/portal/enterDisguise1.js +++ b/scripts/portal/enterDisguise1.js @@ -1,8 +1,6 @@ /* - This file is part of the OdinMS Maple Story Server - Copyright (C) 2008 Patrick Huy - Matthias Butz - Jan Christian Meyer + 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 @@ -24,9 +22,22 @@ Description: Takes you to Tino's Forest */ +var jobtype = 0; + function enter(pi) { if(pi.isQuestStarted(20301) || pi.isQuestStarted(20302) || pi.isQuestStarted(20303) || pi.isQuestStarted(20304) || pi.isQuestStarted(20305)) { - pi.warp(108010600, "out00"); + var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010600 + (10 * jobtype)); + if(map.countPlayers() > 0) { + pi.message("Someone else is already searching the area."); + return false; + } + + if(pi.haveItem(4032101 + jobtype, 1)) { + pi.message("You have already challenged the Master of Disguise, report your success to Neinheart."); + return false; + } + + pi.warp(108010600 + (10 * jobtype), "out00"); } else { pi.warp(130010010, "out00"); } diff --git a/scripts/portal/enterDisguise2.js b/scripts/portal/enterDisguise2.js index 61eaf8788e..088685a497 100644 --- a/scripts/portal/enterDisguise2.js +++ b/scripts/portal/enterDisguise2.js @@ -1,8 +1,6 @@ /* - This file is part of the OdinMS Maple Story Server - Copyright (C) 2008 Patrick Huy - Matthias Butz - Jan Christian Meyer + 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 @@ -24,33 +22,24 @@ Description: Takes you to Tiv's Forest */ -importPackage(Packages.server.life); +var jobtype = 1; function enter(pi) { if(pi.isQuestStarted(20301) || pi.isQuestStarted(20302) || pi.isQuestStarted(20303) || pi.isQuestStarted(20304) || pi.isQuestStarted(20305)) { - var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010610); + var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010600 + (10 * jobtype)); if(map.countPlayers() > 0) { - pi.message("Someone else is already challenging the Master of Disguise."); + pi.message("Someone else is already searching the area."); return false; } - if(pi.haveItem(4032101, 1)) { + if(pi.haveItem(4032101 + jobtype, 1)) { pi.message("You have already challenged the Master of Disguise, report your success to Neinheart."); return false; } - spawnMob(3345, -452, 9001009, map); - pi.warp(108010610, "out00"); + pi.warp(108010600 + (10 * jobtype), "out00"); } else { pi.warp(130010020, "out00"); } return true; } - -function spawnMob(x, y, id, map) { - if(map.getMonsterById(id) != null) - return; - - var mob = MapleLifeFactory.getMonster(id); - map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(x, y)); -} \ No newline at end of file diff --git a/scripts/portal/enterDisguise3.js b/scripts/portal/enterDisguise3.js index eaf7f4c41a..1a0b8c5589 100644 --- a/scripts/portal/enterDisguise3.js +++ b/scripts/portal/enterDisguise3.js @@ -1,8 +1,6 @@ /* - This file is part of the OdinMS Maple Story Server - Copyright (C) 2008 Patrick Huy - Matthias Butz - Jan Christian Meyer + 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 @@ -24,11 +22,24 @@ Description: Takes you to Timu's Forest */ +var jobtype = 2; + function enter(pi) { if(pi.isQuestStarted(20301) || pi.isQuestStarted(20302) || pi.isQuestStarted(20303) || pi.isQuestStarted(20304) || pi.isQuestStarted(20305)) { - pi.warp(108010620, "out00"); + var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010600 + (10 * jobtype)); + if(map.countPlayers() > 0) { + pi.message("Someone else is already searching the area."); + return false; + } + + if(pi.haveItem(4032101 + jobtype, 1)) { + pi.message("You have already challenged the Master of Disguise, report your success to Neinheart."); + return false; + } + + pi.warp(108010600 + (10 * jobtype), "out00"); } else { pi.warp(130010110, "out00"); } return true; -} \ No newline at end of file +} diff --git a/scripts/portal/enterDisguise4.js b/scripts/portal/enterDisguise4.js index 4098c211dd..bcd571a435 100644 --- a/scripts/portal/enterDisguise4.js +++ b/scripts/portal/enterDisguise4.js @@ -1,8 +1,6 @@ /* - This file is part of the OdinMS Maple Story Server - Copyright (C) 2008 Patrick Huy - Matthias Butz - Jan Christian Meyer + 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 @@ -24,11 +22,24 @@ Description: Takes you to Timu's Forest */ +var jobtype = 3; + function enter(pi) { if(pi.isQuestStarted(20301) || pi.isQuestStarted(20302) || pi.isQuestStarted(20303) || pi.isQuestStarted(20304) || pi.isQuestStarted(20305)) { - pi.warp(108010630, "out00"); + var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010600 + (10 * jobtype)); + if(map.countPlayers() > 0) { + pi.message("Someone else is already searching the area."); + return false; + } + + if(pi.haveItem(4032101 + jobtype, 1)) { + pi.message("You have already challenged the Master of Disguise, report your success to Neinheart."); + return false; + } + + pi.warp(108010600 + (10 * jobtype), "out00"); } else { pi.warp(130010120, "out00"); } return true; -} \ No newline at end of file +} diff --git a/scripts/portal/enterDisguise5.js b/scripts/portal/enterDisguise5.js index dbc5a5acee..8239d7f450 100644 --- a/scripts/portal/enterDisguise5.js +++ b/scripts/portal/enterDisguise5.js @@ -1,8 +1,6 @@ /* - This file is part of the OdinMS Maple Story Server - Copyright (C) 2008 Patrick Huy - Matthias Butz - Jan Christian Meyer + 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 @@ -24,7 +22,24 @@ Description: Takes you to Entrance to Drill Hall */ +var jobtype = 4; + function enter(pi) { - pi.warp(130020000, "east00"); + if(pi.isQuestStarted(20301) || pi.isQuestStarted(20302) || pi.isQuestStarted(20303) || pi.isQuestStarted(20304) || pi.isQuestStarted(20305)) { + var map = pi.getClient().getChannelServer().getMapFactory().getMap(108010600 + (10 * jobtype)); + if(map.countPlayers() > 0) { + pi.message("Someone else is already searching the area."); + return false; + } + + if(pi.haveItem(4032101 + jobtype, 1)) { + pi.message("You have already challenged the Master of Disguise, report your success to Neinheart."); + return false; + } + + pi.warp(108010600 + (10 * jobtype), "east00"); + } else { + pi.warp(130020000, "east00"); + } return true; } \ No newline at end of file diff --git a/scripts/quest/20102.js b/scripts/quest/20102.js index b97c20c89c..d377d73926 100644 --- a/scripts/quest/20102.js +++ b/scripts/quest/20102.js @@ -20,7 +20,7 @@ function end(mode, type, selection) { if (status == 0) { qm.sendYesNo("Have you made your decision? The decision will be final, so think carefully before deciding what to do. Are you sure you want to become a Flame Wizard?"); } else if (status == 1) { - qm.sendNext("I have just molded your body to make it perfect for a Soul Master. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); + qm.sendNext("I have just molded your body to make it perfect for a Flame Wizard. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); if (qm.getPlayer().getJob().getId() != 1200) { qm.gainItem(1372043, 1); qm.gainItem(1142066, 1); @@ -33,7 +33,7 @@ function end(mode, type, selection) { } else if (status == 3) { qm.sendNextPrev("I have also given you a hint of #bSP#k, so open the #bSkill Menu#k to acquire new skills. Of course, you can't raise them at all once, and there are some skills out there where you won't be able to acquire them unless you master the basic skills first."); } else if (status == 4) { - qm.sendNextPrev("Unlike your time as a Nobless, once you become the Soul Master, you will lost a portion of your EXP when you run out of HP, okay?"); + qm.sendNextPrev("Unlike your time as a Nobless, once you become the Flame Wizard, you will lost a portion of your EXP when you run out of HP, okay?"); } else if (status == 5) { qm.sendNextPrev("Now... I want you to go out there and show the world how the Knights of Cygnus operate."); qm.dispose(); diff --git a/scripts/quest/20103.js b/scripts/quest/20103.js index f08a2dee09..7a3b8f7db9 100644 --- a/scripts/quest/20103.js +++ b/scripts/quest/20103.js @@ -19,7 +19,7 @@ function end(mode, type, selection) { if (status == 0) { qm.sendYesNo("Have you made your decision? The decision will be final, so think carefully before deciding what to do. Are you sure you want to become a Wind Breaker?"); } else if (status == 1) { - qm.sendNext("I have just molded your body to make it perfect for a Soul Master. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); + qm.sendNext("I have just molded your body to make it perfect for a Wind Breaker. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); if (qm.getPlayer().getJob().getId() != 1300) { qm.gainItem(2060000, 2000); qm.gainItem(1452051, 1); @@ -33,7 +33,7 @@ function end(mode, type, selection) { } else if (status == 3) { qm.sendNextPrev("I have also given you a hint of #bSP#k, so open the #bSkill Menu#k to acquire new skills. Of course, you can't raise them at all once, and there are some skills out there where you won't be able to acquire them unless you master the basic skills first."); } else if (status == 4) { - qm.sendNextPrev("Unlike your time as a Nobless, once you become the Soul Master, you will lost a portion of your EXP when you run out of HP, okay?"); + qm.sendNextPrev("Unlike your time as a Nobless, once you become the Wind Breaker, you will lost a portion of your EXP when you run out of HP, okay?"); } else if (status == 5) { qm.sendNextPrev("Now... I want you to go out there and show the world how the Knights of Cygnus operate."); qm.dispose(); diff --git a/scripts/quest/20104.js b/scripts/quest/20104.js index 48d4aaec31..004f4e4d6b 100644 --- a/scripts/quest/20104.js +++ b/scripts/quest/20104.js @@ -19,7 +19,7 @@ function end(mode, type, selection) { if (status == 0) { qm.sendYesNo("Have you made your decision? The decision will be final, so think carefully before deciding what to do. Are you sure you want to become a Night Walker?"); } else if (status == 1) { - qm.sendNext("I have just molded your body to make it perfect for a Soul Master. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); + qm.sendNext("I have just molded your body to make it perfect for a Night Walker. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); if (qm.getPlayer().getJob().getId() != 1400) { qm.gainItem(1472061, 1); qm.gainItem(2070015, 800); @@ -34,7 +34,7 @@ function end(mode, type, selection) { } else if (status == 3) { qm.sendNextPrev("I have also given you a hint of #bSP#k, so open the #bSkill Menu#k to acquire new skills. Of course, you can't raise them at all once, and there are some skills out there where you won't be able to acquire them unless you master the basic skills first."); } else if (status == 4) { - qm.sendNextPrev("Unlike your time as a Nobless, once you become the Soul Master, you will lost a portion of your EXP when you run out of HP, okay?"); + qm.sendNextPrev("Unlike your time as a Nobless, once you become the Night Walker, you will lost a portion of your EXP when you run out of HP, okay?"); } else if (status == 5) { qm.sendNextPrev("Now... I want you to go out there and show the world how the Knights of Cygnus operate."); qm.dispose(); diff --git a/scripts/quest/20105.js b/scripts/quest/20105.js index 0c3dbda648..8da03e22f2 100644 --- a/scripts/quest/20105.js +++ b/scripts/quest/20105.js @@ -20,7 +20,7 @@ function end(mode, type, selection) { if (status == 0) { qm.sendYesNo("Have you made your decision? The decision will be final, so think carefully before deciding what to do. Are you sure you want to become a Striker?"); } else if (status == 1) { - qm.sendNext("I have just molded your body to make it perfect for a Soul Master. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); + qm.sendNext("I have just molded your body to make it perfect for a Striker. If you wish to become more powerful, use Stat Window (S) to raise the appropriate stats. If you aren't sure what to raise, just click on #bAuto#k."); if (qm.getPlayer().getJob().getId() != 1500) { qm.gainItem(1482014, 1); qm.gainItem(1142066, 1); @@ -33,7 +33,7 @@ function end(mode, type, selection) { } else if (status == 3) { qm.sendNextPrev("I have also given you a hint of #bSP#k, so open the #bSkill Menu#k to acquire new skills. Of course, you can't raise them at all once, and there are some skills out there where you won't be able to acquire them unless you master the basic skills first."); } else if (status == 4) { - qm.sendNextPrev("Unlike your time as a Nobless, once you become the Soul Master, you will lost a portion of your EXP when you run out of HP, okay?"); + qm.sendNextPrev("Unlike your time as a Nobless, once you become the Striker, you will lost a portion of your EXP when you run out of HP, okay?"); } else if (status == 5) { qm.sendNextPrev("Now... I want you to go out there and show the world how the Knights of Cygnus operate."); qm.dispose(); diff --git a/src/client/command/Commands.java b/src/client/command/Commands.java index 5ea54bb05e..d219193b83 100644 --- a/src/client/command/Commands.java +++ b/src/client/command/Commands.java @@ -352,6 +352,16 @@ public class Commands { c.getAbstractPlayerInteraction().openNpc(9201143, "commands"); break; + case "droplimit": + int dropCount = c.getPlayer().getMap().getDroppedItemCount(); + if(((float) dropCount) / ServerConstants.ITEM_LIMIT_ON_MAP < 0.75f) { + c.getPlayer().showHint("Current drop count: #b" + dropCount + "#k / #e" + ServerConstants.ITEM_LIMIT_ON_MAP + "#n"); + } else { + c.getPlayer().showHint("Current drop count: #r" + dropCount + "#k / #e" + ServerConstants.ITEM_LIMIT_ON_MAP + "#n"); + } + + break; + case "time": DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); dateFormat.setTimeZone(TimeZone.getTimeZone(ServerConstants.TIMEZONE)); diff --git a/src/server/maps/MapleMap.java b/src/server/maps/MapleMap.java index 43e36a1bfb..744ce68a0a 100644 --- a/src/server/maps/MapleMap.java +++ b/src/server/maps/MapleMap.java @@ -704,6 +704,10 @@ public class MapleMap { } } + public int getDroppedItemCount() { + return droppedItemCount.get(); + } + private void instantiateItemDrop(MapleMapItem mdrop) { if(droppedItemCount.get() >= ServerConstants.ITEM_LIMIT_ON_MAP) { MapleMapObject mapobj; diff --git a/wz/UI.wz/UIWindow.img.xml b/wz/UI.wz/UIWindow.img.xml index 59852cb19f..9e64ba19aa 100644 --- a/wz/UI.wz/UIWindow.img.xml +++ b/wz/UI.wz/UIWindow.img.xml @@ -19066,32 +19066,32 @@ - - - - - + - + - + - + + + + +