Npcs remaining script fixes

Npcs changed for travel
Npcs changed for new maps
Npcs changed for basic crypts

1 files changed, 8 insertions, 59 deletions

diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 60477015..913f766b 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -1,8 +1,8 @@
-// Aisha and Nina
+// Aisha
 
 001-1.gat,95,29,0|script|Aisha|108,
 {
-    set @TEMP,rand(9);
+    set @TEMP,rand(10);
     if(@TEMP == 1) goto L_1;
     if(@TEMP == 2) goto L_2;
     if(@TEMP == 3) goto L_3;
@@ -11,6 +11,7 @@
     if(@TEMP == 6) goto L_6;
     if(@TEMP == 7) goto L_7;
     if(@TEMP == 8) goto L_8;
+    if(@TEMP == 9) goto L_9;
     goto L_1;
 
 L_1:
@@ -53,58 +54,6 @@ L_8:
     mes "\"That volcano was sooo scary!  The earth was shaking and everything was breaking down... but now they have rebuilt everything.\"";
     goto L_Close;
 
-L_Close:
-    set @TEMP, 0;
-    close;
-}
-
-001-1.gat,39,67,0|script|Nina|103,
-{
-    mes "[Nina]";
-    set @TEMP,rand(10);
-    if(@TEMP == 0) goto L_1;
-    if(@TEMP == 1) goto L_1;
-    if(@TEMP == 2) goto L_2;
-    if(@TEMP == 3) goto L_3;
-    if(@TEMP == 4) goto L_4;
-    if(@TEMP == 5) goto L_5;
-    if(@TEMP == 6) goto L_6;
-    if(@TEMP == 7) goto L_7;
-    if(@TEMP == 8) goto L_8;
-    goto L_9;
-
-L_1:
-    mes "\"If I learned anything from school, Grenxen founded Tulimshar.\"";
-    goto L_Close;
-
-L_2:
-    mes "\"When I was picking rocks from the field, I saw a red scorpion.\"";
-    goto L_Close;
-
-L_3:
-    mes "\"Its polite to state your name before talking to anyone.\"";
-    goto L_Close;
-
-L_4:
-    mes "\"I have a Scorpion Doll!\"";
-    goto L_Close;
-
-L_5:
-    mes "\"I always take some spare Cactus Juice with me on the field.  They are heavy, though.\"";
-    goto L_Close;
-
-L_6:
-    mes "\"When you are feeling bad, eating something can usually help you heal faster.\"";
-    goto L_Close;
-
-L_7:
-    mes "\"Grenxen is the Demon that founded Tulimshar.\"";
-    goto L_Close;
-
-L_8:
-    mes "\"That volcano eruption was scary; much of Tulimshar was destroyed.  But the mayor had everything rebuilt quickly.\"";
-    goto L_Close;
-
 L_9:
     mes "\"I know a very bad word.  But I must not say it, because monsters will come and get me if I do!\"";
     next;
@@ -113,7 +62,7 @@ L_9:
         "Oh, you better keep it for yourself then.", L_Close;
 
 L_tell:
-    mes "[Nina]";
+    mes "[Aisha]";
     mes "\"Yes, I heard my mother say it once.  And she made me promise her to never say it.  Never.\"";
     next;
     menu
@@ -122,17 +71,17 @@ L_tell:
         "Goodbye!", L_Close;
 
 L_keepword:
-    mes "[Nina]";
+    mes "[Aisha]";
     mes "\"No.\"";
     goto L_Close;
 
 L_giveword:
-    mes "[Nina]";
-    mes "Nina looks around as she hushes you to silence.  After a few seconds, she whispers to you.";
+    mes "[Aisha]";
+    mes "Aisha looks around as she hushes you to silence.  After a few seconds, she whispers to you.";
     mes "\"I like you!  So I will tell you the bad word.  But you can't tell anyone else about it!  The bad word is '" + getspellinvocation("aggravate") + "'.\"";
     next;
 
-    mes "[Nina]";
+    mes "[Aisha]";
     mes "Terrified, she looks around once more.";
     mes "\"But you mustn't tell anyone!\"";
     goto L_Close;