From 0c1545f81d743dd07be444bb5d2d93ed31759e10 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 23:32:43 +0200 Subject: [PATCH] Reformat and clean up map scripts --- scripts/map/onFirstUserEnter/dojang_1st.js | 5 ++- .../map/onFirstUserEnter/spaceGaGa_sMap.js | 6 +-- scripts/map/onUserEnter/100000006.js | 24 +++++------ scripts/map/onUserEnter/101000301.js | 14 +++---- scripts/map/onUserEnter/108010101.js | 35 ++++++++-------- scripts/map/onUserEnter/108010201.js | 35 ++++++++-------- scripts/map/onUserEnter/108010301.js | 35 ++++++++-------- scripts/map/onUserEnter/108010401.js | 35 ++++++++-------- scripts/map/onUserEnter/108010501.js | 35 ++++++++-------- scripts/map/onUserEnter/108010600.js | 10 ++--- scripts/map/onUserEnter/108010610.js | 10 ++--- scripts/map/onUserEnter/108010620.js | 10 ++--- scripts/map/onUserEnter/108010630.js | 10 ++--- scripts/map/onUserEnter/108010640.js | 10 ++--- scripts/map/onUserEnter/130030000.js | 4 +- scripts/map/onUserEnter/130030001.js | 4 +- scripts/map/onUserEnter/200000112.js | 14 +++---- scripts/map/onUserEnter/200000122.js | 14 +++---- scripts/map/onUserEnter/200000132.js | 14 +++---- scripts/map/onUserEnter/200000152.js | 14 +++---- scripts/map/onUserEnter/200090000.js | 14 +++---- scripts/map/onUserEnter/200090010.js | 14 +++---- scripts/map/onUserEnter/220000111.js | 14 +++---- scripts/map/onUserEnter/240000111.js | 14 +++---- scripts/map/onUserEnter/260000110.js | 14 +++---- scripts/map/onUserEnter/540010001.js | 14 +++---- scripts/map/onUserEnter/540010100.js | 14 +++---- scripts/map/onUserEnter/600010002.js | 14 +++---- scripts/map/onUserEnter/600010004.js | 14 +++---- scripts/map/onUserEnter/677000001.js | 26 ++++++------ scripts/map/onUserEnter/677000003.js | 26 ++++++------ scripts/map/onUserEnter/677000005.js | 26 ++++++------ scripts/map/onUserEnter/677000007.js | 26 ++++++------ scripts/map/onUserEnter/677000009.js | 26 ++++++------ scripts/map/onUserEnter/677000012.js | 26 ++++++------ scripts/map/onUserEnter/914000100.js | 4 +- scripts/map/onUserEnter/922000000.js | 10 ++--- scripts/map/onUserEnter/925040100.js | 18 ++++----- scripts/map/onUserEnter/926000000.js | 18 ++++----- scripts/map/onUserEnter/926000010.js | 8 ++-- scripts/map/onUserEnter/926120300.js | 16 ++++---- scripts/map/onUserEnter/Massacre_result.js | 8 ++-- scripts/map/onUserEnter/PromiseDragon.js | 6 +-- scripts/map/onUserEnter/Resi_tutor10.js | 4 +- scripts/map/onUserEnter/Resi_tutor20.js | 4 +- scripts/map/onUserEnter/Resi_tutor30.js | 6 +-- scripts/map/onUserEnter/Resi_tutor40.js | 4 +- scripts/map/onUserEnter/Resi_tutor50.js | 6 +-- scripts/map/onUserEnter/Resi_tutor60.js | 4 +- scripts/map/onUserEnter/Resi_tutor70.js | 6 +-- scripts/map/onUserEnter/Resi_tutor80.js | 4 +- scripts/map/onUserEnter/aranDirection.js | 2 +- scripts/map/onUserEnter/babyPigMap.js | 6 +-- .../map/onUserEnter/cannon_tuto_direction.js | 2 +- .../map/onUserEnter/cannon_tuto_direction1.js | 2 +- scripts/map/onUserEnter/crash_Dragon.js | 4 +- scripts/map/onUserEnter/cygnusJobTutorial.js | 2 +- scripts/map/onUserEnter/dojang_Eff.js | 5 ++- scripts/map/onUserEnter/dojang_Msg.js | 4 +- scripts/map/onUserEnter/evanleaveD.js | 4 +- scripts/map/onUserEnter/explorationPoint.js | 40 +++++++++---------- scripts/map/onUserEnter/getDragonEgg.js | 4 +- scripts/map/onUserEnter/go10000.js | 4 +- scripts/map/onUserEnter/go1000000.js | 4 +- scripts/map/onUserEnter/go1010000.js | 4 +- scripts/map/onUserEnter/go1010100.js | 4 +- scripts/map/onUserEnter/go1010200.js | 4 +- scripts/map/onUserEnter/go1010300.js | 4 +- scripts/map/onUserEnter/go1020000.js | 4 +- scripts/map/onUserEnter/go20000.js | 6 +-- scripts/map/onUserEnter/go30000.js | 4 +- scripts/map/onUserEnter/go40000.js | 4 +- scripts/map/onUserEnter/go50000.js | 4 +- scripts/map/onUserEnter/goAdventure.js | 2 +- scripts/map/onUserEnter/goArcher.js | 2 +- scripts/map/onUserEnter/goLith.js | 2 +- scripts/map/onUserEnter/goMagician.js | 2 +- scripts/map/onUserEnter/goPirate.js | 2 +- scripts/map/onUserEnter/goRogue.js | 2 +- scripts/map/onUserEnter/goSwordman.js | 2 +- scripts/map/onUserEnter/highposition.js | 2 +- scripts/map/onUserEnter/iceCave.js | 14 +++---- scripts/map/onUserEnter/meetWithDragon.js | 6 +-- scripts/map/onUserEnter/pepeking_effect.js | 14 +++---- scripts/map/onUserEnter/rien.js | 8 ++-- scripts/map/onUserEnter/rienArrow.js | 8 ++-- scripts/map/onUserEnter/startEreb.js | 6 +-- 87 files changed, 473 insertions(+), 466 deletions(-) diff --git a/scripts/map/onFirstUserEnter/dojang_1st.js b/scripts/map/onFirstUserEnter/dojang_1st.js index 07c210d9ff..68d970959b 100644 --- a/scripts/map/onFirstUserEnter/dojang_1st.js +++ b/scripts/map/onFirstUserEnter/dojang_1st.js @@ -19,6 +19,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ + /* *@Author: Moogra, Traitor, Ronan *@Map(s): All Dojo fighting maps @@ -30,13 +31,13 @@ function start(ms) { ms.getPlayer().resetEnteredScript(); var stage = Math.floor(ms.getMapId() / 100) % 100; var callBoss = false; - + if (stage % 6 == 0) { ms.getClient().getChannelServer().dismissDojoSchedule(ms.getMapId(), ms.getParty()); ms.getClient().getChannelServer().setDojoProgress(ms.getMapId()); } else { callBoss = ms.getClient().getChannelServer().setDojoProgress(ms.getMapId()); - + var realstage = stage - ((stage / 6) | 0); var mob = ms.getMonsterLifeFactory(9300183 + realstage); if (callBoss && mob != null && ms.getPlayer().getMap().getMonsterById(9300216) == null) { diff --git a/scripts/map/onFirstUserEnter/spaceGaGa_sMap.js b/scripts/map/onFirstUserEnter/spaceGaGa_sMap.js index 3ec7de09a7..036a264a1a 100644 --- a/scripts/map/onFirstUserEnter/spaceGaGa_sMap.js +++ b/scripts/map/onFirstUserEnter/spaceGaGa_sMap.js @@ -1,4 +1,4 @@ -function start(ms) { - ms.getPlayer().resetEnteredScript(); - ms.spawnMonster(9300331, -28, 0); +function start(ms) { + ms.getPlayer().resetEnteredScript(); + ms.spawnMonster(9300331, -28, 0); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/100000006.js b/scripts/map/onUserEnter/100000006.js index 015c5372d5..dd0d4dfedd 100644 --- a/scripts/map/onUserEnter/100000006.js +++ b/scripts/map/onUserEnter/100000006.js @@ -1,16 +1,16 @@ -function start(ms){ +function start(ms) { - if(ms.getQuestStatus(2175) == 1){ - var mobId = 9300156; - var player = ms.getPlayer(); - var map = player.getMap(); + if (ms.getQuestStatus(2175) == 1) { + var mobId = 9300156; + var player = ms.getPlayer(); + var map = player.getMap(); - if(map.getMonsterById(mobId) != null){ - return; - } + if (map.getMonsterById(mobId) != null) { + return; + } - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), new Point(-1027, 216)); - } + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), new Point(-1027, 216)); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/101000301.js b/scripts/map/onUserEnter/101000301.js index 93379e2bca..3df191c620 100644 --- a/scripts/map/onUserEnter/101000301.js +++ b/scripts/map/onUserEnter/101000301.js @@ -1,11 +1,11 @@ var eventName = "Boats"; var toMap = 200090010; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/108010101.js b/scripts/map/onUserEnter/108010101.js index 9f0ce09a0a..37937646f4 100644 --- a/scripts/map/onUserEnter/108010101.js +++ b/scripts/map/onUserEnter/108010101.js @@ -1,23 +1,24 @@ function start(ms) { - if(ms.getMapId() == 108010101) { // Archer - spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010301) { // Warrior - spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010201) { // Mage - spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010401) { // Thief - spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010501) { // Pirate - spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); - } + if (ms.getMapId() == 108010101) { // Archer + spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010301) { // Warrior + spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010201) { // Mage + spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010401) { // Thief + spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010501) { // Pirate + spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); + } } function spawnMob(x, y, id, map) { - if(map.getMonsterById(id) != null) - return; + if (map.getMonsterById(id) != null) { + return; + } - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - var mob = LifeFactory.getMonster(id); - map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + var mob = LifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010201.js b/scripts/map/onUserEnter/108010201.js index 9f0ce09a0a..37937646f4 100644 --- a/scripts/map/onUserEnter/108010201.js +++ b/scripts/map/onUserEnter/108010201.js @@ -1,23 +1,24 @@ function start(ms) { - if(ms.getMapId() == 108010101) { // Archer - spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010301) { // Warrior - spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010201) { // Mage - spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010401) { // Thief - spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010501) { // Pirate - spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); - } + if (ms.getMapId() == 108010101) { // Archer + spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010301) { // Warrior + spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010201) { // Mage + spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010401) { // Thief + spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010501) { // Pirate + spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); + } } function spawnMob(x, y, id, map) { - if(map.getMonsterById(id) != null) - return; + if (map.getMonsterById(id) != null) { + return; + } - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - var mob = LifeFactory.getMonster(id); - map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + var mob = LifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010301.js b/scripts/map/onUserEnter/108010301.js index 9f0ce09a0a..37937646f4 100644 --- a/scripts/map/onUserEnter/108010301.js +++ b/scripts/map/onUserEnter/108010301.js @@ -1,23 +1,24 @@ function start(ms) { - if(ms.getMapId() == 108010101) { // Archer - spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010301) { // Warrior - spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010201) { // Mage - spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010401) { // Thief - spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010501) { // Pirate - spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); - } + if (ms.getMapId() == 108010101) { // Archer + spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010301) { // Warrior + spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010201) { // Mage + spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010401) { // Thief + spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010501) { // Pirate + spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); + } } function spawnMob(x, y, id, map) { - if(map.getMonsterById(id) != null) - return; + if (map.getMonsterById(id) != null) { + return; + } - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - var mob = LifeFactory.getMonster(id); - map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + var mob = LifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010401.js b/scripts/map/onUserEnter/108010401.js index 9f0ce09a0a..37937646f4 100644 --- a/scripts/map/onUserEnter/108010401.js +++ b/scripts/map/onUserEnter/108010401.js @@ -1,23 +1,24 @@ function start(ms) { - if(ms.getMapId() == 108010101) { // Archer - spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010301) { // Warrior - spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010201) { // Mage - spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010401) { // Thief - spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010501) { // Pirate - spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); - } + if (ms.getMapId() == 108010101) { // Archer + spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010301) { // Warrior + spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010201) { // Mage + spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010401) { // Thief + spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010501) { // Pirate + spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); + } } function spawnMob(x, y, id, map) { - if(map.getMonsterById(id) != null) - return; + if (map.getMonsterById(id) != null) { + return; + } - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - var mob = LifeFactory.getMonster(id); - map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + var mob = LifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010501.js b/scripts/map/onUserEnter/108010501.js index 9f0ce09a0a..37937646f4 100644 --- a/scripts/map/onUserEnter/108010501.js +++ b/scripts/map/onUserEnter/108010501.js @@ -1,23 +1,24 @@ function start(ms) { - if(ms.getMapId() == 108010101) { // Archer - spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010301) { // Warrior - spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010201) { // Mage - spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010401) { // Thief - spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); - } else if(ms.getMapId() == 108010501) { // Pirate - spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); - } + if (ms.getMapId() == 108010101) { // Archer + spawnMob(188, 20, 9001002, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010301) { // Warrior + spawnMob(188, 20, 9001000, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010201) { // Mage + spawnMob(188, 20, 9001001, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010401) { // Thief + spawnMob(188, 20, 9001003, ms.getPlayer().getMap()); + } else if (ms.getMapId() == 108010501) { // Pirate + spawnMob(188, 20, 9001008, ms.getPlayer().getMap()); + } } function spawnMob(x, y, id, map) { - if(map.getMonsterById(id) != null) - return; + if (map.getMonsterById(id) != null) { + return; + } - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - var mob = LifeFactory.getMonster(id); - map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + var mob = LifeFactory.getMonster(id); + map.spawnMonsterOnGroundBelow(mob, new Point(x, y)); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010600.js b/scripts/map/onUserEnter/108010600.js index 960ae7fe10..bc10df8e76 100644 --- a/scripts/map/onUserEnter/108010600.js +++ b/scripts/map/onUserEnter/108010600.js @@ -23,9 +23,9 @@ const Point = Java.type('java.awt.Point'); var spawnPos = new Point(2830, 78); function start(ms) { - var mapobj = ms.getMap(); - - if(!mapobj.containsNPC(npcid)) { - ms.spawnNpc(npcid, spawnPos, mapobj); - } + var mapobj = ms.getMap(); + + if (!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010610.js b/scripts/map/onUserEnter/108010610.js index e33a76dc87..055cd1edc1 100644 --- a/scripts/map/onUserEnter/108010610.js +++ b/scripts/map/onUserEnter/108010610.js @@ -23,9 +23,9 @@ const Point = Java.type('java.awt.Point'); var spawnPos = new Point(3395, -322); function start(ms) { - var mapobj = ms.getMap(); - - if(!mapobj.containsNPC(npcid)) { - ms.spawnNpc(npcid, spawnPos, mapobj); - } + var mapobj = ms.getMap(); + + if (!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010620.js b/scripts/map/onUserEnter/108010620.js index db35223e49..b2a4bec341 100644 --- a/scripts/map/onUserEnter/108010620.js +++ b/scripts/map/onUserEnter/108010620.js @@ -23,9 +23,9 @@ const Point = Java.type('java.awt.Point'); var spawnPos = new Point(500, -522); function start(ms) { - var mapobj = ms.getMap(); - - if(!mapobj.containsNPC(npcid)) { - ms.spawnNpc(npcid, spawnPos, mapobj); - } + var mapobj = ms.getMap(); + + if (!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010630.js b/scripts/map/onUserEnter/108010630.js index 325c893061..89155fc40c 100644 --- a/scripts/map/onUserEnter/108010630.js +++ b/scripts/map/onUserEnter/108010630.js @@ -23,9 +23,9 @@ const Point = Java.type('java.awt.Point'); var spawnPos = new Point(-2263, -582); function start(ms) { - var mapobj = ms.getMap(); - - if(!mapobj.containsNPC(npcid)) { - ms.spawnNpc(npcid, spawnPos, mapobj); - } + var mapobj = ms.getMap(); + + if (!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/108010640.js b/scripts/map/onUserEnter/108010640.js index b57b1715ff..17b8c5239f 100644 --- a/scripts/map/onUserEnter/108010640.js +++ b/scripts/map/onUserEnter/108010640.js @@ -23,9 +23,9 @@ const Point = Java.type('java.awt.Point'); var spawnPos = new Point(372, 70); function start(ms) { - var mapobj = ms.getMap(); - - if(!mapobj.containsNPC(npcid)) { - ms.spawnNpc(npcid, spawnPos, mapobj); - } + var mapobj = ms.getMap(); + + if (!mapobj.containsNPC(npcid)) { + ms.spawnNpc(npcid, spawnPos, mapobj); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/130030000.js b/scripts/map/onUserEnter/130030000.js index f789e5ab3b..7a05bd1cb9 100644 --- a/scripts/map/onUserEnter/130030000.js +++ b/scripts/map/onUserEnter/130030000.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.setQuestProgress(20010, 20022, 1); +function start(ms) { + ms.setQuestProgress(20010, 20022, 1); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/130030001.js b/scripts/map/onUserEnter/130030001.js index f789e5ab3b..7a05bd1cb9 100644 --- a/scripts/map/onUserEnter/130030001.js +++ b/scripts/map/onUserEnter/130030001.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.setQuestProgress(20010, 20022, 1); +function start(ms) { + ms.setQuestProgress(20010, 20022, 1); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/200000112.js b/scripts/map/onUserEnter/200000112.js index b1bbdabe14..c4a5c527e7 100644 --- a/scripts/map/onUserEnter/200000112.js +++ b/scripts/map/onUserEnter/200000112.js @@ -1,11 +1,11 @@ var eventName = "Boats"; var toMap = 200090000; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/200000122.js b/scripts/map/onUserEnter/200000122.js index 9bafa6c98a..fc2ac904c8 100644 --- a/scripts/map/onUserEnter/200000122.js +++ b/scripts/map/onUserEnter/200000122.js @@ -1,11 +1,11 @@ var eventName = "Trains"; var toMap = 200090100; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/200000132.js b/scripts/map/onUserEnter/200000132.js index c57f3a831c..2b1cb18740 100644 --- a/scripts/map/onUserEnter/200000132.js +++ b/scripts/map/onUserEnter/200000132.js @@ -1,11 +1,11 @@ var eventName = "Cabin"; var toMap = 200090200; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/200000152.js b/scripts/map/onUserEnter/200000152.js index 670f477205..a31ef79537 100644 --- a/scripts/map/onUserEnter/200000152.js +++ b/scripts/map/onUserEnter/200000152.js @@ -1,11 +1,11 @@ var eventName = "Genie"; var toMap = 200090400; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/200090000.js b/scripts/map/onUserEnter/200090000.js index 0c6511cd61..b630fdad59 100644 --- a/scripts/map/onUserEnter/200090000.js +++ b/scripts/map/onUserEnter/200090000.js @@ -2,13 +2,13 @@ var mapId = 200090000; function start(ms) { - var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId); + var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId); - if(map.getDocked()) { - const PacketCreator = Java.type('tools.PacketCreator'); - ms.getClient().sendPacket(PacketCreator.musicChange("Bgm04/ArabPirate")); - ms.getClient().sendPacket(PacketCreator.crogBoatPacket(true)); - } + if (map.getDocked()) { + const PacketCreator = Java.type('tools.PacketCreator'); + ms.getClient().sendPacket(PacketCreator.musicChange("Bgm04/ArabPirate")); + ms.getClient().sendPacket(PacketCreator.crogBoatPacket(true)); + } - return true; + return true; } \ No newline at end of file diff --git a/scripts/map/onUserEnter/200090010.js b/scripts/map/onUserEnter/200090010.js index ecd5b6feb0..2da4f4110d 100644 --- a/scripts/map/onUserEnter/200090010.js +++ b/scripts/map/onUserEnter/200090010.js @@ -2,13 +2,13 @@ var mapId = 200090010; function start(ms) { - var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId); + var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId); - if(map.getDocked()) { - const PacketCreator = Java.type('tools.PacketCreator'); - ms.getClient().sendPacket(PacketCreator.musicChange("Bgm04/ArabPirate")); - ms.getClient().sendPacket(PacketCreator.crogBoatPacket(true)); - } + if (map.getDocked()) { + const PacketCreator = Java.type('tools.PacketCreator'); + ms.getClient().sendPacket(PacketCreator.musicChange("Bgm04/ArabPirate")); + ms.getClient().sendPacket(PacketCreator.crogBoatPacket(true)); + } - return true; + return true; } \ No newline at end of file diff --git a/scripts/map/onUserEnter/220000111.js b/scripts/map/onUserEnter/220000111.js index 5fe014fafb..d737b3e946 100644 --- a/scripts/map/onUserEnter/220000111.js +++ b/scripts/map/onUserEnter/220000111.js @@ -1,11 +1,11 @@ var eventName = "Trains"; var toMap = 200090110; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/240000111.js b/scripts/map/onUserEnter/240000111.js index 1e44537389..c8b3803995 100644 --- a/scripts/map/onUserEnter/240000111.js +++ b/scripts/map/onUserEnter/240000111.js @@ -1,11 +1,11 @@ var eventName = "Cabin"; var toMap = 200090210; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/260000110.js b/scripts/map/onUserEnter/260000110.js index ee9df7e083..255fbe04cb 100644 --- a/scripts/map/onUserEnter/260000110.js +++ b/scripts/map/onUserEnter/260000110.js @@ -1,11 +1,11 @@ var eventName = "Genie"; var toMap = 200090410; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/540010001.js b/scripts/map/onUserEnter/540010001.js index 295800eef6..5d192c0893 100644 --- a/scripts/map/onUserEnter/540010001.js +++ b/scripts/map/onUserEnter/540010001.js @@ -1,11 +1,11 @@ var eventName = "AirPlane"; var toMap = 540010002; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/540010100.js b/scripts/map/onUserEnter/540010100.js index 2652a1770f..1a24bdf5dd 100644 --- a/scripts/map/onUserEnter/540010100.js +++ b/scripts/map/onUserEnter/540010100.js @@ -1,11 +1,11 @@ var eventName = "AirPlane"; var toMap = 540010101; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/600010002.js b/scripts/map/onUserEnter/600010002.js index 752b57743f..6932831886 100644 --- a/scripts/map/onUserEnter/600010002.js +++ b/scripts/map/onUserEnter/600010002.js @@ -1,11 +1,11 @@ var eventName = "Subway"; var toMap = 600010003; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/600010004.js b/scripts/map/onUserEnter/600010004.js index c33a3cfcad..12d39ef777 100644 --- a/scripts/map/onUserEnter/600010004.js +++ b/scripts/map/onUserEnter/600010004.js @@ -1,11 +1,11 @@ var eventName = "Subway"; var toMap = 600010005; -function start(ms) { - var em = ms.getClient().getEventManager(eventName); - - //is the player late to start the travel? - if(em.getProperty("docked") == "false") { - ms.getClient().getPlayer().warpAhead(toMap); - } +function start(ms) { + var em = ms.getClient().getEventManager(eventName); + + //is the player late to start the travel? + if (em.getProperty("docked") == "false") { + ms.getClient().getPlayer().warpAhead(toMap); + } } diff --git a/scripts/map/onUserEnter/677000001.js b/scripts/map/onUserEnter/677000001.js index 8af02ac694..4b47773b34 100644 --- a/scripts/map/onUserEnter/677000001.js +++ b/scripts/map/onUserEnter/677000001.js @@ -1,17 +1,17 @@ function start(ms) { - const Point = Java.type('java.awt.Point'); - var pos = new Point(461, 61); - var mobId = 9400612; - var mobName = "Marbas"; - - var player = ms.getPlayer(); - var map = player.getMap(); + const Point = Java.type('java.awt.Point'); + var pos = new Point(461, 61); + var mobId = 9400612; + var mobName = "Marbas"; - if(map.getMonsterById(mobId) != null){ - return; - } + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); - player.message(mobName + " has appeared!"); + if (map.getMonsterById(mobId) != null) { + return; + } + + const LifeFactory = Java.type('server.life.LifeFactory'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); + player.message(mobName + " has appeared!"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/677000003.js b/scripts/map/onUserEnter/677000003.js index db5a2edd34..944019ac78 100644 --- a/scripts/map/onUserEnter/677000003.js +++ b/scripts/map/onUserEnter/677000003.js @@ -1,17 +1,17 @@ function start(ms) { - const Point = Java.type('java.awt.Point'); - var pos = new Point(467, 0); - var mobId = 9400610; - var mobName = "Amdusias"; - - var player = ms.getPlayer(); - var map = player.getMap(); + const Point = Java.type('java.awt.Point'); + var pos = new Point(467, 0); + var mobId = 9400610; + var mobName = "Amdusias"; - if(map.getMonsterById(mobId) != null){ - return; - } + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); - player.message(mobName + " has appeared!"); + if (map.getMonsterById(mobId) != null) { + return; + } + + const LifeFactory = Java.type('server.life.LifeFactory'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); + player.message(mobName + " has appeared!"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/677000005.js b/scripts/map/onUserEnter/677000005.js index b6fcf1f90d..5dd2f88c1d 100644 --- a/scripts/map/onUserEnter/677000005.js +++ b/scripts/map/onUserEnter/677000005.js @@ -1,17 +1,17 @@ function start(ms) { - const Point = Java.type('java.awt.Point'); - var pos = new Point(201, 80); - var mobId = 9400609; - var mobName = "Andras"; - - var player = ms.getPlayer(); - var map = player.getMap(); + const Point = Java.type('java.awt.Point'); + var pos = new Point(201, 80); + var mobId = 9400609; + var mobName = "Andras"; - if(map.getMonsterById(mobId) != null){ - return; - } + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); - player.message(mobName + " has appeared!"); + if (map.getMonsterById(mobId) != null) { + return; + } + + const LifeFactory = Java.type('server.life.LifeFactory'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); + player.message(mobName + " has appeared!"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/677000007.js b/scripts/map/onUserEnter/677000007.js index 5e713d868d..90de922e26 100644 --- a/scripts/map/onUserEnter/677000007.js +++ b/scripts/map/onUserEnter/677000007.js @@ -1,17 +1,17 @@ function start(ms) { - const Point = Java.type('java.awt.Point'); - var pos = new Point(171, 50); - var mobId = 9400611; - var mobName = "Crocell"; - - var player = ms.getPlayer(); - var map = player.getMap(); + const Point = Java.type('java.awt.Point'); + var pos = new Point(171, 50); + var mobId = 9400611; + var mobName = "Crocell"; - if(map.getMonsterById(mobId) != null){ - return; - } + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); - player.message(mobName + " has appeared!"); + if (map.getMonsterById(mobId) != null) { + return; + } + + const LifeFactory = Java.type('server.life.LifeFactory'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); + player.message(mobName + " has appeared!"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/677000009.js b/scripts/map/onUserEnter/677000009.js index ea4672ddd1..e75874ba37 100644 --- a/scripts/map/onUserEnter/677000009.js +++ b/scripts/map/onUserEnter/677000009.js @@ -1,17 +1,17 @@ function start(ms) { - const Point = Java.type('java.awt.Point'); - var pos = new Point(251, -841); - var mobId = 9400613; - var mobName = "Valefor"; - - var player = ms.getPlayer(); - var map = player.getMap(); + const Point = Java.type('java.awt.Point'); + var pos = new Point(251, -841); + var mobId = 9400613; + var mobName = "Valefor"; - if(map.getMonsterById(mobId) != null){ - return; - } + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); - player.message(mobName + " has appeared!"); + if (map.getMonsterById(mobId) != null) { + return; + } + + const LifeFactory = Java.type('server.life.LifeFactory'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); + player.message(mobName + " has appeared!"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/677000012.js b/scripts/map/onUserEnter/677000012.js index 2b0236ecf4..ba06ab25b7 100644 --- a/scripts/map/onUserEnter/677000012.js +++ b/scripts/map/onUserEnter/677000012.js @@ -1,17 +1,17 @@ function start(ms) { - const Point = Java.type('java.awt.Point'); - var pos = new Point(842, 0); - var mobId = 9400633; - var mobName = "Astaroth"; - - var player = ms.getPlayer(); - var map = player.getMap(); + const Point = Java.type('java.awt.Point'); + var pos = new Point(842, 0); + var mobId = 9400633; + var mobName = "Astaroth"; - if(map.getMonsterById(mobId) != null){ - return; - } + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); - player.message(mobName + " has appeared!"); + if (map.getMonsterById(mobId) != null) { + return; + } + + const LifeFactory = Java.type('server.life.LifeFactory'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), pos); + player.message(mobName + " has appeared!"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/914000100.js b/scripts/map/onUserEnter/914000100.js index 108f8c451c..9575e5b693 100644 --- a/scripts/map/onUserEnter/914000100.js +++ b/scripts/map/onUserEnter/914000100.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.setQuestProgress(21000, 21002, 1); +function start(ms) { + ms.setQuestProgress(21000, 21002, 1); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/922000000.js b/scripts/map/onUserEnter/922000000.js index 8ef2f3647e..0cb92d35ab 100644 --- a/scripts/map/onUserEnter/922000000.js +++ b/scripts/map/onUserEnter/922000000.js @@ -1,8 +1,8 @@ function start(ms) { - var map = ms.getClient().getChannelServer().getMapFactory().getMap(922000000); - map.clearDrops(); - map.resetReactors(); - map.shuffleReactors(); + var map = ms.getClient().getChannelServer().getMapFactory().getMap(922000000); + map.clearDrops(); + map.resetReactors(); + map.shuffleReactors(); - return(true); + return (true); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/925040100.js b/scripts/map/onUserEnter/925040100.js index f3a36a7691..0791faa643 100644 --- a/scripts/map/onUserEnter/925040100.js +++ b/scripts/map/onUserEnter/925040100.js @@ -1,10 +1,10 @@ -function start(ms){ - var player = ms.getPlayer(); - var map = player.getMap(); - - if(ms.isQuestStarted(21747) && ms.getQuestProgressInt(21747, 9300351) == 0) { - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(9300351), new Point(897, 51)); - } +function start(ms) { + var player = ms.getPlayer(); + var map = player.getMap(); + + if (ms.isQuestStarted(21747) && ms.getQuestProgressInt(21747, 9300351) == 0) { + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(9300351), new Point(897, 51)); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/926000000.js b/scripts/map/onUserEnter/926000000.js index 379dba8698..56e6de199b 100644 --- a/scripts/map/onUserEnter/926000000.js +++ b/scripts/map/onUserEnter/926000000.js @@ -1,10 +1,10 @@ -function start(ms) { - var map = ms.getClient().getChannelServer().getMapFactory().getMap(926000000); - map.resetPQ(1); - - if(map.countMonster(9100013) == 0) { - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(9100013), new java.awt.Point(82, 200)); - } - - return(true); +function start(ms) { + var map = ms.getClient().getChannelServer().getMapFactory().getMap(926000000); + map.resetPQ(1); + + if (map.countMonster(9100013) == 0) { + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(9100013), new java.awt.Point(82, 200)); + } + + return (true); } diff --git a/scripts/map/onUserEnter/926000010.js b/scripts/map/onUserEnter/926000010.js index f37e236d1d..8a78e52dce 100644 --- a/scripts/map/onUserEnter/926000010.js +++ b/scripts/map/onUserEnter/926000010.js @@ -18,8 +18,8 @@ along with this program. If not, see . */ -function start(ms) { - var map = ms.getClient().getChannelServer().getMapFactory().getMap(926000010); - map.resetPQ(1); - return(true); +function start(ms) { + var map = ms.getClient().getChannelServer().getMapFactory().getMap(926000010); + map.resetPQ(1); + return (true); } diff --git a/scripts/map/onUserEnter/926120300.js b/scripts/map/onUserEnter/926120300.js index d07ee8a0ae..49e31cbab6 100644 --- a/scripts/map/onUserEnter/926120300.js +++ b/scripts/map/onUserEnter/926120300.js @@ -1,6 +1,6 @@ function getInactiveReactors(map) { - var reactors = new Array(); - + var reactors = []; + var iter = map.getReactors().iterator(); while (iter.hasNext()) { var mo = iter.next(); @@ -8,13 +8,13 @@ function getInactiveReactors(map) { reactors.push(mo); } } - + return reactors; } -function start(ms) { - var map = ms.getClient().getChannelServer().getMapFactory().getMap(926120300); - map.resetReactors(getInactiveReactors(map)); - - return(true); +function start(ms) { + var map = ms.getClient().getChannelServer().getMapFactory().getMap(926120300); + map.resetReactors(getInactiveReactors(map)); + + return (true); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Massacre_result.js b/scripts/map/onUserEnter/Massacre_result.js index a4e13fd5c7..0cb1542a3f 100644 --- a/scripts/map/onUserEnter/Massacre_result.js +++ b/scripts/map/onUserEnter/Massacre_result.js @@ -1,6 +1,6 @@ function start(ms) { - var py = ms.getPyramid(); - if (py != null) { - py.sendScore(ms.getPlayer()); - } + var py = ms.getPyramid(); + if (py != null) { + py.sendScore(ms.getPlayer()); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/PromiseDragon.js b/scripts/map/onUserEnter/PromiseDragon.js index 3cc192ef6d..f5cd753463 100644 --- a/scripts/map/onUserEnter/PromiseDragon.js +++ b/scripts/map/onUserEnter/PromiseDragon.js @@ -20,7 +20,7 @@ along with this program. If not, see . */ -function start(ms) { - ms.lockUI(); - ms.showIntro("Effect/Direction4.img/PromiseDragon/Scene" + ms.getPlayer().getGender()); +function start(ms) { + ms.lockUI(); + ms.showIntro("Effect/Direction4.img/PromiseDragon/Scene" + ms.getPlayer().getGender()); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor10.js b/scripts/map/onUserEnter/Resi_tutor10.js index e44549d30f..a95ddeb843 100644 --- a/scripts/map/onUserEnter/Resi_tutor10.js +++ b/scripts/map/onUserEnter/Resi_tutor10.js @@ -1,3 +1,3 @@ -function start(ms) { - ms.setStandAloneMode(true); +function start(ms) { + ms.setStandAloneMode(true); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor20.js b/scripts/map/onUserEnter/Resi_tutor20.js index 99f58bb3ce..2254445f1e 100644 --- a/scripts/map/onUserEnter/Resi_tutor20.js +++ b/scripts/map/onUserEnter/Resi_tutor20.js @@ -1,3 +1,3 @@ -function start(ms) { - ms.mapEffect("resistance/tutorialGuide"); +function start(ms) { + ms.mapEffect("resistance/tutorialGuide"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor30.js b/scripts/map/onUserEnter/Resi_tutor30.js index 3521a94cd9..15e559a6ec 100644 --- a/scripts/map/onUserEnter/Resi_tutor30.js +++ b/scripts/map/onUserEnter/Resi_tutor30.js @@ -1,4 +1,4 @@ -function start(ms) { - ms.updateAreaInfo(23007, "exp1=1;exp2=1;exp3=1;exp4=1");//force - ms.showInfo("Effect/OnUserEff.img/guideEffect/resistanceTutorial/userTalk"); +function start(ms) { + ms.updateAreaInfo(23007, "exp1=1;exp2=1;exp3=1;exp4=1");//force + ms.showInfo("Effect/OnUserEff.img/guideEffect/resistanceTutorial/userTalk"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor40.js b/scripts/map/onUserEnter/Resi_tutor40.js index a5bf05fc07..b1180e1630 100644 --- a/scripts/map/onUserEnter/Resi_tutor40.js +++ b/scripts/map/onUserEnter/Resi_tutor40.js @@ -1,3 +1,3 @@ -function start(ms) { - ms.openNpc(2159012); +function start(ms) { + ms.openNpc(2159012); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor50.js b/scripts/map/onUserEnter/Resi_tutor50.js index ffbba6cb30..d2b4c93a15 100644 --- a/scripts/map/onUserEnter/Resi_tutor50.js +++ b/scripts/map/onUserEnter/Resi_tutor50.js @@ -1,4 +1,4 @@ -function start(ms) { - ms.setDirectionMode(false); - ms.openNpc(2159006); +function start(ms) { + ms.setDirectionMode(false); + ms.openNpc(2159006); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor60.js b/scripts/map/onUserEnter/Resi_tutor60.js index 49f5357198..b77e8f009a 100644 --- a/scripts/map/onUserEnter/Resi_tutor60.js +++ b/scripts/map/onUserEnter/Resi_tutor60.js @@ -1,3 +1,3 @@ -function start(ms) { - ms.openNpc(2159007); +function start(ms) { + ms.openNpc(2159007); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor70.js b/scripts/map/onUserEnter/Resi_tutor70.js index 35778c89f2..c421eb2b5f 100644 --- a/scripts/map/onUserEnter/Resi_tutor70.js +++ b/scripts/map/onUserEnter/Resi_tutor70.js @@ -1,4 +1,4 @@ -function start(ms) { - ms.setDirectionMode(true); - ms.showIntro("Effect/Direction4.img/Resistance/TalkJ"); +function start(ms) { + ms.setDirectionMode(true); + ms.showIntro("Effect/Direction4.img/Resistance/TalkJ"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/Resi_tutor80.js b/scripts/map/onUserEnter/Resi_tutor80.js index b782725ba3..968c6138ff 100644 --- a/scripts/map/onUserEnter/Resi_tutor80.js +++ b/scripts/map/onUserEnter/Resi_tutor80.js @@ -1,3 +1,3 @@ -function start(ms) { - ms.setDirectionMode(false); +function start(ms) { + ms.setDirectionMode(false); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/aranDirection.js b/scripts/map/onUserEnter/aranDirection.js index 21adf9749e..aaccf8dc51 100644 --- a/scripts/map/onUserEnter/aranDirection.js +++ b/scripts/map/onUserEnter/aranDirection.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.displayAranIntro(); + ms.displayAranIntro(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/babyPigMap.js b/scripts/map/onUserEnter/babyPigMap.js index 21a5d69fe7..0ad319055c 100644 --- a/scripts/map/onUserEnter/babyPigMap.js +++ b/scripts/map/onUserEnter/babyPigMap.js @@ -20,7 +20,7 @@ along with this program. If not, see . */ -function start(ms) { - ms.unlockUI(); - ms.getClient().getQM().forceStartQuest(22015); +function start(ms) { + ms.unlockUI(); + ms.getClient().getQM().forceStartQuest(22015); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/cannon_tuto_direction.js b/scripts/map/onUserEnter/cannon_tuto_direction.js index 77eb54a363..a2fdecb692 100644 --- a/scripts/map/onUserEnter/cannon_tuto_direction.js +++ b/scripts/map/onUserEnter/cannon_tuto_direction.js @@ -1,5 +1,5 @@ function start(ms) { - ms.setDirectionStatus(true); + ms.setDirectionStatus(true); ms.showIntro("Effect/Direction4.img/cannonshooter/Scene00"); ms.showIntro("Effect/Direction4.img/cannonshooter/out00"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/cannon_tuto_direction1.js b/scripts/map/onUserEnter/cannon_tuto_direction1.js index 8e01100e84..d3fc41a636 100644 --- a/scripts/map/onUserEnter/cannon_tuto_direction1.js +++ b/scripts/map/onUserEnter/cannon_tuto_direction1.js @@ -1,5 +1,5 @@ function start(ms) { - ms.playSound("cannonshooter/flying"); + ms.playSound("cannonshooter/flying"); ms.sendDirectionInfo("Effect/Direction4.img/effect/cannonshooter/balloon/0", 9000, 0, 0, 0, -1); ms.sendDirectionInfo(1, 1500); ms.setDirectionStatus(true); diff --git a/scripts/map/onUserEnter/crash_Dragon.js b/scripts/map/onUserEnter/crash_Dragon.js index 7e2cdbaa98..9d7ad64937 100644 --- a/scripts/map/onUserEnter/crash_Dragon.js +++ b/scripts/map/onUserEnter/crash_Dragon.js @@ -1,4 +1,4 @@ function start(ms) { - ms.lockUI(); - ms.showIntro("Effect/Direction4.img/crash/Scene" + ms.getPlayer().getGender()); + ms.lockUI(); + ms.showIntro("Effect/Direction4.img/crash/Scene" + ms.getPlayer().getGender()); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/cygnusJobTutorial.js b/scripts/map/onUserEnter/cygnusJobTutorial.js index f7eb69877d..69b87e9f01 100644 --- a/scripts/map/onUserEnter/cygnusJobTutorial.js +++ b/scripts/map/onUserEnter/cygnusJobTutorial.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.displayCygnusIntro(); + ms.displayCygnusIntro(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/dojang_Eff.js b/scripts/map/onUserEnter/dojang_Eff.js index 8fc8cbd0ab..a5c4fdfb37 100644 --- a/scripts/map/onUserEnter/dojang_Eff.js +++ b/scripts/map/onUserEnter/dojang_Eff.js @@ -19,6 +19,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ + /* *@Author: Moogra, Traitor, Ronan *@Map(s): All Dojo fighting maps @@ -29,12 +30,12 @@ function start(ms) { ms.getPlayer().resetEnteredScript(); var stage = Math.floor(ms.getPlayer().getMap().getId() / 100) % 100; - + ms.getPlayer().showDojoClock(); if (stage % 6 > 0) { var realstage = stage - ((stage / 6) | 0); ms.dojoEnergy(); - + ms.playSound("Dojang/start"); ms.showEffect("dojang/start/stage"); ms.showEffect("dojang/start/number/" + realstage); diff --git a/scripts/map/onUserEnter/dojang_Msg.js b/scripts/map/onUserEnter/dojang_Msg.js index 20a5f32f01..56285054d9 100644 --- a/scripts/map/onUserEnter/dojang_Msg.js +++ b/scripts/map/onUserEnter/dojang_Msg.js @@ -28,10 +28,10 @@ var messages = Array("Your courage for challenging the Mu Lung Dojo is commendab function start(ms) { if (ms.getPlayer().getMap().getId() == 925020000) { - if(ms.getPlayer().getMap().findClosestPlayerSpawnpoint(ms.getPlayer().getPosition()).getId() == 0) { + if (ms.getPlayer().getMap().findClosestPlayerSpawnpoint(ms.getPlayer().getPosition()).getId() == 0) { ms.getPlayer().startMapEffect(messages[(Math.random() * messages.length) | 0], 5120024); } - + ms.resetDojoEnergy(); } else { ms.getPlayer().resetEnteredScript(); //in case the person dcs in here we set it at dojang_tuto portal diff --git a/scripts/map/onUserEnter/evanleaveD.js b/scripts/map/onUserEnter/evanleaveD.js index 23bd437737..bf25ed9973 100644 --- a/scripts/map/onUserEnter/evanleaveD.js +++ b/scripts/map/onUserEnter/evanleaveD.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.unlockUI(); +function start(ms) { + ms.unlockUI(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/explorationPoint.js b/scripts/map/onUserEnter/explorationPoint.js index dff5e178ee..5e0f278385 100644 --- a/scripts/map/onUserEnter/explorationPoint.js +++ b/scripts/map/onUserEnter/explorationPoint.js @@ -25,24 +25,24 @@ * */ function start(ms) { - if (ms.getPlayer().getMapId() == 110000000 || (ms.getPlayer().getMapId() >= 100000000 && ms.getPlayer().getMapId() < 105040300)) { - ms.explorerQuest(29005, "Beginner Explorer");//Beginner Explorer - } else if (ms.getPlayer().getMapId() >= 105040300 && ms.getPlayer().getMapId() <= 105090900) { - ms.explorerQuest(29014, "Sleepywood Explorer");//Sleepywood Explorer - } else if (ms.getPlayer().getMapId() >= 200000000 && ms.getPlayer().getMapId() <= 211041800) { - ms.explorerQuest(29006, "El Nath Mts. Explorer");//El Nath Mts. Explorer - } else if (ms.getPlayer().getMapId() >= 220000000 && ms.getPlayer().getMapId() <= 222010400) { - ms.explorerQuest(29007, "Ludus Lake Explorer");//Ludus Lake Explorer - } else if (ms.getPlayer().getMapId() >= 230000000 && ms.getPlayer().getMapId() <= 230040401) { - ms.explorerQuest(29008, "Undersea Explorer");//Undersea Explorer - } else if (ms.getPlayer().getMapId() >= 250000000 && ms.getPlayer().getMapId() <= 251010500) { - ms.explorerQuest(29009, "Mu Lung Explorer");//Mu Lung Explorer - } else if (ms.getPlayer().getMapId() >= 260000000 && ms.getPlayer().getMapId() <= 261030000) { - ms.explorerQuest(29010, "Nihal Desert Explorer");//Nihal Desert Explorer - } else if (ms.getPlayer().getMapId() >= 240000000 && ms.getPlayer().getMapId() <= 240050000) { - ms.explorerQuest(29011, "Minar Forest Explorer");//Minar Forest Explorer - } - if (ms.getPlayer().getMapId() == 104000000) { - ms.mapEffect("maplemap/enter/104000000"); - } + if (ms.getPlayer().getMapId() == 110000000 || (ms.getPlayer().getMapId() >= 100000000 && ms.getPlayer().getMapId() < 105040300)) { + ms.explorerQuest(29005, "Beginner Explorer");//Beginner Explorer + } else if (ms.getPlayer().getMapId() >= 105040300 && ms.getPlayer().getMapId() <= 105090900) { + ms.explorerQuest(29014, "Sleepywood Explorer");//Sleepywood Explorer + } else if (ms.getPlayer().getMapId() >= 200000000 && ms.getPlayer().getMapId() <= 211041800) { + ms.explorerQuest(29006, "El Nath Mts. Explorer");//El Nath Mts. Explorer + } else if (ms.getPlayer().getMapId() >= 220000000 && ms.getPlayer().getMapId() <= 222010400) { + ms.explorerQuest(29007, "Ludus Lake Explorer");//Ludus Lake Explorer + } else if (ms.getPlayer().getMapId() >= 230000000 && ms.getPlayer().getMapId() <= 230040401) { + ms.explorerQuest(29008, "Undersea Explorer");//Undersea Explorer + } else if (ms.getPlayer().getMapId() >= 250000000 && ms.getPlayer().getMapId() <= 251010500) { + ms.explorerQuest(29009, "Mu Lung Explorer");//Mu Lung Explorer + } else if (ms.getPlayer().getMapId() >= 260000000 && ms.getPlayer().getMapId() <= 261030000) { + ms.explorerQuest(29010, "Nihal Desert Explorer");//Nihal Desert Explorer + } else if (ms.getPlayer().getMapId() >= 240000000 && ms.getPlayer().getMapId() <= 240050000) { + ms.explorerQuest(29011, "Minar Forest Explorer");//Minar Forest Explorer + } + if (ms.getPlayer().getMapId() == 104000000) { + ms.mapEffect("maplemap/enter/104000000"); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/getDragonEgg.js b/scripts/map/onUserEnter/getDragonEgg.js index 811bf7e3c5..67af49b4f0 100644 --- a/scripts/map/onUserEnter/getDragonEgg.js +++ b/scripts/map/onUserEnter/getDragonEgg.js @@ -1,4 +1,4 @@ function start(ms) { - ms.lockUI(); - ms.showIntro("Effect/Direction4.img/getDragonEgg/Scene" + ms.getPlayer().getGender()); + ms.lockUI(); + ms.showIntro("Effect/Direction4.img/getDragonEgg/Scene" + ms.getPlayer().getGender()); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go10000.js b/scripts/map/onUserEnter/go10000.js index f037740d12..5ccab2f2b9 100644 --- a/scripts/map/onUserEnter/go10000.js +++ b/scripts/map/onUserEnter/go10000.js @@ -21,6 +21,6 @@ */ function start(ms) { - ms.unlockUI(); - ms.mapEffect("maplemap/enter/10000"); + ms.unlockUI(); + ms.mapEffect("maplemap/enter/10000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go1000000.js b/scripts/map/onUserEnter/go1000000.js index fdd0147424..0b8a43c42e 100644 --- a/scripts/map/onUserEnter/go1000000.js +++ b/scripts/map/onUserEnter/go1000000.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/1000000"); +function start(ms) { + ms.mapEffect("maplemap/enter/1000000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go1010000.js b/scripts/map/onUserEnter/go1010000.js index a22d6db406..6a9c5e0d2d 100644 --- a/scripts/map/onUserEnter/go1010000.js +++ b/scripts/map/onUserEnter/go1010000.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/1010000"); +function start(ms) { + ms.mapEffect("maplemap/enter/1010000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go1010100.js b/scripts/map/onUserEnter/go1010100.js index 4b0977dbe7..e4556302eb 100644 --- a/scripts/map/onUserEnter/go1010100.js +++ b/scripts/map/onUserEnter/go1010100.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/1010100"); +function start(ms) { + ms.mapEffect("maplemap/enter/1010100"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go1010200.js b/scripts/map/onUserEnter/go1010200.js index 9f0379153f..1f7f5d5079 100644 --- a/scripts/map/onUserEnter/go1010200.js +++ b/scripts/map/onUserEnter/go1010200.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/1010200"); +function start(ms) { + ms.mapEffect("maplemap/enter/1010200"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go1010300.js b/scripts/map/onUserEnter/go1010300.js index 17c039999a..8ccd76824e 100644 --- a/scripts/map/onUserEnter/go1010300.js +++ b/scripts/map/onUserEnter/go1010300.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/1010300"); +function start(ms) { + ms.mapEffect("maplemap/enter/1010300"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go1020000.js b/scripts/map/onUserEnter/go1020000.js index fbca232adc..37b3ec4476 100644 --- a/scripts/map/onUserEnter/go1020000.js +++ b/scripts/map/onUserEnter/go1020000.js @@ -1,4 +1,4 @@ function start(ms) { - ms.unlockUI(); - ms.mapEffect("maplemap/enter/1020000"); + ms.unlockUI(); + ms.mapEffect("maplemap/enter/1020000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go20000.js b/scripts/map/onUserEnter/go20000.js index deb385cb38..5fa352b179 100644 --- a/scripts/map/onUserEnter/go20000.js +++ b/scripts/map/onUserEnter/go20000.js @@ -20,7 +20,7 @@ along with this program. If not, see . */ -function start(ms) { - ms.unlockUI(); - ms.mapEffect("maplemap/enter/20000"); +function start(ms) { + ms.unlockUI(); + ms.mapEffect("maplemap/enter/20000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go30000.js b/scripts/map/onUserEnter/go30000.js index 1057a9cdaa..6915505053 100644 --- a/scripts/map/onUserEnter/go30000.js +++ b/scripts/map/onUserEnter/go30000.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/30000"); +function start(ms) { + ms.mapEffect("maplemap/enter/30000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go40000.js b/scripts/map/onUserEnter/go40000.js index fc7cd03ab8..ed0d3a1db1 100644 --- a/scripts/map/onUserEnter/go40000.js +++ b/scripts/map/onUserEnter/go40000.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/40000"); +function start(ms) { + ms.mapEffect("maplemap/enter/40000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/go50000.js b/scripts/map/onUserEnter/go50000.js index 8990fbd438..1fa59541fc 100644 --- a/scripts/map/onUserEnter/go50000.js +++ b/scripts/map/onUserEnter/go50000.js @@ -20,6 +20,6 @@ along with this program. If not, see . */ -function start(ms) { - ms.mapEffect("maplemap/enter/50000"); +function start(ms) { + ms.mapEffect("maplemap/enter/50000"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goAdventure.js b/scripts/map/onUserEnter/goAdventure.js index d6b453e409..8819d68ab6 100644 --- a/scripts/map/onUserEnter/goAdventure.js +++ b/scripts/map/onUserEnter/goAdventure.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.goAdventure(); + ms.goAdventure(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goArcher.js b/scripts/map/onUserEnter/goArcher.js index 1fd357c5e0..0966cc9375 100644 --- a/scripts/map/onUserEnter/goArcher.js +++ b/scripts/map/onUserEnter/goArcher.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.startExplorerExperience(); + ms.startExplorerExperience(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goLith.js b/scripts/map/onUserEnter/goLith.js index 86da296ac2..43f6b967f2 100644 --- a/scripts/map/onUserEnter/goLith.js +++ b/scripts/map/onUserEnter/goLith.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.goLith(); + ms.goLith(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goMagician.js b/scripts/map/onUserEnter/goMagician.js index 1fd357c5e0..0966cc9375 100644 --- a/scripts/map/onUserEnter/goMagician.js +++ b/scripts/map/onUserEnter/goMagician.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.startExplorerExperience(); + ms.startExplorerExperience(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goPirate.js b/scripts/map/onUserEnter/goPirate.js index 1fd357c5e0..0966cc9375 100644 --- a/scripts/map/onUserEnter/goPirate.js +++ b/scripts/map/onUserEnter/goPirate.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.startExplorerExperience(); + ms.startExplorerExperience(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goRogue.js b/scripts/map/onUserEnter/goRogue.js index 1fd357c5e0..0966cc9375 100644 --- a/scripts/map/onUserEnter/goRogue.js +++ b/scripts/map/onUserEnter/goRogue.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.startExplorerExperience(); + ms.startExplorerExperience(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/goSwordman.js b/scripts/map/onUserEnter/goSwordman.js index 1fd357c5e0..0966cc9375 100644 --- a/scripts/map/onUserEnter/goSwordman.js +++ b/scripts/map/onUserEnter/goSwordman.js @@ -21,5 +21,5 @@ */ function start(ms) { - ms.startExplorerExperience(); + ms.startExplorerExperience(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/highposition.js b/scripts/map/onUserEnter/highposition.js index 815a15c05c..9afaf8d14a 100644 --- a/scripts/map/onUserEnter/highposition.js +++ b/scripts/map/onUserEnter/highposition.js @@ -25,5 +25,5 @@ * */ function start(ms) { - ms.touchTheSky(); + ms.touchTheSky(); } diff --git a/scripts/map/onUserEnter/iceCave.js b/scripts/map/onUserEnter/iceCave.js index a0fe03be6e..087dcc129f 100644 --- a/scripts/map/onUserEnter/iceCave.js +++ b/scripts/map/onUserEnter/iceCave.js @@ -1,9 +1,9 @@ function start(ms) { - ms.teachSkill(20000014, -1, 0, -1); - ms.teachSkill(20000015, -1, 0, -1); - ms.teachSkill(20000016, -1, 0, -1); - ms.teachSkill(20000017, -1, 0, -1); - ms.teachSkill(20000018, -1, 0, -1); - ms.unlockUI(); - ms.showIntro("Effect/Direction1.img/aranTutorial/ClickLilin"); + ms.teachSkill(20000014, -1, 0, -1); + ms.teachSkill(20000015, -1, 0, -1); + ms.teachSkill(20000016, -1, 0, -1); + ms.teachSkill(20000017, -1, 0, -1); + ms.teachSkill(20000018, -1, 0, -1); + ms.unlockUI(); + ms.showIntro("Effect/Direction1.img/aranTutorial/ClickLilin"); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/meetWithDragon.js b/scripts/map/onUserEnter/meetWithDragon.js index d89b740ea8..593348d2a6 100644 --- a/scripts/map/onUserEnter/meetWithDragon.js +++ b/scripts/map/onUserEnter/meetWithDragon.js @@ -20,7 +20,7 @@ along with this program. If not, see . */ -function start(ms) { - ms.lockUI(); - ms.showIntro("Effect/Direction4.img/meetWithDragon/Scene" + ms.getPlayer().getGender()); +function start(ms) { + ms.lockUI(); + ms.showIntro("Effect/Direction4.img/meetWithDragon/Scene" + ms.getPlayer().getGender()); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/pepeking_effect.js b/scripts/map/onUserEnter/pepeking_effect.js index f61eb6c8d2..f7e60fddc5 100644 --- a/scripts/map/onUserEnter/pepeking_effect.js +++ b/scripts/map/onUserEnter/pepeking_effect.js @@ -1,9 +1,9 @@ -function start(ms){ - var mobId = 3300000 + (Math.floor(Math.random() * 3) + 5); - var player = ms.getPlayer(); - var map = player.getMap(); +function start(ms) { + var mobId = 3300000 + (Math.floor(Math.random() * 3) + 5); + var player = ms.getPlayer(); + var map = player.getMap(); - const LifeFactory = Java.type('server.life.LifeFactory'); - const Point = Java.type('java.awt.Point'); - map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), new Point(-28, -67)); + const LifeFactory = Java.type('server.life.LifeFactory'); + const Point = Java.type('java.awt.Point'); + map.spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), new Point(-28, -67)); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/rien.js b/scripts/map/onUserEnter/rien.js index 0b420b7576..2f572c2d01 100644 --- a/scripts/map/onUserEnter/rien.js +++ b/scripts/map/onUserEnter/rien.js @@ -1,6 +1,6 @@ function start(ms) { - if (ms.isQuestCompleted(21101) && ms.containsAreaInfo(21019, "miss=o;arr=o;helper=clear")) { - ms.updateAreaInfo(21019, "miss=o;arr=o;ck=1;helper=clear"); - } - ms.unlockUI(); + if (ms.isQuestCompleted(21101) && ms.containsAreaInfo(21019, "miss=o;arr=o;helper=clear")) { + ms.updateAreaInfo(21019, "miss=o;arr=o;ck=1;helper=clear"); + } + ms.unlockUI(); } \ No newline at end of file diff --git a/scripts/map/onUserEnter/rienArrow.js b/scripts/map/onUserEnter/rienArrow.js index 1a9bc01d74..9ba89f5c83 100644 --- a/scripts/map/onUserEnter/rienArrow.js +++ b/scripts/map/onUserEnter/rienArrow.js @@ -1,6 +1,6 @@ function start(ms) { - if (ms.containsAreaInfo(21019, "miss=o;helper=clear")) { - ms.updateAreaInfo(21019, "miss=o;arr=o;helper=clear"); - ms.showInfo("Effect/OnUserEff.img/guideEffect/aranTutorial/tutorialArrow3"); - } + if (ms.containsAreaInfo(21019, "miss=o;helper=clear")) { + ms.updateAreaInfo(21019, "miss=o;arr=o;helper=clear"); + ms.showInfo("Effect/OnUserEff.img/guideEffect/aranTutorial/tutorialArrow3"); + } } \ No newline at end of file diff --git a/scripts/map/onUserEnter/startEreb.js b/scripts/map/onUserEnter/startEreb.js index 7351fdf8dc..32039fc52f 100644 --- a/scripts/map/onUserEnter/startEreb.js +++ b/scripts/map/onUserEnter/startEreb.js @@ -1,5 +1,5 @@ function start(ms) { - if (ms.getJobId() == 1000 && ms.getLevel() >= 10) { - ms.unlockUI(); - } + if (ms.getJobId() == 1000 && ms.getLevel() >= 10) { + ms.unlockUI(); + } } \ No newline at end of file