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

scripts/reactor/1209000.js

@@ -24,6 +24,10 @@
 */
 
 function act() {    // string visibility thanks to ProXAIMeRx & Glvelturall
-    if (rm.isQuestStarted(6400)) rm.setQuestProgress(6400, 0, 2);
-    rm.message("Real Bart has found. Return to Jonathan through portal.");
+    if (rm.isQuestStarted(6400)) {
+        rm.setQuestProgress(6400, 1, 2);
+        rm.setQuestProgress(6400, 6401, "q3");
+    }
+    
+    rm.message("Real Bart has been found. Return to Jonathan through the portal.");
 }

scripts/reactor/2008007.js

@@ -0,0 +1,29 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2018 RonanLana
+
+    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/>.
+*/
+
+/* @Author Ronan
+ * 
+ * 2008007.js: OrbisPQ jail obstacle trigger
+*/
+
+function hit() {
+    var map = rm.getMap();
+    map.moveEnvironment("trap" + rm.getReactor().getName()[5], 1);
+}

scripts/reactor/2200001.js

@@ -28,5 +28,5 @@
 
 function act(){
     rm.playerMessage(5,"You have found a secret factory!");
-    rm.warp(Math.random() < .5 ? 922000020 : 922000021);
+    rm.warp(Math.random() < .5 ? 922000020 : 922000021, 0);
 }