fiddlerwoaroof/crawl - Change PYRDMGIYU5BUMTGRTYHRKD2D7WULYWCVOU46TJ4R5NSVEZVCZTUQC

Fix [2038873]: Clarify god messages for incurring penance and warnings

about incurring penance. Differentiating between conduct from item use and conduct from spell use is complex, so, for right now, I've made some of the messages a bit generic, in order to try to cover all cases.

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

Created by dolorous on October 1, 2008

PYRDMGIYU5BUMTGRTYHRKD2D7WULYWCVOU46TJ4R5NSVEZVCZTUQC

Dependencies

In channels

main

Change contents

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

B:BD[4.591] → [4.591:656]

                simple_god_message(" did not appreciate that!");

[4.591]

[4.656]

                simple_god_message(" demands, \"Cease your blood-drinking, "
                                   "mortal!\"");

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

B:BD[4.827] → [4.827:892]

                simple_god_message(" did not appreciate that!");

[4.827]

[4.892]

                simple_god_message(" demands, \"Cease your blood-drinking, "
                                   "mortal!\"");

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

B:BD[4.1337] → [4.1337:1402]

                simple_god_message(" did not appreciate that!");

[4.1337]

[4.1402]

                simple_god_message(" demands, \"Cease your unholy ways, "
                                   "mortal!\"");

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

B:BD[3.2894] → [3.2894:2959]

                simple_god_message(" did not appreciate that!");

[3.2894]

[3.2959]

                simple_god_message(" demands, \"Cease your holy ways, "
                                   "mortal!\"");

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

B:BD[6.2722] → [6.2722:2791]

                    simple_god_message(" did not appreciate that!");

[6.2722]

[6.2791]

                    simple_god_message(" demands, \"Cease your dishonourable "
                                       "attack, mortal!\"");

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

B:BD[2.2592] → [2.2592:2657]

                simple_god_message(" did not appreciate that!");

[2.2592]

[2.2657]

                simple_god_message(" demands, \"Cease your attack on the "
                                   "neutral, mortal!\"");

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

B:BD[2.2835] → [2.2835:2900]

                simple_god_message(" did not appreciate that!");

[2.2835]

[2.2900]

                simple_god_message(" demands, \"Cease your attack on the "
                                   "neutral, mortal!\"");

Insertion in crawl-ref/source/religion.cc at line 2300 [5.804403]

[7.182621]

[8.944]

            if (!known)
            {
                simple_god_message(" demands, \"Cease your attack on your "
                                   "ally, mortal!\"");
            }

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

B:BD[5.836899] → [5.836899:836960]

            simple_god_message(" did not appreciate that!");

[5.836899]

[7.183292]

            simple_god_message(" does not appreciate your butchering "
                               "the dead during prayer!");

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

∅:D[9.2538] → [10.396:461]

B:BD[10.396] → [10.396:461]

                simple_god_message(" did not appreciate that!");

[9.2538]

[10.461]

                simple_god_message(" does not appreciate your shedding "
                                   "blood during prayer!");

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

B:BD[11.5895] → [12.2726:2775]

            if (thing_done == DID_CAUSE_GLOWING)

[11.5895]

[12.2775]

            if (!known)
            {
                simple_god_message(" demands, \"Cease your dealings with "
                                   "chaos, mortal!\"");
                break;
            }
            else if (thing_done == DID_CAUSE_GLOWING)

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

B:BD[12.2922] → [12.2922:3064]

                    simple_god_message(" does not appreciate the mutagenic glow "
                                       "surrounding you!");

[12.2922]

[12.3064]

                    simple_god_message(" does not appreciate the mutagenic "
                                       "glow surrounding you!");

Insertion in crawl-ref/source/religion.cc at line 2723 [5.804403]
[12.3140]
[12.3140]

Deletion in crawl-ref/source/religion.cc at line 2726 [5.804403]

B:BD[12.3195] → [12.3195:3238]

∅:D[12.3238] → [11.5919:6021]

B:BD[11.5919] → [11.5919:6021]

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