diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-02 12:32:45 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-02 12:32:45 +0000 |
| commit | cf9342cff2b07003767d7965679ddc315176fc09 (patch) | |
| tree | e6ff784c7c33f20250b56f6c0d6c8cb8a66fa301 /crawl-ref/source/dungeon.cc | |
| parent | aab231295dfe36b6e4dce0d318e9ae710fd17512 (diff) | |
| download | crawl-ref-cf9342cff2b07003767d7965679ddc315176fc09.tar.gz crawl-ref-cf9342cff2b07003767d7965679ddc315176fc09.zip | |
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.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1188 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 524ab8c86d..caaea6892d 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -6542,9 +6542,26 @@ static void many_pools(unsigned char pool_type) 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 @@ static int newwave_weapon_colour(const item_def &item) item_colour = BLUE; break; case SK_CROSSBOWS: - item_colour = RED; + item_colour = LIGHTBLUE; break; case SK_DARTS: item_colour = WHITE; @@ -6584,7 +6601,7 @@ static int newwave_weapon_colour(const item_def &item) item_colour = LIGHTGREY; break; case SK_POLEARMS: - item_colour = LIGHTGREEN; + item_colour = RED; break; case SK_STAVES: item_colour = GREEN; @@ -6655,10 +6672,10 @@ static int newwave_missile_colour(const item_def &item) 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? |