From 59ddc1a0614e250d329947acfeeadb082d955fa1 Mon Sep 17 00:00:00 2001
From: Joseph Hewitt <pyrrho12@yahoo.ca>
Date: Fri, 26 Feb 2016 04:56:05 -0800
Subject: [PATCH] Refactored ifNPCtrait macros, hopefully fixing Biohunt, Fired
 emails

---
 GameData/aslmacro.txt                       |  48 ++-
 GameData/lmtactics.txt                      |  80 ++--
 Series/PLOT_BioHunt.txt                     | 142 +++----
 Series/PLOT_Redemption.txt                  |  74 ++--
 Series/TS_GRD_PumpPusher_PLOT1_Evidence.txt |  72 ++--
 Series/TS_GRD_PumpPusher_PLOT2_Lab.txt      |  24 +-
 Series/TS_GSP_MatchMaker_STORY.txt          |   2 +-
 Series/TS_GTH_Corporate_PLOT.txt            |  96 ++---
 Series/TS_GTH_Default_PLOT.txt              |  54 +--
 Series/TS_LANCE_Martian_STORY.txt           |   2 +-
 Series/TS_PLOT_Fired.txt                    |  24 +-
 Series/TS_PLOT_ThiefPromotion_Default.txt   |  24 +-
 Series/TS_XRAN_a--F_Investigation.txt       | 142 +++----
 Series/TS_XRAN_a-AU_Diary.txt               |  54 +--
 Series/TS_XRAN_a-FF_SisterMoney.txt         | 130 +++---
 Series/TS_XRAN_aC--_FaceYourEnemy.txt       | 100 ++---
 Series/TS_XRAN_aC--_MarsNeedsClones.txt     | 110 ++---
 Series/TS_XRAN_aC--_WaitingForYou.txt       |  78 ++--
 Series/TS_XRAN_aC-F_DarkSide.txt            |  84 ++--
 Series/TS_XRAN_aC-L_SchoolPals.txt          | 446 ++++++++++----------
 Series/TS_XRAN_aF--_Hunter.txt              |  36 +-
 Series/TS_XRAN_aF--_PriceyHead.txt          | 148 +++----
 Series/TS_XRAN_aF-F_News.txt                | 252 +++++------
 Series/TS_XRAN_aU--_InDanger.txt            |  56 +--
 Series/TS_XRAN_aUF-_DoctorKim.txt           |  60 +--
 history.txt                                 |   1 +
 26 files changed, 1191 insertions(+), 1148 deletions(-)

diff --git a/GameData/aslmacro.txt b/GameData/aslmacro.txt
index 2f088d1..3ce5f17 100644
--- a/GameData/aslmacro.txt
+++ b/GameData/aslmacro.txt
@@ -100,18 +100,42 @@ MENTAL <GrabPCPilot GMental>
 OneVictimRecovered <GrabCurrentScene GAddNAtt NAG_Narrative NAS_VictimsRecovered 1>
 SetNPCRep <GrabNPC ? GSetNAtt NAG_CharDescription - ? ?>
 NPCQuitLance <GrabNPC ? GQuitLance>
-ifNPCHeroic <GrabChatNPC ifG GNAtt NAG_CharDescription -1  0>
-ifNPCVillainous <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -1>
-ifNPCLawful <GrabChatNPC ifG GNAtt NAG_CharDescription -2  0>
-ifNPCChaotic <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -2>
-ifNPCSociable <GrabChatNPC ifG GNAtt NAG_CharDescription -3  0>
-ifNPCShy <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -3>
-ifNPCEasygoing <GrabChatNPC ifG GNAtt NAG_CharDescription -4  0>
-ifNPCPassionate <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -4>
-ifNPCCheerful <GrabChatNPC ifG GNAtt NAG_CharDescription -5  0>
-ifNPCMelancholy <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -5>
-ifNPCPragmatic <GrabChatNPC ifG GNAtt NAG_CharDescription -7  0>
-ifNPCSpiritual <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -7>
+ifChatNPCHeroic <GrabChatNPC ifG GNAtt NAG_CharDescription -1  0>
+ifChatNPCVillainous <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -1>
+ifChatNPCLawful <GrabChatNPC ifG GNAtt NAG_CharDescription -2  0>
+ifChatNPCChaotic <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -2>
+ifChatNPCSociable <GrabChatNPC ifG GNAtt NAG_CharDescription -3  0>
+ifChatNPCShy <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -3>
+ifChatNPCEasygoing <GrabChatNPC ifG GNAtt NAG_CharDescription -4  0>
+ifChatNPCPassionate <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -4>
+ifChatNPCCheerful <GrabChatNPC ifG GNAtt NAG_CharDescription -5  0>
+ifChatNPCMelancholy <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -5>
+ifChatNPCPragmatic <GrabChatNPC ifG GNAtt NAG_CharDescription -7  0>
+ifChatNPCSpiritual <GrabChatNPC ifG 0  GNAtt NAG_CharDescription -7>
+ifNPCHeroic <GrabNPC ? ifG GNAtt NAG_CharDescription -1  0>
+ifNPCVillainous <GrabNPC ? ifG 0  GNAtt NAG_CharDescription -1>
+ifNPCLawful <GrabNPC ? ifG GNAtt NAG_CharDescription -2  0>
+ifNPCChaotic <GrabNPC ? ifG 0  GNAtt NAG_CharDescription -2>
+ifNPCSociable <GrabNPC ? ifG GNAtt NAG_CharDescription -3  0>
+ifNPCShy <GrabNPC ? ifG 0  GNAtt NAG_CharDescription -3>
+ifNPCEasygoing <GrabNPC ? ifG GNAtt NAG_CharDescription -4  0>
+ifNPCPassionate <GrabNPC ? ifG 0  GNAtt NAG_CharDescription -4>
+ifNPCCheerful <GrabNPC ? ifG GNAtt NAG_CharDescription -5  0>
+ifNPCMelancholy <GrabNPC ? ifG 0  GNAtt NAG_CharDescription -5>
+ifNPCPragmatic <GrabNPC ? ifG GNAtt NAG_CharDescription -7  0>
+ifNPCSpiritual <GrabNPC ? ifG 0  GNAtt NAG_CharDescription -7>
+ifPCHeroic <GrabPCPilot ifG GNAtt NAG_CharDescription -1  0>
+ifPCVillainous <GrabPCPilot ifG 0  GNAtt NAG_CharDescription -1>
+ifPCLawful <GrabPCPilot ifG GNAtt NAG_CharDescription -2  0>
+ifPCChaotic <GrabPCPilot ifG 0  GNAtt NAG_CharDescription -2>
+ifPCSociable <GrabPCPilot ifG GNAtt NAG_CharDescription -3  0>
+ifPCShy <GrabPCPilot ifG 0  GNAtt NAG_CharDescription -3>
+ifPCEasygoing <GrabPCPilot ifG GNAtt NAG_CharDescription -4  0>
+ifPCPassionate <GrabPCPilot ifG 0  GNAtt NAG_CharDescription -4>
+ifPCCheerful <GrabPCPilot ifG GNAtt NAG_CharDescription -5  0>
+ifPCMelancholy <GrabPCPilot ifG 0  GNAtt NAG_CharDescription -5>
+ifPCPragmatic <GrabPCPilot ifG GNAtt NAG_CharDescription -7  0>
+ifPCSpiritual <GrabPCPilot ifG 0  GNAtt NAG_CharDescription -7>
 FacAlliance <GrabFaction ? GSetNAtt 8 ? 10>
 SetLMTactics <GrabChatNPC GSetOptMax ? GSetOptMin ?>
 GSetOptMax <GSetNAtt NAG_Personal NAS_OptMax ?>
diff --git a/GameData/lmtactics.txt b/GameData/lmtactics.txt
index f6750c4..38685cd 100644
--- a/GameData/lmtactics.txt
+++ b/GameData/lmtactics.txt
@@ -15,90 +15,90 @@ result3 <NewChat Say 2 SetLMTactics 0 0>
 
 Msg1 <Hey, \PC . What can I help you with?>
 Msg1_1 <>
-CMsg1_1 <ifNPCHeroic Accept>
+CMsg1_1 <ifChatNPCHeroic Accept>
 Msg1_2 <Yes, what is it that you want?>
-CMsg1_2 <ifNPCVillainous Accept>
+CMsg1_2 <ifChatNPCVillainous Accept>
 Msg1_3 <What do you want me to do?>
-CMsg1_3 <ifNPCLawful Accept>
+CMsg1_3 <ifChatNPCLawful Accept>
 Msg1_4 <>
-CMsg1_4 <ifNPCChaotic Accept>
+CMsg1_4 <ifChatNPCChaotic Accept>
 Msg1_5 <Hey \PC . It's been great sharing these adventures with you.>
-CMsg1_5 <ifNPCSociable ifG React 40 Accept>
+CMsg1_5 <ifChatNPCSociable ifG React 40 Accept>
 Msg1_6 <Yes?>
-CMsg1_6 <ifNPCShy Accept>
+CMsg1_6 <ifChatNPCShy Accept>
 Msg1_7 <>
-CMsg1_7 <ifNPCEasygoing Accept>
+CMsg1_7 <ifChatNPCEasygoing Accept>
 Msg1_8 <>
-CMsg1_8 <ifNPCPassionate Accept>
+CMsg1_8 <ifChatNPCPassionate Accept>
 Msg1_9 <>
-CMsg1_9 <ifNPCCheerful Accept>
+CMsg1_9 <ifChatNPCCheerful Accept>
 Msg1_10 <I suppose you're going to tell me that you want me to leave the group...>
-CMsg1_10 <ifNPCMelancholy Accept>
+CMsg1_10 <ifChatNPCMelancholy Accept>
 Msg1_11 <It might be a good idea if, at some point, the two of us discussed strategy.>
-CMsg1_11 <ifNPCPragmatic Accept>
+CMsg1_11 <ifChatNPCPragmatic Accept>
 Msg1_12 <>
-CMsg1_12 <ifNPCSpiritual Accept>
+CMsg1_12 <ifChatNPCSpiritual Accept>
 
 Msg2 <I'll do that.>
 Msg2_1 <If that's for the best, then so be it.>
-CMsg2_1 <ifNPCHeroic Accept>
+CMsg2_1 <ifChatNPCHeroic Accept>
 Msg2_2 <Just as you say, oh fearless leader.>
-CMsg2_2 <ifNPCVillainous Accept>
+CMsg2_2 <ifChatNPCVillainous Accept>
 Msg2_3 <I promise that I'll do my best.>
-CMsg2_3 <ifNPCLawful Accept>
+CMsg2_3 <ifChatNPCLawful Accept>
 Msg2_4 <Eh, I don't much like that order...>
-CMsg2_4 <ifNPCChaotic Accept>
+CMsg2_4 <ifChatNPCChaotic Accept>
 Msg2_104 <I'll do as you say... for now.>
-CMsg2_104 <ifNPCChaotic Accept>
+CMsg2_104 <ifChatNPCChaotic Accept>
 Msg2_5 <Alright, I'll do my best as part of the team.>
-CMsg2_5 <ifNPCSociable Accept>
+CMsg2_5 <ifChatNPCSociable Accept>
 Msg2_6 <Alright.>
-CMsg2_6 <ifNPCShy Accept>
+CMsg2_6 <ifChatNPCShy Accept>
 Msg2_7 <Sure, whatever.>
-CMsg2_7 <ifNPCEasygoing Accept>
+CMsg2_7 <ifChatNPCEasygoing Accept>
 Msg2_8 <I hear and do obey!>
-CMsg2_8 <ifNPCPassionate Accept>
+CMsg2_8 <ifChatNPCPassionate Accept>
 Msg2_108 <That seems to me like a very bad idea... but I will do as you say.>
-CMsg2_108 <ifNPCPassionate Accept>
+CMsg2_108 <ifChatNPCPassionate Accept>
 Msg2_208 <Isn't that what I've been doing already!?>
-CMsg2_208 <ifNPCPassionate Accept>
+CMsg2_208 <ifChatNPCPassionate Accept>
 Msg2_9 <Sounds good. I'll do that.>
-CMsg2_9 <ifNPCCheerful Accept>
+CMsg2_9 <ifChatNPCCheerful Accept>
 Msg2_10 <I'll try not to let you down.>
-CMsg2_10 <ifNPCMelancholy Accept>
+CMsg2_10 <ifChatNPCMelancholy Accept>
 Msg2_110 <Might not that get us all killed? Okay, I'll do it...>
-CMsg2_110 <ifNPCMelancholy Accept>
+CMsg2_110 <ifChatNPCMelancholy Accept>
 Msg2_11 <Good thinking. I'll do that.>
-CMsg2_11 <ifNPCPragmatic Accept>
+CMsg2_11 <ifChatNPCPragmatic Accept>
 Msg2_12 <By the heaven's will.>
-CMsg2_12 <ifNPCSpiritual Accept>
+CMsg2_12 <ifChatNPCSpiritual Accept>
 
 
 Msg3 <Hey, \PC . What can I help you with?>
 Msg3_1 <>
-CMsg3_1 <ifNPCHeroic Accept>
+CMsg3_1 <ifChatNPCHeroic Accept>
 Msg3_2 <>
-CMsg3_2 <ifNPCVillainous Accept>
+CMsg3_2 <ifChatNPCVillainous Accept>
 Msg3_3 <>
-CMsg3_3 <ifNPCLawful Accept>
+CMsg3_3 <ifChatNPCLawful Accept>
 Msg3_4 <>
-CMsg3_4 <ifNPCChaotic Accept>
+CMsg3_4 <ifChatNPCChaotic Accept>
 Msg3_5 <>
-CMsg3_5 <ifNPCSociable Accept>
+CMsg3_5 <ifChatNPCSociable Accept>
 Msg3_6 <>
-CMsg3_6 <ifNPCShy Accept>
+CMsg3_6 <ifChatNPCShy Accept>
 Msg3_7 <>
-CMsg3_7 <ifNPCEasygoing Accept>
+CMsg3_7 <ifChatNPCEasygoing Accept>
 Msg3_8 <>
-CMsg3_8 <ifNPCPassionate Accept>
+CMsg3_8 <ifChatNPCPassionate Accept>
 Msg3_9 <>
-CMsg3_9 <ifNPCCheerful Accept>
+CMsg3_9 <ifChatNPCCheerful Accept>
 Msg3_10 <>
-CMsg3_10 <ifNPCMelancholy Accept>
+CMsg3_10 <ifChatNPCMelancholy Accept>
 Msg3_11 <>
-CMsg3_11 <ifNPCPragmatic Accept>
+CMsg3_11 <ifChatNPCPragmatic Accept>
 Msg3_12 <>
-CMsg3_12 <ifNPCSpiritual Accept>
+CMsg3_12 <ifChatNPCSpiritual Accept>
 
 Prompt1 <Stay in the back in combat.>
 
diff --git a/Series/PLOT_BioHunt.txt b/Series/PLOT_BioHunt.txt
index 52f059a..566fa93 100644
--- a/Series/PLOT_BioHunt.txt
+++ b/Series/PLOT_BioHunt.txt
@@ -46,25 +46,25 @@ Plot 0
 	%  The NPC is offering the PC a mission via email.
 	Msg1 <\PERSONA E1 @ \SCENE EScene 1 :// Got some monsters in the city dump; I could use some help clearing them out.>
 	Msg1_1 <\PERSONA E1 @ \SCENE EScene 1 :// Help serve the community. Come help me exterminate some monsters.>
-	CMsg1_1 <ifNPCLawful Accept>
+	CMsg1_1 <ifNPCLawful E1 Accept>
 	Msg1_2 <\PERSONA E1 @ \SCENE EScene 1 :// Looking for some easy money? I've got a job for you in \SCENE EScene 1 .>
-	CMsg1_2 <ifNPCChaotic Accept>
+	CMsg1_2 <ifNPCChaotic E1 Accept>
 	Msg1_3 <\PERSONA E1 @ \SCENE EScene 1 :// Hey, long time no see. If you're in the area I'd love to chat. In fact, I may even have a job for you.>
-	CMsg1_3 <ifNPCSociable Accept>
+	CMsg1_3 <ifNPCSociable E1 Accept>
 	Msg1_4 <\PERSONA E1 @ \SCENE EScene 1 :// Biomonsters on the loose in \SCENE EScene 1 . Come for mission, if you're available.>
-	CMsg1_4 <ifNPCShy Accept>
+	CMsg1_4 <ifNPCShy E1 Accept>
 	Msg1_5 <\PERSONA E1 @ \SCENE EScene 1 :// Hope I'm not catching you at a bad time. We've got a problem in \SCENE EScene 1 ; I may have a job for you.>
-	CMsg1_5 <ifNPCEasygoing Accept>
+	CMsg1_5 <ifNPCEasygoing E1 Accept>
 	Msg1_6 <\PERSONA E1 @ \SCENE EScene 1 :// Come quickly, before all is lost! A colony of bioweapons has taken hold in \SCENE EScene 1 . We must stop them before it's too late!>
-	CMsg1_6 <ifNPCPassionate Accept>
+	CMsg1_6 <ifNPCPassionate E1 Accept>
 	Msg1_7 <\PERSONA E1 @ \SCENE EScene 1 :// Looking for work? You're lucky, I have a job available here if you want it.>
-	CMsg1_7 <ifNPCCheerful Accept>
+	CMsg1_7 <ifNPCCheerful E1 Accept>
 	Msg1_8 <\PERSONA E1 @ \SCENE EScene 1 :// A hunter's job is never done. There's a contract here to exterminate some bioweapons before they kill somebody.>
-	CMsg1_8 <ifNPCMelancholy Accept>
+	CMsg1_8 <ifNPCMelancholy E1 Accept>
 	Msg1_9 <\PERSONA E1 @ \SCENE EScene 1 :// It seems impossible, but a colony of active bioweapons has been discovered near \SCENE EScene 1 . I need someone to fulfil the extermination contract.>
-	CMsg1_9 <ifNPCPragmatic Accept>
+	CMsg1_9 <ifNPCPragmatic E1 Accept>
 	Msg1_10 <\PERSONA E1 @ \SCENE EScene 1 :// May the heavens guard us... a pod of bioweapons has gone active near town. I need a hunter to do extermination.>
-	CMsg1_10 <ifNPCSpiritual Accept>
+	CMsg1_10 <ifNPCSpiritual E1 Accept>
 
 sub
 	Persona 1
@@ -131,147 +131,147 @@ sub
 	% 01 :  Player has won the battle and is being paid.
 	Msg1 <Very well done. The monsters have been eliminated. Here's the pay you earned.>
 	Msg1_2 <An honest day's pay for an honest day's work... I don't get a chance to say that very often. Here's the money you earned.>
-	CMsg1_2 <ifNPCChaotic Accept>
+	CMsg1_2 <ifChatNPCChaotic Accept>
 	Msg1_3 <The monsters were completely annihilated. Good work, \PC . The city dump is safe once more... or as safe as it ever is, with all those core worms crawling around beneath the surface...>
-	CMsg1_3 <ifNPCSociable Accept>
+	CMsg1_3 <ifChatNPCSociable Accept>
 	Msg1_4 <You did it. Here's your pay for the mission.>
-	CMsg1_4 <ifNPCShy Accept>
+	CMsg1_4 <ifChatNPCShy Accept>
 	Msg1_5 <Well, the biomonsters have been stopped, and you appear to still have all your original limbs. Here's the money I promised you.>
-	CMsg1_5 <ifNPCEasygoing Accept>
+	CMsg1_5 <ifChatNPCEasygoing Accept>
 	Msg1_6 <They've been destroyed! That must have been a terrific fight... Here's the pay you earned.>
-	CMsg1_6 <ifNPCPassionate Accept>
+	CMsg1_6 <ifChatNPCPassionate Accept>
 	Msg1_7 <The biomonsters have been destroyed, and no-one got hurt. The mission was a smooth success. Here's your pay.>
-	CMsg1_7 <ifNPCCheerful Accept>
+	CMsg1_7 <ifChatNPCCheerful Accept>
 	Msg1_8 <The biomonsters were destroyed, but we still don't know where they came from. It's only a matter of time before someone's going to get killed... In any case, thanks for your help. Here's your pay.>
-	CMsg1_8 <ifNPCMelancholy Accept>
+	CMsg1_8 <ifChatNPCMelancholy Accept>
 	Msg1_9 <The bioweapons have been eliminated. Here's your reward. Still, I wonder where they came from... Surely nobody could still be producing these things, could they?>
-	CMsg1_9 <ifNPCPragmatic Accept>
+	CMsg1_9 <ifChatNPCPragmatic Accept>
 	Msg1_10 <Destiny is on your side. Here's the pay you earned for exterminating the monsters.>
-	CMsg1_10 <ifNPCSpiritual Accept>
+	CMsg1_10 <ifChatNPCSpiritual Accept>
 
 	% 06 :  Player has lost the battle.
 	Msg6 <You were defeated... but at least they didn't eat you.>
 	Msg6_3 <So, the biomonsters were too tough for you, huh? I'm not surprised. That's why I didn't want to perform the extermination myself. Guess I should have told you that at the beginning, huh?>
-	CMsg6_3 <ifNPCSociable Accept>
+	CMsg6_3 <ifChatNPCSociable Accept>
 	Msg6_4 <You were defeated.>
-	CMsg6_4 <ifNPCShy Accept>
+	CMsg6_4 <ifChatNPCShy Accept>
 	Msg6_5 <The extermination mission was a failure... At least you made it back alive. That's more than most people can say after they've faced the Hunter-X series.>
-	CMsg6_5 <ifNPCEasygoing Accept>
+	CMsg6_5 <ifChatNPCEasygoing Accept>
 	Msg6_6 <You couldn't defeat the biomonsters!? They're too powerful...>
-	CMsg6_6 <ifNPCPassionate Accept>
+	CMsg6_6 <ifChatNPCPassionate Accept>
 	Msg6_7 <You couldn't defeat the monsters? Oh well... On the bright side, this does mean that I'll get to use an orbital neutron blast on the dump site. I've always wanted to do that!>
-	CMsg6_7 <ifNPCCheerful Accept>
+	CMsg6_7 <ifChatNPCCheerful Accept>
 	Msg6_8 <The mission was a failure. These monsters are too powerful... If they were ever to get loose in an urban setting, too many lives would be lost.>
-	CMsg6_8 <ifNPCMelancholy Accept>
+	CMsg6_8 <ifChatNPCMelancholy Accept>
 	Msg6_9 <You failed. Calculations show that if we can't find some way to stop these biomonsters, \SCENE EScene 1 may be doomed.>
-	CMsg6_9 <ifNPCPragmatic Accept>
+	CMsg6_9 <ifChatNPCPragmatic Accept>
 	Msg6_10 <You failed to destroy the monsters; may the heavens deliver us...>
-	CMsg6_10 <ifNPCSpiritual Accept>
+	CMsg6_10 <ifChatNPCSpiritual Accept>
 
 	% 11 :  Description of mission.
 	%  use "$ \VAL V4 " to insert the pay for the mission,
 	%  and don't forget to mention that the PC also gets salvage.
 	Msg11 <Destroy all the monsters and you'll earn $ \VAL V4 . That's really all there is to it.>
 	Msg11_1 <This contract is for complete destruction of the biomonster nest. All monsters mst be eliminated in order to collect. Manage that, and you'll earn $ \VAL V4 .>
-	CMsg11_1 <ifNPCLawful Accept>
+	CMsg11_1 <ifChatNPCLawful Accept>
 	Msg11_2 <It's not often that I'll take a mission from the Guardians, but when the safety of \SCENE EScene 1 is at stake I'll make an exception. Destroy all the bioweapons and I'll give you $ \VAL V4 . Ready to go?>
-	CMsg11_2 <ifNPCChaotic Accept>
+	CMsg11_2 <ifChatNPCChaotic Accept>
 	Msg11_3 <Here's the problem. The city dump isn't so valuable but there are settlements all around it. So, we can't send in mecha, and bombardment is a last resort. You'll have to go in on foot and kill the monsters. Pay will be $ \VAL V4 .>
-	CMsg11_3 <ifNPCSociable Accept>
+	CMsg11_3 <ifChatNPCSociable Accept>
 	Msg11_4 <Destroy the monsters and you'll get $ \VAL V4 . All ready?>
-	CMsg11_4 <ifNPCShy Accept>
+	CMsg11_4 <ifChatNPCShy Accept>
 	Msg11_5 <Should be an easy mission. The only complicating factor is that there's really a lot of monsters... I mean a lot... but, if you can exterminate them all, you'll earn $ \VAL V4 . Deal?>
-	CMsg11_5 <ifNPCEasygoing Accept>
+	CMsg11_5 <ifChatNPCEasygoing Accept>
 	Msg11_6 <Every single last biomonster in that dump must be destroyed. What I'm looking for here is a liberal application of unrestrained violence... Are you down with that? Anyhow, complete the mission and you'll earn $ \VAL V4 .>
-	CMsg11_6 <ifNPCPassionate Accept>
+	CMsg11_6 <ifChatNPCPassionate Accept>
 	Msg11_7 <Go in, kill the monsters, and you'll earn $ \VAL V4 . Fairly standard heroic intervention. You know the deal.>
-	CMsg11_7 <ifNPCCheerful Accept>
+	CMsg11_7 <ifChatNPCCheerful Accept>
 	Msg11_8 <It's important that we exterminate these monsters before they can kill anyone who lives near there. Get rid of the entire pod of bioweapons and you'll earn $ \VAL V4 .>
-	CMsg11_8 <ifNPCMelancholy Accept>
+	CMsg11_8 <ifChatNPCMelancholy Accept>
 	Msg11_9 <Hunter-X synths are crafty. If we don't eliminate them now, they'll set up a defensive perimiter and firing points and it'll take an orbital bombardment to get them out. Exterminate the monsters for $ \VAL V4 . I'll pay you then.>
-	CMsg11_9 <ifNPCPragmatic Accept>
+	CMsg11_9 <ifChatNPCPragmatic Accept>
 	Msg11_10 <The Hunter-X series are an abomination upon this green Earth... They must be destroyed. Complete this mission and you'll earn $ \VAL V4 . Ready to start?>
-	CMsg11_10 <ifNPCSpiritual Accept>
+	CMsg11_10 <ifChatNPCSpiritual Accept>
 
 	% 16 :  Player is asked if he is looking for a job.
 	Msg16 <There's a colony of weapons-grade biomonsters living in the \SCENE EScene 1 dump. I need someone to go eliminate them. Do you think you can help me?>
 	Msg16_1 <Greetings, citizen. A pod of synthetic monsters has been sighted in the city dump. I need a hunter to perform an extermination mission... Feel like serving your community?>
-	CMsg16_1 <ifNPCLawful Accept>
+	CMsg16_1 <ifChatNPCLawful Accept>
 	Msg16_3 <There's been a pod of biomonsters sighted in the city dump. We don't know where they came from or how they got there, but they must be destroyed before someone gets killed. I've got a mission contract for a hunter to do just that. Interested?>
-	CMsg16_3 <ifNPCSociable Accept>
+	CMsg16_3 <ifChatNPCSociable Accept>
 	Msg16_4 <I've got a contract for a hunter to eliminate some biomonsters. Want to have a look?>
-	CMsg16_4 <ifNPCShy Accept>
+	CMsg16_4 <ifChatNPCShy Accept>
 	Msg16_5 <Man, I wish I could get a vacation, but there's always something going on... This time it's a pod of biomonsters at the city dump. How'd you like to take the contract?>
-	CMsg16_5 <ifNPCEasygoing Accept>
+	CMsg16_5 <ifChatNPCEasygoing Accept>
 	Msg16_6 <The life of a bounty hunter is never dull... That's why it's the life I choose. Right now there's a hive of biomonsters at the city dump. I'd like you to run the extermination mission... How about it?>
-	CMsg16_6 <ifNPCPassionate Accept>
+	CMsg16_6 <ifChatNPCPassionate Accept>
 	Msg16_7 <You're in luck. I have a contract for a hunter to go kill some monsters. Are you feeling up for that?>
-	CMsg16_7 <ifNPCCheerful Accept>
+	CMsg16_7 <ifChatNPCCheerful Accept>
 	Msg16_8 <There's a serious problem in town. A pod of bioweapons has appeared at the city dump... we don't know how. I need a hunter to exterminate them. Do you think you can help us?>
-	CMsg16_8 <ifNPCMelancholy Accept>
+	CMsg16_8 <ifChatNPCMelancholy Accept>
 	Msg16_9 <A group of bioweapons has activated at \SCENE EScene 1 dump. These spontaneous appearances go against everything we know about synth propogation, something must be going on... I need a hunter to exterminate them. Interested?>
-	CMsg16_9 <ifNPCPragmatic Accept>
+	CMsg16_9 <ifChatNPCPragmatic Accept>
 	Msg16_10 <You arrived in the nick of time. A group of biomonsters has been sighted at \SCENE EScene 1 dump. I need you to exterminate them... Are you available?>
-	CMsg16_10 <ifNPCSpiritual Accept>
+	CMsg16_10 <ifChatNPCSpiritual Accept>
 
 	% 21 :  NPC implies job, PC might have chance to get it.
 	Msg21 <\SCENE EScene 1 has a problem. A colony of weapons-grade biomonsters has moved into the dump. Nobody really knows where they came from... now, I need someone to help get rid of them.>
 	Msg21_1 <\SCENE Escene 1 has a problem, which means that Guardians have a problem, which means that I've got a headache. Biomonsters have been spotted at the dump. Now I've got to find someone to exterminate them.>
-	CMsg21_1 <ifNPCLawful Accept>
+	CMsg21_1 <ifChatNPCLawful Accept>
 	Msg21_3 <It's always something. Right now I need a hunter to perform some biomonster extermination... A large group of Hunter-X synths has been sighted at the city dump. I wonder if I'll find anyone crazy enough to take them on?>
-	CMsg21_3 <ifNPCSociable Accept>
+	CMsg21_3 <ifChatNPCSociable Accept>
 	Msg21_4 <There are biomonsters living in the \SCENE EScene 1 dump. I need a hunter to run an extermination mission.>
-	CMsg21_4 <ifNPCShy Accept>
+	CMsg21_4 <ifChatNPCShy Accept>
 	Msg21_5 <Just when I was starting to enjoy my holiday, there's another emergency here in \SCENE EScene 1 . Turns out that there are weapon-synths living in the city dump. Now I have to find a hunter for the extermination mission.>
-	CMsg21_5 <ifNPCEasygoing Accept>
+	CMsg21_5 <ifChatNPCEasygoing Accept>
 	Msg21_6 <There's an urgent matter in \SCENE EScene 1 . Biomonsters are on the loose, and a hunter is needed to get rid of them.>
-	CMsg21_6 <ifNPCPassionate Accept>
+	CMsg21_6 <ifChatNPCPassionate Accept>
 	Msg21_7 <It would be a good time to be a hunter in \SCENE EScene 1 . Biomonsters have been sighted at the city dump, so there's a lot of work to go around.>
-	CMsg21_7 <ifNPCCheerful Accept>
+	CMsg21_7 <ifChatNPCCheerful Accept>
 	Msg21_8 <It's a bad time to be in \SCENE EScene 1 . Bioweapons have been sighted near the city dump, and all our hunters are busy fighting them.>
-	CMsg21_8 <ifNPCMelancholy Accept>
+	CMsg21_8 <ifChatNPCMelancholy Accept>
 	Msg21_9 <It's strange. Some biomonsters have been spotted in the city dump... but where did they come from? In any event, hunters are needed to go exterminate the pod.>
-	CMsg21_9 <ifNPCPragmatic Accept>
+	CMsg21_9 <ifChatNPCPragmatic Accept>
 	Msg21_10 <There must be a curse on our city... recently biomonsters have been seen at the city dump. We need a hunter to go down there and eliminate them.>
-	CMsg21_10 <ifNPCSpiritual Accept>
+	CMsg21_10 <ifChatNPCSpiritual Accept>
 
 	% 31 :  "PLAN A" or "PLAN B" worked... the PC is offered
 	%  a job and may choose either prompt7/8 to accept or prompt9/10
 	%  to reject it.
 	Msg31 <If you think you're up for the challenge, I could hire you for the mission. Think you can survive?>
 	Msg31_1 <I have to be honest with you... There's a very good chance that if you accept this mission, you won't be coming back alive. Still interested?>
-	CMsg31_1 <ifNPCLawful Accept>
+	CMsg31_1 <ifChatNPCLawful Accept>
 	Msg31_2 <I'm no fan of truthfulness, but I have to tell you that this mission is tantamount to suicide. Do you really want to try?>
-	CMsg31_2 <ifNPCChaotic Accept>
+	CMsg31_2 <ifChatNPCChaotic Accept>
 	Msg31_3 <This could be very convenient, if you're interested in taking the mission. I've been looking for someone to do it and now here you are. It'll be dangerous, of course. What do you say, are you up for it?>
-	CMsg31_3 <ifNPCSociable Accept>
+	CMsg31_3 <ifChatNPCSociable Accept>
 	Msg31_4 <If you want it, the mission contract is yours. Think you have what it takes?>
-	CMsg31_4 <ifNPCShy Accept>
+	CMsg31_4 <ifChatNPCShy Accept>
 	Msg31_5 <It'd be easy on me if you could take the contract. Interested in hunting some monsters?>
-	CMsg31_5 <ifNPCEasygoing Accept>
+	CMsg31_5 <ifChatNPCEasygoing Accept>
 	Msg31_6 <You must be very brave... I like that! If you want to try, the extermination contract is yours. Deal?>
-	CMsg31_6 <ifNPCPassionate Accept>
+	CMsg31_6 <ifChatNPCPassionate Accept>
 	Msg31_7 <I'm certain that if you tried, you could defeat the monsters! Want to see?>
-	CMsg31_7 <ifNPCCheerful Accept>
+	CMsg31_7 <ifChatNPCCheerful Accept>
 	Msg31_8 <Do you really think you could fight them and survive? If so, the extermination contract is yours...>
-	CMsg31_8 <ifNPCMelancholy Accept>
+	CMsg31_8 <ifChatNPCMelancholy Accept>
 
 	% 36 :  Combat is starting.
 	Msg36 <Good luck. Come back here when you're done and I'll give you your pay.>
 	Msg36_3 <This is gonna be a long fight. Hopefully everything will go well. Come see me after you've finished and I'll give you the reward you've been promised then.>
-	CMsg36_3 <ifNPCSociable Accept>
+	CMsg36_3 <ifChatNPCSociable Accept>
 	Msg36_4 <Exterminate them all. Good luck.>
-	CMsg36_4 <ifNPCShy Accept>
+	CMsg36_4 <ifChatNPCShy Accept>
 	Msg36_5 <If they try to bite you, make sure they don't go for the neck or the face. Come back after all the monsters are gone and you'll get your pay.>
-	CMsg36_5 <ifNPCEasygoing Accept>
+	CMsg36_5 <ifChatNPCEasygoing Accept>
 	Msg36_6 <Eliminate the entire hive, make sure there's nothing left. When you're done I'll give you the reward.>
-	CMsg36_6 <ifNPCPassionate Accept>
+	CMsg36_6 <ifChatNPCPassionate Accept>
 	Msg36_7 <Just kill the monsters then come back here for the money. Good luck.>
-	CMsg36_7 <ifNPCCheerful Accept>
+	CMsg36_7 <ifChatNPCCheerful Accept>
 	Msg36_8 <Try hard not to get yourself killed. I'll be waiting here for you to report in.>
-	CMsg36_8 <ifNPCMelancholy Accept>
+	CMsg36_8 <ifChatNPCMelancholy Accept>
 	Msg36_10 <Good luck. May the heavens protect you.>
-	CMsg36_10 <ifNPCSpiritual Accept>
+	CMsg36_10 <ifChatNPCSpiritual Accept>
 
 	% 101 :  Player accepted job, then left to get ready.
 	Msg101 <Are you ready to exterminate some monsters?>
@@ -288,7 +288,7 @@ sub
 	% 106 :  Player doesn't want job; answer to prompts 17-19.
 	msg106 <It's not likely that I'll find anyone. We may have to bomb the dump from orbit...>
 	msg106_1 <I don't think anyone's going to volunteer. This means I may get to call in an orbital strike against the dump! I'm excited!>
-	cmsg106_1 <ifNPCCheerful Accept>
+	cmsg106_1 <ifChatNPCCheerful Accept>
 
 	% 107 :  Memo
 	msg107 <\ELEMENT 1 in \SCENE EScene 1 offered you a mission to exterminate some biomonsters.>
diff --git a/Series/PLOT_Redemption.txt b/Series/PLOT_Redemption.txt
index 7fedfc3..5e77866 100644
--- a/Series/PLOT_Redemption.txt
+++ b/Series/PLOT_Redemption.txt
@@ -3,6 +3,8 @@ Plot 0
 	% If the PC is seriously wangtta, this mission will give him a chance
 	% to redeem himself. Yay!
 
+    % Updated for GH1 v2.0
+
 	element1 <Character HasMecha Heroic>
 
 	% P1 = Time Limit
@@ -32,7 +34,7 @@ sub
 
 	greeting <NewChat if= P2 3 else GoCheckLoss Say 1 CashPrize V4 AddReact d5 AdvancePlot 0>
 	GoCheckLoss <ifG P2 0 else GoFirstTime Say 2 AdvancePlot 0>
-	GoFirstTime <V= 3 Threat -PCRep 6 100 V= 4 Reward V3 150 ifG PCRep 6 -10 else GoOffer SayAnything AdvancePlot 0>
+	GoFirstTime <V= 3 Threat -PCRep 6 100 V= 4 Reward V3 150 ifG PCRep 6 -10 else GoOffer Say 13 AdvancePlot 0>
 	GoOffer <if= V1 1 else GoFirstOffer Say 8  AddChat 6 AddChat 7 AddChat 8>
 	GoFirstOffer <Say 3 AddChat 1 AddChat 2 AddChat 3>
 
@@ -62,59 +64,59 @@ sub
 
 	Msg1 <The raiders have been stopped! I can't believe you actually did it... Here's your reward.>
 	Msg1_1 <You did it! Nobody else believed in you, and to be honest I didn't either, but you did it! Here's the reward you were promised. Maybe now you'll start getting respect from others.>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <You did it. Here's your pay.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <You must be pretty happy about that win! Here's the pay you've earned.>
-	CMsg1_3 <ifNPCCheerful Accept>
+	CMsg1_3 <ifChatNPCCheerful Accept>
 	Msg1_5 <That didn't seem so tough. Here's your reward.>
-	CMsg1_5 <ifNPCEasygoing Accept>
+	CMsg1_5 <ifChatNPCEasygoing Accept>
 	Msg1_6 <You did it! The enemies have been thoroughly defeated, and \SCENE EScene 1 is safe. Here's your reward.>
-	CMsg1_6 <ifNPCPassionate Accept>
+	CMsg1_6 <ifChatNPCPassionate Accept>
 	Msg1_7 <You made it back alive... too bad. Well, here's your pay, anyhow.>
 	CMsg1_7 <ifG 1 React Accept>
 
 	Msg2 <The town's generator has been destroyed... but, you did your best, I suppose...>
 	Msg2_1 <The enemy mecha broke through our defenses and smashed the generator. Now, we'll be on reserve power until it can be repaired. This is terrible... it was probably a disgruntled former employee of the power company, you know.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <You lost. I guess the things they say about you are true.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <You didn't manage to stop the mecha from wrecking the generator... but I'm certain you'll manage to clear your name someday.>
