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

4
scripts/npc/1061014.js
View File

@@ -28,8 +28,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
const exped = MapleExpeditionType.BALROG_NORMAL;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
const exped = ExpeditionType.BALROG_NORMAL;
var expedName = "Balrog";
var expedBoss = "Balrog";
var expedMap = "Balrog's Tomb";

4
scripts/npc/2030013.js
View File

@@ -29,8 +29,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
const exped = MapleExpeditionType.ZAKUM;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
const exped = ExpeditionType.ZAKUM;
var expedName = "Zakum";
var expedBoss = "Zakum";
var expedMap = "Zakum's Altar";

4
scripts/npc/2083004.js
View File

@@ -29,8 +29,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
const exped = MapleExpeditionType.HORNTAIL;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
const exped = ExpeditionType.HORNTAIL;
var expedName = "Horntail";
var expedBoss = "mighty Horntail";

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);
}

14
scripts/npc/2101017.js
View File

@@ -10,7 +10,7 @@ var arena;
var arenaName;
var type;
var map;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
var exped;
var expedicao;
var expedMembers;
@@ -32,14 +32,14 @@ function action(mode, type, selection) {
const GameConstants = Java.type('constants.game.GameConstants');
if (cm.getPlayer().getMapId() == 980010100 || cm.getPlayer().getMapId() == 980010200 || cm.getPlayer().getMapId() == 980010300) {
if (cm.getPlayer().getMapId() == 980010100) {
exped = MapleExpeditionType.ARIANT;
exped = ExpeditionType.ARIANT;
expedicao = cm.getExpedition(exped);
} else if (cm.getPlayer().getMapId() == 980010200) {
exped = MapleExpeditionType.ARIANT1;
exped = ExpeditionType.ARIANT1;
expedicao = cm.getExpedition(exped);
} else {
exped = MapleExpeditionType.ARIANT2;
exped = ExpeditionType.ARIANT2;
expedicao = cm.getExpedition(exped);
}
@@ -116,13 +116,13 @@ function action(mode, type, selection) {
}
} else if (GameConstants.isAriantColiseumArena(cm.getPlayer().getMapId())) {
if (cm.getPlayer().getMapId() == 980010101) {
exped = MapleExpeditionType.ARIANT;
exped = ExpeditionType.ARIANT;
expedicao = cm.getExpedition(exped);
} else if (cm.getPlayer().getMapId() == 980010201) {
exped = MapleExpeditionType.ARIANT1;
exped = ExpeditionType.ARIANT1;
expedicao = cm.getExpedition(exped);
} else {
exped = MapleExpeditionType.ARIANT2;
exped = ExpeditionType.ARIANT2;
expedicao = cm.getExpedition(exped);
}
if (status == 0) {

4
scripts/npc/2141001.js
View File

@@ -31,8 +31,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
var exped = MapleExpeditionType.PINKBEAN;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
var exped = ExpeditionType.PINKBEAN;
var expedName = "Twilight of the Gods";
var expedBoss = "Pink Bean";
var expedMap = "Twilight of Gods";

4
scripts/npc/9120201.js
View File

@@ -28,8 +28,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
var exped = MapleExpeditionType.SHOWA;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
var exped = ExpeditionType.SHOWA;
var expedName = "Showa Gang";
var expedBoss = "The Boss";
var expedMap = "Nightmarish Last Days";

4
scripts/npc/9201113.js
View File

@@ -29,8 +29,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
var cwkpq = MapleExpeditionType.CWKPQ;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
var cwkpq = ExpeditionType.CWKPQ;
var list = "What would you like to do?#b\r\n\r\n#L1#View current Expedition members#l\r\n#L2#Start the fight!#l\r\n#L3#Stop the expedition.#l";
function start() {

4
scripts/npc/9270047.js
View File

@@ -29,8 +29,8 @@ var expedition;
var expedMembers;
var player;
var em;
const MapleExpeditionType = Java.type('server.expeditions.MapleExpeditionType');
var exped = MapleExpeditionType.SCARGA;
const ExpeditionType = Java.type('server.expeditions.ExpeditionType');
var exped = ExpeditionType.SCARGA;
var expedName = "Scarga";
var expedBoss = "Scarlion and Targa";
var expedMap = "Spooky World";