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

"Exp-party" Pi + Event script disabled on dispose + Personal loot fix

Browse Source 
Refactored event scripts, no longer triggering after the event is deemed disposed.
Added MCPQ access in Dimensional Doors.
Revised Crusader/Dawn Warrior's Combo Attack, no longer resetting orbs after recasting during active time.
Added 4th job advancement handing out Maple Warrior skill book.
Fixed several issues with not being able to collect drops within owned exclusivity time when back-and-forth changing maps.
Revised visual EXP gain. Players that participated most in the defeat of the mob has the gain displayed in white, else yellow, somewhat similar to GMS.
Fixed client not disconnecting properly after closing the game inside MTS/Cash Shop, leading to no update on account's login state.
Fixed wrongly inputted PIC in anti-multiclient system blocking accounts to login under the same IP.
Fixed parameterless command inputs counting as "one empty command".
This commit is contained in:
ronancpl
2019-04-04 14:02:15 -03:00
parent 0b6951527d
commit a15713dfa2
42 changed files with 344 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
scripts/event/GuardianNex.js
View File

@@ -3,6 +3,7 @@ var timeLimit = 15; //15 minutes
var eventTimer = 1000 * 60 * timeLimit;
var exitMap = 240070000;
var eventMap = 240070010;
var eventBossIds = [7120100, 7120101, 7120102, 8120100, 8120101, 8140510];
function init(){}
@@ -42,22 +43,27 @@ function playerRevive(eim, player){
function playerDead(eim, player){}
function playerDisconnected(eim, player){
var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++){
if(party.get(i).equals(player))
removePlayer(eim, player);
else
playerExit(eim, party.get(i));
}
eim.dispose();
function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
function monsterValue(eim, mobId){
return -1;
}
function end(eim) {
var party = eim.getPlayers();
for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i));
}
eim.dispose();
}
function leftParty(eim, player){}
function disbandParty(eim){}
@@ -69,28 +75,32 @@ function playerExit(eim, player){
player.changeMap(exitMap);
}
function changedMap(eim, player, mapId){
if(mapId != (eventMap + 10 * eim.getIntProperty("nex"))){
removePlayer(eim, player);
eim.stopEventTimer();
eim.setEventCleared();
eim.dispose();
}
}
function removePlayer(eim, player){
eim.unregisterPlayer(player);
player.getMap().removePlayer(player);
player.setMap(exitMap);
function changedMap(eim, player, mapid){
if (mapid != (eventMap + 10 * eim.getIntProperty("nex"))) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player);
end(eim);
}
else
eim.unregisterPlayer(player);
}
}
function cancelSchedule(){}
function dispose(){}
function clearPQ(eim){}
function clearPQ(eim){
eim.stopEventTimer();
eim.setEventCleared();
}
function monsterKilled(mob, eim){}
function monsterKilled(mob, eim){
if (mob.getId() == eventBossIds[eim.getIntProperty("nex")]) {
eim.showClearEffect();
eim.clearPQ();
}
}
function allMonstersDead(eim){}

2
scripts/npc/2042005.js
View File

@@ -6,7 +6,7 @@
**/
var cpqMinLvl = 51;
var cpqMaxLvl = 69;
var cpqMaxLvl = 70;
var cpqMinAmt = 2;
var cpqMaxAmt = 6;

31
scripts/npc/2081100.js
View File

