fiddlerwoaroof/crawl - Change ZJSJGWYEOMUS4VK7VWFVLKW2E42X7KPFLK6HAA5LN3URQWISQULQC

Fixed inappropriate monsters being able to submerge in air, tweaked monster shield numbers.

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

Created by dshaligram on January 26, 2008

ZJSJGWYEOMUS4VK7VWFVLKW2E42X7KPFLK6HAA5LN3URQWISQULQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 5929 [6.962854]
B:BD[5.3620] → [5.3620:3649]
```
    return (10 + tohit * 2);
```
[5.3620]
[5.3649]
```
    return (15 + tohit / 2);
```

Replacement in crawl-ref/source/monstuff.cc at line 2447 [6.1396662]

∅:D[3.6966] → [7.277:1264]

B:BD[7.277] → [7.277:1264]

        && ( !player_beheld_by(monster) // no submerging if player entranced
             && (one_chance_in(5)
                 || ((grid_distance( monster->x, monster->y,
                                     you.x_pos, you.y_pos ) > 1
                      // FIXME This is better expressed as a
                      // function such as
                      // monster_has_ranged_attack:
                      && monster->type != MONS_ELECTRICAL_EEL
                      && monster->type != MONS_LAVA_SNAKE
                      && (monster->type != MONS_MERMAID
                          || you.species == SP_MERFOLK)
                      // Don't submerge if we just unsubmerged for
                      // the sake of shouting.
                      && monster->seen_context != "bursts forth shouting"
                      && !one_chance_in(20)) ))
            || monster->hit_points <= monster->max_hit_points / 2)
        || env.cgrid[monster->x][monster->y] != EMPTY_CLOUD)

[3.6966]

[7.1264]

        && !player_beheld_by(monster) // no submerging if player entranced
        && (one_chance_in(5)
            || ((grid_distance( monster->x, monster->y,
                                you.x_pos, you.y_pos ) > 1
                 // FIXME This is better expressed as a
                 // function such as
                 // monster_has_ranged_attack:
                 && monster->type != MONS_ELECTRICAL_EEL
                 && monster->type != MONS_LAVA_SNAKE
                 && (monster->type != MONS_MERMAID
                     || you.species == SP_MERFOLK)
                 // Don't submerge if we just unsubmerged for
                 // the sake of shouting.
                 && monster->seen_context != "bursts forth shouting"
                 && !one_chance_in(20)) )
            || monster->hit_points <= monster->max_hit_points / 2
            || env.cgrid[monster->x][monster->y] != EMPTY_CLOUD))

Replacement in crawl-ref/source/mon-util.cc at line 3537 [6.1699344]

∅:D[4.2749] → [5.13414:13467]

B:BD[5.13414] → [5.13414:13467]

B:BD[5.13467] → [2.1571:1633]

        const int shld_c = property(*shld, PARM_AC);
        return (random2(1 + shld_c) + random2(hit_dice / 2));

[4.2749]

[5.13529]

        int shld_c = property(*shld, PARM_AC);
        return (random2avg(shld_c + hit_dice * 2 / 3, 2));