diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-21 21:13:09 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-21 21:13:09 +0000 |
commit | 33b24e66a7a26ba76ae804996f16a1b8b779a353 (patch) | |
tree | 07e0df29f0ca567ddab1521805cecd27e6f12ad4 | |
parent | 1b6bfb7856cb5590e9e10c1e7317eba775409b21 (diff) | |
download | crawl-ref-33b24e66a7a26ba76ae804996f16a1b8b779a353.tar.gz crawl-ref-33b24e66a7a26ba76ae804996f16a1b8b779a353.zip |
* Actually use the rock worm's corpse tile.
* Tweak a few skill titles.
* Update the change log (not for these, though).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10769 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/docs/changelog.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/describe.cc | 25 | ||||
-rw-r--r-- | crawl-ref/source/describe.h | 1 | ||||
-rw-r--r-- | crawl-ref/source/makeitem.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/skills2.cc | 26 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 2 |
6 files changed, 36 insertions, 24 deletions
diff --git a/crawl-ref/docs/changelog.txt b/crawl-ref/docs/changelog.txt index a49b80021e..d6ff46c6dd 100644 --- a/crawl-ref/docs/changelog.txt +++ b/crawl-ref/docs/changelog.txt @@ -9,6 +9,7 @@ Stone Soup 0.6 * Starting stats and equipment, and hp gain, are no longer assigned randomly. * Round all aptitudes to multiples of 10. * New memorisation interface. +* Autotravel doesn't cut corners and tries to avoid ambushes. * Exclusions are displayed in the overview screen ('Ctrl-O' command). * Autoexclusions get removed again once the trigger monster is no longer there. * Armour acquirement is more likely to fill secondary slots. @@ -22,6 +23,7 @@ Stone Soup 0.6 * Abort some teleportation attempts with -TELE without losing the turn. * Weapons of holy wrath cannot be cursed. * Post-berserk exhaustion cancels Haste, even with an amulet of remove slowing. +* Controlled blink causes glowing. * Lowered gold dragon armour's AC value. * Bears can go berserk. * Bashing plants or fungi will only train Fighting/Unarmed Combat up to level 1. diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 1586fd4b63..8fc83f6c9d 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3290,6 +3290,20 @@ static int _piety_level() } +std::string god_title(god_type which_god) +{ + std::string title; + if (you.penance[which_god]) + title = divine_title[which_god][0]; + else + title = divine_title[which_god][_piety_level()]; + + title = replace_all(title, "%s", + species_name(you.species, 1, true, false)); + + return (title); +} + static void _detailed_god_description(god_type which_god) { clrscr(); @@ -3457,16 +3471,7 @@ void describe_god( god_type which_god, bool give_title ) cprintf(EOL "Title - "); textcolor(colour); - std::string title; - - if (you.penance[which_god]) - title = divine_title[which_god][0]; - else - title = divine_title[which_god][_piety_level()]; - - title = replace_all(title, "%s", - species_name(you.species, 1, true, false)); - + std::string title = god_title(which_god); cprintf("%s", title.c_str()); } diff --git a/crawl-ref/source/describe.h b/crawl-ref/source/describe.h index ee2b912e83..2bcc9438d6 100644 --- a/crawl-ref/source/describe.h +++ b/crawl-ref/source/describe.h @@ -57,6 +57,7 @@ std::string get_item_description( const item_def &item, bool verbose, /* *********************************************************************** * called from: acr - religion * *********************************************************************** */ +std::string god_title(god_type which_god); void describe_god( god_type which_god, bool give_title ); void describe_feature_wide(const coord_def& pos); diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 41c0f2f6f7..491851efd7 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -4159,9 +4159,9 @@ void give_armour(monsters *mon, int level) { case MONS_DEEP_ELF_BLADEMASTER: case MONS_DEEP_ELF_MASTER_ARCHER: - item_race = MAKE_ITEM_ELVEN; + item_race = MAKE_ITEM_ELVEN; item.base_type = OBJ_ARMOUR; - item.sub_type = ARM_LEATHER_ARMOUR; + item.sub_type = ARM_LEATHER_ARMOUR; break; case MONS_DUVESSA: diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 5f11a209cb..7fc1b43dc7 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -83,7 +83,7 @@ const char *skills[50][6] = {"Short Blades", "Cutter", "Slicer", "Swashbuckler", "Blademaster", "Eviscerator"}, {"Long Blades", "Slasher", "Carver", "Fencer", "@Adj@ Blade", "Swordmaster"}, {NULL}, // 3- was: great swords {dlb} - {"Axes", "Chopper", "Cleaver", "Hacker", "Severer", "Executioner"}, + {"Axes", "Chopper", "Cleaver", "Severer", "Executioner", "Axe Maniac"}, {"Maces & Flails", "Cudgeler", "Basher", "Bludgeoner", "Shatterer", "Skullcrusher"}, // 5 {"Polearms", "Poker", "Spear-Bearer", "Impaler", "Phalangite", "@Adj@ Porcupine"}, {"Staves", "Twirler", "Cruncher", "Stickfighter", "Pulveriser", "Chief of Staff"}, @@ -122,8 +122,9 @@ const char *skills[50][6] = {"Earth Magic", "Digger", "Geomancer", "Earth Mage", "Metallomancer", "Petrodigitator"}, {"Poison Magic", "Stinger", "Tainter", "Polluter", "Contaminator", "Envenomancer"}, - // for titles for godless characters, see below - {"Invocations", "Believer", "Agitator", "Worldly Agent", "Theurge", "Avatar"}, + // These titles apply to atheists only, worshippers of the various gods + // use the god titles instead, depending on piety or, in Xom's case, mood. + {"Invocations", "Unbeliever", "Agnostic", "Dissident", "Heretic", "Apostate"}, {"Evocations", "Charlatan", "Prestidigitator", "Fetichist", "Evocator", "Talismancer"}, // 39 /*NOTE: If more skills are added, must change ranges in level_change() in player.cc */ @@ -143,9 +144,6 @@ const char *skills[50][6] = const char *martial_arts_titles[6] = {"Unarmed Combat", "Insei", "Martial Artist", "Black Belt", "Sensei", "Grand Master"}; -const char *atheist_inv_titles[6] = - {"Invocations", "Unbeliever", "Agnostic", "Dissident", "Heretic", "Apostate"}; - // The Human aptitude set of 100 for all skills allows to define all other // species relative to Humans. @@ -968,7 +966,7 @@ const int spec_skills[ NUM_SPECIES ][40] = 100, // SK_EARTH_MAGIC 100, // SK_POISON_MAGIC 80, // SK_INVOCATIONS - 70, // SK_EVOCATIONS + 70, // SK_EVOCATIONS }, { // SP_MOTTLED_DRACONIAN @@ -1990,12 +1988,16 @@ std::string skill_title( unsigned char best_skill, unsigned char skill_lev, case SK_INVOCATIONS: if (god == GOD_NO_GOD) - result = atheist_inv_titles[skill_rank]; - else if (god == GOD_XOM || god == GOD_VEHUMET || god == GOD_TROG - || god == GOD_NEMELEX_XOBEH) + result = skills[best_skill][skill_rank]; + else + result = god_title((god_type) god); + break; + + case SK_BOWS: + if (player_genus(GENPC_ELVEN, static_cast<species_type>(species))) { - // don't care about Invocations - result = "Prodigal"; + result = "Master Archer"; + break; } else result = skills[best_skill][skill_rank]; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 66bdd74145..c401f49fde 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1740,6 +1740,8 @@ static int _tileidx_corpse(int mon) return TILE_CORPSE_BRAIN_WORM; case MONS_SWAMP_WORM: return TILE_CORPSE_SWAMP_WORM; + case MONS_ROCK_WORM: + return TILE_CORPSE_ROCK_WORM; case MONS_SPINY_WORM: return TILE_CORPSE_SPINY_WORM; |