fiddlerwoaroof/crawl - Change S26C7QFN3OBMIHF5XRB5PKRCQVBY22OLUIJKTD4CEMHKWCWE457AC

Fix summoned monsters spattering blood.

Fix menu colouring giving away unknown evil items.

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

Created by j-p-e-g on June 3, 2008

S26C7QFN3OBMIHF5XRB5PKRCQVBY22OLUIJKTD4CEMHKWCWE457AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 221 [4.1340842]

B:BD[3.3951] → [3.3951:4069]

            bleed_onto_floor(monster->x, monster->y, monster->type,
                             damage_taken, true);

[3.3951]

[4.1346909]

            if (!mons_is_summoned(monster))
            {
                bleed_onto_floor(monster->x, monster->y, monster->type,
                                 damage_taken, true);
            }

Insertion in crawl-ref/source/misc.cc at line 1170 [4.1933596]
[3.7191]
[3.7191]
```
    ASSERT(in_bounds(x,y));
```

Replacement in crawl-ref/source/itemname.cc at line 2197 [4.2667494]

B:BD[2.2920] → [2.2920:2977]

    if (is_good_god(you.religion) && is_evil_item(item))

[2.2920]

[2.2977]

    if (is_good_god(you.religion) && is_evil_item(item)
        && item_type_known(item))
    {

Insertion in crawl-ref/source/itemname.cc at line 2201 [4.2667494]
[2.3018]
[5.4503]
```
    }
```

Replacement in crawl-ref/source/food.cc at line 132 [4.3043806]

B:BD[4.3046776] → [4.3046776:3046846]

// more of a "weapon_switch back from butchering" function, switching

[4.3046776]

[4.3046846]

// More of a "weapon_switch back from butchering" function, switching

Deletion in crawl-ref/source/food.cc at line 136 [4.3043806]
B:BD[4.3047015] → [4.3047015:3047016]
Replacement in crawl-ref/source/food.cc at line 148 [4.3043806]
B:BD[4.3047370] → [4.3047370:3047419]
```
    // unwield the old weapon and wield the new.
```
[4.3047370]
[4.3047419]
```
    // Unwield the old weapon and wield the new.
```
Replacement in crawl-ref/source/food.cc at line 159 [4.3043806]
B:BD[4.3047811] → [4.3047811:3047855]
```
    // special checks: staves of power, etc
```
[4.3047811]
[4.3047855]
```
    // Special checks: staves of power, etc.
```

Replacement in crawl-ref/source/fight.cc at line 785 [4.3140790]

B:BD[3.7674] → [6.2661:2714]

        // always upset monster regardless of damage

[3.7674]

[6.2714]

        // Always upset monster regardless of damage.

Replacement in crawl-ref/source/fight.cc at line 788 [4.3140790]

B:BD[6.2764] → [6.2764:2793]

        if (damage_done > 0)

[6.2764]

[3.7703]

        if (damage_done > 0 && !mons_is_summoned(def)
            && !mons_is_submerged(def))

Replacement in crawl-ref/source/fight.cc at line 2389 [4.3140790]

B:BD[3.8005] → [3.8005:8117]

            bleed_onto_floor(pos.x, pos.y, defender->id(),
                             def->hit_points, true);

[3.8005]

[7.2858]

            if (!mons_is_summoned(def))
            {
                bleed_onto_floor(pos.x, pos.y, defender->id(),
                                 def->hit_points, true);
            }

Replacement in crawl-ref/source/fight.cc at line 3849 [4.3140790]

B:BD[3.8275] → [8.13534:13663]

∅:D[8.13663] → [9.3690:3780]

B:BD[9.3690] → [9.3690:3780]

            int blood = _modify_blood_amount(damage_done,
                                             attacker->damage_type());
            if (blood > defender->stat_hp())
                blood = defender->stat_hp();

[3.8275]

[10.5447]

            if (type == -1 || !mons_is_summoned(def) && !mons_is_submerged(def))
            {
                int blood = _modify_blood_amount(damage_done,
                                                 attacker->damage_type());

Replacement in crawl-ref/source/fight.cc at line 3854 [4.3140790]

∅:D[10.5448] → [9.3781:3844]

B:BD[3.8422] → [9.3781:3844]

            bleed_onto_floor(pos.x, pos.y, type, blood, true);

[10.5448]

[3.8486]

                if (blood > defender->stat_hp())
                    blood = defender->stat_hp();

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

[3.8487]

[11.8930]

                bleed_onto_floor(pos.x, pos.y, type, blood, true);
            }

Replacement in crawl-ref/source/beam.cc at line 4585 [4.4128068]

B:BD[12.9035] → [12.9035:9111]

        && (beam.flavour == BEAM_MISSILE || beam.flavour == BEAM_MMISSILE))

[12.9035]

[12.9111]

        && (beam.flavour == BEAM_MISSILE || beam.flavour == BEAM_MMISSILE)
        && !mons_is_summoned(mon) && !mons_is_submerged(mon))

Replacement in crawl-ref/source/beam.cc at line 4588 [4.4128068]

B:BD[12.9117] → [12.9117:9175]

        // using raw_damage instead of the flavoured one!

[12.9117]

[12.9175]

        // Using raw_damage instead of the flavoured one!