Merge branch 'master' of https://github.com/ronancpl/HeavenMS into credits_update

scripts/map/onFirstUserEnter/spaceGaGa_sMap.js

@@ -1,5 +1,4 @@
 function start(ms) { 
-        ms.getPlayer().resetEnteredScript(); 
-	ms.getPlayer().getMap().addMapTimer(180);
+        ms.getPlayer().resetEnteredScript();
 	ms.spawnMonster(9300331, -28, 0);
 }  

scripts/map/onUserEnter/130030000.js

@@ -21,5 +21,5 @@
 */
 
 function start(ms) {   	       
-	ms.getPlayer().updateQuestInfo(20010, "1");
+	ms.setQuestProgress(20010, 20022, 1);
 }

scripts/map/onUserEnter/130030001.js

@@ -21,5 +21,5 @@
 */
 
 function start(ms) {   	       
-	ms.getPlayer().updateQuestInfo(20010, "1");
+	ms.setQuestProgress(20010, 20022, 1);
 }

scripts/map/onUserEnter/910510000.js

@@ -5,11 +5,11 @@ function start(ms){
         var map = player.getMap();
         
 	if(player.isCygnus()) {
-                if(ms.isQuestStarted(20730) && ms.getQuestProgress(20730, 9300285) == 0) {
+                if(ms.isQuestStarted(20730) && ms.getQuestProgressInt(20730, 9300285) == 0) {
                         map.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300285), new java.awt.Point(680, 258));
                 }
         } else {
-                if(ms.isQuestStarted(21731) && ms.getQuestProgress(21731, 9300344) == 0) {
+                if(ms.isQuestStarted(21731) && ms.getQuestProgressInt(21731, 9300344) == 0) {
                         map.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300344), new java.awt.Point(680, 258));
                 }
         }

scripts/map/onUserEnter/914000100.js

@@ -21,5 +21,5 @@
 */
 
 function start(ms) {   	       
-	ms.getPlayer().updateQuestInfo(21000, "1");
+	ms.setQuestProgress(21000, 21002, 1);
 }

scripts/map/onUserEnter/925040100.js

@@ -4,7 +4,7 @@ function start(ms){
         var player = ms.getPlayer();
         var map = player.getMap();
         
-        if(ms.isQuestStarted(21747) && ms.getQuestProgress(21747, 9300351) == 0) {
+        if(ms.isQuestStarted(21747) && ms.getQuestProgressInt(21747, 9300351) == 0) {
                 map.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300351), new java.awt.Point(897, 51));
         }
 }

scripts/map/onUserEnter/cygnusJobTutorial.js

@@ -0,0 +1,25 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function start(ms) {
+	ms.displayCygnusIntro();	   	       
+}

scripts/map/onUserEnter/highposition.js

@@ -19,23 +19,11 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 /*
- *@Author:     kevintjuh93
+ * Author: kevintjuh93
+ *
 */
-
-importPackage(Packages.tools); 
-var player;
-
-function start(ms) { 
-	player = ms.getPlayer();
-        player.resetEnteredScript(); 
-        ms.getClient().announce(MaplePacketCreator.showEffect("event/space/start")); 
-        player.startMapEffect("Please rescue Gaga within the time limit.", 5120027); 
-	var map = player.getMap();
-	if (map.getTimeLeft() > 0) {
-		ms.getClient().announce(MaplePacketCreator.getClock(map.getTimeLeft()));
-	} else {
-		map.addMapTimer(180);
-	}
-	ms.useItem(2360002);//HOORAY <3
-}  
+function start(ms) {
+	ms.touchTheSky();
+}

scripts/map/onUserEnter/startEreb.js

@@ -0,0 +1,5 @@
+function start(ms) {
+        if (ms.getJobId() == 1000 && ms.getLevel() >= 10) {
+                ms.unlockUI();
+        }
+}