|
Description:
|
Hi. I've never submitted a patch here before so I don't really know what I'm doing, but I had an idea and went ahead and implemented it.
This patch adds a new category to menu_colour, called "stats", which is used when an item is shown in the stats panel in the top right.
Normally, not much is coloured there by default save for cursed items. But with this change it's easy to add your own useful colours. I often found myself swapping to the wrong ranged or melee weapon, or keeping wielded chunks equipped too long. Now you can easily add special colours there that won't interfere with your other colour rules. For example:
menu_colour += stats:magenta:food
menu_colour += stats:lightblue:melee
menu_colour += stats:yellow:ranged
To help make simple rules like that, I also added the "ranged" and "melee" prefixes to weapons in the item_prefix function. |
|
Attached Files:
|
 0001-Add-stats-category-to-menu_colour-and-provide-ranged.patch [^] (2,934 bytes) 2014-04-23 16:17 [Show Content] [Hide Content]From 389befa2117ba21f8ea7f601a33e08b1bba72fff Mon Sep 17 00:00:00 2001
From: bones <x@y.z>
Date: Wed, 23 Apr 2014 23:01:05 +0900
Subject: [PATCH] Add "stats" category to menu_colour and provide ranged/melee
colouring prefixes for weapons.
---
crawl-ref/docs/options_guide.txt | 3 +++
crawl-ref/source/itemname.cc | 5 +++++
crawl-ref/source/output.cc | 4 ++--
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index c8c696a..6676f51 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -1372,6 +1372,7 @@ menu_colour ^= <match>:<colour>:<regex>, <colour>:<regex>, ...
resists (the % screen)
spell (the Z and I screens)
stash (the results from Ctrl-F)
+ stats (the player stats panel)
Crawl has a couple of prefixes defined to make inventory colouring
easier. These are, in order of definition:
@@ -1401,6 +1402,8 @@ menu_colour ^= <match>:<colour>:<regex>, <colour>:<regex>, ...
equipped (Equipped items.)
artefact (For artefacts, whether identified or not.)
+ melee (Melee weapons.)
+ ranged (Ranged weapons.)
When looking for menu_colour matches, these prefixes are prepended to
the actual item name, e.g. in the form of
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 8473672..21791af 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -3625,6 +3625,11 @@ string item_prefix(const item_def &item, bool temp)
break;
case OBJ_WEAPONS:
+ if (is_range_weapon(item))
+ prefixes.push_back("ranged");
+ else
+ prefixes.push_back("melee");
+ // fall through
case OBJ_ARMOUR:
case OBJ_JEWELLERY:
if (is_artefact(item))
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 6de7750..8a3fe63 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -793,7 +793,7 @@ static void _print_stats_wp(int y)
const item_def& wpn = *you.weapon();
const string prefix = item_prefix(wpn);
- const int prefcol = menu_colour(wpn.name(DESC_INVENTORY), prefix);
+ const int prefcol = menu_colour(wpn.name(DESC_INVENTORY), prefix, "stats");
if (prefcol != -1)
col = prefcol;
else
@@ -867,7 +867,7 @@ static void _print_stats_qv(int y)
const item_def& quiver = you.inv[q];
const string prefix = item_prefix(quiver);
const int prefcol =
- menu_colour(quiver.name(DESC_INVENTORY), prefix);
+ menu_colour(quiver.name(DESC_INVENTORY), prefix, "stats");
if (prefcol != -1)
col = prefcol;
else
--
1.9.2.msysgit.0
|