fiddlerwoaroof/crawl - Change CH5FUX3FK3M5A4FUOJMRSG7KP3MOPTBVNK6ZXH7AFLDCBSKW43RAC

Reorder TSO blessings a bit.

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

Created by dolorous on April 23, 2008

CH5FUX3FK3M5A4FUOJMRSG7KP3MOPTBVNK6ZXH7AFLDCBSKW43RAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 882 [6.804403]

[4.2751]

[5.2512]

}
static bool _tso_blessing_holy_wpn(monsters *mon)
{
    // Pick a monster's weapon.
    const int weapon = mon->inv[MSLOT_WEAPON];
    if (weapon == NON_ITEM)
        return false;
    item_def& wpn(mitm[weapon]);
    if (is_artefact(wpn) || get_weapon_brand(wpn) == SPWPN_HOLY_WRATH)
        return false;
    // And make it holy.
    set_equip_desc(wpn, ISFLAG_GLOWING);
    set_item_ego_type(wpn, OBJ_WEAPONS, SPWPN_HOLY_WRATH);
    wpn.colour = YELLOW;
    // Convert demonic weapons into non-demonic weapons.
    if (is_demonic(wpn))
        convert2good(wpn, false);
    return true;

Deletion in crawl-ref/source/religion.cc at line 938 [6.804403]
∅:D[3.2548] → [7.3289:3310]
B:BD[7.3289] → [7.3289:3310]
∅:D[7.3310] → [8.4855:4905]
B:BD[5.2515] → [8.4855:4905]
∅:D[8.4905] → [5.2564:2731]
B:BD[5.2564] → [5.2564:2731]
B:BD[5.2731] → [9.2523:2594]
∅:D[9.2594] → [5.2782:2804]
∅:D[10.2641] → [5.2782:2804]
B:BD[5.2782] → [5.2782:2804]
∅:D[10.2648] → [5.2804:2955]
B:BD[5.2804] → [5.2804:2955]
B:BD[5.2955] → [11.2523:2524]
B:BD[11.2524] → [12.2523:2580]
∅:D[12.2580] → [11.2576:2601]
∅:D[13.2580] → [11.2576:2601]
∅:D[14.2661] → [11.2576:2601]
B:BD[11.2576] → [11.2576:2601]
B:BD[11.2601] → [2.2523:2557]
```
    return true;
}
static bool _tso_blessing_holy_wpn(monsters *mon)
{
    // Pick a monster's weapon.
    const int weapon = mon->inv[MSLOT_WEAPON];
    if (weapon == NON_ITEM)
        return false;
    item_def& wpn(mitm[weapon]);
    if (is_artefact(wpn) || get_weapon_brand(wpn) == SPWPN_HOLY_WRATH)
        return false;
    // And make it holy.
    set_equip_desc(wpn, ISFLAG_GLOWING);
    set_item_ego_type(wpn, OBJ_WEAPONS, SPWPN_HOLY_WRATH);
    wpn.colour = YELLOW;
    // Convert demonic weapons into non-demonic weapons.
    if (is_demonic(wpn))
        convert2good(wpn, false);
```

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

B:BD[5.3052] → [7.3806:3875]

                // Brand a monster's armour with positive energy, if

[5.3052]

[7.3875]

                // Brand a monster's weapon with holy wrath, if

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

B:BD[7.3904] → [7.3904:3953]

                if (_tso_blessing_holy_arm(mon))

[7.3904]

[7.3953]

                if (_tso_blessing_holy_wpn(mon))

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

B:BD[7.3971] → [7.3971:4016]

                    result = "life defence";

[7.3971]

[7.4016]

                    result = "holy attack power";

Insertion in crawl-ref/source/religion.cc at line 1137 [6.804403]
[7.4074]
[7.4074]
```
                break;
```

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

∅:D[7.4075] → [5.3052:3116]

B:BD[5.3052] → [5.3052:3116]

                // Brand a monster's weapon with holy wrath, if

[7.4075]

[5.3116]

                // Brand a monster's armour with positive energy, if

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

B:BD[5.3145] → [8.5257:5306]

                if (_tso_blessing_holy_wpn(mon))

[5.3145]

[5.3193]

                if (_tso_blessing_holy_arm(mon))

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

B:BD[5.3211] → [5.3211:3261]

                    result = "holy attack power";

[5.3211]

[5.3261]

                    result = "life defence";

Deletion in crawl-ref/source/religion.cc at line 1146 [6.804403]
B:BD[5.3319] → [5.3319:3342]
```
                break;
```