Wyara temporary version and fixes to status resetters

4 files changed, 108 insertions, 8 deletions

diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt
index 01e857fd7..996e18889 100644
--- a/npc/005-6/zitoni.txt
+++ b/npc/005-6/zitoni.txt
@@ -117,9 +117,7 @@ L_ConfirmReset:
                     l("It seems that you have no status points to reset!"),
                     l("But the money you brought was really awesome you know."),
                     l("Come back when you will really need me.");
-            }
-            else
-            {
+            } 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."),
diff --git a/npc/009-1/kevin.txt b/npc/009-1/kevin.txt
index 8499e4139..d5655a961 100644
--- a/npc/009-1/kevin.txt
+++ b/npc/009-1/kevin.txt
@@ -1,11 +1,13 @@
 // TMW2 Script
 // Author:
 //    Saulc
+//    Vasily_Makarov (original from Evol)
+//    Jesusalva
 
 009-1,79,62,0	script	Kevin	NPC_PLAYER,{
 
     speech S_LAST_NEXT,
-        l("I am Kevin, an alchemist specialized in reset potions.");
+        l("I am @@, an alchemist specialized in reset potions.", .name$);
 
 L_Menu:
     .@plush_count = BaseLevel*210-(9*210);
@@ -62,9 +64,7 @@ L_ConfirmReset:
                     l("It seems that you have no status points to reset!"),
                     l("But the money you brought was really awesome you know."),
                     l("Come back when you will really need me.");
-            }
-            else
-            {
+            } 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."),
@@ -93,6 +93,6 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 4;
     end;
 }
diff --git a/npc/012-4/_import.txt b/npc/012-4/_import.txt
index 8bb7f52a8..f226d86ca 100644
--- a/npc/012-4/_import.txt
+++ b/npc/012-4/_import.txt
@@ -1,3 +1,4 @@
 // Map 012-4: Alchemy Shop
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/012-4/_warps.txt",
+"npc/012-4/wyara.txt",
diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt
new file mode 100644
index 000000000..069be3b50
--- /dev/null
+++ b/npc/012-4/wyara.txt
@@ -0,0 +1,101 @@
+// TMW2 Script
+// Author:
+//    Saulc
+//    Vasily_Makarov (original from Evol)
+//    Jesusalva
+// Description:
+//    Still Unused NPC
+// Notes:
+//    Reset must be turned in function
+
+012-4,79,62,0	script	Wyara	NPC_FEMALE,{
+
+    speech S_LAST_NEXT,
+        l("I am @@, an alchemist specialized in reset potions.", .name$);
+
+L_Menu:
+    .@plush_count = BaseLevel*210-(9*210);
+    // Lv 10: 210 GP
+
+    select
+        l("Can you reset my stats please?"),
+        lg("You are weird, I have to go sorry.");
+
+    switch (@menu) {
+        case 1:
+            goto L_ResetStats;
+        case 2:
+            goto L_Quit;
+    }
+
+L_ResetStats:
+    mesn;
+    mesq l("Status point reset can't be undone. Do you really want this?");
+
+L_ConfirmReset:
+    switch (select(lg("Yes, I am sure."),
+                   lg("I need to think about it..."),
+                   lg("I won't need it, thank you.")))
+    {
+        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);
+
+            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 == 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_Quit;
+            }
+
+            // 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."),
+                l("Now stand still... It should not take much time...");
+
+            .@wasSP = StatusPoint;
+            resetstatus;
+            if (StatusPoint == .@wasSP)
+            {
+                speech S_LAST_NEXT,
+                    l("It seems that you have no status points to reset!"),
+                    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."),
+                    l("But you are welcome to reset your stats again! I need the money.");
+            }
+            goto L_Quit;
+
+        case 2:
+            goto L_Quit;
+        case 3:
+            goto L_Quit;
+    }
+
+
+L_Quit:
+
+    goodbye;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, FancyHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 8);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
+
+    .sex = G_FEMALE;
+    .distance = 4;
+    end;
+}