-	CMsg2_3 <ifNPCCheerful Accept>
+	CMsg2_3 <ifChatNPCCheerful Accept>
 	Msg2_4 <You failed. I guess you really are a loser.>
-	CMsg2_4 <ifNPCMelancholy Accept>
+	CMsg2_4 <ifChatNPCMelancholy Accept>
 	Msg2_5 <You failed. But, it's not the end of the world... just maybe the end of your career...>
-	CMsg2_5 <ifNPCEasygoing Accept>
+	CMsg2_5 <ifChatNPCEasygoing Accept>
 	Msg2_6 <How could you fail!? I trusted you to do this, and you couldn't...>
-	CMsg2_6 <ifNPCPassionate Accept>
+	CMsg2_6 <ifChatNPCPassionate Accept>
 	Msg2_7 <As expected, you failed. The mecha defeated you and smashed our generator.>
 	CMsg2_7 <ifG 1 React Accept>
 
 	Msg3 <I have a mecha mission for you, if you're looking for work. I'll be honest, there's not much chance of success... that's why I need a mecha pilot with nothing to lose.>
 	Msg3_1 <There's an emergency in \SCENE EScene 1 . I know that you could use some work... I'll let you have the mission, but I better say that it's going to be difficult.>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <I need a pilot for an immediate mission. It's going to be tough. Are you available?>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <I've got a good offer for you... A pilot is needed for an immediate mission to defend \SCENE EScene 1 . If you succeed, maybe you'll get the respect you deserve.>
-	CMsg3_3 <ifNPCCheerful Accept>
+	CMsg3_3 <ifChatNPCCheerful Accept>
 	Msg3_4 <There's a group of mecha closing in on the city powerplant. I need a pilot to run interception... This may be a suicide mission, though. You've got nothing worth losing. How about taking the job?>
-	CMsg3_4 <ifNPCMelancholy Accept>
+	CMsg3_4 <ifChatNPCMelancholy Accept>
 	Msg3_5 <There's trouble at the powerplant. I need a pilot to go defend it. I know you don't have much of a rep, but if you can pull off this mission maybe that'll change.>
-	CMsg3_5 <ifNPCEasygoing Accept>
+	CMsg3_5 <ifChatNPCEasygoing Accept>
 	Msg3_7 <I have a job available for a mecha pilot. It's probably a suicide mission, so I want you to take it.>
 	CMsg3_7 <ifG 1 React Accept>
 
 	Msg4 <A group of unidentified mecha is heading towards the city power station. We don't know what they want, but it can't be good. Your job will be to stop them... Do this, and you'll earn $ \VAL V4 plus salvage.>
 	Msg4_1 <The enemy mecha are header for the \SCENE EScene 1 powerplant. They're probably planning to destroy it for whatever nefarious purpose. If you can stop them, you'll get $ \VAL V4 plus salvage...>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <Some mecha are attacking the power plant. Stop them, and you'll earn $ \VAL V4 plus salvage.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_4 <A team of unregistered mecha is heading for the power plant. This could be the start of an invasion, or worse. Defeat them and you'll earn $ \VAL V4 plus salvage.>
-	CMsg4_4 <ifNPCMelancholy Accept>
+	CMsg4_4 <ifChatNPCMelancholy Accept>
 	Msg4_5 <Here's the deal. There are some unknown mecha heading for the power plant; your job is to stop them, or at least slow them down. You'll earn $ \VAL V4 and first salvage rights if you can pull that off.>
-	CMsg4_5 <ifNPCEasygoing Accept>
+	CMsg4_5 <ifChatNPCEasygoing Accept>
 	Msg4_6 <This is terrible! A group of mecha is headed for the city power plant, and they must be stopped! If you can do it, you'll earn $ \VAL V4 and salvage. Be prepared to lay down your life for \SCENE EScene 1 !>
-	CMsg4_6 <ifNPCPassionate Accept>
+	CMsg4_6 <ifChatNPCPassionate Accept>
 
 	Msg5 <\ELEMENT 1 in \SCENE EScene 1 offered you a combat mission.>
 
@@ -128,17 +130,17 @@ sub
 
 	Msg10 <Good luck. If you make it back alive, you'll be a hero.>
 	Msg10_1 <It's very important that not a single mecha be allowed to slip through. Do your best, and maybe people will stop calling you a wangtta.>
-	CMsg10_1 <ifNPCSociable Accept>
+	CMsg10_1 <ifChatNPCSociable Accept>
 	Msg10_2 <Here are the mission coordinates. Report back here when you're done.>
-	CMsg10_2 <ifNPCShy Accept>
+	CMsg10_2 <ifChatNPCShy Accept>
 	Msg10_3 <I'm certain you can do this! Good luck.>
-	CMsg10_3 <ifNPCCheerful Accept>
+	CMsg10_3 <ifChatNPCCheerful Accept>
 	Msg10_4 <You'll probably get killed by their superior firepower, but try to make a difference before you go down.>
-	CMsg10_4 <ifNPCMelancholy Accept>
+	CMsg10_4 <ifChatNPCMelancholy Accept>
 	Msg10_5 <Do your best.>
-	CMsg10_5 <ifNPCEasygoing Accept>
+	CMsg10_5 <ifChatNPCEasygoing Accept>
 	Msg10_6 <Do it for \SCENE EScene 1 !>
-	CMsg10_6 <ifNPCPassionate Accept>
+	CMsg10_6 <ifChatNPCPassionate Accept>
 	Msg10_7 <I suppose I should wish you good luck now... just don't fail us.>
 	CMsg10_7 <ifG 1 React Accept>
 
@@ -146,6 +148,22 @@ sub
 
 	Msg12 <Do whatever it is that you have to do, then come back here and let's start.>
 
+	Msg13 <I just sent a poor young pilot on a dangerous mission. Hopefully they'll be back.>
+	Msg13_1 <If you're here about the mission, I regret to inform you that you're far overqualified. Really I wouldn't be sending anyone on this hot dog run if the pilot involved hadn't begged me for a chance to redeem himself.>
+	CMsg13_1 <ifChatNPCSociable Accept>
+	Msg13_2 <What mission? You heard nothing from me.>
+	CMsg13_2 <ifChatNPCShy Accept>
+	Msg13_3 <A dangerous mission can be a good opportunity to redeem your reputation. Of course if you already have a good reputation you can get better missions.>
+	CMsg13_3 <ifChatNPCCheerful Accept>
+	Msg13_3 <There's never a shortage of desperate pilots willing to take any job. Be thankful you're not one of them.>
+	CMsg13_3 <ifChatNPCMelancholy Accept>
+	Msg13_5 <Victory or death, they say... what about just retiring? If you're no good at being a cavalier that's better than getting yourself killed.>
+	CMsg13_5 <ifChatNPCEasygoing Accept>
+	Msg13_6 <Victory or death. This is the choice every cavalier must face... but of course you already knew that.>
+	CMsg13_6 <ifChatNPCPassionate Accept>
+    Msg13_7 <If you ever become wangtta, a dangerous mission might be just the thing to restore your reputation in the eyes of other pilots.>
+
+
 	Prompt1 <I'll do it.>
 	CPrompt1 <ifG PCMeks 0 Accept>
 
diff --git a/Series/TS_GRD_PumpPusher_PLOT1_Evidence.txt b/Series/TS_GRD_PumpPusher_PLOT1_Evidence.txt
index bbbfbff..b72e968 100644
--- a/Series/TS_GRD_PumpPusher_PLOT1_Evidence.txt
+++ b/Series/TS_GRD_PumpPusher_PLOT1_Evidence.txt
@@ -62,32 +62,32 @@ sub
 	%  01 :  PC has won the mission.
 	Msg1 <Good work, \RANK . The lab boys will search through that filing cabinet you found and see what they can determine.>
 	Msg1_1 <You did a really good job, \RANK \PC . That filing cabinet you discovered is sure to contain information that will lead us to the drug lab.>
-	CMSg1_1 <ifNPCSociable Accept>
+	CMSg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <You did well out there. When the forensics team gets something, I'll let you know.>
-	CMSg1_2 <ifNPCShy Accept>
+	CMSg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <Piece of cake. The lab team will go through that filing cabinet; I'll let you know what they find.>
-	CMSg1_3 <ifNPCEasygoing Accept>
+	CMSg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <You did it! That filing cabinet must contain vital information about the drug ring... Maybe even the location of their lab!>
-	CMSg1_4 <ifNPCPassionate Accept>
+	CMSg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <Good job, \PC . With the information recovered from that filing cabinet we'll be able to track down the Pump lab no problem.>
-	CMSg1_5 <ifNPCCheerful Accept>
+	CMSg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <The mission was a success, but I fear that our time may be running out. It is very important that we shut down their production lab quickly.>
-	CMSg1_6 <ifNPCMelancholy Accept>
+	CMSg1_6 <ifChatNPCMelancholy Accept>
 
 	%  02 :  PC has lost the mission.
 	Msg2 <You didn't find anything? The case is going to be hamstrung until we find a new lead...>
 	Msg2_1 <The mission was a failure. We'll have to keep looking for a new lead... There's no way we can allow these poison merchants to keep operating.>
-	CMSg2_1 <ifNPCSociable Accept>
+	CMSg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <You lost.>
-	CMSg2_2 <ifNPCShy Accept>
+	CMSg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <You didn't find anything? The intelligence must have been wrong... But that leaves us without any good leads in the case.>
-	CMSg2_3 <ifNPCEasygoing Accept>
+	CMSg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <You couldn't find anything!? What happened, were the local gangs too tough for you?>
-	CMSg2_4 <ifNPCPassionate Accept>
+	CMSg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <No evidence was recovered from the scene... We'll have to try harder next time.>
-	CMSg2_5 <ifNPCCheerful Accept>
+	CMSg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <No evidence was recovered... It may well be that we'll never find their lab now...>
-	CMSg2_6 <ifNPCMelancholy Accept>
+	CMSg2_6 <ifChatNPCMelancholy Accept>
 
 	%  03 :  The item somehow got destroyed...
 	Msg3 <The evidence was accidentally destroyed during your investigation. Tough luck.>
@@ -95,17 +95,17 @@ sub
 	%  04 :  Mission description.
 	Msg4 <We need to find some clues, to figure out where the "Pump Pushers" have their base of operations. A dealer has been operating out of one of the edgezone slums... Go there and see what you can find.>
 	Msg4_1 <The "Pump Pushers" have been selling their deadly drug throughout the Federated Territories. We've got a lead that they have operatives in the edgezone slum. Your job will be to go there and see what evidence you can find.>
-	CMSg4_1 <ifNPCSociable Accept>
+	CMSg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <I want you to go to this slum and search for evidence linked to the "Pump Pushers". Be careful, the local street gangs are dangerous.>
-	CMSg4_2 <ifNPCShy Accept>
+	CMSg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <Right now we need information. Once we find out where their production lab is, we can raid and destroy it. I want you to search this area for a drug dealer's hideout. If you find any evidence, report back to me.>
-	CMSg4_3 <ifNPCEasygoing Accept>
+	CMSg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <Our clues so far have indicated that a pump dealer is working in the edgezone. Your task is to storm his lair and bring back any evidence that you find. If his men try to stop you, kill them.>
-	CMSg4_4 <ifNPCPassionate Accept>
+	CMSg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <We had a lucky break in the case... It's been found that one of the local drug dealers has connections to the "Pump Pushers". Your job is to raid his hideout and search for information. If you find anything, come report to me.>
-	CMSg4_5 <ifNPCCheerful Accept>
+	CMSg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <It's believed that a local dealer has connections to the "Pump Pushers". I want you to search the edgezone for his hideout, and see if you can find any evidence there. I'm afraid it's going to be like looking for a needle in a haystack.>
-	CMSg4_6 <ifNPCMelancholy Accept>
+	CMSg4_6 <ifChatNPCMelancholy Accept>
 
 	%  05 :  PC has come back after getting ready
 	Msg5 <All ready to go search for clues yet?>
@@ -114,32 +114,32 @@ sub
 	%  06 :  PC will not be offered the mission
 	Msg6 <I'm very busy with guardian business today.>
 	Msg6_1 <I've been investigating the "Pump Pusher" drug cartel. I really hope that we can find their headquarters... Sorry, this investigation is for Guardians only. If any information was leaked it could damage the case.>
-	CMSg6_1 <ifNPCSociable Accept>
+	CMSg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <Hm? Oh, please come back later.>
-	CMSg6_2 <ifNPCShy Accept>
+	CMSg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <Police work isn't all glamorous you know. Er, actually it isn't glamorous at all.>
-	CMSg6_3 <ifNPCEasygoing Accept>
+	CMSg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <I'm gonna be the one who brings the "Pump Pushers" to justice!>
-	CMSg6_4 <ifNPCPassionate Accept>
+	CMSg6_4 <ifChatNPCPassionate Accept>
 	Msg6_5 <It's only a matter of time before the heads of the "Pump Pusher" gang are arrested.>
-	CMSg6_5 <ifNPCCheerful Accept>
+	CMSg6_5 <ifChatNPCCheerful Accept>
 	Msg6_6 <I won't be able to sleep at night until the "Pump Pushers" are brought to justice...>
-	CMSg6_6 <ifNPCMelancholy Accept>
+	CMSg6_6 <ifChatNPCMelancholy Accept>
 
 	%  07 :  PC will be offered the mission here.
 	Msg7 <Hello, \PC . I guess you heard that I've been investigating the "Pump Pushers". I could use some help with the field work, if you're up for a mission.>
 	Msg7_1 <Good to see you, \PC . I've been hoping you'd show up. I guess you've heard already about the "Pump Pushers"... I need you to do a bit of investigation work for me; how about it?>
-	CMSg7_1 <ifNPCSociable Accept>
+	CMSg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <Hello \RANK . The "Pump Pushers" are operating in town. I need you to investigate.>
-	CMSg7_2 <ifNPCShy Accept>
+	CMSg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <Hey there, \RANK \PC . If you're not busy I have some investigation work that needs doing.>
-	CMSg7_3 <ifNPCEasygoing Accept>
+	CMSg7_3 <ifChatNPCEasygoing Accept>
 	Msg7_4 <Ah, \RANK \PC , you've made it. Our fair city has been the latest target of the nefarious "Pump Pushers". I have an investigation job that you can help with.>
-	CMSg7_4 <ifNPCPassionate Accept>
+	CMSg7_4 <ifChatNPCPassionate Accept>
 	Msg7_5 <You picked a good time to show up. I've got an investigation mission that I need a field agent for... We're going after the "Pump Pushers".>
-	CMSg7_5 <ifNPCCheerful Accept>
+	CMSg7_5 <ifChatNPCCheerful Accept>
 	Msg7_6 <\PC , I need your help to investigate the "Pump Pushers". We must act quickly before more people die.>
-	CMSg7_6 <ifNPCMelancholy Accept>
+	CMSg7_6 <ifChatNPCMelancholy Accept>
 
 	%  08 :  The PC refused the mission.
 	Msg8 <That's too bad. I'll carry on by myself, then.>
@@ -150,17 +150,17 @@ sub
 	%  10 :  Combat is starting.
 	Msg10 <Come back here when you've found something that looks like it might be important. Then, I can send the lab truck over and they'll comb the area.>
 	Msg10_1 <If you find anything that looks like it might be important, come back here and let me know about it. Even if you can't figure it out yourself our lab boys will scour the area for clues, and they'll find something.>
-	CMSg10_1 <ifNPCSociable Accept>
+	CMSg10_1 <ifChatNPCSociable Accept>
 	Msg10_2 <Once you've found something, return here at once. Our forensics team will do the rest.>
-	CMSg10_2 <ifNPCShy Accept>
+	CMSg10_2 <ifChatNPCShy Accept>
 	Msg10_3 <Be careful of the street gangs in the edgezone... some of them are pretty trigger-happy.>
-	CMSg10_3 <ifNPCEasygoing Accept>
+	CMSg10_3 <ifChatNPCEasygoing Accept>
 	Msg10_4 <Search every building until you've found something. There must be evidence...>
-	CMSg10_4 <ifNPCPassionate Accept>
+	CMSg10_4 <ifChatNPCPassionate Accept>
 	Msg10_5 <Good luck. I'm sure you'll have no problem finding some evidence.>
-	CMSg10_5 <ifNPCCheerful Accept>
+	CMSg10_5 <ifChatNPCCheerful Accept>
 	Msg10_6 <Stay alive. We've already lost too many good guardians trying to fight this cartel...>
-	CMSg10_6 <ifNPCMelancholy Accept>
+	CMSg10_6 <ifChatNPCMelancholy Accept>
 
 	%  11 :  The PC needs some time to get ready.
 	Msg11 <Alright. You go do that.>
diff --git a/Series/TS_GRD_PumpPusher_PLOT2_Lab.txt b/Series/TS_GRD_PumpPusher_PLOT2_Lab.txt
index 67709dc..9e9af26 100644
--- a/Series/TS_GRD_PumpPusher_PLOT2_Lab.txt
+++ b/Series/TS_GRD_PumpPusher_PLOT2_Lab.txt
@@ -31,31 +31,31 @@ sub
 
 	Msg1 <We've located the base of the Pump Pushers! Now, it's up to you to go in there and clear it out. Are you ready to start?>
 	Msg1_1 <>
-	CMSg1_1 <ifNPCSociable Accept>
+	CMSg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <>
-	CMSg1_2 <ifNPCShy Accept>
+	CMSg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <>
-	CMSg1_3 <ifNPCEasygoing Accept>
+	CMSg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <>
-	CMSg1_4 <ifNPCPassionate Accept>
+	CMSg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <>
-	CMSg1_5 <ifNPCCheerful Accept>
+	CMSg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <>
-	CMSg1_6 <ifNPCMelancholy Accept>
+	CMSg1_6 <ifChatNPCMelancholy Accept>
 
 	Msg2 <If the criminals resist, you're authorized to use deadly force.>
 	Msg2_1 <>
-	CMSg2_1 <ifNPCSociable Accept>
+	CMSg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <>
-	CMSg2_2 <ifNPCShy Accept>
+	CMSg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <>
-	CMSg2_3 <ifNPCEasygoing Accept>
+	CMSg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <>
-	CMSg2_4 <ifNPCPassionate Accept>
+	CMSg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <>
-	CMSg2_5 <ifNPCCheerful Accept>
+	CMSg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <>
-	CMSg2_6 <ifNPCMelancholy Accept>
+	CMSg2_6 <ifChatNPCMelancholy Accept>
 
 	Msg3 <Do whatever it is that you have to do, then come back here for the mission.>
 
diff --git a/Series/TS_GSP_MatchMaker_STORY.txt b/Series/TS_GSP_MatchMaker_STORY.txt
index e31dc18..9f0aba1 100644
--- a/Series/TS_GSP_MatchMaker_STORY.txt
+++ b/Series/TS_GSP_MatchMaker_STORY.txt
@@ -27,7 +27,7 @@ sub
 	GoNothing <Say 2>
 
 	result1 <NewChat Say 4 AddChat 3 AddChat 4>
-	result2 <NewChat Reputation 5 -d6 ifNPCMelancholy else GoR2Fail AddReact 10 Say 6 AddChat 3 AddChat 4>
+	result2 <NewChat Reputation 5 -d6 ifChatNPCMelancholy else GoR2Fail AddReact 10 Say 6 AddChat 3 AddChat 4>
 	GoR2Fail <Say 5 EndStory>
 	result3 <NewChat S= 1 1 ifG SkRoll 37 15 else GoR3Fail Say 7 Memo 9>
 	GoR3Fail <Say 8>
diff --git a/Series/TS_GTH_Corporate_PLOT.txt b/Series/TS_GTH_Corporate_PLOT.txt
index bc6752c..bb47d52 100644
--- a/Series/TS_GTH_Corporate_PLOT.txt
+++ b/Series/TS_GTH_Corporate_PLOT.txt
@@ -85,115 +85,115 @@ sub
 	% *********************
 	Msg1 <So, did you recover the files we need?>
 	Msg1_1 <You've been gone for a while. I know the complex is well guarded, but I had no idea how much so... Did you find the information that we require, or has the mission been a failure?>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <Find anything?>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <It would be great if one of our own teams could get a look inside the \ELEMENT 2 complex. Did you find anything worth mentioning?>
-	CMsg1_3 <ifNPCCheerful Accept>
+	CMsg1_3 <ifChatNPCCheerful Accept>
 	Msg1_4 <Such an extravagant complex that \ELEMENT 2 has built... It must mean something bad. What have you found?>
-	CMsg1_4 <ifNPCMelancholy Accept>
+	CMsg1_4 <ifChatNPCMelancholy Accept>
 	Msg1_5 <Back already? I was just taking a nap. So, did you find something?>
-	CMsg1_5 <ifNPCEasygoing Accept>
+	CMsg1_5 <ifChatNPCEasygoing Accept>
 	Msg1_6 <We have only one chance to destroy \ELEMENT 2 , and this is it... Did you get something worthwhile?>
-	CMsg1_6 <ifNPCPassionate Accept>
+	CMsg1_6 <ifChatNPCPassionate Accept>
 
 	Msg2 <Excellent. Here is your money.>
 	Msg2_1 <Very good. With this knowledge we'll know exactly what \ELEMENT 2 is doing... and we'll be ready with our own products!>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <You've done well. Now keep this a secret, just between us.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <I knew you'd come through for me. Here's the money you've earned.>
-	CMsg2_3 <ifNPCCheerful Accept>
+	CMsg2_3 <ifChatNPCCheerful Accept>
 	Msg2_4 <Hm, I was afraid at first that you wouldn't recover anything. Here's your pay.>
-	CMsg2_4 <ifNPCMelancholy Accept>
+	CMsg2_4 <ifChatNPCMelancholy Accept>
 	Msg2_5 <Good work. Here's the money I offered you for it... I'll let you know the next time I need any covert ops done.>
-	CMsg2_5 <ifNPCEasygoing Accept>
+	CMsg2_5 <ifChatNPCEasygoing Accept>
 	Msg2_6 <You did it! This will spell the downfall of \ELEMENT 2 ... here's your pay.>
-	CMsg2_6 <ifNPCPassionate Accept>
+	CMsg2_6 <ifChatNPCPassionate Accept>
 
 	Msg3 <That's a pity... Well, I'm certain that our company can defeat \ELEMENT 2 , none the less...>
 	Msg3_1 <>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <>
-	CMsg3_3 <ifNPCCheerful Accept>
+	CMsg3_3 <ifChatNPCCheerful Accept>
 	Msg3_4 <>
-	CMsg3_4 <ifNPCMelancholy Accept>
+	CMsg3_4 <ifChatNPCMelancholy Accept>
 	Msg3_5 <>
-	CMsg3_5 <ifNPCEasygoing Accept>
+	CMsg3_5 <ifChatNPCEasygoing Accept>
 	Msg3_6 <>
-	CMsg3_6 <ifNPCPassionate Accept>
+	CMsg3_6 <ifChatNPCPassionate Accept>
 
 	Msg4 <You are a true thief... Well, so long as the information has been denied to \ELEMENT 2 , this has not been a total loss for us.>
 	Msg4_1 <>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <>
-	CMsg4_3 <ifNPCCheerful Accept>
+	CMsg4_3 <ifChatNPCCheerful Accept>
 	Msg4_4 <>
-	CMsg4_4 <ifNPCMelancholy Accept>
+	CMsg4_4 <ifChatNPCMelancholy Accept>
 	Msg4_5 <>
-	CMsg4_5 <ifNPCEasygoing Accept>
+	CMsg4_5 <ifChatNPCEasygoing Accept>
 	Msg4_6 <>
-	CMsg4_6 <ifNPCPassionate Accept>
+	CMsg4_6 <ifChatNPCPassionate Accept>
 
 	Msg11 <So, you must have received my message... I have a bit of underhanded business that needs looking to, and it would be best if it were done by someone who would not sully the company name.>
 	Msg11_1 <>
-	CMsg11_1 <ifNPCSociable Accept>
+	CMsg11_1 <ifChatNPCSociable Accept>
 	Msg11_2 <>
-	CMsg11_2 <ifNPCShy Accept>
+	CMsg11_2 <ifChatNPCShy Accept>
 	Msg11_3 <>
-	CMsg11_3 <ifNPCCheerful Accept>
+	CMsg11_3 <ifChatNPCCheerful Accept>
 	Msg11_4 <>
-	CMsg11_4 <ifNPCMelancholy Accept>
+	CMsg11_4 <ifChatNPCMelancholy Accept>
 	Msg11_5 <>
-	CMsg11_5 <ifNPCEasygoing Accept>
+	CMsg11_5 <ifChatNPCEasygoing Accept>
 	Msg11_6 <>
-	CMsg11_6 <ifNPCPassionate Accept>
+	CMsg11_6 <ifChatNPCPassionate Accept>
 
 	Msg16 <I have a business offer for you. As you may know, \ELEMENT 2 is developing a new product. Of course we would like this project to fail. That's where you come in.>
 	Msg16_1 <>
-	CMsg16_1 <ifNPCSociable Accept>
+	CMsg16_1 <ifChatNPCSociable Accept>
 	Msg16_2 <>
-	CMsg16_2 <ifNPCShy Accept>
+	CMsg16_2 <ifChatNPCShy Accept>
 	Msg16_3 <>
-	CMsg16_3 <ifNPCCheerful Accept>
+	CMsg16_3 <ifChatNPCCheerful Accept>
 	Msg16_4 <>
-	CMsg16_4 <ifNPCMelancholy Accept>
+	CMsg16_4 <ifChatNPCMelancholy Accept>
 	Msg16_5 <>
-	CMsg16_5 <ifNPCEasygoing Accept>
+	CMsg16_5 <ifChatNPCEasygoing Accept>
 	Msg16_6 <>
-	CMsg16_6 <ifNPCPassionate Accept>
+	CMsg16_6 <ifChatNPCPassionate Accept>
 
 	Msg21 <We know the facility where the new product is being developed. Your job will be to sneak in and steal whatever information you can find. I can give you $ \VAL P4 if you return with anything useful.>
 	Msg21_1 <>
-	CMsg21_1 <ifNPCSociable Accept>
+	CMsg21_1 <ifChatNPCSociable Accept>
 	Msg21_2 <>
-	CMsg21_2 <ifNPCShy Accept>
+	CMsg21_2 <ifChatNPCShy Accept>
 	Msg21_3 <>
-	CMsg21_3 <ifNPCCheerful Accept>
+	CMsg21_3 <ifChatNPCCheerful Accept>
 	Msg21_4 <>
-	CMsg21_4 <ifNPCMelancholy Accept>
+	CMsg21_4 <ifChatNPCMelancholy Accept>
 	Msg21_5 <>
-	CMsg21_5 <ifNPCEasygoing Accept>
+	CMsg21_5 <ifChatNPCEasygoing Accept>
 	Msg21_6 <>
-	CMsg21_6 <ifNPCPassionate Accept>
+	CMsg21_6 <ifChatNPCPassionate Accept>
 
 	Msg26 <Good luck. Return here with the data and I'll pay you for it.>
 	Msg26_1 <>
-	CMsg26_1 <ifNPCSociable Accept>
+	CMsg26_1 <ifChatNPCSociable Accept>
 	Msg26_2 <>
-	CMsg26_2 <ifNPCShy Accept>
+	CMsg26_2 <ifChatNPCShy Accept>
 	Msg26_3 <>
-	CMsg26_3 <ifNPCCheerful Accept>
+	CMsg26_3 <ifChatNPCCheerful Accept>
 	Msg26_4 <>
-	CMsg26_4 <ifNPCMelancholy Accept>
+	CMsg26_4 <ifChatNPCMelancholy Accept>
 	Msg26_5 <>
-	CMsg26_5 <ifNPCEasygoing Accept>
+	CMsg26_5 <ifChatNPCEasygoing Accept>
 	Msg26_6 <>
-	CMsg26_6 <ifNPCPassionate Accept>
+	CMsg26_6 <ifChatNPCPassionate Accept>
 
 	Msg101 <Are you ready to start the mission yet?>
 	Msg102 <I'm working on some company business... secret company business.>
diff --git a/Series/TS_GTH_Default_PLOT.txt b/Series/TS_GTH_Default_PLOT.txt
index 1014d14..50edec8 100644
--- a/Series/TS_GTH_Default_PLOT.txt
+++ b/Series/TS_GTH_Default_PLOT.txt
@@ -51,69 +51,69 @@ sub
 
 	Msg1 <So, you couldn't find what you were looking for? That's a shame... Maybe I'll have better luck myself.>
 	Msg1_2 <You didn't get anything? Shame.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <You couldn't find a thing? Maybe the folks who live there took everything with them on vacation...>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <You didn't get anything from the house? You see, that's why you're the amateur and I'm the professional.>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 
 	Msg2 <You look like the sort who might be up for a bit of thievery. How'd you like to have a go at it?>
 	Msg2_1 <Hey, how'd you like to talk about some things? It seems to me that you're not the most honest person out there... and that's not a bad thing. How'd you like to practice your thieving skills?>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <If you're looking for crime, I've got some info for you.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <Hey, we all know there's nothing worse than having to work for your money. If you're willing to do a bit of robbery I have some info that may interest you.>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <You look like the sort that enjoys a challenge... How'd you like to try your luck at burgulary?>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <There's no opportunity in this world for people like us, so we have to make our own... How'd you like to try a bit of larceny?>
-	CMsg2_5 <ifNPCMelancholy Accept>
+	CMsg2_5 <ifChatNPCMelancholy Accept>
 	Msg2_6 <This is your lucky day. I've got some info on a house just waiting to be robbed, if you're up to scout the place for me.>
-	CMsg2_6 <ifNPCCheerful Accept>
+	CMsg2_6 <ifChatNPCCheerful Accept>
 
 	Msg3 <That's your loss.>
 	Msg3_2 <Whatever.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <It sure beats working for a living.>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_4 <So, you're saying you don't have the guts?>
-	CMsg3_4 <ifNPCPassionate Accept>
+	CMsg3_4 <ifChatNPCPassionate Accept>
 	Msg3_6 <Well, maybe later, then.>
-	CMsg3_6 <ifNPCCheerful Accept>
+	CMsg3_6 <ifChatNPCCheerful Accept>
 
 	Msg4 <I've got word on a mansion whose owner has left for the day. There's security, of course, but you should be able to get around that. I hear they've got some nice treasures inside.>
 	Msg4_1 <There's a mansion whose owner has left for the day. The only ones there are the security robots, and we both know how smart they are. You go in and grab what you can find; that way I find out about their defenses before going there myself.>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <There's a mansion that's been abandoned by its wealthy owner. Should be able to find some good loot there.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <Some rich family has gone on vacation, leaving their home ripe for the picking. Should be easy to walk on in and grab whatever's been left lying around.>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <There's a mansion whose owner is currently out of town. Should be some good loot in there. The security system is pretty tough, but you can look at it as a test of your skills.>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <An elderly widow has just passed away, leaving no heirs. Her mansion is full of valuable loot. No sense in letting that go to waste, is there?>
-	CMsg4_5 <ifNPCMelancholy Accept>
+	CMsg4_5 <ifChatNPCMelancholy Accept>
 	Msg4_6 <A rich family has gone on vacation to Gaos Spinner. I wish we could go with them, but as long as we're stuck planetside, we might as well help ourselves to the treasures left in their unoccupied house, right?>
-	CMsg4_6 <ifNPCCheerful Accept>
+	CMsg4_6 <ifChatNPCCheerful Accept>
 	Msg4_7 <You know, most of the world's wealth is concentrated in the hands of a few. I figure we can do something ourselves to help rectify this imbalance. There's a mansion whose owner is gone for a few days... We can rob him blind.>
-	CMsg4_7 <ifNPCPragmatic Accept>
+	CMsg4_7 <ifChatNPCPragmatic Accept>
 
 	Msg5 <\ELEMENT 1 in \SCENE EScene 1 wants your help to rob a mansion.>
 
 	Msg6 <Here's where you can find the place. You go scout it out, then tell me all about it, and I'll go collect anything you missed.>
 	Msg6_1 <Here's where you can find the place. After you've located all the guard points I'll go in myself and get everything you missed.>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <Here's where you can find the mansion. Good luck.>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <See what you can find in there. If you don't find anything, at least you can tell me where the guard stations are.>
-	CMsg6_3 <ifNPCEasygoing Accept>
+	CMsg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <The game is afoot...>
-	CMsg6_4 <ifNPCPassionate Accept>
+	CMsg6_4 <ifChatNPCPassionate Accept>
 	Msg6_5 <Those security guards are gonna shoot to kill. You better not let them see you.>
-	CMsg6_5 <ifNPCMelancholy Accept>
+	CMsg6_5 <ifChatNPCMelancholy Accept>
 	Msg6_6 <I'm certain there's something incredibly valuable hidden in there. Let me know what you find!>
-	CMsg6_6 <ifNPCCheerful Accept>
+	CMsg6_6 <ifChatNPCCheerful Accept>
 	Msg6_8 <May the god of thieves guard your steps...>
-	CMsg6_8 <ifNPCSpiritual Accept>
+	CMsg6_8 <ifChatNPCSpiritual Accept>
 
 	Msg7 <You do whatever it is that you need. I'll be waiting around here someplace.>
 	Msg7_1 <When you're finished getting ready come back here and we'll start.>
diff --git a/Series/TS_LANCE_Martian_STORY.txt b/Series/TS_LANCE_Martian_STORY.txt
index 2d92208..b133930 100644
--- a/Series/TS_LANCE_Martian_STORY.txt
+++ b/Series/TS_LANCE_Martian_STORY.txt
@@ -23,7 +23,7 @@ Story
 	% Failing to aid the princess results in the end of this story.
 	GoRefuse <EndStory>
 	GoStartCombat <SavePos Dynamic 2 Threat S1 120 .nu1 .nu2 S= 2 1 DynaNPC N2 -1 ComposeD START .encstart PassVar 1 N2>
-	.nu1 <if= T1 0 if= L3 0 L= 3 1 Reputation 1 -8 Return>
+	.nu1 <if= T1 0 if= L3 0 L= 3 1 LoseRenown Return>
 	.nu2 <if= T2 0 if= L3 0 L= 3 1 XPV 100 Reputation 6 1 Reputation 1 1 Return>
 	nu1 <if= T1 0 if= S3 0 S= 2 0>
 	nu2 <if= T2 0 if= S2 1 if= S3 0 S= 3 1 S= 1 1 History 4 ifG SkRoll 11 15 else GoNU2NoSee Print 5>
diff --git a/Series/TS_PLOT_Fired.txt b/Series/TS_PLOT_Fired.txt
index a8838f2..6ed0a6e 100644
--- a/Series/TS_PLOT_Fired.txt
+++ b/Series/TS_PLOT_Fired.txt
@@ -15,28 +15,28 @@ Plot 0
 	Msg1 <\ELEMENT 2 @ \SCENE EScene 2 :// This is to inform you that \ELEMENT 1 shall no longer require your services. All privileges and responsibilities have been cancelled.>
 
 	Msg1_1 <\ELEMENT 2 @ \SCENE EScene 2 :// You will no longer be serving alongside \ELEMENT 1 . As of this minute your position is terminated.>
-	CMsg1_1 <ifNPCHeroic Accept>
+	CMsg1_1 <ifNPCHeroic E2 Accept>
 	Msg1_2 <\ELEMENT 2 @ \SCENE EScene 2 :// This is a great pleasure... You've been dismissed from \ELEMENT 1 , wangtta. You just didn't measure up.>
-	CMsg1_2 <ifNPCVillainous Accept>
+	CMsg1_2 <ifNPCVillainous E2 Accept>
 	Msg1_3 <\ELEMENT 2 @ \SCENE EScene 2 :// For acting against the laws of \ELEMENT 1 , you have been relieved of duty.>
-	CMsg1_3 <ifNPCLawful Accept>
+	CMsg1_3 <ifNPCLawful E2 Accept>
 	Msg1_4 <\ELEMENT 2 @ \SCENE EScene 2 :// You're not one of us anymore. Don't come around here.>
-	CMsg1_4 <ifNPCChaotic Accept>
+	CMsg1_4 <ifNPCChaotic E2 Accept>
 	Msg1_5 <\ELEMENT 2 @ \SCENE EScene 2 :// I don't know exactly what you did, but you've been dismissed from \ELEMENT 1 . We probably won't see each other much any more.>
-	CMsg1_5 <ifNPCSociable Accept>
+	CMsg1_5 <ifNPCSociable E2 Accept>
 	Msg1_6 <\ELEMENT 2 @ \SCENE EScene 2 :// You have been dismissed from \ELEMENT 1 . That is all.>
-	CMsg1_6 <ifNPCShy Accept>
+	CMsg1_6 <ifNPCShy E2 Accept>
 	Msg1_7 <\ELEMENT 2 @ \SCENE EScene 2 :// I regret to inform you that you've been barred from \ELEMENT 1 .>
-	CMsg1_7 <ifNPCEasygoing Accept>
+	CMsg1_7 <ifNPCEasygoing E2 Accept>
 	Msg1_8 <\ELEMENT 2 @ \SCENE EScene 2 :// You have made yourself an enemy of \ELEMENT 1 , and are henceforth banished from our presence.>
-	CMsg1_8 <ifNPCPassionate Accept>
+	CMsg1_8 <ifNPCPassionate E2 Accept>
 	Msg1_9 <\ELEMENT 2 @ \SCENE EScene 2 :// Hey, remember you said you'd like to find a new job? Well, now you can. You've been fired from \ELEMENT 1 .>
-	CMsg1_9 <ifNPCCheerful Accept>
+	CMsg1_9 <ifNPCCheerful E2 Accept>
 	Msg1_10 <\ELEMENT 2 @ \SCENE EScene 2 :// You betrayed us. You are no longer of \ELEMENT 1 ; don't ever speak to us again.>
-	CMsg1_10 <ifNPCMelancholy Accept>
+	CMsg1_10 <ifNPCMelancholy E2 Accept>
 	Msg1_11 <\ELEMENT 2 @ \SCENE EScene 2 :// In accordance with our contract, you have been dismissed from \ELEMENT 1 . All rank and privileges are revoked.>
-	CMsg1_11 <ifNPCPragmatic Accept>
+	CMsg1_11 <ifNPCPragmatic E2 Accept>
 	Msg1_12 <\ELEMENT 2 @ \SCENE EScene 2 :// You should move on... \ELEMENT 1 no longer requires your services.>
-	CMsg1_12 <ifNPCSpiritual Accept>
+	CMsg1_12 <ifNPCSpiritual E2 Accept>
 
 
diff --git a/Series/TS_PLOT_ThiefPromotion_Default.txt b/Series/TS_PLOT_ThiefPromotion_Default.txt
index 160158d..f487b58 100644
--- a/Series/TS_PLOT_ThiefPromotion_Default.txt
+++ b/Series/TS_PLOT_ThiefPromotion_Default.txt
@@ -72,17 +72,17 @@ sub
 
 	Msg2 <Good luck out there. It's a big job.>
 	Msg2_1 <Here's all the information you'll need to make it to the base. Once there, you're on your own.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <Here's the info. Good luck.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <With any luck there won't be a lot of guards on site... Yeah, like that's gonna happen...>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <This place is guarded to the hilt. It'll take all your skills if you hope to get in and out again.>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <Nobody really knows what they're working on at the lab, but that just makes stealing it all the more exciting!>
