summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-08 21:32:42 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-08 21:32:42 +0000
commit0d1eb612ac0f8716738ff1a7bdd3c447b3f469bb (patch)
tree77f77ea57996c120beef7884ba06da1692e0cfea /crawl-ref
parent9742b9a9c93265452044395c401f89711117de91 (diff)
downloadcrawl-ref-0d1eb612ac0f8716738ff1a7bdd3c447b3f469bb.tar.gz
crawl-ref-0d1eb612ac0f8716738ff1a7bdd3c447b3f469bb.zip
For monsters that can use weapons and engage in melee, make sure the
AT_HIT attack is first. The one exception is the deep elf master archer, but, according to the code in mstuff2.cc, monsters with the M_ARCHER flag (of which it's the only one) should have the AT_SHOOT attack first. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8996 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/mon-data.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 938084f692..9bbc690d78 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1033,7 +1033,7 @@ static monsterentry mondata[] = {
M_EVIL,
MR_RES_POISON | MR_RES_COLD,
500, 12, MONS_GHOUL, MONS_GHOUL, MH_UNDEAD, -5,
- { {AT_CLAW, AF_ROT, 8}, {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK },
+ { {AT_HIT, AF_PLAIN, 4}, {AT_CLAW, AF_ROT, 8}, AT_NO_ATK, AT_NO_ATK },
{ 4, 3, 5, 0 },
4, 10, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT, I_NORMAL,
HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
@@ -2165,7 +2165,7 @@ static monsterentry mondata[] = {
MR_RES_POISON,
1000, 12, MONS_HARPY, MONS_HARPY, MH_NATURAL, -3,
{ {AT_CLAW, AF_PLAIN, 10}, {AT_CLAW, AF_STEAL_FOOD, 8},
- AT_NO_ATK, AT_NO_ATK },
+ AT_NO_ATK, AT_NO_ATK },
{ 7, 3, 5, 0 },
2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SCREECH, I_NORMAL,
HT_LAND, 25, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
@@ -2722,7 +2722,7 @@ static monsterentry mondata[] = {
M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS | M_BLOOD_SCENT,
MR_RES_POISON | MR_RES_COLD,
0, 11, MONS_VAMPIRE, MONS_VAMPIRE, MH_UNDEAD, -6,
- { {AT_BITE, AF_VAMPIRIC, 15}, {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK,
+ { {AT_HIT, AF_PLAIN, 7}, {AT_BITE, AF_VAMPIRIC, 15}, AT_NO_ATK,
AT_NO_ATK },
{ 6, 3, 5, 0 },
10, 10, MST_VAMPIRE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL,
@@ -2748,7 +2748,7 @@ static monsterentry mondata[] = {
| M_BLOOD_SCENT,
MR_RES_POISON | MR_RES_COLD,
0, 15, MONS_VAMPIRE, MONS_VAMPIRE, MH_UNDEAD, -6,
- { {AT_BITE, AF_VAMPIRIC, 15}, {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK,
+ { {AT_HIT, AF_PLAIN, 7}, {AT_BITE, AF_VAMPIRIC, 15}, AT_NO_ATK,
AT_NO_ATK },
{ 8, 3, 4, 0 },
10, 10, MST_VAMPIRE_MAGE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH,