From 3458d1c7b3b1fd573c1c6a2e98dec45effd11cb1 Mon Sep 17 00:00:00 2001 From: P0nk Date: Sat, 17 Apr 2021 19:43:00 +0200 Subject: [PATCH] Convert event scripts to Graal --- scripts/event/2xEvent.js | 18 +++++++------ scripts/event/3rdJob_bowman.js | 4 +-- scripts/event/3rdJob_magician.js | 4 +-- scripts/event/3rdJob_mount.js | 4 +-- scripts/event/3rdJob_pirate.js | 4 +-- scripts/event/3rdJob_thief.js | 4 +-- scripts/event/3rdJob_warrior.js | 4 +-- scripts/event/AirPlane.js | 2 -- scripts/event/Aran_2ndmount.js | 4 +-- scripts/event/Aran_3rdmount.js | 4 +-- scripts/event/AreaBossDyle.js | 9 ++++--- scripts/event/AreaBossEliza1.js | 16 ++++++----- scripts/event/AreaBossFaust1.js | 16 ++++++----- scripts/event/AreaBossFaust2.js | 15 ++++++----- scripts/event/AreaBossKimera.js | 13 +++++---- scripts/event/AreaBossKingClang.js | 14 ++++++---- scripts/event/AreaBossKingSageCat.js | 13 +++++---- scripts/event/AreaBossLeviathan.js | 13 +++++---- scripts/event/AreaBossMano.js | 15 ++++++----- scripts/event/AreaBossNineTailedFox.js | 13 +++++---- scripts/event/AreaBossSeruf.js | 13 +++++---- scripts/event/AreaBossStumpy.js | 13 +++++---- scripts/event/AreaBossTaeRoon.js | 13 +++++---- scripts/event/AreaBossTimer1.js | 13 +++++---- scripts/event/AreaBossTimer2.js | 13 +++++---- scripts/event/AreaBossTimer3.js | 13 +++++---- scripts/event/BalrogBattle.js | 15 ++++++----- scripts/event/BalrogBattle_Easy.js | 15 ++++++----- scripts/event/BalrogQuest.js | 7 ++--- scripts/event/Boats.js | 7 +++-- scripts/event/Cabin.js | 2 -- scripts/event/CafePQ_1.js | 3 +-- scripts/event/CafePQ_2.js | 3 +-- scripts/event/CafePQ_3.js | 3 +-- scripts/event/CafePQ_4.js | 3 +-- scripts/event/CafePQ_5.js | 3 +-- scripts/event/CafePQ_6.js | 3 +-- scripts/event/DollHouse.js | 4 +-- scripts/event/Genie.js | 1 - scripts/event/Hak.js | 5 ++-- scripts/event/HolidayPQ_1.js | 10 +++---- scripts/event/HolidayPQ_2.js | 10 +++---- scripts/event/HolidayPQ_3.js | 10 +++---- scripts/event/HorntailBattle.js | 10 +++---- scripts/event/KerningTrain.js | 5 ++-- scripts/event/MK_PrimeMinister.js | 7 +++-- scripts/event/MK_PrimeMinister2.js | 7 +++-- scripts/event/MagatiaPQ_A.js | 37 ++++++++++++++------------ scripts/event/MagatiaPQ_Z.js | 37 ++++++++++++++------------ scripts/event/PinkBeanBattle.js | 13 ++++----- scripts/event/RescueGaga.js | 8 +++--- scripts/event/RockSpirit.js | 2 -- scripts/event/RockSpiritVIP.js | 2 -- scripts/event/Subway.js | 7 ++--- scripts/event/Trains.js | 2 -- scripts/event/ZakumBattle.js | 2 -- 56 files changed, 273 insertions(+), 237 deletions(-) diff --git a/scripts/event/2xEvent.js b/scripts/event/2xEvent.js index c24c548cab..c693514f47 100644 --- a/scripts/event/2xEvent.js +++ b/scripts/event/2xEvent.js @@ -31,8 +31,6 @@ var timer2; var timer3; var timer4; -importPackage(Packages.client); - function init() { /* if(em.getChannelServer().getId() == 1) { // Only run on channel 1. @@ -58,15 +56,19 @@ function cancelSchedule() { } function start() { - var world = Packages.net.server.Server.getInstance().getWorld(em.getChannelServer().getWorld()); - world.setExpRate(8); - world.broadcastPacket(Packages.tools.MaplePacketCreator.serverNotice(6, "The Bunny Onslaught Survival Scanner (BOSS) has detected an Easter Bunny onslaught soon! The GM team has activated the Emergency XP Pool (EXP) that doubles experience gained for the next two hours!")); + const Server = Java.type('net.server.Server'); + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + var world = Server.getInstance().getWorld(em.getChannelServer().getWorld()); + world.setExpRate(8); + world.broadcastPacket(MaplePacketCreator.serverNotice(6, "The Bunny Onslaught Survival Scanner (BOSS) has detected an Easter Bunny onslaught soon! The GM team has activated the Emergency XP Pool (EXP) that doubles experience gained for the next two hours!")); } function stop() { - var world = Packages.net.server.Server.getInstance().getWorld(em.getChannelServer().getWorld()); - world.setExpRate(4); - world.broadcastPacket(Packages.tools.MaplePacketCreator.serverNotice(6, "Unfortunately the Emergency XP Pool (EXP) has run out of juice for now and needs to recharge causing the EXP rate to go back to normal.")); + const Server = Java.type('net.server.Server'); + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + var world = Server.getInstance().getWorld(em.getChannelServer().getWorld()); + world.setExpRate(4); + world.broadcastPacket(MaplePacketCreator.serverNotice(6, "Unfortunately the Emergency XP Pool (EXP) has run out of juice for now and needs to recharge causing the EXP rate to go back to normal.")); } // ---------- FILLER FUNCTIONS ---------- diff --git a/scripts/event/3rdJob_bowman.js b/scripts/event/3rdJob_bowman.js index 4388b7a27a..313d81fcc3 100644 --- a/scripts/event/3rdJob_bowman.js +++ b/scripts/event/3rdJob_bowman.js @@ -21,7 +21,6 @@ * @Author Ronan * 3rd Job Event - Bowman **/ -importPackage(Packages.tools); var entryMap = 108010100; var exitMap = 105040305; @@ -54,7 +53,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_magician.js b/scripts/event/3rdJob_magician.js index e7875bcea2..b8a49f38b2 100644 --- a/scripts/event/3rdJob_magician.js +++ b/scripts/event/3rdJob_magician.js @@ -21,7 +21,6 @@ * @Author Ronan * 3rd Job Event - Magician **/ -importPackage(Packages.tools); var entryMap = 108010200; var exitMap = 100040106; @@ -54,7 +53,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_mount.js b/scripts/event/3rdJob_mount.js index 094086c8ce..4a1d639d7b 100644 --- a/scripts/event/3rdJob_mount.js +++ b/scripts/event/3rdJob_mount.js @@ -21,7 +21,6 @@ * @Author Ronan * 3rd Job Event - Kenta's Mount Quest **/ -importPackage(Packages.tools); var entryMap = 923010000; var exitMap = 923010100; @@ -84,7 +83,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_pirate.js b/scripts/event/3rdJob_pirate.js index 2b0164ba8e..b925e79505 100644 --- a/scripts/event/3rdJob_pirate.js +++ b/scripts/event/3rdJob_pirate.js @@ -21,7 +21,6 @@ * @Author Ronan * 3rd Job Event - Pirate **/ -importPackage(Packages.tools); var entryMap = 108010500; var exitMap = 105070200; @@ -46,7 +45,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_thief.js b/scripts/event/3rdJob_thief.js index 3da091fa42..e88058b29c 100644 --- a/scripts/event/3rdJob_thief.js +++ b/scripts/event/3rdJob_thief.js @@ -21,7 +21,6 @@ * @Author Ronan * 3rd Job Event - Thief **/ -importPackage(Packages.tools); var entryMap = 108010400; var exitMap = 107000402; @@ -54,7 +53,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/3rdJob_warrior.js b/scripts/event/3rdJob_warrior.js index f8c938d075..540627a977 100644 --- a/scripts/event/3rdJob_warrior.js +++ b/scripts/event/3rdJob_warrior.js @@ -21,7 +21,6 @@ * @Author Ronan * 3rd Job Event - Warrior **/ -importPackage(Packages.tools); var entryMap = 108010300; var exitMap = 105070001; @@ -54,7 +53,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/AirPlane.js b/scripts/event/AirPlane.js index a075c820e3..7ae92ce7e6 100644 --- a/scripts/event/AirPlane.js +++ b/scripts/event/AirPlane.js @@ -1,5 +1,3 @@ -importPackage(Packages.tools); - var KC_bfd; var Plane_to_CBD; var CBD_docked; diff --git a/scripts/event/Aran_2ndmount.js b/scripts/event/Aran_2ndmount.js index d9d064cc7f..d6e343114a 100644 --- a/scripts/event/Aran_2ndmount.js +++ b/scripts/event/Aran_2ndmount.js @@ -21,7 +21,6 @@ * @Author Ronan * Event - Scadur's Mount Quest **/ -importPackage(Packages.tools); var entryMap = 921110000; var exitMap = 211050000; @@ -60,7 +59,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 2); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/Aran_3rdmount.js b/scripts/event/Aran_3rdmount.js index 9c2a023622..607177329a 100644 --- a/scripts/event/Aran_3rdmount.js +++ b/scripts/event/Aran_3rdmount.js @@ -21,7 +21,6 @@ * @Author Ronan * Event - Wolves' Mount Quest **/ -importPackage(Packages.tools); var entryMap = 914030000; var exitMap = 140010210; @@ -61,7 +60,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 1); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/AreaBossDyle.js b/scripts/event/AreaBossDyle.js index f4c11549d2..084180a3c0 100644 --- a/scripts/event/AreaBossDyle.js +++ b/scripts/event/AreaBossDyle.js @@ -26,8 +26,6 @@ ThreeStep - based on xQuasar's King Clang spawner **/ -importPackage(Packages.server.life); -importPackage(Packages.tools); function init() { scheduleNew(); @@ -48,7 +46,12 @@ function start() { setupTask = em.schedule("start", 3 * 60 * 60 * 1000); return; } - dangeroudCroko1.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(6220000), new Packages.java.awt.Point(90, 119)); + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(90, 119); + dangeroudCroko1.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(6220000), spawnpoint); dangeroudCroko1.broadcastMessage(MaplePacketCreator.serverNotice(6, "The huge crocodile Dyle has come out from the swamp.")); setupTask = em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossEliza1.js b/scripts/event/AreaBossEliza1.js index 7a000355d7..ead84f636a 100644 --- a/scripts/event/AreaBossEliza1.js +++ b/scripts/event/AreaBossEliza1.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - var setupTask; function init() { @@ -45,16 +43,20 @@ function cancelSchedule() { } function start() { + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var eliza = MapleLifeFactory.getMonster(8220000); var stairwayToTheSky2 = em.getChannelServer().getMapFactory().getMap(200010300); - var eliza = Packages.server.life.MapleLifeFactory.getMonster(8220000); - + if(stairwayToTheSky2.getMonsterById(8220000) != null) { em.schedule("start", 3 * 60 *60 * 1000); return; } - - stairwayToTheSky2.spawnMonsterOnGroundBelow(eliza, new Packages.java.awt.Point(208, 83)); - stairwayToTheSky2.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Eliza has appeared with a black whirlwind.")); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(208, 83); + stairwayToTheSky2.spawnMonsterOnGroundBelow(eliza, spawnpoint); + stairwayToTheSky2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Eliza has appeared with a black whirlwind.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossFaust1.js b/scripts/event/AreaBossFaust1.js index 0d3de727a5..7219b6e422 100644 --- a/scripts/event/AreaBossFaust1.js +++ b/scripts/event/AreaBossFaust1.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,15 +42,19 @@ function cancelSchedule() { function start() { var theForestOfEvil1 = em.getChannelServer().getMapFactory().getMap(100040105); - var faust1 = Packages.server.life.MapleLifeFactory.getMonster(5220002); - if(theForestOfEvil1.getMonsterById(5220002) != null) { em.schedule("start", 3 * 60 *60 * 1000); return; } - - theForestOfEvil1.spawnMonsterOnGroundBelow(faust1, new Packages.java.awt.Point(456, 278)); - theForestOfEvil1.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + const Point = Java.type('java.awt.Point'); + + var faust1 = MapleLifeFactory.getMonster(5220002); + const spawnpoint = new Point(456, 278); + theForestOfEvil1.spawnMonsterOnGroundBelow(faust1, spawnpoint); + theForestOfEvil1.broadcastMessage(MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossFaust2.js b/scripts/event/AreaBossFaust2.js index 610804655a..719da12138 100644 --- a/scripts/event/AreaBossFaust2.js +++ b/scripts/event/AreaBossFaust2.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -43,16 +41,21 @@ function cancelSchedule() { } function start() { + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); var theForestOfEvil2 = em.getChannelServer().getMapFactory().getMap(100040106); - var faust2 = Packages.server.life.MapleLifeFactory.getMonster(5220002); + var faust2 = MapleLifeFactory.getMonster(5220002); if(theForestOfEvil2.getMonsterById(5220002) != null) { em.schedule("start", 3 * 60 *60 * 1000); return; } - - theForestOfEvil2.spawnMonsterOnGroundBelow(faust2, new Packages.java.awt.Point(474, 278)); - theForestOfEvil2.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); + + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(474, 278); + theForestOfEvil2.spawnMonsterOnGroundBelow(faust2, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + theForestOfEvil2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossKimera.js b/scripts/event/AreaBossKimera.js index 006e4e6ef4..c1e11a06a6 100644 --- a/scripts/event/AreaBossKimera.js +++ b/scripts/event/AreaBossKimera.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -43,8 +41,9 @@ function cancelSchedule() { } function start() { + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); var labSecretBasementPath = em.getChannelServer().getMapFactory().getMap(261030000); - var chimera = Packages.server.life.MapleLifeFactory.getMonster(8220002); + var chimera = MapleLifeFactory.getMonster(8220002); if(labSecretBasementPath.getMonsterById(8220002) != null) { em.schedule("start", 3 * 60 *60 * 1000); @@ -54,8 +53,12 @@ function start() { var posX; var posY = 180; posX = (Math.floor(Math.random() * 900) - 900); - labSecretBasementPath.spawnMonsterOnGroundBelow(chimera, new Packages.java.awt.Point(posX, posY)); - labSecretBasementPath.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Kimera has appeared out of the darkness of the underground with a glitter in her eyes.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + labSecretBasementPath.spawnMonsterOnGroundBelow(chimera, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + labSecretBasementPath.broadcastMessage(MaplePacketCreator.serverNotice(6, "Kimera has appeared out of the darkness of the underground with a glitter in her eyes.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossKingClang.js b/scripts/event/AreaBossKingClang.js index 62e2871a5b..daad7c3346 100644 --- a/scripts/event/AreaBossKingClang.js +++ b/scripts/event/AreaBossKingClang.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - var hotSand; function init() { @@ -50,12 +48,18 @@ function start() { em.schedule("start", 3 * 60 *60 * 1000); return; } - var kingClang = Packages.server.life.MapleLifeFactory.getMonster(5220001); + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var kingClang = MapleLifeFactory.getMonster(5220001); var posX; var posY = 140; posX = Math.floor((Math.random() * 2400) - 1600); - hotSand.spawnMonsterOnGroundBelow(kingClang, new Packages.java.awt.Point(posX, posY)); - hotSand.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "A strange turban shell has appeared on the beach.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + hotSand.spawnMonsterOnGroundBelow(kingClang, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + hotSand.broadcastMessage(MaplePacketCreator.serverNotice(6, "A strange turban shell has appeared on the beach.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossKingSageCat.js b/scripts/event/AreaBossKingSageCat.js index ffd42b4603..0e48183fb5 100644 --- a/scripts/event/AreaBossKingSageCat.js +++ b/scripts/event/AreaBossKingSageCat.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,7 +42,8 @@ function cancelSchedule() { function start() { var goblinForest2 = em.getChannelServer().getMapFactory().getMap(250010504); - var kingSageCat = Packages.server.life.MapleLifeFactory.getMonster(7220002); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var kingSageCat = MapleLifeFactory.getMonster(7220002); if(goblinForest2.getMonsterById(7220002) != null) { em.schedule("start", 3 * 60 *60 * 1000); @@ -53,8 +52,12 @@ function start() { var posX; var posY = 540; posX = Math.floor((Math.random() * 1300) - 500); - goblinForest2.spawnMonsterOnGroundBelow(kingSageCat, new Packages.java.awt.Point(posX, posY)); - goblinForest2.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "The ghostly air around here has become stronger. The unpleasant sound of a cat crying can be heard.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + goblinForest2.spawnMonsterOnGroundBelow(kingSageCat, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + goblinForest2.broadcastMessage(MaplePacketCreator.serverNotice(6, "The ghostly air around here has become stronger. The unpleasant sound of a cat crying can be heard.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossLeviathan.js b/scripts/event/AreaBossLeviathan.js index 7a4ca827cf..4b53177f76 100644 --- a/scripts/event/AreaBossLeviathan.js +++ b/scripts/event/AreaBossLeviathan.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,7 +42,8 @@ function cancelSchedule() { function start() { var leviathansCanyon = em.getChannelServer().getMapFactory().getMap(240040401); - var leviathan = Packages.server.life.MapleLifeFactory.getMonster(8220003); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var leviathan = MapleLifeFactory.getMonster(8220003); if(leviathansCanyon.getMonsterById(8220003) != null) { em.schedule("start", 3 * 60 *60 * 1000); return; @@ -53,8 +52,12 @@ function start() { var posX; var posY = 1125; posX = Math.floor((Math.random() * 600) - 300); - leviathansCanyon.spawnMonsterOnGroundBelow(leviathan, new Packages.java.awt.Point(posX, posY)); - leviathansCanyon.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Leviathan emerges from the canyon and the cold icy wind blows.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + leviathansCanyon.spawnMonsterOnGroundBelow(leviathan, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + leviathansCanyon.broadcastMessage(MaplePacketCreator.serverNotice(6, "Leviathan emerges from the canyon and the cold icy wind blows.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossMano.js b/scripts/event/AreaBossMano.js index 861054278a..efd553f051 100644 --- a/scripts/event/AreaBossMano.js +++ b/scripts/event/AreaBossMano.js @@ -26,8 +26,6 @@ ThreeStep - based on xQuasar's King Clang spawner **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -43,14 +41,19 @@ function cancelSchedule() { function start() { var thicketAroundTheBeach3 = em.getChannelServer().getMapFactory().getMap(104000400); - var mano = Packages.server.life.MapleLifeFactory.getMonster(2220000); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var mano = MapleLifeFactory.getMonster(2220000); if(thicketAroundTheBeach3.getMonsterById(2220000) != null) { em.schedule("start", 3 * 60 * 60 * 1000); return; } - - thicketAroundTheBeach3.spawnMonsterOnGroundBelow(mano, new Packages.java.awt.Point(279, -496)); - thicketAroundTheBeach3.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "A cool breeze was felt when Mano appeared.")); + + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(279, -496); + thicketAroundTheBeach3.spawnMonsterOnGroundBelow(mano, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + thicketAroundTheBeach3.broadcastMessage(MaplePacketCreator.serverNotice(6, "A cool breeze was felt when Mano appeared.")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossNineTailedFox.js b/scripts/event/AreaBossNineTailedFox.js index b49c71d549..9573170bde 100644 --- a/scripts/event/AreaBossNineTailedFox.js +++ b/scripts/event/AreaBossNineTailedFox.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,7 +42,8 @@ function cancelSchedule() { function start() { var moonRidge = em.getChannelServer().getMapFactory().getMap(222010310); - var nineTailedFox = Packages.server.life.MapleLifeFactory.getMonster(7220001); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var nineTailedFox = MapleLifeFactory.getMonster(7220001); if(moonRidge.getMonsterById(7220001) != null) { em.schedule("start", 3 * 60 *60 * 1000); return; @@ -52,8 +51,12 @@ function start() { var posX; var posY = 33; posX = Math.floor((Math.random() * 1300) - 800); - moonRidge.spawnMonsterOnGroundBelow(nineTailedFox, new Packages.java.awt.Point(posX, posY)); - moonRidge.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "As the moon light dims, a long fox cry can be heard and the presence of the old fox can be felt")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + moonRidge.spawnMonsterOnGroundBelow(nineTailedFox, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + moonRidge.broadcastMessage(MaplePacketCreator.serverNotice(6, "As the moon light dims, a long fox cry can be heard and the presence of the old fox can be felt")); em.schedule("start", 3 * 60 *60 * 1000); } diff --git a/scripts/event/AreaBossSeruf.js b/scripts/event/AreaBossSeruf.js index 8ba8243b3d..d55e2da280 100644 --- a/scripts/event/AreaBossSeruf.js +++ b/scripts/event/AreaBossSeruf.js @@ -28,8 +28,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -45,7 +43,8 @@ function cancelSchedule() { function start() { var theSeaweedTower = em.getChannelServer().getMapFactory().getMap(230020100); - var seruf = Packages.server.life.MapleLifeFactory.getMonster(4220001); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var seruf = MapleLifeFactory.getMonster(4220001); if(theSeaweedTower.getMonsterById(4220001) != null) { em.schedule("start", 3 * 60 * 60 * 1000); @@ -55,8 +54,12 @@ function start() { var posX; var posY = 520; posX = Math.floor((Math.random() * 2300) - 1500); - theSeaweedTower.spawnMonsterOnGroundBelow(seruf, new Packages.java.awt.Point(posX, posY)); - theSeaweedTower.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "A strange shell has appeared from a grove of seaweed")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + theSeaweedTower.spawnMonsterOnGroundBelow(seruf, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + theSeaweedTower.broadcastMessage(MaplePacketCreator.serverNotice(6, "A strange shell has appeared from a grove of seaweed")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossStumpy.js b/scripts/event/AreaBossStumpy.js index 12354f9d4f..bb4cdf3b51 100644 --- a/scripts/event/AreaBossStumpy.js +++ b/scripts/event/AreaBossStumpy.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,7 +42,8 @@ function cancelSchedule() { function start() { var eastRockyMountain5 = em.getChannelServer().getMapFactory().getMap(101030404); - var stumpy = Packages.server.life.MapleLifeFactory.getMonster(3220000); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var stumpy = MapleLifeFactory.getMonster(3220000); if(eastRockyMountain5.getMonsterById(3220000) != null) { em.schedule("start", 3 * 60 * 60 * 1000); @@ -54,8 +53,12 @@ function start() { var posX; var posY = 1280; posX = Math.floor((Math.random() * 800) + 400); - eastRockyMountain5.spawnMonsterOnGroundBelow(stumpy, new Packages.java.awt.Point(posX, posY)); - eastRockyMountain5.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Stumpy has appeared with a stumping sound that rings the Stone Mountain.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + eastRockyMountain5.spawnMonsterOnGroundBelow(stumpy, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + eastRockyMountain5.broadcastMessage(MaplePacketCreator.serverNotice(6, "Stumpy has appeared with a stumping sound that rings the Stone Mountain.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTaeRoon.js b/scripts/event/AreaBossTaeRoon.js index 862fef4394..29532d19c2 100644 --- a/scripts/event/AreaBossTaeRoon.js +++ b/scripts/event/AreaBossTaeRoon.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,7 +42,8 @@ function cancelSchedule() { function start() { var territoryOfWanderingBear = em.getChannelServer().getMapFactory().getMap(250010304); - var taeRoon = Packages.server.life.MapleLifeFactory.getMonster(7220000); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var taeRoon = MapleLifeFactory.getMonster(7220000); if(territoryOfWanderingBear.getMonsterById(7220000) != null) { em.schedule("start", 3 * 60 * 60 * 1000); @@ -54,8 +53,12 @@ function start() { var posX; var posY = 390; posX = Math.floor((Math.random() * 700) - 800); - territoryOfWanderingBear.spawnMonsterOnGroundBelow(taeRoon, new Packages.java.awt.Point(posX, posY)); - territoryOfWanderingBear.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Tae Roon has appeared with a soft whistling sound.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + territoryOfWanderingBear.spawnMonsterOnGroundBelow(taeRoon, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + territoryOfWanderingBear.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tae Roon has appeared with a soft whistling sound.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTimer1.js b/scripts/event/AreaBossTimer1.js index 0ba63a009f..2d76789b54 100644 --- a/scripts/event/AreaBossTimer1.js +++ b/scripts/event/AreaBossTimer1.js @@ -26,8 +26,6 @@ ThreeStep - based on xQuasar's King Clang spawner **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -43,7 +41,8 @@ function cancelSchedule() { function start() { var whirlpoolOfTime = em.getChannelServer().getMapFactory().getMap(220050100); - var timer1 = Packages.server.life.MapleLifeFactory.getMonster(5220003); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var timer1 = MapleLifeFactory.getMonster(5220003); if(whirlpoolOfTime.getMonsterById(5220003) != null) { em.schedule("start", 3 * 60 * 60 * 1000); @@ -53,8 +52,12 @@ function start() { var posX; var posY = 1030; posX = Math.floor((Math.random() * 770) - 770); - whirlpoolOfTime.spawnMonsterOnGroundBelow(timer1, new Packages.java.awt.Point(posX, posY)); - whirlpoolOfTime.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + whirlpoolOfTime.spawnMonsterOnGroundBelow(timer1, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + whirlpoolOfTime.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTimer2.js b/scripts/event/AreaBossTimer2.js index 0618e87b3e..51aa4efc23 100644 --- a/scripts/event/AreaBossTimer2.js +++ b/scripts/event/AreaBossTimer2.js @@ -27,8 +27,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -44,7 +42,8 @@ function cancelSchedule() { function start() { var lostTime1 = em.getChannelServer().getMapFactory().getMap(220050000); - var timer2 = Packages.server.life.MapleLifeFactory.getMonster(5220003); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var timer2 = MapleLifeFactory.getMonster(5220003); if(lostTime1.getMonsterById(5220003) != null) { em.schedule("start", 3 * 60 * 60 * 1000); @@ -54,8 +53,12 @@ function start() { var posX; var posY = 1030; posX = Math.floor((Math.random() * 1400) - 1000); - lostTime1.spawnMonsterOnGroundBelow(timer2, new Packages.java.awt.Point(posX, posY)); - lostTime1.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + lostTime1.spawnMonsterOnGroundBelow(timer2, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + lostTime1.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/AreaBossTimer3.js b/scripts/event/AreaBossTimer3.js index 6642cc05cf..cd5d9a73fb 100644 --- a/scripts/event/AreaBossTimer3.js +++ b/scripts/event/AreaBossTimer3.js @@ -28,8 +28,6 @@ **/ -importPackage(Packages.client); - function init() { scheduleNew(); } @@ -45,7 +43,8 @@ function cancelSchedule() { function start() { var lostTime2 = em.getChannelServer().getMapFactory().getMap(220050200); - var timer3 = Packages.server.life.MapleLifeFactory.getMonster(5220003); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var timer3 = MapleLifeFactory.getMonster(5220003); if(lostTime2.getMonsterById(5220003) != null) { em.schedule("start", 3 * 60 * 60 * 1000); @@ -55,8 +54,12 @@ function start() { var posX; var posY = 1030; posX = Math.floor((Math.random() * 1400) - 700); - lostTime2.spawnMonsterOnGroundBelow(timer3, new Packages.java.awt.Point(posX, posY)); - lostTime2.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); + const Point = Java.type('java.awt.Point'); + const spawnpoint = new Point(posX, posY); + lostTime2.spawnMonsterOnGroundBelow(timer3, spawnpoint); + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + lostTime2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known.")); em.schedule("start", 3 * 60 * 60 * 1000); } diff --git a/scripts/event/BalrogBattle.js b/scripts/event/BalrogBattle.js index 0517777dda..72b34dcbb9 100644 --- a/scripts/event/BalrogBattle.js +++ b/scripts/event/BalrogBattle.js @@ -23,8 +23,6 @@ * @event: Vs Balrog */ -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 6, maxPlayers = 30; var minLevel = 50, maxLevel = 255; @@ -136,14 +134,17 @@ function releaseLeftClaw(eim) { function spawnBalrog(eim) { var mapObj = eim.getInstanceMap(entryMap); - - mapObj.spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830000), new Packages.java.awt.Point(412, 258)); - mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830002), new Packages.java.awt.Point(412, 258)); - mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830006), new Packages.java.awt.Point(412, 258)); + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); + mapObj.spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830000), new Point(412, 258)); + mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830002), new Point(412, 258)); + mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830006), new Point(412, 258)); } function spawnSealedBalrog(eim) { - eim.getInstanceMap(entryMap).spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(bossMobId), new Packages.java.awt.Point(412, 258)); + const Point = Java.type('java.awt.Point'); + eim.getInstanceMap(entryMap).spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(bossMobId), new Point(412, 258)); } function playerEntry(eim, player) { diff --git a/scripts/event/BalrogBattle_Easy.js b/scripts/event/BalrogBattle_Easy.js index 1fa9b7da5f..6c5603ac91 100644 --- a/scripts/event/BalrogBattle_Easy.js +++ b/scripts/event/BalrogBattle_Easy.js @@ -23,8 +23,6 @@ * @event: Vs Balrog */ -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 3, maxPlayers = 30; var minLevel = 50, maxLevel = 255; @@ -136,14 +134,17 @@ function releaseLeftClaw(eim) { function spawnBalrog(eim) { var mapObj = eim.getInstanceMap(entryMap); - - mapObj.spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830007), new Packages.java.awt.Point(412, 258)); - mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830009), new Packages.java.awt.Point(412, 258)); - mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830013), new Packages.java.awt.Point(412, 258)); + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); + mapObj.spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830007), new Point(412, 258)); + mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830009), new Point(412, 258)); + mapObj.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8830013), new Point(412, 258)); } function spawnSealedBalrog(eim) { - eim.getInstanceMap(entryMap).spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(bossMobId), new Packages.java.awt.Point(412, 258)); + const Point = Java.type('java.awt.Point'); + eim.getInstanceMap(entryMap).spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(bossMobId), new Point(412, 258)); } function playerEntry(eim, player) { diff --git a/scripts/event/BalrogQuest.js b/scripts/event/BalrogQuest.js index c25725fc24..f7650a484d 100644 --- a/scripts/event/BalrogQuest.js +++ b/scripts/event/BalrogQuest.js @@ -21,7 +21,6 @@ * @Author Ronan * Event - Balrog Quest **/ -importPackage(Packages.tools); var entryMap = 910520000; var exitMap = 105100100; @@ -63,7 +62,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 1); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } @@ -96,7 +96,8 @@ function isBalrog(mob) { function monsterKilled(mob, eim) { if(isBalrog(mob)) { - eim.spawnNpc(1061015, new java.awt.Point(0, 115), mob.getMap()); + const Point = Java.type('java.awt.Point'); + eim.spawnNpc(1061015, new Point(0, 115), mob.getMap()); } } function monsterValue(eim, mobId) { diff --git a/scripts/event/Boats.js b/scripts/event/Boats.js index cea1f52ec6..48daf46225 100644 --- a/scripts/event/Boats.js +++ b/scripts/event/Boats.js @@ -1,7 +1,3 @@ -importPackage(Packages.client); -importPackage(Packages.tools); -importPackage(Packages.server.life); - var Orbis_btf; var Boat_to_Orbis; var Orbis_Boat_Cabin; @@ -88,6 +84,7 @@ function approach() { em.setProperty("haveBalrog","true"); Boat_to_Orbis.broadcastEnemyShip(true); Boat_to_Ellinia.broadcastEnemyShip(true); + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); Boat_to_Orbis.broadcastMessage(MaplePacketCreator.musicChange("Bgm04/ArabPirate")); Boat_to_Ellinia.broadcastMessage(MaplePacketCreator.musicChange("Bgm04/ArabPirate")); @@ -96,6 +93,8 @@ function approach() { } function invasion() { + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + var map1 = Boat_to_Ellinia; var pos1 = new java.awt.Point(-538, 143); map1.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8150000), pos1); diff --git a/scripts/event/Cabin.js b/scripts/event/Cabin.js index a793ad8851..cb602edc1a 100644 --- a/scripts/event/Cabin.js +++ b/scripts/event/Cabin.js @@ -39,8 +39,6 @@ --------------------------------------------------------------------------------------------------- **/ -importPackage(Packages.tools); - var Orbis_btf; var Leafre_btf; var Cabin_to_Orbis; diff --git a/scripts/event/CafePQ_1.js b/scripts/event/CafePQ_1.js index c0f3945d0a..b0c29feadd 100644 --- a/scripts/event/CafePQ_1.js +++ b/scripts/event/CafePQ_1.js @@ -23,8 +23,6 @@ * @event: Cafe PQ 1 */ -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 120; @@ -255,6 +253,7 @@ function monsterKilled(mob, eim) { if(eim.isEventCleared()) return; var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(4001007, 0, getDroppedQuantity(mob)); var dropper = eim.getPlayers().get(0); diff --git a/scripts/event/CafePQ_2.js b/scripts/event/CafePQ_2.js index 7f3108eb6b..bf064b8b90 100644 --- a/scripts/event/CafePQ_2.js +++ b/scripts/event/CafePQ_2.js @@ -23,8 +23,6 @@ * @event: Cafe PQ 2 */ -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 120; @@ -255,6 +253,7 @@ function monsterKilled(mob, eim) { if(eim.isEventCleared()) return; var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(4001007, 0, getDroppedQuantity(mob)); var dropper = eim.getPlayers().get(0); diff --git a/scripts/event/CafePQ_3.js b/scripts/event/CafePQ_3.js index b9b11b3fff..04ab0a61fc 100644 --- a/scripts/event/CafePQ_3.js +++ b/scripts/event/CafePQ_3.js @@ -23,8 +23,6 @@ * @event: Cafe PQ 3 */ -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 120; @@ -255,6 +253,7 @@ function monsterKilled(mob, eim) { if(eim.isEventCleared()) return; var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(4001007, 0, getDroppedQuantity(mob)); var dropper = eim.getPlayers().get(0); diff --git a/scripts/event/CafePQ_4.js b/scripts/event/CafePQ_4.js index 8802c50b38..312958396d 100644 --- a/scripts/event/CafePQ_4.js +++ b/scripts/event/CafePQ_4.js @@ -23,8 +23,6 @@ * @event: Cafe PQ 4 */ -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 120; @@ -255,6 +253,7 @@ function monsterKilled(mob, eim) { if(eim.isEventCleared()) return; var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(4001007, 0, getDroppedQuantity(mob)); var dropper = eim.getPlayers().get(0); diff --git a/scripts/event/CafePQ_5.js b/scripts/event/CafePQ_5.js index 9029263719..4e536f35ee 100644 --- a/scripts/event/CafePQ_5.js +++ b/scripts/event/CafePQ_5.js @@ -23,8 +23,6 @@ * @event: Cafe PQ 5 */ -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 120; @@ -255,6 +253,7 @@ function monsterKilled(mob, eim) { if(eim.isEventCleared()) return; var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(4001007, 0, getDroppedQuantity(mob)); var dropper = eim.getPlayers().get(0); diff --git a/scripts/event/CafePQ_6.js b/scripts/event/CafePQ_6.js index 00ecbd9956..d698ff99d9 100644 --- a/scripts/event/CafePQ_6.js +++ b/scripts/event/CafePQ_6.js @@ -23,8 +23,6 @@ * @event: Cafe PQ 6 */ -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 120; @@ -255,6 +253,7 @@ function monsterKilled(mob, eim) { if(eim.isEventCleared()) return; var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(4001007, 0, 1); var dropper = eim.getPlayers().get(0); diff --git a/scripts/event/DollHouse.js b/scripts/event/DollHouse.js index a01e6e072a..df5d482425 100644 --- a/scripts/event/DollHouse.js +++ b/scripts/event/DollHouse.js @@ -22,7 +22,6 @@ /** *Dollhouse Event **/ -importPackage(Packages.tools); var entryMap = 922000010; var exitMap = 221024400; @@ -46,7 +45,8 @@ function playerEntry(eim, player) { player.changeMap(entryMap, 0); em.setProperty("noEntry","true"); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60)); eim.startEventTimer(eventTime * 60000); } diff --git a/scripts/event/Genie.js b/scripts/event/Genie.js index 26f3ac5bfa..1894771858 100644 --- a/scripts/event/Genie.js +++ b/scripts/event/Genie.js @@ -19,7 +19,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -importPackage(Packages.tools); var Orbis_btf; var Genie_to_Orbis; diff --git a/scripts/event/Hak.js b/scripts/event/Hak.js index 24e33279d9..536124e21d 100644 --- a/scripts/event/Hak.js +++ b/scripts/event/Hak.js @@ -1,5 +1,3 @@ -importPackage(Packages.tools); - var returnTo = new Array(200000141, 250000100); var rideTo = new Array(250000100, 200000141); var birdRide = new Array(200090300, 200090310); @@ -33,7 +31,8 @@ function playerEntry(eim, player) { returnMap = eim.getMapFactory().getMap(returnTo[myRide]); onRide = eim.getMapFactory().getMap(birdRide[myRide]); player.changeMap(onRide, onRide.getPortal(0)); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000)); eim.schedule("timeOut", rideTime); } diff --git a/scripts/event/HolidayPQ_1.js b/scripts/event/HolidayPQ_1.js index 56a8538067..5e193a992b 100644 --- a/scripts/event/HolidayPQ_1.js +++ b/scripts/event/HolidayPQ_1.js @@ -25,9 +25,6 @@ // GMS-like event string data thanks to iHealForLove -importPackage(Packages.client.inventory); -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 21, maxLevel = 30; @@ -277,6 +274,7 @@ function monsterKilled(mob, eim) { } var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item((forceDrop || Math.random() < 0.77) ? 4032094 : 4032095, 0, 1); // 77% chance of not fake var dropper = eim.getPlayers().get(0); @@ -305,9 +303,11 @@ function snowmanEvolve(eim, curLevel) { eim.setIntProperty("snowmanLevel", curLevel + 2); // increment by 2 to decrement by 1 on friendlyKilled mapobj.killMonster(snowman, null, false, 2); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var snowman = MapleLifeFactory.getMonster(9400317 + (5 * difficulty) + curLevel); - mapobj.spawnMonsterOnGroundBelow(snowman, new java.awt.Point(-180, 15)); + mapobj.spawnMonsterOnGroundBelow(snowman, new Point(-180, 15)); if(curLevel >= 4) { mapobj.allowSummonState(false); diff --git a/scripts/event/HolidayPQ_2.js b/scripts/event/HolidayPQ_2.js index a01aa60782..3b3dddf780 100644 --- a/scripts/event/HolidayPQ_2.js +++ b/scripts/event/HolidayPQ_2.js @@ -25,9 +25,6 @@ // GMS-like event string data thanks to iHealForLove -importPackage(Packages.client.inventory); -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 31, maxLevel = 40; @@ -277,6 +274,7 @@ function monsterKilled(mob, eim) { } var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item((forceDrop || Math.random() < 0.77) ? 4032094 : 4032095, 0, 1); // 77% chance of not fake var dropper = eim.getPlayers().get(0); @@ -305,9 +303,11 @@ function snowmanEvolve(eim, curLevel) { eim.setIntProperty("snowmanLevel", curLevel + 2); // increment by 2 to decrement by 1 on friendlyKilled mapobj.killMonster(snowman, null, false, 2); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var snowman = MapleLifeFactory.getMonster(9400317 + (5 * difficulty) + curLevel); - mapobj.spawnMonsterOnGroundBelow(snowman, new java.awt.Point(-180, 15)); + mapobj.spawnMonsterOnGroundBelow(snowman, new Point(-180, 15)); if(curLevel >= 4) { mapobj.allowSummonState(false); diff --git a/scripts/event/HolidayPQ_3.js b/scripts/event/HolidayPQ_3.js index afb2cc7459..b25b3a1998 100644 --- a/scripts/event/HolidayPQ_3.js +++ b/scripts/event/HolidayPQ_3.js @@ -25,9 +25,6 @@ // GMS-like event string data thanks to iHealForLove -importPackage(Packages.client.inventory); -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 3, maxPlayers = 6; var minLevel = 41, maxLevel = 50; @@ -277,6 +274,7 @@ function monsterKilled(mob, eim) { } var mapObj = mob.getMap(); + const Item = Java.type('client.inventory.Item'); var itemObj = new Item((forceDrop || Math.random() < 0.77) ? 4032094 : 4032095, 0, 1); // 77% chance of not fake var dropper = eim.getPlayers().get(0); @@ -305,9 +303,11 @@ function snowmanEvolve(eim, curLevel) { eim.setIntProperty("snowmanLevel", curLevel + 2); // increment by 2 to decrement by 1 on friendlyKilled mapobj.killMonster(snowman, null, false, 2); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var snowman = MapleLifeFactory.getMonster(9400317 + (5 * difficulty) + curLevel); - mapobj.spawnMonsterOnGroundBelow(snowman, new java.awt.Point(-180, 15)); + mapobj.spawnMonsterOnGroundBelow(snowman, new Point(-180, 15)); if(curLevel >= 4) { mapobj.allowSummonState(false); diff --git a/scripts/event/HorntailBattle.js b/scripts/event/HorntailBattle.js index a49801f525..39e9e8b03a 100644 --- a/scripts/event/HorntailBattle.js +++ b/scripts/event/HorntailBattle.js @@ -23,8 +23,6 @@ * @event: Horntail Battle */ -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 6, maxPlayers = 30; var minLevel = 100, maxLevel = 255; @@ -97,15 +95,17 @@ function setup(channel) { eim.getInstanceMap(240060000).resetPQ(level); eim.getInstanceMap(240060100).resetPQ(level); eim.getInstanceMap(240060200).resetPQ(level); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var map, mob; map = eim.getInstanceMap(240060000); mob = MapleLifeFactory.getMonster(8810000); - map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(960, 120)); + map.spawnMonsterOnGroundBelow(mob, new Point(960, 120)); map = eim.getInstanceMap(240060100); mob = MapleLifeFactory.getMonster(8810001); - map.spawnMonsterOnGroundBelow(mob, new java.awt.Point(-420, 120)); + map.spawnMonsterOnGroundBelow(mob, new Point(-420, 120)); eim.startEventTimer(eventTime * 60000); setEventRewards(eim); diff --git a/scripts/event/KerningTrain.js b/scripts/event/KerningTrain.js index 516af052c5..09f707ee27 100644 --- a/scripts/event/KerningTrain.js +++ b/scripts/event/KerningTrain.js @@ -1,5 +1,3 @@ -importPackage(Packages.tools); - var returnTo = new Array(103000100, 103000310); var rideTo = new Array(103000310, 103000100); var trainRide = new Array(103000301, 103000302); @@ -34,7 +32,8 @@ function playerEntry(eim, player) { returnMap = eim.getMapFactory().getMap(returnTo[myRide]); onRide = eim.getMapFactory().getMap(trainRide[myRide]); player.changeMap(onRide, onRide.getPortal(0)); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000)); player.getClient().announce(MaplePacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left.")); eim.schedule("timeOut", rideTime); diff --git a/scripts/event/MK_PrimeMinister.js b/scripts/event/MK_PrimeMinister.js index 0ef72ad21d..93e5ec2742 100644 --- a/scripts/event/MK_PrimeMinister.js +++ b/scripts/event/MK_PrimeMinister.js @@ -1,6 +1,3 @@ -importPackage(Packages.tools); -importPackage(Packages.server.life); - var eventTime = 10 * 60 * 1000; // 10 minutes var entryMap = 106021600; var exitMap = 106021402; @@ -66,7 +63,9 @@ function respawn(eim){ var weddinghall = eim.getMapInstance(entryMap); weddinghall.getPortal(1).setPortalState(false); - weddinghall.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), new java.awt.Point(292, 143)); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); + weddinghall.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), new Point(292, 143)); } else { eim.schedule("respawn", 10000); } diff --git a/scripts/event/MK_PrimeMinister2.js b/scripts/event/MK_PrimeMinister2.js index 32e2788366..dc64c4e0e7 100644 --- a/scripts/event/MK_PrimeMinister2.js +++ b/scripts/event/MK_PrimeMinister2.js @@ -1,6 +1,3 @@ -importPackage(Packages.tools); -importPackage(Packages.server.life); - var eventTime = 10 * 60 * 1000; // 10 minutes var entryMap = 106021601; var exitMap = 106021402; @@ -57,7 +54,9 @@ function respawn(eim){ var weddinghall = eim.getMapInstance(entryMap); weddinghall.getPortal(1).setPortalState(false); - weddinghall.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), new java.awt.Point(292, 143)); + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); + weddinghall.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), new Point(292, 143)); } else { eim.schedule("respawn", 10000); } diff --git a/scripts/event/MagatiaPQ_A.js b/scripts/event/MagatiaPQ_A.js index 663e0ef781..b96be131ae 100644 --- a/scripts/event/MagatiaPQ_A.js +++ b/scripts/event/MagatiaPQ_A.js @@ -23,8 +23,6 @@ * @event: Magatia PQ (Alcadno) */ -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 4, maxPlayers = 4; var minLevel = 71, maxLevel = 85; @@ -144,11 +142,12 @@ function setup(level, lobbyid) { eim.getInstanceMap(926110201).shuffleReactors(2518000, 2612004); eim.getInstanceMap(926110202).shuffleReactors(2518000, 2612004); - - eim.spawnNpc(2112010, new java.awt.Point(252, 243), eim.getInstanceMap(926110203)); - eim.spawnNpc(2112010, new java.awt.Point(200, 100), eim.getInstanceMap(926110401)); - eim.spawnNpc(2112011, new java.awt.Point(200, 100), eim.getInstanceMap(926110500)); - eim.spawnNpc(2112018, new java.awt.Point(200, 100), eim.getInstanceMap(926110600)); + + const Point = Java.type('java.awt.Point'); + eim.spawnNpc(2112010, new Point(252, 243), eim.getInstanceMap(926110203)); + eim.spawnNpc(2112010, new Point(200, 100), eim.getInstanceMap(926110401)); + eim.spawnNpc(2112011, new Point(200, 100), eim.getInstanceMap(926110500)); + eim.spawnNpc(2112018, new Point(200, 100), eim.getInstanceMap(926110600)); respawnStages(eim); eim.startEventTimer(eventTime * 60000); @@ -245,15 +244,17 @@ function respawnStages(eim) { var mapobj = eim.getMapInstance(926110401); var mobcount = mapobj.countMonster(9300150); var mobobj; + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); if(mobcount == 0) { mobobj = MapleLifeFactory.getMonster(9300150); - mapobj.spawnMonsterOnGroundBelow(mobobj, new Packages.java.awt.Point(-278, -126)); + mapobj.spawnMonsterOnGroundBelow(mobobj, new Point(-278, -126)); mobobj = MapleLifeFactory.getMonster(9300150); - mapobj.spawnMonsterOnGroundBelow(mobobj, new Packages.java.awt.Point(-542, -126)); + mapobj.spawnMonsterOnGroundBelow(mobobj, new Point(-542, -126)); } else if(mobcount == 1) { mobobj = MapleLifeFactory.getMonster(9300150); - mapobj.spawnMonsterOnGroundBelow(mobobj, new Packages.java.awt.Point(-542, -126)); + mapobj.spawnMonsterOnGroundBelow(mobobj, new Point(-542, -126)); } } @@ -311,14 +312,16 @@ function yuleteAction(eim) { var mob1 = 9300143, mob2 = 9300144; mapobj.destroyNPC(2112010); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var mobobj1, mobobj2; for(var i = 0; i < 5; i++) { mobobj1 = MapleLifeFactory.getMonster(mob1); mobobj2 = MapleLifeFactory.getMonster(mob2); - mapobj.spawnMonsterOnGroundBelow(mobobj1, new Packages.java.awt.Point(-455, 135)); - mapobj.spawnMonsterOnGroundBelow(mobobj2, new Packages.java.awt.Point(-455, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj1, new Point(-455, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj2, new Point(-455, 135)); } @@ -326,8 +329,8 @@ function yuleteAction(eim) { mobobj1 = MapleLifeFactory.getMonster(mob1); mobobj2 = MapleLifeFactory.getMonster(mob2); - mapobj.spawnMonsterOnGroundBelow(mobobj1, new Packages.java.awt.Point(0, 135)); - mapobj.spawnMonsterOnGroundBelow(mobobj2, new Packages.java.awt.Point(0, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj1, new Point(0, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj2, new Point(0, 135)); } @@ -335,8 +338,8 @@ function yuleteAction(eim) { mobobj1 = MapleLifeFactory.getMonster(mob1); mobobj2 = MapleLifeFactory.getMonster(mob2); - mapobj.spawnMonsterOnGroundBelow(mobobj1, new Packages.java.awt.Point(360, 135)); - mapobj.spawnMonsterOnGroundBelow(mobobj2, new Packages.java.awt.Point(360, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj1, new Point(360, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj2, new Point(360, 135)); } } diff --git a/scripts/event/MagatiaPQ_Z.js b/scripts/event/MagatiaPQ_Z.js index 3dea1423b2..45ca08e720 100644 --- a/scripts/event/MagatiaPQ_Z.js +++ b/scripts/event/MagatiaPQ_Z.js @@ -23,8 +23,6 @@ * @event: Magatia PQ (Zenumist) */ -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 4, maxPlayers = 4; var minLevel = 71, maxLevel = 85; @@ -144,11 +142,12 @@ function setup(level, lobbyid) { eim.getInstanceMap(926100201).shuffleReactors(2518000, 2612004); eim.getInstanceMap(926100202).shuffleReactors(2518000, 2612004); - - eim.spawnNpc(2112000, new java.awt.Point(252, 243), eim.getInstanceMap(926100203)); - eim.spawnNpc(2112000, new java.awt.Point(200, 100), eim.getInstanceMap(926100401)); - eim.spawnNpc(2112001, new java.awt.Point(200, 100), eim.getInstanceMap(926100500)); - eim.spawnNpc(2112018, new java.awt.Point(200, 100), eim.getInstanceMap(926100600)); + + const Point = Java.type('java.awt.Point'); + eim.spawnNpc(2112000, new Point(252, 243), eim.getInstanceMap(926100203)); + eim.spawnNpc(2112000, new Point(200, 100), eim.getInstanceMap(926100401)); + eim.spawnNpc(2112001, new Point(200, 100), eim.getInstanceMap(926100500)); + eim.spawnNpc(2112018, new Point(200, 100), eim.getInstanceMap(926100600)); respawnStages(eim); eim.startEventTimer(eventTime * 60000); @@ -245,15 +244,17 @@ function respawnStages(eim) { var mapobj = eim.getMapInstance(926100401); var mobcount = mapobj.countMonster(9300150); var mobobj; + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); if(mobcount == 0) { mobobj = MapleLifeFactory.getMonster(9300150); - mapobj.spawnMonsterOnGroundBelow(mobobj, new Packages.java.awt.Point(-278, -126)); + mapobj.spawnMonsterOnGroundBelow(mobobj, new Point(-278, -126)); mobobj = MapleLifeFactory.getMonster(9300150); - mapobj.spawnMonsterOnGroundBelow(mobobj, new Packages.java.awt.Point(-542, -126)); + mapobj.spawnMonsterOnGroundBelow(mobobj, new Point(-542, -126)); } else if(mobcount == 1) { mobobj = MapleLifeFactory.getMonster(9300150); - mapobj.spawnMonsterOnGroundBelow(mobobj, new Packages.java.awt.Point(-542, -126)); + mapobj.spawnMonsterOnGroundBelow(mobobj, new Point(-542, -126)); } } @@ -311,14 +312,16 @@ function yuleteAction(eim) { var mob1 = 9300143, mob2 = 9300144; mapobj.destroyNPC(2112000); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var mobobj1, mobobj2; for(var i = 0; i < 5; i++) { mobobj1 = MapleLifeFactory.getMonster(mob1); mobobj2 = MapleLifeFactory.getMonster(mob2); - mapobj.spawnMonsterOnGroundBelow(mobobj1, new Packages.java.awt.Point(-455, 135)); - mapobj.spawnMonsterOnGroundBelow(mobobj2, new Packages.java.awt.Point(-455, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj1, new Point(-455, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj2, new Point(-455, 135)); } @@ -326,8 +329,8 @@ function yuleteAction(eim) { mobobj1 = MapleLifeFactory.getMonster(mob1); mobobj2 = MapleLifeFactory.getMonster(mob2); - mapobj.spawnMonsterOnGroundBelow(mobobj1, new Packages.java.awt.Point(0, 135)); - mapobj.spawnMonsterOnGroundBelow(mobobj2, new Packages.java.awt.Point(0, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj1, new Point(0, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj2, new Point(0, 135)); } @@ -335,8 +338,8 @@ function yuleteAction(eim) { mobobj1 = MapleLifeFactory.getMonster(mob1); mobobj2 = MapleLifeFactory.getMonster(mob2); - mapobj.spawnMonsterOnGroundBelow(mobobj1, new Packages.java.awt.Point(360, 135)); - mapobj.spawnMonsterOnGroundBelow(mobobj2, new Packages.java.awt.Point(360, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj1, new Point(360, 135)); + mapobj.spawnMonsterOnGroundBelow(mobobj2, new Point(360, 135)); } } diff --git a/scripts/event/PinkBeanBattle.js b/scripts/event/PinkBeanBattle.js index 71f178f023..a8ad13d961 100644 --- a/scripts/event/PinkBeanBattle.js +++ b/scripts/event/PinkBeanBattle.js @@ -23,9 +23,6 @@ * @event: Pink Bean Battle */ -importPackage(Packages.server.life); -importPackage(Packages.client.inventory); - var isPq = true; var minPlayers = 6, maxPlayers = 30; var minLevel = 120, maxLevel = 255; @@ -104,10 +101,12 @@ function setup(channel) { eim.getInstanceMap(270050100).resetPQ(level); eim.getInstanceMap(270050200).resetPQ(level); eim.getInstanceMap(270050300).resetPQ(level); - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); + const Point = Java.type('java.awt.Point'); var mob = MapleLifeFactory.getMonster(8820000); mob.disableDrops(); - eim.getInstanceMap(270050100).spawnMonsterOnGroundBelow(mob, new java.awt.Point(0, -42)); + eim.getInstanceMap(270050100).spawnMonsterOnGroundBelow(mob, new Point(0, -42)); eim.startEventTimer(eventTime * 60000); setEventRewards(eim); @@ -234,7 +233,8 @@ function spawnJrBoss(mobObj, gotKilled) { mobObj.getMap().killMonster(mobObj.getId()); spawnid = mobObj.getId() - 17; } - + + const MapleLifeFactory = Java.type('server.life.MapleLifeFactory'); var mob = MapleLifeFactory.getMonster(spawnid); mobObj.getMap().spawnMonsterOnGroundBelow(mob, mobObj.getPosition()); } @@ -254,6 +254,7 @@ function monsterKilled(mob, eim) { if(stage == 5) { var iid = 4001193; + const Item = Java.type('client.inventory.Item'); var itemObj = new Item(iid, 0, 1); var mapObj = eim.getMapFactory().getMap(270050100); var reactObj = mapObj.getReactorById(2708000); diff --git a/scripts/event/RescueGaga.js b/scripts/event/RescueGaga.js index dc9dd6b7c7..48c662c2e6 100644 --- a/scripts/event/RescueGaga.js +++ b/scripts/event/RescueGaga.js @@ -3,8 +3,6 @@ * @author: Ronan */ -importPackage(Packages.tools); - var isPq = true; var minPlayers = 1, maxPlayers = 1; var minLevel = 12, maxLevel = 255; @@ -102,7 +100,8 @@ function respawnStages(eim) {} function playerEntry(eim, player) { var map = eim.getMapInstance(entryMap); player.changeMap(map, map.getPortal(0)); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); player.announce(MaplePacketCreator.showEffect("event/space/start")); player.startMapEffect("Please rescue Gaga within the time limit.", 5120027); } @@ -199,7 +198,8 @@ function clearPQ(eim) { } function spawnGrandpaBunny(eim) { - eim.spawnNpc(9001105, new java.awt.Point(175, -20), eim.getInstanceMap(maxMapId)); + const Point = Java.type('java.awt.Point'); + eim.spawnNpc(9001105, new Point(175, -20), eim.getInstanceMap(maxMapId)); } function monsterKilled(mob, eim) {} diff --git a/scripts/event/RockSpirit.js b/scripts/event/RockSpirit.js index 9bd0726582..d7a8970269 100644 --- a/scripts/event/RockSpirit.js +++ b/scripts/event/RockSpirit.js @@ -19,8 +19,6 @@ along with this program. If not, see . */ -importPackage(Packages.tools); - var entryMap; var exitMap; var otherMap; diff --git a/scripts/event/RockSpiritVIP.js b/scripts/event/RockSpiritVIP.js index 60085fb57d..58cf3e9b72 100644 --- a/scripts/event/RockSpiritVIP.js +++ b/scripts/event/RockSpiritVIP.js @@ -19,8 +19,6 @@ along with this program. If not, see . */ -importPackage(Packages.tools); - var entryMap; var exitMap; var otherMap; diff --git a/scripts/event/Subway.js b/scripts/event/Subway.js index 0ddc29268f..9cd8d68ddd 100644 --- a/scripts/event/Subway.js +++ b/scripts/event/Subway.js @@ -1,5 +1,3 @@ -importPackage(Packages.tools); - var KC_Waiting; var Subway_to_KC; var KC_docked; @@ -38,6 +36,8 @@ function stopEntry() { } function takeoff() { + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); + //sound src: https://www.soundjay.com/transportation/metro-door-close-01.mp3 KC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); NLC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); @@ -52,7 +52,8 @@ function arrived() { Subway_to_KC.warpEveryone(KC_docked.getId(), 0); Subway_to_NLC.warpEveryone(NLC_docked.getId(), 0); scheduleNew(); - + + const MaplePacketCreator = Java.type('tools.MaplePacketCreator'); KC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); NLC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle")); } diff --git a/scripts/event/Trains.js b/scripts/event/Trains.js index 63a41ee2af..ae27b326fb 100644 --- a/scripts/event/Trains.js +++ b/scripts/event/Trains.js @@ -1,5 +1,3 @@ -importPackage(Packages.tools); - var Orbis_btf; var Train_to_Orbis; var Orbis_docked; diff --git a/scripts/event/ZakumBattle.js b/scripts/event/ZakumBattle.js index 0df9871263..c317a56653 100644 --- a/scripts/event/ZakumBattle.js +++ b/scripts/event/ZakumBattle.js @@ -23,8 +23,6 @@ * @event: Zakum Battle */ -importPackage(Packages.server.life); - var isPq = true; var minPlayers = 6, maxPlayers = 30; var minLevel = 50, maxLevel = 255;