-	CMsg2_5 <ifNPCCheerful Accept>
+	CMsg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <There's a lot of guards so be careful. If you make it back alive, I certainly hope that whatever you find was worth the trouble...>
-	CMsg2_6 <ifNPCMelancholy Accept>
+	CMsg2_6 <ifChatNPCMelancholy Accept>
 	Msg2_7 <The guards might very well kill you. If so, I'll learn something about their defenses, for when I try to steal it myself...>
 	CMsg2_7 <ifG 10 React Accept>
 
@@ -91,17 +91,17 @@ sub
 
 	Msg4 <The army's been working on an experimental mecha system. I've found out where the test site is; if you can sneak in there, we can help ourselves to the newest in weapons technology.>
 	Msg4_1 <BioCorp has been working on something new. They aren't supposed to do weapon systems, but apparently they have been. I've discovered where the secret lab is. If you can sneak in there, you can sneak out with something very valuable.>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <There's a secret Kettel Industries testing lab where a new mecha is being developed. We have a good chance to steal whatever it is they're working on.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <A lab near town is working on some mecha project for the Navy. If you can slip in there, you can steal the latest in weapons technology. Sounds like it should be an easy job.>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <This is a real challenge... but you've proven that you're a skilled thief. An army base near town is home to an experimental new mecha. If you can slip past their guards, it could easily be yours.>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <Opportunities like this don't come by too often. RegEx corp is developing a new mecha weapon, and I've discovered where they're housing the prototypes! If you can sneak into their complex, all that new technology could be yours.>
-	CMsg4_5 <ifNPCCheerful Accept>
+	CMsg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <Kettel Industries has started a new mecha program. They've caused enough bloodshed with their terror weapons, selling them to any dead-zone tyrant who can meet the price. I say we steal the prototype, and put it to better use!>
-	CMsg4_6 <ifNPCMelancholy ifNPCHeroic Accept>
+	CMsg4_6 <ifChatNPCMelancholy ifChatNPCHeroic Accept>
 
 	Msg5 <Alright. Come back when you're ready and we can start the job then.>
 	Msg5_1 <You do whatever it is that you do. Better hurry, before anyone catches word of our plan.>
diff --git a/Series/TS_XRAN_a--F_Investigation.txt b/Series/TS_XRAN_a--F_Investigation.txt
index fabbd45..4346c83 100644
--- a/Series/TS_XRAN_a--F_Investigation.txt
+++ b/Series/TS_XRAN_a--F_Investigation.txt
@@ -49,34 +49,34 @@ sub
 	Msg151 <You were falsely implicated in the death of your parents.>
 	Msg102 <Ever hear the name \NARRATIVE 1 before? According to the files, he's the one who staged the hit on your parents. The Guardian's office in \ELEMENT 3 has started an investigation of their own. You may want to head there.>
 	Msg102_1 <Now that we have the data core, we should be able to connect all the big figures of the criminal underworld. \NARRATIVE 1 is the name of the person who murdered your parents; our surveillance indicates that \OPR N1 's hiding in \ELEMENT 3 .>
-	CMsg102_1 <ifNPCSociable Accept>
+	CMsg102_1 <ifChatNPCSociable Accept>
 	Msg102_2 <The assassin who killed your parents was \NARRATIVE 1 . The office in \ELEMENT 3 has been investigating \SPR N1 already; you may want to head there.>
-	CMsg102_2 <ifNPCShy Accept>
+	CMsg102_2 <ifChatNPCShy Accept>
 	Msg102_3 <That went well. We've learned that it was \NARRATIVE 1 who murdered your parents, though we don't yet know why or on whose orders. It's thought that \OPR N1 's currently hiding out in \ELEMENT 3 . The guardians are now looking for \SPR N1 .>
-	CMsg102_3 <ifNPCEasygoing Accept>
+	CMsg102_3 <ifChatNPCEasygoing Accept>
 	Msg102_4 <Their operation has been shut down perminantly! We've learned from the data core that \NARRATIVE 1 is the one who murdered your parents. It's thought that \OPR N1 's currently operating out of \ELEMENT 3 .>
-	CMsg102_4 <ifNPCPassionate Accept>
+	CMsg102_4 <ifChatNPCPassionate Accept>
 	Msg102_5 <The information from that database will piece together a lot of crimes. We've already confirmed that \NARRATIVE 1 is the one who killed your parents. The guardians in \ELEMENT 3 will be following up on this investigation.>
-	CMsg102_5 <ifNPCCheerful Accept>
+	CMsg102_5 <ifChatNPCCheerful Accept>
 	Msg102_6 <There wasn't as much in the database as we'd hoped. We did confirm that your parents were killed by \NARRATIVE 1 ... though the financing and reasons behind the killing remain elusive. The guardians in \ELEMENT 3 are investigating.>
-	CMsg102_6 <ifNPCMelancholy Accept>
+	CMsg102_6 <ifChatNPCMelancholy Accept>
 	Msg102_7 <Our suspicions have been confirmed... \NARRATIVE 1 is the person who carried out the murder of your parents. It's quite likely that \OPR N1 was hired by someone else. The guardian office in \ELEMENT 3 is doing their own investigation.>
 	CMsg102_7 <if= XRE NAV_XRECharacter Accept>
 
 	Msg152 <You discovered that \NARRATIVE 1 killed your parents.>
 	Msg103 <The hit against your parents seems to have been financed by \NARRATIVE 2 . I'll need more evidence before charges can be placed. The Guardian's office in \ELEMENT 3 has started an investigation of their own. You may want to head there.>
 	Msg103_1 <It was \NARRATIVE 2 that ordered the murder of your parents, we have more than enough evidence to prove that now. The guardian office in \ELEMENT 3 will be conducting a further investigation. If you want to follow the case you can go there.>
-	CMsg103_1 <ifNPCSociable Accept>
+	CMsg103_1 <ifChatNPCSociable Accept>
 	Msg103_2 <We've determined that \NARRATIVE 2 arranged for your parents to be killed. The guardian's office in \ELEMENT 3 will continue the investigation.>
-	CMsg103_2 <ifNPCShy Accept>
+	CMsg103_2 <ifChatNPCShy Accept>
 	Msg103_3 <From our initial exploration of the captured data core, it seems like \NARRATIVE 2 ordered the hit against your parents. The killer, whose identity we haven't confirmed yet, was working out of \ELEMENT 3 .>
-	CMsg103_3 <ifNPCEasygoing Accept>
+	CMsg103_3 <ifChatNPCEasygoing Accept>
 	Msg103_4 <We've examined the data. It was \NARRATIVE 2 that killed your parents! I'd say this counts as an act of war against the Federation... The Guardian's office in \ELEMENT 3 will be continuing the investigation.>
-	CMsg103_4 <ifNPCPassionate Accept>
+	CMsg103_4 <ifChatNPCPassionate Accept>
 	Msg103_5 <The computers we found contain lots of useful data... We've dealt a serious blow to organized crime in the Federation! It appears \NARRATIVE 2 ordered the hit on your parents. Our office in \ELEMENT 3 will continue to investigate.>
-	CMsg103_5 <ifNPCCheerful Accept>
+	CMsg103_5 <ifChatNPCCheerful Accept>
 	Msg103_6 <We've struck one small blow against organized crime, but I fear they'll recover far too quickly. It seems that \NARRATIVE 2 arranged the death of your parents. Our office in \ELEMENT 3 is doing an investigation of their own.>
-	CMsg103_6 <ifNPCMelancholy Accept>
+	CMsg103_6 <ifChatNPCMelancholy Accept>
 
 	Msg153 <You discovered that \NARRATIVE 2 arranged for your parents to be killed.>
 
@@ -97,142 +97,142 @@ sub
 
 	Msg1 <The mission was a failure, and now that the killers know we're after them we'll never recover that data.>
 	Msg1_1 <You didn't manage to defeat the guards... even worse, now the killers know we've been observing them. They'll move to another base, and probably wipe the data core just for good measure. There's nothing else we can do at this point.>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <You failed to defeat their guards... We won't get another chance. You blew it.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <Our forensics team didn't get a look at the data core. The assassins will move camp and it could take months to find them again, if ever. I guess you could say our mission was an unqualified failure.>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <You failed... And now that the assassin gang know we're onto them, we won't get another chance to recover their data core.>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <Well, at least you made it back alive... the mission was a complete failure though. The killers will move their base camp, and if they haven't already wiped the data core they will soon. We'll have to find another lead.>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <The mission was a complete failure... The assassins will move their base elsewhere, and if they haven't wiped the data core yet they will soon.>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 
 	Msg3 <The mission to assault the deadzone encampment and retrieve the evidence from their database is ready to go. Are you ready?>
 	Msg3_1 <I've been waiting for you to get back. We're all ready to start the mission. Your job will be to disable the guards, after which our ground troops can secure the data core. Are you ready?>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <Are you ready to start the mission yet?>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <We can start the operation any time you're ready.>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_4 <We should start the operation quickly, before the killers have a chance to move their base... Are you ready yet?>
-	CMsg3_4 <ifNPCPassionate Accept>
+	CMsg3_4 <ifChatNPCPassionate Accept>
 	Msg3_5 <Once we recover the data core from the assassin's base, we should have lots of information on the criminal networks of the Federated Territories. Are you ready to start the mission yet?>
-	CMsg3_5 <ifNPCCheerful Accept>
+	CMsg3_5 <ifChatNPCCheerful Accept>
 	Msg3_6 <Those killers have claimed enough innocent lives... it's time we learned who they're working for, and why. Are you ready to start?>
-	CMsg3_6 <ifNPCMelancholy Accept>
+	CMsg3_6 <ifChatNPCMelancholy Accept>
 
 	Msg4 <Hello. I wanted to speak with you, with regard to the death of your parents... We believe that they were murdered. At the moment we are attempting to obtain evidence which could confirm that.>
 	Msg4_1 <Hello, \PC . I'm sure this is a difficult time for you... I've been helping to investigate your parent's death. Right now things look suspicious but we'll need more evidence before we can charge anyone in the case.>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <Ah, \PC . I have been investigating the death of your parents. It is believed they were murdered... More information is needed before I can say for certain.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <I wanted to speak with you. I've been investigating the death of your parents. All I can say is that they may or may not have been murdered... I'm going to need more evidence before I can say for certain.>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <\PC , I have something shocking to tell you... I fear that your parents were murdered! The guardians don't yet have enough evidence to confirm this but I'm working on the case myself.>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <Hello, \PC . I'm sorry but I need to ask you some questions about your parents. We've been investigating their deaths, and it looks like they could have been murdered... though we're going to need more evidence before we can say for sure.>
-	CMsg4_5 <ifNPCCheerful Accept>
+	CMsg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <I've been investigating the death of your parents. There have been several other recent deaths which follow the same basic patter. I fear they may have been the victims of an assassin gang, but more evidence is needed before we can be certain.>
-	CMsg4_6 <ifNPCMelancholy Accept>
+	CMsg4_6 <ifChatNPCMelancholy Accept>
 
 	Msg5 <Come back here once you've eliminated the guardian mecha. Our forensic cryptologists will then be able to scour their computer systems for the contract.>
 	Msg5_1 <Take out all of the guardian mecha... Our forensics team has delicate equipment that can't be endangered by a mecha firefight. Once the area is secure we can take the data core and sweep for additional evidence.>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <Eliminate the guardian mecha. Then, our lab boys can do their job.>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <Just take care of the mecha, we'll take care of securing the evidence.>
-	CMsg5_3 <ifNPCEasygoing Accept>
+	CMsg5_3 <ifChatNPCEasygoing Accept>
 	Msg5_4 <Destroy all of their sentries. We can't afford for the mobile lab or the data core to be damaged in a firefight.>
-	CMsg5_4 <ifNPCPassionate Accept>
+	CMsg5_4 <ifChatNPCPassionate Accept>
 	Msg5_5 <Eliminate the guardian mecha. Once we've captured the data core we'll be able to answer a whole lot of questions, about this case and many others.>
-	CMsg5_5 <ifNPCCheerful Accept>
+	CMsg5_5 <ifChatNPCCheerful Accept>
 	Msg5_6 <Destroy the guards, and make sure that nothing goes wrong. We only have one chance at this and if you mess up we'll never get another one.>
-	CMsg5_6 <ifNPCMelancholy Accept>
+	CMsg5_6 <ifChatNPCMelancholy Accept>
 
 	Msg6 <Make sure your equipment is in perfect working order, then we can start the mission.>
 	Msg6_1 <You'll want to make sure that your gear is in top shape before we head out. Otherwise you might not be able to complete the mission, and as I think I mentioned we're only going to have one shot at this.>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <Come back when you're ready to start.>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <Sure, just come back when you're ready to head out.>
-	CMsg6_3 <ifNPCEasygoing Accept>
+	CMsg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <This is going to be a difficult battle... Make sure you're ready before we start.>
-	CMsg6_4 <ifNPCPassionate Accept>
+	CMsg6_4 <ifChatNPCPassionate Accept>
 	Msg6_6 <We'll only have one chance here, so you better be ready when we begin.>
-	CMsg6_6 <ifNPCMelancholy Accept>
+	CMsg6_6 <ifChatNPCMelancholy Accept>
 
 	Msg7 <The guards have about \VAL Threat S103 150 points worth of mecha guarding their computer center. If you don't eliminate them all and capture the base, they're just going to move camp and we may never find them again.>
 	Msg7_1 <As near as our surveillance can tell, there's always \VAL Threat S103 150 points worth of mecha guarding the base. You'll have to take down all of that before our lab truck can even get close.>
-	CMsg7_1 <ifNPCSociable Accept>
+	CMsg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <It's believed they have \VAL Threat S103 150 tactical threat points worth of mecha.>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <They have around \VAL Threat S103 150 points of mecha. All of that has to be destroyed so that we can capture the base, and the computers inside.>
-	CMsg7_3 <ifNPCEasygoing Accept>
+	CMsg7_3 <ifChatNPCEasygoing Accept>
 	Msg7_4 <At all times, \VAL Threat S103 150 threat points worth of military grade hardware are guarding the base. All of this must be destroyed so that we can move in.>
-	CMsg7_4 <ifNPCPassionate Accept>
+	CMsg7_4 <ifChatNPCPassionate Accept>
 	Msg7_5 <So long as our intel is right, they've only got \VAL Threat S103 145 points worth of mecha guarding their base. It should be no trouble to get through.>
-	CMsg7_5 <ifNPCCheerful Accept>
+	CMsg7_5 <ifChatNPCCheerful Accept>
 	Msg7_6 <Their base is defended by \VAL Threat S103 165 points worth of hardware, and their pilots are all combat veterans. It's likey to be a difficult fight and you're going to have to take them all out in one go.>
-	CMsg7_6 <ifNPCMelancholy Accept>
+	CMsg7_6 <ifChatNPCMelancholy Accept>
 
 	Msg8 <Well, to prove that, I'm going to need some data. You're an adventurer, right? Evidence suggests there was a contract on your parents lives. I could use your help to recover the details.>
 	Msg8_1 <You're a cavalier, right? I heard about your adventures. Maybe you can help me gather the proof we'll need that it was, in fact, murder.>
-	CMsg8_1 <ifNPCSociable Accept>
+	CMsg8_1 <ifChatNPCSociable Accept>
 	Msg8_2 <In order to prove that we'll need data. Maybe you can help me to get that.>
-	CMsg8_2 <ifNPCShy Accept>
+	CMsg8_2 <ifChatNPCShy Accept>
 	Msg8_3 <If you want to get involved, I could use some assistance. In order to prove that it was murder we're going to need some data. You can help me to get that.>
-	CMsg8_3 <ifNPCEasygoing Accept>
+	CMsg8_3 <ifChatNPCEasygoing Accept>
 	Msg8_4 <You know that and I know that, but in order for it to stand up in court we're going to need some data. If you're interested in the truth you might be able to help me. You're a cavalier, right?>
-	CMsg8_4 <ifNPCPassionate Accept>
+	CMsg8_4 <ifChatNPCPassionate Accept>
 	Msg8_5 <We don't know that for sure... but, yeah, I think you're right. You're a mecha pilot, aren't you? That could come in handy. Evidence suggests there was a contract on your parents lives. I could use your help to recover the details.>
-	CMsg8_5 <ifNPCCheerful Accept>
+	CMsg8_5 <ifChatNPCCheerful Accept>
 	Msg8_6 <It's one thing to know that, and quite another to prove it. I have an offer for you... revenge against those who killed your parents, and help for us to find out who hired them.>
-	CMsg8_6 <ifNPCMelancholy Accept>
+	CMsg8_6 <ifChatNPCMelancholy Accept>
 
 	Msg9 <\ELEMENT 2 in \SCENE EScene 2 wants you to help investigate the death of your parents.>
 	Msg10 <A contract on their lives, specifically, and the identity of whoever paid their killers. This information likely resides in an underworld data center in the dead zone, but I'm going to need a pilot to help recover it.>
 	Msg10_1 <We need something tying their deaths to the other murders in this case file. There's probably sufficient evidence in an underworld data center that we've been watching, but getting inside is going to be tough. I could use your help.>
-	CMsg10_1 <ifNPCSociable Accept>
+	CMsg10_1 <ifChatNPCSociable Accept>
 	Msg10_2 <What I really want is the identity of whoever ordered these killings. You're a pilot, right? Maybe you can help me to get that.>
-	CMsg10_2 <ifNPCShy Accept>
+	CMsg10_2 <ifChatNPCShy Accept>
 	Msg10_3 <I need something connecting the death of your parents to these other murders... And I think I know where I can find that, if you're willing to help me.>
-	CMsg10_3 <ifNPCEasygoing Accept>
+	CMsg10_3 <ifChatNPCEasygoing Accept>
 	Msg10_4 <We need information about who financed the murder, and why... The thugs who carried it out are small fry. I want the head of the person who's really behind this. If you're willing to help me, I think I know where we can get this information.>
-	CMsg10_4 <ifNPCPassionate Accept>
+	CMsg10_4 <ifChatNPCPassionate Accept>
 	Msg10_5 <There's a mafia computer center in the dead-zone that probably holds all the information we need. You're an adventurer, right? If you're half decent as a mecha pilot I could use your help.>
-	CMsg10_5 <ifNPCCheerful Accept>
+	CMsg10_5 <ifChatNPCCheerful Accept>
 	Msg10_6 <Finding enough evidence might be very difficuly, but I do have a singe lead... There's a mafia datacenter hidden in the dead-zone. If we could get access to their machines we might be able to learn something. I could use your help with this.>
-	CMsg10_6 <ifNPCMelancholy Accept>
+	CMsg10_6 <ifChatNPCMelancholy Accept>
 
 	Msg11 <The data bank where we can find the contract is out in the dead zone, protected by ravager mecha. I need you to disable the guards so our lab boys can recover the evidence. You better do well the first time, since we only get one chance.>
 	Msg11_1 <We'll have to capture the mafia computer base and analyze what's there. Your job will be to disable the bandit mecha that guard it, so our forensics team can move in. If we fail they'll move camp and we won't get a second chance.>
-	CMsg11_1 <ifNPCSociable Accept>
+	CMsg11_1 <ifChatNPCSociable Accept>
 	Msg11_2 <The assassin cell maintains a data center in the dead zone. Your job is to disable their mecha. If we don't capture it on the first try we aren't going to get another chance.>
-	CMsg11_2 <ifNPCShy Accept>
+	CMsg11_2 <ifChatNPCShy Accept>
 	Msg11_3 <Here's the deal: it's believed that the assassins have a computer base in the dead zone. We know where that is, but we need to disable the mecha guards before our fornsics team can move in. That's your job.>
-	CMsg11_3 <ifNPCEasygoing Accept>
+	CMsg11_3 <ifChatNPCEasygoing Accept>
 	Msg11_4 <Our intel department has located a mafia data center hidden in the dead-zone. Your job will be to destroy the bandits guarding it, so our crypto-forensics team can move in. Better do this right the first time otherwise they'll just move shop.>
-	CMsg11_4 <ifNPCPassionate Accept>
+	CMsg11_4 <ifChatNPCPassionate Accept>
 	Msg11_5 <We had a lucky break, and discovered the exact location of an underworld data center. I want you to engage the ravagers who are guarding it... Once their mecha are out of the way our forensics team can move in.>
-	CMsg11_5 <ifNPCCheerful Accept>
+	CMsg11_5 <ifChatNPCCheerful Accept>
 	Msg11_6 <This will be a risky mission. We have to capture a major criminal installation in the dead-zone. If we don't do this quickly, they'll just move it and we'll never find them again. Your task is to eliminate their mecha. It could be dangerous.>
-	CMsg11_6 <ifNPCMelancholy Accept>
+	CMsg11_6 <ifChatNPCMelancholy Accept>
 
 	Msg12 <We don't have enough manpower to go around. Without outside assistance, this investigation might be left for weeks... The evidence could be destroyed by then. Of course you're under no obligation to help but things would be quicker if you did.>
 	Msg12_1 <Perhaps I heard wrong about you. I thought you were an adventurer? This is a chance to find the people who killed your family, and you're refusing it? What will people say about that...?>
-	CMsg12_1 <ifNPCSociable ifG PCRep 6 0 Accept>
+	CMsg12_1 <ifChatNPCSociable ifG PCRep 6 0 Accept>
 	Msg12_2 <If I had all the manpower I needed I wouldn't be asking for help. If you're concerned about solving this case, then helping me yourself will make things go faster.>
-	CMsg12_2 <ifNPCShy Accept>
+	CMsg12_2 <ifChatNPCShy Accept>
 	Msg12_3 <Well, if you want this investigation to languish until the brass gets around to approving my mecha requisition, you don't have to help. Of course that could be months from now...>
-	CMsg12_3 <ifNPCEasygoing Accept>
+	CMsg12_3 <ifChatNPCEasygoing Accept>
 	Msg12_4 <Your parents are dead, and you don't care enough to do anything about it!? I thought you would have jumped at the opportunity to help...>
-	CMsg12_4 <ifNPCPassionate Accept>
+	CMsg12_4 <ifChatNPCPassionate Accept>
 	Msg12_5 <The big problem is that we don't have enough manpower or equipment to go around. We especially don't have enough mecha... Personally, I blame "Section Two" for losing too many robots in the line of duty.>
-	CMsg12_5 <ifNPCCheerful Accept>
+	CMsg12_5 <ifChatNPCCheerful Accept>
 	Msg12_6 <I expected you to appreciate my offer... This is, after all, a chance to get revenge against those who killed your parents.>
-	CMsg12_6 <ifNPCMelancholy Accept>
+	CMsg12_6 <ifChatNPCMelancholy Accept>
 
 
 	Prompt1 <Let's go!>
diff --git a/Series/TS_XRAN_a-AU_Diary.txt b/Series/TS_XRAN_a-AU_Diary.txt
index 253c6e1..6ad9321 100644
--- a/Series/TS_XRAN_a-AU_Diary.txt
+++ b/Series/TS_XRAN_a-AU_Diary.txt
@@ -47,70 +47,70 @@ sub
 	Msg1_1 <I love searching through abandoned buildings. Time causes all things to rust and decay... It's interesting to see how a once-new home can fall to bits over the years. Sometimes I even find valuable things.>
 	CMsg1_1 <ifG 0 NPCRep E3 5 Accept>
 	Msg1_11 <I hope someday to discover something valuable while exploring the ruins... Usually, though, all I turn up is junk. Lately I've been searching through some abandoned buildings near town. It's a bit dangerous, but will prepare me for later.>
-	CMsg1_11 <ifNPCSociable Accept>
+	CMsg1_11 <ifChatNPCSociable Accept>
 	Msg1_12 <Yes, I've been exploring abandoned buildings. No, I haven't found anything valuable... yet.>
-	CMsg1_12 <ifNPCShy Accept>
+	CMsg1_12 <ifChatNPCShy Accept>
 	Msg1_13 <I'd like to mount an expedition to the PreZero ruins of the Trans-Siberian Megafortress... but as that's far away and dangerous, I content myself with exploring abandoned buildings around town.>
-	CMsg1_13 <ifNPCEasygoing Accept>
+	CMsg1_13 <ifChatNPCEasygoing Accept>
 	Msg1_14 <I'm never content to just read about things in books... I want to be the first to make exciting discoveries! That's why I've been exploring abandoned buildings near town. It's preparation for an expedition to the ruins.>
-	CMsg1_14 <ifNPCPassionate Accept>
+	CMsg1_14 <ifChatNPCPassionate Accept>
 	Msg1_15 <You can find all kinds of interesting things if you search hard enough. I enjoy going into abandoned places to see what's been left behind.>
-	CMsg1_15 <ifNPCCheerful Accept>
+	CMsg1_15 <ifChatNPCCheerful Accept>
 	Msg1_16 <Archaeology is a fascinating subject. I hope someday to research an actual prezero habitation... For right now, I'll have to be content with whatever ruins I can find near town.>
-	CMsg1_16 <ifNPCPragmatic Accept>
+	CMsg1_16 <ifChatNPCPragmatic Accept>
 	Msg1_17 <There are ancient mystical secrets to be found in the forgotten places... lost technology, crystal skulls, and other miraculous things. I often enjoy meditating in the ruins near town.>
-	CMsg1_17 <ifNPCSpiritual Accept>
+	CMsg1_17 <ifChatNPCSpiritual Accept>
 
 	Msg2 <Then you should know that outside of town is an old apartment complex. You can find it as you enter the city. I found a couple of good things there but I'm certain there's even more left to be discovered.>
 	Msg2_1 <You too? We should swap stories later. Well, the place I've been exploring lately is an old apartment complex. It's easy to find on the way into town. I'm sure there are interesting things on the upper floors.>
 	CMsg2_1 <ifG NPCRep E3 3 0 Accept>
 	Msg2_12 <Is that so? Well, if you look around, I'm certain you'll find something interesting.>
-	CMsg2_12 <ifNPCShy Accept>
+	CMsg2_12 <ifChatNPCShy Accept>
 	Msg2_13 <There's an abandoned apartment complex on the way into town. I started searching it, but I doubt there's anything of intellectual value there. If you're just interested in loot you might be able to find something on the upper floor, though.>
-	CMsg2_13 <ifNPCEasygoing Accept>
+	CMsg2_13 <ifChatNPCEasygoing Accept>
 	Msg2_14 <There's an old apartment complex on the road to town. Something bad happened there many years ago... I'm hoping my studies can shed light on the tragedy.>
-	CMsg2_14 <ifNPCPassionate Accept>
+	CMsg2_14 <ifChatNPCPassionate Accept>
 	Msg2_15 <There's a great abandoned building near here. As you're coming into town from the highway you go right past it. It's not very old so there won't be anything valuable there, but it is a fun place to look around.>
-	CMsg2_15 <ifNPCCheerful Accept>
+	CMsg2_15 <ifChatNPCCheerful Accept>
 	Msg2_16 <Here, let me show you the data I've acquired. There's an old apartment building on the outskirts of town. It looks like something bad happened there, but so far I haven't been able to determine what.>
-	CMsg2_16 <ifNPCPragmatic Accept>
+	CMsg2_16 <ifChatNPCPragmatic Accept>
 	Msg2_17 <There is a derelect building on the way into town. It contains nothing that I desire, but maybe it is here you can find the answers you seek?>
-	CMsg2_17 <ifNPCSpiritual Accept>
+	CMsg2_17 <ifChatNPCSpiritual Accept>
 
 
 	Msg3 <\ELEMENT 3 said there's an abandoned building outside of \ELEMENT 1 .>
 	Msg4 <As a matter of fact I have. Just recently I came across an old book... I can let you have it for the low price of $ \VAL V1 , if you're into that sort of thing.>
 	Msg4_11 <Well, I found this old diary in the abandoned building I'm exploring. It's interesting reading but nothing of intellectual note. If you want, I can let you have it for $ \VAL V1 .>
-	CMsg4_11 <ifNPCSociable Accept>
+	CMsg4_11 <ifChatNPCSociable Accept>
 	Msg4_12 <I found some old books. If you want one, I can sell it for $ \VAL V1 .>
-	CMsg4_12 <ifNPCShy Accept>
+	CMsg4_12 <ifChatNPCShy Accept>
 	Msg4_13 <I've found plenty of stuff... most of it worthless, unfortunately. I have a book that was acquired from my latest expedition. If you're interested, I can give it to you for $ \VAL V1 .>
-	CMsg4_13 <ifNPCEasygoing Accept>
+	CMsg4_13 <ifChatNPCEasygoing Accept>
 	Msg4_14 <Have I ever! Yes, I have so many artifacts I don't know what to do with them. My latest find is an old handwritten manuscript. If you were interested in owning it, I could give it to you for a mere $ \VAL V1 .>
-	CMsg4_14 <ifNPCPassionate Accept>
+	CMsg4_14 <ifChatNPCPassionate Accept>
 	Msg4_15 <Why, are you interested in artifacts? That's great! I have an old handwritten manuscript that can be yours for the low price of $ \VAL V1 . How about it?>
-	CMsg4_15 <ifNPCCheerful Accept>
+	CMsg4_15 <ifChatNPCCheerful Accept>
 	Msg4_16 <Just an old book... I've OCR'd the data already. If you want to look at the original, I can let you have it for $ \VAL V1 .>
-	CMsg4_16 <ifNPCPragmatic Accept>
+	CMsg4_16 <ifChatNPCPragmatic Accept>
 	Msg4_17 <I've discovered an old book. I haven't read it yet... I feel it was private. If you'd like to fund my expeditions, I can sell it to you for $ \VAL V1 .>
-	CMsg4_17 <ifNPCSpiritual Accept>
+	CMsg4_17 <ifChatNPCSpiritual Accept>
 
 	Msg5 <\ELEMENT 3 in \ELEMENT 1 offered to sell you a book for $ \VAL V1 .>
 	Msg6 <Here you go. It seems to be a diary or something. If you're interested in the past, I'm certain that this can help your studies.>
 	Msg6_11 <The juicy parts come near the end. I'm certain that if you investigate this book thoroughly you'll find something of interest.>
-	CMsg6_11 <ifNPCSociable Accept>
+	CMsg6_11 <ifChatNPCSociable Accept>
 	Msg6_12 <Here's the book.>
-	CMsg6_12 <ifNPCShy Accept>
+	CMsg6_12 <ifChatNPCShy Accept>
 	Msg6_13 <Thanks. I hope that book is worth the price.>
-	CMsg6_13 <ifNPCEasygoing Accept>
+	CMsg6_13 <ifChatNPCEasygoing Accept>
 	Msg6_14 <Thanks. I'm certain you'll find that the book was well worth the price.>
-	CMsg6_14 <ifNPCPassionate Accept>
+	CMsg6_14 <ifChatNPCPassionate Accept>
 	Msg6_15 <It's been a pleasure doing business with you.>
-	CMsg6_15 <ifNPCCheerful Accept>
+	CMsg6_15 <ifChatNPCCheerful Accept>
 	Msg6_16 <Here it is. If you thoroughly investigate the text I'm sure you can learn something that I've missed.>
-	CMsg6_16 <ifNPCPragmatic Accept>
+	CMsg6_16 <ifChatNPCPragmatic Accept>
 	Msg6_17 <May this book bring you the enlightenment you seek.>
-	CMsg6_17 <ifNPCSpiritual Accept>
+	CMsg6_17 <ifChatNPCSpiritual Accept>
 
 	Msg7 <Any money I receive will go into funding my next expedition.>
 
diff --git a/Series/TS_XRAN_a-FF_SisterMoney.txt b/Series/TS_XRAN_a-FF_SisterMoney.txt
index 953b160..fa376ed 100644
--- a/Series/TS_XRAN_a-FF_SisterMoney.txt
+++ b/Series/TS_XRAN_a-FF_SisterMoney.txt
@@ -41,120 +41,120 @@ sub
 
 	Msg1 <You've got to help me! Mom and Dad left some money for us when they went away, but it wasn't much. There's not much left. I'll have to spend the last of it on either food or school. Please, I haven't called for help before...>
 	Msg1_1 <I've got a big problem that I wanted to talk with you about. I'm running out of money... I need to pay for tuition and rent, and I already have two part-time jobs. If Mom and Dad were still here I'd go to them, but...>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <You know I don't call for help often, but I don't know what else to do... I'm running out of money. I need to pay for tuition at school, plus food and everything else...>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <I need some money. I've got to pay tuition and rent for next semester but I'm flat broke. I figured you'll have no trouble giving me a tiny loan... I can pay you back in a few years after I get a job!>
-	CMsg1_3 <ifNPCCheerful Accept>
+	CMsg1_3 <ifChatNPCCheerful Accept>
 	Msg1_4 <\PC , I have a serious problem... Ever since our parents died I've had trouble adjusting. Now, it's time for me to pay tuition at school. I don't have the money... I don't like calling to you for help but I don't know what else I can do.>
-	CMsg1_4 <ifNPCMelancholy Accept>
+	CMsg1_4 <ifChatNPCMelancholy Accept>
 
 	Msg2 <I still need $ \VAL V3 to pay for my school and living expenses.>
 	Msg2_1 <The bank called today. They said if I don't get my rent to them in a week I'll be living on the street. Do you have the money I asked you for yet?>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <Do you have the money I need yet?>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <Hey \PC , it's good to see you. You wouldn't happen to have a present for me, would you?>
-	CMsg2_3 <ifNPCCheerful Accept>
+	CMsg2_3 <ifChatNPCCheerful Accept>
 	Msg2_4 <I wish our parents were still here... I miss them so much. And now I'm worried about this tuition problem...>
-	CMsg2_4 <ifNPCMelancholy Accept>
+	CMsg2_4 <ifChatNPCMelancholy Accept>
 
 	Msg3 <I need $ \VAl V3 to cover everything, and even with that I'll be living on ramen for a while.>
 	Msg3_1 <I've done a bit of thinking about this, and I think $ \VAl V3 is about as much as I'm going to need for one semester. That includes tuition, books, food... it doesn't include fun or emergencies. I can write everything down if you'd like.>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <I need $ \VAl V3 . I think that's the least amount of money that'll still allow me to live.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <It's not a lot, just around $ \VAl V3 . I'm sure you'll have no problem getting that kind of money. Don't worry, I'm not going to waste any money on partying or anything like that.>
-	CMsg3_3 <ifNPCCheerful Accept>
+	CMsg3_3 <ifChatNPCCheerful Accept>
 	Msg3_4 <I need a lot... $ \VAl V3 . I don't know how you're going to raise that kind of money. I feel sorry for being such a burden.>
-	CMsg3_4 <ifNPCMelancholy Accept>
+	CMsg3_4 <ifChatNPCMelancholy Accept>
 	Msg3_5 <I think $ \VAl V3 should cover all my expenses. Here, I've prepared a budget plan. As you see, most of the cash goes towards tuition and rent. I've cut the food budget as low as possible, and there's no entertainment budget at all.>
-	CMsg3_5 <ifNPCPragmatic Accept>
+	CMsg3_5 <ifChatNPCPragmatic Accept>
 
 	Msg4 <You're mean! You're the only person I have in the world to turn to...>
 	Msg4_1 <I'd help you out if you needed it! Someday you might need my help! Come on, you've got to help me...>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <So that's how it is...>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <Aww, why do you have to be so mean? If you don't help me then I'll keep bugging you and bugging you until you do!>
-	CMsg4_3 <ifNPCCheerful Accept>
+	CMsg4_3 <ifChatNPCCheerful Accept>
 	Msg4_4 <I see. So, I have no-one in the world I can depend on... I truly am alone...>
-	CMsg4_4 <ifNPCMelancholy Accept>
+	CMsg4_4 <ifChatNPCMelancholy Accept>
 
 	Msg5 <You're the greatest! It'll take $ \VAL V3 to cover rent, food, and tuition until the end of the semester.>
 	Msg5_1 <I knew I could count on you. I'm going to need around $ \VAL V3 to cover food, rent, and tuition. That doesn't include any extras, either...>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <Thanks. It'll take $ \VAL V3 to cover all my expenses until the end of term.>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <Great! It's going to cost $ \VAL V3 for all my basic expenses... That doesn't include things like movies or parties or even eating meat.>
-	CMsg5_3 <ifNPCCheerful Accept>
+	CMsg5_3 <ifChatNPCCheerful Accept>
 	Msg5_4 <I only wish I wasn't such a burden on you... I'll need $ \VAL V3 for tuition, rent, and food until the end of the semester.>
-	CMsg5_4 <ifNPCMelancholy Accept>
+	CMsg5_4 <ifChatNPCMelancholy Accept>
 
 	Msg6 <Please remember while you're driving your robot that your poor little sister is cold and hungry.>
 	Msg6_1 <When you're out there adventuring and having a good time and eating real food, don't forget your poor little sister who's stuck here wondering when her ramen supply is going to run out.>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <Let me know when you've got the money.>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <I'm sure this will be no trouble for you.>
-	CMsg6_3 <ifNPCCheerful Accept>
+	CMsg6_3 <ifChatNPCCheerful Accept>
 	Msg6_4 <I'll try to hold things together are well as I can, until you get the money.>
-	CMsg6_4 <ifNPCMelancholy Accept>
+	CMsg6_4 <ifChatNPCMelancholy Accept>
 	Msg6_5 <What's the matter, \FACTION PCFac doesn't pay you enough?>
 	CMsg6_5 <if# PCFac 0 Accept>
 
 	Msg7 <You're still mean.>
 	Msg7_1 <That which you give always returns to you tenfold...>
-	CMsg7_1 <ifNPCSpiritual Accept>
+	CMsg7_1 <ifChatNPCSpiritual Accept>
 	Msg7_2 <Whatever.>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <I'll assume that you're just being a jerk, as usual.>
-	CMsg7_3 <ifNPCCheerful Accept>
+	CMsg7_3 <ifChatNPCCheerful Accept>
 	Msg7_4 <I should have known better than to ask you for help...>
-	CMsg7_4 <ifNPCMelancholy Accept>
+	CMsg7_4 <ifChatNPCMelancholy Accept>
 
 	Msg8 <Please do that.>
 	Msg8_1 <That'd be great. Keep me informed of how it's going.>
-	CMsg8_1 <ifNPCSociable Accept>
+	CMsg8_1 <ifChatNPCSociable Accept>
 	Msg8_2 <Please do.>
-	CMsg8_2 <ifNPCShy Accept>
+	CMsg8_2 <ifChatNPCShy Accept>
 	Msg8_3 <It would be greatly appreciated if you could!>
-	CMsg8_3 <ifNPCCheerful Accept>
+	CMsg8_3 <ifChatNPCCheerful Accept>
 	Msg8_4 <Please hurry. I don't want to live on the street.>
-	CMsg8_4 <ifNPCMelancholy Accept>
+	CMsg8_4 <ifChatNPCMelancholy Accept>
 
 	Msg9 <Your sister \ELEMENT 2 in \SCENE EScene 2 needs $ \VAL V3 to pay for living expenses.>
 	Msg10 <I can't get a job because I haven't graduated school! I can't graduate school unless I can pay for tuition! Please help me out here...>
 	Msg10_1 <I'm in school so I can get a decent job! If I can't graduate, I'll be relegated to fast food service for the rest of my life! Even worse, I may have to get a job at RegEx corporation...>
-	CMsg10_1 <ifNPCSociable Accept>
+	CMsg10_1 <ifChatNPCSociable Accept>
 	Msg10_2 <I already have a part time job, but it can't pay bills like this.>
