fiddlerwoaroof/crawl - Change DENP72AB5VYMFLNU3VQULFIAWZAXOK4K554O5GBMZPHMVBUTO53AC

Don't display the warning prompt for firing a charming beam (from e.g. a

wand of enslavement) at a non-holy monster, since it doesn't generate negative conducts then.

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

Created by dolorous on June 3, 2008

DENP72AB5VYMFLNU3VQULFIAWZAXOK4K554O5GBMZPHMVBUTO53AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/beam.cc at line 4303 [5.4128068]

B:BD[3.18261] → [4.3222:3270]

B:BD[4.3270] → [2.2762:2905]

∅:D[2.2905] → [6.3053:3129]

B:BD[7.3778] → [6.3053:3129]

                if (beam.flavour != BEAM_CHARM)
                    set_attack_conducts(mon, conduct);
                // No charming holy beings!
                else if (mons_is_holy(mon))
                    conduct.set(DID_ATTACK_HOLY, mon->hit_dice, true, mon);

[3.18261]

[8.1489]

                set_attack_conducts(mon, conduct);

Insertion in crawl-ref/source/beam.cc at line 5455 [5.4128068]

[5.4259554]

    // No charming holy beings!
    if (beam.flavour == BEAM_CHARM)
        return (mons_is_holy(mon));