diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-08 09:03:58 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-08 09:03:58 -0500 |
| commit | 2f36937e529bf89e595de2b456120768e9030548 (patch) | |
| tree | 06afed9bfe6739ed1f78e0be8642da5207655fe5 /crawl-ref/source/ghost.cc | |
| parent | 22982415537d288bc2429b225dceafc64a79db95 (diff) | |
| download | crawl-ref-2f36937e529bf89e595de2b456120768e9030548.tar.gz crawl-ref-2f36937e529bf89e595de2b456120768e9030548.zip | |
Reorganize (very) ugly things' colors again so that red is the first
one, as in the tiles version.
Diffstat (limited to 'crawl-ref/source/ghost.cc')
| -rw-r--r-- | crawl-ref/source/ghost.cc | 54 |
1 files changed, 27 insertions, 27 deletions
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; |