Xovilam, Fortress Island Status Reset NPC.

Remove some unused clutter from Malivox and Wyara

6 files changed, 53 insertions, 21 deletions

diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt
index cf080f3e7..7ae0d3679 100644
--- a/npc/003-1/malivox.txt
+++ b/npc/003-1/malivox.txt
@@ -4,22 +4,11 @@
 003-1,114,106,0	script	Malivox	NPC_PLAYER,{
 
     speech S_LAST_NEXT,
-        l("I am Malivox, an alchemist specialized in reset potions.");
-
-L_Menu:
-    if (BaseLevel < 10)
-        .@plush_count = (BaseLevel*5)+5;
-    else
-        .@plush_count = BaseLevel*190-(9*190);
-    // Lv 9: 50 GP | Lv 10: 190 GP
-    // Lv 90: 1.710 GP
-
-    if (BaseLevel > 10)
-        .@plush_count = .@plush_count/(BaseLevel/10);
+        l("I am @@, an alchemist specialized in reset potions.", .name$);
 
     select
         l("Can you reset my stats please?"),
-        lg("You are weird, I have to go sorry.");
+        l("You are weird, I have to go sorry.");
 
     switch (@menu)
     {
@@ -52,6 +41,6 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 4;
     end;
 }
diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt
index a649663eb..cac765c8a 100644
--- a/npc/012-4/wyara.txt
+++ b/npc/012-4/wyara.txt
@@ -14,12 +14,6 @@
         l("I am @@, an alchemist specialized in reset potions.", .name$);
 
 L_Menu:
-    .@plush_count = BaseLevel*210-(10*210);
-    // Lv 10: 210 GP
-    // Lv 90: 1.867 GP
-    if (BaseLevel > 10)
-        .@plush_count = .@plush_count/(BaseLevel/10);
-
     .@n=getq(General_Narrator);
     .@s=getq(HurnscaldQuest_Sagratha);
     .@s3=getq3(HurnscaldQuest_Sagratha);
diff --git a/npc/025-1/_import.txt b/npc/025-1/_import.txt
index 8077fd8b5..2d7aab78d 100644
--- a/npc/025-1/_import.txt
+++ b/npc/025-1/_import.txt
@@ -5,3 +5,4 @@
 "npc/025-1/ctrl.c",
 "npc/025-1/ihclot.txt",
 "npc/025-1/salohcin.txt",
+"npc/025-1/xovilam.txt",
diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c
index 8c1cdc8e5..7128a5bf2 100644
--- a/npc/025-1/ctrl.c
+++ b/npc/025-1/ctrl.c
@@ -21,7 +21,7 @@
 // TODO: Provide a way to resume failed attempts. Move Phoenix inside.
 // TODO: Testing.
 //       Use setwall() instead of builtin collision? (Deprecates out NPC)
-// TODO: NPCs from inside: Tolchi. Phoenix. Free Status Reset. Aeros Shop. Etc.
+// TODO: NPCs from inside: Phoenix. Aeros Shop. Etc.
 // TODO: Spawn inside and outside when siege begins.
 // TODO: Heartbeat - (Re)Spawn monsters inside every X seconds
 
diff --git a/npc/025-1/xovilam.txt b/npc/025-1/xovilam.txt
new file mode 100644
index 000000000..886b03850
--- /dev/null
+++ b/npc/025-1/xovilam.txt
@@ -0,0 +1,47 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+
+025-1,143,59,0	script	Xovilam	NPC_PLAYER,{
+
+    speech S_LAST_NEXT,
+        l("I am @@, an alchemist specialized in reset potions.", .name$);
+
+    select
+        l("Can you reset my stats please?"),
+        l("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:
+    ConfirmStatusReset(1000, false);
+    goto L_Quit;
+
+
+L_Quit:
+    goodbye;
+    end;
+
+OnInit:
+    .@npcId = getnpcid(.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, 7);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
+
+    .sex = G_MALE;
+    .distance = 4;
+    end;
+}
diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt
index 5d4f88ea7..256b47ff3 100644
--- a/npc/functions/dungeon.txt
+++ b/npc/functions/dungeon.txt
@@ -13,6 +13,7 @@ OnInit:
     setarray .cursemap$, "006-4", "006-4-1";
     end;
 
+/////////////////////////////////////////
 // Heartbeat for Heat effects
 OnHeat:
     // Did you left?