fiddlerwoaroof/crawl - Change C2VJXKTIPFZ34C6L6FNCDAGEI7NLTKUXTNB7RN4EYAJCALULIBMQC

A few tweaks of Zin invocations, thanks to David Ramsey.

Donating money will now also affect penance (along with special messages). I just used gain_piety(1) for this - the downside is that now it also respects the slower piety growth of the actual piety gain only happening in 66% (piety > 100) or 33% (piety > 150) of piety leaking in (and out of the pool!)

Zin will provide sustenance even under penance, and Recite trains Invocations now.

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

Created by j-p-e-g on February 1, 2008

C2VJXKTIPFZ34C6L6FNCDAGEI7NLTKUXTNB7RN4EYAJCALULIBMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 747 [4.804403]

B:BD[4.810639] → [5.352:384]

∅:D[5.384] → [6.82:141]

B:BD[6.82] → [6.82:141]

    if (!player_under_penance()
        && (!you.gift_timeout || you.religion == GOD_ZIN))

[4.810639]

[4.810712]

    if (!player_under_penance() && !you.gift_timeout
        || you.religion == GOD_ZIN)

Replacement in crawl-ref/source/religion.cc at line 3337 [4.804403]

B:BD[2.3143] → [2.3143:3210]

        std::string result = god_name(GOD_ZIN) + " will soon be ";

[2.3143]

[2.3210]

        
        you.duration[DUR_PIETY_POOL] += donation_value;
        if (you.duration[DUR_PIETY_POOL] > 500)
            you.duration[DUR_PIETY_POOL] = 500;
        if (you.penance[GOD_ZIN])
        {
            if (estimated_piety >= you.penance[GOD_ZIN])
                mpr("You feel that soon you will be absolved of all your sins.");
            else
                mpr("You feel that soon your burden of sins will be lighter.");
            return;
        }
        std::string result = "You feel that " + god_name(GOD_ZIN)
                             + " will soon be ";

Deletion in crawl-ref/source/religion.cc at line 3369 [4.804403]

∅:D[2.3867] → [7.4322:4475]

B:BD[7.4322] → [7.4322:4475]


        you.duration[DUR_PIETY_POOL] += donation_value;
        if (you.duration[DUR_PIETY_POOL] > 500)
            you.duration[DUR_PIETY_POOL] = 500;

Replacement in crawl-ref/source/acr.cc at line 2695 [4.4397395]
B:BD[7.6622] → [7.6622:6661]
```
        if (you.piety < 200)
        {
```
[7.6622]
[7.6661]
```
        gain_piety(1);
        
```

Replacement in crawl-ref/source/acr.cc at line 2698 [4.4397395]

B:BD[7.6717] → [7.6717:7029]

            mpr("Piety increases by 1 due to piety pool.", MSGCH_DIAGNOSTICS);
#endif
            you.piety++;
        }
#if DEBUG_DIAGNOSTICS || DEBUG_SACRIFICE || DEBUG_PIETY
        else
            mpr("Piety already at maximum and fails to increase "
                "from piety pool.", MSGCH_DIAGNOSTICS);

[7.6717]

[7.7029]

        mpr("Piety increases by 1 due to piety pool.", MSGCH_DIAGNOSTICS);

Insertion in crawl-ref/source/abl-show.cc at line 1322 [4.4494389]

[3.9492]

        
        exercise( SK_INVOCATIONS, (one_chance_in(3)? 2 : 1) );