fiddlerwoaroof/crawl - Change KW43PGXTTM57DXUGGBQXJ5G5OYYIY3WB76TXIKL2ZCIJGH7GH4LAC

Allow Elyvilon's invocations to be used even when confused (Eva Myers).

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

Created by dshaligram on March 25, 2007

KW43PGXTTM57DXUGGBQXJ5G5OYYIY3WB76TXIKL2ZCIJGH7GH4LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/enum.h at line 138 [4.3287960]

B:BD[4.3292625] → [4.3292625:3292686]

    ABFLAG_PERMANENT_MP = 0x00000040  // costs permanent MPs

[4.3292625]

[5.447397]

    ABFLAG_PERMANENT_MP = 0x00000040, // costs permanent MPs
    ABFLAG_CONF_OK      = 0x00000080  // can use even if confused.

Replacement in crawl-ref/source/command.cc at line 315 [4.4082507]
B:BD[4.4088619] → [4.4088619:4088650]
```
    if (!generate_abilities())
```
[4.4088619]
[4.4088650]
```
    if (!generate_abilities(false))
```
Replacement in crawl-ref/source/abl-show.h at line 44 [4.4492997]
B:BD[4.4494273] → [4.4494273:4494306]
```
bool generate_abilities( void );
```
[4.4494273]
[2.68156]
```
bool generate_abilities( bool check_conf );
```
Replacement in crawl-ref/source/abl-show.cc at line 85 [4.4494389]
B:BD[4.4496158] → [4.4496158:4496207]
```
static bool insert_ability( int which_ability );
```
[4.4496158]
[3.592]
```
static bool insert_ability( int which_ability, bool check_conf );
```

Replacement in crawl-ref/source/abl-show.cc at line 257 [4.4494389]

B:BD[4.4502598] → [4.4502598:4502991]

    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing", 1, 0, 100, 0, ABFLAG_NONE },
    { ABIL_ELYVILON_PURIFICATION, "Purification", 2, 0, 150, 1, ABFLAG_NONE },
    { ABIL_ELYVILON_HEALING, "Healing", 2, 0, 250, 2, ABFLAG_NONE },
    { ABIL_ELYVILON_RESTORATION, "Restoration", 3, 0, 400, 3, ABFLAG_NONE },
    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 4, ABFLAG_NONE },

[4.4502598]

[6.5169]

    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing", 1, 0, 100, 0,
      ABFLAG_CONF_OK },
    { ABIL_ELYVILON_PURIFICATION, "Purification", 2, 0, 150, 1,
      ABFLAG_CONF_OK },
    { ABIL_ELYVILON_HEALING, "Healing", 2, 0, 250, 2, ABFLAG_CONF_OK },
    { ABIL_ELYVILON_RESTORATION, "Restoration", 3, 0, 400, 3, ABFLAG_CONF_OK },
    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 4,
      ABFLAG_CONF_OK },

