Clean up Pikel band code, name them "slaves", then "freed slaves".

As per kilobyte's suggestion on c-r-d, Pikel's humans are named "slave"
until they are released from bondage on Pikel's death, in which case
they're called "freed slave".

Also clean up the Pikel band neutralisation code: instead of assuming
that all human monsters that are band members are Pikel's band, store a
value in monsters.props that signifies them as such.

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 4b0114d5ee..eff21048af 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -1162,21 +1162,22 @@ static void _elven_twin_died(monsters* twin)
 
 void pikel_band_neutralise ()
 {
-    // XXX: This is a really ugly hack. It should be replaced by something else
-    // when band tracking is available. This assumes that the only human monsters
-    // with MF_BAND_MEMBER are Pikel's band members.
     bool message_made = false;
 
     for (monster_iterator mi; mi; ++mi)
     {
         if (mi->type == MONS_HUMAN
-            && testbits(mi->flags, MF_BAND_MEMBER))
+            && testbits(mi->flags, MF_BAND_MEMBER)
+            && mi->props.exists("pikel_band"))
         {
             if (mi->observable() && !message_made)
             {
                 mpr("Pikel's slaves thank you for their freedom.");
                 message_made = true;
             }
+
+            mi->mname = "freed slave";
+            // viewwindow();
             mons_pacify(*mi);
         }
     }