fiddlerwoaroof/crawl - Change PBKRKGKARGZSLVFVDTK5NWDXQD26NHNN67LDSSB75CLEWBR6TLEQC

Implement evil item sacrifices for TSO: all evil weapons, plus wands of

draining, scrolls of torment, staves of death, rods of demonology, and lanterns of shadows. Expand is_evil_weapon() to cover these, and rename it is_evil_item().

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

Created by dolorous on March 3, 2008

PBKRKGKARGZSLVFVDTK5NWDXQD26NHNN67LDSSB75CLEWBR6TLEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 770 [7.16817]

B:BD[4.954] → [4.954:1004]

                && is_evil_weapon( you.inv[wpn] )

[4.954]

[4.1004]

                && is_evil_item( you.inv[wpn] )

Replacement in crawl-ref/source/religion.h at line 68 [7.800304]
B:BD[8.442] → [4.4910:4953]
```
bool is_evil_weapon(const item_def& weap);
```
[8.442]
[9.161]
```
bool is_evil_item(const item_def& item);
```
Replacement in crawl-ref/source/religion.cc at line 1836 [7.804403]
B:BD[7.849712] → [4.5419:5461]
```
bool is_evil_weapon(const item_def& weap)
```
[7.849712]
[10.215]
```
bool is_evil_item(const item_def& item)
```

Replacement in crawl-ref/source/religion.cc at line 1838 [7.804403]

B:BD[10.217] → [10.217:278]

    if (weap.base_type != OBJ_WEAPONS)
        return false;

[10.217]

[11.750]

    bool retval = false;
    switch (item.base_type)
    {
    case OBJ_WEAPONS:
        {
        int item_brand = get_weapon_brand(item);
        int item_eff = item_special_wield_effect(item);

Replacement in crawl-ref/source/religion.cc at line 1847 [7.804403]

B:BD[11.751] → [12.2495:2540]

B:BD[12.2540] → [6.2495:2547]

    int weap_brand = get_weapon_brand(weap);
    int weap_eff = item_special_wield_effect(weap);

[11.751]

[13.2617]

        retval = (is_demonic(item)
             || item.special == SPWPN_SCEPTRE_OF_ASMODEUS
             || item.special == SPWPN_STAFF_OF_DISPATER
             || item.special == SPWPN_SWORD_OF_CEREBOV
             || item_eff == SPWLD_CURSE
             || item_eff == SPWLD_TORMENT
             || item_eff == SPWLD_ZONGULDROK
             || item_brand == SPWPN_DRAINING
             || item_brand == SPWPN_PAIN
             || item_brand == SPWPN_VAMPIRICISM);
        }
        break;
    case OBJ_WANDS:
        retval = (item.sub_type == WAND_DRAINING);
        break;
    case OBJ_SCROLLS:
        retval = (item.sub_type == SCR_TORMENT);
        break;
    case OBJ_STAVES:
        retval = (item.sub_type == STAFF_DEATH
             || item.sub_type == STAFF_DEMONOLOGY);
        break;
    case OBJ_MISCELLANY:
        retval = (item.sub_type == MISC_LANTERN_OF_SHADOWS);
        break;
    default:
        break;
    }

Replacement in crawl-ref/source/religion.cc at line 1876 [7.804403]

∅:D[13.2618] → [10.279:308]

B:BD[11.751] → [10.279:308]

B:BD[10.308] → [6.2548:2882]

∅:D[6.2882] → [12.2588:2628]

B:BD[12.2588] → [12.2588:2628]

B:BD[12.2628] → [6.2883:2932]

    return (is_demonic(weap)
            || weap.special == SPWPN_SCEPTRE_OF_ASMODEUS
            || weap.special == SPWPN_STAFF_OF_DISPATER
            || weap.special == SPWPN_SWORD_OF_CEREBOV
            || weap_eff == SPWLD_CURSE
            || weap_eff == SPWLD_TORMENT
            || weap_eff == SPWLD_ZONGULDROK
            || weap_brand == SPWPN_DRAINING
            || weap_brand == SPWPN_PAIN
            || weap_brand == SPWPN_VAMPIRICISM);

[13.2618]

[10.447]

    return retval;

Replacement in crawl-ref/source/religion.cc at line 1905 [7.804403]
B:BD[11.1606] → [3.2510:2547]
```
        if (is_evil_weapon(mitm[i]))
```
[11.1606]
[11.1761]
```
        if (is_evil_item(mitm[i]))
```

Replacement in crawl-ref/source/religion.cc at line 3405 [7.804403]

B:BD[14.230] → [14.230:357]

B:BD[14.357] → [11.5300:5328]

    case GOD_ZIN:      case GOD_KIKUBAAQUDGHA: case GOD_OKAWARU:
    case GOD_MAKHLEB:  case GOD_SIF_MUNA:      case GOD_TROG:
    case GOD_NEMELEX_XOBEH:

[14.230]

[14.423]

    case GOD_ZIN:      case GOD_SHINING_ONE:   case GOD_KIKUBAAQUDGHA:
    case GOD_OKAWARU:  case GOD_MAKHLEB:       case GOD_SIF_MUNA:
    case GOD_TROG:     case GOD_NEMELEX_XOBEH:

Replacement in crawl-ref/source/religion.cc at line 3409 [7.804403]

B:BD[14.444] → [14.444:579]

B:BD[14.579] → [11.5329:5352]

        
    case GOD_SHINING_ONE: case GOD_YREDELEMNUL: case GOD_XOM:
    case GOD_VEHUMET:     case GOD_LUGONU:      case GOD_BEOGH:
    case GOD_ELYVILON:

[14.444]

[14.579]


    case GOD_YREDELEMNUL: case GOD_XOM:        case GOD_VEHUMET:
    case GOD_LUGONU:      case GOD_BEOGH:      case GOD_ELYVILON:

Replacement in crawl-ref/source/religion.cc at line 3430 [7.804403]
B:BD[14.1130] → [15.349:358]
```
        
```
[14.1130]
[15.358]
Insertion in crawl-ref/source/religion.cc at line 3434 [7.804403]
[16.2992]
[16.2992]
```
    case GOD_SHINING_ONE:
        return is_evil_item(item);
```

Insertion in crawl-ref/source/religion.cc at line 3679 [7.804403]

[2.4276]

        else if (you.religion == GOD_SHINING_ONE)
            simple_god_message(" only cares about evil items!", you.religion);

Replacement in crawl-ref/source/item_use.cc at line 476 [7.2781507]
B:BD[7.2790062] → [5.2625:2675]
```
        if (is_evil_weapon(you.inv[item_wield_2])
```
[7.2790062]
[7.2790117]
```
        if (is_evil_item(you.inv[item_wield_2])
```

Implement evil item sacrifices for TSO: all evil weapons, plus wands of

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 770 [7.16817]

Replacement in crawl-ref/source/religion.h at line 68 [7.800304]

Replacement in crawl-ref/source/religion.cc at line 1836 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1838 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1847 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1876 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 1905 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3405 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3409 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3430 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 3434 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 3679 [7.804403]

Replacement in crawl-ref/source/item_use.cc at line 476 [7.2781507]