summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/enum.h3
-rw-r--r--crawl-ref/source/fight.cc3
-rw-r--r--crawl-ref/source/mon-data.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index a6000a6a44..ef51a97c1a 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2299,7 +2299,8 @@ enum mon_attack_type
AT_TOUCH,
AT_ENGULF,
AT_CLAW,
- AT_TAIL_SLAP
+ AT_TAIL_SLAP,
+ AT_BUTT
};
enum mon_attack_flavour
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index c1809e3348..fe7e7cf6df 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2469,7 +2469,8 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
"touch",
"engulf",
"claw",
- "tail slap"
+ "tail slap",
+ "butt"
};
return attack_types[ attk.type ];
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index f31f9d9406..6bffc0fc46 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1032,7 +1032,7 @@
M_WARM_BLOOD,
MR_NO_FLAGS,
1500, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3,
- { {AT_HIT, AF_PLAIN, 35}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
+ { {AT_HIT, AF_PLAIN, 35}, {AT_BUTT, AF_PLAIN, 20}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
{ 13, 3, 5, 0 },
5, 7, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW, I_NORMAL,
MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM