diff --git a/scripts/event/0_EXAMPLE.js b/scripts/event/0_EXAMPLE.js index 3fe5535d65..b08814c392 100644 --- a/scripts/event/0_EXAMPLE.js +++ b/scripts/event/0_EXAMPLE.js @@ -12,14 +12,14 @@ var maxMapId; var eventTime; // Max time allotted for the event, in minutes. -var lobbyRange = [0, 0]; // Range of concurrent lobbies (min range is 0, max range is 7). +const maxLobbies = 7; // Max amount of concurrent active lobbies. function init() { // After loading, ChannelServer } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/3rdJob_bowman.js b/scripts/event/3rdJob_bowman.js index 313d81fcc3..0f21752d2b 100644 --- a/scripts/event/3rdJob_bowman.js +++ b/scripts/event/3rdJob_bowman.js @@ -30,10 +30,10 @@ var maxMapId = 108010101; var eventTime = 20; //20 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/3rdJob_magician.js b/scripts/event/3rdJob_magician.js index b8a49f38b2..efa3818094 100644 --- a/scripts/event/3rdJob_magician.js +++ b/scripts/event/3rdJob_magician.js @@ -30,10 +30,10 @@ var maxMapId = 108010201; var eventTime = 20; //20 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/3rdJob_mount.js b/scripts/event/3rdJob_mount.js index 4a1d639d7b..363f2e28f0 100644 --- a/scripts/event/3rdJob_mount.js +++ b/scripts/event/3rdJob_mount.js @@ -32,10 +32,10 @@ var eventMaps = [923010000]; var eventTime = 5; //5 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/3rdJob_pirate.js b/scripts/event/3rdJob_pirate.js index b925e79505..27ff8d4586 100644 --- a/scripts/event/3rdJob_pirate.js +++ b/scripts/event/3rdJob_pirate.js @@ -30,10 +30,10 @@ var maxMapId = 108010501; var eventTime = 20; //20 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/3rdJob_thief.js b/scripts/event/3rdJob_thief.js index e88058b29c..37b5fefa60 100644 --- a/scripts/event/3rdJob_thief.js +++ b/scripts/event/3rdJob_thief.js @@ -30,10 +30,10 @@ var maxMapId = 108010401; var eventTime = 20; //20 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/3rdJob_warrior.js b/scripts/event/3rdJob_warrior.js index 540627a977..0ce3a86411 100644 --- a/scripts/event/3rdJob_warrior.js +++ b/scripts/event/3rdJob_warrior.js @@ -30,10 +30,10 @@ var maxMapId = 108010301; var eventTime = 20; //20 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/4jaerial.js b/scripts/event/4jaerial.js index d026a0fb09..a260999fa0 100644 --- a/scripts/event/4jaerial.js +++ b/scripts/event/4jaerial.js @@ -30,10 +30,10 @@ var maxMapId = 912020000; var eventTime = 2; //2 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/4jship.js b/scripts/event/4jship.js index ba58956743..b503d35058 100644 --- a/scripts/event/4jship.js +++ b/scripts/event/4jship.js @@ -30,10 +30,10 @@ var maxMapId = 912010200; var eventTime = 4; //4 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/4jsuper.js b/scripts/event/4jsuper.js index 322beef6d7..e225908a01 100644 --- a/scripts/event/4jsuper.js +++ b/scripts/event/4jsuper.js @@ -30,10 +30,10 @@ var maxMapId = 912010200; var eventTime = 4; //4 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/AmoriaPQ.js b/scripts/event/AmoriaPQ.js index fd1cd3332c..08683d08c0 100644 --- a/scripts/event/AmoriaPQ.js +++ b/scripts/event/AmoriaPQ.js @@ -37,14 +37,14 @@ var maxMapId = 670010800; var eventTime = 75; // 75 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/Aran_2ndmount.js b/scripts/event/Aran_2ndmount.js index d6e343114a..27da92ba44 100644 --- a/scripts/event/Aran_2ndmount.js +++ b/scripts/event/Aran_2ndmount.js @@ -30,10 +30,10 @@ var maxMapId = 921110000; var eventTime = 3; //3 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/Aran_3rdmount.js b/scripts/event/Aran_3rdmount.js index 607177329a..93c9ee83c8 100644 --- a/scripts/event/Aran_3rdmount.js +++ b/scripts/event/Aran_3rdmount.js @@ -30,10 +30,10 @@ var maxMapId = 914030000; var eventTime = 3; //3 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/BalrogBattle.js b/scripts/event/BalrogBattle.js index ff47407fa0..1ebd80265b 100644 --- a/scripts/event/BalrogBattle.js +++ b/scripts/event/BalrogBattle.js @@ -41,14 +41,14 @@ var bossMobId = 8830003; var eventTime = 60; // 60 minutes var releaseClawTime = 1; -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/BalrogBattle_Easy.js b/scripts/event/BalrogBattle_Easy.js index 7256aa6fae..e6efb9956b 100644 --- a/scripts/event/BalrogBattle_Easy.js +++ b/scripts/event/BalrogBattle_Easy.js @@ -41,14 +41,14 @@ var bossMobId = 8830010; var eventTime = 60; // 60 minutes var releaseClawTime = 1; -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/BalrogQuest.js b/scripts/event/BalrogQuest.js index f7650a484d..9a7be5607f 100644 --- a/scripts/event/BalrogQuest.js +++ b/scripts/event/BalrogQuest.js @@ -30,10 +30,10 @@ var maxMapId = 910520000; var eventTime = 10; //10 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function init() { diff --git a/scripts/event/BossRushPQ.js b/scripts/event/BossRushPQ.js index b7eb5d5988..81cfd89f80 100644 --- a/scripts/event/BossRushPQ.js +++ b/scripts/event/BossRushPQ.js @@ -36,14 +36,14 @@ var maxMapId = 970042711; var eventTime = 5; //5 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CWKPQ.js b/scripts/event/CWKPQ.js index 4c7e41df21..c46404adf7 100644 --- a/scripts/event/CWKPQ.js +++ b/scripts/event/CWKPQ.js @@ -36,14 +36,14 @@ var maxMapId = 610030800; var eventTime = 2; // 2 minutes for first stg -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CafePQ_1.js b/scripts/event/CafePQ_1.js index 08793c120e..f7c71bb70c 100644 --- a/scripts/event/CafePQ_1.js +++ b/scripts/event/CafePQ_1.js @@ -38,14 +38,14 @@ var eventMaps = [190000000, 190000001, 190000002]; var eventTime = 45; // 45 minutes var couponsNeeded = 400; // total of coupons to complete the event -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CafePQ_2.js b/scripts/event/CafePQ_2.js index 83c80208c7..6843fe1240 100644 --- a/scripts/event/CafePQ_2.js +++ b/scripts/event/CafePQ_2.js @@ -38,14 +38,14 @@ var eventMaps = [191000000, 191000001]; var eventTime = 45; // 45 minutes var couponsNeeded = 350; // total of coupons to complete the event -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CafePQ_3.js b/scripts/event/CafePQ_3.js index f9fde5b3dd..82aefc9b42 100644 --- a/scripts/event/CafePQ_3.js +++ b/scripts/event/CafePQ_3.js @@ -38,14 +38,14 @@ var eventMaps = [192000000, 192000001]; var eventTime = 45; // 45 minutes var couponsNeeded = 350; // total of coupons to complete the event -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CafePQ_4.js b/scripts/event/CafePQ_4.js index ca130d555d..2d4aca90f0 100644 --- a/scripts/event/CafePQ_4.js +++ b/scripts/event/CafePQ_4.js @@ -38,14 +38,14 @@ var eventMaps = [195000000, 195010000, 195020000, 195030000]; var eventTime = 45; // 45 minutes var couponsNeeded = 450; // total of coupons to complete the event -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CafePQ_5.js b/scripts/event/CafePQ_5.js index 93feb547ca..4e2f36a319 100644 --- a/scripts/event/CafePQ_5.js +++ b/scripts/event/CafePQ_5.js @@ -38,14 +38,14 @@ var eventMaps = [196000000, 196010000]; var eventTime = 45; // 45 minutes var couponsNeeded = 500; // total of coupons to complete the event -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/CafePQ_6.js b/scripts/event/CafePQ_6.js index 06f13f52f0..50c1d4bc9c 100644 --- a/scripts/event/CafePQ_6.js +++ b/scripts/event/CafePQ_6.js @@ -38,14 +38,14 @@ var eventMaps = [197000000, 197010000]; var eventTime = 45; // 45 minutes var couponsNeeded = 300; // total of coupons to complete the event -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/DelliBattle.js b/scripts/event/DelliBattle.js index faedb4600f..b21edef43d 100644 --- a/scripts/event/DelliBattle.js +++ b/scripts/event/DelliBattle.js @@ -35,14 +35,14 @@ var maxMapId = 925010300; var eventTime = 6; // 6 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/ElementalBattle.js b/scripts/event/ElementalBattle.js index 6af9cf2363..f286ae6564 100644 --- a/scripts/event/ElementalBattle.js +++ b/scripts/event/ElementalBattle.js @@ -36,14 +36,14 @@ var maxMapId = 922020100; var eventTime = 20; // 20 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/EllinPQ.js b/scripts/event/EllinPQ.js index a7829edd59..51501e6cb0 100644 --- a/scripts/event/EllinPQ.js +++ b/scripts/event/EllinPQ.js @@ -36,14 +36,14 @@ var maxMapId = 930000800; var eventTime = 30; // 30 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/ElnathPQ.js b/scripts/event/ElnathPQ.js index d3339e1b5b..082d16178b 100644 --- a/scripts/event/ElnathPQ.js +++ b/scripts/event/ElnathPQ.js @@ -35,14 +35,14 @@ var maxMapId = 921100300; var eventTime = 10; // 10 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/GuildQuest.js b/scripts/event/GuildQuest.js index 837803481f..2e60a73214 100644 --- a/scripts/event/GuildQuest.js +++ b/scripts/event/GuildQuest.js @@ -38,14 +38,14 @@ var waitTime = 3; // 3 minutes var eventTime = 90; // 90 minutes var bonusTime = 0.5; // 30 seconds -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/HenesysPQ.js b/scripts/event/HenesysPQ.js index 7ba1973d72..84a6432819 100644 --- a/scripts/event/HenesysPQ.js +++ b/scripts/event/HenesysPQ.js @@ -36,14 +36,14 @@ var maxMapId = 910010400; var eventTime = 10; // 10 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/HolidayPQ_1.js b/scripts/event/HolidayPQ_1.js index b1a9d201ae..68920209b6 100644 --- a/scripts/event/HolidayPQ_1.js +++ b/scripts/event/HolidayPQ_1.js @@ -38,14 +38,14 @@ var maxMapId = 889100001; var eventTime = 15; // 15 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/HolidayPQ_2.js b/scripts/event/HolidayPQ_2.js index 621a0b9d0c..954c677c0d 100644 --- a/scripts/event/HolidayPQ_2.js +++ b/scripts/event/HolidayPQ_2.js @@ -38,14 +38,14 @@ var maxMapId = 889100011; var eventTime = 20; // 20 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/HolidayPQ_3.js b/scripts/event/HolidayPQ_3.js index 6c87a86f3f..e08173bd6a 100644 --- a/scripts/event/HolidayPQ_3.js +++ b/scripts/event/HolidayPQ_3.js @@ -38,14 +38,14 @@ var maxMapId = 889100021; var eventTime = 25; // 25 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/HorntailBattle.js b/scripts/event/HorntailBattle.js index 39e9e8b03a..cd2dc1d052 100644 --- a/scripts/event/HorntailBattle.js +++ b/scripts/event/HorntailBattle.js @@ -36,14 +36,14 @@ var maxMapId = 240060200; var eventTime = 120; // 120 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/HorntailPQ.js b/scripts/event/HorntailPQ.js index cd2dedab66..c7ae6d4f0d 100644 --- a/scripts/event/HorntailPQ.js +++ b/scripts/event/HorntailPQ.js @@ -36,14 +36,14 @@ var maxMapId = 240050310; var eventTime = 25; // 25 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/KerningPQ.js b/scripts/event/KerningPQ.js index 9b3e8fb982..f0aefe454d 100644 --- a/scripts/event/KerningPQ.js +++ b/scripts/event/KerningPQ.js @@ -36,14 +36,14 @@ var maxMapId = 103000805; var eventTime = 30; // 30 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/LatanicaBattle.js b/scripts/event/LatanicaBattle.js index 249f466d52..40a63c8c22 100644 --- a/scripts/event/LatanicaBattle.js +++ b/scripts/event/LatanicaBattle.js @@ -36,14 +36,14 @@ var maxMapId = 541010100; var eventTime = 10; // 10 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/LudiMazePQ.js b/scripts/event/LudiMazePQ.js index 525d739a66..475c54f25f 100644 --- a/scripts/event/LudiMazePQ.js +++ b/scripts/event/LudiMazePQ.js @@ -36,14 +36,14 @@ var maxMapId = 809050016; var eventTime = 15; // 15 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/LudiPQ.js b/scripts/event/LudiPQ.js index 4e1e5745ac..eaea40f276 100644 --- a/scripts/event/LudiPQ.js +++ b/scripts/event/LudiPQ.js @@ -36,14 +36,14 @@ var maxMapId = 922011100; var eventTime = 45; // 45 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/MagatiaPQ_A.js b/scripts/event/MagatiaPQ_A.js index 42abb23f37..e4216b7446 100644 --- a/scripts/event/MagatiaPQ_A.js +++ b/scripts/event/MagatiaPQ_A.js @@ -36,14 +36,14 @@ var maxMapId = 926110600; var eventTime = 45; // 45 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/MagatiaPQ_Z.js b/scripts/event/MagatiaPQ_Z.js index c69ee97382..ec12baa753 100644 --- a/scripts/event/MagatiaPQ_Z.js +++ b/scripts/event/MagatiaPQ_Z.js @@ -36,14 +36,14 @@ var maxMapId = 926100600; var eventTime = 45; // 45 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/MahaBattle.js b/scripts/event/MahaBattle.js index 6791f678ad..da67bdef82 100644 --- a/scripts/event/MahaBattle.js +++ b/scripts/event/MahaBattle.js @@ -33,7 +33,7 @@ var maxMapId = 914020000; var eventTime = 10; // 10 minutes -var lobbyRange = [0, 7]; +const maxLobbies = 7; function init() {} diff --git a/scripts/event/OrbisPQ.js b/scripts/event/OrbisPQ.js index b7543c0a51..8d71fd512b 100644 --- a/scripts/event/OrbisPQ.js +++ b/scripts/event/OrbisPQ.js @@ -36,14 +36,14 @@ var maxMapId = 920011300; var eventTime = 45; // 45 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/PapulatusBattle.js b/scripts/event/PapulatusBattle.js index 08511c95cd..f75d082f30 100644 --- a/scripts/event/PapulatusBattle.js +++ b/scripts/event/PapulatusBattle.js @@ -36,14 +36,14 @@ var maxMapId = 220080001; var eventTime = 45; // 45 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/PinkBeanBattle.js b/scripts/event/PinkBeanBattle.js index a8ad13d961..e9574c775c 100644 --- a/scripts/event/PinkBeanBattle.js +++ b/scripts/event/PinkBeanBattle.js @@ -36,14 +36,14 @@ var maxMapId = 270050300; var eventTime = 140; // 140 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/PiratePQ.js b/scripts/event/PiratePQ.js index 05ec57ee6b..8fdd9c0664 100644 --- a/scripts/event/PiratePQ.js +++ b/scripts/event/PiratePQ.js @@ -38,14 +38,14 @@ var maxMapId = 925100500; var eventTime = 4; // 4 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/RescueGaga.js b/scripts/event/RescueGaga.js index 89e784db39..b1dbe077e6 100644 --- a/scripts/event/RescueGaga.js +++ b/scripts/event/RescueGaga.js @@ -15,14 +15,14 @@ var maxMapId = 922240100; var eventTime = 3; // 3 minutes -var lobbyRange = [0, 19]; +const maxLobbies = 20; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/ScargaBattle.js b/scripts/event/ScargaBattle.js index 450b794f49..13ebb023b9 100644 --- a/scripts/event/ScargaBattle.js +++ b/scripts/event/ScargaBattle.js @@ -36,14 +36,14 @@ var maxMapId = 551030200; var eventTime = 60; // 60 minutes for boss stg -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/ShowaBattle.js b/scripts/event/ShowaBattle.js index 789cb0b8ec..df316f8afc 100644 --- a/scripts/event/ShowaBattle.js +++ b/scripts/event/ShowaBattle.js @@ -36,14 +36,14 @@ var maxMapId = 801040101; var eventTime = 60; // 60 minutes for boss stg -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/TD_Battle1.js b/scripts/event/TD_Battle1.js index 18ea69ab6b..3ca55f6b37 100644 --- a/scripts/event/TD_Battle1.js +++ b/scripts/event/TD_Battle1.js @@ -38,14 +38,14 @@ var tdBossId = 7220005; var eventTime = 10; // 10 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/TD_Battle2.js b/scripts/event/TD_Battle2.js index 350bdc9738..b893fe4949 100644 --- a/scripts/event/TD_Battle2.js +++ b/scripts/event/TD_Battle2.js @@ -38,14 +38,14 @@ var tdBossId = 8220010; var eventTime = 10; // 10 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/TD_Battle3.js b/scripts/event/TD_Battle3.js index 1eab11205e..175deb3925 100644 --- a/scripts/event/TD_Battle3.js +++ b/scripts/event/TD_Battle3.js @@ -38,14 +38,14 @@ var tdBossId = 8220011; var eventTime = 15; // 15 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/TD_Battle4.js b/scripts/event/TD_Battle4.js index b7dd66fb83..e7e3b15bd6 100644 --- a/scripts/event/TD_Battle4.js +++ b/scripts/event/TD_Battle4.js @@ -38,14 +38,14 @@ var tdBossId = 8220012; var eventTime = 15; // 15 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/TD_Battle5.js b/scripts/event/TD_Battle5.js index 86b4fcaa07..b5ecaf12d3 100644 --- a/scripts/event/TD_Battle5.js +++ b/scripts/event/TD_Battle5.js @@ -38,14 +38,14 @@ var tdBossId = 8220015; var eventTime = 20; // 20 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/TreasurePQ.js b/scripts/event/TreasurePQ.js index 88252dcdf2..10c89e8757 100644 --- a/scripts/event/TreasurePQ.js +++ b/scripts/event/TreasurePQ.js @@ -37,14 +37,14 @@ var maxMapId = 674030300; var eventTime = 45; // 45 minutes var bonusTime = 10; // 10 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/WeddingCathedral.js b/scripts/event/WeddingCathedral.js index e49e90ff78..d052d9bb88 100644 --- a/scripts/event/WeddingCathedral.js +++ b/scripts/event/WeddingCathedral.js @@ -44,12 +44,12 @@ var forceHideMsgTime = 10; // unfortunately, EIM weddings don't send wedding ta var eventBoss = true; // spawns a Cake boss at the hunting ground var isCathedral = true; -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() {} -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventExclusives(eim) { diff --git a/scripts/event/WeddingChapel.js b/scripts/event/WeddingChapel.js index 904d707f4a..0cd6b8407f 100644 --- a/scripts/event/WeddingChapel.js +++ b/scripts/event/WeddingChapel.js @@ -44,12 +44,12 @@ var forceHideMsgTime = 10; // unfortunately, EIM weddings don't send wedding ta var eventBoss = true; // spawns a Cake boss at the hunting ground var isCathedral = false; -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() {} -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventExclusives(eim) { diff --git a/scripts/event/ZakumBattle.js b/scripts/event/ZakumBattle.js index c317a56653..0f370faf3a 100644 --- a/scripts/event/ZakumBattle.js +++ b/scripts/event/ZakumBattle.js @@ -36,14 +36,14 @@ var maxMapId = 280030000; var eventTime = 120; // 120 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/scripts/event/ZakumPQ.js b/scripts/event/ZakumPQ.js index 07175811dc..a823ab16cf 100644 --- a/scripts/event/ZakumPQ.js +++ b/scripts/event/ZakumPQ.js @@ -36,14 +36,14 @@ var maxMapId = 280011006; var eventTime = 30; // 30 minutes -var lobbyRange = [0, 0]; +const maxLobbies = 1; function init() { setEventRequirements(); } -function setLobbyRange() { - return lobbyRange; +function getMaxLobbies() { + return maxLobbies; } function setEventRequirements() { diff --git a/src/main/java/scripting/event/EventManager.java b/src/main/java/scripting/event/EventManager.java index 272570f2ef..b254c1bb49 100644 --- a/src/main/java/scripting/event/EventManager.java +++ b/src/main/java/scripting/event/EventManager.java @@ -163,16 +163,11 @@ public class EventManager { return YamlConfig.config.server.EVENT_LOBBY_DELAY; } - private List getLobbyRange() { + private int getMaxLobbies() { try { - List objects = (List) iv.invokeFunction("setLobbyRange", (Object) null); - return convertToIntegerList(objects); + return (int) iv.invokeFunction("getMaxLobbies"); } catch (ScriptException | NoSuchMethodException ex) { // they didn't define a lobby range - List defaultRange = new ArrayList<>(); - defaultRange.add(0); - defaultRange.add(maxLobbys); - - return defaultRange; + return maxLobbys; } } @@ -332,23 +327,19 @@ public class EventManager { public String getName() { return name; } - + private int availableLobbyInstance() { - List lr = getLobbyRange(); - int lb = 0, hb = 0; - - if(lr.size() >= 2) { - lb = Math.max(lr.get(0), 0); - hb = Math.min(lr.get(1), maxLobbys - 1); + int maxLobbies = getMaxLobbies(); + + if (maxLobbies > 0) { + for (int i = 0; i < maxLobbies; i++) { + if (startLobbyInstance(i)) { + return i; + } } - - for(int i = lb; i <= hb; i++) { - if(startLobbyInstance(i)) { - return i; - } - } - - return -1; + } + + return -1; } private String getInternalScriptExceptionMessage(Throwable a) {