6 files changed, 152 insertions, 0 deletions
diff --git a/npc/031-2/_import.txt b/npc/031-2/_import.txt
index 47a3c2479..39fc907c0 100644
--- a/npc/031-2/_import.txt
+++ b/npc/031-2/_import.txt
@@ -1,3 +1,4 @@
 // Map 031-2: Aethyr Inn
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/031-2/_warps.txt",
+"npc/031-2/tyrca.txt",
diff --git a/npc/031-2/tyrca.txt b/npc/031-2/tyrca.txt
new file mode 100644
index 000000000..a9125f2b2
--- /dev/null
+++ b/npc/031-2/tyrca.txt
@@ -0,0 +1,66 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Questmaker Handbook 14.0 (F = Favorable)
+
+031-2,77,77,0	script	Tyrca	NPC_SAVIOR_F,{
+    .@q = getq(AethyrQuest_Tyrca);
+    mesn;
+    mesq l("Welcome to Aethyr, strange traveler. I am a collector of rare gemstones.");
+    if (REBIRTH || BaseLevel > 90) {
+        if (.@q == 0 && countitem(LightGreenDiamond)) {
+            next;
+            mesn;
+            mesq l("...This %s you have there. I haven't seen one for a while.", getitemlink(LightGreenDiamond));
+            next;
+            mesn;
+            mesq l("I offer you either %s GP, or %s Monster Points for it. What do you say?", fnum(100000), fnum(40000));
+            next;
+            select
+                l("Sorry, I'll keep my gem."),
+                l("Sure, gimme the Gold."),
+                l("Sure, gimme the Monster Points."),
+                rif(REBIRTH, l("Can you give me half the gold and half the monster points?"));
+            mes "";
+            switch (@menu) {
+            case 2:
+                delitem LightGreenDiamond, 1;
+                Zeny+=100000;
+                break;
+            case 3:
+                delitem LightGreenDiamond, 1;
+                Mobpt+=40000;
+                break;
+            case 4:
+                if (!REBIRTH) {
+                    atcommand("@block "+strcharinfo(0)); end;
+                }
+                delitem LightGreenDiamond, 1;
+                Zeny+=50000;
+                Mobpt+=20000;
+                break;
+            default:
+                close;
+            }
+            getexp 0, 5000;
+            setq AethyrQuest_Tyrca, 1;
+            mesn;
+            mesq l("Please doing business with you.");
+        }
+    }
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, SilkRobe);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, BunnyEars);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 9);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
+
+    .sex = G_FEMALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/031-5/_import.txt b/npc/031-5/_import.txt
index 543a827f9..89c400af3 100644
--- a/npc/031-5/_import.txt
+++ b/npc/031-5/_import.txt
@@ -1,3 +1,4 @@
 // Map 031-5: Aethyr Armory
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/031-5/_warps.txt",
+"npc/031-5/beatrice.txt",
diff --git a/npc/031-5/beatrice.txt b/npc/031-5/beatrice.txt
new file mode 100644
index 000000000..bd363867c
--- /dev/null
+++ b/npc/031-5/beatrice.txt
@@ -0,0 +1,53 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Questmaker Handbook 14.0 (F = Favorable)
+
+031-5,97,41,0	script	Beatrice	NPC_SAVIOR_F,{
+    mesn;
+    mesq l("Hey there, %s. I deal with ultra rare items. If the Powers That Be decided you're out of luck, well, I am here to help you to bypass it.", get_race());
+    next;
+    mesn;
+    mesq l("For that, I use a special currency - Aethyr points. You can trade rare items for points. I also sell one point for %d GP. So, what will it me?", .price);
+    next;
+
+L_Loop:
+    clear;
+    mesc l("Aethyr Points: %s", fnum(AETHYR_PTS)), 2;
+    select
+        l("Nothing right now."),
+        l("Buying rares"),
+        l("Selling rares"),
+        l("Purchasing points");
+    mes "";
+    switch (@menu) {
+    case 1:
+        closeclientdialog;
+        close;
+    case 4:
+        mesc l("How many points? (0-%d)", Zeny/.price);
+        input .@points, 0, Zeny/.price;
+        if (.@points * .price > Zeny)
+            .@points = 0;
+        Zeny-=.price*.@points;
+        AETHYR_PTS+=.@points;
+        mesc l("Done!"), 2;
+        break;
+    }
+    goto L_Loop;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonSkirt);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SaviorArmor);
+    setunitdata(.@npcId, UDT_HEADTOP, TrapperHat);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 9);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
+
+    .sex = G_FEMALE;
+    .distance = 5;
+    .price = 570;
+    end;
+}
+
diff --git a/npc/031-7/_import.txt b/npc/031-7/_import.txt
index 9a8d59f60..dfa82e0d7 100644
--- a/npc/031-7/_import.txt
+++ b/npc/031-7/_import.txt
@@ -1,3 +1,4 @@
 // Map 031-7: Aethyr Townhall
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/031-7/_warps.txt",
+"npc/031-7/tametomo.txt",
diff --git a/npc/031-7/tametomo.txt b/npc/031-7/tametomo.txt
new file mode 100644
index 000000000..03a7770bc
--- /dev/null
+++ b/npc/031-7/tametomo.txt
@@ -0,0 +1,30 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Questmaker Handbook 14.0 (F = Favorable)
+
+031-7,76,49,2	script	Tametomo	NPC_SAVIOR,{
+    .@q = getq(AethyrQuest_Tametomo);
+    if (BaseLevel < 90) {
+        mesc l("The wizard seems busy. He ignores you.");
+        close;
+    }
+    mesn;
+    mesq l("Go away.");
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, GraduationRobe);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ManaGloves);
+    setunitdata(.@npcId, UDT_HEADTOP, ImperialCrown);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 9);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
+    npcsit;
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+