Add standard colour variables for message highlighting: $danger, $warning,

$boring and $item_dmg.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8044 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 39 insertions, 25 deletions

diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 0ef981a890..c884c3383f 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -283,6 +283,13 @@ menu_colour = inventory:white:\w \+\s
 menu_colour = inventory:white:\w \#\s
 
 # Colouring of messages
+# Messages are colour coded in standard_colours.txt as follows:
+#
+#   lightred   = really important messages  ($danger)
+#   yellow     = significant messages       ($warning)
+#   lightred   = item damaged/destryoed     ($item_dmg [same as $danger])
+#   darkgrey   = boring, message clutter    ($boring)
+#
 include = messages.txt
 
 # Colouring for the notes
diff --git a/crawl-ref/settings/messages.txt b/crawl-ref/settings/messages.txt
index 5227d46a20..e1a00a633e 100644
--- a/crawl-ref/settings/messages.txt
+++ b/crawl-ref/settings/messages.txt
@@ -4,36 +4,37 @@ msc := message_colour
 
 # Really important messages
 #
-msc = lightred:drains you
-msc = lightred:feel drained
-msc = lightred:strangely unstable
-msc = lightred:curare-tipped.*hits you
-msc = lightred:Space warps.* around you
-msc = lightred:Space bends around you
-msc = lightred:acid corrodes
-msc = lightred:you are carrying w.* destroyed
-msc = lightred:you are carrying catche?s? fire
-msc = lightred:you are carrying freezes? and shatters?
-msc = lightred:Some of your food is covered with spores
-msc = lightred:lose your buoyancy
-msc = lightred:sense of stasis
-msc = lightred:clumsily bash
-msc = lightred:goes berserk!
+msc = $danger:drains you
+msc = $danger:feel drained
+msc = $danger:strangely unstable
+msc = $danger:curare-tipped.*hits you
+msc = $danger:Space warps.* around you
+msc = $danger:Space bends around you
+msc = $danger:lose your buoyancy
+msc = $danger:sense of stasis
+msc = $danger:clumsily bash
+msc = $danger:goes berserk!
+
+msc = $item_dmg:acid corrodes
+msc = $item_dmg:you are carrying w.* destroyed
+msc = $item_dmg:you are carrying catche?s? fire
+msc = $item_dmg:you are carrying freezes? and shatters?
+msc = $item_dmg:Some of your food is covered with spores
 
 # Less urgent, but still significant messages
 #
-msc = yellow:ticking.*clock
-msc = yellow:distant snort
-msc = yellow:coins.*counted
-msc = yellow:tolling.*bell
+msc = $warning:ticking.*clock
+msc = $warning:distant snort
+msc = $warning:coins.*counted
+msc = $warning:tolling.*bell
 msc = lightcyan:LOW MAGIC WARNING
-msc = yellow:fails to return
+msc = $warning:fails to return
 
 # Unimportant messages and combat clutter
 #
-msc = darkgrey:You start (resting|searching)
-msc = darkgrey:Unknown command
-msc = darkgrey:disappears in a puff of smoke
+msc = $boring:You start (resting|searching)
+msc = $boring:Unknown command
+msc = $boring:disappears in a puff of smoke
 #
-msc = darkgrey:plain:miss(es)? (the|you|it)
-msc = darkgrey:but (do no|doesn't do any) damage
+msc = $boring:plain:miss(es)? (the|you|it)
+msc = $boring:but (do no|doesn't do any) damage
diff --git a/crawl-ref/settings/standard_colours.txt b/crawl-ref/settings/standard_colours.txt
index dc000cfd1c..6cae75834d 100644
--- a/crawl-ref/settings/standard_colours.txt
+++ b/crawl-ref/settings/standard_colours.txt
@@ -7,3 +7,9 @@ $rot-inducing := lightred
 $mutagenic    := magenta
 $poisonous    := lightgreen
 $contaminated := brown
+
+### standard colours to be used for message highlighting
+$danger   := lightred
+$warning  := yellow
+$boring   := darkgrey
+$item_dmg := $danger