fiddlerwoaroof/crawl - Change NIWYMEKDSS3KYWQNL2EHD2EEK6FMQXWG3QWIB5OILGIUTR4CXGLAC

Let TSO's blessings properly convert demonic weapons into non-demonic

weapons. Note that demon blades now become scimitars. This will be improved later.

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

Created by dolorous on April 13, 2008

NIWYMEKDSS3KYWQNL2EHD2EEK6FMQXWG3QWIB5OILGIUTR4CXGLAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 918 [4.804403]

B:BD[3.2524] → [3.2524:2576]

    // Convert a demon weapon into a blessed blade.

[3.2524]

[3.2576]

    // Convert demonic weapons into non-demonic weapons.

Replacement in crawl-ref/source/religion.cc at line 920 [4.804403]
B:BD[3.2601] → [3.2601:2643]
```
        wpn.sub_type = WPN_BLESSED_BLADE;
```
[3.2601]
[5.2682]
```
        demonic2nondemonic(wpn);
```

Replacement in crawl-ref/source/religion.cc at line 4161 [4.804403]

B:BD[6.195090] → [2.2567:2628]

                // convert demon weapons into blessed blades

[6.195090]

[2.2628]

                // convert demonic weapons into non-demonic weapons

Replacement in crawl-ref/source/religion.cc at line 4163 [4.804403]

∅:D[2.2674] → [6.195210:195273]

B:BD[6.195210] → [6.195210:195273]

                    you.inv[wpn].sub_type = WPN_BLESSED_BLADE;

[2.2674]

[6.195273]

                    demonic2nondemonic(you.inv[wpn]);

Insertion in crawl-ref/source/itemprop.h at line 664 [6.641567]
[6.644809]
[6.644809]
```
bool  demonic2nondemonic( item_def &item );
```
Replacement in crawl-ref/source/itemprop.cc at line 898 [6.646661]
B:BD[6.672932] → [6.672932:672970]
```
    if (item.base_type != OBJ_ARMOUR 
```
[6.672932]
[6.672970]
```
    if (item.base_type != OBJ_ARMOUR
```
Replacement in crawl-ref/source/itemprop.cc at line 907 [6.646661]
B:BD[6.673118] → [6.673118:673122]
```
// 
```
[6.673118]
[6.673122]
```
//
```

Replacement in crawl-ref/source/itemprop.cc at line 920 [6.646661]

B:BD[6.673341] → [6.673341:673412]

    case ARM_DRAGON_HIDE: 
        item.sub_type = ARM_DRAGON_ARMOUR;

[6.673341]

[6.673412]

    case ARM_DRAGON_HIDE:
        item.sub_type = ARM_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 924 [6.646661]

B:BD[6.673428] → [6.673428:673505]

    case ARM_TROLL_HIDE: 
        item.sub_type = ARM_TROLL_LEATHER_ARMOUR;

[6.673428]

[6.673505]

    case ARM_TROLL_HIDE:
        item.sub_type = ARM_TROLL_LEATHER_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 928 [6.646661]

B:BD[6.673521] → [6.673521:673600]

    case ARM_ICE_DRAGON_HIDE: 
        item.sub_type = ARM_ICE_DRAGON_ARMOUR;

[6.673521]

[6.673600]

    case ARM_ICE_DRAGON_HIDE:
        item.sub_type = ARM_ICE_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 932 [6.646661]

B:BD[6.673616] → [6.673616:673703]

    case ARM_MOTTLED_DRAGON_HIDE: 
        item.sub_type = ARM_MOTTLED_DRAGON_ARMOUR;

[6.673616]

[6.673703]

    case ARM_MOTTLED_DRAGON_HIDE:
        item.sub_type = ARM_MOTTLED_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 936 [6.646661]

B:BD[6.673719] → [6.673719:673802]

    case ARM_STORM_DRAGON_HIDE: 
        item.sub_type = ARM_STORM_DRAGON_ARMOUR;

[6.673719]

[6.673802]

    case ARM_STORM_DRAGON_HIDE:
        item.sub_type = ARM_STORM_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 940 [6.646661]

B:BD[6.673818] → [6.673818:673899]

    case ARM_GOLD_DRAGON_HIDE: 
        item.sub_type = ARM_GOLD_DRAGON_ARMOUR;

[6.673818]

[6.673899]

    case ARM_GOLD_DRAGON_HIDE:
        item.sub_type = ARM_GOLD_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 944 [6.646661]

B:BD[6.673915] → [6.673915:673998]

    case ARM_SWAMP_DRAGON_HIDE: 
        item.sub_type = ARM_SWAMP_DRAGON_ARMOUR;

[6.673915]

[6.673998]

    case ARM_SWAMP_DRAGON_HIDE:
        item.sub_type = ARM_SWAMP_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 948 [6.646661]

B:BD[6.674014] → [6.674014:674097]

    case ARM_STEAM_DRAGON_HIDE: 
        item.sub_type = ARM_STEAM_DRAGON_ARMOUR;

[6.674014]

[6.674097]

    case ARM_STEAM_DRAGON_HIDE:
        item.sub_type = ARM_STEAM_DRAGON_ARMOUR;

Replacement in crawl-ref/source/itemprop.cc at line 1486 [6.646661]

B:BD[6.686149] → [6.686149:686218]

        // these useful objects (we want spriggans and ogre magi to

[6.686149]

[6.686218]

        // these useful objects (we want spriggans and ogre magi to

Replacement in crawl-ref/source/itemprop.cc at line 1494 [6.646661]
B:BD[6.686481] → [6.686481:686499]
```
            else 
```
[6.686481]
[6.686499]
```
            else
```

Replacement in crawl-ref/source/itemprop.cc at line 1539 [6.646661]

B:BD[6.688083] → [6.688083:688149]

    case OBJ_ARMOUR:    // barding and body armours are unwieldy

[6.688083]

[6.688149]

    case OBJ_ARMOUR:    // barding and body armours are unwieldy

Replacement in crawl-ref/source/itemprop.cc at line 1544 [6.646661]
B:BD[6.688315] → [6.688315:688364]
```
            ret = HANDS_TWO;                    
```
[6.688315]
[6.688364]
```
            ret = HANDS_TWO;
```

Insertion in crawl-ref/source/itemprop.cc at line 1599 [6.646661]

[6.689409]

bool demonic2nondemonic( item_def &item )
{
    if (item.base_type != OBJ_WEAPONS)
        return (false);
    switch (item.sub_type)
    {
    default:
        return (false);
    case WPN_DEMON_BLADE:
        item.sub_type = WPN_SCIMITAR;
        break;
    case WPN_DEMON_WHIP:
        item.sub_type = WPN_WHIP;
        break;
    case WPN_DEMON_TRIDENT:
        item.sub_type = WPN_TRIDENT;
        break;
    }
    return (true);
}                               // end demonic2nondemonic()