fiddlerwoaroof/crawl - Change 2RSY5J2ED2GM5R564UF5NEPDAEJDGLJJ6U3YO6UBQOX4KSLGNY7QC

Fixed condensation shield (Haran).

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

Created by dshaligram on June 24, 2007

2RSY5J2ED2GM5R564UF5NEPDAEJDGLJJ6U3YO6UBQOX4KSLGNY7QC

Dependencies

In channels

main

Change contents

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

B:BD[3.3430] → [2.55:130]

    const item_def *sh = const_cast<player*>(this)->shield();
    if (!sh)

[3.3430]

[2.130]

    const int shield_class = player_shield_class();
    if (!shield_class)

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

[2.150]

    
    int stat = 0;
    if (const item_def *sh = const_cast<player*>(this)->shield())
        stat = 
            sh->sub_type == ARM_BUCKLER?      dex :
            sh->sub_type == ARM_LARGE_SHIELD? (3 * strength + dex) / 4:
            (dex + strength) / 2;
    else
        // Condensation shield is guided by the mind.
        stat = intel / 2;

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

B:BD[2.151] → [2.151:323]

∅:D[2.323] → [3.3430:3473]

B:BD[3.3430] → [3.3430:3473]

    const int stat =
        sh->sub_type == ARM_BUCKLER?      dex :
        sh->sub_type == ARM_LARGE_SHIELD? (3 * strength + dex) / 4:
        (dex + strength) / 2;
    
    return random2(player_shield_class())

[2.151]

[2.324]

    return random2(player_shield_class())

Replacement in crawl-ref/source/fight.cc at line 2531 [4.3140790]
B:BD[3.65293] → [3.65293:65319]
```
    if (!defender_shield)
```
[3.65293]
[3.65319]
```
    if (!defender_shield && defender->atype() != ACT_PLAYER)
```

Insertion in crawl-ref/source/fight.cc at line 2544 [4.3140790]

[3.65606]

#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Pro-block: %d, Con-block: %d",
         pro_block, con_block);
#endif