Various documentation tweaks. Among others, replace all references to

"class" with "job", and "race" with "species" because that comes much
closer to what they actually are.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9425 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 27 insertions, 17 deletions

diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt
index 7b79ece236..c7c08394ac 100644
--- a/crawl-ref/source/dat/database/FAQ.txt
+++ b/crawl-ref/source/dat/database/FAQ.txt
@@ -162,7 +162,7 @@ Keep in mind that you don't absolutely have to fight every monster you meet,
 and with ghosts it's even easier: they cannot leave the level they were
 created on.
 
-Alternatively, you could play a couple of strong species/class combinations
+Alternatively, you could play a couple of strong species/job combinations
 for the sole purpose of busting those ghosts, for example Berserkers or a
 spellcaster who's learned Dispel Undead.
 %%%%
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 26c6a58f6b..30432cd59a 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2966,6 +2966,9 @@ static std::string _get_monster_desc(const monsters *mon)
     else if (mons_neutral(mon)) // don't differentiate between permanent or not
         text += pronoun + " is indifferent to you.\n";
 
+    if (mons_is_summoned(mon))
+        text += pronoun + " has been summoned.\n";
+
     if (mon->haloed())
         text += pronoun + " is illuminated by a divine halo.\n";
 
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 854359715d..13c0c3d4a7 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1593,8 +1593,10 @@ int prompt_eat_chunks()
             //    and may have unintended consequences.
             //  * Ghouls may want to wait until chunks become rotten.
             if (easy_eat && !bad && !contam)
+            {
                 // If this chunk is safe to eat, just do so without prompting.
                 autoeat = true;
+            }
             else if (easy_contam && contam && !bad)
                 autoeat = true;
             else
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 5ac5dfe6d0..4bee7a894b 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -385,7 +385,7 @@ static char _str_to_race( const std::string &str )
         index = get_species_index_by_name( str.c_str() );
 
     if (index == -1)
-        fprintf( stderr, "Unknown race choice: %s\n", str.c_str() );
+        fprintf( stderr, "Unknown species choice: %s\n", str.c_str() );
 
     return ((index != -1) ? index_to_letter( index ) : 0);
 }
@@ -407,7 +407,7 @@ static int _str_to_class( const std::string &str )
         index = get_class_index_by_name( str.c_str() );
 
     if (index == -1)
-        fprintf( stderr, "Unknown class choice: %s\n", str.c_str() );
+        fprintf( stderr, "Unknown job choice: %s\n", str.c_str() );
 
     return ((index != -1) ? index_to_letter( index ) : 0);
 }
@@ -1309,9 +1309,9 @@ static void write_newgame_options(FILE *f)
 
     // Race selection
     if (Options.prev_race)
-        fprintf(f, "race = %c\n", Options.prev_race);
+        fprintf(f, "species = %c\n", Options.prev_race);
     if (Options.prev_cls)
-        fprintf(f, "class = %c\n", Options.prev_cls);
+        fprintf(f, "job = %c\n", Options.prev_cls);
 
     if (Options.prev_weapon != WPN_UNKNOWN)
         fprintf(f, "weapon = %s\n", _weapon_to_str(Options.prev_weapon).c_str());
@@ -1987,7 +1987,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     const std::string orig_field = field;
 
     if (key != "name" && key != "crawl_dir" && key != "macro_dir"
-        && key != "race" && key != "class" && key != "ban_pickup"
+        && key != "species" && key != "job" && key != "ban_pickup"
         && key != "autopickup_exceptions"
         && key != "stop_travel" && key != "sound"
         && key != "travel_stop_message" && key != "force_more_message"
@@ -2373,11 +2373,11 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         macro_dir = field;
     }
 #endif
-    else if (key == "race")
+    else if (key == "species" || key == "race")
     {
         race = _str_to_race( field );
     }
-    else if (key == "class")
+    else if (key == "job" || key == "class")
     {
         cls = _str_to_class( field );
     }
@@ -3380,7 +3380,7 @@ enum commandline_option_type {
 };
 
 static const char *cmd_ops[] = {
-    "scores", "name", "race", "class", "plain", "dir", "rc",
+    "scores", "name", "species", "job", "plain", "dir", "rc",
     "rcdir", "tscores", "vscores", "scorefile", "morgue", "macro",
     "mapstat", "arena"
 };
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index cc6eb1d7ec..b65f983f33 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1188,7 +1188,7 @@ game_start:
                                _get_class(letter_to_index(Options.cls))))
         {
             end(1, false,
-                "Incompatible race and class specified in options file.");
+                "Incompatible species and job specified in options file.");
         }
         // Repeat until valid race/class combination found.
         while (choose_race() && !choose_class());
@@ -3075,8 +3075,8 @@ static void _show_name_prompt(int where, bool blankOK,
         else
         {
             cprintf(EOL
-                    "Press <Enter> to answer this after race and "
-                    "class are chosen." EOL);
+                    "Press <Enter> to answer this after species and "
+                    "job are chosen." EOL);
         }
     }
 
@@ -3847,14 +3847,14 @@ spec_query:
         cprintf(EOL EOL);
         if (you.char_class == JOB_UNKNOWN)
         {
-            cprintf("Space - Choose class first; * - Random species" EOL
+            cprintf("Space - Choose job first; * - Random species" EOL
                     "! - Random character; # - Good random character; X - Quit"
                     EOL);
         }
         else
         {
             cprintf("* - Random; + - Good random; "
-                    "Bksp - Back to class selection; X - Quit"
+                    "Bksp - Back to job selection; X - Quit"
                     EOL);
         }
 
@@ -4097,8 +4097,8 @@ job_query:
         if (you.species == SP_UNKNOWN)
         {
             cprintf(EOL
-                    "Space - Choose species first; * - Random class; "
-                    "+ - Good random class" EOL
+                    "Space - Choose species first; * - Random job; "
+                    "+ - Good random job" EOL
                     "! - Random character; # - Good random character; X - Quit"
                     EOL);
         }
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index c7b9113470..62f3234174 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3173,7 +3173,12 @@ void level_change(bool skip_attribute_increase)
                 else if (you.experience_level == 6)
                 {
                     mpr("You can now bottle potions of blood from chopped up "
-                        "corpses.");
+                        "corpses.", MSGCH_INTRINSIC_GAIN);
+                }
+                else if (you.experience_level == 10)
+                {
+                    mpr("Cursed equipment will now meld into your body when "
+                        "transforming into a vampire bat.", MSGCH_INTRINSIC_GAIN);
                 }
                 break;
             case SP_NAGA:
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/sonja.png b/crawl-ref/source/rltiles/dc-mon/unique/sonja.png
index 1257e2c1f8..8fd21e8a76 100644
--- a/crawl-ref/source/rltiles/dc-mon/unique/sonja.png
+++ b/crawl-ref/source/rltiles/dc-mon/unique/sonja.png