For flavor, add "peck" and "headbutt" attack types. The former is now

used by some birdlike monsters as an alternative to "claw".  The latter
is currently used only by chaos spawns and (very) ugly things, although
it could be useful if non-draconian monks are added.  Also, rename
AT_BUTT to AT_GORE, as it's described as "gore" anyway.

6 files changed, 15 insertions, 11 deletions

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index e457220656..84716b4494 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -158,7 +158,7 @@ A middle aged bounty hunter, hired to kill you. He is in a hurry.
 %%%%
 harpy
 
-Harpies have roamed these coasts as long as seafarers can remember.  They strike fear in the hearts of all sentient beings but not for their stings or claws.  It is their way to steal food from the unwary, causing many a man to starve to death.
+Harpies have roamed these coasts as long as seafarers can remember. They strike fear in the hearts of all sentient beings, but not for their beaks or claws. It is their way to steal food from the unwary, causing many a man to starve to death.
 %%%%
 Ijyb
 
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 1276ec3185..4bb268ee4a 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -4298,6 +4298,8 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
         "touch",
         "engulf",
         "claw",
+        "peck",
+        "headbutt",
         "punch",
         "kick",
         "tentacle-slap",
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index e68b780e4f..411d9a8dc1 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -514,8 +514,8 @@ void ghost_demon::init_ugly_thing(bool very_ugly, bool only_mutate)
 
     const mon_attack_type att_types[] =
     {
-        AT_BITE, AT_STING, AT_CLAW, AT_PUNCH, AT_KICK, AT_TENTACLE_SLAP,
-        AT_TAIL_SLAP, AT_BUTT
+        AT_BITE, AT_STING, AT_CLAW, AT_PECK, AT_HEADBUTT, AT_PUNCH, AT_KICK,
+        AT_TENTACLE_SLAP, AT_TAIL_SLAP, AT_GORE
     };
 
     att_type = att_types[random2(sizeof(att_types) / sizeof(*att_types))];
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index e96f455c7d..34021cd954 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1350,7 +1350,7 @@ static monsterentry mondata[] = {
     M_FIGHTER | M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
     1500, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 35}, {AT_BUTT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
+    { {AT_HIT, AF_PLAIN, 35}, {AT_GORE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW, I_NORMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
@@ -2134,7 +2134,7 @@ static monsterentry mondata[] = {
     M_FLIES | M_WARM_BLOOD,
     MR_NO_FLAGS,
     1000, 10, MONS_HIPPOGRIFF, MONS_HIPPOGRIFF, MH_NATURAL, -3,
-    { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8},
+    { {AT_BITE, AF_PLAIN, 10}, {AT_PECK, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8},
        AT_NO_ATK },
     { 7, 3, 5, 0 },
     2, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL,
@@ -2158,7 +2158,7 @@ static monsterentry mondata[] = {
     M_FLIES | M_WARM_BLOOD,
     MR_NO_FLAGS,
     1800, 10, MONS_GRIFFON, MONS_GRIFFON, MH_NATURAL, -3,
-    { {AT_BITE, AF_PLAIN, 18}, {AT_CLAW, AF_PLAIN, 10},
+    { {AT_BITE, AF_PLAIN, 18}, {AT_PECK, AF_PLAIN, 10},
       {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK },
     { 12, 3, 5, 0 },
     4, 6, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL,
@@ -2183,7 +2183,7 @@ static monsterentry mondata[] = {
     M_FLIES | M_WARM_BLOOD | M_BATTY,
     MR_RES_POISON,
     1000, 12, MONS_HARPY, MONS_HARPY, MH_NATURAL, -3,
-    { {AT_CLAW, AF_PLAIN, 10}, {AT_CLAW, AF_STEAL_FOOD, 8},
+    { {AT_PECK, AF_PLAIN, 10}, {AT_CLAW, AF_STEAL_FOOD, 8},
        AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SCREECH, I_NORMAL,
@@ -2895,7 +2895,7 @@ static monsterentry mondata[] = {
     M_WARM_BLOOD,
     MR_NO_FLAGS,
     1200, 10, MONS_YAK, MONS_YAK, MH_NATURAL, -3,
-    { {AT_BUTT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+    { {AT_GORE, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     4, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_BELLOW, I_ANIMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG
@@ -2906,7 +2906,7 @@ static monsterentry mondata[] = {
     M_WARM_BLOOD,
     MR_NO_FLAGS,
     1500, 10, MONS_YAK, MONS_DEATH_YAK, MH_NATURAL, -5,
-    { {AT_BUTT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+    { {AT_GORE, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 3, 5, 0 },
     9, 5, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_BELLOW, I_ANIMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index bcd2e3f76a..987ebd3712 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1173,7 +1173,7 @@ mon_attack_def mons_attack_spec(const monsters *mon, int attk_number)
 
     if (attk.type == AT_RANDOM)
         attk.type = static_cast<mon_attack_type>(random_range(AT_HIT,
-                                                              AT_BUTT));
+                                                              AT_GORE));
 
     if (attk.flavour == AF_KLOWN)
     {
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 16cfbf78c6..a58e9725d1 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -44,11 +44,13 @@ enum mon_attack_type
     AT_TOUCH,
     AT_ENGULF,
     AT_CLAW,
+    AT_PECK,
+    AT_HEADBUTT,
     AT_PUNCH,
     AT_KICK,
     AT_TENTACLE_SLAP,
     AT_TAIL_SLAP,
-    AT_BUTT,
+    AT_GORE,
 
     AT_SHOOT,       // Attack representing missile damage for M_ARCHER.
     AT_RANDOM       // Anything but AT_SHOOT