Made (re)colouring of food/item types really easy (using variables and a

new default colours file). Thanks Matthew!


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

3 files changed, 35 insertions, 22 deletions

diff --git a/crawl-ref/settings/food_colouring.txt b/crawl-ref/settings/food_colouring.txt
index 9a0125776e..f21ac57585 100644
--- a/crawl-ref/settings/food_colouring.txt
+++ b/crawl-ref/settings/food_colouring.txt
@@ -1,32 +1,32 @@
 ### Colouring of corpses, depending on whether you can eat them, and
-### whether it's safe to eat them. Contains spoilers!
+### whether it's safe to eat them. 
 ### Colours both on the ground and in inventory!
 
 msg := message_colour
 inv := menu_colour
 
-msg = darkgrey:.*inedible.*
-inv = darkgrey:.*inedible.*
+msg = $inedible:.*inedible.*
+inv = $inedible:.*inedible.*
 
-inv = magenta:.*evil_item.*
-inv = magenta:.*evil_eating.*
+inv = $evil:.*evil_item.*
+inv = $evil:.*evil_eating.*
 
-msg = yellow:.*preferred.*
-inv = yellow:.*preferred.*
+msg = $preferred:.*preferred.*
+inv = $preferred:.*preferred.*
 
 # Corpses of undead (necrophages etc.)
-msg = lightred:.*rot-inducing.*
-inv = lightred:.*rot-inducing.*
+msg = $rot-inducing:.*rot-inducing.*
+inv = $rot-inducing:.*rot-inducing.*
 
 # Mutagenic corpses/chunks
-msg = magenta:.*mutagenic.*
-inv = magenta:.*mutagenic.*
+msg = $mutagenic:.*mutagenic.*
+inv = $mutagenic:.*mutagenic.*
 
 # Poisonous corpses/chunks
-msg = lightgreen:.*poisonous.*
-inv = lightgreen:.*poisonous.*
+msg = $poisonous:.*poisonous.*
+inv = $poisonous:.*poisonous.*
 
 # Contaminated corpses/chunks
-msg = brown:.*contaminated.*
-inv = brown:.*contaminated.*
+msg = $contaminated:.*contaminated.*
+inv = $contaminated:.*contaminated.*
 
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index c915c1ac57..63e99082ed 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -238,15 +238,19 @@ include = travel_stoppers.txt
 # menu_colour_prefix_id    = true
 menu_colour_prefix_class = true
 
-# Food is colour coded as follows:
+# Food is colour coded in standard_colours.txt as follows:
+include = standard_colours.txt
 #
-#   yellow     = preferred food
-#   darkgrey   = cannot be eaten at all
-#   lightred   = extremely dangerous (causes rot)
-#   magenta    = mutagenic, or eating frowned upon by the good gods
-#   lightgreen = poisonous
-#   brown      = contaminated (may cause sickening)
+#   yellow     = preferred food                    ($preferred)
+#   darkgrey   = cannot be eaten at all            ($inedible)
+#   lightred   = extremely dangerous, causes rot   ($rot-inducing)
+#   magenta    = mutagenic, or evil                ($mutagenic, $evil)
+#   lightgreen = poisonous                         ($poisonous)
+#   brown      = contaminated, may cause sickness  ($contaminated)
 #
+# You can change colours by using something like
+# $contaminated := magenta
+
 include = food_colouring.txt
 
 # There is elaborate colouring of items in the inventory (and other menus)
diff --git a/crawl-ref/settings/standard_colours.txt b/crawl-ref/settings/standard_colours.txt
new file mode 100644
index 0000000000..dc000cfd1c
--- /dev/null
+++ b/crawl-ref/settings/standard_colours.txt
@@ -0,0 +1,9 @@
+### standard colours to be used for menu and inventory colouring
+
+$inedible     := darkgrey
+$evil         := magenta
+$preferred    := yellow
+$rot-inducing := lightred
+$mutagenic    := magenta
+$poisonous    := lightgreen
+$contaminated := brown