fiddlerwoaroof/crawl - Change FBCMCSB4CABB4UNHO2DRM37E3EM7HXKJF33GUGGLIC5WG6SWB4WQC

Fix check for good gods' and Feawn's disliking weapons of chaos so that

it actually works. Note that the first of these is no longer in good_god_hates_item_handling(), as weapons of chaos are only potentially evil. Also, add wands of random effects to the list of potentially evil items, as they might as well be wands of chaos.

Created by David Lawrence Ramsey on October 29, 2009

FBCMCSB4CABB4UNHO2DRM37E3EM7HXKJF33GUGGLIC5WG6SWB4WQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/goditem.h at line 14 [4.3179]
[4.3409]
[4.3409]
```
bool is_potentially_evil_item(const item_def& item);
```
Deletion in crawl-ref/source/goditem.cc at line 19 [4.4997]
B:BD[4.5282] → [4.5282:5283]

Insertion in crawl-ref/source/goditem.cc at line 54 [4.4997]

[4.6013]

bool is_potentially_evil_item(const item_def& item)
{
    switch (item.base_type)
    {
    case OBJ_WEAPONS:
        {
        const int item_brand = get_weapon_brand(item);
        if (item_brand == SPWPN_CHAOS)
            return (true);
        }
        break;
    case OBJ_MISSILES:
        {
        const int item_brand = get_ammo_brand(item);
        if (item_brand == SPMSL_CHAOS)
            return (true);
        }
        break;
    case OBJ_WANDS:
        if (item.sub_type == WAND_RANDOM_EFFECTS)
            return (true);
        break;
    default:
        break;
    }
    return (false);
}

Deletion in crawl-ref/source/goditem.cc at line 100 [4.4997]
B:BD[4.6389] → [4.6389:6390]

Replacement in crawl-ref/source/goditem.cc at line 110 [4.4997]

B:BD[4.6731] → [3.3822:3888]

        retval = is_demonic(item) || item_brand == SPMSL_REAPING;

[4.6731]

[4.6796]

        retval = (item_brand == SPMSL_REAPING);

Insertion in crawl-ref/source/goditem.cc at line 223 [4.4997]
[4.9494]
[4.9494]

Replacement in crawl-ref/source/goditem.cc at line 366 [4.4997]

B:BD[4.12873] → [4.12873:13004]

    if (item_type_known(item)
        || item.base_type == OBJ_WEAPONS
            && get_weapon_brand(item) == SPWPN_CHAOS)
    {

[4.12873]

[4.13004]

    if (item_type_known(item))

Deletion in crawl-ref/source/goditem.cc at line 368 [4.4997]
B:BD[4.13037] → [4.13037:13043]
```
    }
```

Deletion in crawl-ref/source/goditem.cc at line 377 [4.4997]

B:BD[4.13184] → [4.13184:13312]

        if (item_type_known(item) && is_chaotic_item(item))
            return (DID_CHAOS);
        break;
    case GOD_FEAWN:

Replacement in crawl-ref/source/goditem.cc at line 380 [4.4997]

B:BD[4.13383] → [4.13383:13527]

        if (is_evil_item(item)
            || item.base_type == OBJ_WEAPONS
                && get_weapon_brand(item) == SPWPN_CHAOS)
        {

[4.13383]

[4.13527]

        if (is_chaotic_item(item))
            return (DID_CHAOS);
        if (is_potentially_evil_item(item))

Deletion in crawl-ref/source/goditem.cc at line 385 [4.4997]
B:BD[4.13564] → [4.13564:13574]
```
        }
```

Insertion in crawl-ref/source/goditem.cc at line 418 [4.4997]

[4.14352]


        if (is_potentially_evil_item(item))
            return (DID_NECROMANCY);

Insertion in crawl-ref/source/goditem.cc at line 424 [4.4997]

[4.14374]

    case GOD_ELYVILON:
        if (item_type_known(item) && is_potentially_evil_item(item))
            return (DID_NECROMANCY);
        break;

Insertion in crawl-ref/source/goditem.cc at line 443 [4.4997]

[4.14734]

[2.4394]

    case GOD_FEAWN:
        if (item_type_known(item)
            && is_potentially_evil_item(item) || is_evil_item(item))
        {
            return (DID_NECROMANCY);
        }
        break;

Fix check for good gods' and Feawn's disliking weapons of chaos so that

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/goditem.h at line 14 [4.3179]

Deletion in crawl-ref/source/goditem.cc at line 19 [4.4997]

Insertion in crawl-ref/source/goditem.cc at line 54 [4.4997]

Deletion in crawl-ref/source/goditem.cc at line 100 [4.4997]