-	CMsg10_2 <ifNPCShy Accept>
+	CMsg10_2 <ifChatNPCShy Accept>
 	Msg10_3 <Um, excuse me? I already have a part time job... I can't work any more and continue to study. We don't live on Mars, you know. There are child labor laws in place here.>
-	CMsg10_3 <ifNPCCheerful Accept>
+	CMsg10_3 <ifChatNPCCheerful Accept>
 	Msg10_4 <I can't work any more than I'm doing already... I'm at the end of my rope. I have two part time jobs, and that's not enough to keep up with all the bills...>
-	CMsg10_4 <ifNPCMelancholy Accept>
+	CMsg10_4 <ifChatNPCMelancholy Accept>
 	Msg10_5 <I suppose I could open an pornographic netsite to pay my bills, but I don't think our parents would have approved... Coming to you for the money is the only thing I can do that doesn't involve breaking the law or public humiliation.>
-	CMsg10_5 <ifNPCChaotic ifNPCSociable Accept>
+	CMsg10_5 <ifChatNPCChaotic ifChatNPCSociable Accept>
 
 	Msg11 <Aieee... being out in the world sure hasn't helped you to grow up any. I need $ \VAL V3 to pay for my school and living expenses.>
 	Msg11_1 <Don't joke at a time like this! My nerves can't handle it... Look, I'm going to need $ \VAL V3 sometime within the next couple of weeks. I know that's a lot but I don't have anyone else to turn to.>
-	CMsg11_1 <ifNPCSociable Accept>
+	CMsg11_1 <ifChatNPCSociable Accept>
 	Msg11_2 <Oh. I figure I'm going to need $ \VAL V3 for the upcoming semester. That covers food, rent, and tuition, but not much else.>
-	CMsg11_2 <ifNPCShy Accept>
+	CMsg11_2 <ifChatNPCShy Accept>
 	Msg11_3 <Ah, I see, it was one of those newfangled jokes that aren't funny. You're cutting edge, \PC . Anyhow, I'm going to need $ \VAL V3 for rent and tuition. Think you can get that much?>
-	CMsg11_3 <ifNPCCheerful Accept>
+	CMsg11_3 <ifChatNPCCheerful Accept>
 	Msg11_4 <That wasn't funny. In any case, I'm going to need $ \VAL V3 for tuition and lodging.>
-	CMsg11_4 <ifNPCMelancholy Accept>
+	CMsg11_4 <ifChatNPCMelancholy Accept>
 
 	Msg12 <You wouldn't dare say that if our parents were still alive...>
 	Msg12_1 <If you act like this to me now, just wait and see if I'll help you when you need something. It might not be anytime soon but you will need my help with something someday.>
-	CMsg12_1 <ifNPCSociable Accept>
+	CMsg12_1 <ifChatNPCSociable Accept>
 	Msg12_2 <Fine, whatever.>
-	CMsg12_2 <ifNPCShy Accept>
+	CMsg12_2 <ifChatNPCShy Accept>
 	Msg12_3 <You're not being funny, \PC ... this is serious.>
-	CMsg12_3 <ifNPCCheerful Accept>
+	CMsg12_3 <ifChatNPCCheerful Accept>
 	Msg12_4 <Then I guess I have no hope left...>
-	CMsg12_4 <ifNPCMelancholy Accept>
+	CMsg12_4 <ifChatNPCMelancholy Accept>
 
 	Prompt1 <How much do you need?>
 	Prompt1_1 <How much money are you talking about?>
@@ -185,49 +185,49 @@ sub
 
 	Msg101 <Thank you! Oh, this should cover just about everything... You really stick by, y'know? If Mom and Dad were here they'd be proud. I miss them so much sometimes...>
 	Msg101_1 <I know what a sacrifice it was to give me this much money, and I promise if you ever need help I'll do my best. That's what Mom and Dad would have wanted. It seems so empty without them... I still miss them so much.>
-	CMsg101_1 <ifNPCSociable Accept>
+	CMsg101_1 <ifChatNPCSociable Accept>
 	Msg101_2 <Thanks for sticking by me, \PC . It means a lot. I only wish our parents were still around, so they could see me graduate...>
-	CMsg101_2 <ifNPCShy Accept>
+	CMsg101_2 <ifChatNPCShy Accept>
 	Msg101_3 <It's such a relief to not have to worry about this anymore! If Mom and Dad were here they'd be proud of you. I really miss them...>
-	CMsg101_3 <ifNPCCheerful Accept>
+	CMsg101_3 <ifChatNPCCheerful Accept>
 	Msg101_4 <Thank you! Life has been really hard since losing our parents... I'm glad that I still have you, but sometimes the pain from missing Mom and Dad is unbearable.>
-	CMsg101_4 <ifNPCMelancholy Accept>
+	CMsg101_4 <ifChatNPCMelancholy Accept>
 
 	Msg102 <I'm glad I still have you. I found a book while cleaning up the house a while back. It says we might have family in \ELEMENT 3 . Maybe while you're traveling you can check it out.>
 	Msg102_1 <It was so nice back when we were all together... Oh, I discovered something recently. Our parents had financed some kind of thing in \ELEMENT 3 . I don't know what... I'm surprised they never told us. Maybe you can find out what that was?>
-	CMsg102_1 <ifNPCSociable Accept>
+	CMsg102_1 <ifChatNPCSociable Accept>
 	Msg102_2 <While cleaning out the house I found an old dataslate. Apparently Mom and Dad had some kind of investment in \ELEMENT 3 . Maybe you can go there and see what it is sometime?>
-	CMsg102_2 <ifNPCShy Accept>
+	CMsg102_2 <ifChatNPCShy Accept>
 	Msg102_3 <I've been cleaning the study at home, and it brings back all kinds of memories. Did you know that our parents were members of a club in \ELEMENT 3 ? Strange they never mentioned that...>
-	CMsg102_3 <ifNPCCheerful Accept>
+	CMsg102_3 <ifChatNPCCheerful Accept>
 	Msg102_4 <They're gone, never to return... I've been cleaning the study at home, and remembering how it was to be with them. Did you know that our parents had investments in \ELEMENT 3 ? Strange they never mentioned that to us...>
-	CMsg102_4 <ifNPCMelancholy Accept>
+	CMsg102_4 <ifChatNPCMelancholy Accept>
 	Msg102_5 <At least they've gone to a better place. I was cleaning out Dad's study a few days ago and came across an old dataslate. It seems like he had some kind of investment in \ELEMENT 3 . Maybe you can find out more?>
-	CMsg102_5 <ifNPCSpiritual Accept>
+	CMsg102_5 <ifChatNPCSpiritual Accept>
 
 	Msg103 <I wish I could believe that as strongly as you... Hm, a few days ago I found something interesting. I wanted to tell you but forgot. We might have family in \ELEMENT 3 . Maybe you could go check it out someday.>
 	Msg103_1 <It's good that you have such faith to see you through troubles. Oh, I recently discovered something... Before they died Mom and Dad were planning some kind of investment in \ELEMENT 3 ; I really don't know what. Maybe you could find out?>
-	CMsg103_1 <ifNPCSociable Accept>
+	CMsg103_1 <ifChatNPCSociable Accept>
 	Msg103_2 <I spent a lot of time cleaning out Mom's study. There was an old dataslate there... I think she had some kind of business in \ELEMENT 3 . Maybe someday you can go find out more.>
-	CMsg103_2 <ifNPCShy Accept>
+	CMsg103_2 <ifChatNPCShy Accept>
 	Msg103_3 <It must be nice to have such strong faith. I'm just glad that I still have you. A while ago I was cleaning the attic at home and I found an old family album... I think we might have family in \ELEMENT 3 . Maybe you can go there and see.>
-	CMsg103_3 <ifNPCCheerful Accept>
+	CMsg103_3 <ifChatNPCCheerful Accept>
 	Msg103_4 <...and we'll be joining them there someday, if there really is an afterlife. I had something to tell you... While cleaning Mom's study I found an old book. Apparently we have relatives in \ELEMENT 3 . Maybe you can check that out?>
-	CMsg103_4 <ifNPCMelancholy Accept>
+	CMsg103_4 <ifChatNPCMelancholy Accept>
 	Msg103_5 <That's the only thing that gives me comfort in these times. While cleaning out the house I found something interesting... Apparently we have relatives in \ELEMENT 3 . Maybe you could investigate the next time you're over that way?>
-	CMsg103_5 <ifNPCSpiritual Accept>
+	CMsg103_5 <ifChatNPCSpiritual Accept>
 	Msg103_6 <You know I don't believe in that stuff. I've been researching our family, to see if we have any other relatives... I believe we may have some in \ELEMENT 3 . Maybe while you're traveling you can go see.>
-	CMsg103_6 <ifNPCPragmatic Accept>
+	CMsg103_6 <ifChatNPCPragmatic Accept>
 
 	Msg104 <I know, but I still miss them now. I did find something interesting while cleaning the house a few days ago... we might have family in \ELEMENT 3 . Maybe if you're there sometime you can check it out.>
 	Msg104_1 <A few days ago someone called asking questions about our folks. I didn't tell them anything, of course... The phone number was from the \ELEMENT 3 area code. Maybe you can find out what that was about...>
-	CMsg104_1 <ifNPCSociable Accept>
+	CMsg104_1 <ifChatNPCSociable Accept>
 	Msg104_2 <Perhaps. Um, I have something to tell you... While cleaning out Dad's study I found something. I think we may have family in \ELEMENT 3 . Maybe you can find out for sure?>
-	CMsg104_2 <ifNPCShy Accept>
+	CMsg104_2 <ifChatNPCShy Accept>
 	Msg104_3 <Not anytime soon, I hope! Oh, I had something to tell you about our parents... While I was cleaning the attic I found a portfolio... something about an investment in \ELEMENT 3 . Maybe you can find out what that's about?>
-	CMsg104_3 <ifNPCCheerful Accept>
+	CMsg104_3 <ifChatNPCCheerful Accept>
 	Msg104_4 <Everything that is born will some day die... we are all just visitors to this place. While cleaning the attic I found an old dataslate. Did you know our parents had property in \ELEMENT 3 ? I don't know what but maybe you can find out.>
-	CMsg104_4 <ifNPCMelancholy Accept>
+	CMsg104_4 <ifChatNPCMelancholy Accept>
 
 	Prompt101 <I miss them too.>
 	Prompt101_1 <I also miss them.>
diff --git a/Series/TS_XRAN_aC--_FaceYourEnemy.txt b/Series/TS_XRAN_aC--_FaceYourEnemy.txt
index 54b6622..24103f2 100644
--- a/Series/TS_XRAN_aC--_FaceYourEnemy.txt
+++ b/Series/TS_XRAN_aC--_FaceYourEnemy.txt
@@ -74,94 +74,94 @@ sub
 
 	Msg1 <Don't think that you've won today. You've merely prolonged the inevitable. Come face me aqain in \ELEMENT 3 ... next time, it is I who will be victorious!>
 	Msg1_1 <You think you've got the better of me, but you haven't... As long as I live I will continue to hunt you down wherever you may be! Let's have a rematch in \ELEMENT 3 ... next time, it's I who will win!>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <Sleep with one eye open, \PC . I'll see you again in \ELEMENT 3 .>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <Ah, so it seems you got lucky today. That luck will run out eventually. Meet me in \ELEMENT 3 for a rematch... This time I won't hold back!>
-	CMsg1_3 <ifNPCCheerful Accept>
+	CMsg1_3 <ifChatNPCCheerful Accept>
 	Msg1_4 <You merely delay the inevitable march of death, \PC ... Let's meet again in \ELEMENT 3 and finish this.>
-	CMsg1_4 <ifNPCMelancholy Accept>
+	CMsg1_4 <ifChatNPCMelancholy Accept>
 	Msg1_5 <So this time you win. Very well... next time I will, and you can expect no mercy. Meet me in \ELEMENT 3 for a rematch if you're brave enough.>
-	CMsg1_5 <ifNPCEasygoing Accept>
+	CMsg1_5 <ifChatNPCEasygoing Accept>
 	Msg1_6 <Your powers are formidible... But you are nothing to me, and I will crush you in time! I demand a rematch, in \ELEMENT 3 ! Meet me if you dare!>
-	CMsg1_6 <ifNPCPassionate Accept>
+	CMsg1_6 <ifChatNPCPassionate Accept>
 	Msg1_7 <An honorable duel, \PC ... You have bested me today. I demand a rematch... what say, in \ELEMENT 3 ? I know you won't be able to resist...>
-	CMsg1_7 <ifNPCLawful Accept>
+	CMsg1_7 <ifChatNPCLawful Accept>
 	Msg2 <You defeated \ELEMENT 2 outside of \ELEMENT 1 .>
 
 	Msg5 <You are lucky to have escaped us today. That luck will soon run out, I assure you. Until the next time we meet...>
 	Msg5_1 <Now that you've been humiliated, I hope you will tell everyone what an incredible pilot \ELEMENT 2 is. I'm sure you'll come back to challenge me again but I assure you it will be equally pointless.>
-	CMsg5_1 <ifNPCSociable ifPCOK Accept>
+	CMsg5_1 <ifChatNPCSociable ifPCOK Accept>
 	Msg5_2 <You lose.>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <I win! I will have to toast a drink to your crushing defeat, \PC .>
-	CMsg5_3 <ifNPCCheerful Accept>
+	CMsg5_3 <ifChatNPCCheerful Accept>
 	Msg5_4 <How unfortunate, it was my intention to kill you today... When I see you again, I will do just that.>
-	CMsg5_4 <ifNPCMelancholy IfPCOK Accept>
+	CMsg5_4 <ifChatNPCMelancholy IfPCOK Accept>
 	Msg5_5 <So, this time I win... but you have escaped from the field of battle. I could hunt you down but it's not worth getting worked up over such small things. Until the next time we meet...>
-	CMsg5_5 <ifNPCEasygoing IfPCOK Accept>
+	CMsg5_5 <ifChatNPCEasygoing IfPCOK Accept>
 	Msg5_6 <You are no match for me, wangtta. Next time I see you I'll end your worthless life.>
-	CMsg5_6 <ifNPCPassionate Accept>
+	CMsg5_6 <ifChatNPCPassionate Accept>
 	Msg5_7 <You fought honorably, but your skills have been found wanting. Next time I will deliver the killing blow.>
-	CMsg5_7 <ifNPCLawful Accept>
+	CMsg5_7 <ifChatNPCLawful Accept>
 
 	Msg6 <You were defeated by \ELEMENT 2 outside of \ELEMENT 1 .>
 	Msg7 <I've been waiting for you to show yourself. Now, we will battle!>
 	Msg7_1 <It's so good that you've decided to join us. I've prepared a small party for you... Now, it's time for you to go down!>
-	CMsg7_1 <ifNPCSociable Accept>
+	CMsg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <I've been waiting. It's time for you to die.>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <This is going to be such fun... Prepare for battle, \PC . I am here to finish you.>
-	CMsg7_3 <ifNPCCheerful Accept>
+	CMsg7_3 <ifChatNPCCheerful Accept>
 	Msg7_4 <Death is waiting for you, \PC , and I am her messenger. You can try to run but I will only find you again.>
-	CMsg7_4 <ifNPCMelancholy Accept>
+	CMsg7_4 <ifChatNPCMelancholy Accept>
 	Msg7_5 <What luck! Imagine finding you here... why, \PC , you're making the job of killing you trivially easy. Not that I'm complaining, mind you... Let's get this over with.>
-	CMsg7_5 <ifNPCEasygoing Accept>
+	CMsg7_5 <ifChatNPCEasygoing Accept>
 	Msg7_6 <Prepare yourself! We are about to do battle, a battle which only one of us can walk away from!>
-	CMsg7_6 <ifNPCPassionate Accept>
+	CMsg7_6 <ifChatNPCPassionate Accept>
 	Msg7_7 <\PC , you are hereby challenged to a duel, to take place right here and right now. If you dishonor me by refusing I will have no choice but to kill you.>
-	CMsg7_7 <ifNPCLawful Accept>
+	CMsg7_7 <ifChatNPCLawful Accept>
 	Msg7_8 <I'll bet you weren't expecting this! Welcome to my ambush, \PC .>
-	CMsg7_8 <ifNPCChaotic Accept>
+	CMsg7_8 <ifChatNPCChaotic Accept>
 	Msg7_9 <Welcome, \PC ... I've made arrangements for you to join your parents.>
 	CMsg7_9 <if= XRB NAV_XRBFamilyDied Accept>
 
 
 	Msg8 <You're going down...>
 	Msg8_1 <Don't worry. After you're dead I'll be sure to tell everyone that you fought valliantly.>
-	CMsg8_1 <ifNPCSociable Accept>
+	CMsg8_1 <ifChatNPCSociable Accept>
 	Msg8_2 <Let's begin.>
-	CMsg8_2 <ifNPCShy Accept>
+	CMsg8_2 <ifChatNPCShy Accept>
 	Msg8_3 <Let's see if it's true that you fight like a cow!>
-	CMsg8_3 <ifNPCCheerful Accept>
+	CMsg8_3 <ifChatNPCCheerful Accept>
 	Msg8_4 <You will die in pain...>
-	CMsg8_4 <ifNPCMelancholy Accept>
+	CMsg8_4 <ifChatNPCMelancholy Accept>
 	Msg8_5 <I won't even have to break a sweat to defeat you.>
-	CMsg8_5 <ifNPCEasygoing Accept>
+	CMsg8_5 <ifChatNPCEasygoing Accept>
 	Msg8_6 <I hope you prove to be an adequate test of my skills. Otherwise, this entire fight will just be boring.>
-	CMsg8_6 <ifNPCPassionate Accept>
+	CMsg8_6 <ifChatNPCPassionate Accept>
 	Msg8_7 <May the better pilot win...>
-	CMsg8_7 <ifNPCLawful Accept>
+	CMsg8_7 <ifChatNPCLawful Accept>
 	Msg8_8 <No rules, no holds barred... only one survivor.>
-	CMsg8_8 <ifNPCChaotic Accept>
+	CMsg8_8 <ifChatNPCChaotic Accept>
 	Msg8_13 <You could've been on the winning side, \PC , but you decided to betray us...>
 	CMsg8_13 <if= XRB NAV_XRBExMember Accept>
 
 	Msg9 <I am a force you should not take so lightly!!!>
 	Msg9_3 <Ah, it's good to see that I will be facing someone with at least a modicun of wit.>
-	CMsg9_3 <ifNPCCheerful Accept>
+	CMsg9_3 <ifChatNPCCheerful Accept>
 	Msg9_4 <If you fight as well as you insult, this should be an easy fight for me...>
-	CMsg9_4 <ifNPCMelancholy Accept>
+	CMsg9_4 <ifChatNPCMelancholy Accept>
 
 	Msg10 <Imagine seeing you here. So long as we are both in town there is no reason why we should not be civil. Once we leave here, though, we will be enemies again.>
 	Msg10_2 <Eh, you!? Look, we're in town. We can't start anything here.>
-	CMsg10_2 <ifNPCShy Accept>
+	CMsg10_2 <ifChatNPCShy Accept>
 	Msg10_4 <Just what I need, to ruin my day off... What do you want, \PC !?>
-	CMsg10_4 <ifNPCMelancholy Accept>
+	CMsg10_4 <ifChatNPCMelancholy Accept>
 	Msg10_7 <I certainly hope that you're not looking for trouble. The guards around here wouldn't react kindly if you started a fight... Surely we're civilized enough to wait until later to begin our duel.>
-	CMsg10_7 <ifNPCLawful Accept>
+	CMsg10_7 <ifChatNPCLawful Accept>
 	Msg10_8 <Well, if it isn't \PC . Count yourself lucky that we're in town, otherwise I'd snuff out your worthless life in an instant.>
-	CMsg10_8 <ifNPCChaotic Accept>
+	CMsg10_8 <ifChatNPCChaotic Accept>
 	Msg10_10 <Hello \PC . It's a shame what happened to your parents. I wouldn't worry; you'll be joining them soon enough...>
 	CMsg10_10 <if= XRB NAV_XRBFamilyDied Accept>
 	Msg10_11 <When you were a member of \NARRATIVE 2 , I used to look up to you. Now I see what a failure you've become... If we weren't in town right now, I'd send you to your grave.>
@@ -174,11 +174,11 @@ sub
 
 	Msg15 <You haven't figured that out on your own yet? You must be stupider than you look. Perhaps they are wrong... perhaps you're not as much of a danger as they say.>
 	Msg15_1 <I'd love to explain everything to you but my masters have asked that I not get personally involved with the quarry.>
-	CMsg15_1 <ifNPCSociable Accept>
+	CMsg15_1 <ifChatNPCSociable Accept>
 	Msg15_2 <Don't ask questions you don't really want answered.>
-	CMsg15_2 <ifNPCShy Accept>
+	CMsg15_2 <ifChatNPCShy Accept>
 	Msg15_8 <Ah, but that would be telling... You can't expect me to hand you everything on a silver platter, can you?>
-	CMsg15_8 <ifNPCChaotic Accept>
+	CMsg15_8 <ifChatNPCChaotic Accept>
 	Msg15_9 <You honestly can't remember a thing? If I could trust in that, it would be merciful to let you live... but if your memories ever return, you could be a danger to the project. So you must be eliminated.>
 	CMsg15_9 <if= XRM NAV_XRMAmnesia Accept>
 	Msg15_10 <You are the continuation of a remarkable bloodline, \PC ; a bloodline that must be eliminated if we are to immanentize the eschaton. Nothing more need be said.>
@@ -192,29 +192,29 @@ sub
 
 	Msg16 <In the middle of \ELEMENT 1 ? You must be daft. Aside from the obvious problems of bystanders and the Guardians, there's also my reputation to think about.>
 	Msg16_1 <That's not going to happen. There's too many bystanders, and guards who would probably interfere. Plus, what would people say about me if I behaved like a common rougheon? No, when we fight, it will be at a time and place of my choosing.>
-	CMsg16_1 <ifNPCSociable Accept>
+	CMsg16_1 <ifChatNPCSociable Accept>
 	Msg16_2 <No. This is no place for a fight. We will continue this discussion later.>
-	CMsg16_2 <ifNPCShy Accept>
+	CMsg16_2 <ifChatNPCShy Accept>
 	Msg16_3 <Are you completely bonkers? Start a fight in the middle of \ELEMENT 1 ? Look, we'll fight later, but not here.>
-	CMsg16_3 <ifNPCCheerful Accept>
+	CMsg16_3 <ifChatNPCCheerful Accept>
 	Msg16_4 <This isn't the place for that, idiot. Too many people around to interfere. No, we will not fight here, but rest assured that your death approaches...>
-	CMsg16_4 <ifNPCMelancholy Accept>
+	CMsg16_4 <ifChatNPCMelancholy Accept>
 	Msg16_5 <I don't want to fight you now. I've got other things to do. If you want, I promise that I'll come back to fight you later...>
-	CMsg16_5 <ifNPCEasygoing Accept>
+	CMsg16_5 <ifChatNPCEasygoing Accept>
 	Msg16_6 <It's taking every bit of self control I have to not run you through where you stand. But, there are things that just aren't done... I will kill you later, when we are both beyond the walls of civilization.>
-	CMsg16_6 <ifNPCPassionate Accept>
+	CMsg16_6 <ifChatNPCPassionate Accept>
 	Msg16_7 <Fight here in the middle of town? Are you a barbarian? That's not something a civilized warrior would even consider. There are too many bystanders who could get hurt...>
-	CMsg16_7 <ifNPCLawful Accept>
+	CMsg16_7 <ifChatNPCLawful Accept>
 	Msg16_8 <Eh, I'd rather not. I'll be seeing you again, sometime when I hold the advantage...>
-	CMsg16_8 <ifNPCChaotic Accept>
+	CMsg16_8 <ifChatNPCChaotic Accept>
 
 	Msg17 <Then why did you speak with me? If you have nothing to say, then don't disturb me.>
 	Msg17_2 <Then go away.>
-	CMsg17_2 <ifNPCShy Accept>
+	CMsg17_2 <ifChatNPCShy Accept>
 	Msg17_3 <Ah, so that's why you're the one who came up to me. I understand now. Idiot.>
-	CMsg17_3 <ifNPCCheerful Accept>
+	CMsg17_3 <ifChatNPCCheerful Accept>
 	Msg17_4 <Excuse me, you're the one who started this conversation. Idiot.>
-	CMsg17_4 <ifNPCMelancholy Accept>
+	CMsg17_4 <ifChatNPCMelancholy Accept>
 	Msg17_9 <You have nothing to say, but maybe you're hoping that I do... You are hunting for any small clue to the secret of your past. Well, perhaps I will tell you who you are, right before I end your life...>
 	CMsg17_9 <if= XRM NAV_XRMAmnesia Accept>
 
diff --git a/Series/TS_XRAN_aC--_MarsNeedsClones.txt b/Series/TS_XRAN_aC--_MarsNeedsClones.txt
index e7bf39a..200cf0c 100644
--- a/Series/TS_XRAN_aC--_MarsNeedsClones.txt
+++ b/Series/TS_XRAN_aC--_MarsNeedsClones.txt
@@ -42,69 +42,69 @@ sub
 	result3 <EndChat Say 4 Reputation 3 -d10 Goto GoStartFight>
 	Msg1 <So \PC , I've found you at last. It's time for us to settle matters once and for all, right here and right now.>
 	Msg1_1 <My old enemy \PC ... This battle between us has destroyed the better part of my soul. Now it is time for us to end it, once and for all.>
-	CMsg1_1 <ifNPCHeroic Accept>
+	CMsg1_1 <ifChatNPCHeroic Accept>
 	Msg1_2 <We meet again, for the last time. Prepare to die.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <My old enemy \PC ... You have been a good opponent, though all our battles, but that time must now come to an end. The secret I know must go to the grave with me. Prepare to defend yourself, or die at my hand.>
-	CMsg1_3 <ifNPCSociable Accept>
+	CMsg1_3 <ifChatNPCSociable Accept>
 	Msg1_4 <What wonderful news! \ELEMENT 1 is to be the site of our final, greatest battle! Let us begin...>
-	CMsg1_4 <ifNPCCheerful Accept>
+	CMsg1_4 <ifChatNPCCheerful Accept>
 	Msg1_5 <This charade has continued for long enough. It's time for this to end... one of us will die today...>
-	CMsg1_5 <ifNPCMelancholy Accept>
+	CMsg1_5 <ifChatNPCMelancholy Accept>
 	Msg1_6 <All things come to an end, \PC ... It's time to settle matters between us once and for all, right here and right now.>
-	CMsg1_6 <ifNPCEasygoing Accept>
+	CMsg1_6 <ifChatNPCEasygoing Accept>
 	Msg1_7 <You have escaped me before, but today I bring you death!!!>
-	CMsg1_7 <ifNPCPassionate Accept>
+	CMsg1_7 <ifChatNPCPassionate Accept>
 	Msg1_8 <Ah, \PC ... You think you have everything all figured out... If you knew what I've seen, you wouldn't be so certain. It's time to end all this fighting we've done... to the death!>
 	CMsg1_8 <if= XRM NAV_XRMResolved Accept>
 
 	Msg2 <That's the spirit! Killing you would be boring if you didn't bother to fight back!>
 	Msg2_1 <I'll try to make sure your end is painless...>
-	CMsg2_1 <ifNPCHeroic Accept>
+	CMsg2_1 <ifChatNPCHeroic Accept>
 	Msg2_2 <Let us begin.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <Whichever one of us wins, they'll tell of our great skill unto the end of the world... which by my calculation isn't too far off.>
-	CMsg2_3 <ifNPCSociable Accept>
+	CMsg2_3 <ifChatNPCSociable Accept>
 	Msg2_4 <Try to keep this interesting. It would be no good for our final duel to be boring.>
-	CMsg2_4 <ifNPCCheerful Accept>
+	CMsg2_4 <ifChatNPCCheerful Accept>
 	Msg2_5 <May the streets run red...>
-	CMsg2_5 <ifNPCMelancholy Accept>
+	CMsg2_5 <ifChatNPCMelancholy Accept>
 	Msg2_6 <We might as well begin right away...>
-	CMsg2_6 <ifNPCEasygoing Accept>
+	CMsg2_6 <ifChatNPCEasygoing Accept>
 	Msg2_7 <I will kill you!!!>
-	CMsg2_7 <ifNPCPassionate Accept>
+	CMsg2_7 <ifChatNPCPassionate Accept>
 
 	Msg3 <Oh, what a noble sentiment... Not that it matters to me anymore. They can all be replaced. We can all be replaced.>
 	Msg3_1 <Look upon it as an act of mercy. I have seen the horror that is to be unleashed... It must not be so...>
-	CMsg3_1 <ifNPCHeroic Accept>
+	CMsg3_1 <ifChatNPCHeroic Accept>
 	Msg3_2 <That is of no concern anymore.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <You don't understand what's going to happen...>
-	CMsg3_3 <ifNPCSociable Accept>
+	CMsg3_3 <ifChatNPCSociable Accept>
 	Msg3_4 <Oh, that's funny... You're a real comedian! Whether they die now or in a few weeks time makes no difference at all!>
-	CMsg3_4 <ifNPCCheerful Accept>
+	CMsg3_4 <ifChatNPCCheerful Accept>
 	Msg3_5 <In a few days we're all going to be dead anyhow, after the tyrant is reawakened...>
-	CMsg3_5 <ifNPCMelancholy Accept>
+	CMsg3_5 <ifChatNPCMelancholy Accept>
 	Msg3_6 <We could move the fight to somewhere more appropriate... but I don't have the patience for it. Prepare to defend yourself!>
-	CMsg3_6 <ifNPCEasygoing Accept>
+	CMsg3_6 <ifChatNPCEasygoing Accept>
 	Msg3_7 <Anyone who dies today should thank us, for they will be spared the rebirth of the Lord of Terror!>
-	CMsg3_7 <ifNPCPassionate Accept>
+	CMsg3_7 <ifChatNPCPassionate Accept>
 
 	Msg4 <I have been wondering that very same thing myself... so now, it is time to end our game. Either you will die or I will die, and I can't even manage to care which...>
 	Msg4_1 <I am less than half the human being I once was... perhaps no longer a human being at all...>
-	CMsg4_1 <ifNPCHeroic Accept>
+	CMsg4_1 <ifChatNPCHeroic Accept>
 	Msg4_2 <Enough chatter. Let's begin.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <Your denials wound me, \PC ... Let's see if I can return the favor with my blade!>
-	CMsg4_3 <ifNPCSociable Accept>
+	CMsg4_3 <ifChatNPCSociable Accept>
 	Msg4_4 <Ah, how I will miss your wit when you're lying on the ground in several pieces. Let us begin.>
-	CMsg4_4 <ifNPCCheerful ifG PCRep 5 0 Accept>
+	CMsg4_4 <ifChatNPCCheerful ifG PCRep 5 0 Accept>
 	Msg4_5 <Truth be told I never did care for your wisecracks. I won't much miss them when you're gone. Let's begin this fight.>
-	CMsg4_5 <ifNPCMelancholy ifG PCRep 5 0 Accept>
+	CMsg4_5 <ifChatNPCMelancholy ifG PCRep 5 0 Accept>
 	Msg4_6 <Who am I... a very good question, one I hope to answer myself one day...>
-	CMsg4_6 <ifNPCEasygoing Accept>
+	CMsg4_6 <ifChatNPCEasygoing Accept>
 	Msg4_7 <I am your nemesis, the dark messenger of death... I am a shadow of a more brilliant light and nothing more...>
-	CMsg4_7 <ifNPCPassionate Accept>
+	CMsg4_7 <ifChatNPCPassionate Accept>
 
 	Msg5 <If you have something to say to me, tell me to my face.>
 	Msg5_1 <I'm not home right now.>
@@ -119,7 +119,7 @@ sub
 	GoE3Dead <EndChat Say 101 N= 3 E2 FreezeItem E5 FreezeChar E7 FreezeChar E3 AdvancePlot 1>
 	Msg101 <You haven't won yet... I can still defeat you...>
 	Msg101_1 <If you meet my ghost on the road... kill \spr E3 ...>
-	CMsg101_1 <ifNPCHeroic Accept>
+	CMsg101_1 <ifChatNPCHeroic Accept>
 
 Plot 1
 	% The second fight... The PC will meet the NPC again, this
@@ -148,35 +148,35 @@ sub
 	GoStartFight <EndChat SoloAttack E3>
 	Msg1 <\PC , I was informed that you'd try to interfere with our operations here in \ELEMENT 2 . I've been authorized to stop you by whatever means are nessecary. What's the matter... you look like you've seen a ghost?>
 	Msg1_1 <My old enemy \PC ... I don't want to fight you in public like this, but the Eschaton Project would be jeopardized if I allowed you to live. Don't look so shocked, prepare to defend yourself!>
-	CMsg1_1 <ifNPCHeroic Accept>
+	CMsg1_1 <ifChatNPCHeroic Accept>
 	Msg1_2 <I was informed that you'd be investigating our project in \ELEMENT 2 . Your adventure ends here.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <It's good to finally meet you, \PC . I've heard that you've interfered with many of our plans. The \ELEMENT 2 is too important to let you near it... so now you are going to die.>
-	CMsg1_3 <ifNPCSociable Accept>
+	CMsg1_3 <ifChatNPCSociable Accept>
 	Msg1_4 <Ah, \PC ... So you survived the handiwork of our associates. Well, you won't live long enough to see what we have planned for \ELEMENT 2 . It really is going to be a better world when we're finished with it.>
-	CMsg1_4 <ifNPCCheerful Accept>
+	CMsg1_4 <ifChatNPCCheerful Accept>
 	Msg1_5 <What does it take to kill you? They said that you defeated our second most powerful operative... second only to me, of course. Now I'll end your life before you have a chance to look around \ELEMENT 2 .>
-	CMsg1_5 <ifNPCMelancholy Accept>
+	CMsg1_5 <ifChatNPCMelancholy Accept>
 	Msg1_6 <We've been expecting you in \ELEMENT 2 . It's much easier to wait for my quarry than chase it all over the place... Now, I'm going to have to kill you.>
-	CMsg1_6 <ifNPCEasygoing Accept>
+	CMsg1_6 <ifChatNPCEasygoing Accept>
 	Msg1_7 <I've been waiting for the chance to test my skills against you! They say you've already defeated one of our top agents... I can't allow you to get close to our \ELEMENT 2 operations. Now you die!>
-	CMsg1_7 <ifNPCPassionate Accept>
+	CMsg1_7 <ifChatNPCPassionate Accept>
 
 	Msg2 <Let's do this!>
 	Msg2_1 <Try not to hurt any of the civilians, they have no part in our battle...>
-	CMsg2_1 <ifNPCHeroic Accept>
+	CMsg2_1 <ifChatNPCHeroic Accept>
 	Msg2_2 <Let's go.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <I'm going to be famous as the person who killed \PC !>
-	CMsg2_3 <ifNPCSociable ifG PCRep 6 25 Accept>
+	CMsg2_3 <ifChatNPCSociable ifG PCRep 6 25 Accept>
 	Msg2_4 <Try to keep up with me, it'll make a better show for the onlookers.>
-	CMsg2_4 <ifNPCCheerful Accept>
+	CMsg2_4 <ifChatNPCCheerful Accept>
 	Msg2_5 <Is there anyone who will weep at your death? Or shall we just dump you in an unmarked grave?>
-	CMsg2_5 <ifNPCMelancholy Accept>
+	CMsg2_5 <ifChatNPCMelancholy Accept>
 	Msg2_6 <It must be nice to believe that you stand a chance against me... Of course, I know that you don't.>
-	CMsg2_6 <ifNPCEasygoing Accept>
+	CMsg2_6 <ifChatNPCEasygoing Accept>
 	Msg2_7 <As you die, know that you've been slain by a superior foe.>
-	CMsg2_7 <ifNPCPassionate Accept>
+	CMsg2_7 <ifChatNPCPassionate Accept>
 
 	Msg5 <If you have something to say to me, tell me to my face.>
 	Msg5_1 <I'm not home right now.>
@@ -193,32 +193,32 @@ sub
 	result1 <NewChat Say 3>
 	Msg1 <I have some strange news for you about \ELEMENT 3 . I know the two of you fought here recently, and he apparently died... But the guardian office in \ELEMENT 2 claims \OPR E3 's been there all this time!>
 	Msg1_2 <You just fought \ELEMENT 3 , right? Well, according to the Guardian liason in \ELEMENT 2 , \OPR E3 's been there all along.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <This is strange. I heard about your fight with \ELEMENT 3 , and how \OPR E3 supposedly died. Well, the Guardians in \ELEMENT 2 say they've been staking out \PPR E3 position over there. It certainly seems like \OPR E3 's in two places at once.>
-	CMsg1_3 <ifNPCSociable Accept>
+	CMsg1_3 <ifChatNPCSociable Accept>
 	Msg1_4 <>
-	CMsg1_4 <ifNPCCheerful Accept>
+	CMsg1_4 <ifChatNPCCheerful Accept>
 	Msg1_5 <>
-	CMsg1_5 <ifNPCMelancholy Accept>
+	CMsg1_5 <ifChatNPCMelancholy Accept>
 	Msg1_6 <>
-	CMsg1_6 <ifNPCEasygoing Accept>
+	CMsg1_6 <ifChatNPCEasygoing Accept>
 	Msg1_7 <>
-	CMsg1_7 <ifNPCPassionate Accept>
+	CMsg1_7 <ifChatNPCPassionate Accept>
 
 	Msg2 <\ELEMENT 3 has been sighted in \ELEMENT 2 .>
 	Msg3 <\ELEMENT 3 is wanted for a list of crimes as long as a phone book. We've been keeping tabs on \PPR E3 whereabouts for some time now.>
 	Msg3_2 <It's Guardian business. We have our reasons.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <Haven't you been paying attention? \ELEMENT 3 has a rap sheet a mile long. There's murder, arson, grand theft... It's our job to keep track of criminals like that.>
-	CMsg3_3 <ifNPCSociable Accept>
+	CMsg3_3 <ifChatNPCSociable Accept>
 	Msg3_4 <Eh, everybody needs a hobby.>
-	CMsg3_4 <ifNPCCheerful Accept>
+	CMsg3_4 <ifChatNPCCheerful Accept>
 	Msg3_5 <\ELEMENT 3 killed my fiance. I will bring \SPR E3 to justice if it's the last thing I do.>
-	CMsg3_5 <ifNPCMelancholy Accept>
+	CMsg3_5 <ifChatNPCMelancholy Accept>
 	Msg3_6 <>
-	CMsg3_6 <ifNPCEasygoing Accept>
+	CMsg3_6 <ifChatNPCEasygoing Accept>
 	Msg3_7 <\ELEMENT 3 has been involved in some horrifying crimes... I've dedicated myself to bring \SPR E3 to justice. I cannot rest until it is done!>
-	CMsg3_7 <ifNPCPassionate Accept>
+	CMsg3_7 <ifChatNPCPassionate Accept>
 
 	Prompt1 <Why do you care about \ELEMENT 3 ?>
 	Prompt1_1 <Is there anything else you can tell me?>
