Merge pull request #334 from anliting/fix-quest-21010-reward #patch

Fix quest 21010 reward.

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;
-}
+}

scripts/quest/21010.js

@@ -83,8 +83,8 @@ function end(mode, type, selection) {
     } else if (status == 2) {
         if (qm.isQuestStarted(21010) && !qm.isQuestCompleted(21010)) {
             qm.gainExp(16);
-            qm.gainItem(2000022, 3);
-            qm.gainItem(2000023, 3);
+            qm.gainItem(2000022, 5);
+            qm.gainItem(2000023, 5);
             qm.forceCompleteQuest();
         }
 

src/main/java/client/Character.java

@@ -2377,7 +2377,7 @@ public class Character extends AbstractCharacterObject {
                 ps.executeUpdate();
             }
 
-            String[] toDel = {"famelog", "inventoryitems", "keymap", "queststatus", "savedlocations", "trocklocations", "skillmacros", "skills", "eventstats", "server_queue"};
+            String[] toDel = {"famelog", "inventoryitems", "keymap", "queststatus", "savedlocations", "trocklocations", "skillmacros", "skills", "eventstats" };
             for (String s : toDel) {
                 Character.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid);
             }