MagatiaPQ + several minor fixes

Added MagatiaPQ. Fixed a bug on Dojo where parties quitting the boss
fight without completing until rest point couldn't not start Dojo again
w/o reforming the party. Fixed issues with 2nd job NPC scripts. Reverted
command layout to use "!" and "@" again.

scripts/map/onFirstUserEnter/dojang_Eff.js

@@ -20,7 +20,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- *@Author:     Moogra, Traitor
+ *@Author:     Moogra, Traitor, Ronan
  *@Map(s):     All Dojo fighting maps
  *@Function:   Spawns dojo monsters and handles time
 */
@@ -28,21 +28,23 @@
 
 function start(ms) {
     ms.getPlayer().resetEnteredScript();
-    var stage = (ms.getPlayer().getMap().getId() / 100) % 100;
-    if (stage % 6 == 1)
-        ms.getPlayer().setDojoStart();
-    if (ms.getPlayer().getMap().getCharacters().size() == 1)
-        ms.getPlayer().showDojoClock();
+    var stage = Math.floor(ms.getMapId() / 100) % 100;
+    var callBoss = false;
+    
+    if (stage % 6 == 1) {
+        ms.getClient().getChannelServer().startDojoSchedule(ms.getMapId());
+    } else if(stage % 6 == 0) {
+        ms.getClient().getChannelServer().dismissDojoSchedule(ms.getMapId(), ms.getParty());
+    }
+        
+    callBoss = ms.getClient().getChannelServer().setDojoProgress(ms.getMapId());
+    
     if (stage % 6 > 0) {
         var realstage = stage - ((stage / 6) | 0);
-        ms.dojoEnergy();
         var mob = ms.getMonsterLifeFactory(9300183 + realstage);
-        if (mob != null && ms.getPlayer().getMap().getMonsterById(9300183 + realstage) == null && ms.getPlayer().getMap().getMonsterById(9300216) == null) {
+        if (callBoss && mob != null && ms.getPlayer().getMap().getMonsterById(9300216) == null) {
             mob.setBoss(false);
             ms.getPlayer().getMap().spawnDojoMonster(mob);
-            ms.playSound("Dojang/start");
-            ms.showEffect("dojang/start/stage");
-            ms.showEffect("dojang/start/number/" + realstage);
         }
     }
 }

scripts/map/onUserEnter/101000301.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Boats";
 var toMap = 200090010;
 

scripts/map/onUserEnter/200000112.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Boats";
 var toMap = 200090000;
 

scripts/map/onUserEnter/200000122.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Trains";
 var toMap = 200090100;
 

scripts/map/onUserEnter/200000132.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Cabin";
 var toMap = 200090200;
 

scripts/map/onUserEnter/200000152.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Genie";
 var toMap = 200090400;
 

scripts/map/onUserEnter/220000111.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Trains";
 var toMap = 200090110;
 

scripts/map/onUserEnter/240000111.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Cabin";
 var toMap = 200090210;
 

scripts/map/onUserEnter/260000110.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Genie";
 var toMap = 200090410;
 

scripts/map/onUserEnter/540010001.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "AirPlane";
 var toMap = 540010002;
 

scripts/map/onUserEnter/540010100.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "AirPlane";
 var toMap = 540010101;
 

scripts/map/onUserEnter/600010002.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Subway";
 var toMap = 600010003;
 

scripts/map/onUserEnter/600010004.js

@@ -1,5 +1,3 @@
-importPackage(Packages.tools);
-
 var eventName = "Subway";
 var toMap = 600010005;
 

scripts/map/onUserEnter/dojang_1st.js

@@ -20,8 +20,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * @author Traitor
- */
-function start(ms) {
+ *@Author:     Moogra, Traitor, Ronan
+ *@Map(s):     All Dojo fighting maps
+ *@Function:   Displays info for the player when entering a dojo map
+*/
 
+
+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);
+    }
 }