fiddlerwoaroof/crawl - Change FRJDHZKBOJX3LPWYDK426RBIQXNC6WFQXE556YFMMXJ2F53OW4JAC

Be a bit more forgiving of zapping unidentified wands that your god

dislikes the effects of (e.g. for good gods, unidentified wands of draining), and properly handle inadvertent unchivalric attacks.

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

Created by dolorous on May 22, 2008

FRJDHZKBOJX3LPWYDK426RBIQXNC6WFQXE556YFMMXJ2F53OW4JAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1900 [5.804403]

B:BD[4.182435] → [2.2574:2691]

            if (thing_done == DID_UNCHIVALRIC_ATTACK
                && tso_unchivalric_attack_safe_monster(victim))

[4.182435]

[2.2691]

            if (thing_done == DID_UNCHIVALRIC_ATTACK)

Replacement in crawl-ref/source/religion.cc at line 1902 [5.804403]

B:BD[2.2705] → [2.2705:2728]

                break;

[2.2705]

[2.2728]

                if (tso_unchivalric_attack_safe_monster(victim))
                    break;
                if (!known)
                {
                    simple_god_message(" did not appreciate that!");
                    break;
                }

Deletion in crawl-ref/source/religion.cc at line 1911 [5.804403]
B:BD[2.2742] → [2.2742:2743]

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

B:BD[5.4238975] → [6.4784:4814]

B:BD[6.4814] → [7.6651:6720]

B:BD[7.6720] → [3.3542:3582]

            const bool okay =
                (beam.aux_source == "reading a scroll of immolation"
                && !beam.effect_known);

[5.4238975]

[6.4883]

            const bool okay = !beam.effect_known;