From 67ff47f25420cc6e8cccd2a4f02f1810eb4fe141 Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 30 Jun 2007 08:09:47 +0000 Subject: Removed hill dwarves. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1697 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/describe.cc | 1 - crawl-ref/source/enum.h | 2 +- crawl-ref/source/newgame.cc | 13 ++------ crawl-ref/source/player.cc | 24 ++------------- crawl-ref/source/skills2.cc | 73 +++++++++++--------------------------------- 5 files changed, 23 insertions(+), 90 deletions(-) diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index b7378bd2f4..852e231a7c 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -4910,7 +4910,6 @@ std::string ghost_description(const monsters &mons, bool concise) int str; switch (ghost.values[GVAL_SPECIES]) { - case SP_HILL_DWARF: case SP_MOUNTAIN_DWARF: case SP_TROLL: case SP_OGRE: diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 30b6dc4256..9ab0ea7940 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -3231,7 +3231,6 @@ enum species_type SP_GREY_ELF, SP_DEEP_ELF, // 5 SP_SLUDGE_ELF, - SP_HILL_DWARF, SP_MOUNTAIN_DWARF, SP_HALFLING, SP_HILL_ORC, // 10 @@ -3263,6 +3262,7 @@ enum species_type SP_KENKU, SP_MERFOLK, SP_ELF, // (placeholder) + SP_HILL_DWARF, // (placeholder) NUM_SPECIES, // always after the last species SP_UNKNOWN = 100 diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index df76dd7d60..8f59bd18b8 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -256,7 +256,7 @@ static void pick_random_species_and_class( void ) // we only want draconians counted once in this loop... // we'll add the variety lower down -- bwr if ((sp >= SP_WHITE_DRACONIAN && sp <= SP_BASE_DRACONIAN) - || sp == SP_ELF) + || sp == SP_ELF || sp == SP_HILL_DWARF) continue; for (int cl = JOB_FIGHTER; cl < NUM_JOBS; cl++) @@ -528,7 +528,6 @@ static void racialise_starting_equipment() set_equip_race( you.inv[i], ISFLAG_ELVEN ); break; - case SP_HILL_DWARF: case SP_MOUNTAIN_DWARF: set_equip_race( you.inv[i], ISFLAG_DWARVEN ); break; @@ -887,7 +886,6 @@ static bool class_allowed( species_type speci, job_type char_class ) { case SP_GNOME: case SP_HALFLING: - case SP_HILL_DWARF: case SP_HILL_ORC: case SP_KENKU: case SP_KOBOLD: @@ -1336,7 +1334,6 @@ static bool class_allowed( species_type speci, job_type char_class ) switch (speci) { case SP_HALFLING: - case SP_HILL_DWARF: case SP_HILL_ORC: case SP_KENKU: case SP_MINOTAUR: @@ -1381,7 +1378,6 @@ static bool class_allowed( species_type speci, job_type char_class ) case SP_GNOME: case SP_GREY_ELF: case SP_HALFLING: - case SP_HILL_DWARF: case SP_MINOTAUR: case SP_MOUNTAIN_DWARF: case SP_OGRE: @@ -1424,7 +1420,6 @@ static bool class_allowed( species_type speci, job_type char_class ) { case SP_CENTAUR: case SP_GNOME: - case SP_HILL_DWARF: case SP_KOBOLD: case SP_NAGA: case SP_OGRE: @@ -1730,7 +1725,6 @@ static void species_stat_init(species_type which_species) case SP_DEEP_ELF: sb = 3; ib = 10; db = 8; break; // 21 case SP_SLUDGE_ELF: sb = 6; ib = 7; db = 7; break; // 20 - case SP_HILL_DWARF: sb = 10; ib = 3; db = 4; break; // 17 case SP_MOUNTAIN_DWARF: sb = 9; ib = 4; db = 5; break; // 18 case SP_TROLL: sb = 13; ib = 2; db = 3; break; // 18 @@ -2878,7 +2872,7 @@ static job_type letter_to_class(int keyn) static species_type letter_to_species(int keyn) { - if ( keyn < 'a' || keyn > 'z' ) + if ( keyn < 'a' || keyn > 'x' ) return SP_UNKNOWN; const int offset = keyn - 'a'; int rc; @@ -2970,7 +2964,7 @@ spec_query: for (int i = SP_HUMAN; i < NUM_SPECIES; ++i) { if ((i > SP_RED_DRACONIAN && i <= SP_BASE_DRACONIAN) - || i == SP_ELF) + || i == SP_ELF || i == SP_HILL_DWARF) continue; if (you.char_class != JOB_UNKNOWN && @@ -4066,7 +4060,6 @@ void give_items_skills() you.skills[SK_SLINGS] = 2; break; - case SP_HILL_DWARF: case SP_MOUNTAIN_DWARF: case SP_HILL_ORC: you.inv[2].sub_type = MI_BOLT; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index d31130824b..2a85955949 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -409,7 +409,6 @@ bool player_genus(unsigned char which_genus, unsigned char species) case SP_ELF: return (which_genus == GENPC_ELVEN); - case SP_HILL_DWARF: case SP_MOUNTAIN_DWARF: return (which_genus == GENPC_DWARVEN); @@ -797,7 +796,6 @@ int player_res_magic(void) case SP_HIGH_ELF: case SP_GREY_ELF: case SP_SLUDGE_ELF: - case SP_HILL_DWARF: case SP_MOUNTAIN_DWARF: rm = you.experience_level * 4; break; @@ -2365,21 +2363,6 @@ void level_change(void) } break; - case SP_HILL_DWARF: - // lowered because of HD raise -- bwr - // if (you.experience_level < 14) - // hp_adjust++; - - if (you.experience_level % 3) - hp_adjust++; - - if (!(you.experience_level % 2)) - mp_adjust--; - - if (!(you.experience_level % 4)) - modify_stat(STAT_STRENGTH, 1, false); - break; - case SP_MOUNTAIN_DWARF: // lowered because of HD raise -- bwr // if (you.experience_level < 14) @@ -3373,9 +3356,6 @@ char *species_name( int speci, int level, bool genus, bool adj, bool cap ) { switch (speci) { - case SP_HILL_DWARF: - strcpy( species_buff, "Hill Dwarf" ); - break; case SP_MOUNTAIN_DWARF: strcpy( species_buff, "Mountain Dwarf" ); break; @@ -4040,10 +4020,10 @@ void set_mp(int new_amount, bool max_too) static const char * Species_Abbrev_List[ NUM_SPECIES ] = - { "XX", "Hu", "HE", "GE", "DE", "SE", "HD", "MD", "Ha", + { "XX", "Hu", "HE", "GE", "DE", "SE", "MD", "Ha", "HO", "Ko", "Mu", "Na", "Gn", "Og", "Tr", "OM", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", - "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "El" }; + "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "HD", "El" }; int get_species_index_by_abbrev( const char *abbrev ) { diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 0b9aac8af2..ccd3a626b2 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -341,78 +341,35 @@ const int spec_skills[ NUM_SPECIES ][40] = (110 * 75) / 100, // SK_EVOCATIONS }, - { // SP_HILL_DWARF (7) - 70, // SK_FIGHTING - 80, // SK_SHORT_BLADES - 80, // SK_LONG_SWORDS - 90, // SK_UNUSED_1 - 60, // SK_AXES - 70, // SK_MACES_FLAILS - 110, // SK_POLEARMS - 130, // SK_STAVES - 130, // SK_SLINGS - 150, // SK_BOWS - 120, // SK_CROSSBOWS - 120, // SK_DARTS - 120, // SK_RANGED_COMBAT - 70, // SK_ARMOUR - 120, // SK_DODGING - 150, // SK_STEALTH - 140, // SK_STABBING - 70, // SK_SHIELDS - 100, // SK_TRAPS_DOORS - 100, // SK_UNARMED_COMBAT - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - (160 * 130) / 100, // SK_SPELLCASTING - 120, // SK_CONJURATIONS - 150, // SK_ENCHANTMENTS - 150, // SK_SUMMONINGS - 160, // SK_NECROMANCY - 150, // SK_TRANSLOCATIONS - 120, // SK_TRANSMIGRATION - 130, // SK_DIVINATIONS - 80, // SK_FIRE_MAGIC - 120, // SK_ICE_MAGIC - 150, // SK_AIR_MAGIC - 70, // SK_EARTH_MAGIC - 130, // SK_POISON_MAGIC - (100 * 75) / 100, // SK_INVOCATIONS - (60 * 75) / 100, // SK_EVOCATIONS - }, - { // SP_MOUNTAIN_DWARF (8) 70, // SK_FIGHTING - 90, // SK_SHORT_BLADES + 80, // SK_SHORT_BLADES 90, // SK_LONG_SWORDS 100, // SK_UNUSED_1 - 70, // SK_AXES + 65, // SK_AXES 70, // SK_MACES_FLAILS 110, // SK_POLEARMS 120, // SK_STAVES - 125, // SK_SLINGS - 140, // SK_BOWS - 100, // SK_CROSSBOWS + 120, // SK_SLINGS + 150, // SK_BOWS + 90, // SK_CROSSBOWS 120, // SK_DARTS - 115, // SK_RANGED_COMBAT + 120, // SK_RANGED_COMBAT 60, // SK_ARMOUR 110, // SK_DODGING - 140, // SK_STEALTH + 150, // SK_STEALTH 130, // SK_STABBING 70, // SK_SHIELDS - 100, // SK_TRAPS_DOORS + 80, // SK_TRAPS_DOORS 100, // SK_UNARMED_COMBAT 100, // undefined 100, // undefined 100, // undefined 100, // undefined 100, // undefined - (140 * 130) / 100, // SK_SPELLCASTING - 115, // SK_CONJURATIONS - 135, // SK_ENCHANTMENTS + (160 * 130) / 100, // SK_SPELLCASTING + 120, // SK_CONJURATIONS + 150, // SK_ENCHANTMENTS 150, // SK_SUMMONINGS 160, // SK_NECROMANCY 150, // SK_TRANSLOCATIONS @@ -424,7 +381,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 70, // SK_EARTH_MAGIC 130, // SK_POISON_MAGIC (100 * 75) / 100, // SK_INVOCATIONS - (70 * 75) / 100, // SK_EVOCATIONS + (60 * 75) / 100, // SK_EVOCATIONS }, { // SP_HALFLING (9) @@ -661,7 +618,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 70, // SK_STEALTH 80, // SK_STABBING 120, // SK_SHIELDS - 100, // SK_TRAPS_DOORS + 70, // SK_TRAPS_DOORS 110, // SK_UNARMED_COMBAT 100, // undefined 100, // undefined @@ -1674,6 +1631,10 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, + // SP_HILL_DWARF placeholder. + { + }, + // SP_ELF placeholder. { }, -- cgit v1.2.3-54-g00ecf