From e44a4d8349036092b8c691ce1644263d3b4122a4 Mon Sep 17 00:00:00 2001 From: haranp Date: Thu, 25 Sep 2008 23:19:59 +0000 Subject: Removed Ogre-Mages, hopefully without breaking anything. Docs are unchanged. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6996 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/acr.cc | 2 +- crawl-ref/source/describe.cc | 1 - crawl-ref/source/effects.cc | 11 ++--- crawl-ref/source/enum.h | 16 ++++---- crawl-ref/source/fight.cc | 2 +- crawl-ref/source/mon-util.cc | 4 +- crawl-ref/source/mutation.cc | 2 +- crawl-ref/source/newgame.cc | 65 ++++++++--------------------- crawl-ref/source/output.cc | 6 +-- crawl-ref/source/player.cc | 43 ++++--------------- crawl-ref/source/player.h | 2 +- crawl-ref/source/skills2.cc | 98 +++++++++++++------------------------------- crawl-ref/source/spl-cast.cc | 2 +- crawl-ref/source/tilepick.cc | 3 -- 14 files changed, 72 insertions(+), 185 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 92f3b856b6..5b83553c38 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -4534,7 +4534,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 == 34 , c3); + COMPILE_CHECK(SP_VAMPIRE == 33 , c3); COMPILE_CHECK(SPELL_BOLT_OF_MAGMA == 18 , c4); COMPILE_CHECK(SPELL_POISON_ARROW == 94 , c5); COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 223 , c6); diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index a25f8fe3b4..b79bc620e5 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2582,7 +2582,6 @@ std::string get_ghost_description(const monsters &mons, bool concise) case SP_MOUNTAIN_DWARF: case SP_TROLL: case SP_OGRE: - case SP_OGRE_MAGE: case SP_MINOTAUR: case SP_HILL_ORC: case SP_CENTAUR: diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 2d21ad2004..aa63d036be 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -935,7 +935,6 @@ static int _find_acquirement_subtype(object_class_type class_wanted, switch (you.species) { case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_RED_DRACONIAN: case SP_WHITE_DRACONIAN: @@ -996,14 +995,10 @@ static int _find_acquirement_subtype(object_class_type class_wanted, // Do this here, before acquirement()'s call to can_wear_armour(), // so that caps will be just as common as helmets for those // that can't wear helmets. - // We could use player_mutation_level for the horns, but let's just - // check for the mutation directly to avoid acquirement fiddles. + // We check for the mutation directly to avoid acquirement fiddles + // with vampires. if (type_wanted == ARM_HELMET - && ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE) - || player_genus(GENPC_DRACONIAN) - || you.species == SP_KENKU - || you.species == SP_SPRIGGAN - || you.mutation[MUT_HORNS])) + && (!you_can_wear(EQ_HELMET) || you.mutation[MUT_HORNS])) { type_wanted = coinflip()? ARM_CAP : ARM_WIZARD_HAT; } diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 756b79f129..e000c7d6ed 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2440,42 +2440,42 @@ enum speed_type enum species_type { - SP_HUMAN = 1, // 1 + SP_HUMAN = 1, SP_HIGH_ELF, SP_GREY_ELF, SP_DEEP_ELF, - SP_SLUDGE_ELF, // 5 + SP_SLUDGE_ELF, SP_MOUNTAIN_DWARF, SP_HALFLING, SP_HILL_ORC, SP_KOBOLD, - SP_MUMMY, // 10 + SP_MUMMY, SP_NAGA, SP_GNOME, SP_OGRE, SP_TROLL, - SP_OGRE_MAGE, // 15 SP_RED_DRACONIAN, SP_WHITE_DRACONIAN, SP_GREEN_DRACONIAN, SP_YELLOW_DRACONIAN, - SP_GREY_DRACONIAN, // 20 + SP_GREY_DRACONIAN, SP_BLACK_DRACONIAN, SP_PURPLE_DRACONIAN, SP_MOTTLED_DRACONIAN, SP_PALE_DRACONIAN, - SP_BASE_DRACONIAN, // 25 + SP_BASE_DRACONIAN, SP_CENTAUR, SP_DEMIGOD, SP_SPRIGGAN, SP_MINOTAUR, - SP_DEMONSPAWN, // 30 + SP_DEMONSPAWN, SP_GHOUL, SP_KENKU, SP_MERFOLK, - SP_VAMPIRE, // 34 + SP_VAMPIRE, SP_ELF, // (placeholder) SP_HILL_DWARF, // (placeholder) + SP_OGRE_MAGE, // (placeholder) NUM_SPECIES, // always after the last species SP_UNKNOWN = 100 diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index d196cf824c..6af6c04309 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -204,7 +204,7 @@ int calc_heavy_armour_penalty( bool random_factor ) heavy_armour++; break; case ARM_LARGE_SHIELD: - if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE) + if (you.species == SP_OGRE || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN)) { if (you.skills[SK_SHIELDS] < maybe_random2(13, random_factor)) diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 5050bcb30b..9d746d852d 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -7139,7 +7139,7 @@ static std::string _get_species_insult(const std::string type) static std::string _pluralise_player_genus() { - std::string sp = species_name(you.species, 1, true, false, true); + std::string sp = species_name(you.species, 1, true, false); if (player_genus(GENPC_ELVEN, you.species) || player_genus(GENPC_DWARVEN, you.species)) { @@ -7208,7 +7208,7 @@ std::string do_mon_str_replacements(const std::string &in_msg, msg = replace_all(msg, "@player_species@", species_name(you.species, 1).c_str()); msg = replace_all(msg, "@player_genus@", - species_name(you.species, 1, true, false, true).c_str()); + species_name(you.species, 1, true, false).c_str()); msg = replace_all(msg, "@player_genus_plural@", _pluralise_player_genus().c_str()); diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index c387d3a1c3..99fb8eee0f 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1245,7 +1245,7 @@ formatted_string describe_mutations() } //end switch - innate abilities // a bit more stuff - if (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE + if (you.species == SP_OGRE || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN) { result += "Your body does not fit into most forms of armour." EOL; diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 4bc4bb890b..e9bb4bee75 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -114,19 +114,18 @@ 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_OGRE_MAGE, 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_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 }; // Fantasy staples and humanoid creatures come first, then dimunitive and @@ -143,9 +142,9 @@ static species_type new_species_order[] = { SP_KOBOLD, SP_SPRIGGAN, // significantly different body type than human SP_NAGA, SP_CENTAUR, - SP_OGRE, SP_OGRE_MAGE, - SP_TROLL, SP_MINOTAUR, - SP_KENKU, SP_RED_DRACONIAN, + SP_OGRE, SP_TROLL, + SP_MINOTAUR, SP_KENKU, + SP_RED_DRACONIAN, // celestial species SP_DEMIGOD, SP_DEMONSPAWN, // undead species @@ -998,7 +997,6 @@ static void _give_species_bonus_hp() case SP_GHOUL: case SP_MINOTAUR: case SP_NAGA: - case SP_OGRE_MAGE: case SP_DEMIGOD: inc_max_hp(2); break; @@ -1294,7 +1292,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_RED_DRACONIAN: case SP_VAMPIRE: return CC_RESTRICTED; @@ -1315,7 +1312,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_RED_DRACONIAN: case SP_MUMMY: return CC_RESTRICTED; @@ -1338,7 +1334,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_KENKU: case SP_RED_DRACONIAN: case SP_DEMIGOD: @@ -1365,7 +1360,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_CENTAUR: - case SP_OGRE_MAGE: case SP_RED_DRACONIAN: case SP_MUMMY: case SP_GHOUL: @@ -1394,7 +1388,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_KENKU: case SP_RED_DRACONIAN: @@ -1416,7 +1409,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_KENKU: case SP_GHOUL: @@ -1435,7 +1427,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_DEEP_ELF: case SP_SPRIGGAN: case SP_NAGA: - case SP_OGRE_MAGE: case SP_KENKU: return CC_RESTRICTED; default: @@ -1449,7 +1440,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_GNOME: case SP_SPRIGGAN: case SP_NAGA: - case SP_OGRE_MAGE: case SP_KENKU: return CC_RESTRICTED; default: @@ -1472,7 +1462,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: return CC_RESTRICTED; default: @@ -1489,7 +1478,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_KENKU: @@ -1514,7 +1502,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_KENKU: @@ -1538,7 +1525,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_GNOME: case SP_SPRIGGAN: case SP_CENTAUR: - case SP_OGRE: case SP_TROLL: case SP_MINOTAUR: case SP_GHOUL: @@ -1575,7 +1561,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_KENKU: @@ -1600,7 +1585,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_RED_DRACONIAN: @@ -1647,7 +1631,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_KENKU: @@ -1675,7 +1658,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_GNOME: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_KENKU: @@ -1795,7 +1777,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_HILL_ORC: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_RED_DRACONIAN: @@ -1820,7 +1801,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_RED_DRACONIAN: @@ -1838,7 +1818,6 @@ static char_choice_restriction _class_allowed( species_type speci, case SP_SPRIGGAN: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_RED_DRACONIAN: case SP_MUMMY: @@ -1887,7 +1866,6 @@ static char_choice_restriction _book_restriction(int booktype, case SP_GNOME: case SP_KOBOLD: case SP_NAGA: - case SP_OGRE_MAGE: case SP_KENKU: case SP_DEMIGOD: case SP_DEMONSPAWN: @@ -1914,7 +1892,6 @@ static char_choice_restriction _book_restriction(int booktype, case SP_GNOME: case SP_KOBOLD: case SP_NAGA: - case SP_OGRE_MAGE: case SP_KENKU: case SP_DEMIGOD: case SP_DEMONSPAWN: @@ -2128,7 +2105,6 @@ static char_choice_restriction _weapon_restriction(weapon_type wpn) case SP_CENTAUR: case SP_NAGA: case SP_OGRE: - case SP_OGRE_MAGE: case SP_MINOTAUR: case SP_KENKU: case SP_DEMIGOD: @@ -2149,7 +2125,6 @@ static char_choice_restriction _weapon_restriction(weapon_type wpn) case SP_MERFOLK: case SP_NAGA: case SP_CENTAUR: - case SP_OGRE_MAGE: case SP_MINOTAUR: case SP_KENKU: case SP_DEMIGOD: @@ -2223,7 +2198,6 @@ static bool _choose_weapon() switch (you.species) { case SP_OGRE: - case SP_OGRE_MAGE: startwep[1] = WPN_ANKUS; break; case SP_MERFOLK: @@ -2414,7 +2388,6 @@ static char_choice_restriction _religion_restriction(god_type god) return (CC_UNRESTRICTED); case SP_DEEP_ELF: - case SP_OGRE_MAGE: case SP_KENKU: // Unrestrict these only for Priests as Zin is worse, but // Necromancy (DK) the better choice. @@ -2484,7 +2457,6 @@ static char_choice_restriction _religion_restriction(god_type god) case SP_NAGA: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: case SP_MINOTAUR: case SP_DEMONSPAWN: @@ -2603,8 +2575,7 @@ static void _species_stat_init(species_type which_species) case SP_MOUNTAIN_DWARF: sb = 9; ib = 4; db = 5; break; // 18 case SP_TROLL: sb = 13; ib = 2; db = 3; break; // 18 - case SP_OGRE: sb = 12; ib = 3; db = 3; break; // 18 - case SP_OGRE_MAGE: sb = 9; ib = 7; db = 3; break; // 19 + case SP_OGRE: sb = 10; ib = 5; db = 3; break; // 18 case SP_MINOTAUR: sb = 10; ib = 3; db = 3; break; // 16 case SP_HILL_ORC: sb = 9; ib = 3; db = 4; break; // 16 @@ -2706,9 +2677,6 @@ void give_basic_mutations(species_type speci) you.mutation[MUT_FAST_METABOLISM] = 1; you.mutation[MUT_SAPROVOROUS] = 1; break; - case SP_OGRE_MAGE: - you.mutation[MUT_FAST_METABOLISM] = 1; - break; case SP_HALFLING: you.mutation[MUT_SLOW_METABOLISM] = 1; break; @@ -5173,7 +5141,6 @@ bool _give_items_skills() case SP_HILL_ORC: case SP_CENTAUR: case SP_OGRE: - case SP_OGRE_MAGE: you.inv[0].sub_type = WPN_HAND_AXE; break; case SP_GHOUL: diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 6efba29125..72a227b1a6 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2409,13 +2409,13 @@ std::string _status_mut_abilities() } //end switch - innate abilities // a bit more stuff - if ( you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE - || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN ) + if (you.species == SP_OGRE || you.species == SP_TROLL + || player_genus(GENPC_DRACONIAN) || you.species == SP_SPRIGGAN) { mutations.push_back("unfitting armour"); } - if ( beogh_water_walk() ) + if (beogh_water_walk()) mutations.push_back("water walking"); std::string current; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 6b1f1788ca..979ec72fc1 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -439,7 +439,6 @@ bool player_genus(genus_type which_genus, species_type species) return (which_genus == GENPC_DWARVEN); case SP_OGRE: - case SP_OGRE_MAGE: return (which_genus == GENPC_OGRE); default: @@ -491,7 +490,6 @@ bool is_player_same_species(const int mon, bool transform) return (true); return (false); case SP_OGRE: - case SP_OGRE_MAGE: if (mons_genus(mon) == MONS_OGRE) return (true); return (false); @@ -1161,10 +1159,10 @@ int player_res_magic(void) case SP_MOUNTAIN_DWARF: case SP_VAMPIRE: case SP_DEMIGOD: + case SP_OGRE: rm = you.experience_level * 4; break; case SP_NAGA: - case SP_OGRE_MAGE: rm = you.experience_level * 5; break; case SP_PURPLE_DRACONIAN: @@ -3174,14 +3172,9 @@ void level_change(bool skip_attribute_increase) } break; - case SP_OGRE: case SP_TROLL: hp_adjust++; - // lowered because of HD raise -- bwr - // if (you.experience_level < 14) - // hp_adjust++; - if (!(you.experience_level % 2)) hp_adjust++; @@ -3192,19 +3185,10 @@ void level_change(bool skip_attribute_increase) modify_stat(STAT_STRENGTH, 1, false, "level gain"); break; - case SP_OGRE_MAGE: + case SP_OGRE: hp_adjust++; - - // lowered because of HD raise -- bwr - // if (you.experience_level < 14) - // hp_adjust++; - - if (!(you.experience_level % 5)) - { - modify_stat( (coinflip() ? STAT_INTELLIGENCE - : STAT_STRENGTH), 1, false, - "level gain"); - } + if (!(you.experience_level % 3)) + modify_stat(STAT_STRENGTH, 1, false, "level gain"); break; case SP_RED_DRACONIAN: @@ -3553,7 +3537,6 @@ int check_stealth(void) { case SP_TROLL: case SP_OGRE: - case SP_OGRE_MAGE: case SP_CENTAUR: stealth += (you.skills[SK_STEALTH] * 9); break; @@ -4085,16 +4068,11 @@ int str_to_species(const std::string &species) return (SP_HUMAN); } -std::string species_name(species_type speci, int level, bool genus, bool adj, - bool ogre) +std::string species_name(species_type speci, int level, bool genus, bool adj) // defaults: false false false { std::string res; - // If 'ogre' is true, the Ogre-Mage is described as like the Ogre. - if (ogre && speci == SP_OGRE_MAGE) - speci = SP_OGRE; - if (player_genus( GENPC_DRACONIAN, speci )) { if (adj || genus) // adj doesn't care about exact species @@ -4167,10 +4145,6 @@ std::string species_name(species_type speci, int level, bool genus, bool adj, case SP_KOBOLD: res = "Kobold"; break; case SP_MUMMY: res = "Mummy"; break; case SP_NAGA: res = "Naga"; break; - // We've previously declared that these are radically - // different from Ogres... so we're not going to - // refer to them as Ogres. -- bwr - case SP_OGRE_MAGE: res = "Ogre-Mage"; break; case SP_CENTAUR: res = "Centaur"; break; case SP_SPRIGGAN: res = "Spriggan"; break; case SP_MINOTAUR: res = "Minotaur"; break; @@ -4272,6 +4246,7 @@ static int _species_exp_mod(species_type species) case SP_KOBOLD: return 10; case SP_GNOME: + case SP_OGRE: return 11; case SP_SLUDGE_ELF: case SP_NAGA: @@ -4283,7 +4258,6 @@ static int _species_exp_mod(species_type species) return 13; case SP_GREY_ELF: case SP_DEEP_ELF: - case SP_OGRE: case SP_CENTAUR: case SP_MINOTAUR: case SP_DEMONSPAWN: @@ -4292,7 +4266,6 @@ static int _species_exp_mod(species_type species) case SP_MUMMY: case SP_VAMPIRE: case SP_TROLL: - case SP_OGRE_MAGE: return 15; case SP_DEMIGOD: return 16; @@ -5739,7 +5712,6 @@ size_type player::body_size(int psize, bool base) const switch (species) { case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: ret = SIZE_LARGE; break; @@ -6740,8 +6712,7 @@ bool player::cannot_act() const bool player::can_throw_rocks() const { - return (species == SP_OGRE || species == SP_TROLL - || species == SP_OGRE_MAGE); + return (species == SP_OGRE || species == SP_TROLL); } void player::put_to_sleep(int) diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index c5cbcd8c5a..fe4b69e58f 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -80,7 +80,7 @@ bool wearing_amulet(jewellery_type which_am, bool calc_unid = true); * called from: acr - chardump - describe - newgame - view * *********************************************************************** */ std::string species_name( species_type speci, int level, bool genus = false, - bool adj = false, bool ogre = false ); + bool adj = false ); int str_to_species(const std::string &species); /* *********************************************************************** diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 24609162c6..1ef882a12f 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -666,11 +666,11 @@ const int spec_skills[ NUM_SPECIES ][40] = }, { // SP_OGRE (15) - 100, // SK_FIGHTING - 140, // SK_SHORT_BLADES - 120, // SK_LONG_BLADES - 110, // SK_UNUSED_1 - 100, // SK_AXES + 70, // SK_FIGHTING + 160, // SK_SHORT_BLADES + 150, // SK_LONG_BLADES + 100, // SK_UNUSED_1 + 150, // SK_AXES 100, // SK_MACES_FLAILS 110, // SK_POLEARMS 120, // SK_STAVES @@ -678,34 +678,34 @@ const int spec_skills[ NUM_SPECIES ][40] = 150, // SK_BOWS 180, // SK_CROSSBOWS 150, // SK_DARTS - 100, // SK_THROWING - 140, // SK_ARMOUR - 150, // SK_DODGING - 200, // SK_STEALTH + 80, // SK_THROWING + 150, // SK_ARMOUR + 120, // SK_DODGING + 150, // SK_STEALTH 150, // SK_STABBING - 110, // SK_SHIELDS - 200, // SK_TRAPS_DOORS + 120, // SK_SHIELDS + 150, // SK_TRAPS_DOORS 130, // SK_UNARMED_COMBAT 100, // undefined 100, // undefined 100, // undefined 100, // undefined 100, // undefined - (220 * 130) / 100, // SK_SPELLCASTING - 180, // SK_CONJURATIONS - 220, // SK_ENCHANTMENTS - 200, // SK_SUMMONINGS + (70 * 130) / 100, // SK_SPELLCASTING + 150, // SK_CONJURATIONS + 150, // SK_ENCHANTMENTS + 150, // SK_SUMMONINGS 150, // SK_NECROMANCY - 200, // SK_TRANSLOCATIONS - 200, // SK_TRANSMIGRATION - 200, // SK_DIVINATIONS + 150, // SK_TRANSLOCATIONS + 150, // SK_TRANSMIGRATION + 150, // SK_DIVINATIONS 150, // SK_FIRE_MAGIC 150, // SK_ICE_MAGIC - 200, // SK_AIR_MAGIC - 120, // SK_EARTH_MAGIC + 150, // SK_AIR_MAGIC + 150, // SK_EARTH_MAGIC 150, // SK_POISON_MAGIC - (130 * 75) / 100, // SK_INVOCATIONS - (170 * 75) / 100, // SK_EVOCATIONS + (100 * 75) / 100, // SK_INVOCATIONS + (150 * 75) / 100, // SK_EVOCATIONS }, { // SP_TROLL (16) @@ -751,49 +751,6 @@ const int spec_skills[ NUM_SPECIES ][40] = (180 * 75) / 100, // SK_EVOCATIONS }, - { // SP_OGRE_MAGE (17) - 100, // SK_FIGHTING - 110, // SK_SHORT_BLADES - 100, // SK_LONG_BLADES - 100, // SK_UNUSED_1 - 100, // SK_AXES - 100, // SK_MACES_FLAILS - 100, // SK_POLEARMS - 100, // SK_STAVES - 150, // SK_SLINGS - 150, // SK_BOWS - 150, // SK_CROSSBOWS - 150, // SK_DARTS - 150, // SK_THROWING - 170, // SK_ARMOUR - 130, // SK_DODGING - 100, // SK_STEALTH - 130, // SK_STABBING - 150, // SK_SHIELDS - 150, // SK_TRAPS_DOORS - 100, // SK_UNARMED_COMBAT - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - 100, // undefined - (70 * 130) / 100, // SK_SPELLCASTING - 100, // SK_CONJURATIONS - 80, // SK_ENCHANTMENTS - 100, // SK_SUMMONINGS - 100, // SK_NECROMANCY - 100, // SK_TRANSLOCATIONS - 100, // SK_TRANSMIGRATION - 100, // SK_DIVINATIONS - 100, // SK_FIRE_MAGIC - 100, // SK_ICE_MAGIC - 100, // SK_AIR_MAGIC - 100, // SK_EARTH_MAGIC - 100, // SK_POISON_MAGIC - (100 * 75) / 100, // SK_INVOCATIONS - (100 * 75) / 100, // SK_EVOCATIONS - }, - { // SP_RED_DRACONIAN (18) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES @@ -1619,6 +1576,10 @@ const int spec_skills[ NUM_SPECIES ][40] = { }, + // SP_OGRE_MAGE placeholder + { + }, + /* ****************************************************** @@ -1965,16 +1926,14 @@ int str_to_skill(const std::string &skill) return (SK_FIGHTING); } -// [ds] @Genus@ distinguishes between Ogre-Mages and Ogres, but -// @genus@ does not. This is rather confusing. static std::string _stk_genus_cap() { - return species_name(Skill_Species, 1, true, false, false); + return species_name(Skill_Species, 1, true, false); } static std::string _stk_genus_nocap() { - std::string s = species_name(Skill_Species, 1, true, false, true); + std::string s = species_name(Skill_Species, 1, true, false); return (lowercase(s)); } @@ -1995,7 +1954,6 @@ static std::string _stk_weight() switch (Skill_Species) { case SP_OGRE: - case SP_OGRE_MAGE: case SP_TROLL: return "Heavy"; diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index a2b4fbf49b..87c5e7f333 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -363,7 +363,7 @@ int spell_fail(spell_type spell) case ARM_LARGE_SHIELD: // *BCR* Large chars now get a lower penalty for large shields - if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE) + if (you.species == SP_OGRE || you.species == SP_TROLL || player_genus(GENPC_DRACONIAN)) { chance += 20; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 91292d18b1..406fabd6d8 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2607,9 +2607,6 @@ void tilep_race_default(int race, int gender, int level, int *parts) result = TILEP_BASE_TROLL; hair = 0; break; - case SP_OGRE_MAGE: - result = TILEP_BASE_OGRE_MAGE; - break; case SP_BASE_DRACONIAN: case SP_RED_DRACONIAN: -- cgit v1.2.3-54-g00ecf