Fix and test Anselmo quest

2 files changed, 30 insertions, 4 deletions

diff --git a/npc/017-1/inspector.txt b/npc/017-1/inspector.txt
index fc8835914..f5d010903 100644
--- a/npc/017-1/inspector.txt
+++ b/npc/017-1/inspector.txt
@@ -14,6 +14,7 @@
     if (BaseLevel < 49) goto L_Close;
     if (.@q == 0) goto L_Start;
     if (.@q == 1) goto L_Arc1;
+    if (.@q == 2) goto L_Arc2;
     goto L_Close;
 
 L_Start:
@@ -68,7 +69,34 @@ L_Arc1:
         .@p = bitmask_count(.@q2);
         mesn;
         mesq l("Keep investigating. You've found %d/%d pieces of evidence thus far.", .@p, 10);
+        if (!TUTORIAL) {
+            next;
+            goto L_Close;
+        }
+	    .@THIEF_DESCRIPTION =   1; // Know how thief looked alike
+	    .@TIME_OF_THEFT     =   4; // Know the time the theft happened
+	    .@VICTIM_CHEF       =   8; // Talked to Dimond Cove chef
+	    .@UNDERGROUND_PASS  =  32; // Know the route used in Dimond
+	    .@RAT_RULEOUT       =  64; // Ruled out the possibility of rats
+	    .@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
+        if (!(.@q2 & THIEF_DESCRIPTION))
+            mesc l("- I don't know how the thief looks like.");
+        if (!(.@q2 & TIME_OF_THEFT))
+            mesc l("- I don't know when the theft happened.");
+        if (!(.@q2 & VICTIM_CHEF))
+            mesc l("- I don't know the victims of the thievery.");
+        if (!(.@q2 & UNDERGROUND_PASS))
+            mesc l("- I don't know how the theft happened.");
+        if (!(.@q2 & RAT_RULEOUT))
+            mesc l("- I don't know the possible culprits for this.");
+        if (!(.@q2 & PORTAL_USE))
+            mesc l("- I don't know if the thief is from LoF or not.");
+        if (!(.@q2 & SCRATCH_EVIDENCE))
+            mesc l("- I don't know any supporting evidence from the crome.");
     }
+    next;
     goto L_Close;
 
 L_Arc2:
diff --git a/npc/config/inspector.txt b/npc/config/inspector.txt
index 7103257ca..b165e4a1c 100644
--- a/npc/config/inspector.txt
+++ b/npc/config/inspector.txt
@@ -143,14 +143,12 @@ function	script	inspectorQuest	{
 			mesq l("We can rule out rats, though. I know, shocking, right? But these kind of cheese are eaten by cats, dragons, squirrels and yetis, but not by rats.");
 			next;
 			mesn;
-			mesq l("I would limit the search for persons, cats, dragons or yetis. Keep in mind these aren't the primary food for any of them, so you're unlikely to find them in a pile of stolen cheese.");
+			mesq l("I would limit the search for persons, cats, dragons, squirrels or yetis. Keep in mind these aren't the primary food for any of them, so you're unlikely to find them in a pile of stolen cheese.");
 			setq2 LoFQuest_Inspector, .@q2 | .@RAT_RULEOUT;
 		} else {
 			mesn;
 			mesq l("I know nothing about the robberies, sorry.");
 		}
-		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Chef#dimond") {
 		// Acquire VICTIM_CHEF, acquire CHEESE_TYPES if VICTIM_LAB
 		mesn;
@@ -229,7 +227,7 @@ function	script	inspectorQuest	{
 		// Hints toward the underground pass flag if VICTIM_CHEF
 		mesn;
 		mesq l("I am the owner of a transport company, which rent carts to exceptional clients. And I can assure you my company's terms of service prohibit the use of carts to rob cheese.");
-		if (.@q2 & VICTIM_CHEF) {
+		if (.@q2 & .@VICTIM_CHEF) {
 			next;
 			mesn;
 			mesq l("This being said, Axzell and Erik made interesting requests recently... Have you talked to them yet? Erik works in the Townhall, and Axzell in the alchemy shop.");