diff --git a/Series/TS_XRAN_aC--_WaitingForYou.txt b/Series/TS_XRAN_aC--_WaitingForYou.txt
index a86c0c2..6e2005c 100644
--- a/Series/TS_XRAN_aC--_WaitingForYou.txt
+++ b/Series/TS_XRAN_aC--_WaitingForYou.txt
@@ -67,93 +67,93 @@ sub
 
 	Msg2 <Urgent business calls me to \ELEMENT 3 ; count yourself lucky that I don't have time to remain here and call in reinforcements.>
 	Msg2_1 <How strange... You're far deadlier than your reputation would have me expect. I'll have to rethink my strategy before fighting you again. In the meantime, I must be off to \ELEMENT 3 , and I recommend that you get some repairs.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <I must go immediately to \ELEMENT 3 . Don't think you've escaped, \PC ... I will return later to end your life once and for all.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <I can't stand losing! Meet me in \ELEMENT 3 for a rematch, if you dare.>
-	CMsg2_3 <ifNPCCheerful Accept>
+	CMsg2_3 <ifChatNPCCheerful Accept>
 	Msg2_4 <So, you have more life in you than I'd imagined... Business calls me to \ELEMENT 3 , but I assure you that I will return to finish what I've started.>
-	CMsg2_4 <ifNPCMelancholy Accept>
+	CMsg2_4 <ifChatNPCMelancholy Accept>
 	Msg2_5 <If I had suspected you'd be so hard I would have brought my good mecha from \ELEMENT 3 . But no matter... Go repair your mek, \PC , since on my return I won't be holding back any longer!>
-	CMsg2_5 <ifNPCEasygoing Accept>
+	CMsg2_5 <ifChatNPCEasygoing Accept>
 	Msg2_6 <How is this possible!? There's no way someone like you could have defeated me! I have to go to \ELEMENT 3 , but I'll be back to have my revenge!>
-	CMsg2_6 <ifNPCPassionate Accept>
+	CMsg2_6 <ifChatNPCPassionate Accept>
 	Msg2_7 <I have been honorably defeated, and concede to you the field... Until we meet again in \ELEMENT 3 , \PC .>
-	CMsg2_7 <ifNPCHeroic Accept>
+	CMsg2_7 <ifChatNPCHeroic Accept>
 
 	Msg3 <Just as I thought, you are pathetically weak. It's not worth my time to kill you. You're going to have to improve if you hope to face me again.>
 	Msg3_1 <Hah, it's true what they say, you are pathetically weak. I'm afraid that you haven't been much of a challenge for me.>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <You lose.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <I win again! How delightful.>
-	CMsg3_3 <ifNPCCheerful Accept>
+	CMsg3_3 <ifChatNPCCheerful Accept>
 	Msg3_4 <May death's door swallow you, \PC ...>
-	CMsg3_4 <ifNPCMelancholy Accept>
+	CMsg3_4 <ifChatNPCMelancholy Accept>
 	Msg3_5 <Well, that was easy. Good-bye, \PC ...>
-	CMsg3_5 <ifNPCEasygoing Accept>
+	CMsg3_5 <ifChatNPCEasygoing Accept>
 	Msg3_6 <Is that the best you could do? It was hardly worth wasting my time on this fight...>
-	CMsg3_6 <ifNPCPassionate Accept>
+	CMsg3_6 <ifChatNPCPassionate Accept>
 
 	Msg4 <I expected you to make it here eventually. Now, we will settle everything, with your death...>
 	Msg4_1 <Did you get my email? It's about time for the two of us to settle things... Specifically, for me to stop you from ever interfering in my plans ever again. It's time to fight.>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <I've been waiting. Let's finish this.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <I knew this was going to be a good day when I got out of bed this morning. Here I am, about to kill \PC ...>
-	CMsg4_3 <ifNPCCheerful Accept>
+	CMsg4_3 <ifChatNPCCheerful Accept>
 	Msg4_4 <I have accepted your existence for as long as possible. Now, it is time to snuff out your brief candle...>
-	CMsg4_4 <ifNPCMelancholy Accept>
+	CMsg4_4 <ifChatNPCMelancholy Accept>
 	Msg4_5 <You're a thorn in my side that I just can't ignore any longer, \PC . It's time that thorn was picked out and cast aside for good.>
-	CMsg4_5 <ifNPCEasygoing Accept>
+	CMsg4_5 <ifChatNPCEasygoing Accept>
 	Msg4_6 <At last you've finally decided to show up... Now, we will see which one of us is the better pilot!>
-	CMsg4_6 <ifNPCPassionate Accept>
+	CMsg4_6 <ifChatNPCPassionate Accept>
 	Msg4_7 <Let us settle our differences in an honorable duel. The first one to die, loses.>
-	CMsg4_7 <ifNPCHeroic Accept>
+	CMsg4_7 <ifChatNPCHeroic Accept>
 
 	Msg5 <Prepare to die!>
 	Msg5_1 <You have no better speech than that? It's going to make a sorry epitath for your tombstone, I'll tell you that much...>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <I already have.>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <Show me what you've got!>
-	CMsg5_3 <ifNPCCheerful Accept>
+	CMsg5_3 <ifChatNPCCheerful Accept>
 	Msg5_4 <You will not leave this place alive.>
-	CMsg5_4 <ifNPCMelancholy Accept>
+	CMsg5_4 <ifChatNPCMelancholy Accept>
 	Msg5_5 <Let's try to finish this quickly... I'm meeting someone for dinner.>
-	CMsg5_5 <ifNPCEasygoing Accept>
+	CMsg5_5 <ifChatNPCEasygoing Accept>
 	Msg5_6 <Try to show a bit more excitement, please... After all, today is the last day of your life!>
-	CMsg5_6 <ifNPCPassionate Accept>
+	CMsg5_6 <ifChatNPCPassionate Accept>
 
 	Msg6 <You're spirited... that's good. It would be terrible to have to face a boring enemy. Let's begin this dance!>
 	Msg6_1 <Ah, as eloquent a speech as I could expect from someone with your obvious intelligence. I'll be sure that they write that on your tombstone.>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <Brave words, coming from someone who is soon to be dead.>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <This is going to be such fun!>
-	CMsg6_3 <ifNPCCheerful Accept>
+	CMsg6_3 <ifChatNPCCheerful Accept>
 	Msg6_4 <You boast now, but later on you'll only bleed.>
-	CMsg6_4 <ifNPCMelancholy Accept>
+	CMsg6_4 <ifChatNPCMelancholy Accept>
 	Msg6_5 <You seem very excited to face your own death. Far be it from me to deny it to you...>
-	CMsg6_5 <ifNPCEasygoing Accept>
+	CMsg6_5 <ifChatNPCEasygoing Accept>
 	Msg6_6 <That's just the answer I was hoping for. Let's begin our duel!>
-	CMsg6_6 <ifNPCPassionate Accept>
+	CMsg6_6 <ifChatNPCPassionate Accept>
 
 	Msg7 <No condition to fight? You are pathetic. It's beneath my dignity to kill you now... Maybe someday we can meet again if you prove yourself worthy.>
 	Msg7_1 <How pathetic. Once everyone finds out how you pleaded with me today, your reputation will be shot.>
-	CMsg7_1 <ifNPCSociable Accept>
+	CMsg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <Ah, in that case, I should attend to my more important business elsewhere...>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <If you're not going to put up a good fight then it's not going to be any fun. We'll meet again, someday...>
-	CMsg7_3 <ifNPCCheerful Accept>
+	CMsg7_3 <ifChatNPCCheerful Accept>
 	Msg7_4 <So, you're too afraid to face me? Can't say I blame you. Run away, little dog... We'll meet again someday, and on that occasion I will kill you.>
-	CMsg7_4 <ifNPCMelancholy Accept>
+	CMsg7_4 <ifChatNPCMelancholy Accept>
 	Msg7_5 <So you want to reschedule? Fine. I can kill you some other time.>
-	CMsg7_5 <ifNPCEasygoing Accept>
+	CMsg7_5 <ifChatNPCEasygoing Accept>
 	Msg7_6 <You're just making excuses! I knew that you wouldn't have the stomach to face me.>
-	CMsg7_6 <ifNPCPassionate Accept>
+	CMsg7_6 <ifChatNPCPassionate Accept>
 	Msg7_7 <In that case, I cannot in good conscience fight you. We will continue the duel at another time.>
-	CMsg7_7 <ifNPCHeroic Accept>
+	CMsg7_7 <ifChatNPCHeroic Accept>
 
 	Msg8 <You defeated \ELEMENT 2 in a duel outside \ELEMENT 1 .>
 	Msg9 <You were defeated by \ELEMENT 2 in a duel outside \ELEMENT 1 .>
diff --git a/Series/TS_XRAN_aC-F_DarkSide.txt b/Series/TS_XRAN_aC-F_DarkSide.txt
index fa4f554..238d315 100644
--- a/Series/TS_XRAN_aC-F_DarkSide.txt
+++ b/Series/TS_XRAN_aC-F_DarkSide.txt
@@ -73,60 +73,60 @@ sub
 
 	Msg201 <You're much better than I expected. We could use you in \ELEMENT 3 . You may even be as good as your father. He used to be one of our agents, until that one time... There was no way we could let him survive, you understand.>
 	Msg201_1 <I see shades of your father in your fighting style. He used to work for us, you realize... one of our better agents, until his conscience got the better of him. We could use your talents in \ELEMENT 3 .>
-	CMsg201_1 <ifNPCSociable Accept>
+	CMsg201_1 <ifChatNPCSociable Accept>
 	Msg201_2 <So you're nearly as good as your father. He was one of our agents, until he had to eliminate him. Maybe you will join us as well. We could use your talents in \ELEMENT 3 .>
-	CMsg201_2 <ifNPCShy Accept>
+	CMsg201_2 <ifChatNPCShy Accept>
 	Msg201_3 <Aha, I knew that you'd be as capable as your father before you. Did I mention? Before he outlived his usefulness he was an agent of ours. You may be too, if you can pass the next test in \ELEMENT 3 .>
-	CMsg201_3 <ifNPCCheerful Accept>
+	CMsg201_3 <ifChatNPCCheerful Accept>
 	Msg201_4 <So, you're as efficient and ruthless a killer as your father before you. This is excellent. It fits so perfectly into our plan for \ELEMENT 3 ... and like your father, you too will work for us.>
-	CMsg201_4 <ifNPCMelancholy Accept>
+	CMsg201_4 <ifChatNPCMelancholy Accept>
 	Msg201_5 <Ah, you've earned the right to hear the big secret: Your father used to work for \NARRATIVE 2 . Like him, you've proven yourself to be a great pilot. This fits well into our plans for \ELEMENT 3 .>
-	CMsg201_5 <ifNPCEasygoing Accept>
+	CMsg201_5 <ifChatNPCEasygoing Accept>
 	Msg201_6 <Impressive. Your father would have been pleased with the results. Did I mention that he used to be one of us? Of course, once the masters could no longer trust him, he had to be eliminated. You are ready for the next test in \ELEMENT 3 .>
-	CMsg201_6 <ifNPCPassionate Accept>
+	CMsg201_6 <ifChatNPCPassionate Accept>
 
 	Msg202 <\ELEMENT 2 said your father once worked for \NARRATIVE 2 .>
 	Msg203 <As I said, he was one of our best operatives. Very good at keeping secrets. The command thinks you might be an adequate replacement for him. In time, you may be given a choice... Join us, or die like your parents.>
 	Msg203_1 <Don't deny what must now seem obvious. Your father was a good agent... very good at keeping secrets. It is believed that you might replace him. I certainly hope that you'll join of your own free will, but there are other ways as well.>
-	CMsg203_1 <ifNPCSociable Accept>
+	CMsg203_1 <ifChatNPCSociable Accept>
 	Msg203_2 <Believe what you will, only know that \NARRATIVE 2 is considering you for a replacement.>
-	CMsg203_2 <ifNPCShy Accept>
+	CMsg203_2 <ifChatNPCShy Accept>
 	Msg203_3 <You'll be much happier if you simply accept the truth... and join us on the winning side of history. But I can see that you need more persuasion. Have no fears, you will come to serve us in the end...>
-	CMsg203_3 <ifNPCCheerful Accept>
+	CMsg203_3 <ifChatNPCCheerful Accept>
 	Msg203_4 <The truth must sting horribly. I leave you now with this one additional fact: \NARRATIVE 2 wants you on our side. Whether you come of your own free will or through other methods is of little concern. In the end, you will serve us...>
-	CMsg203_4 <ifNPCMelancholy Accept>
+	CMsg203_4 <ifChatNPCMelancholy Accept>
 	Msg203_5 <Believe me about that- I served alongside him. I was the one who ended his life, after he betrayed us... You don't want to end up like that. Serve \NARRATIVE 2 . I'll see you later, and I'll bring some additional persuasion.>
-	CMsg203_5 <ifNPCEasygoing Accept>
+	CMsg203_5 <ifChatNPCEasygoing Accept>
 	Msg203_6 <It's the truth! I served alongside your father, and he was a great warrior up until the moment he betrayed us... Join us, take his place in \NARRATIVE 2 , and you'll be on the winning side of history. I'll leave you to think about this for a while.>
-	CMsg203_6 <ifNPCPassionate Accept>
+	CMsg203_6 <ifChatNPCPassionate Accept>
 
 	Msg204 <Me? I want nothing... but my employers may think you're ready to replace your father in our organization. If they make that decision, you will be given a choice... join us and serve our will, or join your family in the next world.>
 	Msg204_1 <You will serve us, in our mission to immanentize the eschaton. It would be preferable if you were to do this of your own free will. If you choose not to, there are other means at our disposal.>
-	CMsg204_1 <ifNPCSociable Accept>
+	CMsg204_1 <ifChatNPCSociable Accept>
 	Msg204_2 <I want nothing. My masters want a replacement for your father. They're thinking about choosing you.>
-	CMsg204_2 <ifNPCShy Accept>
+	CMsg204_2 <ifChatNPCShy Accept>
 	Msg204_3 <Think of this as a job offer. My masters need someone to replace your father. You would make a good candidate... and the immanentization of the eschaton is near at hand.>
-	CMsg204_3 <ifNPCCheerful Accept>
+	CMsg204_3 <ifChatNPCCheerful Accept>
 	Msg204_4 <You will replace your father in \NARRATIVE 2 , and serve us faithfully, or be utterly destroyed like your parents before you.>
-	CMsg204_4 <ifNPCMelancholy Accept>
+	CMsg204_4 <ifChatNPCMelancholy Accept>
 	Msg204_5 <I want you to think about this: \NARRATIVE 2 needs someone to replace your father, and they are considering you. I'll be in contact again.>
-	CMsg204_5 <ifNPCEasygoing Accept>
+	CMsg204_5 <ifChatNPCEasygoing Accept>
 	Msg204_6 <I want you to give up your pretensions and join us. Forget your father... he was weak, that's why he had to die... But \NARRATIVE 2 needs new blood. Think about it... I will be in contact again soon.>
-	CMsg204_6 <ifNPCPassionate Accept>
+	CMsg204_6 <ifChatNPCPassionate Accept>
 
 	Msg205 <You still don't understand. Your father brought his death upon himself for failing to carry out his orders. Someday you will understand, and you will join us... or I will kill you as easily as I killed your parents.>
 	Msg205_1 <Don't say things that you'll regret later. I was supposed to offer you a position with \NARRATIVE 2 , but it seems that more persuasion is needed first.>
-	CMsg205_1 <ifNPCSociable Accept>
+	CMsg205_1 <ifChatNPCSociable Accept>
 	Msg205_2 <You can try. In time, you too will join \NARRATIVE 2 .>
-	CMsg205_2 <ifNPCShy Accept>
+	CMsg205_2 <ifChatNPCShy Accept>
 	Msg205_3 <I very much doubt that, \PC . You'll come to see the rightness of our position in time. And then, you'll be one of us.>
-	CMsg205_3 <ifNPCCheerful Accept>
+	CMsg205_3 <ifChatNPCCheerful Accept>
 	Msg205_4 <Struggle all you want, only know that it's inevitable... One way or the other, you will serve \NARRATIVE 2 in the end.>
-	CMsg205_4 <ifNPCMelancholy Accept>
+	CMsg205_4 <ifChatNPCMelancholy Accept>
 	Msg205_5 <Now that's just not very nice... Here I was, about to offer you a job with \NARRATIVE 2 , and you have to go say something unfriendly like that... It seems that you're going to need a bit more persuasion.>
-	CMsg205_5 <ifNPCEasygoing Accept>
+	CMsg205_5 <ifChatNPCEasygoing Accept>
 	Msg205_6 <Don't try to rebel against your destiny. In one way or another you will serve our purposes.>
-	CMsg205_6 <ifNPCPassionate Accept>
+	CMsg205_6 <ifChatNPCPassionate Accept>
 
 	Prompt201 <You're lying!>
 	Prompt201_1 <I can't believe you!>
@@ -138,17 +138,17 @@ sub
 	GoCheckLoss <if= P2 2 else GoFirstTime Say 101 AdvancePlot 0>
 	Msg101 <As I expected, you are weak. I don't expect that \NARRATIVE 2 will have any further interest in you.>
 	Msg101_1 <From your reputation, I honestly expected to see more of a fight. You are worthless and weak.>
-	CMsg101_1 <ifNPCSociable Accept>
+	CMsg101_1 <ifChatNPCSociable Accept>
 	Msg101_2 <It is settled. You are of no consequence to \NARRATIVE 2 .>
-	CMsg101_2 <ifNPCShy Accept>
+	CMsg101_2 <ifChatNPCShy Accept>
 	Msg101_3 <It was entertaining to watch you get slaughtered, but now I have more pressing matters to attend to. Goodbye, \PC .>
-	CMsg101_3 <ifNPCCheerful Accept>
+	CMsg101_3 <ifChatNPCCheerful Accept>
 	Msg101_4 <You are too weak to be of any interest to \NARRATIVE 2 .>
-	CMsg101_4 <ifNPCMelancholy Accept>
+	CMsg101_4 <ifChatNPCMelancholy Accept>
 	Msg101_5 <You are not a bad pilot, but thoroughly mediocre. If you were to improve your skills you might even be dangerous... and at that time, you would have to be eliminated.>
-	CMsg101_5 <ifNPCEasygoing Accept>
+	CMsg101_5 <ifChatNPCEasygoing Accept>
 	Msg101_6 <So that's all the great \PC is capable of!?>
-	CMsg101_6 <ifNPCPassionate Accept>
+	CMsg101_6 <ifChatNPCPassionate Accept>
 
 	GoFirstTime <if= V1 0 else GoAnything V= 1 1 Say 1 History 3 XREnemy NAV_XREFaction AddChat 1 AddChat 2 AddChat 3>
 	GoAnything <SayAnything>
@@ -157,31 +157,31 @@ sub
 	result3 <Reputation 4 d8 goto result2>
 	Msg1 <Greetings, \PC . We meet again. My employers think it's time you learned the truth... I am working for \NARRATIVE 2 , and they have a small test for you.>
 	Msg1_1 <Glad to see our intel on you was correct, \PC . I was sent here today by \NARRATIVE 2 to inform you of some unpleasant truths, and to give you a small test.>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <Hello \PC . It's time you learn the truth about your parent's death. I have been operating under the direction of \NARRATIVE 2 . They sent me here today with a test for you.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <Oh, I have a fun game for you today, \PC . You want to know about who killed your parents? I admit, I had some hand in that, but the orders came from \NARRATIVE 2 . Want to learn more? Then you have to pass my test.>
-	CMsg1_3 <ifNPCCheerful Accept>
+	CMsg1_3 <ifChatNPCCheerful Accept>
 	Msg1_4 <Greetings \PC ... No, I'm not here to attack you, my purpose is far more cruel. I guess you already know that I'm the one who killed your parents. What you don't know is that \NARRATIVE 2 orchestrated it. Pass my test, and you'll learn more.>
-	CMsg1_4 <ifNPCMelancholy Accept>
+	CMsg1_4 <ifChatNPCMelancholy Accept>
 	Msg1_5 <I'm afraid I have some uncomfortable facts about your father's death, \PC . You already know I was involved in that... What you don't know is that \NARRATIVE 2 ordered the hit. They've sent me here today to tell you that, and to test you...>
-	CMsg1_5 <ifNPCEasygoing Accept>
+	CMsg1_5 <ifChatNPCEasygoing Accept>
 	Msg1_6 <Don't look so shocked, \PC ... I'm not here to kill you. Not yet, anyhow... My masters, \NARRATIVE 2 , have decided it's time you were let in on a few of our secrets. They've sent me here today with a little test for you.>
-	CMsg1_6 <ifNPCPassionate Accept>
+	CMsg1_6 <ifChatNPCPassionate Accept>
 
 	Msg2 <My employers are very interested in your combat abilities. You will see the team I have chosen for you to battle... you will defeat them, or be defeated by them. We will see how great you truly are.>
 	Msg2_1 <The masters of \NARRATIVE 2 are very interested in your combat skills. We've planned a little test for you. Let's see how well you fare against some of our top pilots... if you survive, I can tell you more.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <We have arranged a test by fire. If you survive this ambush that I've planned, I'll have a good idea how tough you really are.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <Keep a positive attitude, you should feel honored that \NARRATIVE 2 thinks you're important enough to arrange this sort of test. You're about to be attacked by our top pilots. Survive, and I have some information you'll want to hear.>
-	CMsg2_3 <ifNPCCheerful Accept>
+	CMsg2_3 <ifChatNPCCheerful Accept>
 	Msg2_4 <Death is the truest measure of a warrior. You are about to be attacked... If you survive the encounter, then we'll know how advanced your combat skills are.>
-	CMsg2_4 <ifNPCMelancholy Accept>
+	CMsg2_4 <ifChatNPCMelancholy Accept>
 	Msg2_5 <It's pretty easy. I've assembled a team of crack pilots... They're about to lay a beating on you. Either you defeat them, or get defeated by them. It's that simple.>
-	CMsg2_5 <ifNPCEasygoing Accept>
+	CMsg2_5 <ifChatNPCEasygoing Accept>
 	Msg2_6 <I have some information that you'll want to know, and \NARRATIVE 2 wants to know something about you. If you're skilled enough to defeat a team of our crack pilots I'll explain why your family had to die.>
-	CMsg2_6 <ifNPCPassionate Accept>
+	CMsg2_6 <ifChatNPCPassionate Accept>
 	Msg3 <\ELEMENT 2 revealed that \OPR E2 was taking orders from \NARRATIVE 2 .>
 
 	Prompt1 <Tell \NARRATIVE 2 to shove it.>
diff --git a/Series/TS_XRAN_aC-L_SchoolPals.txt b/Series/TS_XRAN_aC-L_SchoolPals.txt
index 90fe41a..78515d7 100644
--- a/Series/TS_XRAN_aC-L_SchoolPals.txt
+++ b/Series/TS_XRAN_aC-L_SchoolPals.txt
@@ -69,101 +69,101 @@ sub
 	result7 <NewChat  Say 9>
 	Msg1 <I really think you ought to go see what \ELEMENT 4 has been doing in \ELEMENT 3 . I know the two of you never got along very well, but I have a feeling this could be very important for us all!>
 	Msg1_1 <Have you spoken with \ELEMENT 4 in \ELEMENT 3 yet? I have a feeling that something very bad is going on there... I know the two of you were never really friends, but could you at least do this for me?>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <You haven't spoken with \ELEMENT 4 yet? Let me know when you do.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <I think someone should go talk with \ELEMENT 4 in \ELEMENT 3 ... If you're free sometime, could you check up on \SPR E4 ?>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <Why haven't you spoken to \ELEMENT 4 yet!? I asked you to do that a while ago...>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <I hope that \ELEMENT 4 is alright. I'd hate for something bad to happen to anyone I know, no matter what...>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <\ELEMENT 4 has started down a path of self destruction... I fear \OPR E4 may be beyond any help.>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 
 	Msg2 <\PC ! I haevn't seen you in ages... not since graduation, I think. How have you been? I'm sorry that I didn't write to you all this time but it was a lot of work in the piloting academy, you know?>
 	Msg2_1 <\PC ! It's been ages since we've spoken! I was really hoping you'd show up today. Did you get my email? How've you been? Sorry that I haven't kept in touch better, but it was a lot of work in the piloting academy.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <\PC , I was hoping you'd come here. Did you get my email? I know, I should have kept in touch better, but you know how it is...>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <\PC ! It's really been ages, hasn't it? I don't think we've been together like this since graduation. How have you been? We really should have kept in touch... that's probably my fault for not writing.>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <\PC !!! Oh, I've missed you so much!!! How are you doing? I haven't seen you since graduation... It's been really busy in the piloting academy, I would have written but things have been so crazy the past few years.>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <It's good to see you, \PC ! I've been hoping you'd come over. We haven't met face to face since graduation, I think. I've been doing well at the piloting academy. Sorry I didn't write more often.>
-	CMsg2_5 <ifNPCCheerful Accept>
+	CMsg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <Ah, \PC , I was a bit worried you wouldn't accept my invitation. It's been very busy for me at the piloting academy. I missed you, and all of our friends from school... I should have written, I know, I just let everyone slip away.>
-	CMsg2_6 <ifNPCMelancholy Accept>
+	CMsg2_6 <ifChatNPCMelancholy Accept>
 
 	Msg3 <I wish our meeting could be under happier circumstances, though. I've got a problem. Tell me... Do you remember \ELEMENT 4 ? We all went to school together. I kind of remember that the two of you didn't get along.>
 	Msg3_1 <There's a reason why I called you here. One of our schoolmates is in a lot of trouble. I think there's something really bad going on, and this is only the surface. Remember \ELEMENT 4 ? You two were rivals, weren't you?>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <There's a reason why I asked you here today. Remember \ELEMENT 4 from school?>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <Well, I have a problem that I can't solve by myself. A friend of mine... one of our schoolmates... is in bad trouble. You wouldn't happen to remember \ELEMENT 4 , would you?>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_4 <As great as it is to see you today, I wish it could be under better circumstances. One of our ex-schoolmates needs help. Do you remember \ELEMENT 4 ?>
-	CMsg3_4 <ifNPCPassionate Accept>
+	CMsg3_4 <ifChatNPCPassionate Accept>
 	Msg3_5 <Unfortunately, I've got a problem. I'm certain that you can help me with it, though. Remember your old rival \ELEMENT 4 ?>
-	CMsg3_5 <ifNPCCheerful Accept>
+	CMsg3_5 <ifChatNPCCheerful Accept>
 	Msg3_6 <I have a very serious problem... or rather, one of our schoolmates does, and I've been entangled into it. Do you remember \ELEMENT 4 ? I seem to recall that you hated each other.>
-	CMsg3_6 <ifNPCMelancholy Accept>
+	CMsg3_6 <ifChatNPCMelancholy Accept>
 
 	Msg4 <I'm a bit embarassed but very happy to hear that. I missed you too. I called you here for a reason today, Tell me... Do you remember \ELEMENT 4 ? We all went to school together. I kind of remember that the two of you didn't get along.>
 	Msg4_1 <Then why didn't you write me back, either!? Ah well, each one of us is just as bad as the other... I missed you too, \PC , but I wish our first meeting in so many years could be under better circumstances. Tell me, do you remember \ELEMENT 4 ?>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <I'm glad to hear that. Unfortunately, this isn't just a social call... do you remember \ELEMENT 4 ?>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <Me too. Well, I did have a flimsy excuse for calling you here today... Do you remember \ELEMENT 4 ? We went to school together. I seem to recall that the two of you didn't get along very well.>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <Not half as much as I missed you, I'll bet. I did have a rationale for calling you here. Do you remember \ELEMENT 4 from school? As I recall the two of you were rivals then.>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <I'm very happy to hear that! I missed you too. I hear you're a big adventurer now... Well, I'm hoping that you can help with something. Do you remember \ELEMENT 4 from our school days?>
-	CMsg4_5 <ifNPCCheerful Accept>
+	CMsg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <Really? I barely expected that you'd even remember me, let alone miss me... I missed you too. Um, I'm afraid that I have a problem... Tell me, do you remember \ELEMENT 4 ? We went to school together.>
-	CMsg4_6 <ifNPCMelancholy Accept>
+	CMsg4_6 <ifChatNPCMelancholy Accept>
 
 	Msg5 <You're right, we both should have. Anyway, there's a reason why I asked you here today. Tell me... Do you remember \ELEMENT 4 ? We all went to school together. I kind of remember that the two of you didn't get along.>
 	Msg5_1 <I'm just glad to be speaking with you now. Look, I need to tell you about something... Do you remember our ex-classmate \ELEMENT 4 ? Well, \OPR E4 's mixed up in something really bad.>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <Point taken. In any case, I had a reason for calling you here. Do you remember the name \ELEMENT 4 ?>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <Well, there's no sense in talking about the past. I called you here for a reason... Do you remember our ex-classmate \ELEMENT 4 , by any chance?>
-	CMsg5_3 <ifNPCEasygoing Accept>
+	CMsg5_3 <ifChatNPCEasygoing Accept>
 	Msg5_4 <Thanks for trying to accept part of the blame, but that still doesn't excuse me. Actually, I called you here today because one of our ex-classmates is in trouble... Do you remember \ELEMENT 4 ?>
-	CMsg5_4 <ifNPCPassionate Accept>
+	CMsg5_4 <ifChatNPCPassionate Accept>
 	Msg5_5 <Well, that doesn't matter much anymore, now that we're both here together finally. I had a reason for calling you today... Do you remember \ELEMENT 4 ? The three of us went to school together.>
-	CMsg5_5 <ifNPCCheerful Accept>
+	CMsg5_5 <ifChatNPCCheerful Accept>
 	Msg5_6 <No, it's my fault, I wanted to write many times... but today, I have a reason for contacting you. Tell me, do you remember \ELEMENT 4 from our school days?>
-	CMsg5_6 <ifNPCMelancholy Accept>
+	CMsg5_6 <ifChatNPCMelancholy Accept>
 
 	Msg6 <I can't say I'm surprised. After graduation we both applied to the academy... but during training \OPR E4 began to change. Soon \OPR E4 dropped out. I kept contact with \SPR E4 for a while. I'm certain \OPR E4 got involved in something bad...>
 	Msg6_1 <That doesn't surprise me... not anymore. \ELEMENT 4 joined the academy the same time I did. A year later, something happened to \SPR E4 ... \OPR E4 stopped talking to just about everyone, then dropped out. I'm certain something very bad is going on.>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <That sounds like \SPR E4 ... \OPR E4 has really changed since dropping out of the academy. I suspect that \OPR E4 's in some kind of trouble.>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <Is that true!? Then \OPR E4 must be even worse off than I thought... A few years ago \OPR E4 dropped out of the academy. We kept in touch for a while, but there was like a dark shadow growing across \SPR E4 . I'm certain \OPR E4 's in trouble.>
-	CMsg6_3 <ifNPCEasygoing Accept>
+	CMsg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <I can't believe that! The \ELEMENT 4 I know could never... of course, \OPR E4 hasn't been \SPR E4 self for a while now. There's something very bad going on. I only wish I knew more...>
-	CMsg6_4 <ifNPCPassionate Accept>
+	CMsg6_4 <ifChatNPCPassionate Accept>
 	Msg6_5 <You're still alive, so I guess \OPR E4 couldn't have wanted to kill you very badly. Last year \OPR E4 dropped out of the academy and got involved in a bad crowd... I don't know exactly what they're up to, but I know it isn't good.>
-	CMsg6_5 <ifNPCCheerful Accept>
+	CMsg6_5 <ifChatNPCCheerful Accept>
 	Msg6_6 <In that case \OPR E4 may already be beyond our help. \ELEMENT 4 quit the academy a year ago... there was something going on, \OPR E4 got involved with some bad people. I don't know all the details but I can tell it's very serious.>
-	CMsg6_6 <ifNPCMelancholy Accept>
+	CMsg6_6 <ifChatNPCMelancholy Accept>
 
 	Msg7 <After graduation both \ELEMENT 4 and I applied to the academy... but during training \OPR E4 began to change. Soon \OPR E4 dropped out. I kept contact with \SPR E4 for a while. I'm certain \OPR E4 got involved in something bad...>
 	Msg7_1 <After graduating we both applied to the academy, but a short time later \ELEMENT 4 dropped out. Over the course of basic training \OPR E4 changed.  I kept contact with \SPR E4 for a while. I'm certain \OPR E4 got involved in something bad...>
-	CMsg7_1 <ifNPCSociable Accept>
+	CMsg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <\ELEMENT 4 went to the same piloting academy as me, but dropped out of the program suddenly and without explanation. My contact with \SPR E4 suggests that \OPR E4 got involved with some bad people.>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <\ELEMENT 4 used to be a good person... that changed after we joined the piloting academy together. I think \OPR E4 was being influenced by someone else... I really don't know what happened...>
-	CMsg7_3 <ifNPCEasygoing Accept>
+	CMsg7_3 <ifChatNPCEasygoing Accept>
 	Msg7_4 <\ELEMENT 4 really changed after graduation. After we both joined the academy, \OPR E4 would sometimes disappear for days at a time. Later \OPR E4 dropped out, without reason or explanation.>
-	CMsg7_4 <ifNPCPassionate Accept>
+	CMsg7_4 <ifChatNPCPassionate Accept>
 	Msg7_5 <That's good. You might also remember that \OPR E4 and I both applied to the piloting academy... While there, \ELEMENT 4 changed horribly. It's like \OPR E4 joined a cult or something worse.>
-	CMsg7_5 <ifNPCCheerful Accept>
+	CMsg7_5 <ifChatNPCCheerful Accept>
 	Msg7_6 <I guess \ELEMENT 4 is a hard person to forget... Shortly after we both joined the academy, \OPR E4 cut off all ties to \PPR E4 old friends. It's like \OPR E4 joined a cult. I'm certain something terrible is brewing...>
-	CMsg7_6 <ifNPCMelancholy Accept>
+	CMsg7_6 <ifChatNPCMelancholy Accept>
 
 	Msg8 <I can't say I much care for the person \OPR E4 has become... but for the person \OPR E4 used to be, and for my sake, could you go to \ELEMENT 3 and check up on \SPR E4 ? I have this awful feeling that something terrible is about to happen.>
 	Msg8_1 <I would have thought you'd at least be curious as to why \OPR E4 's changed so much... Look, you're better at talking to people than me. Could you go to \ELEMENT 3 and check up on \SPR E4 ?>
@@ -181,17 +181,17 @@ sub
 
 	Msg9 <Go to \ELEMENT 3 and talk to \SPR E4 . You know, \OPR E4 used to really look up to you in our school days. That's why \OPR E4 decided to be a pilot. Please do this for me. I have this awful feeling that something terrible is about to happen.>
 	Msg9_1 <I recently got an email from \ELEMENT 4 ... \OPR E4 's in \ELEMENT 3 . If you could go there and talk with \SPR E4 , we could find out what's going on...>
-	CMsg9_1 <ifNPCSociable Accept>
+	CMsg9_1 <ifChatNPCSociable Accept>
 	Msg9_2 <I got an email from \SPR E4 recently. There's more going on than \OPR E4 's willing to say. If you go there and speak with \SPR E4 we could find out what's really behind all this.>
-	CMsg9_2 <ifNPCShy Accept>
+	CMsg9_2 <ifChatNPCShy Accept>
 	Msg9_3 <Nothing much, just go to \ELEMENT 3 and talk with \SPR E4 . Maybe we can find out what's been going on.>
-	CMsg9_3 <ifNPCEasygoing Accept>
+	CMsg9_3 <ifChatNPCEasygoing Accept>
 	Msg9_4 <I've become convinced that \OPR E4 is involved in some huge conspiracy. But, for the friend \OPR E4 once was, I hope \OPR E4 can still be saved... Go to \ELEMENT 3 and seek \SPR E4 out.>
-	CMsg9_4 <ifNPCPassionate Accept>
+	CMsg9_4 <ifChatNPCPassionate Accept>
 	Msg9_5 <I got an email from \SPR E4 ... It kind of sounded like a cry for help. I'd like you to go to \ELEMENT 3 and find out what's happened to \SPR E4 . I'm certain \OPR E4 can still be rescued. I hope so...>
-	CMsg9_5 <ifNPCCheerful Accept>
+	CMsg9_5 <ifChatNPCCheerful Accept>
 	Msg9_6 <I don't know... I don't know if anything can be done. But I got an email recently saying \OPR E4 'd be in \ELEMENT 4 . Maybe you could go talk with \SPR E4 ?>
-	CMsg9_6 <ifNPCMelancholy Accept>
+	CMsg9_6 <ifChatNPCMelancholy Accept>
 
 	Msg10 <\ELEMENT 2 in \ELEMENT 1 asked you to speak with \ELEMENT 4 in \ELEMENT 3 .>
 	Msg11 <Your school friend \ELEMENT 2 sent you to talk with \ELEMENT 4 .>
@@ -227,186 +227,186 @@ sub
 	GoR8Fail <Say 14>
 	Msg1 <Why are you here? That fool \ELEMENT 2 sent you, didn't \OPR E2 ? I told \SPR E2 that I didn't need \SPR E2 anymore... \ELEMENT 6 has turned me into a greater pilot than I ever dreamt possible!>
 	Msg1_1 <Ah, if it isn't my old friend \PC ... Well, you're too late to interfere in my mission for \ELEMENT 6 , since it's already been completed!>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <Greetings \PC . I hope you're not here to stop me... my mission for \ELEMENT 6 has already been completed.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <\PC , you must be here to continue our battle... Well, I'm afraid that I'll have to disappoint you; \ELEMENT 6 has business for me elsewhere.>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <How did you find me!? You must be in league with that \ELEMENT 2 ... no matter, \ELEMENT 6 will deal with \SPR E2 soon enough. What do you want?>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <Ah, so \PC has come to play with me once again. I'm sorry but \ELEMENT 6 has other things for me to do.>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <You! I should have killed you when I had the chance... Why have you come here today? You cannot defeat me; \ELEMENT 6 has made me a greater warrior than ever dreamed possible!>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 
 	Msg2 <Then you'll be disappointed I'm afraid. I have other things to take care of... My men will handle you by themselves.>
 	Msg2_1 <Destroy me? Oh, I think not. I've been taking GARU Serum... my abilities have been multiplied far beyond the levels of a mere human such as yourself. I would demonstrate this to you, but duty calls.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <It will be you who dies instead. Men, destroy \PC .>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <No thanks, but as a parting gift I'll leave my men to fight you. If you survive maybe we'll meet again.>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <It's beneath my dignity to accept a challenge from one such as you. Since taking GARU serum my abilities have increased a hundred fold. My men will prove more than sufficient to defeat you.>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <It's not me who's going to get destroyed today, \PC . I'm off but my men can easily defeat you on their own. Have fun with them.>
-	CMsg2_5 <ifNPCCheerful Accept>
+	CMsg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <You may not live to regret your empty threat, \PC ... I don't have the luxury of killing you myself today, but I'm sure my men will be more than up to the task. Goodbye.>
-	CMsg2_6 <ifNPCMelancholy Accept>
+	CMsg2_6 <ifChatNPCMelancholy Accept>
 
 	Msg3 <Why? I had nothing! You were always better than me... \ELEMENT 2 always loved you more, no matter what I did... It was \ELEMENT 6 that showed how my dreams can be realized! They gave me the power to destroy you!>
 	Msg3_1 <It's too late to talk! You took the one thing that used to matter to me, in the person of \ELEMENT 2 ... but now I've found something else, now all I care about is power! And \ELEMENT 6 has given me more than you can ever dream of!>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <You should know that I have no desire to talk. All I want is to kill you.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <Then talk. Just keep in mind that no matter what you say, I'm still going to kill you.>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_4 <All my life I've tried to prove myself equal to you... Now, at last, thanks to \ELEMENT 6 I am stronger than you could ever dream! They gave me the power to destroy you!>
