From 14344568f23c5bd71a5c391bb36b22d7a148c334 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:00:48 +0200 Subject: [PATCH] Rename and clean up MapleExpeditionType --- scripts/npc/1061014.js | 4 +- scripts/npc/2030013.js | 4 +- scripts/npc/2083004.js | 4 +- scripts/npc/2101014.js | 20 ++++----- scripts/npc/2101017.js | 14 +++---- scripts/npc/2141001.js | 4 +- scripts/npc/9120201.js | 4 +- scripts/npc/9201113.js | 4 +- scripts/npc/9270047.js | 4 +- src/main/java/net/server/channel/Channel.java | 10 ++--- .../scripting/AbstractPlayerInteraction.java | 12 +++--- .../scripting/npc/NPCConversationManager.java | 4 +- .../java/server/expeditions/Expedition.java | 8 ++-- ...xpeditionType.java => ExpeditionType.java} | 42 +++++++++---------- .../server/partyquest/AriantColiseum.java | 12 +++--- 15 files changed, 74 insertions(+), 76 deletions(-) rename src/main/java/server/expeditions/{MapleExpeditionType.java => ExpeditionType.java} (78%) diff --git a/scripts/npc/1061014.js b/scripts/npc/1061014.js index cc4410d375..20be342e85 100644 --- a/scripts/npc/1061014.js +++ b/scripts/npc/1061014.js @@ -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"; diff --git a/scripts/npc/2030013.js b/scripts/npc/2030013.js index b0ab2e5c5d..4770881445 100644 --- a/scripts/npc/2030013.js +++ b/scripts/npc/2030013.js @@ -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"; diff --git a/scripts/npc/2083004.js b/scripts/npc/2083004.js index 3d95f72be4..5c7d0f7ef0 100644 --- a/scripts/npc/2083004.js +++ b/scripts/npc/2083004.js @@ -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"; diff --git a/scripts/npc/2101014.js b/scripts/npc/2101014.js index cf2588b614..59dec9e986 100644 --- a/scripts/npc/2101014.js +++ b/scripts/npc/2101014.js @@ -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); } \ No newline at end of file diff --git a/scripts/npc/2101017.js b/scripts/npc/2101017.js index 27302f3aa6..1741dfb41b 100644 --- a/scripts/npc/2101017.js +++ b/scripts/npc/2101017.js @@ -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) { diff --git a/scripts/npc/2141001.js b/scripts/npc/2141001.js index 2e94159166..4e2785fbdc 100644 --- a/scripts/npc/2141001.js +++ b/scripts/npc/2141001.js @@ -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"; diff --git a/scripts/npc/9120201.js b/scripts/npc/9120201.js index 38b8e6d57f..90d4d67821 100644 --- a/scripts/npc/9120201.js +++ b/scripts/npc/9120201.js @@ -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"; diff --git a/scripts/npc/9201113.js b/scripts/npc/9201113.js index 21f6bfaca5..3164a0babf 100644 --- a/scripts/npc/9201113.js +++ b/scripts/npc/9201113.js @@ -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() { diff --git a/scripts/npc/9270047.js b/scripts/npc/9270047.js index c7cc73c902..d70ec6468a 100644 --- a/scripts/npc/9270047.js +++ b/scripts/npc/9270047.js @@ -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"; diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index a7ef234f13..777ef54b61 100644 --- a/src/main/java/net/server/channel/Channel.java +++ b/src/main/java/net/server/channel/Channel.java @@ -45,7 +45,7 @@ import scripting.event.EventScriptManager; import server.TimerManager; import server.events.gm.Event; import server.expeditions.Expedition; -import server.expeditions.MapleExpeditionType; +import server.expeditions.ExpeditionType; import server.maps.*; import tools.PacketCreator; import tools.Pair; @@ -73,9 +73,9 @@ public final class Channel { private Map hiredMerchants = new HashMap<>(); private final Map storedVars = new HashMap<>(); private Set playersAway = new HashSet<>(); - private Map expeditions = new HashMap<>(); + private Map expeditions = new HashMap<>(); private Map dungeons = new HashMap<>(); - private List expedType = new ArrayList<>(); + private List expedType = new ArrayList<>(); private Set ownedMaps = Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>())); private Event event; private boolean finishedShutdown = false; @@ -119,7 +119,7 @@ public final class Channel { try { this.channelServer = initServer(port, world, channel); - expedType.addAll(Arrays.asList(MapleExpeditionType.values())); + expedType.addAll(Arrays.asList(ExpeditionType.values())); if (Server.getInstance().isOnline()) { // postpone event loading to improve boot time... thanks Riizade, daronhudson for noticing slow startup times eventSM = new EventScriptManager(this, getEvents()); @@ -416,7 +416,7 @@ public final class Channel { } } - public Expedition getExpedition(MapleExpeditionType type) { + public Expedition getExpedition(ExpeditionType type) { return expeditions.get(type); } diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index b91465d0b7..e6ba14bba5 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -40,7 +40,7 @@ import server.MapleItemInformationProvider; import server.MapleMarriage; import server.expeditions.Expedition; import server.expeditions.ExpeditionBossLog; -import server.expeditions.MapleExpeditionType; +import server.expeditions.ExpeditionType; import server.life.*; import server.maps.MapleMap; import server.maps.MapleMapObject; @@ -1067,11 +1067,11 @@ public class AbstractPlayerInteraction { return (Pyramid) getPlayer().getPartyQuest(); } - public int createExpedition(MapleExpeditionType type) { + public int createExpedition(ExpeditionType type) { return createExpedition(type, false, 0, 0); } - public int createExpedition(MapleExpeditionType type, boolean silent, int minPlayers, int maxPlayers) { + public int createExpedition(ExpeditionType type, boolean silent, int minPlayers, int maxPlayers) { Character player = getPlayer(); Expedition exped = new Expedition(player, type, silent, minPlayers, maxPlayers); @@ -1092,11 +1092,11 @@ public class AbstractPlayerInteraction { exped.removeChannelExpedition(getPlayer().getClient().getChannelServer()); } - public Expedition getExpedition(MapleExpeditionType type) { + public Expedition getExpedition(ExpeditionType type) { return getPlayer().getClient().getChannelServer().getExpedition(type); } - public String getExpeditionMemberNames(MapleExpeditionType type) { + public String getExpeditionMemberNames(ExpeditionType type) { String members = ""; Expedition exped = getExpedition(type); for (String memberName : exped.getMembers().values()) { @@ -1105,7 +1105,7 @@ public class AbstractPlayerInteraction { return members; } - public boolean isLeaderExpedition(MapleExpeditionType type) { + public boolean isLeaderExpedition(ExpeditionType type) { Expedition exped = getExpedition(type); return exped.isLeader(getPlayer()); } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index 56fe988367..5d2dc8815d 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -46,7 +46,7 @@ import server.*; import server.MapleSkillbookInformationProvider.SkillBookEntry; import server.events.gm.Event; import server.expeditions.Expedition; -import server.expeditions.MapleExpeditionType; +import server.expeditions.ExpeditionType; import server.gachapon.MapleGachapon; import server.gachapon.MapleGachapon.MapleGachaponItem; import server.life.MapleLifeFactory; @@ -1024,7 +1024,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { return true; } - public String startAriantBattle(MapleExpeditionType expedType, int mapid) { + public String startAriantBattle(ExpeditionType expedType, int mapid) { if (!GameConstants.isAriantColiseumLobby(mapid)) { return "You cannot start an Ariant tournament from outside the Battle Arena Entrance."; } diff --git a/src/main/java/server/expeditions/Expedition.java b/src/main/java/server/expeditions/Expedition.java index d85dec7777..be7efdf806 100644 --- a/src/main/java/server/expeditions/Expedition.java +++ b/src/main/java/server/expeditions/Expedition.java @@ -81,7 +81,7 @@ public class Expedition { }; private final Character leader; - private final MapleExpeditionType type; + private final ExpeditionType type; private boolean registering; private final MapleMap startMap; private final List bossLogs; @@ -95,7 +95,7 @@ public class Expedition { private final int maxSize; private final MonitoredReentrantLock pL = MonitoredReentrantLockFactory.createLock(MonitoredLockType.EIM_PARTY, true); - public Expedition(Character player, MapleExpeditionType met, boolean sil, int minPlayers, int maxPlayers) { + public Expedition(Character player, ExpeditionType met, boolean sil, int minPlayers, int maxPlayers) { leader = player; members.put(player.getId(), player.getName()); startMap = player.getMap(); @@ -252,7 +252,7 @@ public class Expedition { if (!silent) { player.dropMessage(6, "[Expedition] You have been banned from this expedition."); } - if (MapleExpeditionType.ARIANT.equals(type) || MapleExpeditionType.ARIANT1.equals(type) || MapleExpeditionType.ARIANT2.equals(type)) { + if (ExpeditionType.ARIANT.equals(type) || ExpeditionType.ARIANT1.equals(type) || ExpeditionType.ARIANT2.equals(type)) { player.changeMap(980010000); } } @@ -287,7 +287,7 @@ public class Expedition { } } - public MapleExpeditionType getType() { + public ExpeditionType getType() { return type; } diff --git a/src/main/java/server/expeditions/MapleExpeditionType.java b/src/main/java/server/expeditions/ExpeditionType.java similarity index 78% rename from src/main/java/server/expeditions/MapleExpeditionType.java rename to src/main/java/server/expeditions/ExpeditionType.java index ca2cefd457..744880d350 100644 --- a/src/main/java/server/expeditions/MapleExpeditionType.java +++ b/src/main/java/server/expeditions/ExpeditionType.java @@ -25,12 +25,10 @@ package server.expeditions; import config.YamlConfig; /** -* -* @author Alan (SharpAceX) -*/ - -public enum MapleExpeditionType { + * @author Alan (SharpAceX) + */ +public enum ExpeditionType { BALROG_EASY(3, 30, 50, 255, 5), BALROG_NORMAL(6, 30, 50, 255, 5), SCARGA(6, 30, 100, 255, 5), @@ -44,14 +42,14 @@ public enum MapleExpeditionType { ARIANT2(2, 7, 20, 30, 5), PINKBEAN(6, 30, 120, 255, 5), CWKPQ(6, 30, 90, 255, 5); // CWKPQ min-level 90, found thanks to Cato - - private int minSize; - private int maxSize; - private int minLevel; - private int maxLevel; - private int registrationTime; - - private MapleExpeditionType(int minSize, int maxSize, int minLevel, int maxLevel, int minutes) { + + private final int minSize; + private final int maxSize; + private final int minLevel; + private final int maxLevel; + private final int registrationTime; + + ExpeditionType(int minSize, int maxSize, int minLevel, int maxLevel, int minutes) { this.minSize = minSize; this.maxSize = maxSize; this.minLevel = minLevel; @@ -60,22 +58,22 @@ public enum MapleExpeditionType { } public int getMinSize() { - return !YamlConfig.config.server.USE_ENABLE_SOLO_EXPEDITIONS ? minSize : 1; + return !YamlConfig.config.server.USE_ENABLE_SOLO_EXPEDITIONS ? minSize : 1; } - + public int getMaxSize() { return maxSize; } - + public int getMinLevel() { - return minLevel; + return minLevel; } - + public int getMaxLevel() { - return maxLevel; + return maxLevel; } - - public int getRegistrationTime(){ - return registrationTime; + + public int getRegistrationTime() { + return registrationTime; } } diff --git a/src/main/java/server/partyquest/AriantColiseum.java b/src/main/java/server/partyquest/AriantColiseum.java index fef66e3a0b..b9fcd7dc06 100644 --- a/src/main/java/server/partyquest/AriantColiseum.java +++ b/src/main/java/server/partyquest/AriantColiseum.java @@ -23,7 +23,7 @@ import client.Character; import constants.game.GameConstants; import server.TimerManager; import server.expeditions.Expedition; -import server.expeditions.MapleExpeditionType; +import server.expeditions.ExpeditionType; import server.maps.MapleMap; import tools.PacketCreator; @@ -244,14 +244,14 @@ public class AriantColiseum { } } - private MapleExpeditionType getExpeditionType() { - MapleExpeditionType type; + private ExpeditionType getExpeditionType() { + ExpeditionType type; if (map.getId() == 980010101) { - type = MapleExpeditionType.ARIANT; + type = ExpeditionType.ARIANT; } else if (map.getId() == 980010201) { - type = MapleExpeditionType.ARIANT1; + type = ExpeditionType.ARIANT1; } else { - type = MapleExpeditionType.ARIANT2; + type = ExpeditionType.ARIANT2; } return type;