fiddlerwoaroof/crawl - Change JPZDDDJT7CKZTIUGVPDBRKWZMPWKVKDHG6LDFRJ24HZKU27WRC7QC

Tweaks to make it less likely that command repitition will be cancled when it's

being used to wizard test Xom acts.

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

Created by zelgadis on January 17, 2009

JPZDDDJT7CKZTIUGVPDBRKWZMPWKVKDHG6LDFRJ24HZKU27WRC7QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1100 [4.293070]

[2.3622]

    const bool normal_cast = crawl_state.prev_cmd == CMD_CAST_SPELL
                          && god == GOD_NO_GOD;

Replacement in crawl-ref/source/spl-cast.cc at line 1409 [4.293070]

B:BD[5.4902] → [5.4902:4977]

        crawl_state.cant_cmd_repeat("You can't repeat delayed fireball.");

[5.4902]

[5.4977]

        if (normal_cast)
            crawl_state.cant_cmd_repeat("You can't repeat delayed fireball.");

Replacement in crawl-ref/source/spl-cast.cc at line 1566 [4.293070]

∅:D[6.320] → [7.231:304]

∅:D[5.7961] → [7.231:304]

B:BD[8.207] → [7.231:304]

        crawl_state.cant_cmd_repeat("You can't repeat Tukima's Dance.");

[6.320]

[9.1166]

        if (normal_cast)
            crawl_state.cant_cmd_repeat("You can't repeat Tukima's Dance.");

Replacement in crawl-ref/source/spl-cast.cc at line 1885 [4.293070]

B:BD[10.159] → [11.3954:4023]

        crawl_state.cant_cmd_repeat("You can't repeat Alter Self.");

[10.159]

[4.334280]

        if (normal_cast)
            crawl_state.cant_cmd_repeat("You can't repeat Alter Self.");

Replacement in crawl-ref/source/spl-cast.cc at line 2100 [4.293070]

B:BD[5.16023] → [5.16023:16079]

        crawl_state.cant_cmd_repeat("You can't swap.");

[5.16023]

[5.16079]

        if (normal_cast)
            crawl_state.cant_cmd_repeat("You can't swap.");

Replacement in crawl-ref/source/spl-cast.cc at line 2110 [4.293070]

B:BD[5.16171] → [5.16171:16243]

        crawl_state.cant_cmd_repeat("You can't repeat create portal.");

[5.16171]

[5.16243]

        if (normal_cast)
            crawl_state.cant_cmd_repeat("You can't repeat create portal.");

Insertion in crawl-ref/source/player.cc at line 2997 [4.962854]

[4.1007614]

[4.1007661]

    const bool wiz_cmd = crawl_state.prev_cmd == CMD_WIZARD
                      || crawl_state.repeat_cmd == CMD_WIZARD;

Replacement in crawl-ref/source/player.cc at line 3009 [4.962854]
B:BD[12.214] → [13.2859:2897]
```
        if (!skip_attribute_increase)
```
[12.214]
[12.250]
```
        if (!skip_attribute_increase && !wiz_cmd)
```

Replacement in crawl-ref/source/player.cc at line 3011 [4.962854]

B:BD[12.260] → [14.4859:4907]

∅:D[14.4907] → [12.309:485]

B:BD[12.309] → [12.309:485]

            if (crawl_state.is_replaying_keys()
                || crawl_state.is_repeating_cmd())
            {
                crawl_state.cancel_cmd_repeat();
                crawl_state.cancel_cmd_again();
            }

[12.260]

[12.485]

            crawl_state.cancel_cmd_all();

Replacement in crawl-ref/source/ouch.cc at line 902 [4.1104358]

B:BD[15.6183] → [3.8393:8468]

        if (crawl_state.prev_cmd == CMD_WIZARD && you.religion != GOD_XOM)

[15.6183]

[15.6231]

        if ((crawl_state.repeat_cmd == CMD_WIZARD
             || crawl_state.prev_cmd == CMD_WIZARD)
            && you.religion != GOD_XOM)
        {

Insertion in crawl-ref/source/ouch.cc at line 907 [4.1104358]
[15.6251]
[3.8469]
```
        }
```

Replacement in crawl-ref/source/acr.cc at line 1571 [4.4397395]

B:BD[16.16805] → [17.3166:3239]

∅:D[17.3239] → [18.28410:28464]

B:BD[18.28410] → [18.28410:28464]

        crawl_state.cancel_cmd_repeat("Cannot move, cancelling command "
                                      "repetition.");

[16.16805]

[18.28464]

        if (crawl_state.repeat_cmd != CMD_WIZARD)
            crawl_state.cancel_cmd_repeat("Cannot move, cancelling command "
                                          "repetition.");