fiddlerwoaroof/crawl - Change WLBSQ2ESMTOPKZUFZL6KPKKTRPW5Y2LDJO6F34K6WSNE7H77KFKAC

Implement a hack to differentiate between Ely's self healing and healing

others. I've added a new targetting mode TARG_NOT_SELF that basically just forces the autotargetting to skip the player in favour of the previous target or, failing that, the nearest monster (no matter whether friendly, hostile or neutral). Both types of ability crop up at the same piety point, and the ability letters are changed accordingly (which is likely to wreak havoc on those relying on their finger memory, but makes more sense and is easier to remember in the long run).

I haven't changed/added the ability descriptions. If someone could do that, please?

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

Created by j-p-e-g on April 3, 2009

WLBSQ2ESMTOPKZUFZL6KPKKTRPW5Y2LDJO6F34K6WSNE7H77KFKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 21 [6.611815]

B:BD[5.402] → [5.402:461]

                 const coord_def& where = coord_def(0,0));

[5.402]

[7.170]

                 const coord_def& where = coord_def(0,0),
                 targ_mode_type mode = TARG_NUM_MODES);

Replacement in crawl-ref/source/spells1.cc at line 692 [6.616635]

B:BD[5.575] → [5.575:625]

                          const coord_def& where)

[5.575]

[6.626181]

                          const coord_def& where, targ_mode_type mode)

Insertion in crawl-ref/source/spells1.cc at line 702 [6.616635]

[8.239]

                                      mode != TARG_NUM_MODES ? mode :

Replacement in crawl-ref/source/spells1.cc at line 704 [6.616635]

B:BD[8.308] → [8.308:374]

                                          TARG_ANY : TARG_FRIEND,

[8.308]

[9.5663]

                                            TARG_ANY : TARG_FRIEND,

Replacement in crawl-ref/source/spells1.cc at line 710 [6.616635]
B:BD[10.1906] → [11.35950:35978]
```
        spd.target = where;
```
[10.1906]
[11.35978]
```
        spd.target  = where;
```

Replacement in crawl-ref/source/spells1.cc at line 790 [6.616635]

B:BD[5.1343] → [5.1343:1414]

int cast_healing(int pow, bool divine_ability, const coord_def& where)

[5.1343]

[6.627336]

int cast_healing(int pow, bool divine_ability, const coord_def& where,
                 targ_mode_type mode)

Replacement in crawl-ref/source/spells1.cc at line 794 [6.616635]

B:BD[12.255] → [5.1415:1496]

    return (_healing_spell(pow + roll_dice(2, pow) - 2, divine_ability, where));

[12.255]

[7.732]

    return (_healing_spell(pow + roll_dice(2, pow) - 2, divine_ability, where,
                           mode));

Replacement in crawl-ref/source/religion.cc at line 263 [6.804403]

