fiddlerwoaroof/crawl - Change T7WNH6S3VICGMHV7MJ6RHR2YKH75TLMZBOF7SDSE6TOHTIJNT63QC

Add more blessing adjustments, which should make TSO's "friendliness"

and "extended stay" blessings a bit more common.

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

Created by dolorous on April 11, 2008

T7WNH6S3VICGMHV7MJ6RHR2YKH75TLMZBOF7SDSE6TOHTIJNT63QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1154 [6.804403]
B:BD[4.3823] → [5.3484:3540]
∅:D[5.3540] → [7.2509:2552]
B:BD[8.3008] → [7.2509:2552]
```
    // Either remove harmful ailments from a monster...
    if (coinflip() && blessing_balms(mon))
```
[4.3823]
[8.3037]
```
    switch (god)
```
Replacement in crawl-ref/source/religion.cc at line 1156 [6.804403]
B:BD[8.3043] → [8.3043:3110]
∅:D[9.2575] → [8.3177:3186]
∅:D[5.3625] → [8.3177:3186]
B:BD[4.3910] → [8.3177:3186]
∅:D[10.2797] → [11.2900:2906]
∅:D[8.3186] → [11.2900:2906]
∅:D[4.3910] → [11.2900:2906]
∅:D[12.4148] → [11.2900:2906]
B:BD[11.2900] → [11.2900:2906]
B:BD[11.2906] → [13.3394:3415]
```
        result = "divine balms";
        goto blessing_done;
    }
    else
    {
        switch (god)
```
[8.3043]
[11.3120]
```
        case GOD_SHINING_ONE:
```

Replacement in crawl-ref/source/religion.cc at line 1158 [6.804403]

B:BD[11.3130] → [13.3416:3450]

B:BD[13.3450] → [14.2753:2906]

∅:D[14.2906] → [13.3587:3643]

B:BD[13.3587] → [13.3587:3643]

B:BD[13.3643] → [14.2907:3015]

            case GOD_SHINING_ONE:
            {
                // ...make it friendly if it's charmed, optionally
                // extending its stay if it's abjurable.  If neither is
                // possible, deliberately fall through.
                bool friendliness = tso_blessing_friendliness(mon);
                bool more_time = false;

[11.3130]

[14.3015]

            // Make a monster friendly if it's charmed, optionally
            // extending its stay if it's abjurable.  If neither is
            // possible, deliberately fall through.
            bool friendliness = tso_blessing_friendliness(mon);
            bool more_time = false;

Replacement in crawl-ref/source/religion.cc at line 1164 [6.804403]

B:BD[14.3016] → [14.3016:3065]

B:BD[14.3065] → [3.2790:2853]

                if (!friendliness || coinflip())
                    more_time = tso_blessing_extend_stay(mon);

[14.3016]

[14.3164]

            if (!friendliness || coinflip())
                more_time = tso_blessing_extend_stay(mon);

Replacement in crawl-ref/source/religion.cc at line 1167 [6.804403]

B:BD[14.3165] → [14.3165:3324]

∅:D[14.3324] → [13.3902:3947]

B:BD[13.3902] → [13.3902:3947]

B:BD[13.3947] → [14.3325:3417]

                if (friendliness && more_time)
                    result = "friendliness and more time in this world";
                else if (friendliness)
                    result = "friendliness";
                else if (more_time)
                    result = "more time in this world";

[14.3165]

[14.3417]

            if (friendliness && more_time)
                result = "friendliness and more time in this world";
            else if (friendliness)
                result = "friendliness";
            else if (more_time)
                result = "more time in this world";

Replacement in crawl-ref/source/religion.cc at line 1174 [6.804403]

B:BD[14.3418] → [14.3418:3465]

∅:D[14.3465] → [13.3947:3974]

B:BD[13.3947] → [13.3947:3974]

B:BD[13.3974] → [14.3466:3480]

                if (friendliness || more_time)
                    break;
            }

[14.3418]

[11.3243]

            if (friendliness || more_time)
                break;
        }

Replacement in crawl-ref/source/religion.cc at line 1178 [6.804403]

B:BD[11.3244] → [13.3993:4021]

            case GOD_BEOGH:

[11.3244]

[13.4021]

        case GOD_BEOGH:
        {
            // Remove harmful ailments from a monster, or give it full
            // healing, optionally giving it one extra hit point, if
            // possible.
            if (coinflip() && blessing_balms(mon))

Replacement in crawl-ref/source/religion.cc at line 1185 [6.804403]

B:BD[13.4035] → [13.4035:4241]

                // ...or give it full healing, optionally giving it one
                // extra hit point.
                bool healing = blessing_healing(mon, false);
                bool vigour = false;

[13.4035]

[11.3435]

                result = "divine balms";
                goto blessing_done;
            }

Replacement in crawl-ref/source/religion.cc at line 1189 [6.804403]

B:BD[11.3436] → [13.4242:4286]

B:BD[13.4286] → [2.2523:2581]

                if (!healing || coinflip())
                    vigour = blessing_healing(mon, true);

[11.3436]

[13.4407]

            bool healing = blessing_healing(mon, false);
            bool vigour = false;

Replacement in crawl-ref/source/religion.cc at line 1192 [6.804403]

B:BD[13.4408] → [13.4408:4578]

B:BD[13.4578] → [2.2582:2660]

∅:D[2.2660] → [13.4578:4599]

B:BD[13.4578] → [13.4578:4599]

B:BD[13.4599] → [2.2661:2695]

                if (healing && vigour)
                    result = "healing and extra vigour";
                else if (healing)
                    result = "healing";
                else if (vigour)
                    result = "extra vigour";
                else
                    return false;

[13.4408]

[2.2695]

            if (!healing || coinflip())
                vigour = blessing_healing(mon, true);

Replacement in crawl-ref/source/religion.cc at line 1195 [6.804403]

∅:D[2.2696] → [13.4644:4681]

B:BD[13.4644] → [13.4644:4681]

                break;
            }

[2.2696]

[13.4681]

            if (healing && vigour)
                result = "healing and extra vigour";
            else if (healing)
                result = "healing";
            else if (vigour)
                result = "extra vigour";
            else
                return false;

Replacement in crawl-ref/source/religion.cc at line 1204 [6.804403]
B:BD[13.4682] → [13.4682:4726]
```
            default:
                break;
```
[13.4682]
[13.4726]
```
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1206 [6.804403]
[13.4736]
[11.3752]
```
        default:
            break;
```