This commit breaks 30 NPCs in one go. Seriously. It just needed its own commit.

18 files changed, 87 insertions, 3 deletions

diff --git a/npc/017-1/guards.txt b/npc/017-1/guards.txt
index b5606c5fe..8cadba8b6 100644
--- a/npc/017-1/guards.txt
+++ b/npc/017-1/guards.txt
@@ -16,6 +16,7 @@ function	script	LofGuard	{
 }
 
 017-1,79,43,0	script	Guard#lof-1	NPC_GUARD2,{
+    inspectorQuest();
     LofGuard();
     end;
 
@@ -27,6 +28,7 @@ OnInit:
 
 
 017-1,220,44,0	script	Guard#lof-2	NPC_GUARD1,{
+    inspectorQuest();
     LofGuard();
     end;
 
@@ -37,6 +39,7 @@ OnInit:
 }
 
 017-1,193,69,0	script	Guard#lof-3	NPC_GUARD2,{
+    inspectorQuest();
     LofGuard();
     end;
 
@@ -48,6 +51,7 @@ OnInit:
 
 
 017-1,69,108,0	script	Guard#lof-4	NPC_GUARD1,{
+    inspectorQuest();
     LofGuard();
     end;
 
@@ -58,6 +62,7 @@ OnInit:
 }
 
 017-1,90,149,0	script	Guard#lof-5	NPC_GUARD1,{
+    inspectorQuest();
     LofGuard();
     end;
 
@@ -69,6 +74,7 @@ OnInit:
 
 
 017-1,85,223,0	script	Guard#lof-6	NPC_GUARD2,{
+    inspectorQuest();
     LofGuard();
     end;
 
diff --git a/npc/017-1/inspector.txt b/npc/017-1/inspector.txt
index 66abd8d4a..0fadaf652 100644
--- a/npc/017-1/inspector.txt
+++ b/npc/017-1/inspector.txt
@@ -25,7 +25,12 @@
     mesq l("Excellent. I'd like you to ask around about the recent string of robberies.");
     next;
     mesn;
+    mesq l("I'll just... put this tiny coat of arms on you. This will let everyone know you are acting on an official capacity.");
+    next;
+    mesn;
     mesq l("But remember, they're stealing %s, not shinies, so try to limit your search a bit.", getitemlink(Cheese));
+    // Excluded: Doctor, Boring NPC, Nowhere family, Drowned Man
+    // Billy, Drueme, Stranger, Fortiun, Fusus, Nahrec, Silversmith
     setq LoFQuest_Inspector, 1, 0;
     next;
     goto L_Close;
