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

2 files changed, 43 insertions, 73 deletions

diff --git a/npc/017-1/inspector.txt b/npc/017-1/inspector.txt
index 0f1db5044..fc8835914 100644
--- a/npc/017-1/inspector.txt
+++ b/npc/017-1/inspector.txt
@@ -33,45 +33,61 @@ L_Start:
     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;
 
 L_Arc1:
-    if (!is_staff()) goto L_Close; // FIXME
     .@q2 = getq2(LoFQuest_Inspector);
     if (.@q2 == (1024-1)) {
         mesn;
         mesq l("Cool, you have collected enough evidence. I also have some of my own, so we can proceed.");
         next;
-        // getexp; setq
         mesn;
         mesq l("So, what have we concluded thus far?");
         next;
-        //...
+        mesc l("You spend some time going over the evidence with Anselmo. You mention which kind of cheese was stolen and the thief description, the time of the robbery and the victims, the route they used from the portal to the kitchen depot, the scratch marks and the odd aversion to loud instruments the thief had.");
+        next;
         mesn;
         mesq l("Excellent. So, this time, we should follow the other lead we had - the %s found in the scene of the crime.", getitemlink(GoldenApple));
-        //...
+        next;
         mesn;
-        mesq l("We also know our thief is likely either a squirrel or a cat, although one intelligent enough and resourceful enough to make the travel every day.");
-        //...
+        mesq l("We know our thief is likely either a squirrel or a cat, although one intelligent enough and resourceful enough to make the travel every day. So I'm going to assume it was bought in some store as some sort of prank.");
+        next;
         mesn;
         mesq l("Considering the direction they came from, we should check Hurnscald next. Ask them if they saw a squirrel robbing Golden Apples, or anything which could help.");
         next;
         mesn;
         mesq l("Ah, and you don't need to ask all of them, that would be a real bother. Ask maybe %d, and try to prioritize shop keepers, unless you feel you found a trail. You can also ask inside La Marine.", 7);
-        //...
-        // ... ... ... ......
-        mesn;
-        mesq l("Hmm, none of them saw anything? What did we miss... Oh right, Golden Apples grows in the Desert Canyon as well. Snakes often carry them, although we already discarded the possibility of a snake being the thief.");
         next;
         mesn;
-        mesq l("Sorry for wasting so much of your time, but go in Halinarzo and ask about it. Who knows, one of them might have seen our little thief crossing the Eternal Swamps, and it would match the time range if they had to occasionally wait for the floods to stop, and the fact no one in Hurnscald saw anything.");
+        mesq l("My authority won't do you any good, but we have good relations with Hurnscald so you should have no problem. Good luck, %s!", strcharinfo(0));
+        getexp 60000, 600;
+        setq LoFQuest_Inspector, 2, 0;
+    } else {
+        .@p = bitmask_count(.@q2);
+        mesn;
+        mesq l("Keep investigating. You've found %d/%d pieces of evidence thus far.", .@p, 10);
     }
     goto L_Close;
 
+L_Arc2:
+    mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
+    next;
+    if (!is_staff()) goto L_Close; // FIXME
+    //...
+    // ... ... ... ......
+    mesn;
+    mesq l("Hmm, none of them saw anything? What did we miss... Oh right, Golden Apples grows in the Desert Canyon as well. Snakes often carry them, although we already discarded the possibility of a snake being the thief.");
+    next;
+    mesn;
+    mesq l("Sorry for wasting so much of your time, but go in Halinarzo and ask about it. Who knows, one of them might have seen our little thief crossing the Eternal Swamps, and it would match the time range if they had to occasionally wait for the floods to stop, and the fact no one in Hurnscald saw anything.");
+    next;
+    mesn;
+    mesq l("But be careful, they won't like an inspector snooping there.");
+    next;
+    goto L_Close;
+
 L_Close:
     closeclientdialog;
     if (rand2(100) < 2)
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;