fiddlerwoaroof/crawl - Change AROBKQGZEY7IBWUQ6XNGEJQJMI3XB7BXLMX5PHU3L6DWIATCH7EAC

Fix some fallthrough-related bugs in Zin's Revitalisation, and allow

chaining it.

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

Created by dolorous on May 8, 2008

AROBKQGZEY7IBWUQ6XNGEJQJMI3XB7BXLMX5PHU3L6DWIATCH7EAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells1.h at line 57 [7.611815]

[5.243]

[6.170]


void revitalisation_chain(int amount);
void reduce_revitalisation_chain(int amount);

Insertion in crawl-ref/source/spells1.cc at line 761 [7.616635]

[8.869]

[7.627887]

}
void revitalisation_chain(int amount)
{
    if (amount <= 0)
        return;
    const int old_value = you.duration[DUR_REVITALISATION_CHAIN];
    you.duration[DUR_REVITALISATION_CHAIN] += amount;
    if (you.duration[DUR_REVITALISATION_CHAIN] > 15)
        you.duration[DUR_REVITALISATION_CHAIN] = 15;
    if (old_value == 0)
    {
        mpr("Zin magnifies your power of revitalisation!", MSGCH_DURATION);
        you.duration[DUR_REVITALISATION_CHAIN] += 3;
    }
}
void reduce_revitalisation_chain(int amount)
{
    if (you.duration[DUR_REVITALISATION_CHAIN] == 0 || amount <= 0)
        return;
    you.duration[DUR_REVITALISATION_CHAIN] -= amount;
    if (you.duration[DUR_REVITALISATION_CHAIN] <= 0)
    {
        you.duration[DUR_REVITALISATION_CHAIN] = 0;
        mpr("Your vitality returns to normal.", MSGCH_DURATION);
    }

Replacement in crawl-ref/source/spells1.cc at line 797 [7.616635]

B:BD[9.5368] → [6.240:265]

    static int step = 0;

[9.5368]

[6.265]

    const int step_max_chain = 6;
    const int type_max_chain = 4;
    static int step;

Replacement in crawl-ref/source/spells1.cc at line 806 [7.616635]

B:BD[6.358] → [6.358:446]

    // If the step counter has been reset, start from the beginning.
    if (step == 0)

[6.358]

[6.446]

    // If revitalisation chaining is turned off, start from the
    // beginning.
    if (you.duration[DUR_REVITALISATION_CHAIN] == 0)

Replacement in crawl-ref/source/spells1.cc at line 810 [7.616635]

B:BD[6.452] → [6.452:489]

B:BD[6.489] → [10.193:220]

        step_max = std::min(pow, 6);
        type = random2(6);

[6.452]

[6.516]

        step = 0;
        step_max = std::min(pow, step_max_chain);
        type = random2(type_max_chain * 3 / 2);

Insertion in crawl-ref/source/spells1.cc at line 834 [7.616635]

[11.484]

            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 849 [7.616635]

[11.770]

            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 863 [7.616635]

[11.1022]


            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 879 [7.616635]

[11.1275]

            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 894 [7.616635]

[12.330]

            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 908 [7.616635]

[11.1558]


            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 969 [7.616635]

[10.767]

            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 986 [7.616635]

[13.541]

            if (step == step_max)
                break;

Insertion in crawl-ref/source/spells1.cc at line 1003 [7.616635]

[4.598]

            if (step == step_max)
                break;

Replacement in crawl-ref/source/spells1.cc at line 1022 [7.616635]

B:BD[14.1068] → [14.1068:1091]

        // Do nothing.

[14.1068]

[14.1091]

        // Set the step counter to its maximum value to turn off
        // revitalisation chaining.
        step = step_max;

Replacement in crawl-ref/source/spells1.cc at line 1028 [7.616635]

B:BD[14.1113] → [3.171:244]

∅:D[3.244] → [6.938:983]

B:BD[6.938] → [6.938:983]

    // If revitalisation has failed, reset the step counter and get out,
    // indicating failure.
    if (!success)

[14.1113]

[6.983]

    // If revitalisation has succeeded, display an appropriate message.
    if (success)

Replacement in crawl-ref/source/spells1.cc at line 1031 [7.616635]

∅:D[6.989] → [14.1222:1263]

B:BD[14.1222] → [14.1222:1263]

B:BD[14.1263] → [6.990:1032]

        canned_msg(MSG_NOTHING_HAPPENS);
        step = 0;
        return 0;
    }