-	CMsg3_4 <ifNPCPassionate Accept>
+	CMsg3_4 <ifChatNPCPassionate Accept>
 	Msg3_5 <My, but you are the eternal optimist... Do you really think you can talk me out of destroying you, now that I've been given the power to do just that?>
-	CMsg3_5 <ifNPCCheerful Accept>
+	CMsg3_5 <ifChatNPCCheerful Accept>
 	Msg3_6 <There's nothing you could say. All of my dreams were crushed by you... \ELEMENT 2 would never be with me, as long as you lived... But \ELEMENT 6 has given me the power to take revenge!>
-	CMsg3_6 <ifNPCMelancholy Accept>
+	CMsg3_6 <ifChatNPCMelancholy Accept>
 
 	Msg4 <\ELEMENT 4 revealed that \OPR E4 was working for \ELEMENT 6 .>
 	Msg5 <You'll have to prove yourself worthy of my new talents first. I've been taking GARU serum... it's boosted my abilities to beyond human levels. My men should be able to kill you themselves. If not, then we'll meet again someday...>
 	Msg5_1 <I'd love to stay and chat with you some more, but I will shortly be needed elsewhere. If you're determined to fight then my men should prove more than capable of defeating you themselves.>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <I've no time for this. My men will make short work of you. Goodbye, \PC .>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <Not today, I'm afraid. I'll have to apologize for leaving early... but my men should be more than sufficient to destroy you themselves.>
-	CMsg5_3 <ifNPCEasygoing Accept>
+	CMsg5_3 <ifChatNPCEasygoing Accept>
 	Msg5_4 <Do you really think you're capable of such a feat? I've been given GARU serum by \ELEMENT 6 . My abilities have advanced far beyond the limits of a mere human such as yourself. My men can finish you off themselves...>
-	CMsg5_4 <ifNPCPassionate Accept>
+	CMsg5_4 <ifChatNPCPassionate Accept>
 	Msg5_5 <As much as I'd love to stay and play with you, I'm afraid that I really must be off. My men will be able to defeat you themselves. Try to put up an entertaining fight.>
-	CMsg5_5 <ifNPCCheerful Accept>
+	CMsg5_5 <ifChatNPCCheerful Accept>
 	Msg5_6 <I'm afraid that I don't have time to stay and watch your death... important business calls me elsewhere. Goodbye.>
-	CMsg5_6 <ifNPCMelancholy Accept>
+	CMsg5_6 <ifChatNPCMelancholy Accept>
 
 	Msg6 <I've been taking GARU serum. My abilities have been pumped to beyond human levels... Now, I am far more powerful than you! I no longer have to feel the shame of being second best! When \ELEMENT 6 takes over, I will be a lord!>
 	Msg6_1 <They've given me GARU serum... it's boosted my abilities far beyond human levels! They told me that it's completely safe... When \ELEMENT 6 takes over, I will be a lord of the new Earth!>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <You know, training, study, plus some experimental medical procedures... I am moving beyond all limits, transforming into a god!>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <I've done nothing but seize the power which always should have been mine... \ELEMENT 6 has provided me with GARU serum. It's increased my abilities a hundred fold!>
-	CMsg6_3 <ifNPCEasygoing Accept>
+	CMsg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <Isn't it obvious? I am becoming a god! My benefactors have provided me with GARU serum, the soul of the dragon... I am evolving so quickly... When \ELEMENT 6 immanentizes the eschaton, I will be a lord of the New World Order!>
-	CMsg6_4 <ifNPCPassionate Accept>
+	CMsg6_4 <ifChatNPCPassionate Accept>
 	Msg6_5 <Isn't it wonderful? This is the effect of GARU serum... My body is rebuilding itself on a molecular level. I am becoming a god!>
-	CMsg6_5 <ifNPCCheerful Accept>
+	CMsg6_5 <ifChatNPCCheerful Accept>
 	Msg6_6 <In every battle... there are some sacrifices to be made. My masters in \ELEMENT 6 have provided me with GARU serum. My body is evolving, becoming something else, something better... I have so much power, you can't understand it...>
-	CMsg6_6 <ifNPCMelancholy Accept>
+	CMsg6_6 <ifChatNPCMelancholy Accept>
 
 	Msg7 <That could apply to both of us, couldn't it? Well, my masters have ordered me elsewhere. My men should be able to handle you by themselves. Goodbye, old friend... may your death be more painless than my life has been...>
 	Msg7_1 <It's well known that you have precious little humanity left yourself. Don't worry- when you die, I'll have my men recycle you. Goodbye, \PC ...>
-	CMsg7_1 <ifNPCSociable Accept>
+	CMsg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <That's a small price to pay for ultimate power. Goodbye, \PC ... my men will prove more than able to destroy you themselves.>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <Eh, what did my humanity ever do for me? It's a small thing to trade in exchange for ultimate power.  My men should be able to handle you by themselves. Goodbye, old friend...>
-	CMsg7_3 <ifNPCEasygoing Accept>
+	CMsg7_3 <ifChatNPCEasygoing Accept>
 	Msg7_4 <That's right! I'm becoming something far better than a mere human! I would stay here to destroy you, as a demonstration of my godlike abilities, but I must be off... my men can handle you themselves.>
-	CMsg7_4 <ifNPCPassionate Accept>
+	CMsg7_4 <ifChatNPCPassionate Accept>
 	Msg7_5 <Why do you lie? I'm not losing anything, just gaining ultimate power! Goodbye, \PC ... my men should be more than capable of destroying you themselves.>
-	CMsg7_5 <ifNPCCheerful Accept>
+	CMsg7_5 <ifChatNPCCheerful Accept>
 	Msg7_6 <Perhaps I never had any in the first place... In any event it is a far greater thing I will become, than that pitiful creature I once was... Goodbye, \PC . I must be off, but will leave my men to destroy you.>
-	CMsg7_6 <ifNPCMelancholy Accept>
+	CMsg7_6 <ifChatNPCMelancholy Accept>
 
 	Msg8 <You can't speak of me that way! I'm powerful! No-one has the right to... but, it's too late. My choices have been made. There's no way to redemption for me any more, is there?>
 	Msg8_1 <You're right... soon I will no longer be able to show my face in public, cut off forever from the rest of humanity... But my choice has been made. Even if I wanted to change, there's no going back now, is there?>
-	CMsg8_1 <ifNPCSociable Accept>
+	CMsg8_1 <ifChatNPCSociable Accept>
 	Msg8_2 <What does it profit one to gain the world, if \OPR E4 loses \PPR E4 soul? But, no... it's too late for me to turn back. There's no other path for me to take.>
-	CMsg8_2 <ifNPCShy Accept>
+	CMsg8_2 <ifChatNPCShy Accept>
 	Msg8_3 <If I had any "humanity" I wouldn't have started this process in the first place, would I? But even that doesn't matter any more... The transformation has started and there's no way out for me.>
-	CMsg8_3 <ifNPCEasygoing Accept>
+	CMsg8_3 <ifChatNPCEasygoing Accept>
 	Msg8_4 <Don't talk about me as if I'm some kind of loser! I'm powerful now! More powerful than you, even! There's no going back from this point... is there?>
-	CMsg8_4 <ifNPCPassionate Accept>
+	CMsg8_4 <ifChatNPCPassionate Accept>
 	Msg8_5 <Can't make an omelette without breaking a few eggs. Even if I wanted to change, there's no other path before me, is there?>
-	CMsg8_5 <ifNPCCheerful Accept>
+	CMsg8_5 <ifChatNPCCheerful Accept>
 	Msg8_6 <If I have to destroy myself, then so be it... better to become a monster than to remain what I was before... there is no other choice for me, is there?>
-	CMsg8_6 <ifNPCMelancholy Accept>
+	CMsg8_6 <ifChatNPCMelancholy Accept>
 
 	Msg9 <You've never cared about anyone but yourself, for as long as you've been alive... \ELEMENT 6 has given me exactly what I need. When my men kill you, I'll laugh on your corpse. Goodbye old friend...>
 	Msg9_1 <I'm supposed to believe that you suddenly started caring about people just now? I've known you long enough to know that you care only about yourself. Goodbye, \PC .>
-	CMsg9_1 <ifNPCSociable Accept>
+	CMsg9_1 <ifChatNPCSociable Accept>
 	Msg9_2 <It's you who will need help, once my men are finished with you. Goodbye \PC .>
-	CMsg9_2 <ifNPCShy Accept>
+	CMsg9_2 <ifChatNPCShy Accept>
 	Msg9_3 <\PC , that crap might work on everyone else but I know you too well. You care about nothing but yourself, and after my men have killed you the world will be better for it. Goodbye.>
-	CMsg9_3 <ifNPCEasygoing Accept>
+	CMsg9_3 <ifChatNPCEasygoing Accept>
 	Msg9_4 <I need nothing from anyone, least of all help from an insect like you! I've suffered your insolence for long enough. Now, my men will make short work of you!>
-	CMsg9_4 <ifNPCPassionate Accept>
+	CMsg9_4 <ifChatNPCPassionate Accept>
 	Msg9_5 <Is that supposed to be funny? I don't need help... \ELEMENT 6 has given me everything I've ever wanted, especially the power to destroy you!>
-	CMsg9_5 <ifNPCCheerful Accept>
+	CMsg9_5 <ifChatNPCCheerful Accept>
 	Msg9_6 <There's no help for me, my destiny is sealed... Goodbye \PC . May your death be far less painful than my life has been.>
-	CMsg9_6 <ifNPCMelancholy Accept>
+	CMsg9_6 <ifChatNPCMelancholy Accept>
 
 	Msg10 <What kind of help can you offer me? I am no longer a mere human... there is no way back from where I am now. Can't you see that?>
 	Msg10_1 <What kind of help? My transformation has progressed too far... My lust for power has brought me to this place... there is no way back from where I am now. Can't you see that?>
-	CMsg10_1 <ifNPCSociable Accept>
+	CMsg10_1 <ifChatNPCSociable Accept>
 	Msg10_2 <Can't you see that there's no way you can help me? I'm too far gone...>
-	CMsg10_2 <ifNPCShy Accept>
+	CMsg10_2 <ifChatNPCShy Accept>
 	Msg10_3 <And what kind of help can you offer? If the power that \ELEMENT 6 has provided can't give me peace, then what can?>
-	CMsg10_3 <ifNPCEasygoing Accept>
+	CMsg10_3 <ifChatNPCEasygoing Accept>
 	Msg10_4 <You are speaking to a god, worm! There is nothing that can be done for the rage that fills me, except to give it voice in the service of \ELEMENT 6 !>
-	CMsg10_4 <ifNPCPassionate Accept>
+	CMsg10_4 <ifChatNPCPassionate Accept>
 	Msg10_5 <This power \ELEMENT 6 has given me has not brought me peace... but if even this cannot make me happy, what choice do I have?>
-	CMsg10_5 <ifNPCCheerful Accept>
+	CMsg10_5 <ifChatNPCCheerful Accept>
 	Msg10_6 <My transformation has done nothing to silence those demons in my head... my lifelong agony remains... Is there no other path but for me to express this fury against the world!?>
-	CMsg10_6 <ifNPCMelancholy Accept>
+	CMsg10_6 <ifChatNPCMelancholy Accept>
 
 	Msg11 <I'm so confused... I need time to think... Men, finish him off...>
 	Msg11_1 <I will think about what you have said... But for now, I must go. Men, destroy \PC ! Goodbye old friend...>
-	CMsg11_1 <ifNPCSociable Accept>
+	CMsg11_1 <ifChatNPCSociable Accept>
 	Msg11_2 <Enough talking! You're making me confused! I have to go...>
-	CMsg11_2 <ifNPCShy Accept>
+	CMsg11_2 <ifChatNPCShy Accept>
 	Msg11_3 <I don't know either, but I do know that you have little chance of surviving this battle... Goodbye \PC .>
-	CMsg11_3 <ifNPCEasygoing Accept>
+	CMsg11_3 <ifChatNPCEasygoing Accept>
 	Msg11_4 <You're confused and weak. I will never be like you... my men will finish you off...>
-	CMsg11_4 <ifNPCPassionate Accept>
+	CMsg11_4 <ifChatNPCPassionate Accept>
 	Msg11_5 <At least you're being honest. Up until this point I was actually starting to think you might have something useful to tell me... But no more. Now, my men will destroy you. It's a pity I can't stay around to watch.>
-	CMsg11_5 <ifNPCCheerful Accept>
+	CMsg11_5 <ifChatNPCCheerful Accept>
 	Msg11_6 <Then you're useless to me. I'm so confused... I must go; my men will finish you themselves...>
-	CMsg11_6 <ifNPCMelancholy Accept>
+	CMsg11_6 <ifChatNPCMelancholy Accept>
 
 	Msg12 <This must be the only thing you're not sure of... I must guess you don't want to speak the truth of your mind. Men, finish him off... I have business elsewhere...>
 	Msg12_1 <That's it? No long monologue about how everybody has a spot of goodness in their soul and all? If your intention was to delay my attack you really could have done a better job. If you were honestly trying to convince me, it was even worse...>
-	CMsg12_1 <ifNPCSociable Accept>
+	CMsg12_1 <ifChatNPCSociable Accept>
 	Msg12_2 <That's all you can come up with? Then it's clear to me now. Men, destroy \PC ... I must be going.>
-	CMsg12_2 <ifNPCShy Accept>
+	CMsg12_2 <ifChatNPCShy Accept>
 	Msg12_3 <An honest answer, but hardly convincing. I've wasted enough time here and must be going. My men will see to your execution...>
-	CMsg12_3 <ifNPCEasygoing Accept>
+	CMsg12_3 <ifChatNPCEasygoing Accept>
 	Msg12_4 <Pathetic. You can't even think of anything to say... Well, you've prolonged the inevitable for a while, but now it's time for you to die. Men, destroy this loser...>
-	CMsg12_4 <ifNPCPassionate Accept>
+	CMsg12_4 <ifChatNPCPassionate Accept>
 	Msg12_5 <I'd love to stay and chat some more... actually, no, I wouldn't. But I would like to stay and watch my men destroy you... sadly, I must be off. Urgent business awaits.>
-	CMsg12_5 <ifNPCCheerful Accept>
+	CMsg12_5 <ifChatNPCCheerful Accept>
 	Msg12_6 <I expected that you'd prove to be useless. Now, my men will finish you off. I must go...>
-	CMsg12_6 <ifNPCMelancholy Accept>
+	CMsg12_6 <ifChatNPCMelancholy Accept>
 
 	Msg13 <You really think that a beast like me can find salvation? You must be a true believer... My head is so confused... Men, finish him off. I have to go away.>
 	Msg13_1 <I can't believe that... I'd love to stay and chat some more, but you've already wasted enough of my time. I must be off... my men will handle you by themselves.>
-	CMsg13_1 <ifNPCSociable Accept>
+	CMsg13_1 <ifChatNPCSociable Accept>
 	Msg13_2 <I will think about what you've said. After my men kill you it will make a nice speech to remember you by. Goodbye, \PC .>
-	CMsg13_2 <ifNPCShy Accept>
+	CMsg13_2 <ifChatNPCShy Accept>
 	Msg13_3 <You've got a pretty strong belief in human nature. I'm afraid I can't share your convictions... I must be off, but my men will prove more than able to destroy you themselves...>
-	CMsg13_3 <ifNPCEasygoing Accept>
+	CMsg13_3 <ifChatNPCEasygoing Accept>
 	Msg13_4 <You're lying! I can't believe that... I have to go, but my men will destroy you!>
-	CMsg13_4 <ifNPCPassionate Accept>
+	CMsg13_4 <ifChatNPCPassionate Accept>
 	Msg13_5 <Ah, you're an optimist. I like that. But, right now I have to go... my men will have to destroy you by themselves.>
-	CMsg13_5 <ifNPCCheerful Accept>
+	CMsg13_5 <ifChatNPCCheerful Accept>
 	Msg13_6 <There is no hope for me. I feel so confused... I have to go, but my men will defeat you...>
-	CMsg13_6 <ifNPCMelancholy Accept>
+	CMsg13_6 <ifChatNPCMelancholy Accept>
 
 	Msg14 <There's uncertainty in your voice... I know that my destiny is already sealed, and it is to become the lord over this entire planet! Men, finish him off... I have business elsewhere...>
 	Msg14_1 <I can tell just by listening to you that you don't mean it. There's no passion or conviction in your voice. I guess you're just trying to postpone your own death... Well, the time is up. My troops will destroy you now.>
-	CMsg14_1 <ifNPCSociable Accept>
+	CMsg14_1 <ifChatNPCSociable Accept>
 	Msg14_2 <I have no more time for this. I'm going, but my men will be more than capable of defeating you themselves.>
-	CMsg14_2 <ifNPCShy Accept>
+	CMsg14_2 <ifChatNPCShy Accept>
 	Msg14_3 <Even if there was some way, it'd be far too much work. Why would I want to give up my position with the future rulers of the Earth? I have to go, but will leave my troops here to finish you off. Goodbye, \PC .>
-	CMsg14_3 <ifNPCEasygoing Accept>
+	CMsg14_3 <ifChatNPCEasygoing Accept>
 	Msg14_4 <You don't sound very certain of that. This has been nothing but a waste of time... I will go now, but leave my men to destroy you!>
-	CMsg14_4 <ifNPCPassionate Accept>
+	CMsg14_4 <ifChatNPCPassionate Accept>
 	Msg14_5 <You still don't get it... I don't want any help, I don't need any help... But in a minute, you're going to need some. I have to go but my men are more than capable of killing you themselves. Goodbye, \PC .>
-	CMsg14_5 <ifNPCCheerful Accept>
+	CMsg14_5 <ifChatNPCCheerful Accept>
 	Msg14_6 <I can tell from the sound of your voice that even you don't believe that. Goodbye, old friend... my men will make your death swift and painless, I'm sure...>
-	CMsg14_6 <ifNPCMelancholy Accept>
+	CMsg14_6 <ifChatNPCMelancholy Accept>
 
 	Prompt1 <Actually, I'm here to destroy you.>
 	pROMPt1_1 <I came here today to kill you.>
@@ -450,116 +450,116 @@ sub
 		result7 <Say 9 PCLover E2 NewChat>
 		Msg1 <So, did you speak with \ELEMENT 4 ? I was worried when I didn't hear back from you. I saw on the news there was a battle near \ELEMENT 3 , and some mecha escaped to \ELEMENT 5 . Were you two involved in that?>
 		Msg1_1 <I saw on the news there was a big mecha battle near \ELEMENT 3 ... The guardians caught some \ELEMENT 6 pilots trying to escape to \ELEMENT 5 . Did you and \ELEMENT 4 have anything to do with that? What happened? Tell me everything.>
-		CMsg1_1 <ifNPCSociable Accept>
+		CMsg1_1 <ifChatNPCSociable Accept>
 		Msg1_2 <I heard about your fight in \ELEMENT 3 . You might want to know that the survivors from that battle were spotted heading for \ELEMENT 5 . So, I take it \ELEMENT 4 was involved?>
-		CMsg1_2 <ifNPCShy Accept>
+		CMsg1_2 <ifChatNPCShy Accept>
 		Msg1_3 <I heard about your fight in \ELEMENT 3 . According to the net, those mecha you destroyed belonged to \ELEMENT 6 , and were operating out of \ELEMENT 5 . I couldn't find anything about \ELEMENT 4 but I'm assuming \OPR E4 was behind it.>
-		CMsg1_3 <ifNPCEasygoing Accept>
+		CMsg1_3 <ifChatNPCEasygoing Accept>
 		Msg1_4 <Are you okay? I heard you were ambushed by some \ELEMENT 6 meks! The vidnews said the survivors were caught trying to get to \ELEMENT 5 ... \ELEMENT 4 didn't have anything to do with this, did \OPR E4 ?>
-		CMsg1_4 <ifNPCPassionate Accept>
+		CMsg1_4 <ifChatNPCPassionate Accept>
 		Msg1_5 <I saw on the vidnews that you fought a team of \ELEMENT 6 mecha from \ELEMENT 5 ... It looked like you kicked a truckload of ass! \ELEMENT 4 wasn't behind that fight, was \OPR E4 ?>
-		CMsg1_5 <ifNPCCheerful Accept>
+		CMsg1_5 <ifChatNPCCheerful Accept>
 		Msg1_6 <I saw on the vid that you fought a team of \ELEMENT 6 mecha from \ELEMENT 5 ... It certainly looked like there were no survivors. \ELEMENT 4 wasn't behind that fight, was \OPR E4 ?>
-		CMsg1_6 <ifNPCMelancholy Accept>
+		CMsg1_6 <ifChatNPCMelancholy Accept>
 
 		Msg2 <I should've known something like that could happen. The world seems to be getting crazier every day... I feel like we're moving towards something big and really bad. Look, I've got something else to tell you... Want to hear?>
 		Msg2_1 <That bastard... How could \OPR E4 betray all \PPR E4 old friends like that? Um, \PC ? I have something to tell you... something I've waited years to say...>
-		CMsg2_1 <ifNPCSociable Accept>
+		CMsg2_1 <ifChatNPCSociable Accept>
 		Msg2_2 <I should have known. Sorry for getting you involved in this. Um, if you have a few minutes before moving on, there's something else... I've got something to tell you, that I've been holding onto for a long time...>
-		CMsg2_2 <ifNPCShy Accept>
+		CMsg2_2 <ifChatNPCShy Accept>
 		Msg2_3 <Yikes. I had no idea \OPR E4 'd do something like that... I wouldn't have asked you to go if I'd known. Look, there's something I want to tell you... I've wanted to tell you for a long time...>
-		CMsg2_3 <ifNPCEasygoing Accept>
+		CMsg2_3 <ifChatNPCEasygoing Accept>
 		Msg2_4 <If I ever see \ELEMENT 4 again, \OPR E4 will not live to regret harming to you. And I'm very sorry for getting you involved. Hey, before you go, I had another reason for calling you... There's something I've wanted to say a long time.>
-		CMsg2_4 <ifNPCPassionate Accept>
+		CMsg2_4 <ifChatNPCPassionate Accept>
 		Msg2_5 <No worries, I knew you could take \SPR E4 . While you're here, \PC , there was another reason why I contacted you... there's something I've wanted to say to you for a long long time...>
-		CMsg2_5 <ifNPCCheerful Accept>
+		CMsg2_5 <ifChatNPCCheerful Accept>
 		Msg2_6 <Don't tell me whether or not you killed \SPR E4 ... I don't want to know. \PC , there was another reason why you were the one I called about this problem... There's something I've needed to tell you, ever since we were in school...>
-		CMsg2_6 <ifNPCMelancholy Accept>
+		CMsg2_6 <ifChatNPCMelancholy Accept>
 
 		Msg3 <I get the feeling that I won't be hearing from \ELEMENT 4 ever again. Something big is getting ready to happen and I just know it isn't going to be good. Um, I have something I never told you before... if you want to listen...>
 		Msg3_1 <I can imagine what must have happened... Alright. Look, there was another reason why I called you here... \PC , I have something to tell you... this is something I should have said years ago.>
-		CMsg3_1 <ifNPCSociable Accept>
+		CMsg3_1 <ifChatNPCSociable Accept>
 		Msg3_2 <I see. Um, if you have a few spare minutes, there's something else... I've got something to tell you, that I've been holding onto for a long time...>
-		CMsg3_2 <ifNPCShy Accept>
+		CMsg3_2 <ifChatNPCShy Accept>
 		Msg3_3 <I probably don't. Guess I was being too soft-hearted on \ELEMENT 4 , huh? Um, if you've got the time, there's another reason why I called you... there's something I wanted to say.>
-		CMsg3_3 <ifNPCEasygoing Accept>
+		CMsg3_3 <ifChatNPCEasygoing Accept>
 		Msg3_4 <You'd be surprised... But, from looking in your eyes, I can tell that things didn't go well. Look, before anything else crazy happens, there's something I need to get off my chest... it's something I should have said to you years ago.>
-		CMsg3_4 <ifNPCPassionate Accept>
+		CMsg3_4 <ifChatNPCPassionate Accept>
 		Msg3_5 <Then I won't ask again. The world is going crazy... but before the sky falls, there's something I need to get off my chest. I should have told you this ages ago.>
-		CMsg3_5 <ifNPCCheerful Accept>
+		CMsg3_5 <ifChatNPCCheerful Accept>
 		Msg3_6 <Just by saying that you've told me everything I need to know. I don't know how these recent troubles will end, but it isn't going to be well... There's something I have to tell you... I should have told you long ago.>
-		CMsg3_6 <ifNPCMelancholy Accept>
+		CMsg3_6 <ifChatNPCMelancholy Accept>
 
 		Msg4 <Really? Still, I get the feeling that I won't hear from \ELEMENT 4 ever again... and some big things are soon going to happen. Before then I have something to tell you, if you want to hear it...>
 		Msg4_1 <Despite that assurance, I have a feeling that I won't ever be hearing from \ELEMENT 4 ever again. Thanks for your help. Before you leave, you should know there was another reason why I contacted you. I have to tell you something...>
-		CMsg4_1 <ifNPCSociable Accept>
+		CMsg4_1 <ifChatNPCSociable Accept>
 		Msg4_2 <That's good to hear. Look, before you leave again... there's something you should know.>
-		CMsg4_2 <ifNPCShy Accept>
+		CMsg4_2 <ifChatNPCShy Accept>
 		Msg4_3 <That wasn't so hard. Hey, before you go, there was something else I wanted to talk about... There's something I've needed to get off my chest for a long time.>
-		CMsg4_3 <ifNPCEasygoing Accept>
+		CMsg4_3 <ifChatNPCEasygoing Accept>
 		Msg4_4 <See? There's a reason why I believe in you. You're simply the best. Before you leave, there's something I absolutely have to tell you... I've needed to say this ever since we graduated but never had a chance...>
-		CMsg4_4 <ifNPCPassionate Accept>
+		CMsg4_4 <ifChatNPCPassionate Accept>
 		Msg4_5 <I knew you were the right one to call! But, your skill as a cavalier wasn't the only thing on my mind when I contacted you... there's something I've wanted to tell you for a long time.>
-		CMsg4_5 <ifNPCCheerful Accept>
+		CMsg4_5 <ifChatNPCCheerful Accept>
 		Msg4_6 <Nothing ever works out "all for the best", but I'm glad things didn't end as badly as they could have. Um, if you have a bit of time before you have to go, there's something I've wanted to speak with you about.>
-		CMsg4_6 <ifNPCMelancholy Accept>
+		CMsg4_6 <ifChatNPCMelancholy Accept>
 
 		Msg5 <You're probably right. It was nice seeing you again.>
 		Msg5_1 <You're probably right... The world is changing, it's foolish to try hanging on to the past. Still I'm very glad that we could see each other again.>
-		CMsg5_1 <ifNPCSociable Accept>
+		CMsg5_1 <ifChatNPCSociable Accept>
 		Msg5_2 <Yeah, I understand...>
-		CMsg5_2 <ifNPCShy Accept>
+		CMsg5_2 <ifChatNPCShy Accept>
 		Msg5_3 <Okay, it wasn't very important, anyhow...>
-		CMsg5_3 <ifNPCEasygoing Accept>
+		CMsg5_3 <ifChatNPCEasygoing Accept>
 		Msg5_4 <I know, I know, but it can be so hard to let go of certain things...>
-		CMsg5_4 <ifNPCPassionate Accept>
+		CMsg5_4 <ifChatNPCPassionate Accept>
 		Msg5_5 <That's good advice... I'll try to remember it. It was very nice seeing you again.>
-		CMsg5_5 <ifNPCCheerful Accept>
+		CMsg5_5 <ifChatNPCCheerful Accept>
 		Msg5_6 <Okay. I didn't think you'd be interested...>
-		CMsg5_6 <ifNPCMelancholy Accept>
+		CMsg5_6 <ifChatNPCMelancholy Accept>
 
 		Msg6 <All these years... Ever since our school days together, really... I've cared very deeply for you. I always wanted to be near you. That's why I decided to be a pilot... I don't guess there's any way my feelings could be returned...>
 		Msg6_1 <I wrote you a thousand letters explaining my feelings to you, but deleted them all. I think I love you... I've felt this way ever since we met the first time all those years ago. You must not feel the same way, or your would have noticed.>
-		CMsg6_1 <ifNPCSociable Accept>
+		CMsg6_1 <ifChatNPCSociable Accept>
 		Msg6_2 <I'm no good with words. You know that. But... I care very deeply for you, \PC . I always have.>
-		CMsg6_2 <ifNPCShy Accept>
+		CMsg6_2 <ifChatNPCShy Accept>
 		Msg6_3 <Back in school I thought you were really cute. I still do, really... I was kind of hoping that by calling you here maybe something could start between us. That's silly, I guess.>
-		CMsg6_3 <ifNPCEasygoing Accept>
+		CMsg6_3 <ifChatNPCEasygoing Accept>
 		Msg6_4 <I love you, \PC ! I always have! How could you not have known... I know there's no way my feelings could ever be returned, but I thought you should know...>
-		CMsg6_4 <ifNPCPassionate Accept>
+		CMsg6_4 <ifChatNPCPassionate Accept>
 		Msg6_5 <Back in school I used to have such a big crush on you. I still do, I guess. I used to imagine that maybe we could get together sometime but that's just a dream.>
-		CMsg6_5 <ifNPCCheerful Accept>
+		CMsg6_5 <ifChatNPCCheerful Accept>
 		Msg6_6 <I know you could never return these feelings, \PC , but... I care very much about you. I always have, really...>
-		CMsg6_6 <ifNPCMelancholy Accept>
+		CMsg6_6 <ifChatNPCMelancholy Accept>
 
 		Msg7 <\ELEMENT 2 confessed \PPR E2 feelings for you.>
 		Msg8 <I know. I knew before you told me... but I wanted to let you know how I feel. I'm still very glad that we could see each other again, and I hope that you'll come by to talk every once in a while.>
 		Msg8_1 <Please don't tell anyone else what I just said, I'd die of embarassment.>
-		CMsg8_1 <ifNPCSociable Accept>
+		CMsg8_1 <ifChatNPCSociable Accept>
 		Msg8_2 <I see. Well, I'll see you later, \PC .>
-		CMsg8_2 <ifNPCShy Accept>
+		CMsg8_2 <ifChatNPCShy Accept>
 		Msg8_3 <That's all right. I just wanted to let you know. Be seeing you around, \PC .>
-		CMsg8_3 <ifNPCEasygoing Accept>
+		CMsg8_3 <ifChatNPCEasygoing Accept>
 		Msg8_4 <What a fool I've been... I'm sorry for telling you that... I hope you can forgive me...>
-		CMsg8_4 <ifNPCPassionate Accept>
+		CMsg8_4 <ifChatNPCPassionate Accept>
 		Msg8_5 <I'm a bit disappointed that you don't feel the same way I do... but I'll be happy to just be friends, OK? Don't be a stranger. I'll see you later, \PC .>
-		CMsg8_5 <ifNPCCheerful Accept>
+		CMsg8_5 <ifChatNPCCheerful Accept>
 		Msg8_6 <I expected that you would feel that way... that's why I never told you. Goodbye, \PC ... maybe we can meet again some day.>
-		CMsg8_6 <ifNPCMelancholy Accept>
+		CMsg8_6 <ifChatNPCMelancholy Accept>
 
 		Msg9 <Really? I should have told you that years ago! You've made me very happy! Um, if you're not doing anything, maybe we could spend some time together?>
 		Msg9_1 <You don't know how hard it was to keep my feelings a secret all these years! I should have told you back in school... If you're not doing anything, maybe we could get together sometime?>
-		CMsg9_1 <ifNPCSociable Accept>
+		CMsg9_1 <ifChatNPCSociable Accept>
 		Msg9_2 <I'm glad that you feel the same. I'd like to spend more time with you, if you'd like the same...>
-		CMsg9_2 <ifNPCShy Accept>
+		CMsg9_2 <ifChatNPCShy Accept>
 		Msg9_3 <I'd like to spend some more time with you, if that's alright. We can go adventure together. Or just hang out. I really don't care, I'd just like to be with you.>
-		CMsg9_3 <ifNPCEasygoing Accept>
+		CMsg9_3 <ifChatNPCEasygoing Accept>
 		Msg9_4 <In that case... take me with you! Something bad is happening in the world and I want the chance to fight it! Together, we can stand against \ELEMENT 6 . I know we can!>
-		CMsg9_4 <ifNPCPassionate Accept>
+		CMsg9_4 <ifChatNPCPassionate Accept>
 		Msg9_5 <In that case, maybe we can spend time together someday? I'd like to join you on an adventure. It sounds exciting!>
-		CMsg9_5 <ifNPCCheerful Accept>
+		CMsg9_5 <ifChatNPCCheerful Accept>
 		Msg9_6 <Wow, that's a surprise... I never expected you to return my feelings! I feel strangely happy all of a sudden...>
-		CMsg9_6 <ifNPCMelancholy Accept>
+		CMsg9_6 <ifChatNPCMelancholy Accept>
 
 		Prompt1 <\ELEMENT 4 attacked me.>
 		Prompt1_1 <I was attacked by \ELEMENT 4 .>
@@ -588,76 +588,76 @@ sub
 		result3 <NewChat Say 5>
 		Msg1 <You were right. I was following a dark path... I don't want to work for \ELEMENT 6 anymore.>
 		Msg1_1 <You were right... I am heading down a dark path... I feel like I am going crazy... I don't want this anymore. I don't want anything.>
-		CMsg1_1 <ifNPCSociable Accept>
+		CMsg1_1 <ifChatNPCSociable Accept>
 		Msg1_2 <I thought it over. You're right.>
-		CMsg1_2 <ifNPCShy Accept>
+		CMsg1_2 <ifChatNPCShy Accept>
 		Msg1_3 <So this is what a nervous breakdown feels like. You were right, \PC , about everything... and I was so wrong. I can't work for \ELEMENT 6 anymore. I'm broken.>
-		CMsg1_3 <ifNPCEasygoing Accept>
+		CMsg1_3 <ifChatNPCEasygoing Accept>
 		Msg1_4 <It's not easy for me to admit that you could be right about anything... but I fear you were. I've decided to leave \ELEMENT 6 ... I will find my own path.>
-		CMsg1_4 <ifNPCPassionate Accept>
+		CMsg1_4 <ifChatNPCPassionate Accept>
 		Msg1_5 <I think you could be right... there may still be hope for a demon like me. I was heading for self-destruction, \PC , but you refused to give up on me... I'm just so sorry for all the harm I've caused...>
-		CMsg1_5 <ifNPCCheerful Accept>
+		CMsg1_5 <ifChatNPCCheerful Accept>
 		Msg1_6 <\PC ... your words affected me. I think I may be crazy... or that I was crazy before... but I just can't go on like this. Screw \ELEMENT 6 ... from now on I choose my own path.>
-		CMsg1_6 <ifNPCMelancholy Accept>
+		CMsg1_6 <ifChatNPCMelancholy Accept>
 		Msg1_7 <For a long time, I was a servant of the worst evil... I was blinded by jealousy, by ambition... I did some very horrible things. You refused to give up on me, and for that I thank you.>
-		CMSg1_7 <ifNPCHeroic Accept>
+		CMSg1_7 <ifChatNPCHeroic Accept>
 
 		Msg2 <You convinced \ELEMENT 4 to quit \ELEMENT 6 .>
 		Msg3 <I think I've needed help for a long time... You've shown me something I had almost forgotten. I will never be the same as I was, but I can try to start a new life.>
 		Msg3_1 <I can't accept any help from you, I've already taken too many things... I know that I won't have a lot of time left once \ELEMENT 6 discovers I've left them. What I can do is tell you what they've been planning...>
-		CMsg3_1 <ifNPCSociable Accept>
+		CMsg3_1 <ifChatNPCSociable Accept>
 		Msg3_2 <I will. To think of all the things I've done for \ELEMENT 6 ... it's more than I can bear.>
-		CMsg3_2 <ifNPCShy Accept>
+		CMsg3_2 <ifChatNPCShy Accept>
 		Msg3_3 <Yeah, if I thought I was going to make it any longer than a week after \ELEMENT 6 finds out I've betrayed them, I'd check myself into therapy right away. Even if it means my death I can no longer take part in their evil plans...>
-		CMsg3_3 <ifNPCEasygoing Accept>
+		CMsg3_3 <ifChatNPCEasygoing Accept>
 		Msg3_4 <Are you implying that I've lost my mind? I think you could be right about that, as well... \ELEMENT 6 has to be stopped. I wasn't strong enough to resist their promises...>
-		CMsg3_4 <ifNPCPassionate Accept>
+		CMsg3_4 <ifChatNPCPassionate Accept>
 		Msg3_5 <You really think there could be redemption for someone who's done the things I have? You must be an optimist. I'm not certain of that... but I do know that I cannot remain with \ELEMENT 6 .>
-		CMsg3_5 <ifNPCCheerful Accept>
+		CMsg3_5 <ifChatNPCCheerful Accept>
 		Msg3_6 <No. Either \ELEMENT 6 will find me and kill me for betraying them, or one of the many enemies I made while in their service will find me and do the same.>
-		CMsg3_6 <ifNPCMelancholy Accept>
+		CMsg3_6 <ifChatNPCMelancholy Accept>
 
 		Msg4 <I've decided to quit \ELEMENT 6 ... I can never go back to the way things were, but I can make the most of that time I have left... I feel that without the GARU serum my body is dying... at least I will die a person, not a monster.>
 		Msg4_1 <It's \ELEMENT 6 that needs to be punished... If I can give the rest of my life any meaning, it will be through telling the world exactly what they're planning.>
-		CMsg4_1 <ifNPCSociable Accept>
+		CMsg4_1 <ifChatNPCSociable Accept>
 		Msg4_2 <Don't waste your energy. It's \ELEMENT 6 that you should be concerned about.>
-		CMsg4_2 <ifNPCShy Accept>
+		CMsg4_2 <ifChatNPCShy Accept>
 		Msg4_3 <You're probably right. For all the evil things I've done, I no longer deserve to live... but let me tell you this, as bad as I am, \ELEMENT 6 is a hundred times worse.>
-		CMsg4_3 <ifNPCEasygoing Accept>
+		CMsg4_3 <ifChatNPCEasygoing Accept>
 		Msg4_4 <All I wanted was to be strong, but \ELEMENT 6 saw my weakness... I acted as their puppet for far too long. Nothing remains but the empty shell of a monster that used to be a human being.>
-		CMsg4_4 <ifNPCPassionate Accept>
+		CMsg4_4 <ifChatNPCPassionate Accept>
 		Msg4_5 <I'll try to avoid that fate for as long as I can, thanks... \ELEMENT 6 knew exactly how to mold me, to make me their puppet. My part in their evil plan will be replaced quite quickly, I'm certain.>
-		CMsg4_5 <ifNPCCheerful Accept>
+		CMsg4_5 <ifChatNPCCheerful Accept>
 		Msg4_6 <Oh, that's going to happen soon enough... Either \ELEMENT 6 will hunt me down for betraying them, or one of the many enemies I've made while in their service will find me first. My only hope now is that I die a human being, not a monster.>
