Fortress Town missing npcs

10 files changed, 215 insertions, 9 deletions

diff --git a/npc/003-6/tamiloc.txt b/npc/003-6/tamiloc.txt
index 912ad250e..6f883980d 100644
--- a/npc/003-6/tamiloc.txt
+++ b/npc/003-6/tamiloc.txt
@@ -10,7 +10,7 @@
 003-6,46,30,0	script	Tamiloc	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
     function setRace {
         clear;
-        setnpcdialogtitle l("Tamiloc - Modify Race");
+        setnpcdialogtitle l("%s - Modify Race", .name$);
         mes l("Race") + ": " + get_race();
         next;
         mes l("Please select the desired race.");
diff --git a/npc/017-1/misc.txt b/npc/017-1/misc.txt
index ee65dcec3..849c980b4 100644
--- a/npc/017-1/misc.txt
+++ b/npc/017-1/misc.txt
@@ -169,7 +169,7 @@ OnInit:
 017-1,147,176,0	script	Milocat	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
     function setRace {
         clear;
-        setnpcdialogtitle l("Tamiloc - Modify Race");
+        setnpcdialogtitle l("%s - Modify Race", .name$);
         mes l("Race") + ": " + get_race();
         next;
         mes l("Please select the desired race.");
diff --git a/npc/025-1/_import.txt b/npc/025-1/_import.txt
index 348924636..a276b04d9 100644
--- a/npc/025-1/_import.txt
+++ b/npc/025-1/_import.txt
@@ -3,8 +3,12 @@
 "npc/025-1/_config.txt",
 "npc/025-1/_mobs.txt",
 "npc/025-1/_warps.txt",
+"npc/025-1/anin.txt",
+"npc/025-1/commander.txt",
 "npc/025-1/ctrl.c",
+"npc/025-1/drahcir.txt",
 "npc/025-1/ihclot.txt",
 "npc/025-1/phoenix.txt",
 "npc/025-1/salohcin.txt",
+"npc/025-1/selim.txt",
 "npc/025-1/xovilam.txt",
diff --git a/npc/025-1/anin.txt b/npc/025-1/anin.txt
new file mode 100644
index 000000000..5b4cd9633
--- /dev/null
+++ b/npc/025-1/anin.txt
@@ -0,0 +1,79 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//   Anin is Nina spelled backwards
+
+025-1,109,71,0	script	Anin The Traveler	NPC_F_COINKEEPER,{
+
+    mesn;
+    if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Wow! Are you @@? Everyone, in every city, talks about you!", $MOST_HEROIC$);
+    if (strcharinfo(0) == $MOST_HEROIC$) next;
+
+    mesq l("Hello. I am @@, and I am from a family of travellers. We travel though the whole world, looking for exotic goods.", .name$);
+    next;
+    mesq l("You can buy rare items with me, or I can tell you about different cities in our world.");
+
+L_Menu:
+    mes "";
+    menu
+        l("I want to trade with you."), L_Trade,
+        l("Tell me about Tulimshar."),  L_Tulim,
+        l("Tell me about Fortress Town."),  L_Town,
+        l("Sorry, I'll pass."), L_Close;
+
+L_Tulim:
+    mes "";
+    mesn;
+    mesq l("Tulimshar is the oldest human city, and its foundation is the year zero of our calendar.");
+    next;
+    mesq l("The city only flourished because Janett Platinum had the idea to build city walls surrounding this city.");
+    next;
+    mesq l("The desert climate means you'll find mostly maggots and scorpions. Their drops include cactus drinks, cake, knifes, black pearls, gold, and other common things.");
+    next;
+    mesq l("You can find for a good price desert equipment and some kind of dyes. You find all sort of crafters, artisans and warriors here.");
+    next;
+    goto L_Menu;
+
+L_Town:
+    mes "";
+    mesn;
+    mesq l("Fortress Town is connected to the prophecies of the death of all humans, wildlife, and the other lesser races.");
+    next;
+    mesq l("The World's Heart was shattered by the Ancient Families to serve as Soul Menhirs on the world, and this allows respawning after death, but at a cost.");
+    next;
+    mesq l("The World Edge, which is where we are, is a holy land, the place where all began and all shall perish. Which is why after the World's Heart was broken, it was vowed to never make a settlement here ever again.");
+    next;
+    mesq l("Right now this territory is under the Monster Army's control, but the Alliance has occupied it to raid the Impregnable Fortress.");
+    next;
+    mesq l("Nearly everyone around is a seasoned veteran or was sent here by the Alliance Council to support the war efforts. Including me. So, good luck!");
+    next;
+    goto L_Menu;
+
+
+L_Trade:
+    mesn;
+    mesq l("Use your @@ as currency!", getitemlink(StrangeCoin));
+    tutmes l("%s is obtained during events, daily logins, heroic deeds, gifts, etc. But cannot be bought with real money.", getitemlink(StrangeCoin));
+    next;
+    openshop "Aeros Trader";
+    closedialog;
+
+L_Close:
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 27);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
+    npcsit;
+
+    .sex = G_FEMALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/025-1/commander.txt b/npc/025-1/commander.txt
new file mode 100644
index 000000000..eca701f28
--- /dev/null
+++ b/npc/025-1/commander.txt
@@ -0,0 +1,22 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//   Leads the Alliance in the Fortress Town
+
+025-1,96,26,0	script	Commander Povo	NPC_BRGUARD_SPEAR,{
+    mesn;
+    mesq l("Greetings %s, I am %s, the man in charge for the Alliance ocupation of Fortress Town.", (strcharinfo(0) == $MOST_HEROIC$ ? lg("Hero") : l("Adventurer")));
+    next;
+
+    // Endtrail
+    mes "";
+    mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c
index 836dc49b9..dcc5b7a31 100644
--- a/npc/025-1/ctrl.c
+++ b/npc/025-1/ctrl.c
@@ -45,15 +45,23 @@ function	script	FTCleanup	{
         hideonnpc "Gate#F";
         enablenpc "Ihclot";
         enablenpc "Salohnic";
-        enablenpc "Phoenix Rebirth";
         enablenpc "Xovilam";
+        enablenpc "Drahcir";
+        enablenpc "Selim";
+        enablenpc "Commander Povo";
+        enablenpc "Phoenix Rebirth";
+        enablenpc "Anin The Traveler";
         donpcevent "#025-1_99_112::OnDisable";
     } else {
         hideoffnpc "Gate#F";
         disablenpc "Ihclot";
         disablenpc "Salohnic";
-        disablenpc "Phoenix Rebirth";
         disablenpc "Xovilam";
+        disablenpc "Drahcir";
+        disablenpc "Selim";
+        disablenpc "Commander Povo";
+        disablenpc "Phoenix Rebirth";
+        disablenpc "Anin The Traveler";
         donpcevent "#025-1_99_112::OnEnable";
         mapwarp("025-1", "025-2", 100, 27);
     }
diff --git a/npc/025-1/drahcir.txt b/npc/025-1/drahcir.txt
new file mode 100644
index 000000000..72a3b7c76
--- /dev/null
+++ b/npc/025-1/drahcir.txt
@@ -0,0 +1,16 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//   Drahcir is Richard spelled backwards
+
+025-1,167,61,0	script	Drahcir	NPC_LLOYD,{
+    Banker(.name$, "Fortress Town", 2000);
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/025-1/selim.txt b/npc/025-1/selim.txt
new file mode 100644
index 000000000..76fbd9b33
--- /dev/null
+++ b/npc/025-1/selim.txt
@@ -0,0 +1,81 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//   Selim is just a barber. No puns this time.
+
+025-1,101,58,0	script	Selim	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
+    function setRace {
+        clear;
+        setnpcdialogtitle l("%s - Modify Race", .name$);
+        mes l("Race") + ": " + get_race();
+        next;
+        mes l("Please select the desired race.");
+        select
+            l("Kaizei Human"),
+            l("Argaes Human"),
+            l("Tonori Human"),
+            l("Elf"),
+            l("Orc"),
+            l("Raijin"),
+            l("Tritan"),
+            l("Ukar"),
+            l("Redy"),
+            l("Savior");
+        switch (@menu)
+        {
+            default:
+                jobchange max(0, @menu-1);
+        }
+        return;
+    }
+
+
+    mesn;
+    mesq l("Hi! Do you want a hair cut?");
+
+    do
+    {
+        select
+            l("What is my current hairstyle and hair color?"),
+            l("I'd like to get a different style."),
+            l("Can you do something with my color?"),
+            rif(is_gm() || REBIRTH >= 5, l("I want to change my Race!")),
+            l("I'm fine for now, thank you.");
+
+        switch (@menu)
+        {
+            case 1:
+                BarberSayStyle 3;
+                break;
+            case 2:
+                BarberChangeStyle;
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Enjoy your new style.");
+                    l("Anything else?");
+                break;
+            case 3:
+                BarberChangeColor;
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("I hope you like this color.");
+                    l("Anything else?");
+                break;
+            case 4:
+                setRace;
+                break;
+            case 5:
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Feel free to come visit me another time.");
+
+                goodbye;
+        }
+    } while (1);
+    close;
+
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/025-2/guard.txt b/npc/025-2/guard.txt
index e9743a3e4..61dfd10aa 100644
--- a/npc/025-2/guard.txt
+++ b/npc/025-2/guard.txt
@@ -68,10 +68,6 @@ L_ShortSummary:
     .@lock$=l("It is locked but %s should be able to coordinate a raid on it.", $MOST_HEROIC$);
     mesn;
     mesq l("Past this point is the Fortress Island. %s Even so, be careful, the town should not exist.", ($FORTRESS_STATE ? .@open$ : .@lock$));
-
-    // Endtrail
-    mes "";
-    mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
     close;
 }
 
diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index cb7818334..f7650947f 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -181,7 +181,7 @@ function	script	BKReg	{
         if (@menu == 1) {
             Zeny=Zeny-.@price;
             setq General_Banker, 1;
-            #BankP=#BankP+rand(100,400);
+            #BankP=#BankP+rand2(150,400);
             mesn getarg(0);
             mesq l("Registered! You can now use any banking service, of any town!");
         } else if (@menu == 3) {