B12007 yellow light animal parts

Uses "ray" for arm-related parts, "beam" for everything else.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 1e4f78e307dc89082d1eac10bf5e18f9e37947d8..77592a88338978d3da34140ea9a86622ac6e1e3c 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -260,6 +260,7 @@ can no longer activate a figurine while engulfed
 can't use figurines to get too many erinyes or Nazgul
 include currently wielded weapon among the list of likely choices for 'w'
 likewise for currently quivered ammo among choices for 'Q'
+prevent mbodypart() from returning animal parts for lights
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/polyself.c b/src/polyself.c
index 12cdf053310333ce8068ece06703a060e0c38f73..06f7fce688b37a1fa8a4ce9413c9ad27378c4227 100644 (file)
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -1200,6 +1200,12 @@ int part;
        if (mptr->mlet == S_CENTAUR || mptr->mlet == S_UNICORN ||
                (mptr == &mons[PM_ROTHE] && part != HAIR))
            return horse_parts[part];
+       if (mptr->mlet == S_LIGHT) {
+               if (part == HANDED) return "rayed";
+               else if (part == ARM || part == FINGER ||
+                               part == FINGERTIP || part == HAND) return "ray";
+               else return "beam";
+       }
        if (mptr->mlet == S_EEL && mptr != &mons[PM_JELLYFISH])
            return fish_parts[part];
        if (slithy(mptr) || (mptr->mlet == S_DRAGON && part == HAIR))