diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-27 19:14:45 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-27 19:14:45 +0000 |
| commit | ef742fbaebe4e9622204c8e45df55137f1da2208 (patch) | |
| tree | 3fb72132dee1ccb23fee208e76e6221b3c29a9f1 /crawl-ref/source/skills2.cc | |
| parent | 2eb5aea0c045caea4a260213b85f6cfa64c815ee (diff) | |
| download | crawl-ref-ef742fbaebe4e9622204c8e45df55137f1da2208.tar.gz crawl-ref-ef742fbaebe4e9622204c8e45df55137f1da2208.zip | |
Remove healing effect from blood potions. To make up for it, fresh blood
now has a greater nutrition (1500) compared to coagulated blood (1000,
as before).
Give Ogres the Spellcasting title of "Ogre-Mage".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7042 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/skills2.cc')
| -rw-r--r-- | crawl-ref/source/skills2.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 1ef882a12f..9d2fac14d6 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -2075,6 +2075,13 @@ std::string skill_title( unsigned char best_skill, unsigned char skill_lev, result = skills[best_skill][skill_rank]; break; + case SK_SPELLCASTING: + if (species == SP_OGRE) + { + result = "Ogre-Mage"; + break; + } + // else fall-through default: result = skills[best_skill][skill_rank]; break; @@ -2095,7 +2102,7 @@ std::string player_title() { const unsigned char best = best_skill( SK_FIGHTING, (NUM_SKILLS - 1), 99 ); return (skill_title( best, you.skills[ best ] )); -} // end player_title() +} skill_type best_skill( int min_skill, int max_skill, int excl_skill ) { @@ -2107,7 +2114,7 @@ skill_type best_skill( int min_skill, int max_skill, int excl_skill ) { if (i == excl_skill || i == SK_UNUSED_1 - || (i > SK_UNARMED_COMBAT && i < SK_SPELLCASTING)) + || i > SK_UNARMED_COMBAT && i < SK_SPELLCASTING) { continue; } @@ -2128,7 +2135,7 @@ skill_type best_skill( int min_skill, int max_skill, int excl_skill ) } return static_cast<skill_type>(ret); -} // end best_skill() +} // Calculate the skill_order array from scratch. // |