fiddlerwoaroof/crawl - Change RDI4NCN6HNXSCI7SQWBOAIEXOVQYPM7E4QK5G2A3Z6HFB6OTDA2AC

Don't allow the branding blessings to override existing brands, unless

they're brands the blessing god doesn't like.

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

Created by dolorous on April 23, 2008

RDI4NCN6HNXSCI7SQWBOAIEXOVQYPM7E4QK5G2A3Z6HFB6OTDA2AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 893 [3.804403]
[2.2743]
[2.2743]
```
    const int wpn_brand = get_weapon_brand(wpn);
```

Replacement in crawl-ref/source/religion.cc at line 896 [3.804403]

B:BD[2.2744] → [2.2744:2815]

    if (is_artefact(wpn) || get_weapon_brand(wpn) == SPWPN_HOLY_WRATH)

[2.2744]

[2.2815]

    // Override certain brands.
    if (is_artefact(wpn)
        || (wpn_brand != SPWPN_NORMAL && wpn_brand != SPWPN_DRAINING
            && wpn_brand != SPWPN_PAIN && wpn_brand != SPWPN_VAMPIRICISM
            && wpn_brand != SPWPN_VENOM))
    {

Insertion in crawl-ref/source/religion.cc at line 903 [3.804403]
[2.2837]
[2.2837]
```
    }
```

Replacement in crawl-ref/source/religion.cc at line 939 [3.804403]

B:BD[4.3009] → [4.3009:3088]

    if (is_artefact(arm) || get_armour_ego_type(arm) == SPARM_POSITIVE_ENERGY)

[4.3009]

[4.3088]

    const int arm_brand = get_armour_ego_type(arm);
    // Override certain brands.
    if (is_artefact(arm) || arm_brand != SPARM_NORMAL)

Insertion in crawl-ref/source/religion.cc at line 1056 [3.804403]
[4.3532]
[4.3532]
```
    const int wpn_brand = get_weapon_brand(wpn);
```

Replacement in crawl-ref/source/religion.cc at line 1059 [3.804403]

B:BD[4.3533] → [4.3533:3607]

    if (is_artefact(wpn) || get_weapon_brand(wpn) == SPWPN_ELECTROCUTION)

[4.3533]

[4.3607]

    // Override certain brands.
    if (is_artefact(wpn)
        || (wpn_brand != SPWPN_NORMAL && wpn_brand != SPWPN_ORC_SLAYING))
    {

Insertion in crawl-ref/source/religion.cc at line 1064 [3.804403]
[4.3629]
[4.3629]
```
    }
```

Don't allow the branding blessings to override existing brands, unless

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 893 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 896 [3.804403]

Insertion in crawl-ref/source/religion.cc at line 903 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 939 [3.804403]

Insertion in crawl-ref/source/religion.cc at line 1056 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 1059 [3.804403]

Insertion in crawl-ref/source/religion.cc at line 1064 [3.804403]