Regenerate map cache. Remove some placeholders. Add more placeholders.

2 files changed, 88 insertions, 35 deletions

diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache
index 6b8e150c6..d23edaa69 100644
--- a/maps/re/017-1.mcache
+++ b/maps/re/017-1.mcache
diff --git a/npc/config/inspector.txt b/npc/config/inspector.txt
index f6a08d48b..f64610110 100644
--- a/npc/config/inspector.txt
+++ b/npc/config/inspector.txt
@@ -77,6 +77,7 @@ function	script	inspectorQuest	{
 		LoF alchemist
 	*/
 	mes "";
+    .@q2 = getq2(LoFQuest_Inspector);
     .@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
@@ -92,107 +93,159 @@ function	script	inspectorQuest	{
     // 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
 	if (.@npc$ == "Doug") {
+        // Knows nothing, saw nothing
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 		next;
 		mesn;
 		mesq l("Besides, this room is too dark, so I wouldn't be able to see anything.");
 	} else if (.@npc$ == "Royal Fairy") {
-        // FIXME
+        // Knows nothing, saw nothing
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
-	} else if (.@npc$ == "Erik") {
-        // FIXME
+        next;
 		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+		mesq l("There haven't been anything unusual in the fairy district of the Land of Fire Village, after all.");
+	} else if (.@npc$ == "Erik") {
+        // Points toward Pet Dectective if CHEESE_TYPES
+        if (.@q2 & .@CHEESE_TYPES) {
+		    mesn;
+		    mesq l("Hmm, based on these cheese types... Definitely either a person, or a pet.");
+            next;
+		    mesn;
+		    mesq l("Try asking Ace Ventura, the Pet Detective. He'll be able to trim further the list.");
+        } else {
+		    mesn;
+		    mesq l("I know nothing about the robberies, sorry.");
+        }
 	} else if (.@npc$ == "Kenton") {
-        // FIXME
+        // FIXME Acquire SCRATCH_EVIDENCE FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (compare(.@npc$, "Guard")) {
-        // FIXME
+        // List some excluded NPCs. Could use miller rand to be predictable but...
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
+        next;
+        .@n1$ = any(l("Doctor"), l("Boring NPC"), l("Nowhere family"), l("Drowned Man"), l("Billy"), l("Drueme"), l("Stranger"), l("Fortiun"), l("Fusus"), l("Nahrec"), l("Silversmith"));
+        .@n2$ = any(l("Doctor"), l("Boring NPC"), l("Nowhere family"), l("Drowned Man"), l("Billy"), l("Drueme"), l("Stranger"), l("Fortiun"), l("Fusus"), l("Nahrec"), l("Silversmith"));
+        .@n3$ = any(l("Doctor"), l("Boring NPC"), l("Nowhere family"), l("Drowned Man"), l("Billy"), l("Drueme"), l("Stranger"), l("Fortiun"), l("Fusus"), l("Nahrec"), l("Silversmith"));
+        mesn;
+        mesq l("But don't waste your breath with %s... %s, if I haven't mentioned... did I mention %s already? Anyway, they definitely cannot help.", .@n1$, .@n2$, .@n3$);
 	} else if (.@npc$ == "Elen The Traveler") {
-        // FIXME
+        // FIXME Hints towards more useful NPCs? FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Milocat") {
-        // FIXME
+        // Points toward Axzell
 		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+		mesq l("No idea. Paxel would at least know a few tricks, and Axzell the Alchemist could speak more about cheese thieves.");
 	} else if (.@npc$ == "Pydisgner#spoints") {
-        // FIXME
+        // FIXME Acquire PORTAL_USE if THIEF_DESCRIPTION and TIME_OF_THEFT FIXME
 		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+		mesq l("I've been here all day and night. And a lot of people use this portal, unless you have a description of what I'm looking for, and the time, I can't help.");
 	} else if (.@npc$ == "Paxel") {
-        // FIXME
+        // General hints from Prsm - have you talked to Chef? And to Dimond?
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
+        next;
+		mesn;
+		mesq l("But my father, Prsm, always told me to check multiple times with the victim and the boss. I guess in your case it would be...");
+        next;
+		mesn;
+		mesq l("Dimond's Chef and Dimond herself. So if you're stuck, try talking to them again, confirm the details?");
 	} else if (.@npc$ == "Pet Detective") {
-        // FIXME
+        // FIXME Acquire RAT_RULEOUT if CHEESE_TYPES FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Chef#dimond") {
-        // FIXME
+        // FIXME Acquire VICTIM_CHEF, acquire CHEESE_TYPES if VICTIM_LAB FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Dimond") {
-        // FIXME
+        // FIXME Acquire THIEF_DESCRIPTION if TIME_OF_THEFT FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Phil") {
-        // FIXME
+        // FIXME Acquire TROUPE_DISGUISE if VICTIM_CHEF FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Jerry") {
-        // FIXME
+        // FIXME Acquire TROUPE_DISGUISE if VICTIM_CHEF FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Robert") {
-        // FIXME
+        // FIXME Acquire TROUPE_DISGUISE if VICTIM_CHEF FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Shannon") {
-        // FIXME
+        // FIXME Acquire UNDERGROUND_PASS if VICTIM_CHEF FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Basil") {
-        // FIXME
+        // FIXME Guides about Zack requisites FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Gambler#017-3") {
-        // FIXME
+        // FIXME Guides about Lora and Nico requisites FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Lora Tay") {
-        // FIXME
+        // FIXME Acquire TIME_OF_THEFT if UNDERGROUND_PASS FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Nico Goethe") {
-        // FIXME
+        // FIXME Acquire TIME_OF_THEFT if UNDERGROUND_PASS FIXME
 		mesn;
 		mesq l("I know nothing about the robberies, sorry.");
 	} else if (.@npc$ == "Jenny") {
-        // FIXME
-		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+        // Acquire THIEF_DESCRIPTION if UNDERGROUND_PASS
+	    mesn;
+	    mesq l("You want to know if I saw something going through here?");
+        next;
+        if (.@q2 & .@UNDERGROUND_PASS) {
+		    mesn;
+		    mesq l("And not a rat? Not really... No, wait, I did. Multiple times, something relatively big, which came in as if they were liquid.");
+            next;
+		    mesn;
+		    mesq l("Here, I'll write down how it seemed. Some sort of grey fluff. But it clearly wasn't human, so why would I be worried it could be a thief?");
+            setq2 LoFQuest_Inspector, .@q2 | .@THIEF_DESCRIPTION;
+        } else {
+		    mesn;
+		    mesq l("Well... Rats, maybe?");
+        }
 	} else if (.@npc$ == "Zack") {
-        // FIXME
-		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+        // Acquire UNDERGROUND_PASS if RAT_RULEOUT
+        if (.@q2 & .@RAT_RULEOUT) {
+		    mesn;
+		    mesq l("You want to know if something could pass through the tunnel we're digging?");
+            next;
+		    mesn;
+		    mesq l("Well, if you look behind the building, there's a couple chimneys on ground and a hole which connects here.");
+            next;
+		    mesn;
+		    mesq l("I imagine something sufficiently small or nimble, or maybe liquid, could pass through it to reach the kitchen's depot.");
+            setq2 LoFQuest_Inspector, .@q2 | .@UNDERGROUND_PASS;
+        } else {
+		    mesn;
+		    mesq l("I don't know what you're talking, I've been working all day.");
+        }
 	} else if (.@npc$ == "Pihro") {
-        // FIXME
+        // Send to Dimond's Cove chef
 		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+		mesq l("Ah, so you're the one in charge of the cheese robberies? I believe Dimond's Cove Chef was the most affected one, but I keep myself out of these matters.");
 	} else if (.@npc$ == "Pyndragon") {
-        // FIXME
+        // Send to Kenton, the Public Affairs Officer
 		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+		mesq l("Ah, so you're the one in charge of the cheese robberies? I wouldn't know anything myself, but try asking Kenton, he is in charge of Public Affairs.");
 	} else if (.@npc$ == "Axzell the Alchemist") {
-        // FIXME
+        // Acquire VICTIM_LAB
 		mesn;
-		mesq l("I know nothing about the robberies, sorry.");
+		mesq l("You want help with your investigation? Well, several creatures eat cheese. Like me. You could try to shorten this list.");
+        next;
+		mesn;
+		mesq l("The trick is figuring out which kind of cheese was stolen. Once you know that, I guess either Ace Ventura or Erik could help you to thin out the list.");
+        setq2 LoFQuest_Inspector, .@q2 | .@VICTIM_LAB;
 	} else {
 		Exception(sprintf("Oops, unhandled NPC at investigation (typo)! %s was not found on stage %d <= report this!", .@npc$, .@q), RB_SPEECH|RB_PLEASEREPORT);
 	}