FR 1913320: remove shock resistance from a number of (humanoid) monsters

Fix 1916532: rename db entry "simulacrum" -> "large simulacrum"

Move tutorial help into the complete hotkey-triggerable help menu.


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

6 files changed, 50 insertions, 57 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 39657a0e58..9161f1a06c 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2152,13 +2152,7 @@ void process_command( command_type cmd )
 #endif
 
     case CMD_DISPLAY_COMMANDS:
-        if (Options.tutorial_left)
-        {
-            list_tutorial_help();
-            redraw_screen();
-        }
-        else
-            list_commands(false, 0, true);
+        list_commands(false, 0, true);
         break;
 
     case CMD_EXPERIENCE_CHECK:
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 404de4b0cc..9861fe001d 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -629,7 +629,7 @@ static void add_file_to_scroller(FILE* fp, formatted_scroller& m,
         // XXX FIXME: there must be a better way to identify sections
         next_is_hotkey = auto_hotkeys &&
             (strstr(buf, "------------------------------------------"
-                    "------------------------------") == buf);
+                         "------------------------------") == buf);
         is_first = false;
     }
 }
@@ -1459,24 +1459,8 @@ void show_stash_search_help()
     show_specific_help( getHelpString("stash-search.prompt") );
 }
 
-void list_commands(bool wizard, int hotkey, bool do_redraw_screen)
+static void add_formatted_keyhelp(column_composer &cols)
 {
-    if (wizard)
-    {
-        list_wizard_commands();
-
-        if (do_redraw_screen)
-            redraw_screen();
-
-        return;
-    }
-
-    // 2 columns, split at column 40.
-    column_composer cols(2, 41);
-
-    // Page size is number of lines - one line for --more-- prompt.
-    cols.set_pagesize(get_number_of_lines() - 1);
-
     cols.add_formatted(
             0,
             "<h>Movement:\n"
@@ -1633,24 +1617,10 @@ void list_commands(bool wizard, int hotkey, bool do_redraw_screen)
             "form of targeting), <w>Ctrl-F</w> and <w>Ctrl-G</w>."
             "\n",
             true, true, cmdhelp_textfilter);
-
-    
-    show_keyhelp_menu(cols.formatted_lines(), true, false, hotkey);
-
-    if (do_redraw_screen)
-    {
-        clrscr();
-        redraw_screen();
-    }
 }
 
-void list_tutorial_help()
+static void add_formatted_tutorial_help(column_composer &cols)
 {
-    // 2 columns, split at column 40.
-    column_composer cols(2, 41);
-    // Page size is number of lines - one line for --more-- prompt.
-    cols.set_pagesize(get_number_of_lines());
-
     unsigned ch;
     unsigned short colour;
 
@@ -1713,10 +1683,40 @@ void list_tutorial_help()
             "and in sight, one of <w>f</w> or <w>p</w> fires at it\n"
             "again (without selecting anything).\n",
             true, true, cmdhelp_textfilter, 40);
-            
-    show_keyhelp_menu(cols.formatted_lines(), false);
 }
- 
+
+void list_commands(bool wizard, int hotkey, bool do_redraw_screen)
+{
+    if (wizard)
+    {
+        list_wizard_commands();
+
+        if (do_redraw_screen)
+            redraw_screen();
+
+        return;
+    }
+
+    // 2 columns, split at column 40.
+    column_composer cols(2, 41);
+
+    // Page size is number of lines - one line for --more-- prompt.
+    cols.set_pagesize(get_number_of_lines() - 1);
+
+    if (Options.tutorial_left)
+        add_formatted_tutorial_help(cols);
+    else
+        add_formatted_keyhelp(cols);
+    
+    show_keyhelp_menu(cols.formatted_lines(), true, false, hotkey);
+
+    if (do_redraw_screen)
+    {
+        clrscr();
+        redraw_screen();
+    }
+}
+
 static void list_wizard_commands()
 {
 #ifdef WIZARD
diff --git a/crawl-ref/source/command.h b/crawl-ref/source/command.h
index 47dcd293d8..0de4a5034c 100644
--- a/crawl-ref/source/command.h
+++ b/crawl-ref/source/command.h
@@ -59,7 +59,6 @@ void show_interlevel_travel_depth_help();
 void show_stash_search_help();
 void list_commands(bool wizard, int hotkey = 0,
                    bool do_redraw_screen = false);
-void list_tutorial_help(void);
 
 // Actually defined in acr.cc; we may want to move this to command.cc
 void process_command(command_type cmd);
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index f300d8bda7..9c0db179c0 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -924,6 +924,10 @@ An enormous monitor lizard. It's more than capable of preying on large
 animals. Bits of fetid and rotting flesh from its last few meals are
 stuck in its teeth.
 %%%%
+large simulacrum
+
+An ice replica of a monster that is animated by the powers of necromancy.
+%%%%
 large skeleton
 
 A large skeleton compelled to unlife by the exercise of necromancy.
@@ -1270,10 +1274,6 @@ A beautiful statue of silvery hue. Its eyes glow with an otherworldly
 radiance.
 It looks brittle.
 %%%%
-simulacrum
-
-An ice replica of a monster that is animated by the powers of necromancy.
-%%%%
 skeletal dragon
 
 A huge undead abomination, pieced together from the broken bones of many dragons.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index ab711c0dae..dc7971297a 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2012,7 +2012,7 @@ void describe_monsters(monsters& mons)
         break;
 
     case MONS_SIMULACRUM_SMALL: case MONS_SIMULACRUM_LARGE:
-        description << getLongDescription("simulacrum");
+        description << getLongDescription("large simulacrum");
         break;
 
     case MONS_SPECTRAL_THING:
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 5a84ccbebe..73e55e6ddf 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -504,7 +504,7 @@
 {
     MONS_DEEP_ELF_MAGE, 'e', MAGENTA, "deep elf mage",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 3, 0 },
@@ -526,7 +526,7 @@
 {
     MONS_DEEP_ELF_CONJURER, 'e', BLUE, "deep elf conjurer",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 3, 0 },
@@ -572,7 +572,7 @@
     MONS_DEEP_ELF_ANNIHILATOR, 'e', LIGHTBLUE, "deep elf annihilator",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL
         | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 3, 3, 0 },
@@ -2358,7 +2358,7 @@
 {
     MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 16, MONS_OGRE, MONS_OGRE, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
@@ -2954,7 +2954,7 @@
 {
     MONS_WIZARD, '@', MAGENTA, "wizard",
     M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 2, 4, 0 },
@@ -3748,7 +3748,7 @@
     MONS_EROLCHA, 'O', LIGHTBLUE, "Erolcha",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD
         | M_SPEAKS | M_EVIL | M_UNIQUE,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 20, MONS_OGRE, MONS_OGRE, MH_NATURAL, -7,
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 54 },
@@ -4007,7 +4007,7 @@
 {
     MONS_LOUISE, '@', BLUE, "Louise",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 0, 0, 106 },
@@ -4043,7 +4043,7 @@
     MONS_RUPERT, '@', RED, "Rupert",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD
         | M_SEE_INVIS | M_UNIQUE,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 21}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 0, 0, 123 },