fiddlerwoaroof/crawl - Change UXYQEI6GLKABRWITOJVAFK5QETIMVRRBJO3DCHFUAC5A6YTVI64QC

Implement reliable protection from harm for Elyvilon (available under

prayer at high enough piety, but with a significant piety cost).

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

Created by dolorous on December 21, 2008

UXYQEI6GLKABRWITOJVAFK5QETIMVRRBJO3DCHFUAC5A6YTVI64QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 26 [5.800304]
[4.281]
[4.281]
```
    HPT_RELIABLE_PRAYING_PLUS_ANYTIME,
```

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

B:BD[2.2497] → [2.2497:2560]

    if (hpt == HPT_PRAYING || hpt == HPT_PRAYING_PLUS_ANYTIME)

[2.2497]

[2.2560]

    if (hpt == HPT_PRAYING || hpt == HPT_PRAYING_PLUS_ANYTIME
        || hpt == HPT_RELIABLE_PRAYING_PLUS_ANYTIME)
    {

Insertion in crawl-ref/source/religion.cc at line 2075 [5.804403]
[2.2583]
[2.2583]
```
    }
```
Insertion in crawl-ref/source/religion.cc at line 6386 [5.804403]
[6.2826]
[7.5708]
```
    bool reliable = (you.piety > 130);
```

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

B:BD[8.2519] → [9.2647:2777]

            return (you.piety >= min_piety) ? HPT_PRAYING_PLUS_ANYTIME
                                            : HPT_ANYTIME;

[8.2519]

[8.2520]

            if (you.piety >= min_piety)
            {
                return (reliable) ? HPT_RELIABLE_PRAYING_PLUS_ANYTIME
                                  : HPT_PRAYING_PLUS_ANYTIME;
            }
            else
                return (HPT_ANYTIME);

Replacement in crawl-ref/source/ouch.cc at line 853 [5.1104358]
B:BD[5.1119161] → [10.1662:1729]
```
        if (dam >= you.hp && god_protects_from_harm(you.religion))
```
[5.1119161]
[5.1119191]
```
        if (dam >= you.hp)
```

Replacement in crawl-ref/source/ouch.cc at line 855 [5.1104358]

B:BD[5.1119201] → [11.2514:2574]

∅:D[11.2574] → [4.1483:1503]

B:BD[4.1483] → [4.1483:1503]

            simple_god_message(" protects you from harm!");
            return;

[5.1119201]

[5.1119911]

            if (harm_protection_type hpt = god_protects_from_harm(you.religion))
            {
                simple_god_message(" protects you from harm!");
                if (you.duration[DUR_PRAYER]
                    && hpt == HPT_RELIABLE_PRAYING_PLUS_ANYTIME)
                {
                    lose_piety(21 + random2(20));
                }
                return;
            }

Replacement in crawl-ref/source/enum.h at line 110 [5.3287960]

B:BD[12.24347] → [3.3503:3556]

    ABIL_RENOUNCE_RELIGION = 250             //  250

[12.24347]

[5.3292139]

    ABIL_HARM_PROTECTION,
    ABIL_HARM_PROTECTION_II,
    ABIL_RENOUNCE_RELIGION = 250            //  250

Insertion in crawl-ref/source/describe.cc at line 3124 [5.3736416]
[5.3955704]
[13.9268]
```
            have_any = true;
```

Replacement in crawl-ref/source/describe.cc at line 3128 [5.3736416]

B:BD[9.2942] → [9.2942:3013]

            if (hpt == HPT_PRAYING || hpt == HPT_PRAYING_PLUS_ANYTIME)

[9.2942]

[13.9365]

            if (hpt == HPT_PRAYING || hpt == HPT_PRAYING_PLUS_ANYTIME
                || hpt == HPT_RELIABLE_PRAYING_PLUS_ANYTIME)
            {

Insertion in crawl-ref/source/describe.cc at line 3132 [5.3736416]
[13.9417]
[13.9417]
```
            }
```

Replacement in crawl-ref/source/describe.cc at line 3142 [5.3736416]

B:BD[4.2292] → [9.3147:3228]

                (hpt == HPT_PRAYING_PLUS_ANYTIME) ? ", especially during prayer"

[4.2292]

[9.3228]

                (hpt == HPT_PRAYING_PLUS_ANYTIME) ? ", especially during prayer" :
                (hpt == HPT_RELIABLE_PRAYING_PLUS_ANYTIME)
                                                  ? ", and always does so during prayer"

Replacement in crawl-ref/source/describe.cc at line 3147 [5.3736416]

∅:D[4.2432] → [14.8043:8072]

B:BD[5.3955704] → [14.8043:8072]

B:BD[14.8072] → [11.2788:2841]

B:BD[11.2841] → [9.3285:3346]

            have_any = true;
            cprintf("%s %s watches over you%s." EOL,
                    god_name(which_god).c_str(), how, when);

[4.2432]

[15.1092]

            std::string buf = god_name(which_god);
            buf += " ";
            buf += how;
            buf += " watches over you";
            buf += when;
            buf += ".";
            _print_final_god_abil_desc(which_god, buf,
                (hpt == HPT_RELIABLE_PRAYING_PLUS_ANYTIME) ?
                    ABIL_HARM_PROTECTION_II : ABIL_HARM_PROTECTION);

Replacement in crawl-ref/source/describe.cc at line 3201 [5.3736416]

B:BD[16.1755] → [3.4987:5128]

            cprintf("You can call upon %s to destroy weapons lying on the "
                    "ground." EOL, god_name(which_god).c_str());

[16.1755]

[5.3956114]

            std::string buf = "You can call upon ";
            buf += god_name(which_god);
            buf += " to destroy weapons lying on the ground.";
            _print_final_god_abil_desc(which_god, buf,
                                       ABIL_ELYVILON_DESTROY_WEAPONS);

Replacement in crawl-ref/source/dat/descript/gods.txt at line 117 [19.575]

B:BD[17.7716] → [18.9852:10129]

The healer god offers followers various means to heal themselves and others, including ones to rid their body from effects surpassing those of simple damage. Elyvilon will occasionally directly intervene to save a follower's life, and is almost certain to do so during prayer.

[17.7716]

[17.7993]

The healer god offers followers various means to heal themselves and others, including ones to rid their body from effects surpassing those of simple damage. Elyvilon will occasionally directly intervene to save a follower's life, and is almost certain to do so during prayer. At high enough piety, the latter becomes certain, but at a cost of piety.

Insertion in crawl-ref/source/abl-show.cc at line 303 [5.4494389]

[5.4503407]

[5.4503482]


    { ABIL_HARM_PROTECTION, "Protection From Harm", 0, 0, 0, 0, ABFLAG_NONE },
    { ABIL_HARM_PROTECTION_II, "Reliable Protection From Harm", 0, 0, 0, 0, ABFLAG_PIETY },

Insertion in crawl-ref/source/abl-show.cc at line 1883 [5.4494389]

[20.9252]

[5.4530159]

        break;
    case ABIL_HARM_PROTECTION:
    case ABIL_HARM_PROTECTION_II:
        // Activated via prayer elsewhere.