Attached Files:
|
0001-Added-Angry-indicator-to-the-screen.patch [^] (1,491 bytes) 2014-01-20 01:48 [Show Content] [Hide Content]From 4448a92be9ac27a3fe25a3ae2527faa351ea9238 Mon Sep 17 00:00:00 2001
From: Dom Light <bodricklight@gmail.com>
Date: Mon, 20 Jan 2014 00:34:47 +0000
Subject: [PATCH] Added Angry indicator to the % screen. This replaces the
clarity indicator if you have a *Rage item or berserkitis, but don't have
clarity or stasis.
---
crawl-ref/source/output.cc | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index c8ba994..51ea50f 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2253,9 +2253,12 @@ static vector<formatted_string> _get_overview_resistances(
cwidth = 9;
const int rinvi = you.can_see_invisible(calc_unid);
out += _resist_composer("SeeInvis", cwidth, rinvi) + "\n";
- // TODO: Also show *Rage in clarity line
+ const bool show_angry = ((you.angry(calc_unid) || player_mutation_level(MUT_BERSERK))
+ && !you.clarity(calc_unid)
+ && !you.stasis(calc_unid));
const int rclar = you.clarity(calc_unid);
- out += _resist_composer("Clarity", cwidth, rclar) + "\n";
+ out += show_angry ? _resist_composer("Angry", cwidth, 1, 1, false) + "\n"
+ : _resist_composer("Clarity", cwidth, rclar) + "\n";
const int rcons = you.conservation(calc_unid);
out += _resist_composer("Conserve", cwidth, rcons) + "\n";
const int rcorr = you.res_corr(calc_unid);
--
1.8.5.2
|