fiddlerwoaroof/crawl - Change RJMIPI5VFQSH4UBGVP4KQ6PAUYAJMVUBWJVFVADDUQA2BIFBOJAQC

Display a proper message when TSO's "extended stay" blessing makes a

monster stay permanently.

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

Created by dolorous on May 8, 2008

RJMIPI5VFQSH4UBGVP4KQ6PAUYAJMVUBWJVFVADDUQA2BIFBOJAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 978 [5.804403]
B:BD[3.2703] → [4.4906:4959]
```
static bool _tso_blessing_extend_stay(monsters *mon)
```
[3.2703]
[3.2755]
```
static int _tso_blessing_extend_stay(monsters *mon)
```
Replacement in crawl-ref/source/religion.cc at line 981 [5.804403]
B:BD[3.2791] → [3.2791:2813]
```
        return false;
```
[3.2791]
[3.2813]
```
        return 0;
```
Insertion in crawl-ref/source/religion.cc at line 996 [5.804403]
[6.2691]
[7.2731]
```
    {
```
Insertion in crawl-ref/source/religion.cc at line 998 [5.804403]
[7.2777]
[7.2777]
```
        return 2;
    }
```
Replacement in crawl-ref/source/religion.cc at line 1003 [5.804403]
B:BD[3.2932] → [3.2932:2949]
```
    return true;
```
[3.2904]
[3.2949]
```
    return 1;
```

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

B:BD[6.2803] → [2.4239:4305]

            bool more_time = _tso_blessing_extend_stay(follower);

[6.2803]

[8.2721]

            int more_time = _tso_blessing_extend_stay(follower);

Insertion in crawl-ref/source/religion.cc at line 1269 [5.804403]
[2.4375]
[9.3164]
```
            result = "";
```

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

B:BD[9.3165] → [8.2868:2911]

∅:D[8.2911] → [10.3008:3077]

B:BD[10.3008] → [10.3008:3077]

B:BD[10.3153] → [10.3153:3237]

B:BD[10.3237] → [8.2912:2988]

B:BD[8.2988] → [11.3541:3643]

            if (more_time && friendliness)
                result = "friendliness and more time in this world";
            else if (more_time)
                result = "more time in this world";
            else if (friendliness)
                result = "friendliness";
            else if (force)
                mpr("Couldn't increase monster's friendliness or time.");

[9.3165]

[9.3417]

            if (friendliness)
            {
                result += "friendliness";
                if (more_time)
                    result += " and ";
            }
            if (more_time)
            {
                result += (more_time == 2) ? "permanence in this world"
                                           : "more time in this world";
            }

Insertion in crawl-ref/source/religion.cc at line 1287 [5.804403]

[10.3304]


            if (force)
                mpr("Couldn't increase monster's friendliness or time.");

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

B:BD[12.2696] → [10.3844:4085]

B:BD[10.4085] → [11.3644:3736]

            if (healing && vigour)
                result = "healing and extra vigour";
            else if (healing)
                result = "healing";
            else if (vigour)
                result = "extra vigour";
            else
            {
                if (force)
                    mpr("Couldn't heal monster.");

[12.2696]

[3.4681]

            result = "";

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

B:BD[3.4682] → [11.3737:3767]

                return false;

[3.4682]

[11.3767]

            if (healing)
            {
                result += "healing";
                if (vigour)
                    result += " and ";

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

∅:D[11.3781] → [10.4116:4135]

B:BD[3.4682] → [10.4116:4135]

            break;

[11.3781]

[3.4726]


            if (vigour)
                result += "extra vigour";
            if (healing || vigour)
                break;
            if (force)
                mpr("Couldn't heal monster.");
            return false;

Display a proper message when TSO's "extended stay" blessing makes a

Dependencies

In channels

Change contents

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

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

Insertion in crawl-ref/source/religion.cc at line 996 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 998 [5.804403]

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