Merge branch 'master' of gitlab.com:TMW2/serverdata

2 files changed, 33 insertions, 24 deletions

diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt
index bace64baf..b56adb5df 100644
--- a/npc/005-6/zitoni.txt
+++ b/npc/005-6/zitoni.txt
@@ -1,6 +1,7 @@
-// Evol scripts.
+// TMW2 scripts.
 // Author:
 //    Vasily_Makarov
+//    Jesusalva
 // Description:
 //    Stat resetter.
 // Variables:
@@ -16,7 +17,7 @@
 
 005-6,43,39,0	script	Zitoni	NPC_RUMLY,{
 
-    setnpcdir "Rumly#001-1", 2;
+    setnpcdir "Zitoni", 2;
     stopnpctimer;
     initnpctimer;
 
@@ -25,9 +26,11 @@
 
 L_Menu:
     .@visited = getq(General_Rumly);
-    .@plush_count = lognbaselvl(1, 10);
     if (BaseLevel < 10)
         .@plush_count = 1;
+    else 
+        .@plush_count = BaseLevel*200-(9*200);
+    // Lv 9: 1 GP | Lv 10: 200 GP
 
     select
         l("Plushrooms you say?"),
@@ -60,14 +63,15 @@ L_Menu:
 
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("I won't forget it, I swear on my precious plushrooms!"),
-                l("There is an unknown side effect to these plushrooms, they can free you from your past mistakes."),
+                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("Bring me some of these plushrooms and I will show you how it works!"),
-                l("Although the more powerful you are, the more plushrooms you will need.");
+                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(countitem(Plushroom) >= .@plush_count, lg("I think I have enough plushrooms on me.")),
+                rif(Zeny >= .@plush_count, 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.");
 
@@ -80,7 +84,7 @@ L_Menu:
                     }
 
                     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("Great! Can't wait for some tasty mushrooms!");
+                        l("Yes, it is a really sweet deal, believe me!");
 
                     goto L_Menu;
                 case 2:
@@ -101,7 +105,7 @@ L_Menu:
             if (.@rand)
             {
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("See you! And come back with the plushrooms!");
+                    l("See you! And come back!");
             }
             else
             {
@@ -111,7 +115,7 @@ L_Menu:
                     l("He has a guns!"),
                     l("*Bang bang*");
                 narrator S_LAST_NEXT,
-                    l("Rumly is hiding behind the tree.");
+                    l("Rumly is hiding behind the desk.");
             }
 
             goto L_Quit;
@@ -139,20 +143,21 @@ 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 @@ @@s to reset your stats.", .@plush_count, getitemlink(Plushroom));
+                l("Let me just have a quick look at you. Hm... I will need @@ GP to reset your stats.", .@plush_count);
 
             select
-                rif(countitem(Plushroom) >= .@plush_count, lg("Here, take as many as you need, I have plenty!")),
-                rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, lg("I don't have enough plushrooms...")),
-                rif(countitem(Plushroom) == 0, lg("Oh no, I don't have any plushroom on me right now.")),
-                lg("I have to go, sorry.");
+                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 == 0, l("Oh no, I don't have any money on me right now.")),
+                l("I have to go, sorry.");
 
             if (@menu > 1)
             {
                 goto L_Later;
             }
 
-            delitem Plushroom, .@plush_count;
+            // TODO: I think there were functions to deal with GP
+            set Zeny, Zeny-.@plush_count;
 
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Thank you."),
@@ -168,15 +173,15 @@ L_ConfirmReset:
             {
                 speech S_LAST_NEXT,
                     l("It seems that you have no status points to reset!"),
-                    lg("But the plushroom you brought was really awesome you know."),
-                    lg("Come back when you will really need me. And bring more plushrooms with you!");
+                    l("But the money you brought was really awesome you know."),
+                    l("Come back when you will really need me.");
             }
             else
             {
                 speech S_LAST_NEXT,
                     l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
                     l("Spend it wisely this time."),
-                    lg("But you are welcome to reset your stats again if you bring me some more plushrooms!");
+                    l("But you are welcome to reset your stats again! I need the money.");
             }
             goto L_Quit;
 
@@ -192,7 +197,7 @@ L_Later:
         setq General_Rumly, 2;
     }
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("Come back soon, and bring @@s!", getitemlink(Plushroom));
+        l("Come back soon!");
 
     goto L_Quit;
 
@@ -203,12 +208,12 @@ L_Never:
     }
 
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        lg("I am sure that you will change your mind.");
+        l("I am sure that you will change your mind.");
 
     goto L_Quit;
 
 L_Quit:
-    setnpcdir "Rumly#001-1", 4;
+    setnpcdir "Zitoni", 4;
     stopnpctimer;
     initnpctimer;
 
@@ -217,8 +222,8 @@ L_Quit:
 OnTimer1800:
     stopnpctimer;
 
-    if (getnpcdir("Rumly#001-1") == 2) setnpcdir "Rumly#001-1", 6;
-    if (getnpcdir("Rumly#001-1") == 4) setnpcdir "Rumly#001-1", 8;
+    if (getnpcdir("Zitoni") == 2) setnpcdir "Zitoni", 6;
+    if (getnpcdir("Zitoni") == 4) setnpcdir "Zitoni", 8;
 
     end;
 
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index 75079c33a..78b28a44a 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -42,6 +42,10 @@ L_DontPanic:
 
 L_Do_Save:
     savepoint @map$, @x, @y;
+    specialeffect(4, SELF, getcharid(3));
+
+    // As we have a dialog box open, this function produces an undesirable player talk.
+    //savepointparticle @map$, @x, @y, NO_INN;
     goto L_Return;
 
 L_FindPoint: