fiddlerwoaroof/crawl - Change SIP35YIR6H5EBKAT4QN3LTE4XOUN6Z6DDMPK33TTGMM5PZM4QB5AC

Add still more minor cosmetic fixes.

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

Created by dolorous on May 15, 2008

SIP35YIR6H5EBKAT4QN3LTE4XOUN6Z6DDMPK33TTGMM5PZM4QB5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills2.cc at line 2113 [3.647133]

B:BD[2.174] → [2.174:240]

    // limit combined robust mutations and divine robustness to 3

[2.174]

[2.240]

    // robust mutations and divine robustness don't stack

Replacement in crawl-ref/source/player.cc at line 2989 [3.962854]

B:BD[3.1011654] → [4.4195:4272]

                                                : STAT_DEXTERITY), 1, false,

[3.1011654]

[4.4272]

                                             : STAT_DEXTERITY), 1, false,

Replacement in crawl-ref/source/player.cc at line 3024 [3.962854]

B:BD[3.1013198] → [4.4468:4541]

                                            : STAT_DEXTERITY), 1, false,

[3.1013198]

[4.4541]

                                             : STAT_DEXTERITY), 1, false,

Replacement in crawl-ref/source/player.cc at line 3116 [3.962854]

B:BD[3.1015328] → [4.4734:4811]

                                                : STAT_DEXTERITY), 1, false,

[3.1015328]

[4.4811]

                                             : STAT_DEXTERITY), 1, false,

Replacement in crawl-ref/source/player.cc at line 3275 [3.962854]

B:BD[3.1021090] → [4.5201:5275]

                                              : STAT_STRENGTH), 1, false,

[3.1021090]

[4.5275]

                                             : STAT_STRENGTH), 1, false,

Replacement in crawl-ref/source/player.cc at line 3317 [3.962854]

B:BD[3.1022331] → [4.5395:5458]

                                  : STAT_DEXTERITY), 1, false,

[3.1022331]

[4.5458]

                                             : STAT_DEXTERITY), 1, false,

Deletion in crawl-ref/source/player.cc at line 4454 [3.962854]
∅:D[5.16828] → [3.1050429:1050470]
B:BD[3.1050429] → [3.1050429:1050470]
B:BD[3.1050470] → [4.6415:6448]
∅:D[4.6448] → [3.1050499:1050536]
B:BD[3.1050499] → [3.1050499:1050536]
B:BD[3.1050536] → [4.6449:6540]
∅:D[4.6540] → [5.16829:16883]
B:BD[3.1050580] → [5.16829:16883]
```
        break;
    case STAT_DEXTERITY:
        ptr_stat     = &you.dex;
        ptr_stat_max = &you.max_dex;
        ptr_redraw   = &you.redraw_dexterity;
        kill_type    = KILLED_BY_CLUMSINESS;
        msg += ((amount > 0) ? "agile." : "clumsy.");
```

Insertion in crawl-ref/source/player.cc at line 4464 [3.962854]

[6.863]

    case STAT_DEXTERITY:
        ptr_stat     = &you.dex;
        ptr_stat_max = &you.max_dex;
        ptr_redraw   = &you.redraw_dexterity;
        kill_type    = KILLED_BY_CLUMSINESS;
        msg += ((amount > 0) ? "agile." : "clumsy.");
        break;

Replacement in crawl-ref/source/player.cc at line 5166 [3.962854]
B:BD[7.785] → [7.785:820]
```
    if ( you.duration[DUR_MIGHT] )
```
[7.785]
[7.820]
```
    if (you.duration[DUR_MIGHT])
```

Insertion in crawl-ref/source/player.cc at line 5198 [3.962854]

[8.1770]

[9.3200]

static int _int_modifier()
{
    int result = 0;
    // ego items of intelligence
    result += 3 * count_worn_ego(SPARM_INTELLIGENCE);
    // rings of intelligence
    result += player_equip( EQ_RINGS_PLUS, RING_INTELLIGENCE );
    // randarts of intelligence
    result += scan_randarts(RAP_INTELLIGENCE);
    // mutations
    result += player_mutation_level(MUT_CLEVER)
              - player_mutation_level(MUT_DOPEY);
    return result;
}

Deletion in crawl-ref/source/player.cc at line 5261 [3.962854]

B:BD[7.2914] → [9.3228:3255]

∅:D[9.3255] → [7.2940:3242]

B:BD[7.2940] → [7.2940:3242]

B:BD[7.3242] → [10.11591:11690]

∅:D[10.11690] → [7.3308:3330]

B:BD[7.3308] → [7.3308:3330]

static int _int_modifier()
{
    int result = 0;
    // ego items of intelligence
    result += 3 * count_worn_ego(SPARM_INTELLIGENCE);
    // rings of intelligence
    result += player_equip( EQ_RINGS_PLUS, RING_INTELLIGENCE );
    // randarts of intelligence
    result += scan_randarts(RAP_INTELLIGENCE);
    // mutations
    result += player_mutation_level(MUT_CLEVER)
              - player_mutation_level(MUT_DOPEY);
    return result;
}

Deletion in crawl-ref/source/player.cc at line 5266 [3.962854]
B:BD[9.3313] → [9.3313:3365]
```
    case STAT_DEXTERITY:    return _dex_modifier();
```
Insertion in crawl-ref/source/player.cc at line 5267 [3.962854]
[9.3417]
[7.3552]
```
    case STAT_DEXTERITY:    return _dex_modifier();
```

Replacement in crawl-ref/source/acr.cc at line 3068 [3.4397395]

B:BD[11.5027] → [11.5027:5082]

    if ( _decrement_a_duration(DUR_DIVINE_ROBUSTNESS))

[11.5027]

[11.5082]

    if (_decrement_a_duration(DUR_DIVINE_ROBUSTNESS))