fiddlerwoaroof/crawl - Change YFACWAHJI6DAZDNCI7C4NSSPYFRAKORZTXUFX6PRM6JQ7GCQKHGAC

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

Created by j-p-e-g on March 20, 2008

YFACWAHJI6DAZDNCI7C4NSSPYFRAKORZTXUFX6PRM6JQ7GCQKHGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-data.h at line 507 [5.1826214]
∅:D[3.4154] → [4.14819:14836]
B:BD[4.14819] → [4.14819:14836]
```
    MR_RES_ELEC,
```
[3.4154]
[4.14836]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 529 [5.1826214]
∅:D[3.4282] → [4.15638:15655]
B:BD[4.15638] → [4.15638:15655]
```
    MR_RES_ELEC,
```
[3.4282]
[4.15655]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 575 [5.1826214]
∅:D[3.4538] → [4.17396:17413]
B:BD[4.17396] → [4.17396:17413]
```
    MR_RES_ELEC,
```
[3.4538]
[4.17413]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 2361 [5.1826214]
∅:D[3.7148] → [4.74806:74823]
B:BD[4.74806] → [4.74806:74823]
```
    MR_RES_ELEC,
```
[3.7148]
[4.74823]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 2957 [5.1826214]
B:BD[4.94629] → [4.94629:94646]
```
    MR_RES_ELEC,
```
[4.94629]
[4.94646]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 3751 [5.1826214]
∅:D[4.118789] → [6.518941:518958]
B:BD[6.518941] → [6.518941:518958]
```
    MR_RES_ELEC,
```
[4.118789]
[4.118790]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 4010 [5.1826214]
B:BD[6.523041] → [6.523041:523058]
```
    MR_RES_ELEC,
```
[6.523041]
[7.370]
```
    MR_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 4046 [5.1826214]
B:BD[6.523557] → [6.523557:523574]
```
    MR_RES_ELEC,
```
[6.523557]
[7.526]
```
    MR_NO_FLAGS,
```

Replacement in crawl-ref/source/describe.cc at line 2015 [5.3736416]

B:BD[2.602] → [2.602:659]

        description << getLongDescription("simulacrum");

[2.602]

[2.659]

        description << getLongDescription("large simulacrum");

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 926 [10.17579]

[8.49137]

[9.14515]

%%%%
large simulacrum
An ice replica of a monster that is animated by the powers of necromancy.

Deletion in crawl-ref/source/dat/descript/monsters.txt at line 1276 [10.17579]
∅:D[8.57947] → [11.3977:3982]
B:BD[11.3977] → [11.3977:3982]
B:BD[11.3982] → [8.57948:57959]
∅:D[8.57959] → [11.4001:4002]
B:BD[11.4001] → [11.4001:4002]
B:BD[11.4002] → [8.57960:58034]
```
%%%%
simulacrum
An ice replica of a monster that is animated by the powers of necromancy.
```
Deletion in crawl-ref/source/command.h at line 62 [5.4080838]
∅:D[12.602] → [13.85006:85037]
∅:D[14.4726] → [13.85006:85037]
B:BD[15.1583] → [13.85006:85037]
```
void list_tutorial_help(void);
```

Replacement in crawl-ref/source/command.cc at line 632 [5.4082507]

B:BD[16.2654] → [16.2654:2717]

                    "------------------------------") == buf);

[16.2654]

[16.2717]

                         "------------------------------") == buf);

Replacement in crawl-ref/source/command.cc at line 1462 [5.4082507]

B:BD[17.2237] → [14.10926:10993]

void list_commands(bool wizard, int hotkey, bool do_redraw_screen)

[17.2237]

[6.1189512]

static void add_formatted_keyhelp(column_composer &cols)

Deletion in crawl-ref/source/command.cc at line 1464 [5.4082507]
B:BD[6.1189514] → [6.1189514:1189568]
B:BD[6.1189568] → [14.10994:11055]
∅:D[14.11055] → [6.1189568:1189590]
B:BD[6.1189568] → [6.1189568:1189590]
B:BD[6.1189590] → [18.3936:3937]
∅:D[18.3937] → [6.1189599:1189670]
B:BD[6.1189599] → [6.1189599:1189670]
B:BD[6.1189670] → [18.3938:3939]
∅:D[18.3939] → [6.1189670:1189789]
B:BD[6.1189670] → [6.1189670:1189789]
```
    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);
```
Deletion in crawl-ref/source/command.cc at line 1620 [5.4082507]
B:BD[6.1195549] → [6.1195549:1195550]
B:BD[19.7457] → [19.7457:7462]
∅:D[14.11084] → [20.5587:5655]
B:BD[19.7462] → [20.5587:5655]
B:BD[20.5655] → [14.11085:11167]
```
    
    show_keyhelp_menu(cols.formatted_lines(), true, false, hotkey);
    if (do_redraw_screen)
    {
        clrscr();
        redraw_screen();
    }
```
Replacement in crawl-ref/source/command.cc at line 1622 [5.4082507]
B:BD[6.1197191] → [13.85039:85065]
```
void list_tutorial_help()
```
[6.1197191]
[13.85065]
```
static void add_formatted_tutorial_help(column_composer &cols)
```

Deletion in crawl-ref/source/command.cc at line 1624 [5.4082507]

B:BD[13.85067] → [13.85067:85253]

    // 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());

Deletion in crawl-ref/source/command.cc at line 1686 [5.4082507]
∅:D[21.7016] → [22.1719:1732]
B:BD[13.88255] → [22.1719:1732]
∅:D[22.1732] → [13.88256:88310]
B:BD[13.88256] → [13.88256:88310]
```
            
    show_keyhelp_menu(cols.formatted_lines(), false);
```

Replacement in crawl-ref/source/command.cc at line 1687 [5.4082507]

B:BD[13.88312] → [13.88312:88314]

[13.88312]

[6.1197191]


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();
    }
}

Replacement in crawl-ref/source/acr.cc at line 2155 [5.4397395]
B:BD[5.4434406] → [13.91305:91340]
B:BD[13.91340] → [14.11332:11342]
∅:D[14.11342] → [13.91340:91374]
B:BD[13.91340] → [13.91340:91374]
B:BD[13.91374] → [14.11343:11382]
∅:D[14.11382] → [13.91374:91387]
B:BD[13.91374] → [13.91374:91387]
B:BD[13.91387] → [14.11383:11426]
```
        if (Options.tutorial_left)
        {
            list_tutorial_help();
            redraw_screen();
        }
        else
            list_commands(false, 0, true);
```
[5.4434406]
[5.4434461]
```
        list_commands(false, 0, true);
```

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

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-data.h at line 507 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 529 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 575 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2361 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2957 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3751 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4010 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4046 [5.1826214]

Replacement in crawl-ref/source/describe.cc at line 2015 [5.3736416]

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 926 [10.17579]

Deletion in crawl-ref/source/dat/descript/monsters.txt at line 1276 [10.17579]

Deletion in crawl-ref/source/command.h at line 62 [5.4080838]

Replacement in crawl-ref/source/command.cc at line 632 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1462 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 1464 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 1620 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1622 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 1624 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 1686 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1687 [5.4082507]

Replacement in crawl-ref/source/acr.cc at line 2155 [5.4397395]