fiddlerwoaroof/crawl - Change 23GQ2RKTWHLYFJIIXYMUUDQK6M3Y6XSR6GPO5S7JZFBIFM7DPOKQC

Clean up TSO's weapon blessing again.

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

Created by dolorous on April 17, 2008

23GQ2RKTWHLYFJIIXYMUUDQK6M3Y6XSR6GPO5S7JZFBIFM7DPOKQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/randart.cc at line 93 [4.893152]

[3.2583]

         if (item.base_type != OBJ_WEAPONS
             || weapon_skill(item) != SK_LONG_BLADES)
         {
             return (false);
         }

Deletion in crawl-ref/source/itemprop.h at line 671 [5.641567]
B:BD[5.644809] → [2.2789:2833]
```
bool  is_unblessed( const item_def &item );
```

Deletion in crawl-ref/source/itemprop.cc at line 1627 [5.646661]

B:BD[5.689409] → [2.2835:2877]

∅:D[2.2877] → [6.3017:3105]

B:BD[6.3017] → [6.3017:3105]

B:BD[6.3105] → [2.2878:3108]

∅:D[2.3108] → [6.3137:3238]

∅:D[7.5799] → [6.3137:3238]

B:BD[6.3137] → [6.3137:3238]

B:BD[6.3238] → [2.3109:3163]

∅:D[2.3163] → [8.2909:2910]

B:BD[9.2686] → [8.2909:2910]

bool is_unblessed( const item_def &item )
{
    if (item.base_type == OBJ_WEAPONS)
    {
        switch (item.sub_type)
        {
        case WPN_FALCHION:
        case WPN_LONG_SWORD:
        case WPN_SCIMITAR:
        case WPN_KATANA:
        case WPN_DEMON_BLADE:
        case WPN_DOUBLE_SWORD:
        case WPN_GREAT_SWORD:
        case WPN_TRIPLE_SWORD:
            return (true);
        default:
            break;
        }
    }
    return (false);
}                               // end is_unblessed()

Replacement in crawl-ref/source/itemprop.cc at line 1653 [5.646661]

B:BD[2.3591] → [2.3591:3668]

    return ((is_unblessed(item) || is_blessed(item)) && !is_artefact(item));

[2.3591]

[8.3371]

    return (!is_artefact(item)
        && (item.base_type == OBJ_WEAPONS
            && (is_demonic(item)
                || weapon_skill(item) == SK_LONG_BLADES)));