Merge pull request #230 from PaperChonChon/master #patch

NPC 2040022.js is removing items even if player does not have all materials to craft it. party3_jailin.js - Map is unpassable as the top layer spears will not hit mobs

scripts/npc/2040022.js

@@ -198,20 +198,12 @@ function action(mode, type, selection) {
         } else {
             if (mats instanceof Array) {
                 for (var i = 0; complete && i < mats.length; i++) {
-                    if (matQty[i] * selection == 1) {
-                        if (!cm.haveItem(mats[i])) {
+                    if (!cm.haveItem(mats[i], matQty[i])) {
                             complete = false;
-                        }
-                    } else {
-                        if (!cm.haveItem(mats[i], matQty[i] * selection)) {
-                            complete = false;
-                        }
                     }
                 }
             } else {
-                if (!cm.haveItem(mats, matQty * selection)) {
-                    complete = false;
-                }
+                complete = false;
             }
         }
 
@@ -250,4 +242,4 @@ function action(mode, type, selection) {
         }
         cm.dispose();
     }
-}
+}

scripts/portal/party3_jailin.js

@@ -1,4 +1,4 @@
-var leverSequenceExit = false;
+var leverSequenceExit = true;
 
 function enterLeverSequence(pi) {
     var map = pi.getMap();
@@ -72,4 +72,4 @@ function enter(pi) {
     }
 
     return ret;
-}
+}