Merge branch 'master' into credits_update

scripts/portal/TD_MC_enterboss2.js

@@ -22,17 +22,20 @@ function enter(pi) {
     else if(pi.isQuestStarted(2332) && pi.hasItem(4032388)){
         pi.forceCompleteQuest(2332, 1300002);
         pi.getPlayer().message("You've found the princess!");
-        pi.giveCharacterExp(4400 * 1.5, pi.getPlayer());
+        pi.giveCharacterExp(4400, pi.getPlayer());
         
         var em = pi.getEventManager("MK_PrimeMinister");
         var party = pi.getPlayer().getParty();
         if (party != null) {
-            if (em.startInstance(party, pi.getMap())) {
-                pi.playPortalSound();
-                return true;
-            } else {
-                pi.message("Another party is already challenging the boss in this channel.");
-                return false;
+            var eli = em.getEligibleParty(pi.getParty());   // thanks Conrad for pointing out missing eligible party declaration here
+            if(eli.size() > 0) {
+                if (em.startInstance(party, pi.getMap(), 1)) {
+                    pi.playPortalSound();
+                    return true;
+                } else {
+                    pi.message("Another party is already challenging the boss in this channel.");
+                    return false;
+                }
             }
         } else {
             if (em.startInstance(pi.getPlayer())) { // thanks RedHat for noticing an issue here
@@ -49,12 +52,15 @@ function enter(pi) {
         
         var party = pi.getPlayer().getParty();
         if (party != null) {
-            if (em.startInstance(1, party, pi.getMap())) {
-                pi.playPortalSound();
-                return true;
-            } else {
-                pi.message("Another party is already challenging the boss in this channel.");
-                return false;
+            var eli = em.getEligibleParty(pi.getParty());
+            if(eli.size() > 0) {
+                if (em.startInstance(party, pi.getMap(), 1)) {
+                    pi.playPortalSound();
+                    return true;
+                } else {
+                    pi.message("Another party is already challenging the boss in this channel.");
+                    return false;
+                }
             }
         } else {
             if (em.startInstance(pi.getPlayer())) {

scripts/portal/dragonNest.js

@@ -20,11 +20,20 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 function enter(pi) {
-        if(!pi.isQuestCompleted(3706)) {
-            pi.playPortalSound(); pi.warp(240040611, "out00");
+    if (pi.isQuestCompleted(3706)) {
+        pi.playPortalSound(); pi.warp(240040612, "out00");
+        return true;
+    } else if (pi.isQuestStarted(100203) || pi.getPlayer().haveItem(4001094)) {
+        var em = pi.getEventManager("NineSpirit");
+        if (!em.startInstance(pi.getPlayer())) {
+            pi.message("There is currently someone in this map, come back later.");
+            return false;
         } else {
-            pi.playPortalSound(); pi.warp(240040612, "out00");
+            pi.playPortalSound();
+            return true;
         }
-    
-	return true;
+    } else {
+        pi.message("A strange force is blocking you from entering.");
+        return false;
+    }
 }

scripts/portal/go_secretroom.js

@@ -1,13 +1,12 @@
 function enter(pi) {
-	
-	if(!pi.isQuestStarted(2335) || (pi.isQuestStarted(2335) && !pi.hasItem(4032405))){
+	if(!pi.isQuestCompleted(2335) && !(pi.isQuestStarted(2335) && pi.hasItem(4032405))){
 		pi.getPlayer().message("The door is locked securely. I will need a key if I want to go in there.");
 		return false;
 	}
 
-	if(pi.isQuestStarted(2335) && pi.hasItem(4032405)){
+	if(pi.isQuestStarted(2335)){
 		pi.forceCompleteQuest(2335, 1300002);
-		pi.giveCharacterExp(5000 * 1.5, pi.getPlayer());
+		pi.giveCharacterExp(5000, pi.getPlayer());
 		pi.gainItem(4032405, -1);
 	}
 	pi.playPortalSound();

scripts/portal/gotocastle.js

@@ -1,12 +1,9 @@
 function enter(pi) {
-	if (pi.isQuestActive(2324)) {
-            var player = pi.getPlayer();
-            player.gainExp(3300 * player.getExpRate());
-            
-	    pi.forceCompleteQuest(2324);
-	    pi.removeAll(2430015);
-	    pi.playerMessage(5, "You have used the Thorn Remover to clear the path.");
-	}
-	pi.playPortalSound(); pi.warp(106020501,0);
-	return true;
+    if (pi.isQuestCompleted(2324)) {
+        pi.playPortalSound(); pi.warp(106020501,0);
+        return true;
+    } else {
+        pi.playerMessage(5, "The path ahead is covered with sprawling vine thorns, only a Thorn Remover to clear this out...");
+        return false;
+    }
 }

scripts/portal/obstacle.js

@@ -5,17 +5,12 @@
  */
  
  function enter(pi){
- 	if (pi.isQuestCompleted(2316)) {
- 		if (pi.hasItem(2430014)) {
- 			pi.gainItem(2430014, -1 * pi.getPlayer().getItemQuantity(2430014, false));
-                        pi.message("You have used the Killer Mushroom Spore to open the way.");
- 		}
- 
+ 	if (pi.isQuestStarted(100202)) {
  		pi.playPortalSound(); pi.warp(106020400, 2);
  		return true;
- 	} else if (pi.hasItem(2430015)) {
-                pi.gainItem(2430015, -1 * pi.getPlayer().getItemQuantity(2430015, false));
-                pi.message("You have used the Thorn Remover to clean the way.");
+ 	} else if (pi.hasItem(4000507)) {
+                pi.gainItem(4000507, -1);
+                pi.message("You have used a Poison Spore to pass through the barrier.");
                 
                 pi.playPortalSound(); pi.warp(106020400, 2);
                 return true;