Replacement in crawl-ref/source/abl-show.cc at line 310 [4.4494389]
B:BD[2.68295] → [2.68295:68325]
```
    if (generate_abilities())
```
[2.68295]
[2.68325]
```
    if (generate_abilities(false))
```
Replacement in crawl-ref/source/abl-show.cc at line 420 [4.4494389]
B:BD[5.553245] → [5.553245:553275]
```
    if (generate_abilities())
```
[5.553245]
[5.553275]
```
    if (generate_abilities(false))
```
Replacement in crawl-ref/source/abl-show.cc at line 450 [4.4494389]
B:BD[4.4506479] → [4.4506479:4506561]
```
    // early returns prior to generation of ability list {dlb}:
    if (you.conf)
```
[4.4506479]
[4.4506561]
```
    if (you.berserker)
```
Replacement in crawl-ref/source/abl-show.cc at line 452 [4.4494389]
B:BD[4.4506567] → [4.4506567:4506604]
```
        mpr("You're too confused!");
```
[4.4506567]
[4.4506604]
```
        canned_msg(MSG_TOO_BERSERK);
```
Replacement in crawl-ref/source/abl-show.cc at line 456 [4.4494389]
B:BD[4.4506635] → [4.4506635:4506658]
```
    if (you.berserker)
```
[4.4506635]
[4.4506658]
```
    // populate the array of structs {dlb}:
    if (!generate_abilities(false))
```
Replacement in crawl-ref/source/abl-show.cc at line 459 [4.4494389]
B:BD[4.4506664] → [4.4506664:4506701]
```
        canned_msg(MSG_TOO_BERSERK);
```
[4.4506664]
[4.4506701]
```
        mpr("Sorry, you're not good enough to have a special ability.");
```
Replacement in crawl-ref/source/abl-show.cc at line 463 [4.4494389]
B:BD[4.4506732] → [4.4506732:4506807]
```
    // populate the array of structs {dlb}:
    if (!generate_abilities())
```
[4.4506732]
[4.4506807]
```
    if (!generate_abilities(you.conf))
```
Replacement in crawl-ref/source/abl-show.cc at line 465 [4.4494389]
B:BD[4.4506813] → [4.4506813:4506886]
```
        mpr("Sorry, you're not good enough to have a special ability.");
```
[4.4506813]
[4.4506886]
```
        mpr("You're too confused!");
```
Replacement in crawl-ref/source/abl-show.cc at line 1498 [4.4494389]
B:BD[4.4535408] → [4.4535408:4535440]
```
bool generate_abilities( void )
```
[4.4535408]
[4.4535440]
```
bool generate_abilities( bool check_confused )
```

Replacement in crawl-ref/source/abl-show.cc at line 1517 [4.4494389]

B:BD[4.4536061] → [4.4536061:4536111]

        insert_ability( ABIL_MUMMY_RESTORATION );

[4.4536061]