[6.989]

[14.1263]

        mprf("You feel %s %s.", (step == 0) ? "only nominally" :
                                (step == 1) ? "very slightly" :
                                (step == 2) ? "slightly" :
                                (step == 3) ? "somewhat" :
                                (step == 4) ? "appropriately"
                                            : "impressively",
                                (type == 0) ? "better" :
                                (type == 1) ? "invigorated" :
                                (type == 2) ? "powerful"
                                            : "renewed");

Replacement in crawl-ref/source/spells1.cc at line 1042 [7.616635]

B:BD[14.1264] → [6.1033:1436]

B:BD[6.1436] → [11.1792:1845]

B:BD[11.1845] → [10.1468:1633]

    // If it succeeded, display an appropriate message.
    mprf("You feel %s %s.", (step == 0) ? "only nominally" :
                            (step == 1) ? "very slightly" :
                            (step == 2) ? "slightly" :
                            (step == 3) ? "somewhat" :
                            (step == 4) ? "appropriately"
                                        : "impressively",
                            (type == 0) ? "better" :
                            (type == 1) ? "invigorated" :
                            (type == 2) ? "powerful"
                                        : "renewed");

[14.1264]

[6.1547]

        // The more the step counter has advanced, the greater the piety
        // cost is.
        int loss_amt = step + 1 + (random2(3) - 1);

Replacement in crawl-ref/source/spells1.cc at line 1046 [7.616635]

B:BD[6.1548] → [6.1548:1681]

    // The more the step counter has advanced, the greater the piety
    // cost is.
    int loss_amt = step + 1 + (random2(3) - 1);

[6.1548]

[6.1681]

        if (loss_amt > 0)
            lose_piety(loss_amt);

Replacement in crawl-ref/source/spells1.cc at line 1049 [7.616635]

B:BD[6.1682] → [6.1682:1734]

    if (loss_amt > 0)
        lose_piety(loss_amt);

[6.1682]

[6.1734]

        // Increment the step counter.
        step++;
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);

Replacement in crawl-ref/source/spells1.cc at line 1055 [7.616635]

B:BD[6.1735] → [6.1735:1782]

    // Increment the step counter.
    step++;

[6.1735]

[6.1782]

    // If revitalisation has succeeded, and it hasn't succeeded as far
    // as possible, turn on revitalisation chaining for several turns.
    if (success && step != step_max)
        revitalisation_chain(3);
    // Otherwise, turn off revitalisation chaining.
    else
        reduce_revitalisation_chain(15);

Replacement in crawl-ref/source/spells1.cc at line 1063 [7.616635]

B:BD[6.1783] → [3.245:370]

∅:D[3.370] → [6.1904:2040]

B:BD[6.1904] → [6.1904:2040]

B:BD[6.2040] → [12.509:532]

    // If revitalisation has gone as far as possible, reset the step
    // counter and get out, indicating maximum success.
    if (step == step_max)
    {
        step = 0;
        return step_max;
    }
    // Otherwise, get out, indicating normal success.
    return (step + 1);

[6.1783]

[9.5532]

    return (success) ? (step + 1) : 0;

Insertion in crawl-ref/source/enum.h at line 1103 [7.3287960]
[2.3061]
[15.15103]
```
    DUR_REVITALISATION_CHAIN,
```
Insertion in crawl-ref/source/acr.cc at line 3063 [7.4397395]
[7.4458872]
[16.1269835]
```
    reduce_revitalisation_chain(1);
```