Reformat and clean up event scripts

This commit is contained in:
P0nk
2021-09-09 23:31:05 +02:00
parent 7be1d119de
commit a12feaf3e4
107 changed files with 7493 additions and 6977 deletions

View File

@@ -45,15 +45,19 @@ function init() {
} }
function cancelSchedule() { function cancelSchedule() {
if (timer1 != null) if (timer1 != null) {
timer1.cancel(true); timer1.cancel(true);
if (timer2 != null) }
if (timer2 != null) {
timer2.cancel(true); timer2.cancel(true);
if (timer3 != null) }
if (timer3 != null) {
timer3.cancel(true); timer3.cancel(true);
if (timer4 != null) }
if (timer4 != null) {
timer4.cancel(true); timer4.cancel(true);
} }
}
function start() { function start() {
const Server = Java.type('net.server.Server'); const Server = Java.type('net.server.Server');

View File

@@ -87,7 +87,9 @@ function clear(eim) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function monsterKilled(mob, eim) {} function monsterKilled(mob, eim) {}

View File

@@ -87,7 +87,9 @@ function clear(eim) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function monsterKilled(mob, eim) {} function monsterKilled(mob, eim) {}

View File

@@ -112,7 +112,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function clearPQ(eim) { function clearPQ(eim) {

View File

@@ -87,7 +87,9 @@ function clear(eim) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function monsterKilled(mob, eim) {} function monsterKilled(mob, eim) {}

View File

@@ -87,7 +87,9 @@ function clear(eim) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function monsterKilled(mob, eim) {} function monsterKilled(mob, eim) {}

View File

@@ -87,7 +87,9 @@ function clear(eim) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function monsterKilled(mob, eim) {} function monsterKilled(mob, eim) {}

View File

@@ -84,7 +84,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function clearPQ(eim) { function clearPQ(eim) {

View File

@@ -98,7 +98,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function clearPQ(eim) { function clearPQ(eim) {

View File

@@ -98,7 +98,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}

View File

@@ -51,15 +51,23 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n At least 1 of both genders"; reqStr += "\r\n At least 1 of both genders";
if(onlyMarriedPlayers) reqStr += "\r\n All married"; if (onlyMarriedPlayers) {
reqStr += "\r\n All married";
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -96,8 +104,12 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
if(!ch.getPlayer().isMarried()) hasNotMarried = true; hasLeader = true;
}
if (!ch.getPlayer().isMarried()) {
hasNotMarried = true;
}
eligible.push(ch); eligible.push(ch);
mask |= (1 << ch.getPlayer().getGender()); mask |= (1 << ch.getPlayer().getGender());
@@ -105,8 +117,12 @@ function getEligibleParty(party) { //selects, from the given party, the tea
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers && mask == 3)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers && mask == 3)) {
if(onlyMarriedPlayers && hasNotMarried) eligible = []; eligible = [];
}
if (onlyMarriedPlayers && hasNotMarried) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -193,8 +209,7 @@ function playerEntry(eim, player) {
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
if (eim.getIntProperty("statusStg6") == 1) { if (eim.getIntProperty("statusStg6") == 1) {
eim.warpEventTeam(exitMap); eim.warpEventTeam(exitMap);
} } else {
else {
end(eim); end(eim);
} }
} }
@@ -217,11 +232,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -236,27 +251,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -84,7 +84,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function clearPQ(eim) { function clearPQ(eim) {

View File

@@ -85,7 +85,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function clearPQ(eim) { function clearPQ(eim) {

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
const LifeFactory = Java.type('server.life.LifeFactory'); const LifeFactory = Java.type('server.life.LifeFactory');

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var herbGarden = em.getChannelServer().getMapFactory().getMap(251010102); var herbGarden = em.getChannelServer().getMapFactory().getMap(251010102);

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var royalCatthusDesert = em.getChannelServer().getMapFactory().getMap(260010201); var royalCatthusDesert = em.getChannelServer().getMapFactory().getMap(260010201);

View File

@@ -33,9 +33,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var bossMobid = 9400610; var bossMobid = 9400610;

View File

@@ -33,9 +33,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var bossMobid = 9400609; var bossMobid = 9400609;

View File

@@ -33,9 +33,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var bossMobid = 9400613; var bossMobid = 9400613;

View File

@@ -33,9 +33,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var bossMobid = 9400633; var bossMobid = 9400633;

View File

@@ -33,9 +33,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var bossMobid = 9400612; var bossMobid = 9400612;

View File

@@ -33,9 +33,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var bossMobid = 9400611; var bossMobid = 9400611;

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var dangeroudCroko1 = em.getChannelServer().getMapFactory().getMap(107000300); var dangeroudCroko1 = em.getChannelServer().getMapFactory().getMap(107000300);

View File

@@ -38,9 +38,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
const LifeFactory = Java.type('server.life.LifeFactory'); const LifeFactory = Java.type('server.life.LifeFactory');

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var theForestOfEvil1 = em.getChannelServer().getMapFactory().getMap(100040105); var theForestOfEvil1 = em.getChannelServer().getMapFactory().getMap(100040105);

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
const LifeFactory = Java.type('server.life.LifeFactory'); const LifeFactory = Java.type('server.life.LifeFactory');

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
const LifeFactory = Java.type('server.life.LifeFactory'); const LifeFactory = Java.type('server.life.LifeFactory');

View File

@@ -39,9 +39,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
if (hotSand.getMonsterById(5220001) != null) { if (hotSand.getMonsterById(5220001) != null) {

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var goblinForest2 = em.getChannelServer().getMapFactory().getMap(250010504); var goblinForest2 = em.getChannelServer().getMapFactory().getMap(250010504);

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var leviathansCanyon = em.getChannelServer().getMapFactory().getMap(240040401); var leviathansCanyon = em.getChannelServer().getMapFactory().getMap(240040401);

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var thicketAroundTheBeach3 = em.getChannelServer().getMapFactory().getMap(104000400); var thicketAroundTheBeach3 = em.getChannelServer().getMapFactory().getMap(104000400);

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var moonRidge = em.getChannelServer().getMapFactory().getMap(222010310); var moonRidge = em.getChannelServer().getMapFactory().getMap(222010310);

View File

@@ -37,9 +37,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var theSeaweedTower = em.getChannelServer().getMapFactory().getMap(230020100); var theSeaweedTower = em.getChannelServer().getMapFactory().getMap(230020100);

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var snackBarMap = em.getChannelServer().getMapFactory().getMap(105090310); var snackBarMap = em.getChannelServer().getMapFactory().getMap(105090310);

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var eastRockyMountain5 = em.getChannelServer().getMapFactory().getMap(101030404); var eastRockyMountain5 = em.getChannelServer().getMapFactory().getMap(101030404);

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var territoryOfWanderingBear = em.getChannelServer().getMapFactory().getMap(250010304); var territoryOfWanderingBear = em.getChannelServer().getMapFactory().getMap(250010304);

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var whirlpoolOfTime = em.getChannelServer().getMapFactory().getMap(220050100); var whirlpoolOfTime = em.getChannelServer().getMapFactory().getMap(220050100);

View File

@@ -36,9 +36,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var lostTime1 = em.getChannelServer().getMapFactory().getMap(220050000); var lostTime1 = em.getChannelServer().getMapFactory().getMap(220050000);

View File

@@ -37,9 +37,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var lostTime2 = em.getChannelServer().getMapFactory().getMap(220050200); var lostTime2 = em.getChannelServer().getMapFactory().getMap(220050200);

View File

@@ -35,9 +35,10 @@ function scheduleNew() {
} }
function cancelSchedule() { function cancelSchedule() {
if (setupTask != null) if (setupTask != null) {
setupTask.cancel(true); setupTask.cancel(true);
} }
}
function start() { function start() {
var graysPrairie = em.getChannelServer().getMapFactory().getMap(221040301); var graysPrairie = em.getChannelServer().getMapFactory().getMap(221040301);

View File

@@ -55,12 +55,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -96,13 +102,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -174,11 +184,11 @@ function changedMap(eim, player, mapid) {
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}
@@ -188,19 +198,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -55,12 +55,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -96,13 +102,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -174,11 +184,11 @@ function changedMap(eim, player, mapid) {
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}
@@ -188,19 +198,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -87,7 +87,9 @@ function playerDisconnected(eim, player) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid < minMapId || mapid > maxMapId) playerExit(eim, chr); if (mapid < minMapId || mapid > maxMapId) {
playerExit(eim, chr);
}
} }
function isBalrog(mob) { function isBalrog(mob) {
@@ -100,6 +102,7 @@ function monsterKilled(mob, eim) {
eim.spawnNpc(1061015, new Point(0, 115), mob.getMap()); eim.spawnNpc(1061015, new Point(0, 115), mob.getMap());
} }
} }
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return 1; return 1;
} }

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -110,13 +116,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -160,11 +170,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -179,26 +189,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
end(eim); end(eim);
else } else {
playerExit(eim, player); playerExit(eim, player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -115,7 +121,9 @@ function generateMapReactors(map) {
rndIndex.push(idx); rndIndex.push(idx);
} }
if(Object.keys(jobFound).length == 6) break; if (Object.keys(jobFound).length == 6) {
break;
}
} }
var toDeploy = []; var toDeploy = [];
@@ -129,7 +137,7 @@ function generateMapReactors(map) {
toDeploy.push(getNameFromList(rndIndex[6], ["4fake1a", "4skill2c", "4skill4e"])); toDeploy.push(getNameFromList(rndIndex[6], ["4fake1a", "4skill2c", "4skill4e"]));
toDeploy.push(getNameFromList(rndIndex[7], ["4fake0b", "4fake0d"])); toDeploy.push(getNameFromList(rndIndex[7], ["4fake0b", "4fake0d"]));
var toRandomize = new Array(); var toRandomize = [];
for (var i = 0; i < toDeploy.length; i++) { for (var i = 0; i < toDeploy.length; i++) {
var react = map.getReactorByName(toDeploy[i]); var react = map.getReactorByName(toDeploy[i]);
@@ -245,8 +253,7 @@ function changedMap(eim, player, mapid) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -301,8 +308,7 @@ function playerRevive(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -313,8 +319,7 @@ function playerDisconnected(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -163,11 +173,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -182,27 +192,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -250,7 +260,9 @@ function getDroppedQuantity(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
return;
}
var mapObj = mob.getMap(); var mapObj = mob.getMap();
const Item = Java.type('client.inventory.Item'); const Item = Java.type('client.inventory.Item');
@@ -259,7 +271,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -163,11 +173,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -182,27 +192,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -250,7 +260,9 @@ function getDroppedQuantity(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
return;
}
var mapObj = mob.getMap(); var mapObj = mob.getMap();
const Item = Java.type('client.inventory.Item'); const Item = Java.type('client.inventory.Item');
@@ -259,7 +271,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -163,11 +173,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -182,27 +192,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -250,7 +260,9 @@ function getDroppedQuantity(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
return;
}
var mapObj = mob.getMap(); var mapObj = mob.getMap();
const Item = Java.type('client.inventory.Item'); const Item = Java.type('client.inventory.Item');
@@ -259,7 +271,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -163,11 +173,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -182,27 +192,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -250,7 +260,9 @@ function getDroppedQuantity(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
return;
}
var mapObj = mob.getMap(); var mapObj = mob.getMap();
const Item = Java.type('client.inventory.Item'); const Item = Java.type('client.inventory.Item');
@@ -259,7 +271,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -163,11 +173,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -182,27 +192,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -250,7 +260,9 @@ function getDroppedQuantity(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
return;
}
var mapObj = mob.getMap(); var mapObj = mob.getMap();
const Item = Java.type('client.inventory.Item'); const Item = Java.type('client.inventory.Item');
@@ -259,7 +271,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -163,11 +173,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -182,27 +192,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -250,7 +260,9 @@ function getDroppedQuantity(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
return;
}
var mapObj = mob.getMap(); var mapObj = mob.getMap();
const Item = Java.type('client.inventory.Item'); const Item = Java.type('client.inventory.Item');
@@ -260,7 +272,8 @@ function monsterKilled(mob, eim) {
itemObj.setQuantity(getDroppedQuantity(mob)); itemObj.setQuantity(getDroppedQuantity(mob));
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}

View File

@@ -33,8 +33,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -50,11 +51,12 @@ function playerDisconnected(eim, player){
var party = eim.getPlayers(); var party = eim.getPlayers();
for (var i = 0; i < party.size(); i++) { for (var i = 0; i < party.size(); i++) {
if(party.get(i).equals(player)) if (party.get(i).equals(player)) {
removePlayer(eim, player); removePlayer(eim, player);
else } else {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
} }
}
eim.dispose(); eim.dispose();
} }

View File

@@ -49,12 +49,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -73,13 +79,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -130,11 +140,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -149,27 +159,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -79,7 +79,9 @@ function clear(eim) {
} }
function changedMap(eim, chr, mapid) { function changedMap(eim, chr, mapid) {
if(mapid != entryMap) playerExit(eim, chr); if (mapid != entryMap) {
playerExit(eim, chr);
}
} }
function cancelSchedule() {} function cancelSchedule() {}

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n For #rmagicians only#k."; reqStr += "\r\n For #rmagicians only#k.";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel && ch.getJob().getJobNiche() == 2) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel && ch.getJob().getJobNiche() == 2) {
if(ch.isLeader()) hasLeader = true; // magician niche only if (ch.isLeader()) {
hasLeader = true;
} // magician niche only
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -167,27 +177,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n For #radventurers only#k."; reqStr += "\r\n For #radventurers only#k.";
@@ -83,13 +89,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel && Math.floor(ch.getJob().getId() / 1000) == 0) { //only adventurers if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel && Math.floor(ch.getJob().getId() / 1000) == 0) { //only adventurers
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -121,7 +131,9 @@ function setup(level, lobbyid) {
function afterSetup(eim) {} function afterSetup(eim) {}
function respawnStg2(eim) { function respawnStg2(eim) {
if(!eim.getMapInstance(930000200).getPlayers().isEmpty()) eim.getMapInstance(930000200).instanceMapRespawn(); if (!eim.getMapInstance(930000200).getPlayers().isEmpty()) {
eim.getMapInstance(930000200).instanceMapRespawn();
}
eim.schedule("respawnStg2", 4 * 1000); eim.schedule("respawnStg2", 4 * 1000);
} }
@@ -130,11 +142,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -171,26 +183,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
end(eim); end(eim);
else } else {
playerExit(eim, player); playerExit(eim, player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -49,12 +49,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -73,13 +79,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -126,11 +136,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -145,27 +155,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -30,8 +30,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -47,10 +48,10 @@ function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return -1; return -1;
@@ -80,11 +81,11 @@ function changedMap(eim, player, mapid){
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function cancelSchedule() {} function cancelSchedule() {}

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n All members of the same guild"; reqStr += "\r\n All members of the same guild";
@@ -105,13 +111,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel && ch.getGuildId() == guildId) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel && ch.getGuildId() == guildId) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader)) eligible = []; if (!(hasLeader)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -228,11 +238,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) { if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function afterChangedMap(eim, player, mapid) { function afterChangedMap(eim, player, mapid) {
if (mapid == 990000100) { if (mapid == 990000100) {
@@ -256,8 +266,7 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) { if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) {
player.respawn(eim, exitMap); player.respawn(eim, exitMap);
end(eim); end(eim);
} } else {
else {
player.respawn(eim, exitMap); player.respawn(eim, exitMap);
} }
@@ -271,10 +280,10 @@ function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) { if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -1,6 +1,6 @@
var returnTo = new Array(200000141, 250000100); var returnTo = [200000141, 250000100];
var rideTo = new Array(250000100, 200000141); var rideTo = [250000100, 200000141];
var birdRide = new Array(200090300, 200090310); var birdRide = [200090300, 200090310];
var myRide; var myRide;
var returnMap; var returnMap;
var exitMap; var exitMap;

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -138,8 +148,7 @@ function scheduledTimeout(eim) {
if (eim.getProperty("1stageclear") != null) { if (eim.getProperty("1stageclear") != null) {
var curStage = 910010200, toStage = 910010400; var curStage = 910010200, toStage = 910010400;
eim.warpEventTeam(curStage, toStage); eim.warpEventTeam(curStage, toStage);
} } else {
else {
end(eim); end(eim);
} }
} }
@@ -167,11 +176,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -186,27 +195,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -103,13 +109,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -176,11 +186,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -195,27 +205,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -253,8 +263,9 @@ function isScrooge(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
else if(isScrooge(mob)) { return;
} else if (isScrooge(mob)) {
eim.giveEventPlayersStageReward(2 * eim.getIntProperty("level")); eim.giveEventPlayersStageReward(2 * eim.getIntProperty("level"));
eim.showClearEffect(); eim.showClearEffect();
eim.clearPQ(); eim.clearPQ();
@@ -280,7 +291,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
eim.setIntProperty("missingDrops", 0); eim.setIntProperty("missingDrops", 0);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}
@@ -320,7 +332,9 @@ function snowmanEvolve(eim, curLevel) {
} }
function snowmanSnack(eim) { function snowmanSnack(eim) {
if(eim.getIntProperty("snowmanLevel") >= 5) return; if (eim.getIntProperty("snowmanLevel") >= 5) {
return;
}
var step = eim.getIntProperty("snowmanStep"); var step = eim.getIntProperty("snowmanStep");
var snowmanLevel = eim.getIntProperty("snowmanLevel"); var snowmanLevel = eim.getIntProperty("snowmanLevel");
@@ -341,7 +355,9 @@ function snowmanSnack(eim) {
} }
function snowmanSnackFake(eim) { function snowmanSnackFake(eim) {
if(eim.getIntProperty("snowmanLevel") >= 5) return; if (eim.getIntProperty("snowmanLevel") >= 5) {
return;
}
var step = eim.getIntProperty("snowmanStep"); var step = eim.getIntProperty("snowmanStep");
if (step > 0) { if (step > 0) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -103,13 +109,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -176,11 +186,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -195,27 +205,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -253,8 +263,9 @@ function isScrooge(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
else if(isScrooge(mob)) { return;
} else if (isScrooge(mob)) {
eim.giveEventPlayersStageReward(2 * eim.getIntProperty("level")); eim.giveEventPlayersStageReward(2 * eim.getIntProperty("level"));
eim.showClearEffect(); eim.showClearEffect();
eim.clearPQ(); eim.clearPQ();
@@ -280,7 +291,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
eim.setIntProperty("missingDrops", 0); eim.setIntProperty("missingDrops", 0);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}
@@ -320,7 +332,9 @@ function snowmanEvolve(eim, curLevel) {
} }
function snowmanSnack(eim) { function snowmanSnack(eim) {
if(eim.getIntProperty("snowmanLevel") >= 5) return; if (eim.getIntProperty("snowmanLevel") >= 5) {
return;
}
var step = eim.getIntProperty("snowmanStep"); var step = eim.getIntProperty("snowmanStep");
var snowmanLevel = eim.getIntProperty("snowmanLevel"); var snowmanLevel = eim.getIntProperty("snowmanLevel");
@@ -341,7 +355,9 @@ function snowmanSnack(eim) {
} }
function snowmanSnackFake(eim) { function snowmanSnackFake(eim) {
if(eim.getIntProperty("snowmanLevel") >= 5) return; if (eim.getIntProperty("snowmanLevel") >= 5) {
return;
}
var step = eim.getIntProperty("snowmanStep"); var step = eim.getIntProperty("snowmanStep");
if (step > 0) { if (step > 0) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -103,13 +109,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -176,11 +186,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -195,27 +205,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -253,8 +263,9 @@ function isScrooge(mob) {
function monsterKilled(mob, eim) { function monsterKilled(mob, eim) {
try { try {
if(eim.isEventCleared()) return; if (eim.isEventCleared()) {
else if(isScrooge(mob)) { return;
} else if (isScrooge(mob)) {
eim.giveEventPlayersStageReward(2 * eim.getIntProperty("level")); eim.giveEventPlayersStageReward(2 * eim.getIntProperty("level"));
eim.showClearEffect(); eim.showClearEffect();
eim.clearPQ(); eim.clearPQ();
@@ -280,7 +291,8 @@ function monsterKilled(mob, eim) {
mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false); mapObj.spawnItemDrop(mob, dropper, itemObj, mob.getPosition(), true, false);
eim.setIntProperty("missingDrops", 0); eim.setIntProperty("missingDrops", 0);
} catch(err) {} // PQ not started yet } catch (err) {
} // PQ not started yet
} }
function allMonstersDead(eim) {} function allMonstersDead(eim) {}
@@ -320,7 +332,9 @@ function snowmanEvolve(eim, curLevel) {
} }
function snowmanSnack(eim) { function snowmanSnack(eim) {
if(eim.getIntProperty("snowmanLevel") >= 5) return; if (eim.getIntProperty("snowmanLevel") >= 5) {
return;
}
var step = eim.getIntProperty("snowmanStep"); var step = eim.getIntProperty("snowmanStep");
var snowmanLevel = eim.getIntProperty("snowmanLevel"); var snowmanLevel = eim.getIntProperty("snowmanLevel");
@@ -341,7 +355,9 @@ function snowmanSnack(eim) {
} }
function snowmanSnackFake(eim) { function snowmanSnackFake(eim) {
if(eim.getIntProperty("snowmanLevel") >= 5) return; if (eim.getIntProperty("snowmanLevel") >= 5) {
return;
}
var step = eim.getIntProperty("snowmanStep"); var step = eim.getIntProperty("snowmanStep");
if (step > 0) { if (step > 0) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -130,8 +136,7 @@ function changedMap(eim, player, mapid) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -147,8 +152,7 @@ function playerRevive(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -159,8 +163,7 @@ function playerDisconnected(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -161,11 +171,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -180,27 +190,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -147,11 +157,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -166,27 +176,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -1,6 +1,6 @@
var returnTo = new Array(103000100, 103000310); var returnTo = [103000100, 103000310];
var rideTo = new Array(103000310, 103000100); var rideTo = [103000310, 103000100];
var trainRide = new Array(103000301, 103000302); var trainRide = [103000301, 103000302];
var myRide; var myRide;
var returnMap; var returnMap;
var exitMap; var exitMap;

View File

@@ -25,8 +25,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -37,10 +38,10 @@ function playerDisconnected(eim, player){
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return -1; return -1;
@@ -70,11 +71,11 @@ function changedMap(eim, chr, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, chr)) { if (eim.isEventTeamLackingNow(true, minPlayers, chr)) {
eim.unregisterPlayer(chr); eim.unregisterPlayer(chr);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(chr); eim.unregisterPlayer(chr);
} }
} }
}
function cancelSchedule() {} function cancelSchedule() {}

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -146,11 +156,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -165,27 +175,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -150,11 +160,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -169,27 +179,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -160,8 +170,7 @@ function scheduledTimeout(eim) {
if (eim.getProperty("9stageclear") != null) { if (eim.getProperty("9stageclear") != null) {
var curStage = 922011000, toStage = 922011100; var curStage = 922011000, toStage = 922011100;
eim.warpEventTeam(curStage, toStage); eim.warpEventTeam(curStage, toStage);
} } else {
else {
end(eim); end(eim);
} }
} }
@@ -184,11 +193,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -203,27 +212,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -24,13 +24,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -79,8 +83,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -89,10 +94,10 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDead(eim, player) {} function playerDead(eim, player) {}
@@ -100,10 +105,10 @@ function playerDisconnected(eim, player){
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return -1; return -1;
@@ -133,11 +138,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function removePlayer(eim, player) { function removePlayer(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);

View File

@@ -24,13 +24,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -70,8 +74,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -80,10 +85,10 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDead(eim, player) {} function playerDead(eim, player) {}
@@ -91,10 +96,10 @@ function playerDisconnected(eim, player){
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return -1; return -1;
@@ -124,11 +129,11 @@ function changedMap(eim, chr, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function removePlayer(eim, player) { function removePlayer(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -288,9 +298,9 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
}
} else if (mapid == 926110203 && eim.getIntProperty("yuleteTimeout") == 0) { } else if (mapid == 926110203 && eim.getIntProperty("yuleteTimeout") == 0) {
eim.setIntProperty("yuleteTimeout", 1); eim.setIntProperty("yuleteTimeout", 1);
@@ -356,27 +366,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -414,8 +424,7 @@ function monsterKilled(mob, eim) {
eim.giveEventPlayersStageReward(2); eim.giveEventPlayersStageReward(2);
eim.setIntProperty("statusStg2", 1); eim.setIntProperty("statusStg2", 1);
} }
} } else if (map.getId() == 926110203 && eim.getIntProperty("statusStg1") == 1) {
else if(map.getId() == 926110203 && eim.getIntProperty("statusStg1") == 1) {
if (map.countMonsters() == 0) { if (map.countMonsters() == 0) {
eim.showClearEffect(); eim.showClearEffect();
eim.giveEventPlayersStageReward(5); eim.giveEventPlayersStageReward(5);

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -288,9 +298,9 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
}
} else if (mapid == 926100203 && eim.getIntProperty("yuleteTimeout") == 0) { } else if (mapid == 926100203 && eim.getIntProperty("yuleteTimeout") == 0) {
eim.setIntProperty("yuleteTimeout", 1); eim.setIntProperty("yuleteTimeout", 1);
@@ -356,27 +366,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -414,8 +424,7 @@ function monsterKilled(mob, eim) {
eim.giveEventPlayersStageReward(2); eim.giveEventPlayersStageReward(2);
eim.setIntProperty("statusStg2", 1); eim.setIntProperty("statusStg2", 1);
} }
} } else if (map.getId() == 926100203 && eim.getIntProperty("statusStg1") == 1) {
else if(map.getId() == 926100203 && eim.getIntProperty("statusStg1") == 1) {
if (map.countMonsters() == 0) { if (map.countMonsters() == 0) {
eim.showClearEffect(); eim.showClearEffect();
eim.giveEventPlayersStageReward(5); eim.giveEventPlayersStageReward(5);

View File

@@ -82,11 +82,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}
@@ -96,19 +96,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -34,8 +34,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -51,11 +52,12 @@ function playerDisconnected(eim, player){
var party = eim.getPlayers(); var party = eim.getPlayers();
for (var i = 0; i < party.size(); i++) { for (var i = 0; i < party.size(); i++) {
if(party.get(i).equals(player)) if (party.get(i).equals(player)) {
removePlayer(eim, player); removePlayer(eim, player);
else } else {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
} }
}
eim.dispose(); eim.dispose();
} }

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -186,8 +196,7 @@ function playerEntry(eim, player) {
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
if (eim.getIntProperty("statusStg8") == 1) { if (eim.getIntProperty("statusStg8") == 1) {
eim.warpEventTeam(920011300); eim.warpEventTeam(920011300);
} } else {
else {
end(eim); end(eim);
} }
} }
@@ -215,11 +224,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -234,27 +243,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}
@@ -162,19 +172,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) { if (eim.isExpeditionTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -131,8 +137,7 @@ function changedMap(eim, player, mapid) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the expedition."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the expedition.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -172,8 +177,7 @@ function playerDisconnected(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the expedition."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the expedition.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -83,13 +89,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -263,9 +273,9 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
}
} else { } else {
changedMapInside(eim, mapid); changedMapInside(eim, mapid);
} }
@@ -284,27 +294,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerExit(eim, player); playerExit(eim, player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {
@@ -341,7 +351,9 @@ function isLordPirate(mob) {
} }
function passedGrindMode(map, eim) { function passedGrindMode(map, eim) {
if(eim.getIntProperty("grindMode") == 0) return true; if (eim.getIntProperty("grindMode") == 0) {
return true;
}
return eim.activatedAllReactorsOnMap(map, 2511000, 2517999); return eim.activatedAllReactorsOnMap(map, 2511000, 2517999);
} }

View File

@@ -30,8 +30,9 @@ function playerEntry(eim, player){
function scheduledTimeout(eim) { function scheduledTimeout(eim) {
var party = eim.getPlayers(); var party = eim.getPlayers();
for(var i = 0; i < party.size(); i++) for (var i = 0; i < party.size(); i++) {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
}
eim.dispose(); eim.dispose();
} }
@@ -47,11 +48,12 @@ function playerDisconnected(eim, player){
var party = eim.getPlayers(); var party = eim.getPlayers();
for (var i = 0; i < party.size(); i++) { for (var i = 0; i < party.size(); i++) {
if(party.get(i).equals(player)) if (party.get(i).equals(player)) {
removePlayer(eim, player); removePlayer(eim, player);
else } else {
playerExit(eim, party.get(i)); playerExit(eim, party.get(i));
} }
}
eim.dispose(); eim.dispose();
} }

View File

@@ -29,12 +29,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -70,13 +76,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -156,19 +166,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -76,21 +76,21 @@ function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function changedMap(eim, player, mapid) { function changedMap(eim, player, mapid) {
if (mapid < minMapId || mapid > maxMapId) { if (mapid < minMapId || mapid > maxMapId) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return -1; return -1;

View File

@@ -76,21 +76,21 @@ function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function changedMap(eim, player, mapid) { function changedMap(eim, player, mapid) {
if (mapid < minMapId || mapid > maxMapId) { if (mapid < minMapId || mapid > maxMapId) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function monsterValue(eim, mobId) { function monsterValue(eim, mobId) {
return -1; return -1;

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -116,8 +122,7 @@ function changedMap(eim, player, mapid) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -133,8 +138,7 @@ function playerRevive(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -145,8 +149,7 @@ function playerDisconnected(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -123,8 +129,7 @@ function changedMap(eim, player, mapid) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -142,8 +147,7 @@ function playerRevive(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -154,8 +158,7 @@ function playerDisconnected(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -167,27 +177,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -167,27 +177,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -167,27 +177,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -167,27 +177,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -52,12 +52,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -93,13 +99,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -148,11 +158,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -167,27 +177,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -51,12 +51,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -92,13 +98,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -151,11 +161,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -170,27 +180,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -93,7 +93,9 @@ function setup(level, lobbyid) {
eim.initializeGiftItems(); eim.initializeGiftItems();
eim.getInstanceMap(680000400).resetPQ(level); eim.getInstanceMap(680000400).resetPQ(level);
if(eventBoss) spawnCakeBoss(eim); if (eventBoss) {
spawnCakeBoss(eim);
}
respawnStages(eim); respawnStages(eim);
eim.startEventTimer(eventTime * 60000); eim.startEventTimer(eventTime * 60000);
@@ -210,11 +212,11 @@ function changedMap(eim, player, mapid) {
if (isMarrying(eim, player)) { if (isMarrying(eim, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}
@@ -224,19 +226,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (isMarrying(eim, player)) { if (isMarrying(eim, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (isMarrying(eim, player)) { if (isMarrying(eim, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -93,7 +93,9 @@ function setup(level, lobbyid) {
eim.initializeGiftItems(); eim.initializeGiftItems();
eim.getInstanceMap(680000400).resetPQ(level); eim.getInstanceMap(680000400).resetPQ(level);
if(eventBoss) spawnCakeBoss(eim); if (eventBoss) {
spawnCakeBoss(eim);
}
respawnStages(eim); respawnStages(eim);
eim.startEventTimer(eventTime * 60000); eim.startEventTimer(eventTime * 60000);
@@ -211,11 +213,11 @@ function changedMap(eim, player, mapid) {
if (isMarrying(eim, player)) { if (isMarrying(eim, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) {} function changedLeader(eim, leader) {}
@@ -225,19 +227,19 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (isMarrying(eim, player)) { if (isMarrying(eim, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (isMarrying(eim, player)) { if (isMarrying(eim, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) {} function leftParty(eim, player) {}

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -118,8 +124,7 @@ function changedMap(eim, player, mapid) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -135,8 +140,7 @@ function playerRevive(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
@@ -147,8 +151,7 @@ function playerDisconnected(eim, player) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it."); eim.dropMessage(5, "[Expedition] Either the leader has quit the expedition or there is no longer the minimum number of members required to continue it.");
end(eim); end(eim);
} } else {
else {
eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance."); eim.dropMessage(5, "[Expedition] " + player.getName() + " has left the instance.");
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }

View File

@@ -50,12 +50,18 @@ function setEventRequirements() {
var reqStr = ""; var reqStr = "";
reqStr += "\r\n Number of players: "; reqStr += "\r\n Number of players: ";
if(maxPlayers - minPlayers >= 1) reqStr += minPlayers + " ~ " + maxPlayers; if (maxPlayers - minPlayers >= 1) {
else reqStr += minPlayers; reqStr += minPlayers + " ~ " + maxPlayers;
} else {
reqStr += minPlayers;
}
reqStr += "\r\n Level range: "; reqStr += "\r\n Level range: ";
if(maxLevel - minLevel >= 1) reqStr += minLevel + " ~ " + maxLevel; if (maxLevel - minLevel >= 1) {
else reqStr += minLevel; reqStr += minLevel + " ~ " + maxLevel;
} else {
reqStr += minLevel;
}
reqStr += "\r\n Time limit: "; reqStr += "\r\n Time limit: ";
reqStr += eventTime + " minutes"; reqStr += eventTime + " minutes";
@@ -91,13 +97,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) { if (ch.getMapId() == recruitMap && ch.getLevel() >= minLevel && ch.getLevel() <= maxLevel) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers && eligible.length <= maxPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }
@@ -177,11 +187,11 @@ function changedMap(eim, player, mapid) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
} }
}
function changedLeader(eim, leader) { function changedLeader(eim, leader) {
var mapid = leader.getMapId(); var mapid = leader.getMapId();
@@ -196,27 +206,27 @@ function playerRevive(eim, player) { // player presses ok on the death pop up.
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function playerDisconnected(eim, player) { function playerDisconnected(eim, player) {
if (eim.isEventTeamLackingNow(true, minPlayers, player)) { if (eim.isEventTeamLackingNow(true, minPlayers, player)) {
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
end(eim); end(eim);
} } else {
else
eim.unregisterPlayer(player); eim.unregisterPlayer(player);
} }
}
function leftParty(eim, player) { function leftParty(eim, player) {
if (eim.isEventTeamLackingNow(false, minPlayers, player)) { if (eim.isEventTeamLackingNow(false, minPlayers, player)) {
end(eim); end(eim);
} } else {
else
playerLeft(eim, player); playerLeft(eim, player);
} }
}
function disbandParty(eim) { function disbandParty(eim) {
if (!eim.isEventCleared()) { if (!eim.isEventCleared()) {

View File

@@ -23,13 +23,17 @@ function getEligibleParty(party) { //selects, from the given party, the tea
var ch = partyList[i]; var ch = partyList[i];
if (ch.getMapId() == 105090200 && ch.getLevel() >= 120) { if (ch.getMapId() == 105090200 && ch.getLevel() >= 120) {
if(ch.isLeader()) hasLeader = true; if (ch.isLeader()) {
hasLeader = true;
}
eligible.push(ch); eligible.push(ch);
} }
} }
} }
if(!(hasLeader && eligible.length >= minPlayers)) eligible = []; if (!(hasLeader && eligible.length >= minPlayers)) {
eligible = [];
}
return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]')); return Java.to(eligible, Java.type('net.server.world.PartyCharacter[]'));
} }