From 57baf97a89b6b666f4ee1b3413ae26df5b9a570c Mon Sep 17 00:00:00 2001
From: jesusalva <cpntb1@ymail.com>
Date: Sat, 24 Feb 2018 01:28:53 -0300
Subject: Explain Ayasha a little better

---
 npc/005-1/ayasha.txt | 58 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 13 deletions(-)

(limited to 'npc/005-1')

diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index 2c17e59b5..4b1cb75dd 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -1,14 +1,24 @@
 // Author:
 //    Crazyfefe
-//    Jesusalva (fixes)
-
+//    Jesusalva
+// Description:
+//  Ayasha takes care of the children of Candor Village, and is in charge of protecting them.
+//  The kids sometimes go play outside of city walls, and this makes her upset.
+//  Even if no attack happened in Candor for a while.
+// Variables:
+//  CandorQuest_HAS
+//      0: Not met
+//      1: Already met
+//      2: Quest ongoing
+//      3: Found all kids
+//      4: Reward given
 
 005-1,52,81,0	script	Ayasha	NPC_HUMAN_FEMALE_NOOB,{
 
     
     function quest_findAllKids
     {
-        setq CandorQuest_HAS, 1;
+        setq CandorQuest_HAS, 2;
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Good luck!");
         close;
@@ -18,13 +28,16 @@
     if (.@has == 0)
     {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Hello! Can you help me to find all kids?");
+            l("Ah, the kids are playing hide and seek, but I am afraid they went too far. A monster attack could start anytime, after all."),
+            l("I am currently very worried with them. They're just children! They don't know how to fight!"),
+            l("Could you perhaps help me to find all kids?");
         do
         {
             select
                 l("Yes!"),
                 menuaction(l("I can't, sorry."));
 
+            setq CandorQuest_HAS, 1;
             switch (@menu)
             {
                 case 1:
@@ -34,19 +47,38 @@
         } while (@menu != 2);
     }
     else if (.@has == 1)
+    {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Even if the city has not been attacked on the last few years, I can't help but be concerned while the kids are playing hide and seek."),
+            l("Could you perhaps help me to find all kids?");
+        do
+        {
+            select
+                l("Yes!"),
+                menuaction(l("I can't, sorry."));
+
+            switch (@menu)
+            {
+                case 1:
+                    quest_findAllKids;
+                    break;
+            }
+        } while (@menu != 2);
+    }
+    else if (.@has == 2)
     {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You still haven't found all of them yet.");
         close;
     }
-    else if (.@has == 2)
+    else if (.@has == 3)
     {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Thank you, here is your reward and... some pocket money.");
             narrator("You receive 30 exp and 50 GP.");
         getexp 30, 0;
         Zeny = (Zeny + 50);
-        setq CandorQuest_HAS, 3;
+        setq CandorQuest_HAS, 4;
         close;
     }
     else
@@ -84,7 +116,7 @@ L_KidsTally:
     if (@kids_count == 6)
     {
         message strcharinfo(0), "That must have been the last kid.";
-        setq CandorQuest_HAS, 2;
+        setq CandorQuest_HAS, 3;
     }
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Oh! You found me. Good job!");
@@ -110,7 +142,7 @@ L_Already:
 }
 005-1,69,90,0	script	Charda	NPC_CHILD8,{
     @kids = 0;
-    if (getq(CandorQuest_HAS) == 1)
+    if (getq(CandorQuest_HAS) == 2)
     {
         CheckEnfant();
     } else {
@@ -127,7 +159,7 @@ OnInit:
 }
 005-1,23,84,0	script	Faris	NPC_CHILD7,{
     @kids = 1;
-    if (getq(CandorQuest_HAS) == 1)
+    if (getq(CandorQuest_HAS) == 2)
     {
         CheckEnfant();
     } else {
@@ -142,7 +174,7 @@ OnInit:
 }
 005-1,84,21,0	script	Ghada	NPC_CHILD5,{
     @kids = 2;
-    if (getq(CandorQuest_HAS) == 1)
+    if (getq(CandorQuest_HAS) == 2)
     {
         CheckEnfant();
     } else {
@@ -157,7 +189,7 @@ OnInit:
 }
 005-1,38,58,0	script	Latif	NPC_HUMAN_M_ARTIS,{
     @kids = 3;
-    if (getq(CandorQuest_HAS) == 1)
+    if (getq(CandorQuest_HAS) == 2)
     {
         CheckEnfant();
     } else {
@@ -172,7 +204,7 @@ OnInit:
 }
 005-1,18,43,0	script	Rasin	NPC_CHILD3,{
     @kids = 4;
-    if (getq(CandorQuest_HAS) == 1)
+    if (getq(CandorQuest_HAS) == 2)
     {
         CheckEnfant();
     } else {
@@ -187,7 +219,7 @@ OnInit:
 }
 005-1,38,65,0	script	Lilly	NPC_CHILD6,{
     @kids = 5;
-    if (getq(CandorQuest_HAS) == 1)
+    if (getq(CandorQuest_HAS) == 2)
     {
         CheckEnfant();
     } else {
-- 
cgit v1.2.3-60-g2f50