B:BD[13.2221] → [2.2749:2796]

    { "call upon Elyvilon for lesser healing",

[13.2221]

[13.2267]

    { "call upon Elyvilon for lesser healing of yourself and others",

Replacement in crawl-ref/source/religion.cc at line 265 [6.804403]

B:BD[13.2312] → [2.2797:2845]

      "call upon Elyvilon for greater healing",

[13.2312]

[13.2361]

      "call upon Elyvilon for greater healing of yourself and others",

Replacement in crawl-ref/source/enum.h at line 86 [6.3287960]

B:BD[14.6889] → [15.10541:10593]

    ABIL_ELYVILON_LESSER_HEALING = 220,     //  220

[14.6889]

[6.3291830]

    ABIL_ELYVILON_LESSER_HEALING_SELF = 220, //  220
    ABIL_ELYVILON_LESSER_HEALING_OTHERS,

Replacement in crawl-ref/source/enum.h at line 89 [6.3287960]

B:BD[6.3291862] → [16.4389:4424]

∅:D[16.4424] → [6.3291889:3291920]

B:BD[6.3291889] → [6.3291889:3291920]

    ABIL_ELYVILON_GREATER_HEALING,
    ABIL_ELYVILON_RESTORATION,

[6.3291862]

[17.3416]

    ABIL_ELYVILON_GREATER_HEALING_SELF,
    ABIL_ELYVILON_GREATER_HEALING_OTHERS,
    ABIL_ELYVILON_RESTORATION,              //  225

Replacement in crawl-ref/source/enum.h at line 93 [6.3287960]
∅:D[17.3449] → [18.8778:8830]
∅:D[16.4477] → [18.8778:8830]
B:BD[15.10646] → [18.8778:8830]
```
    ABIL_LUGONU_ABYSS_EXIT,                 //  225
```
[17.3449]
[19.456]
```
    ABIL_LUGONU_ABYSS_EXIT,
```
Replacement in crawl-ref/source/enum.h at line 96 [6.3287960]
B:BD[20.11552] → [20.11552:11577]
```
    ABIL_LUGONU_CORRUPT,
```
[20.11552]
[18.8831]
```
    ABIL_LUGONU_CORRUPT,                    //  230
```
Replacement in crawl-ref/source/enum.h at line 98 [6.3287960]
B:BD[18.8860] → [18.8860:8912]
```
    ABIL_NEMELEX_DRAW_ONE,                  //  230
```
[18.8860]
[21.2742]
```
    ABIL_NEMELEX_DRAW_ONE,
```
Replacement in crawl-ref/source/enum.h at line 101 [6.3287960]
B:BD[22.440] → [21.2770:2798]
```
    ABIL_NEMELEX_MARK_FOUR,
```
[22.440]
[18.8913]
```
    ABIL_NEMELEX_MARK_FOUR,                 //  235
```
Replacement in crawl-ref/source/enum.h at line 103 [6.3287960]
B:BD[18.8942] → [18.8942:8994]
```
    ABIL_BEOGH_SMITING,                     //  235
```
[18.8942]
[18.8994]
```
    ABIL_BEOGH_SMITING,
```
Replacement in crawl-ref/source/enum.h at line 106 [6.3287960]
B:BD[6.3292068] → [23.24328:24347]
```
    ABIL_TRAN_BAT,
```
[24.4313]
[3.2933]
```
    ABIL_TRAN_BAT = 240,
```

Replacement in crawl-ref/source/enum.h at line 108 [6.3287960]

B:BD[3.2959] → [3.2959:3011]

    ABIL_HARM_PROTECTION_II,                //  239

[3.2959]

[25.3566]

    ABIL_HARM_PROTECTION_II,                //  242

Insertion in crawl-ref/source/enum.h at line 1589 [6.3287960]
[6.3329993]
[6.3329993]
```
    TARG_NOT_SELF,
```
Replacement in crawl-ref/source/directn.cc at line 1051 [6.3697945]
∅:D[26.3456] → [27.11059:11113]
B:BD[28.219] → [27.11059:11113]
```
    if (Options.default_target && mode == TARG_ENEMY)
```
[26.3456]
[28.314]
```
    if (Options.default_target && (mode == TARG_ENEMY || mode == TARG_NOT_SELF))
```

Replacement in crawl-ref/source/directn.cc at line 1058 [6.3697945]

∅:D[29.7860] → [27.11255:11332]

B:BD[27.11255] → [27.11255:11332]

                && !mons_friendly(montarget) // not made friendly since then

[29.7860]

[30.45970]

                    // not made friendly since then
                && (mode == TARG_NOT_SELF || !mons_friendly(montarget))

Replacement in crawl-ref/source/directn.cc at line 2007 [6.3697945]
B:BD[31.6103] → [31.6103:6129]
```
    if (mode == TARG_ANY)
```
[31.6103]
[32.40499]
```
    if (mode == TARG_ANY || mode == TARG_NOT_SELF)
```

Replacement in crawl-ref/source/abl-show.cc at line 138 [6.4494389]

B:BD[13.10521] → [13.10521:10585]

B:BD[13.10585] → [16.4956:5020]

    { ABIL_ELYVILON_LESSER_HEALING, ABIL_ELYVILON_PURIFICATION,
      ABIL_ELYVILON_GREATER_HEALING, ABIL_ELYVILON_RESTORATION,

[13.10521]

[16.5020]

    { ABIL_ELYVILON_LESSER_HEALING_SELF, ABIL_ELYVILON_PURIFICATION,
      ABIL_ELYVILON_GREATER_HEALING_SELF, ABIL_ELYVILON_RESTORATION,

Replacement in crawl-ref/source/abl-show.cc at line 265 [6.4494389]

B:BD[33.7405] → [2.4538:4592]

    { ABIL_ELYVILON_LESSER_HEALING, "Lesser Healing",

[33.7405]

[34.4165]

    { ABIL_ELYVILON_LESSER_HEALING_SELF, "Lesser Self-Healing",
      1, 0, 100, generic_cost::range(0, 1), ABFLAG_CONF_OK },
    { ABIL_ELYVILON_LESSER_HEALING_OTHERS, "Lesser Healing",

Replacement in crawl-ref/source/abl-show.cc at line 271 [6.4494389]

B:BD[35.661] → [2.4593:4649]

    { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing",

[35.661]

[16.5114]

    { ABIL_ELYVILON_GREATER_HEALING_SELF, "Greater Self-Healing",
      2, 0, 250, 2, ABFLAG_CONF_OK },
    { ABIL_ELYVILON_GREATER_HEALING_OTHERS, "Greater Healing",

Replacement in crawl-ref/source/abl-show.cc at line 475 [6.4494389]
∅:D[36.4388] → [37.5567:5590]
B:BD[37.5567] → [37.5567:5590]
```
    if ( index != -1 )
```
[36.4388]
[37.5590]
```
    if (index != -1)
```

Replacement in crawl-ref/source/abl-show.cc at line 640 [6.4494389]

B:BD[37.10227] → [37.10227:10266]

    case ABIL_ELYVILON_LESSER_HEALING:

[37.10227]

[38.376]

    case ABIL_ELYVILON_LESSER_HEALING_SELF:
    case ABIL_ELYVILON_LESSER_HEALING_OTHERS:

Replacement in crawl-ref/source/abl-show.cc at line 687 [6.4494389]

B:BD[37.11315] → [16.5220:5260]

    case ABIL_ELYVILON_GREATER_HEALING:

[37.11315]

[38.410]

    case ABIL_ELYVILON_GREATER_HEALING_SELF:
    case ABIL_ELYVILON_GREATER_HEALING_OTHERS:

Replacement in crawl-ref/source/abl-show.cc at line 1687 [6.4494389]

∅:D[39.2899] → [6.4527571:4527610]

∅:D[33.7988] → [6.4527571:4527610]

B:BD[6.4527571] → [6.4527571:4527610]

B:BD[6.4527610] → [5.4172:4246]

    case ABIL_ELYVILON_LESSER_HEALING:
        if (cast_healing(3 + (you.skills[SK_INVOCATIONS] / 6), true) < 0)

[39.2899]

[40.3115]

    case ABIL_ELYVILON_LESSER_HEALING_SELF:
    case ABIL_ELYVILON_LESSER_HEALING_OTHERS:
    {
        const bool self = (abil.ability == ABIL_ELYVILON_LESSER_HEALING_SELF);
        if (cast_healing(3 + (you.skills[SK_INVOCATIONS] / 6), true,
                         self ? you.pos() : coord_def(0,0),
                         self ? TARG_NUM_MODES : TARG_NOT_SELF) < 0)
        {

Insertion in crawl-ref/source/abl-show.cc at line 1696 [6.4494389]
[40.3143]
[6.4527696]
```
        }
```
Replacement in crawl-ref/source/abl-show.cc at line 1700 [6.4494389]
B:BD[6.4527751] → [6.4527751:4527752]
[6.4527751]
[6.4527752]
```
    }
```

Replacement in crawl-ref/source/abl-show.cc at line 1706 [6.4494389]

B:BD[6.4527881] → [16.5455:5495]

B:BD[16.5495] → [5.4247:4322]

    case ABIL_ELYVILON_GREATER_HEALING:
        if (cast_healing(10 + (you.skills[SK_INVOCATIONS] / 3), true) < 0)

[6.4527881]

[40.3144]

    case ABIL_ELYVILON_GREATER_HEALING_SELF:
    case ABIL_ELYVILON_GREATER_HEALING_OTHERS:
    {
        const bool self = (abil.ability == ABIL_ELYVILON_GREATER_HEALING_SELF);
        if (cast_healing(10 + (you.skills[SK_INVOCATIONS] / 3), true,
                         self ? you.pos() : coord_def(0,0),
                         self ? TARG_NUM_MODES : TARG_NOT_SELF) < 0)
        {

Insertion in crawl-ref/source/abl-show.cc at line 1715 [6.4494389]
[40.3172]
[6.4528000]
```
        }
```
Replacement in crawl-ref/source/abl-show.cc at line 1719 [6.4494389]
B:BD[6.4528068] → [6.4528068:4528069]
[6.4528068]
[6.4528069]
```
    }
```
Insertion in crawl-ref/source/abl-show.cc at line 2170 [6.4494389]
[41.12117]
[42.3115]
```
                {
```

Insertion in crawl-ref/source/abl-show.cc at line 2172 [6.4494389]

[42.3179]

[13.10968]

                    if (abil == ABIL_ELYVILON_LESSER_HEALING_SELF)
                    {
                        _add_talent(talents,
                                    ABIL_ELYVILON_LESSER_HEALING_OTHERS,
                                    check_confused);
                    }
                    else if (abil == ABIL_ELYVILON_GREATER_HEALING_SELF)
                    {
                        _add_talent(talents,
                                    ABIL_ELYVILON_GREATER_HEALING_OTHERS,
                                    check_confused);
                    }
                }

Replacement in crawl-ref/source/abl-show.cc at line 2256 [6.4494389]
∅:D[43.16069] → [37.21605:21643]
B:BD[37.21605] → [37.21605:21643]
```
        if ( talents[i].hotkey != 0 )
```
[43.16069]
[37.21643]
```
        if (talents[i].hotkey != 0)
```
Replacement in crawl-ref/source/abl-show.cc at line 2260 [6.4494389]
∅:D[43.16131] → [37.21726:21766]
B:BD[37.21726] → [37.21726:21766]
```
        for ( int k = 51; k >= 0; ++k )
```
[43.16131]
[37.21766]
```
        for (int k = 51; k >= 0; ++k)
```
Replacement in crawl-ref/source/abl-show.cc at line 2266 [6.4494389]
∅:D[43.16198] → [37.21925:21989]
B:BD[37.21925] → [37.21925:21989]
```
            for ( unsigned int j = 0; j < talents.size(); ++j )
```
[43.16198]
[37.21989]
```
            for (unsigned int j = 0; j < talents.size(); ++j)
```

Replacement in crawl-ref/source/abl-show.cc at line 2268 [6.4494389]

B:BD[37.22003] → [37.22003:22052]

                if ( talents[j].hotkey == kkey )

[37.22003]

[37.22052]

                if (talents[j].hotkey == kkey)

Replacement in crawl-ref/source/abl-show.cc at line 2349 [6.4494389]

B:BD[6.4549380] → [36.8160:8240]

∅:D[44.6255] → [45.1251:1270]

∅:D[36.8240] → [45.1251:1270]

B:BD[45.1251] → [45.1251:1270]

            _set_god_ability_helper(god_abilities[you.religion][i], 'a' + num);
            ++num;

[6.4549380]

[6.4549504]

            _set_god_ability_helper(god_abilities[you.religion][i],
                                    'a' + num++);
            if (you.religion == GOD_ELYVILON)
            {
                if (god_abilities[you.religion][i]
                        == ABIL_ELYVILON_LESSER_HEALING_SELF)
                {
                    _set_god_ability_helper(ABIL_ELYVILON_LESSER_HEALING_OTHERS,
                                            'a' + num++);
                }
                else if (god_abilities[you.religion][i]
                            == ABIL_ELYVILON_GREATER_HEALING_SELF)
                {
                    _set_god_ability_helper(ABIL_ELYVILON_GREATER_HEALING_OTHERS,
                                            'a' + num++);
                }
            }

Replacement in crawl-ref/source/abl-show.cc at line 2382 [6.4494389]
∅:D[4.3510] → [44.6291:6333]
∅:D[46.43850] → [44.6291:6333]
B:BD[44.6291] → [44.6291:6333]
```
    for (int slot = 5; slot < 52; slot++)
```
[4.3510]
[35.3694]
```
    const int first_slot = (you.religion == GOD_ELYVILON ? 7 : 5);
    for (int slot = first_slot; slot < 52; slot++)
```
Replacement in crawl-ref/source/abl-show.cc at line 2393 [6.4494389]
∅:D[46.43899] → [44.6381:6423]
B:BD[44.6381] → [44.6381:6423]
```
    for (int slot = 4; slot >= 0; slot--)
```
[46.43899]
[6.4551621]
```
    for (int slot = first_slot - 1; slot >= 0; slot--)
```

Implement a hack to differentiate between Ely's self healing and healing

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells1.h at line 21 [6.611815]

Replacement in crawl-ref/source/spells1.cc at line 692 [6.616635]

Insertion in crawl-ref/source/spells1.cc at line 702 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 704 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 710 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 790 [6.616635]

Replacement in crawl-ref/source/spells1.cc at line 794 [6.616635]

Replacement in crawl-ref/source/religion.cc at line 263 [6.804403]

Replacement in crawl-ref/source/religion.cc at line 265 [6.804403]

Replacement in crawl-ref/source/enum.h at line 86 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 89 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 93 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 96 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 98 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 101 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 103 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 106 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 108 [6.3287960]

Insertion in crawl-ref/source/enum.h at line 1589 [6.3287960]

Replacement in crawl-ref/source/directn.cc at line 1051 [6.3697945]

Replacement in crawl-ref/source/directn.cc at line 1058 [6.3697945]

Replacement in crawl-ref/source/directn.cc at line 2007 [6.3697945]

Replacement in crawl-ref/source/abl-show.cc at line 138 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 265 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 271 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 475 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 640 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 687 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1687 [6.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1696 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1700 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1706 [6.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1715 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1719 [6.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 2170 [6.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 2172 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2256 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2260 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2266 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2268 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2349 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2382 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2393 [6.4494389]