diff --git a/npc/017-1/misc.txt b/npc/017-1/misc.txt
index 5dabba32d..d3e31e7f3 100644
--- a/npc/017-1/misc.txt
+++ b/npc/017-1/misc.txt
@@ -7,6 +7,7 @@
 // Description:
 //    The Travelers travel around the world telling stories.
 017-1,144,204,0	script	Elen The Traveler	NPC_F_COINKEEPER,{
+    inspectorQuest();
 
     mesn;
     if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Wow! Are you @@? Everyone, in every city, talks about you!", $MOST_HEROIC$);
@@ -157,6 +158,7 @@ OnInit:
 //    Barber.
 
 017-1,147,176,0	script	Milocat	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
+    inspectorQuest();
     function setRace {
         clear;
         setnpcdialogtitle l("%s - Modify Race", .name$);
@@ -185,6 +187,7 @@ OnInit:
 
     mesn;
     mesq l("Hi! Do you want a hair cut?");
+    if (REBIRTH >= 5) mesc l("As a Savior, \"%s\" can be used anytime for minor look changes, but a barber is more convenient.", b("@suplook"));
 
     do
     {
@@ -242,6 +245,7 @@ OnInit:
 // Which is a script variable, meaning it will be a really special event.
 // Side Note: Might as well add a special cap for such situations.
 017-1,118,83,0	script	Pydisgner#spoints	NPC_GUGLI,{
+    inspectorQuest();
 	mesn;
 	mesq l("Hello %s and welcome to Land Of Fire Village. This used to be a whole server before the Monster King crashed it down here.", strcharinfo(0));
 	next;
diff --git a/npc/017-1/paxel.txt b/npc/017-1/paxel.txt
index 8a461c23f..913f2c008 100644
--- a/npc/017-1/paxel.txt
+++ b/npc/017-1/paxel.txt
@@ -14,6 +14,7 @@
         npctalk3 l("I hope that strange towel man doesn't bother me again...");
     else if (rand2(10) == 4)
         npctalk3 l("I'm glad there's no annoying towel man. He keeps coming back to annoy me!");
+    inspectorQuest();
 	.@q=getq(SQuest_Paxel);
 	if(.@q == 2) goto L_Done;
 	if (season() != SPRING && !$@GM_OVERRIDE) goto L_OutOfSeason;
diff --git a/npc/017-1/pet_detective.txt b/npc/017-1/pet_detective.txt
index cdc0e3407..275b75519 100644
--- a/npc/017-1/pet_detective.txt
+++ b/npc/017-1/pet_detective.txt
@@ -6,6 +6,7 @@
 //    Sell pets (LoFQuest_Pets) (mesn Ace Ventura)
 
 017-1,192,23,0	script	Pet Detective	NPC_PET_TAMER,{
+    inspectorQuest();
     // Not registered
     .@q=getq(LoFQuest_Pets);
     if (!.@q)
diff --git a/npc/017-10/dispatcher.txt b/npc/017-10/dispatcher.txt
index 07ea3ab22..fb390596d 100644
--- a/npc/017-10/dispatcher.txt
+++ b/npc/017-10/dispatcher.txt
@@ -11,6 +11,7 @@
 
 017-10,61,34,0	script	Erik	NPC_JOURNALMAN,{
     function lootField;
+    inspectorQuest();
     mesn;
     mesq l("Hello. My name is Erik, and I have Homunculus go out in errands in my stead.");
 
diff --git a/npc/017-10/kenton.txt b/npc/017-10/kenton.txt
index 3ffc2fa41..9caa11cf1 100644
--- a/npc/017-10/kenton.txt
+++ b/npc/017-10/kenton.txt
@@ -5,6 +5,7 @@
 //    Part of player story
 
 017-10,57,34,0	script	Kenton	NPC_KENTON,{
+    inspectorQuest();
     .@q=getq(General_Narrator);
     mesn;
     mesq l("Hello! My name is Kenton, and I'm in charge of Public Affairs of Land Of Fire.");
diff --git a/npc/017-3/chef.txt b/npc/017-3/chef.txt
index 7ecd0d4b4..2988e6d55 100644
--- a/npc/017-3/chef.txt
+++ b/npc/017-3/chef.txt
@@ -7,8 +7,9 @@
 //    Easter 2011 and Easter 2012 quests. Assigns the Butcher Knife Quest.
 
 017-3,33,25,0	script	Chef#dimond	NPC_CHEF,{
-    .@q=getq(LoFQuest_ButcherKnife);
     showavatar NPC_CHEF;
+    inspectorQuest();
+    .@q=getq(LoFQuest_ButcherKnife);
     if (.@q == 1) goto L_Report;
     if (.@q == 0 && BaseLevel >= 34) goto L_Start;
     goto L_Busy;
diff --git a/npc/017-3/dimonds.txt b/npc/017-3/dimonds.txt
index 330a38a92..92b9fa699 100644
--- a/npc/017-3/dimonds.txt
+++ b/npc/017-3/dimonds.txt
@@ -7,6 +7,7 @@
 
 017-3,34,38,0	script	Dimond	NPC_DIMOND,{
     showavatar NPC_DIMOND;
+    inspectorQuest();
     mesn;
     mesq l("Welcome to Dimond's Cove!");
     next;
@@ -30,6 +31,7 @@ OnInit:
 
 017-3,40,35,0	script	Phil	NPC_BARD_TRUMP,{
     showavatar NPC_BARD_TRUMP;
+    inspectorQuest();
     if (season() == SPRING)
         goto L_Quest;
     mesn;
@@ -52,6 +54,7 @@ OnInit:
 
 017-3,40,37,0	script	Jerry	NPC_BARD_DRUMS,{
     showavatar NPC_BARD_DRUMS;
+    inspectorQuest();
     if (season() == SPRING)
         goto L_Quest;
     mesn;
@@ -74,6 +77,7 @@ OnInit:
 
 017-3,42,36,0	script	Robert	NPC_BARD_HARPS,{
     showavatar NPC_BARD_HARPS;
+    inspectorQuest();
     if (season() == SPRING)
         goto L_Quest;
     mesn;
@@ -97,6 +101,7 @@ OnInit:
 
 017-3,35,35,0	script	Shannon	NPC_LOF_NOBLEMAN,{
     showavatar NPC_LOF_NOBLEMAN;
+    inspectorQuest();
     if (EPISODE_WINNER && HEROESHOLD_WINNER && REBIRTH && !countitem(RentCart) && (TELEPORTERS & TP_LILIT))
         goto L_Cart;
     // Meaningless babbler, mostly.
@@ -198,6 +203,7 @@ OnInit:
 
 017-3,65,41,0	script	Basil	NPC_TOMBOY,{
     showavatar NPC_TOMBOY;
+    inspectorQuest();
     if (!is_night())
         goto L_Day;
     mesn;
diff --git a/npc/017-3/doug.txt b/npc/017-3/doug.txt
index a6ad8d867..b582cc22c 100644
--- a/npc/017-3/doug.txt
+++ b/npc/017-3/doug.txt
@@ -7,6 +7,7 @@
 //    Weekly Quest
 
 017-3,68,87,0	script	Doug	NPC_PLAYER,{
+    inspectorQuest();
     if (BaseLevel < 25)
         goto L_Weak;
     .@q2=getq2(LoFQuest_Doug);
diff --git a/npc/017-3/gambler.txt b/npc/017-3/gambler.txt
index 7d5c848ae..78a56f995 100644
--- a/npc/017-3/gambler.txt
+++ b/npc/017-3/gambler.txt
@@ -22,6 +22,7 @@
         }
     }
 
+    inspectorQuest();
     goto L_Menu;
 
 L_Menu:
diff --git a/npc/017-3/loratay.txt b/npc/017-3/loratay.txt
index f32636953..fbbbdc4ab 100644
--- a/npc/017-3/loratay.txt
+++ b/npc/017-3/loratay.txt
@@ -10,6 +10,7 @@
 
 017-3,85,85,0	script	Lora Tay	NPC_GLASS_OLD_LADY,{
     showavatar NPC_GLASS_OLD_LADY;
+    inspectorQuest();
     // bugfix, please move to select()
     if ($EVENT$ == "Valentine" && getq(SQuest_Valentine) != gettime(GETTIME_YEAR)) goto L_Valentine;
     if (BaseLevel >= 52 || REBIRTH) goto L_Menu;
diff --git a/npc/017-3/nico.txt b/npc/017-3/nico.txt
index 19dd79e95..7e7176407 100644
--- a/npc/017-3/nico.txt
+++ b/npc/017-3/nico.txt
@@ -5,6 +5,7 @@
 //    Arcmage Cards Enhancer
 
 017-3,37,84,0	script	Nico Goethe	NPC_PLAYER,{
+    inspectorQuest();
     mesn;
     mesq l("My name is Nico Goethe, an %s card player.", "[@@https://arcmage.org|Arcmage@@]");
     next;
diff --git a/npc/017-3/workers.txt b/npc/017-3/workers.txt
index 7f8834ff4..e80f8d098 100644
--- a/npc/017-3/workers.txt
+++ b/npc/017-3/workers.txt
@@ -8,6 +8,7 @@
 //010-2,23,70,0	script	Josh	NPC_TECH_EXPLORER,{
 017-3,23,70,0	script	Jenny	NPC_FEMALE_WORKER,{
     showavatar NPC_FEMALE_WORKER;
+    inspectorQuest();
     mesn;
     mesq l("We're busy here, so please don't bother us.");
     close;
@@ -15,6 +16,7 @@
 
 017-3,39,75,0	script	Zack	NPC_TECH_EXPLORER,{
     showavatar NPC_TECH_EXPLORER;
+    inspectorQuest();
     mesn;
     mesq l("Why are you here? This area is off-limits!");
     // TODO: Offer a Zambacutou if both quests were cancelled? That would unblock
diff --git a/npc/017-4/pihro.txt b/npc/017-4/pihro.txt
index 6b5b9ae3e..d0669d920 100644
--- a/npc/017-4/pihro.txt
+++ b/npc/017-4/pihro.txt
@@ -68,6 +68,7 @@
         }
         return;
     }
+    inspectorQuest();
     mesn;
     mesq l("Hello there! I make bullets for the weapons my friend Pyndragon makes.");
     next;
diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt
index d112b46e7..5fd162684 100644
--- a/npc/017-4/pyndragon.txt
+++ b/npc/017-4/pyndragon.txt
@@ -56,6 +56,7 @@
         return;
     }
 
+    inspectorQuest();
     .@q=getq(HurnscaldQuest_LOFPass);
     mesn;
     if (is_night())
diff --git a/npc/017-6/axzell.txt b/npc/017-6/axzell.txt
index 4148d533e..d1a95e049 100644
--- a/npc/017-6/axzell.txt
+++ b/npc/017-6/axzell.txt
@@ -7,6 +7,7 @@
 //    Status Reset. Formely named Bobby
 
 017-6,25,30,0	script	Axzell the Alchemist	NPC_PLAYER,{
+    inspectorQuest();
 
     speech S_LAST_NEXT,
         l("I am @@, an alchemist specialized in reset potions.", .name$);
diff --git a/npc/config/inspector.txt b/npc/config/inspector.txt
index 7fbbf2d7e..969652584 100644
--- a/npc/config/inspector.txt
+++ b/npc/config/inspector.txt
@@ -18,9 +18,58 @@ function	script	inspectorQuest	{
         return;
     }
 	/*
-	// NPC List
+	// NPC List (24+6 = 30 NPCs)
 	///////////////////////////////
-	 Royal Fairy
+	Royal Fairy
+		Equip collector
+	Erik
+		Homunculus dispatcher
+	Kenton
+		Public affairs officer
+	Guard#lof-{1:6}
+		Six guards in the land of fire
+	Elen The Traveler
+		Traveler shop & lore
+	Milocat
+		Barber
+	Pydisgner#spoints
+		Legacy LoF account converter, sitting at main square
+	Paxel
+		Prsm's son
+	Pet Detective
+		Ace Ventura does feed a lot of pets...
+	Chef#dimond
+		The chef, and likely the principal victim
+	Dimond
+		Dimond's Cove owner
+	Phil
+		Trumpet at Dimond Cove Troupe
+	Jerry
+		...the drummer
+	Robert
+		...Harpist
+	Shannon
+		Cart rent, likely the CEO of a transport company
+	Basil
+		Quartermaster at Dimond's Cove
+	Gambler#017-3
+		Gambler at Dimond's Cove
+	Doug
+		Just a guest at Dimond's Cove
+	Lora Tay
+		Seamstress at Dimond's Cove
+	Nico Goethe
+		Card player, guest at Dimond's Cove
+	Jenny
+		Worker? Thief? at Dimond's Cove
+	Zack
+		Same as Jenny
+	Pihro
+		One of the administrators of LoF. Makes ammo
+	Pyndragon
+		One of the administrators of LoF. Makes rare equip
+	Axzell the Alchemist
+		LoF alchemist
 	*/
     mes "";
     Exception("Oops, this is not yet implemented!", RB_SPEECH);