Update panoua.txt - fixes

1 files changed, 12 insertions, 12 deletions

diff --git a/npc/004-3/panoua.txt b/npc/004-3/panoua.txt
index cd8579df7..18258997a 100644
--- a/npc/004-3/panoua.txt
+++ b/npc/004-3/panoua.txt
@@ -7,18 +7,18 @@
 004-3,32,24,0	script	Panoua	NPC_PLAYER,{
     mesn;
     mesq l("Life in the desert is simply the best.");
+    next;
     goto L_Menu;
 
 L_Menu:
-    .@q = getq(HalinarzoQuest_Panoua);   
-    next;
+    .@m$ =  (getq(HalinarzoQuest_Panoua) ? "Can you make me dye?" : "Do you sell anything?");
     mesn;   
     mesq l("Can I help you with anything traveller?");
     select
         l("Who are you?"),
         l("What is this place?"),
         l("I am lost, what should I do?"),
-        rif(.@q < 1, l("Do you sell anything?"),  l("Can you make me dye?")),
+        l(.@m$),
         l("Nothing. I should get going.");
 
     mes "";
@@ -47,8 +47,8 @@ L_Menu:
             goto L_Menu;
         case 4:
             mesn;
-            mesq l("I have mastered the art of crafting traditional desert dye's.");
-            mesq l("Ya know, for clothes and stuff"); 
+            mesq l("I have mastered the art of crafting traditional desert dyes.");
+            mesq l("Ya know, for clothes and stuff."); 
             next;
             mesn;
             mesq l("The only problem is I cannot sell any to you because I am all out of ingredients.");
@@ -60,7 +60,7 @@ L_Menu:
             mesq l("I have an idea!");
             next;
             mesn;
-            mesq l("If you bring me the ingredients, I will make a dye for you...for a small fee of course");
+            mesq l("If you bring me the ingredients, I will make a dye for you... for a small fee of course");
             next;
             goto L_Offer;
         case 5:
@@ -80,14 +80,12 @@ L_Offer:
     mesq l("%d/%d %s",countitem(YellowDye), 2, getitemlink(YellowDye)); 
     mesn;
     mesq l("So what do you think? Want one?");
-    if (.@q < 1)
-        setq HalinarzoQuest_Panoua, 1;
+    compareandsetq HalinarzoQuest_Panoua, 0, 1;
     goto L_Dye;
 
 L_Dye:
-    select
-        l("Yes."),
-        l("No.");
+    if (askyesno() == ASK_NO)
+        goto L_Quit;
         
     mes "";
     if (@menu == 2)
@@ -119,6 +117,7 @@ L_Dye:
     } else {
         mesn;
         mesq l("Sorry, you seem to be missing some things.");
+        next;
         goto L_Menu;
     }
     close;
@@ -134,7 +133,8 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADMIDDLE, DesertShirt); 
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
     setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 1);
+    setunitdata(.@npcId, UDT_RACE, MedHu);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 19);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 1);
     
     .sex = G_OTHER;