non-humanoid lawful minions wearing armor

<Someone> reported that couatl and ki-rin could wear boots and gloves.
Two problems: 1. all minions were created with a sword and armor, even those
that couldn't use them.  2. couatl and ki-rin were missing some important
bits in their M1 flags.
Now neither couatl or ki-rin are created with armor, and they won't try
to wear any armor they cross in the dungeon.

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 5444a94d77f031f7542f7722d99120016bb18d2a..55c692f03ca0e5f330a0eb86eadcc52d6c2ccbf8 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -11,6 +11,7 @@ expert fireball/cone of cold could not target a monster seen only with
        infravision or ESP
 display "lotus juice", not "lotu juice" for the fruit juice name
 statue of any golem hit with stone-to-flesh spell animates as flesh golem
+only humanoid angelic minions should get/use sword and armor
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/makemon.c b/src/makemon.c
index 65f6de06635efe12a99311cdd3c799f734f70a16..c2e197d49af05445c1376d5aec496da6f84944f8 100644 (file)
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -258,7 +258,7 @@ register struct monst *mtmp;
                break;
 
            case S_ANGEL:
-               {
+               if (humanoid(ptr)) {
                    int spe2;
 
                    /* create minion stuff; can't use mongets */

diff --git a/src/monst.c b/src/monst.c
index d69a6e8262d8c3dc1f3fdf0e0cea634e0a5302dd..a4c45ac283cae00c5bfb6e92a70a7ef95d967afb 100644 (file)
--- a/src/monst.c
+++ b/src/monst.c
@@ -1072,7 +1072,7 @@ NEARDATA struct permonst mons[] = {
        A(ATTK(AT_BITE, AD_DRST, 2, 4), ATTK(AT_BITE, AD_PHYS, 1, 3),
          ATTK(AT_HUGS, AD_WRAP, 2, 4), NO_ATTK, NO_ATTK, NO_ATTK),
        SIZ(900, 400, 0, MS_HISS, MZ_LARGE), MR_POISON, 0,
-       M1_FLY|M1_POIS,
+       M1_FLY|M1_NOHANDS|M1_SLITHY|M1_POIS,
        M2_MINION|M2_STALK|M2_STRONG|M2_NASTY, M3_INFRAVISIBLE|M3_INFRAVISION,
        CLR_GREEN),
     MON("Aleax", S_ANGEL,
@@ -1100,7 +1100,7 @@ NEARDATA struct permonst mons[] = {
          ATTK(AT_BUTT, AD_PHYS, 3, 6), ATTK(AT_MAGC, AD_SPEL, 2, 6),
          NO_ATTK, NO_ATTK),
        SIZ(WT_HUMAN, 400, 0, MS_NEIGH, MZ_LARGE), 0, 0,
-       M1_FLY|M1_SEE_INVIS,
+       M1_FLY|M1_ANIMAL|M1_NOHANDS|M1_SEE_INVIS,
        M2_NOPOLY|M2_MINION|M2_STALK|M2_STRONG|M2_NASTY|M2_LORD,
        M3_INFRAVISIBLE|M3_INFRAVISION, HI_GOLD),
     MON("Archon", S_ANGEL,