From 2f36937e529bf89e595de2b456120768e9030548 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 8 Oct 2009 09:03:58 -0500 Subject: Reorganize (very) ugly things' colors again so that red is the first one, as in the tiles version. --- crawl-ref/source/ghost.cc | 54 ++++++++++----------- crawl-ref/source/mon-util.cc | 12 ++--- .../source/rltiles/dc-mon/demons/ugly_thing.png | Bin 673 -> 665 bytes .../source/rltiles/dc-mon/demons/ugly_thing1.png | Bin 729 -> 723 bytes .../source/rltiles/dc-mon/demons/ugly_thing2.png | Bin 665 -> 673 bytes .../source/rltiles/dc-mon/demons/ugly_thing3.png | Bin 746 -> 729 bytes .../source/rltiles/dc-mon/demons/ugly_thing4.png | Bin 723 -> 746 bytes .../rltiles/dc-mon/demons/very_ugly_thing.png | Bin 675 -> 670 bytes .../rltiles/dc-mon/demons/very_ugly_thing1.png | Bin 745 -> 732 bytes .../rltiles/dc-mon/demons/very_ugly_thing2.png | Bin 670 -> 675 bytes .../rltiles/dc-mon/demons/very_ugly_thing3.png | Bin 750 -> 745 bytes .../rltiles/dc-mon/demons/very_ugly_thing4.png | Bin 732 -> 750 bytes 12 files changed, 33 insertions(+), 33 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc index ac5e0e4e8d..527dd1e90a 100644 --- a/crawl-ref/source/ghost.cc +++ b/crawl-ref/source/ghost.cc @@ -402,7 +402,7 @@ unsigned char ugly_thing_random_colour() { const unsigned char colours[] = { - GREEN, CYAN, RED, MAGENTA, BROWN, LIGHTGREY + RED, BROWN, GREEN, CYAN, MAGENTA, LIGHTGREY }; return (RANDOM_ELEMENT(colours)); @@ -431,6 +431,14 @@ static mon_attack_flavour _ugly_thing_colour_to_flavour(unsigned char u_colour) switch (u_colour) { + case RED: + u_att_flav = AF_FIRE; + break; + + case BROWN: + u_att_flav = AF_ACID; + break; + case GREEN: u_att_flav = AF_POISON_NASTY; break; @@ -439,18 +447,10 @@ static mon_attack_flavour _ugly_thing_colour_to_flavour(unsigned char u_colour) u_att_flav = AF_ELEC; break; - case RED: - u_att_flav = AF_FIRE; - break; - case MAGENTA: u_att_flav = AF_DISEASE; break; - case BROWN: - u_att_flav = AF_ACID; - break; - case LIGHTGREY: u_att_flav = AF_COLD; break; @@ -466,14 +466,14 @@ static mon_attack_flavour _very_ugly_thing_flavour_upgrade(mon_attack_flavour u_ { switch (u_att_flav) { - case AF_POISON_NASTY: - u_att_flav = AF_POISON_MEDIUM; - break; - case AF_FIRE: u_att_flav = AF_NAPALM; break; + case AF_POISON_NASTY: + u_att_flav = AF_POISON_MEDIUM; + break; + case AF_DISEASE: u_att_flav = AF_ROT; break; @@ -576,6 +576,20 @@ void ghost_demon::ugly_thing_add_resistance(bool very_ugly, switch (u_att_flav) { + case AF_FIRE: + resists.fire = 1; + resists.sticky_flame = true; + break; + + case AF_NAPALM: + resists.fire = 2; + resists.sticky_flame = true; + break; + + case AF_ACID: + resists.acid = (very_ugly ? 2 : 1); + break; + case AF_POISON_NASTY: resists.poison = 1; break; @@ -588,25 +602,11 @@ void ghost_demon::ugly_thing_add_resistance(bool very_ugly, resists.elec = (very_ugly ? 2 : 1); break; - case AF_FIRE: - resists.fire = 1; - resists.sticky_flame = true; - break; - - case AF_NAPALM: - resists.fire = 2; - resists.sticky_flame = true; - break; - case AF_DISEASE: case AF_ROT: resists.rotting = true; break; - case AF_ACID: - resists.acid = (very_ugly ? 2 : 1); - break; - case AF_COLD: resists.cold = (very_ugly ? 2 : 1); break; diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index da6a84acde..ff6bd2079b 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2006,7 +2006,7 @@ void define_monster(monsters &mons) } static const char *ugly_colour_names[] = { - "green", "cyan", "red", "purple", "brown", "white" + "red", "brown", "green", "cyan", "purple", "white" }; int ugly_thing_colour_offset(const monsters *mon) @@ -2016,15 +2016,15 @@ int ugly_thing_colour_offset(const monsters *mon) switch (make_low_colour(mon->colour)) { - case GREEN: + case RED: return (0); - case CYAN: + case BROWN: return (1); - case RED: + case GREEN: return (2); - case MAGENTA: + case CYAN: return (3); - case BROWN: + case MAGENTA: return (4); case LIGHTGREY: return (5); diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png index 6e5b95c44f..75dbcd03cd 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png index 305277b447..1d11697db8 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing1.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png index 75dbcd03cd..6e5b95c44f 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing2.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png index ff8efcfcfe..305277b447 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing3.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png index 1d11697db8..ff8efcfcfe 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png and b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing4.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png index e023613478..7d2befab0b 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png index 0befea9e54..6fd88c6ece 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing1.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png index 7d2befab0b..e023613478 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing2.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png index b5547a9a59..0befea9e54 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing3.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png index 6fd88c6ece..b5547a9a59 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png and b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing4.png differ -- cgit v1.2.3-54-g00ecf