diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-04 21:23:23 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-04 21:23:23 +0000 |
commit | a6772d2fdc8e96155e6c9b6536bee7454060c31d (patch) | |
tree | cb4b9ff8fc24bb69cb369c8c5051305e98ed5c11 /crawl-ref | |
parent | ad41e88ccde026ea8da10551d2e373a6585c5105 (diff) | |
download | crawl-ref-a6772d2fdc8e96155e6c9b6536bee7454060c31d.tar.gz crawl-ref-a6772d2fdc8e96155e6c9b6536bee7454060c31d.zip |
Remove gnomes and grey elves. (Can someone check the tiles compile?)
Species-shifts saves.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9328 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/abl-show.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dat/descript/items.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/effects.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 6 | ||||
-rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/newgame.cc | 111 | ||||
-rw-r--r-- | crawl-ref/source/player.cc | 44 | ||||
-rw-r--r-- | crawl-ref/source/skills2.cc | 159 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/transfor.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/traps.cc | 2 |
12 files changed, 74 insertions, 267 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 22b491ac8a..0c1ada0d03 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1147,8 +1147,8 @@ static bool _do_ability(const ability_def& abil) } break; } - case ABIL_EVOKE_MAPPING: // randarts - case ABIL_MAPPING: // Gnome + sense surrounds mut + case ABIL_EVOKE_MAPPING: // Randarts + case ABIL_MAPPING: // Sense surroundings mutation if (abil.ability == ABIL_MAPPING && player_mutation_level(MUT_MAPPING) < 3 && (you.level_type == LEVEL_PANDEMONIUM diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 3cb555ab8a..d82231156b 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -4047,7 +4047,7 @@ static void _compile_time_asserts() // disturbed accidentally. COMPILE_CHECK(SK_UNARMED_COMBAT == 19 , c1); COMPILE_CHECK(SK_EVOCATIONS == 39 , c2); - COMPILE_CHECK(SP_VAMPIRE == 33 , c3); + COMPILE_CHECK(SP_VAMPIRE == 31 , c3); COMPILE_CHECK(SPELL_DEBUGGING_RAY == 107 , c4); COMPILE_CHECK(SPELL_PETRIFY == 160 , c5); COMPILE_CHECK(NUM_SPELLS == 198 , c6); diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index c4e524cf09..534dd42db1 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -687,7 +687,6 @@ javelin A long, light polearm that can be thrown by hand. {{ if you.race() == "Halfling" - or you.race() == "Gnome" or you.race() == "Kobold" or you.race() == "Spriggan" then @@ -1492,7 +1491,6 @@ throwing net A throwing net as used by gladiators. {{ if you.race() == "Halfling" - or you.race() == "Gnome" or you.race() == "Kobold" or you.race() == "Spriggan" then diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index b31ccacc2f..599f956785 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1777,7 +1777,6 @@ bool acquirement(object_class_type class_wanted, int agent, break; case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: switch (thing.sub_type) diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 26154eac6a..c913956c1b 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2514,7 +2514,7 @@ enum size_type { SIZE_TINY, // rats/bats SIZE_LITTLE, // spriggans - SIZE_SMALL, // halflings/kobolds/gnomes + SIZE_SMALL, // halflings/kobolds SIZE_MEDIUM, // humans/elves/dwarves SIZE_LARGE, // trolls/ogres SIZE_BIG, // large quadrupeds/centaurs/nagas @@ -2590,7 +2590,6 @@ enum species_type { SP_HUMAN = 1, SP_HIGH_ELF, - SP_GREY_ELF, SP_DEEP_ELF, SP_SLUDGE_ELF, SP_MOUNTAIN_DWARF, @@ -2599,7 +2598,6 @@ enum species_type SP_KOBOLD, SP_MUMMY, SP_NAGA, - SP_GNOME, SP_OGRE, SP_TROLL, SP_RED_DRACONIAN, @@ -2625,6 +2623,8 @@ enum species_type SP_ELF, // (placeholder) SP_HILL_DWARF, // (placeholder) SP_OGRE_MAGE, // (placeholder) + SP_GREY_ELF, // (placeholder) + SP_GNOME, // (placeholder) NUM_SPECIES, // always after the last species SP_UNKNOWN = 100 diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 970966d30b..15b43dc132 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -134,7 +134,7 @@ size: SIZE_TINY, // rats/bats SIZE_LITTLE, // spriggans - SIZE_SMALL, // halflings/kobolds/gnomes + SIZE_SMALL, // halflings/kobolds SIZE_MEDIUM, // humans/elves/dwarves SIZE_LARGE, // trolls/ogres SIZE_BIG, // large quadrupeds/centaurs/nagas diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 8f9c12e205..5e64603db4 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -117,18 +117,17 @@ static god_type ng_pr; // The red draconian is later replaced by a random variant. // The old and new lists are expected to have the same length. static species_type old_species_order[] = { - SP_HUMAN, SP_HIGH_ELF, - SP_GREY_ELF, SP_DEEP_ELF, - SP_SLUDGE_ELF, SP_MOUNTAIN_DWARF, - SP_HALFLING, SP_HILL_ORC, - SP_KOBOLD, SP_MUMMY, - SP_NAGA, SP_GNOME, - SP_OGRE, SP_TROLL, - SP_RED_DRACONIAN, SP_CENTAUR, - SP_DEMIGOD, SP_SPRIGGAN, - SP_MINOTAUR, SP_DEMONSPAWN, - SP_GHOUL, SP_KENKU, - SP_MERFOLK, SP_VAMPIRE, + SP_HUMAN, SP_HIGH_ELF, + SP_DEEP_ELF, SP_SLUDGE_ELF, + SP_MOUNTAIN_DWARF, SP_HALFLING, + SP_HILL_ORC, SP_KOBOLD, + SP_MUMMY, SP_NAGA, + SP_OGRE, SP_TROLL, + SP_RED_DRACONIAN, SP_CENTAUR, + SP_DEMIGOD, SP_SPRIGGAN, + SP_MINOTAUR, SP_DEMONSPAWN, + SP_GHOUL, SP_KENKU, + SP_MERFOLK, SP_VAMPIRE, SP_DEEP_DWARF }; @@ -137,23 +136,22 @@ static species_type old_species_order[] = { // all living creatures finally the undead. (MM) static species_type new_species_order[] = { // comparatively human-like looks - SP_HUMAN, SP_HIGH_ELF, - SP_GREY_ELF, SP_DEEP_ELF, - SP_SLUDGE_ELF, SP_MOUNTAIN_DWARF, - SP_DEEP_DWARF, SP_HILL_ORC, - SP_MERFOLK, + SP_HUMAN, SP_HIGH_ELF, + SP_DEEP_ELF, SP_SLUDGE_ELF, + SP_MOUNTAIN_DWARF, SP_DEEP_DWARF, + SP_HILL_ORC, SP_MERFOLK, // small species - SP_HALFLING, SP_GNOME, - SP_KOBOLD, SP_SPRIGGAN, + SP_HALFLING, SP_KOBOLD, + SP_SPRIGGAN, // significantly different body type from human - SP_NAGA, SP_CENTAUR, - SP_OGRE, SP_TROLL, - SP_MINOTAUR, SP_KENKU, + SP_NAGA, SP_CENTAUR, + SP_OGRE, SP_TROLL, + SP_MINOTAUR, SP_KENKU, SP_RED_DRACONIAN, // celestial species - SP_DEMIGOD, SP_DEMONSPAWN, + SP_DEMIGOD, SP_DEMONSPAWN, // undead species - SP_MUMMY, SP_GHOUL, + SP_MUMMY, SP_GHOUL, SP_VAMPIRE }; @@ -227,13 +225,13 @@ static job_type _get_class(const int index) } static const char * Species_Abbrev_List[ NUM_SPECIES ] = - { "XX", "Hu", "HE", "GE", "DE", "SE", "MD", "Ha", - "HO", "Ko", "Mu", "Na", "Gn", "Og", "Tr", + { "XX", "Hu", "HE", "DE", "SE", "MD", "Ha", + "HO", "Ko", "Mu", "Na", "Og", "Tr", // the draconians "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp", "DD", // placeholders - "El", "HD", "OM" }; + "El", "HD", "OM", "GE", "Gn" }; int get_species_index_by_abbrev( const char *abbrev ) { @@ -1026,14 +1024,12 @@ static void _give_species_bonus_hp() inc_max_hp(1); break; - case SP_GREY_ELF: case SP_HIGH_ELF: case SP_VAMPIRE: dec_max_hp(1); break; case SP_DEEP_ELF: - case SP_GNOME: case SP_HALFLING: case SP_KENKU: case SP_KOBOLD: @@ -1055,7 +1051,6 @@ static void _give_species_bonus_mp() case SP_VAMPIRE: case SP_SPRIGGAN: case SP_DEMIGOD: - case SP_GREY_ELF: case SP_DEEP_ELF: inc_max_mp(1); break; @@ -1356,13 +1351,11 @@ static char_choice_restriction _class_allowed(species_type speci, case JOB_FIGHTER: switch (speci) { - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_DEEP_DWARF: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -1378,12 +1371,10 @@ static char_choice_restriction _class_allowed(species_type speci, case JOB_GLADIATOR: switch (speci) { - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -1400,13 +1391,11 @@ static char_choice_restriction _class_allowed(species_type speci, { case SP_HUMAN: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_MOUNTAIN_DWARF: case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -1427,12 +1416,10 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_DEMIGOD: return (CC_BANNED); case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -1455,12 +1442,10 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_GHOUL: case SP_VAMPIRE: return (CC_BANNED); - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_DEEP_DWARF: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -1476,12 +1461,10 @@ static char_choice_restriction _class_allowed(species_type speci, { case SP_DEMIGOD: return (CC_BANNED); - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_DEEP_DWARF: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: @@ -1499,7 +1482,6 @@ static char_choice_restriction _class_allowed(species_type speci, { case SP_DEMIGOD: return (CC_BANNED); - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SPRIGGAN: case SP_NAGA: @@ -1512,8 +1494,6 @@ static char_choice_restriction _class_allowed(species_type speci, case JOB_DEATH_KNIGHT: switch (speci) { - case SP_GREY_ELF: - case SP_GNOME: case SP_SPRIGGAN: case SP_NAGA: case SP_KENKU: @@ -1535,7 +1515,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_DEEP_ELF: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: @@ -1575,7 +1554,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -1602,7 +1580,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_HILL_ORC: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_CENTAUR: @@ -1622,7 +1599,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_HILL_ORC: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_TROLL: @@ -1665,7 +1641,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_HILL_ORC: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_TROLL: @@ -1683,11 +1658,9 @@ static char_choice_restriction _class_allowed(species_type speci, switch (speci) { case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_MOUNTAIN_DWARF: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_TROLL: @@ -1701,7 +1674,6 @@ static char_choice_restriction _class_allowed(species_type speci, switch (speci) { case SP_HUMAN: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_MOUNTAIN_DWARF: @@ -1710,7 +1682,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_MERFOLK: case SP_HALFLING: case SP_KOBOLD: - case SP_GNOME: case SP_NAGA: case SP_CENTAUR: case SP_OGRE: @@ -1732,14 +1703,12 @@ static char_choice_restriction _class_allowed(species_type speci, { case SP_HUMAN: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_MOUNTAIN_DWARF: case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_HALFLING: case SP_KOBOLD: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_TROLL: @@ -1760,7 +1729,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_DEEP_DWARF: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_TROLL: @@ -1779,7 +1747,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_HALFLING: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_TROLL: @@ -1798,7 +1765,6 @@ static char_choice_restriction _class_allowed(species_type speci, case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_MERFOLK: - case SP_GNOME: case SP_CENTAUR: case SP_TROLL: case SP_MINOTAUR: @@ -1814,7 +1780,6 @@ static char_choice_restriction _class_allowed(species_type speci, switch (speci) { case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_MERFOLK: @@ -1837,12 +1802,10 @@ static char_choice_restriction _class_allowed(species_type speci, switch (speci) { case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_MOUNTAIN_DWARF: case SP_DEEP_DWARF: case SP_HILL_ORC: case SP_HALFLING: - case SP_GNOME: case SP_CENTAUR: case SP_TROLL: case SP_MINOTAUR: @@ -1900,7 +1863,6 @@ static char_choice_restriction _class_allowed(species_type speci, { case SP_DEEP_DWARF: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: case SP_NAGA: @@ -2013,12 +1975,10 @@ static char_choice_restriction _book_restriction(startup_book_type booktype) { case SP_HUMAN: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_MOUNTAIN_DWARF: case SP_HILL_ORC: - case SP_GNOME: case SP_KOBOLD: case SP_NAGA: case SP_KENKU: @@ -2039,12 +1999,10 @@ static char_choice_restriction _book_restriction(startup_book_type booktype) { case SP_HUMAN: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_HILL_ORC: case SP_MERFOLK: - case SP_GNOME: case SP_KOBOLD: case SP_NAGA: case SP_KENKU: @@ -2063,7 +2021,6 @@ static char_choice_restriction _book_restriction(startup_book_type booktype) case SBT_SUMM: // Summoning switch (you.species) { - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_KOBOLD: @@ -2258,13 +2215,11 @@ static char_choice_restriction _weapon_restriction(weapon_type wpn) return (CC_RESTRICTED); // else fall through case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: // Sludge elves have bad aptitudes with short swords (110) but are // still better with them than any other starting weapon. case SP_SLUDGE_ELF: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_SPRIGGAN: return (CC_UNRESTRICTED); @@ -2590,14 +2545,12 @@ static char_choice_restriction _religion_restriction(god_type god) case SP_HUMAN: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_SLUDGE_ELF: case SP_MOUNTAIN_DWARF: case SP_DEEP_DWARF: case SP_MERFOLK: case SP_HALFLING: case SP_KOBOLD: - case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: case SP_OGRE: @@ -2638,7 +2591,6 @@ static char_choice_restriction _religion_restriction(god_type god) { case SP_HUMAN: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_MOUNTAIN_DWARF: @@ -2646,7 +2598,6 @@ static char_choice_restriction _religion_restriction(god_type god) case SP_HILL_ORC: case SP_MERFOLK: case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: case SP_NAGA: case SP_CENTAUR: @@ -2764,7 +2715,6 @@ static void _species_stat_init(species_type which_species) case SP_DEMONSPAWN: sb = 4; ib = 4; db = 4; break; // 12+7 case SP_HIGH_ELF: sb = 5; ib = 9; db = 8; break; // 22 - case SP_GREY_ELF: sb = 4; ib = 9; db = 8; break; // 21 case SP_DEEP_ELF: sb = 3; ib = 10; db = 8; break; // 21 case SP_SLUDGE_ELF: sb = 6; ib = 7; db = 7; break; // 20 @@ -2779,7 +2729,6 @@ static void _species_stat_init(species_type which_species) case SP_CENTAUR: sb = 8; ib = 5; db = 2; break; // 15 case SP_NAGA: sb = 8; ib = 6; db = 4; break; // 18 - case SP_GNOME: sb = 6; ib = 6; db = 7; break; // 19 case SP_MERFOLK: sb = 6; ib = 5; db = 7; break; // 18 case SP_KENKU: sb = 6; ib = 6; db = 7; break; // 19 @@ -2907,9 +2856,6 @@ void give_basic_mutations(species_type speci) you.mutation[MUT_COLD_RESISTANCE] = 1; you.mutation[MUT_NEGATIVE_ENERGY_RESISTANCE] = 3; break; - case SP_GNOME: - you.mutation[MUT_MAPPING] = 2; - break; case SP_DEEP_DWARF: you.mutation[MUT_SLOW_HEALING] = 3; you.mutation[MUT_MAPPING] = 2; @@ -5464,12 +5410,6 @@ bool _give_items_skills() break; case JOB_EARTH_ELEMENTALIST: - if (you.species == SP_GNOME) - { - _newgame_make_item(0, EQ_NONE, OBJ_WEAPONS, WPN_SLING); - you.skills[SK_SLINGS] = 1; - } - _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE); _newgame_make_item(2, EQ_NONE, OBJ_BOOKS, BOOK_GEOMANCY); _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_STONE, -1, 20); @@ -5597,7 +5537,6 @@ bool _give_items_skills() break; case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: _newgame_make_item(1, EQ_NONE, OBJ_WEAPONS, WPN_SLING); _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_SLING_BULLET, -1, diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index c8af10a78b..b4f6370bbe 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -447,7 +447,6 @@ bool player_genus(genus_type which_genus, species_type species) return (which_genus == GENPC_DRACONIAN); case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: return (which_genus == GENPC_ELVEN); @@ -543,7 +542,6 @@ bool is_player_same_species(const int mon, bool transform) } return (false); - case SP_GREY_ELF: case SP_HIGH_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: @@ -1222,7 +1220,6 @@ int player_res_magic(void) rm = you.experience_level * 3; break; case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_SLUDGE_ELF: case SP_DEEP_ELF: case SP_MOUNTAIN_DWARF: @@ -1235,7 +1232,6 @@ int player_res_magic(void) rm = you.experience_level * 5; break; case SP_PURPLE_DRACONIAN: - case SP_GNOME: case SP_DEEP_DWARF: rm = you.experience_level * 6; break; @@ -3043,22 +3039,6 @@ void level_change(bool skip_attribute_increase) } break; - case SP_GREY_ELF: - if (you.experience_level < 14) - hp_adjust--; - - if (you.experience_level % 3) - mp_adjust++; - - if (!(you.experience_level % 4)) - { - modify_stat( (coinflip() ? STAT_INTELLIGENCE - : STAT_DEXTERITY), 1, false, - "level gain"); - } - - break; - case SP_DEEP_ELF: if (you.experience_level < 17) hp_adjust--; @@ -3208,21 +3188,6 @@ void level_change(bool skip_attribute_increase) } break; - case SP_GNOME: - if (you.experience_level < 13) - hp_adjust--; - - if (!(you.experience_level % 3)) - hp_adjust--; - - if (!(you.experience_level % 4)) - { - modify_stat( (coinflip() ? STAT_INTELLIGENCE - : STAT_DEXTERITY), 1, false, - "level gain"); - } - break; - case SP_TROLL: hp_adjust++; @@ -3609,7 +3574,6 @@ int check_stealth(void) else stealth += (you.skills[SK_STEALTH] * 18); break; - case SP_GNOME: case SP_HALFLING: case SP_KOBOLD: case SP_SPRIGGAN: @@ -4268,7 +4232,6 @@ std::string species_name(species_type speci, int level, bool genus, bool adj) switch (speci) { case SP_HIGH_ELF: res = "High Elf"; break; - case SP_GREY_ELF: res = "Grey Elf"; break; case SP_DEEP_ELF: res = "Deep Elf"; break; case SP_SLUDGE_ELF: res = "Sludge Elf"; break; default: res = "Elf"; break; @@ -4309,7 +4272,6 @@ std::string species_name(species_type speci, int level, bool genus, bool adj) res = (adj ? "Orcish" : genus ? "Orc" : "Hill Orc"); break; - case SP_GNOME: res = (adj ? "Gnomish" : "Gnome"); break; case SP_OGRE: res = (adj ? "Ogreish" : "Ogre"); break; case SP_TROLL: res = (adj ? "Trollish" : "Troll"); break; case SP_DEMIGOD: res = (adj ? "Divine" : "Demigod"); break; @@ -4403,7 +4365,6 @@ static int _species_exp_mod(species_type species) case SP_HILL_ORC: case SP_KOBOLD: return 10; - case SP_GNOME: case SP_OGRE: return 11; case SP_SLUDGE_ELF: @@ -4414,7 +4375,6 @@ static int _species_exp_mod(species_type species) case SP_SPRIGGAN: case SP_KENKU: return 13; - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_CENTAUR: case SP_MINOTAUR: @@ -6066,7 +6026,6 @@ size_type player::body_size(int psize, bool base) const break; case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: ret = SIZE_SMALL; break; @@ -6878,8 +6837,7 @@ int player::mons_species() const { case SP_HILL_ORC: return (MONS_ORC); - case SP_HIGH_ELF: case SP_GREY_ELF: - case SP_DEEP_ELF: case SP_SLUDGE_ELF: + case SP_HIGH_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: return (MONS_ELF); default: diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 05eead734e..3364cf334c 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -152,7 +152,7 @@ const char *atheist_inv_titles[6] = // Spellcasting skill is actually about 130%, the other two about 75%. const int spec_skills[ NUM_SPECIES ][40] = { - { // SP_HUMAN (1) + { // SP_HUMAN 100, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -195,7 +195,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_HIGH_ELF (3) + { // SP_HIGH_ELF 100, // SK_FIGHTING 70, // SK_SHORT_BLADES 70, // SK_LONG_BLADES @@ -238,50 +238,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_GREY_ELF (4) - 140, // SK_FIGHTING - 90, // SK_SHORT_BLADES - 95, // SK_LONG_BLADES - 120, // SK_UNUSED_1 - 140, // SK_AXES - 160, // SK_MACES_FLAILS - 160, // SK_POLEARMS - 100, // SK_STAVES - 130, // SK_SLINGS - 70, // SK_BOWS - 100, // SK_CROSSBOWS - 90, // SK_DARTS - 80, // SK_THROWING - 140, // SK_ARMOUR - 75, // SK_DODGING - 70, // SK_STEALTH - 100, // SK_STABBING - 140, // SK_SHIELDS - 100, // SK_TRAPS_DOORS - 130, // SK_UNARMED_COMBAT - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - (60 * 130) / 100, // SK_SPELLCASTING - 90, // SK_CONJURATIONS - 50, // SK_ENCHANTMENTS - 90, // SK_SUMMONINGS - 130, // SK_NECROMANCY - 80, // SK_TRANSLOCATIONS - 80, // SK_TRANSMUTATIONS - 80, // SK_DIVINATIONS - 90, // SK_FIRE_MAGIC - 90, // SK_ICE_MAGIC - 60, // SK_AIR_MAGIC - 150, // SK_EARTH_MAGIC - 110, // SK_POISON_MAGIC - (100 * 75) / 100, // SK_INVOCATIONS - (90 * 75) / 100, // SK_EVOCATIONS - }, - - { // SP_DEEP_ELF (5) + { // SP_DEEP_ELF 150, // SK_FIGHTING 100, // SK_SHORT_BLADES 105, // SK_LONG_BLADES @@ -324,7 +281,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (90 * 75) / 100, // SK_EVOCATIONS }, - { // SP_SLUDGE_ELF (6) + { // SP_SLUDGE_ELF 80, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES @@ -367,7 +324,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (110 * 75) / 100, // SK_EVOCATIONS }, - { // SP_MOUNTAIN_DWARF (8) + { // SP_MOUNTAIN_DWARF 70, // SK_FIGHTING 80, // SK_SHORT_BLADES 90, // SK_LONG_BLADES @@ -410,7 +367,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (90 * 75) / 100, // SK_EVOCATIONS }, - { // SP_HALFLING (9) + { // SP_HALFLING 120, // SK_FIGHTING 60, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -453,7 +410,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (90 * 75) / 100, // SK_EVOCATIONS }, - { // SP_HILL_ORC (10) + { // SP_HILL_ORC 70, // SK_FIGHTING 100, // SK_SHORT_BLADES 80, // SK_LONG_BLADES @@ -496,7 +453,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_KOBOLD (11) + { // SP_KOBOLD 80, // SK_FIGHTING 60, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -539,7 +496,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (80 * 75) / 100, // SK_EVOCATIONS }, - { // SP_MUMMY (12) + { // SP_MUMMY 100, // SK_FIGHTING 140, // SK_SHORT_BLADES 140, // SK_LONG_BLADES @@ -582,7 +539,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (140 * 75) / 100, // SK_EVOCATIONS }, - { // SP_NAGA (13) + { // SP_NAGA 100, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -625,50 +582,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_GNOME (14) - 100, // SK_FIGHTING - 75, // SK_SHORT_BLADES - 100, // SK_LONG_BLADES - 130, // SK_UNUSED_1 - 100, // SK_AXES - 130, // SK_MACES_FLAILS - 140, // SK_POLEARMS - 130, // SK_STAVES - 80, // SK_SLINGS - 100, // SK_BOWS - 90, // SK_CROSSBOWS - 60, // SK_DARTS - 100, // SK_THROWING - 150, // SK_ARMOUR - 70, // SK_DODGING - 70, // SK_STEALTH - 80, // SK_STABBING - 120, // SK_SHIELDS - 70, // SK_TRAPS_DOORS - 110, // SK_UNARMED_COMBAT - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - (120 * 130) / 100, // SK_SPELLCASTING - 100, // SK_CONJURATIONS - 100, // SK_ENCHANTMENTS - 110, // SK_SUMMONINGS - 130, // SK_NECROMANCY - 130, // SK_TRANSLOCATIONS - 120, // SK_TRANSMUTATIONS - 120, // SK_DIVINATIONS - 100, // SK_FIRE_MAGIC - 100, // SK_ICE_MAGIC - 170, // SK_AIR_MAGIC - 60, // SK_EARTH_MAGIC - 130, // SK_POISON_MAGIC - (120 * 75) / 100, // SK_INVOCATIONS - (60 * 75) / 100, // SK_EVOCATIONS - }, - - { // SP_OGRE (15) + { // SP_OGRE 70, // SK_FIGHTING 200, // SK_SHORT_BLADES 180, // SK_LONG_BLADES @@ -711,7 +625,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (180 * 75) / 100, // SK_EVOCATIONS }, - { // SP_TROLL (16) + { // SP_TROLL 140, // SK_FIGHTING 150, // SK_SHORT_BLADES 150, // SK_LONG_BLADES @@ -754,7 +668,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (180 * 75) / 100, // SK_EVOCATIONS }, - { // SP_RED_DRACONIAN (18) + { // SP_RED_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -797,7 +711,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_WHITE_DRACONIAN (19) + { // SP_WHITE_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -840,7 +754,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_GREEN_DRACONIAN (20) + { // SP_GREEN_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -883,7 +797,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_YELLOW_DRACONIAN (21) + { // SP_YELLOW_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -926,7 +840,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_GREY_DRACONIAN (22) + { // SP_GREY_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -969,7 +883,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_BLACK_DRACONIAN (23) + { // SP_BLACK_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1012,7 +926,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_PURPLE_DRACONIAN (24) + { // SP_PURPLE_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1055,7 +969,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (90 * 75) / 100, // SK_EVOCATIONS }, - { // SP_MOTTLED_DRACONIAN (25) + { // SP_MOTTLED_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1098,7 +1012,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_PALE_DRACONIAN (26) + { // SP_PALE_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1141,7 +1055,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (90 * 75) / 100, // SK_EVOCATIONS }, - { // SP_BASE_DRACONIAN (29) + { // SP_BASE_DRACONIAN 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1184,7 +1098,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_CENTAUR (30) + { // SP_CENTAUR 100, // SK_FIGHTING 120, // SK_SHORT_BLADES 110, // SK_LONG_BLADES @@ -1227,7 +1141,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (130 * 75) / 100, // SK_EVOCATIONS }, - { // SP_DEMIGOD (31) + { // SP_DEMIGOD 110, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES @@ -1270,7 +1184,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (110 * 75) / 100, // SK_EVOCATIONS }, - { // SP_SPRIGGAN (32) + { // SP_SPRIGGAN 150, // SK_FIGHTING 90, // SK_SHORT_BLADES 140, // SK_LONG_BLADES @@ -1313,7 +1227,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (70 * 75) / 100, // SK_EVOCATIONS }, - { // SP_MINOTAUR (33) + { // SP_MINOTAUR 70, // SK_FIGHTING 70, // SK_SHORT_BLADES 70, // SK_LONG_BLADES @@ -1356,7 +1270,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (170 * 75) / 100, // SK_EVOCATIONS }, - { // SP_DEMONSPAWN (34) + { // SP_DEMONSPAWN 100, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES @@ -1399,7 +1313,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (110 * 75) / 100, // SK_EVOCATIONS }, - { // SP_GHOUL (35) + { // SP_GHOUL 80, // SK_FIGHTING 110, // SK_SHORT_BLADES 110, // SK_LONG_BLADES @@ -1442,7 +1356,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (130 * 75) / 100, // SK_EVOCATIONS }, - { // SP_KENKU (36) + { // SP_KENKU 100, // SK_FIGHTING 75, // SK_SHORT_BLADES 75, // SK_LONG_BLADES @@ -1485,7 +1399,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_MERFOLK (37) + { // SP_MERFOLK 80, // SK_FIGHTING 70, // SK_SHORT_BLADES 90, // SK_LONG_BLADES @@ -1528,7 +1442,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_VAMPIRE (38) + { // SP_VAMPIRE 110, // SK_FIGHTING 90, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1571,7 +1485,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (120 * 75)/100, // SK_EVOCATIONS }, - { // SP_DEEP_DWARF (39) + { // SP_DEEP_DWARF 110, // SK_FIGHTING 120, // SK_SHORT_BLADES 100, // SK_LONG_BLADES @@ -1626,6 +1540,13 @@ const int spec_skills[ NUM_SPECIES ][40] = { }, + // SP_GREY_ELF placeholder. + { + }, + + // SP_GNOME placeholder. + { + } }; @@ -1967,14 +1888,12 @@ static std::string _stk_weight() return "Middle"; case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: case SP_KENKU: return "Light"; case SP_HALFLING: - case SP_GNOME: case SP_KOBOLD: return "Feather"; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 41929a6360..db9e3c0101 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2805,7 +2805,6 @@ void tilep_race_default(int race, int gender, int level, int *parts) break; case SP_ELF: case SP_HIGH_ELF: - case SP_GREY_ELF: case SP_SLUDGE_ELF: result = TILEP_BASE_ELF; hair = TILEP_HAIR_ELF_YELLOW; @@ -2846,9 +2845,6 @@ void tilep_race_default(int race, int gender, int level, int *parts) case SP_NAGA: result = TILEP_BASE_NAGA; break; - case SP_GNOME: - result = TILEP_BASE_GNOME; - break; case SP_OGRE: result = TILEP_BASE_OGRE; break; diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index b99b6acb69..7243beae21 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -543,9 +543,7 @@ bool transform(int pow, transformation_type which_trans, bool quiet) symbol = '8'; colour = LIGHTGREY; dur = std::min(20 + random2(pow) + random2(pow), 100); - if (you.species == SP_GNOME && coinflip()) - msg = "Look, a garden gnome. How cute!"; - else if (player_genus(GENPC_DWARVEN) && one_chance_in(10)) + if (player_genus(GENPC_DWARVEN) && one_chance_in(10)) msg = "You inwardly fear your resemblance to a lawn ornament."; else msg = "You turn into a living statue of rough stone."; diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 00d6b15356..f156d6e0d3 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -864,7 +864,7 @@ void remove_net_from(monsters *mon) static int damage_or_escape_net(int hold) { // Spriggan: little (+2) - // Halfling, Kobold, Gnome: small (+1) + // Halfling, Kobold: small (+1) // Human, Elf, ...: medium (0) // Ogre, Troll, Centaur, Naga: large (-1) // transformations: spider, bat: tiny (+3); ice beast: large (-1) |