|
From: <j-...@us...> - 2007-04-02 12:32:48
|
Revision: 1188
http://svn.sourceforge.net/crawl-ref/?rev=1188&view=rev
Author: j-p-e-g
Date: 2007-04-02 05:32:45 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Tweaked item colours and added special colouring to randarts.
We might still have to exchange the grey/blue pairings
but for now I've tried to keep as many settings as possible.
Modified Paths:
--------------
trunk/crawl-ref/source/dungeon.cc
Modified: trunk/crawl-ref/source/dungeon.cc
===================================================================
--- trunk/crawl-ref/source/dungeon.cc 2007-04-02 11:26:27 UTC (rev 1187)
+++ trunk/crawl-ref/source/dungeon.cc 2007-04-02 12:32:45 UTC (rev 1188)
@@ -6542,9 +6542,26 @@
while (pools < no_pools);
} // end many_pools()
+static int exciting_colour()
+{
+ switch(random2(4))
+ {
+ case 0: return YELLOW;
+ case 1: return LIGHTGREEN;
+ case 2: return LIGHTRED;
+ case 3: return LIGHTMAGENTA;
+ default: return MAGENTA;
+ }
+}
+
+
static int newwave_weapon_colour(const item_def &item)
{
int item_colour = BLACK;
+ // unrandom artefacts get predefined colours
+ if ( is_random_artefact(item) )
+ return exciting_colour();
+
if (is_range_weapon( item ))
{
switch (range_skill(item))
@@ -6553,7 +6570,7 @@
item_colour = BLUE;
break;
case SK_CROSSBOWS:
- item_colour = RED;
+ item_colour = LIGHTBLUE;
break;
case SK_DARTS:
item_colour = WHITE;
@@ -6584,7 +6601,7 @@
item_colour = LIGHTGREY;
break;
case SK_POLEARMS:
- item_colour = LIGHTGREEN;
+ item_colour = RED;
break;
case SK_STAVES:
item_colour = GREEN;
@@ -6655,10 +6672,10 @@
item_colour = WHITE;
break;
case MI_BOLT:
- item_colour = RED;
+ item_colour = LIGHTBLUE;
break;
case MI_DART:
- item_colour = LIGHTRED;
+ item_colour = CYAN;
break;
default:
// huh?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|