fiddlerwoaroof/crawl - Change 6SSW2WIX3LUPDP2QI6Z75YUE53G5H3CZBAPCQA7OEQEPOCIXT73AC

Make shields more likely to block missiles, a little less likely to block melee

attacks.

Make training shields in melee easier.

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

Created by dshaligram on March 10, 2007

6SSW2WIX3LUPDP2QI6Z75YUE53G5H3CZBAPCQA7OEQEPOCIXT73AC

Dependencies

In channels

main

Change contents

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

[2.3430]

    const item_def *sh = const_cast<player*>(this)->shield();
    if (!sh)
        return (0);
    const int stat =
        sh->sub_type == ARM_BUCKLER?      dex :
        sh->sub_type == ARM_LARGE_SHIELD? (3 * strength + dex) / 4:
        (dex + strength) / 2;

Replacement in crawl-ref/source/player.cc at line 5005 [3.962854]
B:BD[2.3473] → [2.3473:3503]
```
        + (random2(dex) / 4) 
```
[2.3473]
[2.3503]
```
        + (random2(stat) / 4)
```
Replacement in crawl-ref/source/player.cc at line 5018 [3.962854]
B:BD[2.3713] → [2.3713:3773]
```
    if (one_chance_in(4))
        exercise(SK_SHIELDS, 1);
```
[2.3713]
[2.3773]
```
    exercise(SK_SHIELDS, 1);
```
Replacement in crawl-ref/source/mon-util.cc at line 2814 [3.1699344]
B:BD[2.13667] → [2.13667:13699]
```
    return (15 + hit_dice / 2);
```
[2.13667]
[2.13699]
```
    return (15 + hit_dice * 2 / 3);
```

Replacement in crawl-ref/source/beam.cc at line 3062 [3.4128068]

B:BD[3.4225210] → [4.1243141:1243545]

                    // [dshaligram] beam.hit multiplier lowered to 3 - was 5.
                    // In favour of blocking, dex multiplier changed to .25
                    // (was .2), added shield skill into the equation with a 
                    // skill bump.
                    const int hit = random2( beam.hit * 3
                                + 5 * you.shield_blocks * you.shield_blocks );

[3.4225210]

[3.4225357]

                    const int hit = random2( beam.hit * 130 / 100
                                             + you.shield_block_penalty() );

Replacement in crawl-ref/source/beam.cc at line 3065 [3.4128068]

B:BD[3.4225358] → [3.4225358:4225428]

B:BD[3.4225428] → [4.1243546:1243737]

                    const int block = random2(player_shield_class()) 
                                        + (random2(you.dex) / 4) 
                                        + (random2(skill_bump(SK_SHIELDS)) / 4)
                                        - 1;

[3.4225358]

[3.4225498]

                    const int block = you.shield_bonus();

Insertion in crawl-ref/source/beam.cc at line 3067 [3.4128068]

[3.4225499]

#ifdef DEBUG_DIAGNOSTICS
                    mprf(MSGCH_DIAGNOSTICS, "Beamshield: hit: %d, block %d",
                         hit, block);
#endif