fiddlerwoaroof/crawl - Change 4JBNKOYI3VP6BFGDB2QBPMCJ6XLZMGKD5NJDY5IJS6XVHU523GHQC

Smooth out TSO's draining protection to work with fractional piety for

both the raw damage and the experience loss.

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

Created by dolorous on January 20, 2008

4JBNKOYI3VP6BFGDB2QBPMCJ6XLZMGKD5NJDY5IJS6XVHU523GHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 1604 [3.962854]

B:BD[2.2544] → [2.2544:2627]

    if (you.religion == GOD_SHINING_ONE)
    {
        pl += you.piety / 50;
    }

[2.2544]

[3.986081]

    if (you.religion == GOD_SHINING_ONE && you.piety > pl * 50)
        pl = you.piety / 50;

Insertion in crawl-ref/source/ouch.cc at line 189 [3.1104358]

[3.1108787]


        // TSO's protection
        if (you.religion == GOD_SHINING_ONE && you.piety > resist * 50)
        {
            int unhurted = (you.piety * hurted) / 150;
            if (unhurted > hurted)
                unhurted = hurted;

Replacement in crawl-ref/source/ouch.cc at line 198 [3.1104358]

B:BD[3.1108788] → [3.1108788:1108812]

        if (resist > 0)

[3.1108788]

[3.1108822]

            if (unhurted > 0)
                hurted -= unhurted;
        }
        else if (resist > 0)

Replacement in crawl-ref/source/ouch.cc at line 644 [3.1104358]

B:BD[3.1117733] → [3.1117733:1117757]

    if (protection > 0)

[3.1117733]

[3.1117757]

    // TSO's protection
    if (you.religion == GOD_SHINING_ONE && you.piety > protection * 50)
    {
        unsigned long undrained = (you.piety * exp_drained) / 150;
        if (undrained > exp_drained)
            undrained = exp_drained;
        if (undrained > 0)
        {
            simple_god_message(" protects your life force!");
            exp_drained -= undrained;
        }
    }
    else if (protection > 0)

Replacement in crawl-ref/source/describe.cc at line 2530 [3.3736416]

B:BD[2.2854] → [2.2854:3113]

            if (you.piety >= 50)
            {
                const char *how = (you.piety >= 150) ? "carefully" : // l.p. 3
                                  (you.piety >= 100) ? "often" :
                                                       "sometimes";

[2.2854]

[2.3113]

            const char *how = (you.piety >= 150) ? "carefully" : // l.p. 3
                              (you.piety >= 100) ? "often" :
                              (you.piety >=  50) ? "sometimes" :
                                                   "occasionally";

Replacement in crawl-ref/source/describe.cc at line 2535 [3.3736416]

B:BD[2.3114] → [2.3114:3250]

                cprintf("%s %s protects your life force." EOL,
                        god_name(which_god).c_str(), how);
            }

[2.3114]

[2.3250]

            cprintf("%s %s shields you from negative energy." EOL,
                    god_name(which_god).c_str(), how);