fiddlerwoaroof/crawl - Change QZVQOERFNTC7N3YQXERX7VXK5SJGTIASJSQEZW3FFZFEJK2PLLUQC

Code cleanup for traps.

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

Created by haranp on January 21, 2009

QZVQOERFNTC7N3YQXERX7VXK5SJGTIASJSQEZW3FFZFEJK2PLLUQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.cc at line 149 [7.5308]
[6.2713]
[6.2734]
```
    bool rc = false;
```

Replacement in crawl-ref/source/traps.cc at line 153 [7.5308]

B:BD[6.2854] → [3.260:350]

        return (player_knows);
    bool rc = false;
    if (act->atype() == ACT_MONSTER)

[6.2854]

[6.2923]

        rc = player_knows;
    else if (act->atype() == ACT_MONSTER)

Replacement in crawl-ref/source/traps.cc at line 172 [7.5308]
B:BD[6.3833] → [6.3833:3848]
```
    return rc;
```
[6.3833]
[6.3848]
```
    return (rc);
```

Replacement in crawl-ref/source/traps.cc at line 1132 [7.5308]

B:BD[5.301] → [5.301:367]

        // resetting its position) before the ammo can be droped.

[5.301]

[5.367]

        // resetting its position) before the ammo can be dropped.

Replacement in crawl-ref/source/traps.cc at line 1136 [7.5308]

B:BD[6.17217] → [6.17217:17268]

        bool poison = (this->type == TRAP_NEEDLE);

[6.17217]

[6.17268]

        bool poison = (this->type == TRAP_NEEDLE
                       && !act.res_poison()
                       && x_chance_in_y(50 - (3*act.armour_class()) / 2, 100));

Replacement in crawl-ref/source/traps.cc at line 1141 [7.5308]

B:BD[6.17295] → [6.17295:17423]

            this->shot_damage(act) - random2(act.armour_class()+1);
        if (damage_taken < 0)
            damage_taken = 0;

[6.17295]

[6.17423]

            std::max(this->shot_damage(act) - random2(act.armour_class()+1),0);
        int trap_hit = (20 + (you.your_level*2)) * random2(200) / 100;

Replacement in crawl-ref/source/traps.cc at line 1160 [7.5308]

B:BD[6.17989] → [6.17989:18053]

            if (!was_known && you.shield() && one_chance_in(3))

[6.17989]

[6.18053]

            if (!was_known && player_shield_class() && coinflip())

Replacement in crawl-ref/source/traps.cc at line 1163 [7.5308]

∅:D[8.263] → [6.18107:18220]

B:BD[6.18107] → [6.18107:18220]

            if (random2(20 + 5 * you.shield_blocks * you.shield_blocks)
                < player_shield_class())

[8.263]

[6.18220]

            const int con_block = random2(20 + you.shield_block_penalty());
            const int pro_block = you.shield_bonus();
            if (pro_block >= con_block)

Insertion in crawl-ref/source/traps.cc at line 1167 [7.5308]

[6.18234]

                // Note that we don't call shield_block_succeeded()
                // because that can exercise Shields skill.

Replacement in crawl-ref/source/traps.cc at line 1177 [7.5308]

B:BD[6.18500] → [6.18500:18719]

                int trap_hit = (20 + (you.your_level*2)) * random2(200) / 100;
                int your_dodge = player_evasion() + random2(you.dex) / 3
                    - 2 + (you.duration[DUR_REPEL_MISSILES] * 10);

[6.18500]

[6.18719]

                int your_dodge = you.melee_evasion(NULL) - 2
                    + (random2(you.dex) / 3)
                    + (you.duration[DUR_REPEL_MISSILES] * 10);

Replacement in crawl-ref/source/traps.cc at line 1191 [7.5308]

B:BD[6.19153] → [6.19153:19380]

                    if (poison && !player_res_poison()
                        && x_chance_in_y(50 - (3*player_AC()) / 2, 100))
                    {
                        poison_player(1 + random2(3));
                    }

[6.19153]

[6.19380]

                    if (poison)
                        you.poison(NULL, 1 + random2(3));

Deletion in crawl-ref/source/traps.cc at line 1210 [7.5308]
B:BD[6.19974] → [2.678:742]
∅:D[2.742] → [6.20077:20078]
B:BD[6.20077] → [6.20077:20078]
```
            monsters* monster = dynamic_cast<monsters *>(&act);
```

Replacement in crawl-ref/source/traps.cc at line 1211 [7.5308]

B:BD[6.20128] → [6.20128:20301]

B:BD[6.20301] → [4.303:374]

            bool hit = (((20+(you.your_level*2))*random2(200))/100
                        >= monster->ev);
            // Check whether to poison.
            if (poison)
                poison = (x_chance_in_y(50 - (3*monster->ac)/2, 100));

[6.20128]

[6.20379]

            bool hit = (trap_hit >= act.melee_evasion(NULL));

Replacement in crawl-ref/source/traps.cc at line 1218 [7.5308]

B:BD[6.20565] → [6.20565:20625]

                     monster->name(DESC_NOCAP_THE).c_str(),

[6.20565]

[4.375]

                     act.name(DESC_NOCAP_THE).c_str(),

Replacement in crawl-ref/source/traps.cc at line 1227 [7.5308]

B:BD[4.584] → [4.584:639]

∅:D[4.639] → [6.20821:20822]

B:BD[6.20821] → [6.20821:20822]

B:BD[6.20822] → [4.640:691]

                    poison_monster(monster, KC_OTHER);
                monster->hurt(NULL, damage_taken);

[4.584]

[4.691]

                    act.poison(NULL, 1 + random2(3));
                act.hurt(NULL, damage_taken);

Replacement in crawl-ref/source/player.cc at line 2635 [9.962854]
B:BD[9.1002564] → [9.1002564:1002625]
```
}                               // end player_shield_class()
```
[9.1002564]
[9.1002625]
```
}
```
Replacement in crawl-ref/source/player.cc at line 6696 [9.962854]
∅:D[10.2565] → [11.520:574]
B:BD[11.520] → [11.520:574]
```
        // Condensation shield is guided by the mind.
```
[10.2565]
[11.574]
```
        // Magical and divine shields are governed by the mind.
```

Replacement in crawl-ref/source/mon-util.cc at line 5866 [9.1699344]

B:BD[12.12503] → [12.12503:12562]

    poison_monster(this, agent->kill_alignment(), amount);

[12.12503]

[13.15012]

    poison_monster(this, agent ? agent->kill_alignment() : KC_OTHER, amount);