Bandit Lord should be working, and only reward missing. Push to playtest.

3 files changed, 47 insertions, 5 deletions

diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt
index cf92c48d4..bc9f36296 100644
--- a/npc/012-2/helena.txt
+++ b/npc/012-2/helena.txt
@@ -29,6 +29,8 @@
     if (BaseLevel < 45) goto L_Busy;
     if (.@q == 4) goto L_BanditLord;
     if (.@q == 5) goto L_Busy;
+    if (.@q == 6) goto L_Busy;
+    if (.@q == 7) goto L_Finish;
 
     goto L_Daily;
 
@@ -180,7 +182,7 @@ L_BanditLord:
     mesq l("The @@ is not only a fearsome and ruthless leader. He is strong, and he have tricks on his sleeve.", getmonsterlink(BanditLord));
     next;
     mesn;
-    mesq l("He will summon allies if he think you have the upper hand. So, bring allies yourself, too.");
+    mesq l("He will summon allies if he think you have the upper hand. So take care if you are going ranged.");
     next;
     mesn;
     mesq l("I know another Bandit Lord will take up his place, but the loss of their leader will make bandits scatter long enough.");
@@ -205,6 +207,11 @@ L_BanditLord:
     mesq l("One last thing... Good luck. This is a long shot, so don't hesit in running away.");
     close;
 
+L_Finish:
+    mesn;
+    mesq l("Wow");
+    close;
+
 OnInit:
     .@npcId = getnpcid(0, .name$);
     setunitdata(.@npcId, UDT_HEADTOP, FairyHat);
diff --git a/npc/015-2/guard.txt b/npc/015-2/guard.txt
index e9ba3fe37..97a7dea54 100644
--- a/npc/015-2/guard.txt
+++ b/npc/015-2/guard.txt
@@ -3,6 +3,7 @@
 //    Jesusalva
 // Description:
 //    Part of Helena's quest
+//    Gives spoilers about what Jesusalva plans in doing with Bryant
 
 012-2,47,40,0	script	Helena's Teammate	NPC_ORC,{
     .@q=getq(HurnscaldQuest_Bandits);
@@ -17,18 +18,37 @@ L_SilverKey:
     mesn;
     mesq l("Don't say anything, I can smell the scent of Helena's hair on you.");
     next;
-    geitem SilverKey, 1;
+    inventoryplace SilverKey, 1, PiberriesInfusion, 3;
+    getitem SilverKey, 1;
+    getitem PiberriesInfusion, 3;
     setq HurnscaldQuest_Bandits, 6;
     mesn;
     mesq l("I guess she sent you to kill another Bandit Lord, right? Ok, I'll give you the key for his room.");
     next;
     mesn;
-    mesq l("It is pretty close to here. I advise you to bring friends, and use a sword, but I can't give keys to them and etc.");
+    mesq l("It is pretty close to here. I advise you to use a good sword, and heal yourself often.");
+    next;
+    mesn;
+    mesq l("I will give you 3 @@. Use them on this fight, or you're doomed to fail.", getitemlink(PiberriesInfusion));
     close;
 
 L_BanditLord:
+    mesn;
+    mesq l("What are you waiting for? Go kill the bandit lord.");
+    next;
     mesn strcharinfo(0);
-    mesq l("There was nobody on the Bandit Lord's room.");
+    select
+        l("There was nobody on the Bandit Lord's room."),
+        l("I'm going, don't worry.");
+    mes "";
+    mesn;
+    mesq l("...Have you ever gone there yet?");
+    next;
+    mesn;
+    mesq l("This is not The Mana World. My name is not Bryant.");
+    next;
+    mesn;
+    mesq l("In fact, Bryant is my brother, and he lives in a cave, and he probably have a high level quest too, but that's not important now.");
     close;
 
 OnInit:
diff --git a/npc/015-2/lordcave.txt b/npc/015-2/lordcave.txt
index 517944f6a..e0eddf7b1 100644
--- a/npc/015-2/lordcave.txt
+++ b/npc/015-2/lordcave.txt
@@ -6,6 +6,21 @@
     end;
 
 OnTouch:
-    npctalk l("This passage seems sealed. If I only had a @@...", getitemlink(SilverKey));
+    if (countitem(SilverKey) >= 1) goto L_Summon;
+    dispbottom l("This passage seems sealed. If I only had a @@...", getitemlink(SilverKey));
+    end;
+
+L_Summon:
+    if (mobcount("015-2", "#BanditLordDen::OnLordDeath") == 0)
+        monster "015-2",260,250,"Bandit Lord",BanditLord,1, "#BanditLordDen::OnLordDeath";
+    slide 251, 277;
+    end;
+
+OnLordDeath:
+    .@q=getq(HurnscaldQuest_Bandits);
+    if (.@q == 6) {
+        setq HurnscaldQuest_Bandits, 7;
+        dispbottom l("Phew! The Bandit Lord was killed.");
+    }
     end;
 }