Simplify Zitoni's script

1 files changed, 24 insertions, 113 deletions

diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt
index b56adb5df..f40fd1d4f 100644
--- a/npc/005-6/zitoni.txt
+++ b/npc/005-6/zitoni.txt
@@ -1,88 +1,51 @@
 // TMW2 scripts.
 // Author:
-//    Vasily_Makarov
+//    Vasily_Makarov (original from Evol)
 //    Jesusalva
 // Description:
 //    Stat resetter.
-// Variables:
-//    General_Rumly
-// Values:
-//    0  Player hasn't met Zitomi
-//    1  Last time player has told that he will never come back
-//    2  Last time player has told that he will come back later
-//    3  Player has already reset his stat
 // Others:
-// .@visited - Zitomi actual variable
 // .@wasSP - free status points before reset
 
 005-6,43,39,0	script	Zitoni	NPC_RUMLY,{
-
-    setnpcdir "Zitoni", 2;
-    stopnpctimer;
-    initnpctimer;
-
-    speech S_LAST_NEXT,
-        l("Hey you, do you have any @@s?", getitemlink(Plushroom));
+    mesn;
+    mesq l("Ah, hello there! I am @@, a Redy alchemist.", .name$);
+    mes "";
+    mesq l("I have developed a special formula, which resets your stats!");
+    next;
+    mes "";
 
 L_Menu:
-    .@visited = getq(General_Rumly);
     if (BaseLevel < 10)
-        .@plush_count = 1;
+        .@price = 1;
     else 
-        .@plush_count = BaseLevel*200-(9*200);
-    // Lv 9: 1 GP | Lv 10: 200 GP
+        .@price = BaseLevel*200-(9*200);
 
     select
-        l("Plushrooms you say?"),
-        l("Who are you?"),
-        rif(.@visited >  0, l("Can you reset my stats please?")),
+        l("Status reset? Sounds illegal!"),
+        l("Can you reset my stats please?"),
         lg("You are weird, I have to go sorry.");
 
     switch (@menu)
     {
         case 1:
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("Wind and grass is nice and cool, so juicy sweet..."),
-                l("Our only wish to eat a plush, so juicy sweet...");
-            goto L_Menu;
-        case 2:
-            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                lg("Why are you asking? And who are you too? I've never seen you around before..."),
                 lg("Wait, are you with the police? I didn't do anything wrong, I promise!"),
-                l("I... I just like to eat the purple and delightful... And natural, and...");
-
-            switch (select(l("Chill out I won't say anything."),
-                           l("Yes I am and you are going to face justice!")))
-            {
-                case 1: break;
-                case 2:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("No! No, no, my precious plushrooms! Don’t take me to them, they wants my precious.");
-                    goto L_Quit;
-            }
-
-            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("I won't forget it, I swear on my precious plushrooms!"),
-                l("As an alchemist, I've developed a secret formula to free you from your past mistakes."),
-                l("You can use it to clear your stats, to start freshly if you see what I mean..."),
+                l("My formula is not a drug, nor magic. It is an ancient technology of our people!"),
+                l("You can use it to clear your stats, to start freshly if you know what I mean..."),
                 l("For only a small amount of Gold Pieces, I will show you how it works!"),
                 l("Although the more powerful you are, the more money you will need."),
                 l("I will let you test it for a peny until level 10!");
 
             select
                 l("Sounds good!"),
-                rif(Zeny >= .@plush_count, lg("I think I have enough gold with me.")),
+                rif(Zeny >= .@price, lg("I think I have enough gold with me.")),
                 l("We will talk about it later."),
                 l("My stats are too good, I won't need it.");
 
             switch (@menu)
             {
                 case 1:
-                    if (.@visited < 2)
-                    {
-                        setq General_Rumly, 2;
-                    }
-
                     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                         l("Yes, it is a really sweet deal, believe me!");
 
@@ -95,46 +58,15 @@ L_Menu:
                     goto L_Never;
             }
 
-        case 3:
+        case 2:
             goto L_ResetStats;
-        case 4:
-            if (.@visited < 2) goto L_Quit;
-
-            .@rand = rand(2);
-
-            if (.@rand)
-            {
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("See you! And come back!");
-            }
-            else
-            {
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("Oh noes!"),
-                    l("A rabbit!"),
-                    l("He has a guns!"),
-                    l("*Bang bang*");
-                narrator S_LAST_NEXT,
-                    l("Rumly is hiding behind the desk.");
-            }
-
+        case 3:
             goto L_Quit;
     }
 
 L_ResetStats:
-    if (.@visited == 1)
-    {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            lg("Changed your mind, uh?"),
-            l("Very good."),
-            l("Status point reset can't be undone. Do you really want this?"),
-            lg("Are you sure about this?");
-    }
-    else
-    {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            lg("Are you sure about this?");
-    }
+            lg("Status point reset can't be undone. Are you sure about this?");
 
 L_ConfirmReset:
     switch (select(lg("Yes, I am sure."),
@@ -143,11 +75,11 @@ L_ConfirmReset:
     {
         case 1:
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("Let me just have a quick look at you. Hm... I will need @@ GP to reset your stats.", .@plush_count);
+                l("Let me just have a quick look at you. Hm... I will need @@ GP to reset your stats.", .@price);
 
             select
-                rif(Zeny >= .@plush_count, l("Here, take as much as you need, I have plenty!")),
-                rif(Zeny > 0 && Zeny < .@plush_count, l("I don't have enough money...")),
+                rif(Zeny >= .@price, l("Here, take as much as you need, I have plenty!")),
+                rif(Zeny > 0 && Zeny < .@price, l("I don't have enough money...")),
                 rif(Zeny == 0, l("Oh no, I don't have any money on me right now.")),
                 l("I have to go, sorry.");
 
@@ -157,7 +89,7 @@ L_ConfirmReset:
             }
 
             // TODO: I think there were functions to deal with GP
-            set Zeny, Zeny-.@plush_count;
+            set Zeny, Zeny-.@price;
 
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Thank you."),
@@ -165,10 +97,7 @@ L_ConfirmReset:
 
             .@wasSP = StatusPoint;
             resetstatus;
-            if (.@visited < 3)
-            {
-                setq General_Rumly, 3;
-            }
+
             if (StatusPoint == .@wasSP)
             {
                 speech S_LAST_NEXT,
@@ -192,20 +121,12 @@ L_ConfirmReset:
     }
 
 L_Later:
-    if (.@visited < 2)
-    {
-        setq General_Rumly, 2;
-    }
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("Come back soon!");
 
     goto L_Quit;
 
 L_Never:
-    if (.@visited < 2)
-    {
-        setq General_Rumly, 1;
-    }
 
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
         l("I am sure that you will change your mind.");
@@ -213,19 +134,9 @@ L_Never:
     goto L_Quit;
 
 L_Quit:
-    setnpcdir "Zitoni", 4;
-    stopnpctimer;
-    initnpctimer;
-
+    closedialog;
     goodbye;
-
-OnTimer1800:
-    stopnpctimer;
-
-    if (getnpcdir("Zitoni") == 2) setnpcdir "Zitoni", 6;
-    if (getnpcdir("Zitoni") == 4) setnpcdir "Zitoni", 8;
-
-    end;
+    close; // double sure
 
 OnInit:
     .sex = G_MALE;