fiddlerwoaroof/crawl - Change WIGDOFMKXC3UZWMQCZ4235LPYRXPEJBCHQ2LQEPLVPXQNA33I33AC

Clean up bottled efreet handling some more.

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

Created by dolorous on June 9, 2008

WIGDOFMKXC3UZWMQCZ4235LPYRXPEJBCHQ2LQEPLVPXQNA33I33AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/it_use3.cc at line 701 [4.2870456]
B:BD[4.2892077] → [5.2969:3002]
B:BD[5.3002] → [3.3720:3758]
```
    beh_type beha = BEH_HOSTILE;
    unsigned short hitting = MHITYOU;
```
[4.2892077]
[5.3029]
```
    monster_type mon = MONS_EFREET;
```

Replacement in crawl-ref/source/it_use3.cc at line 703 [4.2870456]

B:BD[5.3030] → [5.3030:3163]

    if (you.skills[SK_EVOCATIONS] / 3 + 10 > random2(20))
    {
        beha = BEH_FRIENDLY;
        hitting = you.pet_target;
    }

[5.3030]

[4.2892210]

    const bool friendly =
        (!player_will_anger_monster(mon)
            && you.skills[SK_EVOCATIONS] / 3 + 10 > random2(20));

Replacement in crawl-ref/source/it_use3.cc at line 711 [4.2870456]

B:BD[6.44928] → [6.44928:44997]

            mgen_data( MONS_EFREET, beha, 0, you.pos(), hitting ) );

[6.44928]

[2.4471]

            mgen_data(mon,
                friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                0, you.pos(),
                friendly ? you.pet_target : MHITYOU));

Replacement in crawl-ref/source/it_use3.cc at line 718 [4.2870456]
B:BD[4.2892436] → [7.1379:1418]
```
        monsters *mon = &menv[efreet];
```
[4.2892436]
[8.29597]
```
        mpr("...and a huge efreet comes out.");
```

Replacement in crawl-ref/source/it_use3.cc at line 720 [4.2870456]

∅:D[7.1427] → [4.2892436:2892486]

∅:D[8.29598] → [4.2892436:2892486]

B:BD[4.2892436] → [4.2892436:2892486]

B:BD[4.2892486] → [5.3355:3403]

∅:D[5.3403] → [7.1510:1596]

B:BD[7.1510] → [7.1510:1596]

        mpr( "...and a huge efreet comes out." );
        mpr( (mon->attitude == ATT_FRIENDLY) ?
             "\"Thank you for releasing me!\""
             : "It howls insanely!" );

[8.29598]

[4.2892631]

        mpr(friendly ? "\"Thank you for releasing me!\""
                     : "It howls insanely!");

Replacement in crawl-ref/source/it_use3.cc at line 726 [4.2870456]
B:BD[7.1598] → [8.29599:29653]
```
    dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );
```
[7.1598]
[4.2892687]
```
    dec_inv_item_quantity(you.equip[EQ_WEAPON], 1);
```