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

Rename and clean up MapleExpeditionType

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:00:48 +02:00
parent 5a6ed83545
commit 14344568f2
15 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/npc/2101014.js
View File

@@ -11,10 +11,10 @@ var arena;
var arenaName;
var type;
var map;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
var exped = MapleExpeditionType.ARIANT;
var exped1 = MapleExpeditionType.ARIANT1;
var exped2 = MapleExpeditionType.ARIANT2;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
var exped = ExpeditionType.ARIANT;
var exped1 = ExpeditionType.ARIANT1;
var exped2 = ExpeditionType.ARIANT2;
function start() {
status = -1;
@@ -103,17 +103,17 @@ function action(mode, type, selection) {
function fetchArenaType() {
switch (arenaType) {
case 0 :
exped = MapleExpeditionType.ARIANT;
exped = ExpeditionType.ARIANT;
expedicao = cm.getExpedition(exped);
map = 980010100;
break;
case 1 :
exped = MapleExpeditionType.ARIANT1;
exped = ExpeditionType.ARIANT1;
expedicao = cm.getExpedition(exped);
map = 980010200;
break;
case 2 :
exped = MapleExpeditionType.ARIANT2;
exped = ExpeditionType.ARIANT2;
expedicao = cm.getExpedition(exped);
map = 980010300;
break;
@@ -174,7 +174,7 @@ function enterArena(arenaPlayers) {
}
function playerAlreadyInLobby(player) {
return cm.getExpedition(MapleExpeditionType.ARIANT) != null && cm.getExpedition(MapleExpeditionType.ARIANT).contains(player) ||
cm.getExpedition(MapleExpeditionType.ARIANT1) != null && cm.getExpedition(MapleExpeditionType.ARIANT1).contains(player) ||
cm.getExpedition(MapleExpeditionType.ARIANT2) != null && cm.getExpedition(MapleExpeditionType.ARIANT2).contains(player);
return cm.getExpedition(ExpeditionType.ARIANT) != null && cm.getExpedition(ExpeditionType.ARIANT).contains(player) ||
cm.getExpedition(ExpeditionType.ARIANT1) != null && cm.getExpedition(ExpeditionType.ARIANT1).contains(player) ||
cm.getExpedition(ExpeditionType.ARIANT2) != null && cm.getExpedition(ExpeditionType.ARIANT2).contains(player);
}