[4.4536111]

        insert_ability( ABIL_MUMMY_RESTORATION, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1525 [4.4494389]
B:BD[4.4536406] → [4.4536406:4536446]
```
        insert_ability( ABIL_GLAMOUR );
```
[4.4536406]
[4.4536446]
```
        insert_ability( ABIL_GLAMOUR, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1531 [4.4494389]

B:BD[4.4536537] → [4.4536537:4536588]

            insert_ability( ABIL_BREATHE_POISON );

[4.4536537]

[4.4536588]

            insert_ability( ABIL_BREATHE_POISON, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1533 [4.4494389]

B:BD[4.4536601] → [4.4536601:4536649]

            insert_ability( ABIL_SPIT_POISON );

[4.4536601]

[4.4536649]

            insert_ability( ABIL_SPIT_POISON, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1537 [4.4494389]
B:BD[4.4536705] → [4.4536705:4536749]
```
        insert_ability( ABIL_SPIT_POISON );
```
[4.4536705]
[4.4536749]
```
        insert_ability( ABIL_SPIT_POISON, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1555 [4.4494389]

B:BD[4.4537578] → [4.4537578:4537621]

                insert_ability( ability );

[4.4537578]

[4.4537621]

                insert_ability( ability, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1563 [4.4494389]
B:BD[4.4537895] → [4.4537895:4537935]
```
        insert_ability( ABIL_MAPPING );
```
[4.4537895]
[4.4537935]
```
        insert_ability( ABIL_MAPPING, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1572 [4.4494389]
B:BD[4.4538272] → [4.4538272:4538312]
```
            insert_ability( ABIL_FLY );
```
[4.4538272]
[4.4538312]
```
            insert_ability( ABIL_FLY, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1574 [4.4494389]
B:BD[4.4538391] → [4.4538391:4538434]
```
            insert_ability( ABIL_FLY_II );
```
[4.4538391]
[4.4538434]
```
            insert_ability( ABIL_FLY_II, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1579 [4.4494389]

B:BD[4.4538517] → [4.4538517:4538568]

        insert_ability( ABIL_SUMMON_MINOR_DEMON );

[4.4538517]

[4.4538568]

        insert_ability( ABIL_SUMMON_MINOR_DEMON, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1582 [4.4494389]
B:BD[4.4538610] → [7.1284023:1284069]
```
        insert_ability( ABIL_SUMMON_DEMONS );
```
[4.4538610]
[4.4538655]
```
        insert_ability( ABIL_SUMMON_DEMONS, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1585 [4.4494389]
B:BD[4.4538697] → [4.4538697:4538738]
```
        insert_ability( ABIL_HELLFIRE );
```
[4.4538697]
[4.4538738]
```
        insert_ability( ABIL_HELLFIRE, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1588 [4.4494389]
B:BD[4.4538779] → [4.4538779:4538819]
```
        insert_ability( ABIL_TORMENT );
```
[4.4538779]
[4.4538819]
```
        insert_ability( ABIL_TORMENT, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1591 [4.4494389]
B:BD[4.4538858] → [4.4538858:4538901]
```
        insert_ability( ABIL_RAISE_DEAD );
```
[4.4538858]
[4.4538901]
```
        insert_ability( ABIL_RAISE_DEAD, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1594 [4.4494389]
B:BD[4.4538944] → [4.4538944:4538990]
```
        insert_ability( ABIL_CONTROL_DEMON );
```
[4.4538944]
[4.4538990]
```
        insert_ability( ABIL_CONTROL_DEMON, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1597 [4.4494389]
B:BD[4.4539030] → [4.4539030:4539077]
```
        insert_ability( ABIL_TO_PANDEMONIUM );
```
[4.4539030]
[4.4539077]
```
        insert_ability( ABIL_TO_PANDEMONIUM, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1600 [4.4494389]
B:BD[4.4539118] → [4.4539118:4539161]
```
        insert_ability( ABIL_CHANNELING );
```
[4.4539118]
[4.4539161]
```
        insert_ability( ABIL_CHANNELING, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1603 [4.4494389]
B:BD[4.4539202] → [4.4539202:4539246]
```
        insert_ability( ABIL_THROW_FLAME );
```
[4.4539202]
[4.4539246]
```
        insert_ability( ABIL_THROW_FLAME, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1606 [4.4494389]
B:BD[4.4539286] → [4.4539286:4539330]
```
        insert_ability( ABIL_THROW_FROST );
```
[4.4539286]
[4.4539330]
```
        insert_ability( ABIL_THROW_FROST, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1609 [4.4494389]

B:BD[4.4539364] → [4.4539364:4539413]

        insert_ability( ABIL_BOLT_OF_DRAINING );

[4.4539364]

[4.4539413]

        insert_ability( ABIL_BOLT_OF_DRAINING, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1612 [4.4494389]

B:BD[4.4539456] → [4.4539456:4539507]

        insert_ability( ABIL_END_TRANSFORMATION );

[4.4539456]

[4.4539507]

        insert_ability( ABIL_END_TRANSFORMATION, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1615 [4.4494389]
B:BD[4.4539542] → [4.4539542:4539580]
```
        insert_ability( ABIL_BLINK );
```
[4.4539542]
[4.4539580]
```
        insert_ability( ABIL_BLINK, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1618 [4.4494389]
B:BD[4.4539625] → [4.4539625:4539671]
```
        insert_ability( ABIL_TELEPORTATION );
```
[4.4539625]
[4.4539671]
```
        insert_ability( ABIL_TELEPORTATION, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1629 [4.4494389]

B:BD[8.10926] → [8.10926:10968]

                    insert_ability(abil);

[8.10926]

[8.10968]

                    insert_ability(abil, check_confused);

Replacement in crawl-ref/source/abl-show.cc at line 1636 [4.4494389]

B:BD[4.4543757] → [4.4543757:4543807]

        insert_ability( ABIL_RENOUNCE_RELIGION );

[4.4543757]

[4.4543807]

        insert_ability( ABIL_RENOUNCE_RELIGION, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1642 [4.4494389]

B:BD[4.4544003] → [4.4544003:4544052]

        insert_ability( ABIL_BREATHE_HELLFIRE );

[4.4544003]

[4.4544052]

        insert_ability( ABIL_BREATHE_HELLFIRE, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1647 [4.4494389]
B:BD[4.4544204] → [4.4544204:4544249]
```
        insert_ability( ABIL_BREATHE_FIRE );
```
[4.4544204]
[4.4544249]
```
        insert_ability( ABIL_BREATHE_FIRE, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1653 [4.4494389]

B:BD[4.4544358] → [4.4544358:4544407]

        insert_ability( ABIL_DELAYED_FIREBALL );

[4.4544358]

[4.4544407]

        insert_ability( ABIL_DELAYED_FIREBALL, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1658 [4.4494389]
B:BD[4.4544478] → [4.4544478:4544522]
```
        insert_ability( ABIL_EVOKE_BLINK );
```
[4.4544478]
[4.4544522]
```
        insert_ability( ABIL_EVOKE_BLINK, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1661 [4.4494389]
B:BD[4.4544587] → [4.4544587:4544633]
```
        insert_ability( ABIL_EVOKE_BERSERK );
```
[4.4544587]
[4.4544633]
```
        insert_ability( ABIL_EVOKE_BERSERK, check_confused );
```
Replacement in crawl-ref/source/abl-show.cc at line 1664 [4.4494389]
B:BD[4.4544672] → [4.4544672:4544718]
```
        insert_ability( ABIL_EVOKE_MAPPING );
```
[4.4544672]
[4.4544718]
```
        insert_ability( ABIL_EVOKE_MAPPING, check_confused );
```

Replacement in crawl-ref/source/abl-show.cc at line 1674 [4.4494389]

B:BD[4.4545070] → [4.4545070:4545125]

            insert_ability( ABIL_EVOKE_TURN_VISIBLE );

[4.4545070]

[4.4545125]

            insert_ability( ABIL_EVOKE_TURN_VISIBLE, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1676 [4.4494389]

B:BD[4.4545138] → [4.4545138:4545195]

            insert_ability( ABIL_EVOKE_TURN_INVISIBLE );

[4.4545138]

[4.4545195]

            insert_ability( ABIL_EVOKE_TURN_INVISIBLE, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1690 [4.4494389]

B:BD[4.4545733] → [4.4545733:4545791]

            insert_ability( ABIL_EVOKE_STOP_LEVITATING );

[4.4545733]

[4.4545791]

            insert_ability( ABIL_EVOKE_STOP_LEVITATING, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1692 [4.4494389]

B:BD[4.4545804] → [4.4545804:4545855]

            insert_ability( ABIL_EVOKE_LEVITATE );

[4.4545804]

[4.4545855]

            insert_ability( ABIL_EVOKE_LEVITATE, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1698 [4.4494389]

B:BD[4.4545967] → [4.4545967:4546019]

        insert_ability( ABIL_EVOKE_TELEPORTATION );

[4.4545967]

[4.4546019]

        insert_ability( ABIL_EVOKE_TELEPORTATION, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 1833 [4.4494389]
B:BD[4.4551089] → [4.4551089:4551138]
```
static bool insert_ability( int which_ability ) 
```
[4.4551089]
[4.4551138]
```
static bool insert_ability( int which_ability, bool check_conf ) 
```

Insertion in crawl-ref/source/abl-show.cc at line 1848 [4.4494389]

[4.4551550]

    if (check_conf)
    {
        const ability_def &abil = get_ability_def(which_ability);
        if (you.conf && !testbits(abil.flags, ABFLAG_CONF_OK))
            return (false);
    }

Allow Elyvilon's invocations to be used even when confused (Eva Myers).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/enum.h at line 138 [4.3287960]

Replacement in crawl-ref/source/command.cc at line 315 [4.4082507]

Replacement in crawl-ref/source/abl-show.h at line 44 [4.4492997]

Replacement in crawl-ref/source/abl-show.cc at line 85 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 257 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 310 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 420 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 450 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 452 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 456 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 459 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 463 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 465 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1498 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1517 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1525 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1531 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1533 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1537 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1555 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1563 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1572 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1574 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1579 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1582 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1585 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1588 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1591 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1594 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1597 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1600 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1603 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1606 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1609 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1612 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1615 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1618 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1629 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1636 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1642 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1647 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1653 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1658 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1661 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1664 [4.4494389]