Remove useless notes, Anselmo quest now has the 1st stage ready for test

1 files changed, 14 insertions, 60 deletions

diff --git a/npc/config/inspector.txt b/npc/config/inspector.txt
index bd1bce81b..7103257ca 100644
--- a/npc/config/inspector.txt
+++ b/npc/config/inspector.txt
@@ -8,13 +8,15 @@
 function	script	inspectorQuest	{
 	.@npc$ = strnpcinfo(0);
 	if ($@GM_OVERRIDE) debugmes .@npc$;
-	// TODO: Rather than using .@q == 1
-	// Check with compare(getmap(), "017") && .@q == 1
-	// Then  with compare(getmap(), "012") && .@q == 2
-	// Then  with compare(getmap(), "009") && .@q == 3
 	// ...So on, for each stage
 	.@q = getq(LoFQuest_Inspector);
-	if (.@q != 1) return;
+	.@go = false;
+	// Check if you are in the right map for the right stage to go
+	if (compare(getmap(), "017") && .@q == 1) .@go=true;
+	if (compare(getmap(), "012") && .@q == 2) .@go=true;
+	if (compare(getmap(), "009") && .@q == 3) .@go=true;
+	// If you're not, return. Otherwise, ask the question.
+	if (!.@go) return;
 	select
 		l("Talk normally."),
 		l("Ask about the robberies.");
@@ -23,61 +25,13 @@ function	script	inspectorQuest	{
 		return;
 	}
 	/*
-	// NPC List (24+6 = 30 NPCs)
+	// Stage 1: (24+6 = 30 NPCs)
+	// Stage 2: TODO
 	///////////////////////////////
-	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 "";
 	.@q2 = getq2(LoFQuest_Inspector);
+	// Stage 1 - Land of Fire
 	.@THIEF_DESCRIPTION =   1; // Know how thief looked alike
 	.@CHEESE_TYPES      =   2; // Know which kind of cheese was stolen
 	.@TIME_OF_THEFT     =   4; // Know the time the theft happened
@@ -88,10 +42,10 @@ function	script	inspectorQuest	{
 	.@PORTAL_USE        = 128; // Concluded the Portal was used by thief
 	.@TROUPE_DISGUISE   = 256; // Learned about thief run-in with musics (no noise)
 	.@SCRATCH_EVIDENCE  = 512; // Learned about the scratch marks left by thief
-	// Each NPC sets exactly ONE piece of evidence to true, or none
-	// Some NPCs require some pieces to already be set in advance
-	// Technically, Dimond Chef can set two pieces - one on first talk, 2nd locked
-	// Some NPCs set the same piece of evidence - you don't need to talk to all
+	// Stage 2 - Hurnscald
+	// TODO
+	///////////////////////////////
+	// All NPCs list
 	if (.@npc$ == "Doug") {
 		// Knows nothing, saw nothing
 		mesn;