-		CMsg4_6 <ifNPCMelancholy Accept>
+		CMsg4_6 <ifChatNPCMelancholy Accept>
 
 		Msg5 <Control. They want to control everything. And I was so willing to get it for them, so long as they fed my delusions... You were always stronger than me, \PC . It may be up to the people like you to protect this world from them.>
 		Msg5_1 <They want the Earth. They've acquired a secret weapon to use against the Federation... But from what I know, I'm not certain they'll be able to control it. We could have the Night of Fire all over again...>
-		CMsg5_1 <ifNPCSociable Accept>
+		CMsg5_1 <ifChatNPCSociable Accept>
 		Msg5_2 <I never asked. All I wanted was power... their motivations didn't matter to me.>
-		CMsg5_2 <ifNPCShy Accept>
+		CMsg5_2 <ifChatNPCShy Accept>
 		Msg5_3 <World domination. They've located an ancient prezero superweapon, and are planning to use it against the Federation. The one good thing is that they don't have all the parts to activate it yet... there's still time to stop them.>
-		CMsg5_3 <ifNPCEasygoing Accept>
+		CMsg5_3 <ifChatNPCEasygoing Accept>
 		Msg5_4 <They're bringing about the second apocalypse. Destroy everything, then remake the world in their own image... They're planning to use a doomsday weapon from the age of superpowers. I only hope there's still enough time to stop them.>
-		CMsg5_4 <ifNPCPassionate Accept>
+		CMsg5_4 <ifChatNPCPassionate Accept>
 		Msg5_5 <You know, the usual... world domination mostly. They've got a secret weapon hidden somewhere in the territories. I'm not sure on all the details, I think it may use prezero tech... Anyhow, once they finish it, it'll be bad news.>
-		CMsg5_5 <ifNPCCheerful Accept>
+		CMsg5_5 <ifChatNPCCheerful Accept>
 		Msg5_6 <Power and destruction. They seek to control the Earth, but if they aren't stopped I fear they'll only succeed in destroying it. It's the Age of Superpowers all over again.>
-		CMsg5_6 <ifNPCMelancholy Accept>
+		CMsg5_6 <ifChatNPCMelancholy Accept>
 
 		Msg10 <I've decided to quit \ELEMENT 6 ... but I still can't forgive you for what you've done. I'll be seeing you around, \PC ...>
 		Msg10_1 <You'll be pleased to know that your words did, in fact, affect me. I've decided to leave \ELEMENT 6 ... Don't think this makes us friends. I still haven't forgiven you... I never will, until you die...>
-		CMsg10_1 <ifNPCSociable Accept>
+		CMsg10_1 <ifChatNPCSociable Accept>
 		Msg10_2 <I'm leaving \ELEMENT 6 . I can't take any more of this madness... But I'll still be killing you. See you around, old friend...>
-		CMsg10_2 <ifNPCShy Accept>
+		CMsg10_2 <ifChatNPCShy Accept>
 		Msg10_3 <You should know, I've decided to quit \ELEMENT 6 . Some of the things you said made a lot of sense... Mind you, this changes nothing between the two of us. Next time we meet you'll have to fight for your life. Goodbye \PC .>
-		CMsg10_3 <ifNPCEasygoing Accept>
+		CMsg10_3 <ifChatNPCEasygoing Accept>
 		Msg10_4 <I can't go on with this... I refuse to let \ELEMENT 6 transform me into a monster! I'm good enough to destroy you even without enhancement... Next time we meet, I'll finally have my revenge!>
-		CMsg10_4 <ifNPCPassionate Accept>
+		CMsg10_4 <ifChatNPCPassionate Accept>
 		Msg10_5 <The stress from working with \ELEMENT 6 was just too much, so I decided to quit... now I can devote myself full time to my true passion, getting revenge against you. Next time we meet I'll definitely end your life. Goodbye \PC .>
-		CMsg10_5 <ifNPCCheerful Accept>
+		CMsg10_5 <ifChatNPCCheerful Accept>
 		Msg10_6 <I can take no more of this madness. I've decided to leave \ELEMENT 6 . Don't think this means our fight is over- if anything, it's only just beginning...>
-		CMsg10_6 <ifNPCMelancholy Accept>
+		CMsg10_6 <ifChatNPCMelancholy Accept>
 
 		Prompt1 <It's alright. You can get help.>
 		Prompt1_1 <You need help, \ELEMENT 4 ...>
@@ -685,45 +685,45 @@ sub
 		result2 <NewChat Say 3 Reputation 3 -d10 AdvancePlot 0>
 		Msg1 <So, did you speak with \ELEMENT 4 ? What's \OPR E4 gotten into?>
 		Msg1_1 <Hey, \PC . Have you been to speak with \ELEMENT 4 yet? I heard there was some kind of mecha battle outside of \ELEMENT 3 and was worried that you might have been involved.>
-		CMsg1_1 <ifNPCSociable Accept>
+		CMsg1_1 <ifChatNPCSociable Accept>
 		Msg1_2 <Did you speak with \ELEMENT 4 yet?>
-		CMsg1_2 <ifNPCShy Accept>
+		CMsg1_2 <ifChatNPCShy Accept>
 		Msg1_3 <Have you had a chance to find out what \ELEMENT 4 's been doing yet?>
-		CMsg1_3 <ifNPCEasygoing Accept>
+		CMsg1_3 <ifChatNPCEasygoing Accept>
 		Msg1_4 <I heard there was a mecha fight in \ELEMENT 3 , and had a bad feeling you were involved in it. Did you speak with \ELEMENT 4 !?>
-		CMsg1_4 <ifNPCPassionate Accept>
+		CMsg1_4 <ifChatNPCPassionate Accept>
 		Msg1_5 <Welcome back. So, did you talk to \ELEMENT 4 ?>
-		CMsg1_5 <ifNPCCheerful Accept>
+		CMsg1_5 <ifChatNPCCheerful Accept>
 		Msg1_6 <It's been a while since you left... I was starting to get worried. Did you speak with \ELEMENT 4 yet?>
-		CMsg1_6 <ifNPCMelancholy Accept>
+		CMsg1_6 <ifChatNPCMelancholy Accept>
 
 		Msg2 <So it's as I feared... \OPR E4 may well be beyond redemption. You know, I used to have strong feelings for both of you, while we were in school. I think I need to be alone for a while.>
 		Msg2_1 <I know there must be a good reason behind \ELEMENT 4 's actions... I can't believe \OPR E4 'd do these things otherwise... I won't give up on \SPR E4 !>
-		CMsg2_1 <ifNPCSociable Accept>
+		CMsg2_1 <ifChatNPCSociable Accept>
 		Msg2_2 <Well, at least you tried. It appears \OPR E4 is beyond our help now.>
-		CMsg2_2 <ifNPCShy Accept>
+		CMsg2_2 <ifChatNPCShy Accept>
 		Msg2_3 <What happened to us? Years ago we were all friends, now \ELEMENT 4 is trying to kill you... What's happening to the world?>
-		CMsg2_3 <ifNPCEasygoing Accept>
+		CMsg2_3 <ifChatNPCEasygoing Accept>
 		Msg2_4 <This shouldn't be happening... We were friends once, dammit! Doesn't that mean anything anymore? What's happening to the world?>
-		CMsg2_4 <ifNPCPassionate Accept>
+		CMsg2_4 <ifChatNPCPassionate Accept>
 		Msg2_5 <I take it from your presence here that you won the fight, then? No? That's too bad...>
-		CMsg2_5 <ifNPCCheerful Accept>
+		CMsg2_5 <ifChatNPCCheerful Accept>
 		Msg2_6 <This is too horrible... When we were in high school, I used to look up to both you and \ELEMENT 4 ... now you're trying to kill one another... I need some time alone, I think, to sort out my feelings...>
-		CMsg2_6 <ifNPCMelancholy Accept>
+		CMsg2_6 <ifChatNPCMelancholy Accept>
 
 		Msg3 <You don't have to say; I can tell what happened from your eyes. You know, I used to have strong feelings for both you and \SPR E4 , while we were in school. I think I need to be alone for a while.>
 		Msg3_1 <It must have been pretty bad, then...>
-		CMsg3_1 <ifNPCSociable Accept>
+		CMsg3_1 <ifChatNPCSociable Accept>
 		Msg3_2 <Then it would appear there's nothing else we can do.>
-		CMsg3_2 <ifNPCShy Accept>
+		CMsg3_2 <ifChatNPCShy Accept>
 		Msg3_3 <This is getting way more serious than I'd like...>
-		CMsg3_3 <ifNPCEasygoing Accept>
+		CMsg3_3 <ifChatNPCEasygoing Accept>
 		Msg3_4 <I can't believe what's happening to \ELEMENT 4 ... \OPR E4 was the brightest among us, once. If someone like \SPR E4 can fall so low I'm afraid for the future of our world.>
-		CMsg3_4 <ifNPCPassionate Accept>
+		CMsg3_4 <ifChatNPCPassionate Accept>
 		Msg3_5 <That can't be good...>
-		CMsg3_5 <ifNPCCheerful Accept>
+		CMsg3_5 <ifChatNPCCheerful Accept>
 		Msg3_6 <In that case, don't tell me any more... I can't bear to think of my dear school friends at each other's throats... What happened to us?>
-		CMsg3_6 <ifNPCMelancholy Accept>
+		CMsg3_6 <ifChatNPCMelancholy Accept>
 
 		Prompt1 <Yes; \OPR E4 attacked me.>
 		Prompt1_1 <\ELEMENT 4 attacked me.>
diff --git a/Series/TS_XRAN_aF--_Hunter.txt b/Series/TS_XRAN_aF--_Hunter.txt
index 7629022..ea463f6 100644
--- a/Series/TS_XRAN_aF--_Hunter.txt
+++ b/Series/TS_XRAN_aF--_Hunter.txt
@@ -97,17 +97,17 @@ sub
 	GoNoStart <SayAnything>
 	Msg1 <You should know that \ELEMENT 5 hired a bounty hunter to kill you. Goes by the name of \ELEMENT 4 ; was in town a while back asking questions. Be careful, there may be an ambush waiting when you leave town...>
 	Msg1_1 <I heard that you've been fighting against \NARRATIVE 2 . Word on the street is that they've been watching you very carefully. \ELEMENT 4 was hired to kill you... be careful, okay?>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <You should know \NARRATIVE 2 wants you dead, and they've ordered \ELEMENT 4 to make that happen. Watch your back, there could be an ambush waiting for you at any time.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <According to the rumors, you might not have long to live... \NARRATIVE 2 has sent \ELEMENT 4 after you. I just thought you'd like to know.>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <I have grave news... \NARRATIVE 2 has decided their battle with you must end, so they've ordered \ELEMENT 4 to kill you. They'll never give up, not until you're dead...>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <It's good to see you looking so healthy... people say you're the walking dead. I've learned that \NARRATIVE 2 ordered a hit against you and \ELEMENT 4 plans to collect. Keep your eyes open or you'll walk straight into an ambush.>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <You're walking dead... \NARRATIVE 2 ordered \ELEMENT 4 to kill you. Even if \OPR E4 fails it's only a matter of time before someone succeeds... Be careful, there could be an ambush waiting for you anywhere.>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 	Msg1_7 <I'm glad you made it here. There's a contract on your life, funded by \NARRATIVE 2 ... I heard it from my regular source. \ELEMENT 4 has been instructed to not return without your head. Be careful out there, alright?>
 	CMsg1_7 <ifG React 25 Accept>
 
@@ -115,31 +115,31 @@ sub
 	greeting <EndChat Say 1>
 	Msg1 <You have been a thorn in the side of \NARRATIVE 2 for long enough. So, I have been ordered to remove you, perminently...>
 	Msg1_1 <So we meet again. My masters have decided they can no longer tolerate your presence on this world. So, I have been sent to eliminate you.>
-	CMsg1_1 <if= P4 0 ifNPCSociable Accept>
+	CMsg1_1 <if= P4 0 ifChatNPCSociable Accept>
 	Msg1_2 <It's been decided that you must die.>
-	CMsg1_2 <if= P4 0 ifNPCShy Accept>
+	CMsg1_2 <if= P4 0 ifChatNPCShy Accept>
 	Msg1_3 <I hate to interrupt, but \NARRATIVE 2 has decided that you must die. You won't be leaving here alive.>
-	CMsg1_3 <if= P4 0 ifNPCEasygoing Accept>
+	CMsg1_3 <if= P4 0 ifChatNPCEasygoing Accept>
 	Msg1_4 <Hello once more, \PC ... My masters have told me that I no longer need to hold back. Today you will face the full extent of my power!>
-	CMsg1_4 <if= P4 0 ifNPCPassionate Accept>
+	CMsg1_4 <if= P4 0 ifChatNPCPassionate Accept>
 	Msg1_5 <Did you miss me? It's time for us to begin the dance once more. My masters in \NARRATIVE 2 have decided that you should die. It will be my pleasure to enact this order.>
-	CMsg1_5 <if= P4 0 ifNPCCheerful Accept>
+	CMsg1_5 <if= P4 0 ifChatNPCCheerful Accept>
 	Msg1_6 <Your worthless life has continued for far too long. Now, it is my task to end it.>
-	CMsg1_6 <if= P4 0 ifNPCMelancholy Accept>
+	CMsg1_6 <if= P4 0 ifChatNPCMelancholy Accept>
 	Msg1_7 <Hello \PC . I am \ELEMENT 4 ; \ELEMENT 5 hired me to kill you. Well, that's enough for introductions... now we must fight!!!>
 	CMsg1_7 <if= P4 1 Accept>
 	Msg1_11 <It's a pleasure to finally meet the famous \PC . You've given \NARRATIVE 2 a lot of trouble, I'm afraid... It's time that you were silenced perminantly.>
-	CMsg1_11 <if= P4 1 ifNPCSociable Accept>
+	CMsg1_11 <if= P4 1 ifChatNPCSociable Accept>
 	Msg1_12 <I've been sent by \NARRATIVE 2 ... they want you to die, now.>
-	CMsg1_12 <if= P4 1 ifNPCShy Accept>
+	CMsg1_12 <if= P4 1 ifChatNPCShy Accept>
 	Msg1_13 <Sorry to interrupt your day, but I've been sent by \NARRATIVE 2 to eliminate you. The name's \ELEMENT 4 .>
-	CMsg1_13 <if= P4 1 ifNPCEasygoing Accept>
+	CMsg1_13 <if= P4 1 ifChatNPCEasygoing Accept>
 	Msg1_14 <You have been declared an enemy of \NARRATIVE 2 ... And I've been sent to destroy you!>
-	CMsg1_14 <if= P4 1 ifNPCPassionate Accept>
+	CMsg1_14 <if= P4 1 ifChatNPCPassionate Accept>
 	Msg1_15 <Ah, \PC , it's a pleasure to finally meet. My name is \ELEMENT 4 and I will be killing you for \NARRATIVE 2 today.>
-	CMsg1_15 <if= P4 1 ifNPCCheerful Accept>
+	CMsg1_15 <if= P4 1 ifChatNPCCheerful Accept>
 	Msg1_16 <Your death approaches, \PC ... I have been hired by \NARRATIVE 2 to end your worthless life.>
-	CMsg1_16 <if= P4 1 ifNPCMelancholy Accept>
+	CMsg1_16 <if= P4 1 ifChatNPCMelancholy Accept>
 
 end
 inv
diff --git a/Series/TS_XRAN_aF--_PriceyHead.txt b/Series/TS_XRAN_aF--_PriceyHead.txt
index eff0984..4736144 100644
--- a/Series/TS_XRAN_aF--_PriceyHead.txt
+++ b/Series/TS_XRAN_aF--_PriceyHead.txt
@@ -53,13 +53,13 @@ sub
 
 	Msg1 <Hey \PC ! I've been looking around for you... I heard something that you ought to know. There's someone trying to kill you!>
 	Msg1_1 <I hear a lot of rumors. I heard one that might interest you... Apparently, there's someone trying to kill you.>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <I have a message for you. There's someone trying to kill you.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_5 <I'm glad I found you! There's something you should know... there's a contract on your life!>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <Hey, \PC , I've got some news for you... There's a contract on your life. Someone wants to see you dead.>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 	Msg1_7 <You're \PC , right? I heard something the other day that you really ought to know... there's a contract out on your life. Someone's trying to kill you.>
 	CMsg1_7 <ifG 50 React Accept>
 	Msg1_8 <Hey, \PC . I don't like you much but I wouldn't be a very good person if I didn't tell you what I heard. There's a price on your head. Someone's trying to kill you.>
@@ -67,43 +67,43 @@ sub
 
 	Msg4 <I was at the shop fixing up my mecha when I overheard some zoners talking about their next hit... you. The contract's being funded by \NARRATIVE 2 . That's all I know, but \ELEMENT 4 was also there, and may be able to tell you more.>
 	Msg4_1 <I was getting my mecha repaired in the deadzone- don't ask why. Anyhow I overheard some bandits talking. They were hired to kill you by \NARRATIVE 2 . \ELEMENT 4 was there as well and might be able to provide more information.>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <It's \NARRATIVE 2 behind the contract. \ELEMENT 4 has better underworld connections than I do... \OPR E4 could tell you more.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <From what I've heard it's \NARRATIVE 2 behind the contract. I don't know that much about it myself... My friend \ELEMENT 4 has some underworld contacts and may be able to tell you more, if you're interested.>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <It's \NARRATIVE 2 behind it. You want to live long enough to find out why? You're going to need some help. Look, go talk with \ELEMENT 4 .>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <It's your old enemies \NARRATIVE 2 of course. Lucky for you I heard some zoners talking about it at the repair shop... I don't know much about these things, but I know who does. Go see \ELEMENT 4 . Don't worry; \OPR E4 can be trusted.>
-	CMsg4_5 <ifNPCCheerful Accept>
+	CMsg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <Sometimes I visit pirate netsites... You know, just keeping an eye on the dark side of human nature. There was a bounty offer from \NARRATIVE 2 for anyone who could kill you. If you want to find out more, \ELEMENT 4 's the person to see.>
-	CMsg4_6 <ifNPCMelancholy Accept>
+	CMsg4_6 <ifChatNPCMelancholy Accept>
 	Msg4_7 <I was hanging out in kind of a seedy place... you know the sort. Anyhow, some guy came up to me and offered me the contract to take you out. Said he was working for \NARRATIVE 2 . \ELEMENT 4 was also there and may be able to tell you more.>
-	CMsg4_7 <ifNPCChaotic Accept>
+	CMsg4_7 <ifChatNPCChaotic Accept>
 
 	Msg5 <I overheard some bandits at the repair shop talking about their next big hit... Every gangster in the dead zone is apparently gunning for your hide now. \ELEMENT 4 was also there with me, and may be able to tell you more details.>
 	Msg5_1 <While getting repairs I overheard some zoners talking about the hit. I don't know what you did to piss \NARRATIVE 2 off, but they really want you dead... \ELEMENT 4 was there at the same time. Maybe \OPR E4 can tell you more.>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <I don't know any way to help you, but I know someone who might. \ELEMENT 4 has some underworld connections. Believe me, you can trust \SPR E4 .>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <What you need is someone with underworld connections, to help get to the bottom of things. My buddy \ELEMENT 4 may be just the person.>
-	CMsg5_3 <ifNPCEasygoing Accept>
+	CMsg5_3 <ifChatNPCEasygoing Accept>
 	Msg5_4 <Don't blame me, I'm only trying to help! Look, we heard some bandits talking about it at the garage. I doubt you have much to worry about from them, but there's others on the way. \ELEMENT 4 could probably tell you more than I can.>
-	CMsg5_4 <ifNPCPassionate Accept>
+	CMsg5_4 <ifChatNPCPassionate Accept>
 	Msg5_5 <Forewarned is forearmed, I say. As long as you already know who hired these killers you might as well find out where they're coming from... I think my friend \ELEMENT 4 could help you there.>
-	CMsg5_5 <ifNPCCheerful Accept>
+	CMsg5_5 <ifChatNPCCheerful Accept>
 	Msg5_6 <Unfortunately that's all I know. I overheard some bandits talking about it at the machine shop. I do know who might be able to tell you more... you should talk with \ELEMENT 4 .>
-	CMsg5_6 <ifNPCMelancholy Accept>
+	CMsg5_6 <ifChatNPCMelancholy Accept>
 
 	Msg6 <\ELEMENT 4 is in \SCENE EScene 4 right now.>
 	Msg6_1 <The last time I was talking to \SPR E4 \OPR E4 was in \SCENE EScene 4 . That's the best place to start looking.>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <You can find \SPR E4 in \SCENE EScene 4 .>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <I believe \OPR E4 lives in \SCENE EScene 4 , but I could be wrong.>
-	CMsg6_3 <ifNPCEasygoing Accept>
+	CMsg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <\ELEMENT 4 lives in \SCENE EScene 4 ... You should hurry.>
-	CMsg6_4 <ifNPCPassionate Accept>
+	CMsg6_4 <ifChatNPCPassionate Accept>
 
 	Prompt1 <Are you sure!? Who?>
 	Prompt1_1 <Who'd want to kill me?>
@@ -184,90 +184,90 @@ sub
 		%    Should mention that next episode will happen in \ELEMENT 3
 		Msg1 <That did it. You should have no problem from those killers from now on... At least, not until \NARRATIVE 2 regroups. I heard that some of the bandits were seen fleeing for \ELEMENT 3 .>
 		Msg1_1 <A major part of the crime network has been destroyed, thanks to you. You should be safe for a while at least. I heard that some of the gang members were seen fleeing to \ELEMENT 3 . It won't take \NARRATIVE 2 long to regroup.>
-		CMsg1_1 <ifNPCSociable Accept>
+		CMsg1_1 <ifChatNPCSociable Accept>
 		Msg1_2 <The gang has been dispersed, though \NARRATIVE 2 won't give up that easily. Some of their mecha were seen heading for \ELEMENT 3 .>
-		CMsg1_2 <ifNPCShy Accept>
+		CMsg1_2 <ifChatNPCShy Accept>
 		Msg1_3 <That should get \NARRATIVE 2 off your back for a while. Some of the gang's mecha were seen fleeing to \ELEMENT 3 ... I don't know what they're doing, but you're probably going to find out.>
-		CMsg1_3 <ifNPCEasygoing Accept>
+		CMsg1_3 <ifChatNPCEasygoing Accept>
 		Msg1_4 <Justice has been done. The murder gang has been dispersed to the four winds... I heard some survivors fled towards \ELEMENT 3 . This is a major blow to \NARRATIVE 2 !>
-		CMsg1_4 <ifNPCPassionate Accept>
+		CMsg1_4 <ifChatNPCPassionate Accept>
 		Msg1_5 <You did it! Those killers won't be bothering you ever again... Of course, your probably just made \NARRATIVE 2 angrier. I heard that some mecha were seen fleeing in the direction of \ELEMENT 3 . They're probably going to regroup from there.>
-		CMsg1_5 <ifNPCCheerful Accept>
+		CMsg1_5 <ifChatNPCCheerful Accept>
 		Msg1_6 <The gang has been destroyed... that should buy you a little time, at least. I heard some \NARRATIVE 2 mecha were spotted in \ELEMENT 3 . It might be a good idea for you to avoid that place for a while.>
-		CMsg1_6 <ifNPCMelancholy Accept>
+		CMsg1_6 <ifChatNPCMelancholy Accept>
 
 		% 2 : Player lost mission previously, now time to try again
 		Msg2 <Would you like to try your luck against those bandits again? I can show you where the base is, but you'll have to take them out yourself.>
 		Msg2_1 <The murder gang holds a contract on your life placed by \NARRATIVE 2 . The last time you fought, they defeated you. I can show you where to find them again, if you're ready for a rematch.>
-		CMsg2_1 <ifNPCSociable Accept>
+		CMsg2_1 <ifChatNPCSociable Accept>
 		Msg2_2 <Ready to try again?>
-		CMsg2_2 <ifNPCShy Accept>
+		CMsg2_2 <ifChatNPCShy Accept>
 		Msg2_3 <How'd you like to try your luck against the bandits again?>
-		CMsg2_3 <ifNPCEasygoing Accept>
+		CMsg2_3 <ifChatNPCEasygoing Accept>
 		Msg2_4 <Last time the murder gang was just too powerful for you... think you've got what it takes to face them now?>
-		CMsg2_4 <ifNPCPassionate Accept>
+		CMsg2_4 <ifChatNPCPassionate Accept>
 		Msg2_5 <I'm sure you'll do much better now than you did the last time you fought the murder gang. Want to try?>
-		CMsg2_5 <ifNPCCheerful Accept>
+		CMsg2_5 <ifChatNPCCheerful Accept>
 		Msg2_6 <Those bandits really thumped you the last time. Do you think you're ready to face them again?>
-		CMsg2_6 <ifNPCMelancholy Accept>
+		CMsg2_6 <ifChatNPCMelancholy Accept>
 
 		% 3 : Player has lost mission, must wait until tomorrow to try again
 		Msg3 <They creamed you out there... But, you're still breathing, so they won't be collecting their bounty yet. Come back tomorrow and we can try again.>
 		Msg3_1 <The murder gang defeated you... but at least nobody's going to collect on that bounty yet. Go get some rest. We can try another assault tomorrow.>
-		CMsg3_1 <ifNPCSociable Accept>
+		CMsg3_1 <ifChatNPCSociable Accept>
 		Msg3_2 <You lost. We'll try again tomorrow.>
-		CMsg3_2 <ifNPCShy Accept>
+		CMsg3_2 <ifChatNPCShy Accept>
 		Msg3_3 <Having a bit of a bad day, aren't you? Let's do this again tomorrow.>
-		CMsg3_3 <ifNPCEasygoing Accept>
+		CMsg3_3 <ifChatNPCEasygoing Accept>
 		Msg3_4 <They were too powerful... You're going to have to improve if you hope to defeat them. Come back tomorrow and let's do this again.>
-		CMsg3_4 <ifNPCPassionate Accept>
+		CMsg3_4 <ifChatNPCPassionate Accept>
 		Msg3_5 <Well, at least they didn't succeed at killing you! We can mount another offensive tomorrow... until then, you better get patched up.>
-		CMsg3_5 <ifNPCCheerful Accept>
+		CMsg3_5 <ifChatNPCCheerful Accept>
 		Msg3_6 <You're lucky to still be breathing. Next time they might not fail. Come back tomorrow and we'll try this again.>
-		CMsg3_6 <ifNPCMelancholy Accept>
+		CMsg3_6 <ifChatNPCMelancholy Accept>
 		Msg3_7 <You made it back... what a shame. Well, we can try another attack tomorrow.>
 		CMsg3_7 <ifG 0 React Accept>
 
 		% 4 : Player has accepted mission, has returned from repair
 		Msg4 <Are you still interested in seeing the bandit base? I can lead you there now, if you want.>
 		Msg4_1 <I can lead you to the murder gang that's hosting the contract on your life. Defeat them and you'll at least delay the plans of \NARRATIVE 2 . We can go now, if you like.>
-		CMsg4_1 <ifNPCSociable Accept>
+		CMsg4_1 <ifChatNPCSociable Accept>
 		Msg4_2 <Ready to start?>
-		CMsg4_2 <ifNPCShy Accept>
+		CMsg4_2 <ifChatNPCShy Accept>
 		Msg4_3 <Want to see where those bandits are yet? I'm not doing anything.>
-		CMsg4_3 <ifNPCEasygoing Accept>
+		CMsg4_3 <ifChatNPCEasygoing Accept>
 		Msg4_4 <Are you all ready? This is gonna be a tough battle.>
-		CMsg4_4 <ifNPCPassionate Accept>
+		CMsg4_4 <ifChatNPCPassionate Accept>
 
 		% 5 : Combat is starting
 		Msg5 <Good luck. Come talk with me after you're finished and let me know how it went.>
 		Msg5_1 <I'll be waiting to hear about how it went. Good luck.>
-		CMsg5_1 <ifNPCSociable Accept>
+		CMsg5_1 <ifChatNPCSociable Accept>
 		Msg5_2 <Good luck.>
-		CMsg5_2 <ifNPCShy Accept>
+		CMsg5_2 <ifChatNPCShy Accept>
 		Msg5_3 <Hopefully this will all go smoothly. Let me know how it works out.>
-		CMsg5_3 <ifNPCEasygoing Accept>
+		CMsg5_3 <ifChatNPCEasygoing Accept>
 		Msg5_4 <You'll be fighting for your life out there... Better give them hell!>
-		CMsg5_4 <ifNPCPassionate Accept>
+		CMsg5_4 <ifChatNPCPassionate Accept>
 		Msg5_5 <I'm certain you'll be able to defeat them. Good luck!>
-		CMsg5_5 <ifNPCCheerful Accept>
+		CMsg5_5 <ifChatNPCCheerful Accept>
 		Msg5_6 <Be careful. If you get killed, all you'll have done is save those bandits the trouble of finding you.>
-		CMsg5_6 <ifNPCMelancholy Accept>
+		CMsg5_6 <ifChatNPCMelancholy Accept>
 
 		% 6 : NPC explains what the PC should do in this mission, and why
 		Msg6 <Hi \PC . I thought you'd be coming to see me. There's a lot of word on the underground right now about that contract on your head... Every criminal yahoo with a mecha is gearing up to try and get it.>
 		Msg6_1 <Hello \PC ; I've heard about your troubles. There's been a lot of talk in the underground about that price on your head. Just about every two-bit criminal in the FedTer is gearing up to take you out.>
-		CMsg6_1 <ifNPCSociable Accept>
+		CMsg6_1 <ifChatNPCSociable Accept>
 		Msg6_2 <Hello \PC . You've come to see me about the contract on your head, right?>
-		CMsg6_2 <ifNPCShy Accept>
+		CMsg6_2 <ifChatNPCShy Accept>
 		Msg6_3 <Are you still alive? I heard that \NARRATIVE 2 placed a gigantic price on your head. I guess you're here to ask me about that, huh?>
-		CMsg6_3 <ifNPCEasygoing Accept>
+		CMsg6_3 <ifChatNPCEasygoing Accept>
 		Msg6_4 <Hey \PC . I knew you'd make it here eventually. Word on the underground is that \NARRATIVE 2 has a massive price on your head.>
-		CMsg6_4 <ifNPCPassionate Accept>
+		CMsg6_4 <ifChatNPCPassionate Accept>
 		Msg6_5 <It looks like \NARRATIVE 2 isn't getting their money's worth out of that contract on your head. Still, with every wannabe hitman in the FedTer aiming for you, it won't be long before they hit the jackpot.>
-		CMsg6_5 <ifNPCCheerful Accept>
+		CMsg6_5 <ifChatNPCCheerful Accept>
 		Msg6_6 <Good to see you're still alive. According to the talk on the street, you should be dead for ages. Every yahoo with a mecha is lining up to collect the contract \NARRATIVE 2 has on your head.>
-		CMsg6_6 <ifNPCMelancholy Accept>
+		CMsg6_6 <ifChatNPCMelancholy Accept>
 
 		% 7 : PC needs some time to get ready
 		Msg7 <Make sure that you're ready, because they sure as hell are.>
@@ -276,37 +276,37 @@ sub
 		% 8 : How many points? Use "\VAL V3 " for that
 		Msg8 <I think they'll have around \VAL V3 points worth of mecha. Think you can handle all that?>
 		Msg8_1 <What am I, some kind of statistician!? If I had to make an educated guess, I'd say they have \VAL V3 threat points worth of mecha.>
-		CMsg8_1 <ifNPCPassionate Accept>
+		CMsg8_1 <ifChatNPCPassionate Accept>
 
 		% 9 : Response to Prompt4
 		Msg9 <As a matter of fact, I know something. The contract was paid for by \NARRATIVE 2 but is being hosted by an action merchant in the dead-zone. Destroy his gang, and the economic incentive to kill you disappears too.>
 		Msg9_1 <I know the identity of the action merchant who's hosting the contract. You see, \NARRATIVE 2 doesn't handle this directly, they contract out to a murder gang. If you stop them you effectively stop the contract.>
-		CMsg9_1 <ifNPCSociable Accept>
+		CMsg9_1 <ifChatNPCSociable Accept>
 		Msg9_2 <That depends. I know who's hosting the contract, if you'd like to put that particular action merchant out of business.>
-		CMsg9_2 <ifNPCShy Accept>
+		CMsg9_2 <ifChatNPCShy Accept>
 		Msg9_3 <I wouldn't waste your time if I didn't. \NARRATIVE 2 contracted out this hit to an action merchant in the dead-zone. Defeat his gang and the whole machination should fall apart.>
-		CMsg9_3 <ifNPCEasygoing Accept>
+		CMsg9_3 <ifChatNPCEasygoing Accept>
 		Msg9_4 <Don't underestimate me. I know that the contract placed by \NARRATIVE 2 is being administered by a murder gang in the dead-zone; if you destroy the gang, the economic incentive to kill you disappears as well.>
-		CMsg9_4 <ifNPCPassionate Accept>
+		CMsg9_4 <ifChatNPCPassionate Accept>
 		Msg9_5 <It's your lucky day. You should know that \NARRATIVE 2 doesn't handle this kind of thing itself; they contracted out to a dead-zone murder gang. All you have to do now is defeat them.>
-		CMsg9_5 <ifNPCCheerful Accept>
+		CMsg9_5 <ifChatNPCCheerful Accept>
 		Msg9_6 <I can tell you, but I can't guarantee that you'll want to hear it. The contract placed by \NARRATIVE 2 is being hosted by a murder gang in the dead-zone. The only way to end it is to put them out of business, and that won't be easy.>
-		CMsg9_6 <ifNPCMelancholy Accept>
+		CMsg9_6 <ifChatNPCMelancholy Accept>
 
 		% 10 : Response to Prompt5
 		Msg10 <You can take a lot of them, I'm sure, but they'll just keep coming until you're dead... I know something you can do about it, though. Destroy the gang that's handling the contract and the wannabe hitmen should dissipate.>
 		Msg10_1 <I heard you were pretty cocky... But I don't think you can take them all. Fortunately you don't have to. The hit's been contracted out to a dead-zone murder gang. Defeat them and you'll be safe for a while.>
-		CMsg10_1 <ifNPCSociable Accept>
+		CMsg10_1 <ifChatNPCSociable Accept>
 		Msg10_2 <That may be, but there's a better suggestion. What you need to do is take the fight to the murder gang that's holding the contract.>
-		CMsg10_2 <ifNPCShy Accept>
+		CMsg10_2 <ifChatNPCShy Accept>
 		Msg10_3 <Honestly, in some of these cases just sitting back and doing nothing really isn't the best solution. Not when you can take the fight to the murder gang holding the contract, and wipe them off the face of the Earth...>
-		CMsg10_3 <ifNPCEasygoing Accept>
+		CMsg10_3 <ifChatNPCEasygoing Accept>
 		Msg10_4 <Pretty confident of your own abilities, aren't you? Admirable though that may be, you can't count on them giving up anytime soon. However, if you were to destroy the murder gang hosting the contract, that could buy you some time...>
-		CMsg10_4 <ifNPCPassionate Accept>
+		CMsg10_4 <ifChatNPCPassionate Accept>
 		Msg10_5 <You're an optimist. I like that. In any case, there's a better solution... I happen to know that the contract on your life is being administered by a dead-zone murder gang. Destroy the gang and the contract disappears, at least for a while.>
-		CMsg10_5 <ifNPCCheerful Accept>
+		CMsg10_5 <ifChatNPCCheerful Accept>
 		Msg10_6 <Hubris comes before a fall. Look, there is one thing you can do to save your life... The contract's being held by an action merchant in the dead-zone. Defeat his gang and the economic incentive to kill you disappears too.>
-		CMsg10_6 <ifNPCMelancholy Accept>
+		CMsg10_6 <ifChatNPCMelancholy Accept>
 
 		% 11 : Memo
 		Msg11 <\ELEMENT 4 in \SCENE EScene 4 knows where to find the killers pursuing you.>
@@ -315,17 +315,17 @@ sub
 
 		Msg13 <As a matter of fact I do, and out of the kindness of my heart I'll even tell you for free. You wanna go kick some ass now, or do you need to freshen up first?>
 		Msg13_1 <Yes, I do... But if you want to go there, I should warn you that it will be pretty dangerous. The murder gang will protect their assets well. Would you like me to show you now, or will you come back later?>
-		CMsg13_1 <ifNPCSociable Accept>
+		CMsg13_1 <ifChatNPCSociable Accept>
 		Msg13_2 <Of course. Do you want to visit them now, or will you be back later?>
-		CMsg13_2 <ifNPCShy Accept>
+		CMsg13_2 <ifChatNPCShy Accept>
 		Msg13_3 <What kind of use would I be if I didn't? I won't even charge you for the info... Would you like me to show you now, or do you need to freshen up?>
-		CMsg13_3 <ifNPCEasygoing Accept>
+		CMsg13_3 <ifChatNPCEasygoing Accept>
 		Msg13_4 <I do, and I'll lead you straight to them. I've got my own reasons for wanting to see these jerks scragged. Want to get on it right away?>
-		CMsg13_4 <ifNPCPassionate Accept>
+		CMsg13_4 <ifChatNPCPassionate Accept>
 		Msg13_5 <Fortunately I do. I can show you where they are, if you'd like. Think of it as my community service.>
-		CMsg13_5 <ifNPCCheerful Accept>
+		CMsg13_5 <ifChatNPCCheerful Accept>
 		Msg13_6 <I do, but if you're planning to go there you might wish that I didn't... The place is heavily guarded. Want me to show you right now?>
-		CMsg13_6 <ifNPCMelancholy Accept>
+		CMsg13_6 <ifChatNPCMelancholy Accept>
 		Msg13_7 <Yes I do, and since you're such a good friend I won't even charge you for the information. Do you need to freshen up or are you ready to go there now?>
 		CMsg13_7 <ifG React 35 Accept>
 
diff --git a/Series/TS_XRAN_aF-F_News.txt b/Series/TS_XRAN_aF-F_News.txt
index 9ecc49e..64c0175 100644
--- a/Series/TS_XRAN_aF-F_News.txt
+++ b/Series/TS_XRAN_aF-F_News.txt
@@ -92,152 +92,152 @@ sub
 	%    Should mention that next episode will happen in \ELEMENT 3
 	Msg1 <So that's what it's all about... People have to know what those monsters are planning! I've had some leads pointing to \ELEMENT 3 ... that's where I'll go investigate next.>
 	Msg1_1 <So that's it... I have to get the word out about what they're planning! My next lead points to \ELEMENT 3 ... That's where I'm planning to investigate next.>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <So that's the story. This is something people ought to know... I'll be heading to \ELEMENT 3 next, to investigate another lead.>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <I thought they'd be planning something like that. Hopefully if we get the word out we can ruin \NARRATIVE 2 's plans. My next lead points to \ELEMENT 3 , so that's where I'm headed.>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <An ancient weapon... If they reactivate it, \NARRATIVE 2 could be unstopable! Thanks for your help. I've got a lead that they're planning something in \ELEMENT 3 , so I'll be going there next.>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <Thanks, the information you recovered will make a great story! I've got some leads indicating that \NARRATIVE 2 has something planned for \ELEMENT 3 . I'll be going there next.>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <This is definitely bad news. If \NARRATIVE 2 is close to recovering the PreZero weapon, they could already be unstopable. My leads point to \ELEMENT 3 as their next target... I'll be going there as soon as I can.>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 
 	% 2 : Player lost mission previously, now time to try again
 	Msg2 <Are you ready to try infiltrating the base again?>
 	Msg2_1 <You didn't find anything the last time you tried infiltrating \NARRATIVE 2 's base. Are you prepared to try it again?>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <Back for another try?>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <Would you like to try infiltrating the base one more time?>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <If they put so much effort into security, \NARRATIVE 2 must really have something to hide! Ready to infiltrate the base?>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <The infiltration didn't go so well last time, but I'm sure you can do it today. Ready to try?>
