From 779fa77b12bdb33d3be215297da1daabf96f5af7 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 24 May 2008 19:01:04 +0000 Subject: Change SP_GOLDEN_DRACONIAN to SP_YELLOW_DRACONIAN, for consistency. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5215 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 2 +- crawl-ref/source/effects.cc | 2 +- crawl-ref/source/enum.h | 2 +- crawl-ref/source/mon-util.cc | 2 +- crawl-ref/source/mutation.cc | 2 +- crawl-ref/source/newgame.cc | 2 +- crawl-ref/source/output.cc | 2 +- crawl-ref/source/player.cc | 12 ++++++------ crawl-ref/source/tile1.cc | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index aa93cccf9f..ef57086485 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -2005,7 +2005,7 @@ std::vector your_talents( bool check_confused ) (you.species == SP_GREEN_DRACONIAN) ? ABIL_BREATHE_POISON : (you.species == SP_RED_DRACONIAN) ? ABIL_BREATHE_FIRE : (you.species == SP_WHITE_DRACONIAN) ? ABIL_BREATHE_FROST : - (you.species == SP_GOLDEN_DRACONIAN) ? ABIL_SPIT_ACID : + (you.species == SP_YELLOW_DRACONIAN) ? ABIL_SPIT_ACID : (you.species == SP_BLACK_DRACONIAN) ? ABIL_BREATHE_LIGHTNING : (you.species == SP_PURPLE_DRACONIAN) ? ABIL_BREATHE_POWER : (you.species == SP_PALE_DRACONIAN) ? ABIL_BREATHE_STEAM : diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 0ddfb56f21..153b195d82 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1036,7 +1036,7 @@ static int find_acquirement_subtype(object_class_type class_wanted, case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: case SP_GREY_DRACONIAN: case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index aafe14b992..9df5219da0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2356,7 +2356,7 @@ enum species_type SP_RED_DRACONIAN, SP_WHITE_DRACONIAN, SP_GREEN_DRACONIAN, - SP_GOLDEN_DRACONIAN, + SP_YELLOW_DRACONIAN, SP_GREY_DRACONIAN, // 20 SP_BLACK_DRACONIAN, SP_PURPLE_DRACONIAN, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 1106aab451..5197d2ac2f 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -6344,7 +6344,7 @@ static mon_body_shape _get_ghost_shape(const monsters *mon) case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: case SP_GREY_DRACONIAN: case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 23ee151116..4deb21dce3 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1192,7 +1192,7 @@ formatted_string describe_mutations() } break; - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: if (you.experience_level > 6) { result += "You can spit acid." EOL; diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index a4209aaf61..1e0d18f870 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2208,7 +2208,7 @@ static void _species_stat_init(species_type which_species) case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: case SP_GREY_DRACONIAN: case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 3322539fd8..41084a1c79 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2358,7 +2358,7 @@ std::string _status_mut_abilities() mutations.push_back("breathe lightning"); break; - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: if (you.experience_level > 6) { mutations.push_back("spit acid"); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 376ab3e73e..ee24dc3615 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -437,7 +437,7 @@ bool player_genus(genus_type which_genus, species_type species) case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: case SP_GREY_DRACONIAN: case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: @@ -559,7 +559,7 @@ bool is_player_same_species(const int mon, bool transform) case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: case SP_GREY_DRACONIAN: case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: @@ -1357,7 +1357,7 @@ int player_res_acid(bool consider_unidentified_gear) int res = 0; if (!transform_changed_physiology()) { - if (you.species == SP_GOLDEN_DRACONIAN + if (you.species == SP_YELLOW_DRACONIAN && you.experience_level >= 7) res += 2; @@ -3154,7 +3154,7 @@ void level_change(bool skip_attribute_increase) case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: /* Grey is later */ case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: @@ -3183,7 +3183,7 @@ void level_change(bool skip_attribute_increase) perma_mutate(MUT_POISON_RESISTANCE, 1); break; - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: mpr("Your scales start taking on a golden yellow colour.", MSGCH_INTRINSIC_GAIN); break; case SP_BLACK_DRACONIAN: @@ -4054,7 +4054,7 @@ std::string species_name(species_type speci, int level, bool genus, bool adj) case SP_RED_DRACONIAN: res = "Red Draconian"; break; case SP_WHITE_DRACONIAN: res = "White Draconian"; break; case SP_GREEN_DRACONIAN: res = "Green Draconian"; break; - case SP_GOLDEN_DRACONIAN: res = "Yellow Draconian"; break; + case SP_YELLOW_DRACONIAN: res = "Yellow Draconian"; break; case SP_GREY_DRACONIAN: res = "Grey Draconian"; break; case SP_BLACK_DRACONIAN: res = "Black Draconian"; break; case SP_PURPLE_DRACONIAN: res = "Purple Draconian"; break; diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index ddcce9456d..600b46fe2e 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -2636,7 +2636,7 @@ int draconian_color(int race, int level) switch(race) { case SP_BLACK_DRACONIAN: return 1; - case SP_GOLDEN_DRACONIAN: return 2; + case SP_YELLOW_DRACONIAN: return 2; case SP_GREY_DRACONIAN: return 3; case SP_GREEN_DRACONIAN: return 4; case SP_MOTTLED_DRACONIAN: return 5; @@ -2725,7 +2725,7 @@ void tilep_race_default(int race, int gender, int level, int *parts) case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: case SP_GREEN_DRACONIAN: - case SP_GOLDEN_DRACONIAN: + case SP_YELLOW_DRACONIAN: case SP_GREY_DRACONIAN: case SP_BLACK_DRACONIAN: case SP_PURPLE_DRACONIAN: -- cgit v1.2.3-54-g00ecf