diff options
| -rw-r--r-- | crawl-ref/source/message.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index ed19b159ee..90dcb3ea95 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -302,7 +302,7 @@ int channel_to_colour( msg_channel_type channel, int param ) case MSGCH_MONSTER_DAMAGE: ret = ((param == MDAM_DEAD) ? RED : - (param >= MDAM_HORRIBLY_DAMAGED) ? LIGHTRED : + (param >= MDAM_SEVERELY_DAMAGED) ? LIGHTRED : (param >= MDAM_MODERATELY_DAMAGED) ? YELLOW : LIGHTGREY); break; diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index ca3b976f16..6ab7630b0c 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1932,8 +1932,8 @@ void mons_get_damage_level( if (monster->hit_points <= monster->max_hit_points / 4) { - desc += "horribly "; - dam_level = MDAM_HORRIBLY_DAMAGED; + desc += "severely "; + dam_level = MDAM_SEVERELY_DAMAGED; } else if (monster->hit_points <= monster->max_hit_points / 3) { diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index 5fc1a8a25a..7ed2c197e4 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -22,7 +22,7 @@ enum mon_dam_level_type MDAM_LIGHTLY_DAMAGED, MDAM_MODERATELY_DAMAGED, MDAM_HEAVILY_DAMAGED, - MDAM_HORRIBLY_DAMAGED, + MDAM_SEVERELY_DAMAGED, MDAM_ALMOST_DEAD, MDAM_DEAD }; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index fb6b87bfa9..8cf8e62379 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1193,7 +1193,7 @@ _print_next_monster_desc(const std::vector<monster_pane_info>& mons, int& start) // but not background colors. So stick wth standards. case MDAM_DEAD: case MDAM_ALMOST_DEAD: - case MDAM_HORRIBLY_DAMAGED: dam_color = RED; break; + case MDAM_SEVERELY_DAMAGED: dam_color = RED; break; case MDAM_HEAVILY_DAMAGED: dam_color = MAGENTA; break; case MDAM_MODERATELY_DAMAGED: dam_color = BROWN; break; case MDAM_LIGHTLY_DAMAGED: dam_color = GREEN; break; |