-	CMsg2_5 <ifNPCCheerful Accept>
+	CMsg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <Last time you were driven away from the base; this time they'll probably kill you. Want to try the infiltration anyway?>
-	CMsg2_6 <ifNPCMelancholy Accept>
+	CMsg2_6 <ifChatNPCMelancholy Accept>
 
 	% 3 : Player has lost mission, must wait until tomorrow to try again
 	Msg3 <You didn't find anything in there worth writing about. Come back tomorrow and we can try again.>
 	Msg3_1 <You searched the base but didn't find anything? There must be something you missed. Come back tomorrow and let's try again.>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <You found nothing? You can try again later.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <It's not likely they'd have so many guards in the area and nothing worth protecting. We can try again tomorrow.>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_4 <You were crushed out there... Come here tomorrow and we will try again.>
-	CMsg3_4 <ifNPCPassionate Accept>
+	CMsg3_4 <ifChatNPCPassionate Accept>
 	Msg3_5 <It seems the guards are more capable than I suspected. It's too dangerous to go back now, but come here tomorrow and let's try again.>
-	CMsg3_5 <ifNPCCheerful Accept>
+	CMsg3_5 <ifChatNPCCheerful Accept>
 	Msg3_6 <They nearly killed you... It's too dangerous to go back now. We can try again tomorrow.>
-	CMsg3_6 <ifNPCMelancholy Accept>
+	CMsg3_6 <ifChatNPCMelancholy Accept>
 
 	% 4 : Player has accepted mission, has returned from repair
 	Msg4 <Is all your equipment in shape? Are you ready to try that infiltration now?>
 	Msg4_1 <I'm certain that \NARRATIVE 2 is guarding some secret in their base. Are you ready to try infiltrating it now?>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <Ready to go?>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <>
-	CMsg4_5 <ifNPCCheerful Accept>
+	CMsg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <>
-	CMsg4_6 <ifNPCMelancholy Accept>
+	CMsg4_6 <ifChatNPCMelancholy Accept>
 
 	% 5 : Combat is starting
 	Msg5 <Good luck in there. Be careful... If their mission is as sensitive as I think it is, they've probably got the base heavily guarded.>
 	Msg5_1 <>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <>
-	CMsg5_3 <ifNPCEasygoing Accept>
+	CMsg5_3 <ifChatNPCEasygoing Accept>
 	Msg5_4 <>
-	CMsg5_4 <ifNPCPassionate Accept>
+	CMsg5_4 <ifChatNPCPassionate Accept>
 	Msg5_5 <>
-	CMsg5_5 <ifNPCCheerful Accept>
+	CMsg5_5 <ifChatNPCCheerful Accept>
 	Msg5_6 <>
-	CMsg5_6 <ifNPCMelancholy Accept>
+	CMsg5_6 <ifChatNPCMelancholy Accept>
 
 	% 6 : NPC explains what the PC should do in this mission, and why
 	Msg6 <I've discovered that \NARRATIVE 2 has a secret base in this city; exactly what they've been doing I can't say. I know that you've fought with them in the past... What I need is a cavalier to infiltrate their base and look for information.>
 	Msg6_1 <>
-	CMsg6_1 <ifNPCSociable Accept>
+	CMsg6_1 <ifChatNPCSociable Accept>
 	Msg6_2 <>
-	CMsg6_2 <ifNPCShy Accept>
+	CMsg6_2 <ifChatNPCShy Accept>
 	Msg6_3 <>
-	CMsg6_3 <ifNPCEasygoing Accept>
+	CMsg6_3 <ifChatNPCEasygoing Accept>
 	Msg6_4 <>
-	CMsg6_4 <ifNPCPassionate Accept>
+	CMsg6_4 <ifChatNPCPassionate Accept>
 	Msg6_5 <>
-	CMsg6_5 <ifNPCCheerful Accept>
+	CMsg6_5 <ifChatNPCCheerful Accept>
 	Msg6_6 <>
-	CMsg6_6 <ifNPCMelancholy Accept>
+	CMsg6_6 <ifChatNPCMelancholy Accept>
 
 	% 7 : PC needs some time to get ready
 	Msg7 <Alright. Do whatever it is that you have to do and then come back here. We can start up then.>
 	Msg7_1 <>
-	CMsg7_1 <ifNPCSociable Accept>
+	CMsg7_1 <ifChatNPCSociable Accept>
 	Msg7_2 <>
-	CMsg7_2 <ifNPCShy Accept>
+	CMsg7_2 <ifChatNPCShy Accept>
 	Msg7_3 <>
-	CMsg7_3 <ifNPCEasygoing Accept>
+	CMsg7_3 <ifChatNPCEasygoing Accept>
 	Msg7_4 <>
-	CMsg7_4 <ifNPCPassionate Accept>
+	CMsg7_4 <ifChatNPCPassionate Accept>
 	Msg7_5 <>
-	CMsg7_5 <ifNPCCheerful Accept>
+	CMsg7_5 <ifChatNPCCheerful Accept>
 	Msg7_6 <>
-	CMsg7_6 <ifNPCMelancholy Accept>
+	CMsg7_6 <ifChatNPCMelancholy Accept>
 
 	% 8 : PC doesn't really want this mission
 	Msg8 <Well, I do know another adventurer who may be able to help... If you could contact \ELEMENT 5 in \SCENE EScene 5 for me, \OPR E5 could do the infiltration instead.>
 	Msg8_1 <>
-	CMsg8_1 <ifNPCSociable Accept>
+	CMsg8_1 <ifChatNPCSociable Accept>
 	Msg8_2 <>
-	CMsg8_2 <ifNPCShy Accept>
+	CMsg8_2 <ifChatNPCShy Accept>
 	Msg8_3 <>
-	CMsg8_3 <ifNPCEasygoing Accept>
+	CMsg8_3 <ifChatNPCEasygoing Accept>
 	Msg8_4 <>
-	CMsg8_4 <ifNPCPassionate Accept>
+	CMsg8_4 <ifChatNPCPassionate Accept>
 	Msg8_5 <>
-	CMsg8_5 <ifNPCCheerful Accept>
+	CMsg8_5 <ifChatNPCCheerful Accept>
 	Msg8_6 <>
-	CMsg8_6 <ifNPCMelancholy Accept>
+	CMsg8_6 <ifChatNPCMelancholy Accept>
 
 	% 9 : Response to Prompt4
 	Msg9 <It's clear that they're up to no good. As a reporter, it's my job to keep the public informed of things they need to know. The answers will be found in their base. It's vital that someone get in there and find out what they're planning!>
 	Msg9_1 <>
-	CMsg9_1 <ifNPCSociable Accept>
+	CMsg9_1 <ifChatNPCSociable Accept>
 	Msg9_2 <>
-	CMsg9_2 <ifNPCShy Accept>
+	CMsg9_2 <ifChatNPCShy Accept>
 	Msg9_3 <>
-	CMsg9_3 <ifNPCEasygoing Accept>
+	CMsg9_3 <ifChatNPCEasygoing Accept>
 	Msg9_4 <>
-	CMsg9_4 <ifNPCPassionate Accept>
+	CMsg9_4 <ifChatNPCPassionate Accept>
 	Msg9_5 <>
-	CMsg9_5 <ifNPCCheerful Accept>
+	CMsg9_5 <ifChatNPCCheerful Accept>
 	Msg9_6 <>
-	CMsg9_6 <ifNPCMelancholy Accept>
+	CMsg9_6 <ifChatNPCMelancholy Accept>
 
 	% 10 : Response to Prompt5
 	Msg10 <That's good to hear. I guess that you know first-hand the danger that \NARRATIVE 2 represents... There's only one way to know what they're doing: Someone has to sneak into their base and get out with the information.>
 	Msg10_1 <>
-	CMsg10_1 <ifNPCSociable Accept>
+	CMsg10_1 <ifChatNPCSociable Accept>
 	Msg10_2 <>
-	CMsg10_2 <ifNPCShy Accept>
+	CMsg10_2 <ifChatNPCShy Accept>
 	Msg10_3 <>
-	CMsg10_3 <ifNPCEasygoing Accept>
+	CMsg10_3 <ifChatNPCEasygoing Accept>
 	Msg10_4 <>
-	CMsg10_4 <ifNPCPassionate Accept>
+	CMsg10_4 <ifChatNPCPassionate Accept>
 	Msg10_5 <>
-	CMsg10_5 <ifNPCCheerful Accept>
+	CMsg10_5 <ifChatNPCCheerful Accept>
 	Msg10_6 <>
-	CMsg10_6 <ifNPCMelancholy Accept>
+	CMsg10_6 <ifChatNPCMelancholy Accept>
 
 	% 11 : Memo
 	Msg11 <\ELEMENT 2 in \SCENE EScene 2 wants you to infiltrate a base belonging to \NARRATIVE 2 .>
@@ -246,45 +246,45 @@ sub
 
 	Msg13 <Great! You're going to have to bring \SPR E5 \PPR E5 hiring fee, of course. This cash should cover that... if there's any change you can keep that for yourself.>
 	Msg13_1 <>
-	CMsg13_1 <ifNPCSociable Accept>
+	CMsg13_1 <ifChatNPCSociable Accept>
 	Msg13_2 <>
-	CMsg13_2 <ifNPCShy Accept>
+	CMsg13_2 <ifChatNPCShy Accept>
 	Msg13_3 <>
-	CMsg13_3 <ifNPCEasygoing Accept>
+	CMsg13_3 <ifChatNPCEasygoing Accept>
 	Msg13_4 <>
-	CMsg13_4 <ifNPCPassionate Accept>
+	CMsg13_4 <ifChatNPCPassionate Accept>
 	Msg13_5 <>
-	CMsg13_5 <ifNPCCheerful Accept>
+	CMsg13_5 <ifChatNPCCheerful Accept>
 	Msg13_6 <>
-	CMsg13_6 <ifNPCMelancholy Accept>
+	CMsg13_6 <ifChatNPCMelancholy Accept>
 
 	Msg14 <You'll have to sneak into the base, past the guards, and search for anything that might tell us what they're up to. If you can find any documents or a computer terminal that'd be great.>
 	Msg14_1 <>
-	CMsg14_1 <ifNPCSociable Accept>
+	CMsg14_1 <ifChatNPCSociable Accept>
 	Msg14_2 <>
-	CMsg14_2 <ifNPCShy Accept>
+	CMsg14_2 <ifChatNPCShy Accept>
 	Msg14_3 <>
-	CMsg14_3 <ifNPCEasygoing Accept>
+	CMsg14_3 <ifChatNPCEasygoing Accept>
 	Msg14_4 <>
-	CMsg14_4 <ifNPCPassionate Accept>
+	CMsg14_4 <ifChatNPCPassionate Accept>
 	Msg14_5 <>
-	CMsg14_5 <ifNPCCheerful Accept>
+	CMsg14_5 <ifChatNPCCheerful Accept>
 	Msg14_6 <>
-	CMsg14_6 <ifNPCMelancholy Accept>
+	CMsg14_6 <ifChatNPCMelancholy Accept>
 
 	Msg15 <Well, I don't have anyone else who could help me, so... I'd hate to give up this investogation, but I may have no other choice. Are you sure you can't do this?>
 	Msg15_1 <>
-	CMsg15_1 <ifNPCSociable Accept>
+	CMsg15_1 <ifChatNPCSociable Accept>
 	Msg15_2 <>
-	CMsg15_2 <ifNPCShy Accept>
+	CMsg15_2 <ifChatNPCShy Accept>
 	Msg15_3 <>
-	CMsg15_3 <ifNPCEasygoing Accept>
+	CMsg15_3 <ifChatNPCEasygoing Accept>
 	Msg15_4 <>
-	CMsg15_4 <ifNPCPassionate Accept>
+	CMsg15_4 <ifChatNPCPassionate Accept>
 	Msg15_5 <>
-	CMsg15_5 <ifNPCCheerful Accept>
+	CMsg15_5 <ifChatNPCCheerful Accept>
 	Msg15_6 <>
-	CMsg15_6 <ifNPCMelancholy Accept>
+	CMsg15_6 <ifChatNPCMelancholy Accept>
 
 	% 1 - 3 :  Standard combat entry options:
 	%         Start Mission, Delay Mission, Mission Details
@@ -322,31 +322,31 @@ sub
 
 		Msg2 <\ELEMENT 5 has done the job; \NARRATIVE 2 is planning to reactivate something called the "T-1". Plus, we found something that will be of great personal interest to you...>
 		Msg2_1 <\ELEMENT 5 infiltrated the complex and found the info. That's why people say \OPR E5 's so good. Apparently \NARRATIVE 2 is planning to activate something called "T-1"; also, something was found that would be of personal interest to you.>
-		CMsg2_1 <ifNPCSociable Accept>
+		CMsg2_1 <ifChatNPCSociable Accept>
 		Msg2_2 <My investigation is complete. I've learned that \NARRATIVE 2 plans to active a PreZero weapon codenamed "T-1". I also found something of personal interest to you.>
-		CMsg2_2 <ifNPCShy Accept>
+		CMsg2_2 <ifChatNPCShy Accept>
 		Msg2_3 <>
-		CMsg2_3 <ifNPCEasygoing Accept>
+		CMsg2_3 <ifChatNPCEasygoing Accept>
 		Msg2_4 <>
-		CMsg2_4 <ifNPCPassionate Accept>
+		CMsg2_4 <ifChatNPCPassionate Accept>
 		Msg2_5 <\ELEMENT 5 has completed the infiltration... \NARRATIVE 2 has located a PreZero weapon called "T-1". They're gonna use it to take over the world, it'll make a great headline. Oh, and there was something about you in their files too...>
-		CMsg2_5 <ifNPCCheerful Accept>
+		CMsg2_5 <ifChatNPCCheerful Accept>
 		Msg2_6 <>
-		CMsg2_6 <ifNPCMelancholy Accept>
+		CMsg2_6 <ifChatNPCMelancholy Accept>
 
 		Msg3 <According to the communications recovered, \NARRATIVE 2 was responsible for the death of your parents. They knew something about this "T-1" thing. What's more, they view you as sort of a loose end... You're marked for death as well.>
 		Msg3_1 <>
-		CMsg3_1 <ifNPCSociable Accept>
+		CMsg3_1 <ifChatNPCSociable Accept>
 		Msg3_2 <It seems that \NARRATIVE 2 is responsible for the death of your parents. They discovered about the "T-1" plan. You are also marked for termination.>
-		CMsg3_2 <ifNPCShy Accept>
+		CMsg3_2 <ifChatNPCShy Accept>
 		Msg3_3 <>
-		CMsg3_3 <ifNPCEasygoing Accept>
+		CMsg3_3 <ifChatNPCEasygoing Accept>
 		Msg3_4 <Your parents were murdered by \NARRATIVE 2 because they found out something about "T-1". You're also slated to be killed...>
-		CMsg3_4 <ifNPCPassionate Accept>
+		CMsg3_4 <ifChatNPCPassionate Accept>
 		Msg3_5 <>
-		CMsg3_5 <ifNPCCheerful Accept>
+		CMsg3_5 <ifChatNPCCheerful Accept>
 		Msg3_6 <Your parents were killed by \NARRATIVE 2 ... They knew something about "T-1". You've also been marked for death. Now that I know, my life is probably in danger as well... but the truth must get out.>
-		CMsg3_6 <ifNPCMelancholy Accept>
+		CMsg3_6 <ifChatNPCMelancholy Accept>
 
 		Msg4 <\ELEMENT 5 discovered that \NARRATIVE 2 killed your family.>
 		Prompt1 <What is it?>
@@ -363,87 +363,87 @@ sub
 		result3 <EndChat Say 6 Cash+ -V1 Goto GoPaid>
 		Msg1 <Hey \PC , how's it going? It's not so good myself... I've been out of work for a while, hoping that a good mission would turn up.>
 		Msg1_1 <>
-		CMsg1_1 <ifNPCSociable Accept>
+		CMsg1_1 <ifChatNPCSociable Accept>
 		Msg1_2 <>
-		CMsg1_2 <ifNPCShy Accept>
+		CMsg1_2 <ifChatNPCShy Accept>
 		Msg1_3 <>
-		CMsg1_3 <ifNPCEasygoing Accept>
+		CMsg1_3 <ifChatNPCEasygoing Accept>
 		Msg1_4 <>
-		CMsg1_4 <ifNPCPassionate Accept>
+		CMsg1_4 <ifChatNPCPassionate Accept>
 		Msg1_5 <>
-		CMsg1_5 <ifNPCCheerful Accept>
+		CMsg1_5 <ifChatNPCCheerful Accept>
 		Msg1_6 <>
-		CMsg1_6 <ifNPCMelancholy Accept>
+		CMsg1_6 <ifChatNPCMelancholy Accept>
 
 		Msg2 <Can I help you? I'm very busy today. My services are high in demand.>
 		Msg2_1 <>
-		CMsg2_1 <ifNPCSociable Accept>
+		CMsg2_1 <ifChatNPCSociable Accept>
 		Msg2_2 <>
-		CMsg2_2 <ifNPCShy Accept>
+		CMsg2_2 <ifChatNPCShy Accept>
 		Msg2_3 <>
-		CMsg2_3 <ifNPCEasygoing Accept>
+		CMsg2_3 <ifChatNPCEasygoing Accept>
 		Msg2_4 <>
-		CMsg2_4 <ifNPCPassionate Accept>
+		CMsg2_4 <ifChatNPCPassionate Accept>
 		Msg2_5 <>
-		CMsg2_5 <ifNPCCheerful Accept>
+		CMsg2_5 <ifChatNPCCheerful Accept>
 		Msg2_6 <>
-		CMsg2_6 <ifNPCMelancholy Accept>
+		CMsg2_6 <ifChatNPCMelancholy Accept>
 
 		Msg3 <A mission in \ELEMENT 1 , huh? Well, my regular price for a job is $ \VAL V1 . If you've got that then I can get started right away.>
 		Msg3_1 <>
-		CMsg3_1 <ifNPCSociable Accept>
+		CMsg3_1 <ifChatNPCSociable Accept>
 		Msg3_2 <>
-		CMsg3_2 <ifNPCShy Accept>
+		CMsg3_2 <ifChatNPCShy Accept>
 		Msg3_3 <>
-		CMsg3_3 <ifNPCEasygoing Accept>
+		CMsg3_3 <ifChatNPCEasygoing Accept>
 		Msg3_4 <>
-		CMsg3_4 <ifNPCPassionate Accept>
+		CMsg3_4 <ifChatNPCPassionate Accept>
 		Msg3_5 <>
-		CMsg3_5 <ifNPCCheerful Accept>
+		CMsg3_5 <ifChatNPCCheerful Accept>
 		Msg3_6 <>
-		CMsg3_6 <ifNPCMelancholy Accept>
+		CMsg3_6 <ifChatNPCMelancholy Accept>
 
 		Msg4 <I normally charge $ \VAL V1 for a mission. As soon as I'm paid I can move out.>
 		Msg4_1 <>
-		CMsg4_1 <ifNPCSociable Accept>
+		CMsg4_1 <ifChatNPCSociable Accept>
 		Msg4_2 <>
-		CMsg4_2 <ifNPCShy Accept>
+		CMsg4_2 <ifChatNPCShy Accept>
 		Msg4_3 <>
-		CMsg4_3 <ifNPCEasygoing Accept>
+		CMsg4_3 <ifChatNPCEasygoing Accept>
 		Msg4_4 <>
-		CMsg4_4 <ifNPCPassionate Accept>
+		CMsg4_4 <ifChatNPCPassionate Accept>
 		Msg4_5 <>
-		CMsg4_5 <ifNPCCheerful Accept>
+		CMsg4_5 <ifChatNPCCheerful Accept>
 		Msg4_6 <>
-		CMsg4_6 <ifNPCMelancholy Accept>
+		CMsg4_6 <ifChatNPCMelancholy Accept>
 
 		Msg5 <You do that.>
 		Msg5_1 <>
-		CMsg5_1 <ifNPCSociable Accept>
+		CMsg5_1 <ifChatNPCSociable Accept>
 		Msg5_2 <>
-		CMsg5_2 <ifNPCShy Accept>
+		CMsg5_2 <ifChatNPCShy Accept>
 		Msg5_3 <>
-		CMsg5_3 <ifNPCEasygoing Accept>
+		CMsg5_3 <ifChatNPCEasygoing Accept>
 		Msg5_4 <>
-		CMsg5_4 <ifNPCPassionate Accept>
+		CMsg5_4 <ifChatNPCPassionate Accept>
 		Msg5_5 <>
-		CMsg5_5 <ifNPCCheerful Accept>
+		CMsg5_5 <ifChatNPCCheerful Accept>
 		Msg5_6 <>
-		CMsg5_6 <ifNPCMelancholy Accept>
+		CMsg5_6 <ifChatNPCMelancholy Accept>
 
 		Msg6 <Very good. I'll head to \ELEMENT 1 straight away.>
 		Msg6_1 <>
-		CMsg6_1 <ifNPCSociable Accept>
+		CMsg6_1 <ifChatNPCSociable Accept>
 		Msg6_2 <>
-		CMsg6_2 <ifNPCShy Accept>
+		CMsg6_2 <ifChatNPCShy Accept>
 		Msg6_3 <>
-		CMsg6_3 <ifNPCEasygoing Accept>
+		CMsg6_3 <ifChatNPCEasygoing Accept>
 		Msg6_4 <>
-		CMsg6_4 <ifNPCPassionate Accept>
+		CMsg6_4 <ifChatNPCPassionate Accept>
 		Msg6_5 <>
-		CMsg6_5 <ifNPCCheerful Accept>
+		CMsg6_5 <ifChatNPCCheerful Accept>
 		Msg6_6 <>
-		CMsg6_6 <ifNPCMelancholy Accept>
+		CMsg6_6 <ifChatNPCMelancholy Accept>
 
 		Prompt1 <I've got a job for you.>
 		Prompt2 <I'll be back with the money soon...>
diff --git a/Series/TS_XRAN_aU--_InDanger.txt b/Series/TS_XRAN_aU--_InDanger.txt
index 773ebbe..e590cf6 100644
--- a/Series/TS_XRAN_aU--_InDanger.txt
+++ b/Series/TS_XRAN_aU--_InDanger.txt
@@ -45,15 +45,15 @@ sub
 
 	Msg1 <I know who you are, and I must warn you... You are in grave danger here.>
 	Msg1_1 <I've been trying to contact you for some time now. I have to tell you that you're in a great deal of danger right now.>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <Hello \PC . You are in great danger here...>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <Hello \PC ... I've been waiting to meet you. I don't want you to panic, but you've got to know that we're both in a lot of danger right now. Want a stick of gum?>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <At last I found you! \PC , your life is in extreme danger!>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_6 <I know who you are, \PC , and I've come to warn you... There are people who will not rest until you are dead. Your life is in grave danger.>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 	Msg1_7 <Hello \PC . I came here to warn you... the people who killed your family are after you as well. You're in serious danger.>
 	CMsg1_7 <if= XRB NAV_XRBFamilyDied Accept>
 	Msg1_8 <I know who you are, or at least who you used to be before the accident. You're in a lot of danger right now.>
@@ -61,17 +61,17 @@ sub
 
 	Msg2 <You could say that we have a common enemy. I can tell you more, but not here... Meet me in \ELEMENT 4 tomorrow.>
 	Msg2_1 <We have a common enemy. Their eyes are everywhere... they're monitoring us right now. I could say more, but not here. Meet me in \ELEMENT 4 tomorrow and we can talk again.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <That's not important. Meet me in \ELEMENT 4 tomorrow and I can tell you more.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <No time to chat, I'm afraid, if I don't get out of here soon we could have a scene on our hands. I'll tell you what: meet me tomorrow in \ELEMENT 4 and I'll tell you what I can.>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <I know all kinds of things. Look, this isn't a safe place to talk. Meet me tomorrow in \ELEMENT 4 ... come prepared for a fight.>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <Everybody knows the great \PC ! Your skills are famous, and they're probably the only reason you're still alive. This isn't a safe place to talk... meet me tomorrow in \ELEMENT 4 and I can tell you more.>
-	CMsg2_5 <ifNPCCheerful ifG PCRep 6 50 Accept>
+	CMsg2_5 <ifChatNPCCheerful ifG PCRep 6 50 Accept>
 	Msg2_6 <An even more important question is, why do "they" know who you are? It's too dangerous to keep talking here... meet me tomorrow in \ELEMENT 4 .>
-	CMsg2_6 <ifNPCMelancholy Accept>
+	CMsg2_6 <ifChatNPCMelancholy Accept>
 	Msg2_7 <We have a common enemy, one that took something as precious from me as your family was to you... This isn't a safe place to be talking. Let's meet again tomorrow in \ELEMENT 4 .>
 	CMsg2_7 <if= XRB NAV_XRBFamilyDied Accept>
 	Msg2_8 <We met some time before your accident. I know who it is that tried to kill you... but we can't speak here, it's too risky. Meet me tomorrow in \ELEMENT 4 .>
@@ -81,15 +81,15 @@ sub
 
 	Msg3 <There's someone trying to kill you. I can tell you more, but not here... Meet me in \ELEMENT 4 in tomorrow.>
 	Msg3_1 <I'd love to go into the details about the plot on your life right now, but this isn't a good place. We're being observed. Meet me tomorrow in \ELEMENT 4 and I'll tell you more.>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <Someone's trying to kill you. Meet me in \ELEMENT 4 tomorrow and I can tell you more.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <I wouldn't worry about it, just some folks trying to kill you. This isn't a good place to talk... meet me tomorrow in \ELEMENT 4 and we can have a better discussion.>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_5 <The kind of danger where someone's trying to kill you, you know. Look, it's not safe here. Let's meet again tomorrow in \ELEMENT 4 .>
-	CMsg3_5 <ifNPCCheerful Accept>
+	CMsg3_5 <ifChatNPCCheerful Accept>
 	Msg3_6 <You've been marked for death. Personally, I don't like your odds... meet me tomorrow in \ELEMENT 4 and I can give you some more information.>
-	CMsg3_6 <ifNPCMelancholy Accept>
+	CMsg3_6 <ifChatNPCMelancholy Accept>
 	Msg3_7 <Your family was murdered to protect a secret. You're a loose end, one they cannot afford to keep alive. This isn't a good place to talk... meet me tomorrow in \ELEMENT 4 and I can tell you more.>
 	CMsg3_7 <if= XRB NAV_XRBFamilyDied Accept>
 	Msg3_8 <Mortal danger, of course. Some of your associates from before the accident are quite disappointed that you didn't die. They intend to finish the job. Meet me tomorrow in \ELEMENT 4 and we can speak further about this.>
@@ -145,17 +145,17 @@ sub
 
 		Msg1 <I tried to evade them, but this town isn't safe either. They followed me, or possibly you... they know that I've had contact with you.>
 		Msg1_1 <I'm glad that you accepted my invitation. There are so many things I have to tell you... and such little time. They've followed us here, you know. They know I've contacted you and are afraid of what it means for their plan.>
-		CMsg1_1 <ifNPCSociable Accept>
+		CMsg1_1 <ifChatNPCSociable Accept>
 		Msg1_2 <So glad you could make it. Shall we get down to business?>
-		CMsg1_2 <ifNPCShy Accept>
+		CMsg1_2 <ifChatNPCShy Accept>
 		Msg1_3 <I trust you had no trouble getting here? >
-		CMsg1_3 <ifNPCEasygoing Accept>
+		CMsg1_3 <ifChatNPCEasygoing Accept>
 		Msg1_4 <Sorry about the ambush outside of town... They know I've contacted you, and have been following me for days. I knew you'd be easily capable of defeating them of course.>
-		CMsg1_4 <ifNPCPassionate Accept>
+		CMsg1_4 <ifChatNPCPassionate Accept>
 		Msg1_5 <I trust that the goons they had following me were no match for your piloting skills, eh? It's very difficult evading them but I knew you'd be able to get through.>
-		CMsg1_5 <ifNPCCheerful Accept>
+		CMsg1_5 <ifChatNPCCheerful Accept>
 		Msg1_6 <I'm glad to see you're alive! They followed me, or possibly you... we only have a short time here.>
-		CMsg1_6 <ifNPCMelancholy Accept>
+		CMsg1_6 <ifChatNPCMelancholy Accept>
 
 		Msg2 <It's very complicated, I don't have enough time to tell you everything, but you should know this: \NARRATIVE 1 is trying to kill you, and will stop at nothing until you're dead. I have to go now but I will help you again.>
 		Msg2_1 <I don't know the reason, but \NARRATIVE 1 wants you dead. It could be that an order came from higher up, it could be a personal grudge, I just don't know. I have to leave soon but when you need me I'll be back to help.>
@@ -182,17 +182,17 @@ sub
 
 		Msg6 <They have a base in \ELEMENT 3 . I used to work for them, until I found out what they're doing... You'd be wise to stay away from there.>
 		Msg6_1 <If you must know, I used to work for them... until I found out what they were really after. One more word of advice- stay away from \ELEMENT 3 ; they've got some kind of operation planned there, and if you go they'll kill you.>
-		CMsg6_1 <ifNPCSociable Accept>
+		CMsg6_1 <ifChatNPCSociable Accept>
 		Msg6_2 <I'd rather not say. There is one further thing... There's a secret base in \ELEMENT 3 . Some of your questions may be answered there.>
-		CMsg6_2 <ifNPCShy Accept>
+		CMsg6_2 <ifChatNPCShy Accept>
 		Msg6_3 <I used to work for the same people, until I wised up. My job was guarding the base in \ELEMENT 3 ... but once I saw what they were planning, I had to get away.>
-		CMsg6_3 <ifNPCEasygoing Accept>
+		CMsg6_3 <ifChatNPCEasygoing Accept>
 		Msg6_4 <I was one of their "experiments" at the \ELEMENT 3 lab... At first I just worked there, but I saw too much, and they decided to finish me off. Luckily I'm not that easy to kill.>
-		CMsg6_4 <ifNPCPassionate Accept>
+		CMsg6_4 <ifChatNPCPassionate Accept>
 		Msg6_5 <What, do you want me to give up all my mystery? There's one more thing before I go- they've got a lab in \ELEMENT 3 . I never got a look inside but I'll bet they're up to something nasty.>
-		CMsg6_5 <ifNPCCheerful Accept>
+		CMsg6_5 <ifChatNPCCheerful Accept>
 		Msg6_6 <You're better off not knowing. There is one further thing that may help keep you alive... They have a base in \ELEMENT 3 . That place should be off limits from now on.>
-		CMsg6_6 <ifNPCMelancholy Accept>
+		CMsg6_6 <ifChatNPCMelancholy Accept>
 
 
 		Prompt1 <I'm tired of games. Tell me everything.>
diff --git a/Series/TS_XRAN_aUF-_DoctorKim.txt b/Series/TS_XRAN_aUF-_DoctorKim.txt
index 298667d..4278ca5 100644
--- a/Series/TS_XRAN_aUF-_DoctorKim.txt
+++ b/Series/TS_XRAN_aUF-_DoctorKim.txt
@@ -48,73 +48,73 @@ sub
 
 	Msg1 <I'm sorry, but the place is a bit of a mess. We were burgalarized last night. May I help you?>
 	Msg1_1 <This is terrible! Our hospital has been burgalarized... The thieves broke down the door, and stole the computer containing our patient database. We have backups, but still this is pretty bad...>
-	CMsg1_1 <ifNPCSociable Accept>
+	CMsg1_1 <ifChatNPCSociable Accept>
 	Msg1_2 <I'm quite busy; our hospital has been broken into. Is there anything I can help you with?>
-	CMsg1_2 <ifNPCShy Accept>
+	CMsg1_2 <ifChatNPCShy Accept>
 	Msg1_3 <Hello. May I help you? Don't mind the mess; it's just that our hospital has been broken into.>
-	CMsg1_3 <ifNPCEasygoing Accept>
+	CMsg1_3 <ifChatNPCEasygoing Accept>
 	Msg1_4 <Yes, may I help you? I'm very busy... There's been a break-in, our computers were stolen, and I have to make sure that nothing else has gone missing...>
-	CMsg1_4 <ifNPCPassionate Accept>
+	CMsg1_4 <ifChatNPCPassionate Accept>
 	Msg1_5 <Don't panic; yes, our hospital suffered a minor break-in last night, and there's stuff all over the floor, but I assure you everything will be right as rain by tomorrow.>
-	CMsg1_5 <ifNPCCheerful Accept>
+	CMsg1_5 <ifChatNPCCheerful Accept>
 	Msg1_6 <Yes, what is it? As you can see I'm quite busy... We had a break-in last night, everything's all over the place...>
-	CMsg1_6 <ifNPCMelancholy Accept>
+	CMsg1_6 <ifChatNPCMelancholy Accept>
 
 	Msg2 <Not really, but I remember they had a similar incident in Hogye just a short time ago. As far as I know their doctor went missing shortly thereafter.>
 	Msg2_1 <It was likely the same people who broke into the Hogye clinic. That happened just a little while ago. Doctor Kim, who works there, hasn't been seen since... \OPR 3 could have been kidnapped or killed.>
-	CMsg2_1 <ifNPCSociable Accept>
+	CMsg2_1 <ifChatNPCSociable Accept>
 	Msg2_2 <They had a similar incident in Hogye a short time ago; I believe the doctor there was killed. It was probably the same people.>
-	CMsg2_2 <ifNPCShy Accept>
+	CMsg2_2 <ifChatNPCShy Accept>
 	Msg2_3 <If I remember correctly there was also a break-in at the Hogye clinic a few days ago. Their doctor also went missing, which makes me glad I wasn't working the night shift yesterday.>
-	CMsg2_3 <ifNPCEasygoing Accept>
+	CMsg2_3 <ifChatNPCEasygoing Accept>
 	Msg2_4 <Complete moral degenerates, that's who. The clinic in Hogye was also attacked recently. Their doctor went missing, no doubt a victim of the robbers...>
-	CMsg2_4 <ifNPCPassionate Accept>
+	CMsg2_4 <ifChatNPCPassionate Accept>
 	Msg2_5 <I can't even understand why they'd break in, especially if they weren't going to steal our drugs... In Hogye they had a similar case recently. The doctor who works there went missing.>
-	CMsg2_5 <ifNPCCheerful Accept>
+	CMsg2_5 <ifChatNPCCheerful Accept>
 	Msg2_6 <Who knows? There are all kinds of criminals operating these days... Even in a small town like Hogye. Their clinic was burgularized a short time ago, and their doctor disappeared. He was probably killed by the robbers.>
-	CMsg2_6 <ifNPCMelancholy Accept>
+	CMsg2_6 <ifChatNPCMelancholy Accept>
 
 	Msg3 <I'll see what I can do for you. I hope you don't have any drug allergies, since I can't look up to check...>
 	Msg3_1 <Our facilities are largely undamaged; it was just the computers that got stolen. So I should be able to treat your injuries without any complications.>
-	CMsg3_1 <ifNPCSociable Accept>
+	CMsg3_1 <ifChatNPCSociable Accept>
 	Msg3_2 <Let me take a look at your injuries. I'll do as much as I can.>
-	CMsg3_2 <ifNPCShy Accept>
+	CMsg3_2 <ifChatNPCShy Accept>
 	Msg3_3 <Alright. Tell me where it hurts.>
-	CMsg3_3 <ifNPCEasygoing Accept>
+	CMsg3_3 <ifChatNPCEasygoing Accept>
 	Msg3_4 <Of course! Let me examine your injuries.>
-	CMsg3_4 <ifNPCPassionate Accept>
+	CMsg3_4 <ifChatNPCPassionate Accept>
 	Msg3_5 <Sure, I can still do that. Tell me where it hurts and I'll make it all better.>
-	CMsg3_5 <ifNPCCheerful Accept>
+	CMsg3_5 <ifChatNPCCheerful Accept>
 	Msg3_6 <I'll see what I can do, but given the state of our facilities I can't make any promises.>
-	CMsg3_6 <ifNPCMelancholy Accept>
+	CMsg3_6 <ifChatNPCMelancholy Accept>
 
 	Msg4 <Keep eating those vegetables.>
 	Msg4_1 <Let me know if you experience any side effects. I'll see you again, the next time you get hurt.>
-	CMsg4_1 <ifNPCSociable Accept>
+	CMsg4_1 <ifChatNPCSociable Accept>
 	Msg4_2 <Take care of yourself.>
-	CMsg4_2 <ifNPCShy Accept>
+	CMsg4_2 <ifChatNPCShy Accept>
 	Msg4_3 <If you experience any further problems come back right away.>
-	CMsg4_3 <ifNPCEasygoing Accept>
+	CMsg4_3 <ifChatNPCEasygoing Accept>
 	Msg4_4 <Exercise and proper diet are the keys to good health, don't forget that!>
-	CMsg4_4 <ifNPCPassionate Accept>
+	CMsg4_4 <ifChatNPCPassionate Accept>
 	Msg4_5 <That went well.>
-	CMsg4_5 <ifNPCCheerful Accept>
+	CMsg4_5 <ifChatNPCCheerful Accept>
 	Msg4_6 <Try not to get hurt again.>
-	CMsg4_6 <ifNPCMelancholy Accept>
+	CMsg4_6 <ifChatNPCMelancholy Accept>
 
 	Msg5 <Well, somebody certainly should.>
 	Msg5_1 <You're from Hogye originally, aren't you? Yes, someone definitely ought to investigate this matter...>
-	CMsg5_1 <ifNPCSociable Accept>
+	CMsg5_1 <ifChatNPCSociable Accept>
 	Msg5_2 <Well, somebody should.>
-	CMsg5_2 <ifNPCShy Accept>
+	CMsg5_2 <ifChatNPCShy Accept>
 	Msg5_3 <I've already told you as much as I know, personally.>
-	CMsg5_3 <ifNPCEasygoing Accept>
+	CMsg5_3 <ifChatNPCEasygoing Accept>
 	Msg5_4 <It's terrible that someone could attack a hospital, the center of medical care and charitable work, yet remain at large without punishment... Justice must be done!>
-	CMsg5_4 <ifNPCPassionate Accept>
+	CMsg5_4 <ifChatNPCPassionate Accept>
 	Msg5_5 <If you could get to the bottom of this, I'd certainly applaud your efforts!>
-	CMsg5_5 <ifNPCCheerful Accept>
+	CMsg5_5 <ifChatNPCCheerful Accept>
 	Msg5_6 <I doubt that you'd find out anything... Though if you're determined to try, then go ahead.>
-	CMsg5_6 <ifNPCMelancholy Accept>
+	CMsg5_6 <ifChatNPCMelancholy Accept>
 
 	Prompt1 <Any idea who did it?>
 	Prompt1_1 <Who would break into a hospital!?>
diff --git a/history.txt b/history.txt
index 6e07719..4caffa4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,4 @@
+- Refactored "ifNPC[trait]" macros, fixing some plot emails (aslmacro.txt)
 - Mauna, Tokto no longer hidden in SDL mode (TS_MAP_World.txt)
 - Imported shuttle service from GH2 (services.pp)
 - Victory saves win file to config folder (arenascript.pp)