Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client Timestamp update + Cosmetic NPCs & H Beacon patch + Log rework

Browse Source 
Fixed Music command not playing soundtracks at all.
Fixed stylish scripts stucking player NPC interactions in certain cases.
Reviewed client mistimed view on items, quest expirations, BBS threads, etc.
Fixed Homing Beacon skill provoking autoflag in mobs with same objectid in different maps.
Solved DB leak cases with removing pets from inventory.
Reviewed logging throughout the source, aiming to normalize the varied-spaced log content within the facilities.
Fixed a bug that would occur when trying to reaccess Horntail expedition.
This commit is contained in:
ronancpl
2019-01-07 12:10:41 -02:00
parent 35ea13420e
commit b47dd03a3e
110 changed files with 511 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/event/GuildQuest.js
View File

@@ -237,7 +237,7 @@ function changedMap(eim, player, mapid) {
function afterChangedMap(eim, player, mapid) {
if (mapid == 990000100) {
var texttt = "So, here is the brief. You guys should be warned that, once out on the fortress outskirts, anyone that would not be equipping the #b#t1032033##k will die instantly due to the deteriorated state of the air around there. That being said, once your team moves out, make sure to #bhit the glowing rocks#k in that region and #bequip the dropped item#k before advancing stages. That will protect you thoroughly from the air sickness. Good luck!";
player.getClient().announce(Packages.tools.MaplePacketCreator.getNPCTalk(9040000, /*(byte)*/ 0, texttt, "00 00", /*(byte)*/ 0));
player.getClient().getAbstractPlayerInteraction().npcTalk(9040000, texttt);
}
}

2
scripts/event/HorntailBattle.js
View File

@@ -88,7 +88,7 @@ function setEventRewards(eim) {
function afterSetup(eim) {}
function setup(channel) {
var eim = em.newInstance("Scarga" + channel);
var eim = em.newInstance("Horntail" + channel); // thanks Thora for reporting an issue with misleading event name here
eim.setProperty("canJoin", 1);
eim.setProperty("defeatedBoss", 0);
eim.setProperty("defeatedHead", 0);

2
scripts/event/OrbisPQ.js
View File

@@ -180,7 +180,7 @@ function playerEntry(eim, player) {
player.changeMap(map, map.getPortal(0));
var texttt = "Hi, my name is Eak, the Chamberlain of the Goddess. Don't be alarmed; you won't be able to see me right now. Back when the Goddess turned into a block of stone, I simultaneously lost my own power. If you gather up the power of the Magic Cloud of Orbis, however, then I'll be able to recover my body and re-transform back to my original self. Please collect #b20#k Magic Clouds and bring them back to me. Right now, you'll only see me as a tiny, flickering light.";
player.getClient().announce(Packages.tools.MaplePacketCreator.getNPCTalk(2013001, /*(byte)*/ 0, texttt, "00 00", /*(byte)*/ 0));
player.getClient().getAbstractPlayerInteraction().npcTalk(2013001, texttt);
}
function scheduledTimeout(eim) {

6
scripts/npc/1012104.js
View File

@@ -45,13 +45,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

7
scripts/npc/1012105.js
View File

@@ -32,14 +32,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && type > 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

7
scripts/npc/1012117.js
View File

@@ -48,14 +48,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && type > 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/1052004.js
View File

@@ -42,13 +42,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/1052005.js
View File

@@ -42,13 +42,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/1052100.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/1052101.js
View File

@@ -45,13 +45,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

4
scripts/npc/1101001.js
View File

@@ -8,8 +8,10 @@ importPackage(Packages.constants);
function start() {
if (cm.getPlayer().isCygnus() && GameConstants.getJobBranch(cm.getJob()) > 2) {
cm.useItem(2022458);
cm.sendOk("Let me cast you my blessings, my Knight. Please protect the world of Maple....");
} else {
cm.sendOk("Don't stop training. Every ounce of your energy is required to protect the world of Maple....");
}
cm.sendOk("Don't stop training. Every ounce of your energy is required to protect the world of Maple....");
cm.dispose();
}

6
scripts/npc/2010001.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2010002.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2012008.js
View File

@@ -31,13 +31,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2040019.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2041007.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2041009.js
View File

@@ -46,13 +46,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2041010.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2041013.js
View File

@@ -29,13 +29,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2090100.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2090101.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2090102.js
View File

@@ -32,13 +32,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2090103.js
View File

@@ -51,13 +51,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2090104.js
View File

@@ -51,13 +51,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

11
scripts/npc/2100005.js
View File

@@ -24,14 +24,13 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
if (type == 7) {
cm.sendNext("I guess you aren't ready to make the change yet. Let me know when you are!");
}
cm.dispose();
} else {
if (mode == 0 && status >= 0) {
cm.sendNext("I guess you aren't ready to make the change yet. Let me know when you are!");
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2100006.js
View File

@@ -24,13 +24,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status >= 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2100007.js
View File

@@ -13,13 +13,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status >= 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/2100008.js
View File

@@ -34,13 +34,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

11
scripts/npc/2100009.js
View File

@@ -34,14 +34,13 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
if (type == 7) {
cm.sendNext("I see...take your time, see if you really want it. Let me know when you make up your mind.");
}
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.sendNext("I see...take your time, see if you really want it. Let me know when you make up your mind.");
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9120100.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9120101.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9120102.js
View File

@@ -56,13 +56,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

5
scripts/npc/9200100.js
View File

@@ -50,15 +50,14 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status == 0)
cm.dispose();
if (mode == 1)
status++;
else
status--;
if (status == 0)
cm.sendSimple("Hi, there~! I'm Dr. Lenu, in charge of the cosmetic lenses here at the Henesys Plastic Surgery Shop! With #b#t5152010##k or #b#t5152013##k, you can let us take care of the rest and have the kind of beautiful look you've always craved~! Remember, the first thing everyone notices about you is the eyes, and we can help you find the cosmetic lens that most fits you! Now, what would you like to use?\r\n#L1#Cosmetic Lenses: #i5152010##t5152010##l\r\n#L2#Cosmetic Lenses: #i5152013##t5152013##l\r\n#L3#One-time Cosmetic Lenses: #i5152103# (any color)#l");
else if (status == 1) {

6
scripts/npc/9200101.js
View File

@@ -50,13 +50,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9200102.js
View File

@@ -50,13 +50,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201015.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201016.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201017.js
View File

@@ -50,13 +50,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201018.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201019.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

10
scripts/npc/9201039.js
View File

@@ -46,12 +46,12 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
if (type == 7) {
cm.sendNext("Ok, I'll give you a minute.");
}
cm.dispose();
} else if (mode == 0) {
cm.sendNext("Ok, I'll give you a minute.");
cm.dispose();
return;
}
status++;
if (status == 1) {

6
scripts/npc/9201061.js
View File

@@ -42,13 +42,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201062.js
View File

@@ -49,13 +49,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201063.js
View File

@@ -44,13 +44,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201064.js
View File

@@ -43,13 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

8
scripts/npc/9201065.js
View File

@@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Miranda
NLC Skin Change.
NLC Skin Change.
*/
var status = 0;
var price = 1000000;
@@ -31,13 +31,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201069.js
View File

@@ -42,13 +42,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9201070.js
View File

@@ -42,13 +42,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1) {
if (mode < 1) { // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
} else {
if (mode == 0 && status == 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

7
scripts/npc/9270023.js
View File

@@ -43,14 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status >= 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

7
scripts/npc/9270024.js
View File

@@ -43,14 +43,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode == -1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status >= 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

6
scripts/npc/9270025.js
View File

@@ -32,13 +32,9 @@ function start() {
}
function action(mode, type, selection) {
if (mode < 1)
if (mode < 1) // disposing issue with stylishs found thanks to Vcoc
cm.dispose();
else {
if (mode == 0 && status >= 0) {
cm.dispose();
return;
}
if (mode == 1)
status++;
else

2
scripts/quest/8185.js
View File

@@ -44,7 +44,7 @@ function end(mode, type, selection) {
return;
}
qm.sendNextPrev("#e#bHey, you did it!#n#k \r\n#rWow!#k Now I could complete my studies on your pet!");
qm.sendNext("#e#bHey, you did it!#n#k \r\n#rWow!#k Now I could complete my studies on your pet!");
} else if (status == 1) {
if (mode == 0) {
qm.sendOk("I see... Come back when you wish to do it. I'm really excited to do this.");