Baktar - require two items instead of only one.

There's seven items now, so ratio improved (33.33% complete to 28.57%)

1 files changed, 13 insertions, 13 deletions

diff --git a/npc/020-4/baktar.txt b/npc/020-4/baktar.txt
index 2158f58c9..e00e074da 100644
--- a/npc/020-4/baktar.txt
+++ b/npc/020-4/baktar.txt
@@ -20,7 +20,7 @@
 
 L_Start:
     mesn;
-    if (rand(1,5) == 4) mesc l("*cough cough*");
+    if (rand2(1,5) == 4) mesc l("*cough cough*");
     mesq l("Hello, did you come from Tulimshar? Because you have a nice tan.");
     next;
     select
@@ -31,11 +31,11 @@ L_Start:
     switch (@menu) {
         case 2:
             mesn;
-            if (rand(1,5) == 4) mesc l("*cough cough*");
+            if (rand2(1,5) == 4) mesc l("*cough cough*");
             mesq l("Bah! Don't try to fool me! The sun can't burn in Nivalis.");
             // Don't stop now
         case 3:
-            if (rand(1,5) == 4)
+            if (rand2(1,5) == 4)
                 mesc l("*cough cough*");
             close;
             break;
@@ -43,7 +43,7 @@ L_Start:
 
     setq NivalisQuest_Baktar, 1, 0;
     mesn;
-    if (rand(1,5) == 4) mesc l("*cough cough*");
+    if (rand2(1,5) == 4) mesc l("*cough cough*");
     mesq l("All my parents, grandparents, until the world was born, are from Tulimshar.");
     next;
     mesn;
@@ -57,7 +57,7 @@ L_Start:
 
 L_Collector:
     mesn;
-    if (rand(1,5) == 4) mesc l("*cough cough*");
+    if (rand2(1,5) == 4) mesc l("*cough cough*");
     mesq l("Did you brought me an souvenir from Tulimshar?");
     mes "";
     mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
@@ -72,11 +72,11 @@ L_Collector:
     .@m = htget(.TULIMITEM, str(.@id), 0);
     if (!.@m) {
         mesn;
-        if (rand(1,5) == 4) mesc l("*cough cough*");
+        if (rand2(1,5) == 4) mesc l("*cough cough*");
         mesq l("What crap is that?! This is not from Tulimshar!");
         next;
         mesn;
-        if (rand(1,5) == 4) mesc l("*cough cough*");
+        if (rand2(1,5) == 4) mesc l("*cough cough*");
         mesq l("I won't accept stuff from Halinarzo!");
         mesc l("Baktar can be picky with Tulimshar stuff, too.");
         close;
@@ -84,7 +84,7 @@ L_Collector:
     // Already given
     if (.@q2 & .@m) {
         mesn;
-        if (rand(1,5) == 4) mesc l("*cough cough*");
+        if (rand2(1,5) == 4) mesc l("*cough cough*");
         mesq l("I already have that...");
         close;
     }
@@ -108,7 +108,7 @@ L_Collector:
 
 L_Braknar:
     mesn;
-    if (rand(1,5) == 4)
+    if (rand2(1,5) == 4)
         mesc l("*cough cough*");
     mesq l("Welcome back.");
     select
@@ -120,22 +120,22 @@ L_Braknar:
         case 1: goto L_Collector;
         case 2:
             mesn;
-            if (rand(1,5) == 4) mesc l("*cough cough*");
+            if (rand2(1,5) == 4) mesc l("*cough cough*");
             mesq l("Yeah, it was my grand-grand-grandfather.");
             next;
             mesn strcharinfo(0);
             mes l("'-' \"Could you give me his shield? Pretty please? I need it to survive and bring Tulimshar goodies!\"");
             next;
             mesn;
-            if (rand(1,5) == 4) mesc l("*cough cough*");
+            if (rand2(1,5) == 4) mesc l("*cough cough*");
             mesq l("No, it is a family heirloom. But I do have the shield blueprints. A skilled craftsman could forge one.");
             next;
             mesn strcharinfo(0);
             mes l("*-* \"Could you share those blueprints with me? Please?\"");
             next;
             mesn;
-            if (rand(1,5) == 4) mesc l("*cough cough*");
-            if (!.@q2) {
+            if (rand2(1,5) == 4) mesc l("*cough cough*");
+            if (bitmask_count(.@q2) < 2) {
                 mesq l("Why should I? Go away. %%n");
                 close;
             }