Modify skill titles

* Replace the "Foo" in Foo Blade, Foo Porcupine, Foo Catapult, Foo Arbalest, 
  Foo Ballista, and Foo Barricade with the capitalized genus (Elf, Orc, 
  Draconian, ...)

* Merry Foo, Foo of Death, Placeless Foo and Shapeless Foo still use the
  species name, though that's debatable, of course.

* Marksfoo uses the lowercase genus name, in particular "ogre" for Ogre
  and Ogre-Mage, both.

* Add "Plane Glider" as "Plane Foo" variant for Kenku.

Clean up the skill title array a bit.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5262 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 7f586238b1..887ffe8987 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -321,6 +321,7 @@ static void _place_monster_corpse(const monsters *monster)
     else if (monster->has_ench(ENCH_GLOWING_SHAPESHIFTER))
         corpse_class = MONS_GLOWING_SHAPESHIFTER;
 
+    // Doesn't leave a corpse.
     if (mons_weight(corpse_class) == 0 || coinflip())
         return;
 
@@ -348,13 +349,13 @@ static void _place_monster_corpse(const monsters *monster)
         return;
     }
 
-    // Don't care if 'o' is changed, and it shouldn't be (corpses don't stack)
+    // Don't care if 'o' is changed, and it shouldn't be (corpses don't stack).
     move_item_to_grid( &o, monster->x, monster->y );
     if (see_grid(monster->x, monster->y))
     {
-        tutorial_dissection_reminder(
-            mons_corpse_effect(monster->type) != CE_POISONOUS
-             || player_res_poison() > 0 );
+        const bool poison = (mons_corpse_effect(monster->type) == CE_POISONOUS
+                             && player_res_poison() <= 0);
+        tutorial_dissection_reminder(!poison);
     }
 }                               // end place_monster_corpse()