@@ -59,19 +59,24 @@ function action(mode, type, selection) {
}
} else if(status == 1) {
if (mode >= 1 && cm.getJobId() % 100 % 10 != 2) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 112) {
cm.teachSkill(1121001, 0, 10, -1);
cm.teachSkill(1120004, 0, 10, -1);
cm.teachSkill(1121008, 0, 10, -1);
} else if(cm.getJobId() == 122) {
cm.teachSkill(1221001, 0, 10, -1);
cm.teachSkill(1220005, 0, 10, -1);
cm.teachSkill(1221009, 0, 10, -1);
} else if(cm.getJobId() == 132) {
cm.teachSkill(1321001, 0, 10, -1);
cm.teachSkill(1320005, 0, 10, -1);
cm.teachSkill(1321007, 0, 10, -1);
if (cm.canHold(2280003, 1)) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 112) {
cm.teachSkill(1121001, 0, 10, -1);
cm.teachSkill(1120004, 0, 10, -1);
cm.teachSkill(1121008, 0, 10, -1);
} else if(cm.getJobId() == 122) {
cm.teachSkill(1221001, 0, 10, -1);
cm.teachSkill(1220005, 0, 10, -1);
cm.teachSkill(1221009, 0, 10, -1);
} else if(cm.getJobId() == 132) {
cm.teachSkill(1321001, 0, 10, -1);
cm.teachSkill(1320005, 0, 10, -1);
cm.teachSkill(1321007, 0, 10, -1);
}
cm.gainItem(2280003, 1);
} else {
cm.sendOk("Please have one slot available on #bUSE#k inventory to receive a skill book.");
}
} else if(mode >= 0 && cm.getJobId() % 100 % 10 == 2) {
// TEMP until I can get the quest fixed...

31
scripts/npc/2081200.js
View File

@@ -60,19 +60,24 @@ function action(mode, type, selection) {
}
} else if(status == 1) {
if (mode >= 1 && cm.getJobId() % 100 % 10 != 2) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 212) {
cm.teachSkill(2121001, 0, 10, -1);
cm.teachSkill(2121002, 0, 10, -1);
cm.teachSkill(2121006, 0, 10, -1);
} else if(cm.getJobId() == 222) {
cm.teachSkill(2221001, 0, 10, -1);
cm.teachSkill(2221002, 0, 10, -1);
cm.teachSkill(2221006, 0, 10, -1);
} else if(cm.getJobId() == 232) {
cm.teachSkill(2321001, 0, 10, -1);
cm.teachSkill(2321002, 0, 10, -1);
cm.teachSkill(2321005, 0, 10, -1);
if (cm.canHold(2280003, 1)) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 212) {
cm.teachSkill(2121001, 0, 10, -1);
cm.teachSkill(2121002, 0, 10, -1);
cm.teachSkill(2121006, 0, 10, -1);
} else if(cm.getJobId() == 222) {
cm.teachSkill(2221001, 0, 10, -1);
cm.teachSkill(2221002, 0, 10, -1);
cm.teachSkill(2221006, 0, 10, -1);
} else if(cm.getJobId() == 232) {
cm.teachSkill(2321001, 0, 10, -1);
cm.teachSkill(2321002, 0, 10, -1);
cm.teachSkill(2321005, 0, 10, -1);
}
cm.gainItem(2280003, 1);
} else {
cm.sendOk("Please have one slot available on #bUSE#k inventory to receive a skill book.");
}
} else if( mode >= 1 && cm.getJobId() % 100 % 10 == 2) {
if(cm.getJobId() == 212) {

23
scripts/npc/2081300.js
View File

@@ -60,15 +60,20 @@ function action(mode, type, selection) {
}
} else if(status == 1) {
if (mode >= 1 && cm.getJobId() % 100 % 10 != 2) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 312) {
cm.teachSkill(3121002, 0, 10, -1);
cm.teachSkill(3120005, 0, 10, -1);
cm.teachSkill(3121007, 0, 10, -1);
} else if(cm.getJobId() == 322) {
cm.teachSkill(3221002, 0, 10, -1);
cm.teachSkill(3220004, 0, 10, -1);
cm.teachSkill(3221006, 0, 10, -1);
if (cm.canHold(2280003, 1)) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 312) {
cm.teachSkill(3121002, 0, 10, -1);
cm.teachSkill(3120005, 0, 10, -1);
cm.teachSkill(3121007, 0, 10, -1);
} else if(cm.getJobId() == 322) {
cm.teachSkill(3221002, 0, 10, -1);
cm.teachSkill(3220004, 0, 10, -1);
cm.teachSkill(3221006, 0, 10, -1);
}
cm.gainItem(2280003, 1);
} else {
cm.sendOk("Please have one slot available on #bUSE#k inventory to receive a skill book.");
}
} else if(mode >= 0 && cm.getJobId() % 100 % 10 == 2) {
if(cm.getJobId() == 312) {

23
scripts/npc/2081400.js
View File

@@ -60,15 +60,20 @@ function action(mode, type, selection) {
}
} else if(status == 1) {
if (mode >= 1 && cm.getJobId() % 100 % 10 != 2) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 412) {
cm.teachSkill(4120002, 0, 10, -1);
cm.teachSkill(4120005, 0, 10, -1);
cm.teachSkill(4121006, 0, 10, -1);
} else if(cm.getJobId() == 422) {
cm.teachSkill(4220002, 0, 10, -1);
cm.teachSkill(4220005, 0, 10, -1);
cm.teachSkill(4221007, 0, 10, -1);
if (cm.canHold(2280003, 1)) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 412) {
cm.teachSkill(4120002, 0, 10, -1);
cm.teachSkill(4120005, 0, 10, -1);
cm.teachSkill(4121006, 0, 10, -1);
} else if(cm.getJobId() == 422) {
cm.teachSkill(4220002, 0, 10, -1);
cm.teachSkill(4220005, 0, 10, -1);
cm.teachSkill(4221007, 0, 10, -1);
}
cm.gainItem(2280003, 1);
} else {
cm.sendOk("Please have one slot available on #bUSE#k inventory to receive a skill book.");
}
} else if(mode >= 1 && cm.getJobId() % 100 % 10 == 2) {
if(cm.getJobId() == 412) {

27
scripts/npc/2081500.js
View File

@@ -60,17 +60,22 @@ function action(mode, type, selection) {
}
} else if(status == 1) {
if (mode >= 1 && cm.getJobId() % 100 % 10 != 2) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 512) {
cm.teachSkill(5121001, 0, 10, -1);
cm.teachSkill(5121002, 0, 10, -1);
cm.teachSkill(5121007, 0, 10, -1);
cm.teachSkill(5121009, 0, 10, -1);
} else if(cm.getJobId() == 522) {
cm.teachSkill(5220001, 0, 10, -1);
cm.teachSkill(5220002, 0, 10, -1);
cm.teachSkill(5221004, 0, 10, -1);
cm.teachSkill(5220011, 0, 10, -1);
if (cm.canHold(2280003, 1)) {
cm.changeJobById(cm.getJobId() + 1);
if(cm.getJobId() == 512) {
cm.teachSkill(5121001, 0, 10, -1);
cm.teachSkill(5121002, 0, 10, -1);
cm.teachSkill(5121007, 0, 10, -1);
cm.teachSkill(5121009, 0, 10, -1);
} else if(cm.getJobId() == 522) {
cm.teachSkill(5220001, 0, 10, -1);
cm.teachSkill(5220002, 0, 10, -1);
cm.teachSkill(5221004, 0, 10, -1);
cm.teachSkill(5220011, 0, 10, -1);
}
cm.gainItem(2280003, 1);
} else {
cm.sendOk("Please have one slot available on #bUSE#k inventory to receive a skill book.");
}
} else if(mode >= 1 && cm.getJobId() % 100 % 10 == 2) {
if(cm.getJobId() == 512) {

4
scripts/npc/2100.js
View File

@@ -56,10 +56,10 @@ function action(mode, type, selection) {
cm.sendNext("It seems like you want to start your journey without taking the training program. Then, I will let you move on to the training ground. Be careful~");
}else if(status == 1){
cm.warp(1, 0);
dispose();
cm.dispose();
}else{
cm.warp(40000, 0);
dispose();
cm.dispose();
}
}else
if(status == 0)

7
scripts/npc/9010022.js
View File

@@ -33,14 +33,15 @@ function action(mode, type, selection) {
selStr += "#1# Mu Lung Dojo";
}
/*if (cm.getLevel() >= 30 && cm.getLevel() <= 50) { NOT IMPLEMENTED
if (cm.getLevel() >= 30 && cm.getLevel() <= 50) { // MC 1 & 2 recalled thanks to ---
selStr += "#2# Monster Carnival 1";
}
if (cm.getLevel() >= 51 && cm.getLevel() <= 70) { NOT IMPLEMENTED
if (cm.getLevel() >= 51 && cm.getLevel() <= 70) {
selStr += "#3# Monster Carnival 2";
}
/*
if (cm.getLevel() >= 40) { NOT IMPLEMENTED
selStr += "#5# Nett's Pyramid";
}
@@ -62,9 +63,11 @@ function action(mode, type, selection) {
cm.warp(925020000, 0);
break;
case 2:
cm.getPlayer().saveLocation("MONSTER_CARNIVAL");
cm.warp(980000000, 3);
break;
case 3:
cm.getPlayer().saveLocation("MONSTER_CARNIVAL");
cm.warp(980030000, 3);
break;
case 5:

6
scripts/quest/21401.js
View File

@@ -55,8 +55,14 @@ function end(mode, type, selection) {
qm.dispose();
return;
}
if (!qm.canHold(2280003, 1)) {
qm.sendOk("Hey, your #buse#k inventory is full. I need you to make at least 1 empty slot to complete this quest.");
qm.dispose();
return;
}
qm.gainItem(1142132, true);
qm.gainItem(2280003, 1);
qm.changeJobById(2112);
qm.completeQuest();

1
scripts/reactor/8091000.js
View File

@@ -28,4 +28,5 @@
function act(){
rm.spawnMonster(9400210, 2);
rm.spawnMonster(9400209, 2);
rm.mapMessage(5, "Some monsters are summoned.");
}

1
scripts/reactor/8091001.js
View File

@@ -28,4 +28,5 @@
function act(){
rm.spawnMonster(9400211, 2);
rm.spawnMonster(9400212, 2);
rm.mapMessage(5, "Some monsters are summoned.");
}

1
scripts/reactor/8091002.js
View File

@@ -28,4 +28,5 @@
function act(){
rm.spawnMonster(9400213, 2);
rm.spawnMonster(9400214, 2);
rm.mapMessage(5, "Some monsters are summoned.");
}

1
scripts/reactor/8091003.js
View File

@@ -28,4 +28,5 @@
function act(){
rm.spawnMonster(9400215, 2);
rm.spawnMonster(9400216, 2);
rm.mapMessage(5, "Some monsters are summoned.");
}

1
scripts/reactor/8091004.js
View File

@@ -28,4 +28,5 @@
function act(){
rm.spawnMonster(9400217, 2);
rm.spawnMonster(9400218, 2);
rm.mapMessage(5, "Some monsters are summoned.");
}