fiddlerwoaroof/crawl - Change ZYBZFZJRHBI7IMLOY7S4BXLJAMOXPK6GWLD2SKWT7S6O26OIYQPQC

Fix 2496474: Bardings melding into centaurs.

Fix 2496520: Quivered weapons getting displayed as melded.

Also, summoned monsters can no longer be affected by vampiric draining (spell or brand, vampire bite was already disallowed).

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

Created by j-p-e-g on January 11, 2009

ZYBZFZJRHBI7IMLOY7S4BXLJAMOXPK6GWLD2SKWT7S6O26OIYQPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 180 [7.143977]

B:BD[6.987] → [6.987:1061]

                if (you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS])

[6.987]

[6.1061]

                if (you.inv[arm].sub_type == ARM_BOOTS // i.e. not barding
                    && (you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS]))
                {

Insertion in crawl-ref/source/transfor.cc at line 184 [7.143977]
[6.1102]
[6.1102]
```
                }
```
Replacement in crawl-ref/source/tilereg.cc at line 1402 [8.54399]
B:BD[8.96227] → [8.96227:96240]
```
        else
```
[8.96227]
[8.96240]
```
        else // in inventory
```
Replacement in crawl-ref/source/tilereg.cc at line 1404 [8.54399]
B:BD[8.96250] → [8.96250:96291]
```
            describe_item(you.inv[idx]);
```
[8.96250]
[2.400]
```
            describe_item(you.inv[idx], true);
```

Replacement in crawl-ref/source/spells2.cc at line 794 [7.569242]

B:BD[7.595281] → [3.686:733]

        if (mons_res_negative_energy(monster))

[7.595281]

[3.733]

        if (mons_res_negative_energy(monster) || mons_is_summoned(monster))

Replacement in crawl-ref/source/player.cc at line 658 [7.962854]

B:BD[9.4521] → [9.4521:4559]

        if (item.sub_type == ARM_CAP)

[9.4521]

[9.4559]

        if (item.sub_type == ARM_NAGA_BARDING)
            return (you.species == SP_NAGA && you_tran_can_wear(EQ_BOOTS));
        else if (item.sub_type == ARM_CENTAUR_BARDING)
            return (you.species == SP_CENTAUR && you_tran_can_wear(EQ_BOOTS));
        if (item.sub_type == ARM_CAP || item.sub_type == ARM_WIZARD_HAT)

Insertion in crawl-ref/source/player.cc at line 666 [7.962854]

[9.4639]

            // All but these transformations can wear hats/caps.

Insertion in crawl-ref/source/output.cc at line 1731 [7.1088282]

[10.3221]

[4.7277]

            const bool not_melded = player_wearing_slot(e_order[i]);

Replacement in crawl-ref/source/output.cc at line 1735 [7.1088282]

B:BD[4.7364] → [4.7364:7483]

                player_wearing_slot(e_order[i]) ?
                    colour_to_str(item.colour).c_str() : "darkgrey";

[4.7364]

[4.7483]

                not_melded ? colour_to_str(item.colour).c_str()
                           : "darkgrey";

Replacement in crawl-ref/source/output.cc at line 1745 [7.1088282]

B:BD[11.3932] → [4.7538:7610]

                     !player_wearing_slot(e_order[i]) ? "melded " : "",

[11.3932]

                     not_melded ? "" : "melded ",

Replacement in crawl-ref/source/itemname.cc at line 235 [7.2667494]

B:BD[7.2680932] → [5.4205:4282]

        if (!you_tran_can_wear(*this) && you.equip[EQ_WEAPON] != this->link)

[7.2680932]

[9.6250]

        if (!you_tran_can_wear(*this) && you.equip[EQ_WEAPON] != this->link
            && this->link != you.m_quiver->get_fire_item())
        {

Insertion in crawl-ref/source/itemname.cc at line 239 [7.2667494]
[9.6283]
[9.6283]
```
        }
```
Insertion in crawl-ref/source/fight.cc at line 1850 [7.3140790]
[12.551]
[13.672]
```
            && !mons_is_summoned(def)
```