fiddlerwoaroof/crawl - Change PCZU6R5IXBVWZ3TALJJNEBBLWSAVQGFFIMRTILFSCEP76ZD4OLQAC

Properly choose between either TSO's weapon blessing or his armor

blessing.

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

Created by dolorous on April 23, 2008

PCZU6R5IXBVWZ3TALJJNEBBLWSAVQGFFIMRTILFSCEP76ZD4OLQAC

Dependencies

In channels

main

Change contents

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

B:BD[3.3052] → [2.3124:3188]

∅:D[2.3188] → [5.3875:3904]

B:BD[5.3875] → [5.3875:3904]

B:BD[5.3904] → [2.3189:3238]

                // Brand a monster's weapon with holy wrath, if
                // possible.
                if (_tso_blessing_holy_wpn(mon))

[3.3052]

[5.3953]

                if (coinflip())

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

B:BD[5.3971] → [2.3239:3289]

∅:D[2.3289] → [5.4016:4056]

B:BD[5.4016] → [5.4016:4056]

                    result = "holy attack power";
                    goto blessing_done;

[5.3971]

[5.4056]

                    // Brand a monster's weapon with holy wrath, if
                    // possible.
                    if (_tso_blessing_holy_wpn(mon))
                    {
                        result = "holy attack power";
                        goto blessing_done;
                    }

Replacement in crawl-ref/source/religion.cc at line 1130 [4.804403]
B:BD[5.4074] → [2.3290:3313]
∅:D[2.3313] → [5.4074:4075]
B:BD[5.4074] → [5.4074:4075]
B:BD[5.4075] → [2.3314:3383]
∅:D[2.3383] → [3.3116:3145]
B:BD[3.3116] → [3.3116:3145]
B:BD[3.3145] → [2.3384:3433]
```
                break;
                // Brand a monster's armour with positive energy, if
                // possible.
                if (_tso_blessing_holy_arm(mon))
```
[5.4074]
[3.3193]
```
                else
```

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

B:BD[3.3211] → [2.3434:3479]

∅:D[2.3479] → [3.3261:3301]

B:BD[3.3261] → [3.3261:3301]

                    result = "life defence";
                    goto blessing_done;

[3.3211]

[3.3301]

                    // Brand a monster's armour with positive energy, if
                    // possible.
                    if (_tso_blessing_holy_arm(mon))
                    {
                        result = "life defence";
                        goto blessing_done;
                    }

Insertion in crawl-ref/source/religion.cc at line 1140 [4.804403]
[3.3319]
[6.3279]
```
                break;
```