diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-16 19:48:09 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-17 09:58:06 -0400 |
| commit | 10cfb32cb67a2438832e2425b3a73eb5078203b6 (patch) | |
| tree | 19bed7e575013883622d296f273bffa798cbb5b0 /crawl-ref/source/melee_attack.cc | |
| parent | 1137a02fa7c1675c1248b5ae20f10b8970c92166 (diff) | |
| download | crawl-ref-10cfb32cb67a2438832e2425b3a73eb5078203b6.tar.gz crawl-ref-10cfb32cb67a2438832e2425b3a73eb5078203b6.zip | |
Make a hit message less buggy.
We're fairly consistent about saying 'bug' to the user meaning there's
something buggy going on. It's not an ironclad rule but I don't think
there's much of a cost to changing it.
Diffstat (limited to 'crawl-ref/source/melee_attack.cc')
| -rw-r--r-- | crawl-ref/source/melee_attack.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index 4339baebe7..24635f952f 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -1769,19 +1769,12 @@ void melee_attack::set_attack_verb() attack_verb = "punch"; else if (damage_to_display < HIT_STRONG) attack_verb = "pummel"; - // XXX: detect this better else if (defender->is_monster() - && (get_mon_shape(defender->type) - == MON_SHAPE_INSECT - || get_mon_shape(defender->type) - == MON_SHAPE_INSECT_WINGED - || get_mon_shape(defender->type) - == MON_SHAPE_CENTIPEDE - || get_mon_shape(defender->type) - == MON_SHAPE_ARACHNID)) + && (mons_genus(defender->type) == MONS_WORKER_ANT + || mons_genus(defender->type) == MONS_FORMICID)) { attack_verb = "squash"; - verb_degree = "like a proverbial bug"; + verb_degree = "like the proverbial ant"; } else { @@ -1789,7 +1782,7 @@ void melee_attack::set_attack_verb() {{"pound", "into fine dust"}, {"pummel", "like a punching bag"}, {"pulverise", ""}, - {"squash", "like a bug"}}; + {"squash", "like an ant"}}; const int choice = random2(ARRAYSZ(punch_desc)); // XXX: could this distinction work better? if (choice == 0 |