Replace pouf.txt

1 files changed, 37 insertions, 29 deletions

diff --git a/npc/006-2-5/pouf.txt b/npc/006-2-5/pouf.txt
index 4d974e96d..6b42846c4 100644
--- a/npc/006-2-5/pouf.txt
+++ b/npc/006-2-5/pouf.txt
@@ -5,20 +5,21 @@
 //	  +seeds
 // Description:
 //    Piou royal who asks players to prove themselves against piou knights.
+
 function	script	PoufMobCount	{
     .@q=getq(LilitQuest_Pouf);
     .@t=getq2(LilitQuest_Pouf);
-    if (getmap() == "006-2-4" && .@q == 1 && killedrid == PiouKnight)
+    if (.@q == 1 && killedrid == PiouKnight)
     {
-        setq2 LilitQuest_Pouf, .@t+1;
+        setq2(LilitQuest_Pouf, .@t+1);
     }
-    if (.@t+1 >= 12)
+    if (.@t+1 >= 10)
     {
-        setq LilitQuest_Pouf, 2, 0;
+        setq(LilitQuest_Pouf, 2);
     }
     
     // Report progress
-    dispbottom l("@@/@@", .@t+1, 12);
+    dispbottom l("@@/@@", .@t+1, 10);
     
     return;
 }
@@ -29,11 +30,12 @@ function	script	PoufMobCount	{
     function poufQuestReport;
     function poufQuestReward;
     function poufQuestFinished;
-    .@q=getq(LilitQuest_Pouf);
     if (BaseLevel < 60)
     {
         mesn;
         mesq l("You are too weak to pass my test.");
+        next;
+        mesn;
         mesc l("Return when you are stronger.");
     }
     else
@@ -44,6 +46,7 @@ function	script	PoufMobCount	{
     close;
 
 function poufChallenge {
+    .@q=getq(LilitQuest_Pouf);
     if (.@q == 0)
     {
         mesn;
@@ -69,57 +72,62 @@ function poufChallenge {
     return;
 }
 
-function poufQuest { // L_Quest:
+function poufQuest {
     mes "";
     mesn;
-    mesq l("Defeat 12 of my bravest @@ to prove yourself a warrior, brave of heart and strong of arm!", getmonsterlink(PiouKnight));
+    mesq l("Defeat 10 of my bravest @@ to prove yourself a warrior, brave of heart and strong of arm!", getmonsterlink(PiouKnight));
     next;
     select
         l("Point the way! Little yellow birds can't be that hard."),
 	    l("Scary pious with armor? No thank you!");
     mes "";
-    switch (@menu)
-    {
-        case 1:
-            mesn;
-            mesq l("Excellent. You will find them in the training room beneath this chamber.");
-            setq LilitQuest_Pouf, 1, 0;
-            break;
-        case 2:
-            mesn;
-            mesq l("You are clearly not brave enough for this test. Leave my sight at once, chicken.");
-            break;
+    switch (@menu) {
+		case 1:
+			mesn;
+			mesq l("Excellent. You will find them in the training room beneath this chamber.");
+			next;
+			setq(LilitQuest_Pouf, 1, 0);
+			break;
+		case 2:
+			next;
+			mesq l("You are clearly not brave enough for this test. Leave my sight at once, chicken.");
+			break;
     }
     return;
 }
 
-function poufQuestReport { // L_Report:
+function poufQuestReport {
     mesn;
-    mesq l("You've only killed @@/8 @@! You must defeat more to win my favor.", getq2(LilitQuest_Pouf),getmonsterlink(PiouKnight));
+    mesq l("You've only killed @@/10 @@! You must defeat more to win my favor.", getq2(LilitQuest_Pouf),getmonsterlink(PiouKnight));
+    next;
     return;
 }
 
-function poufQuestReward { // L_Reward:
+function poufQuestReward {
     mesn;
-    mesq l("You've defeated 8 of my knights without flinching! You are truly a brave warrior.");
+    mesq l("You've defeated 10 of my knights without flinching! You are truly a brave warrior.");
+    next;
     mesn;
     mesc l("The princess flies off her perch and alights upon your right and left shoulder in succession.");
+    next;
     mesn;
-    mesq l("I dub thee Honorary Piou Knight @@, with all the rewards and duties of the position!", strcharinfo(0));
+    mesq l("I dub thee Honorary Piou Knight @@, with all the rewards and duties of the position.", strcharinfo(0));
+    next;
     mesn;
     mesc l("The princess produces a small, shiny bronze feather and pins it to your lapel, then returns to her perch.");
+    next;
     mesn;
     mesq l("Make me proud, knight!");
     inventoryplace BronzePin, 1;
     getitem BronzePin, 1;
     getexp(91479, 24989);
-    setq LilitQuest_Pouf, 3, 0;
-    mesn;
+    setq(LilitQuest_Pouf, 3);
+    next;
     return;
 }
 
-function poufQuestFinished { // L_Finished:
-    next;
+function poufQuestFinished {
+    mesn;
 	.@r = rand2(3);
     if (.@r == 0)
     {
@@ -127,7 +135,7 @@ function poufQuestFinished { // L_Finished:
     }
     else if (.@r == 1)
     {
-        npctalk3 l("Fight bravely for Queen +seeds and country, honorable knight!");
+        npctalk3 l("Fight bravely for Queen +seeds and our isles, honorable knight!");
     }
     else
     {