fiddlerwoaroof/crawl - Change ZXIBXDEOAA63LSBMDRGA3IBYXYLFFWX2JMV2SEJTKK3XLJIQNGPQC

Fix debugging ray zaps (e.g. unknown wands) always setting obvious_effect by

making ZAP_DEBUGGING_RAY no longer an obvious_effect. It might be more correct to restore obvious_effect on a tracer, or at least a player_tracer, but bug 2515082 [and r8500] makes me cautious. Fix healing being too generously identified. Fix wand of healing not working on enemies if you happen to worship Ely. Fixes [2580106]. Also some dead code elimination.

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

Created by haranp on February 8, 2009

ZXIBXDEOAA63LSBMDRGA3IBYXYLFFWX2JMV2SEJTKK3XLJIQNGPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1753 [6.293070]
B:BD[5.10162] → [5.10162:10192]
```
        if (!cast_healing(5))
```
[5.10162]
[5.10192]
```
        if (cast_healing(5) < 0)
```
Replacement in crawl-ref/source/spl-cast.cc at line 1758 [6.293070]
B:BD[5.10259] → [5.10259:10290]
```
        if (!cast_healing(25))
```
[5.10259]
[7.3421]
```
        if (cast_healing(25) < 0)
```

Deletion in crawl-ref/source/spells1.h at line 19 [6.611815]

B:BD[6.612133] → [6.612133:612340]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */

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

∅:D[8.177] → [6.613135:613353]

B:BD[6.613135] → [6.613135:613353]

B:BD[6.613353] → [2.272:340]


// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */
int cast_healing(int pow, const coord_def& where = coord_def(0,0));

[6.612373]

[9.170]

int cast_healing(int pow, bool divine_ability = false,
                 const coord_def& where = coord_def(0,0));

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

B:BD[10.1643] → [4.279:354]

static int _healing_spell(int healed, const coord_def where = coord_def())

[10.1643]

[6.626181]

// Returns: 1 -- success, 0 -- failure, -1 -- cancel
static int _healing_spell(int healed, bool divine_ability,
                          const coord_def& where)

Replacement in crawl-ref/source/spells1.cc at line 727 [6.616635]
∅:D[11.468] → [12.248:268]
B:BD[13.159114] → [12.248:268]
```
        return (0);
```
[14.379]
[6.626514]
```
        return (-1);
```
Deletion in crawl-ref/source/spells1.cc at line 735 [6.616635]
B:BD[6.626648] → [6.626648:626649]
B:BD[6.626649] → [15.36058:36096]
```
    const int mgr = mgrd(spd.target);
```
Replacement in crawl-ref/source/spells1.cc at line 736 [6.616635]
∅:D[16.176] → [6.626649:626677]
∅:D[10.2065] → [6.626649:626677]
B:BD[6.626649] → [6.626649:626677]
```
    if (mgr == NON_MONSTER)
```
[16.176]
[6.626677]
```
    monsters* monster = monster_at(spd.target);
    if (!monster)
```

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

B:BD[6.626727] → [12.290:311]

        return (-1);

[6.626727]

[6.626746]

        // This isn't a cancel, to avoid leaking invisible monster
        // locations.
        return (0);

Deletion in crawl-ref/source/spells1.cc at line 744 [6.616635]
B:BD[6.626752] → [6.626752:626753]
B:BD[6.626753] → [17.693:729]
```
    monsters *monster = &menv[mgr];
```

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

B:BD[16.178] → [12.312:358]

∅:D[12.358] → [18.210:289]

B:BD[10.2114] → [18.210:289]

    // Don't heal a monster you can't pacify.
    if (you.religion == GOD_ELYVILON && !_can_pacify_monster(monster, healed))

[16.178]

[10.2227]

    // Don't divinely heal a monster you can't pacify.
    if (divine_ability
        && you.religion == GOD_ELYVILON
        && !_can_pacify_monster(monster, healed))

Replacement in crawl-ref/source/spells1.cc at line 751 [6.616635]
B:BD[10.2274] → [12.359:380]
```
        return (-1);
```
[10.2274]
[10.2293]
```
        return (0);
```
Replacement in crawl-ref/source/spells1.cc at line 754 [6.616635]
B:BD[6.626780] → [10.2300:2333]
```
    bool nothing_happens = true;
```
[6.626780]
[6.626780]
```
    bool did_something = false;
```
Insertion in crawl-ref/source/spells1.cc at line 757 [6.616635]
[6.626832]
[19.1206]
```
        did_something = true;
```

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

B:BD[10.2432] → [10.2432:2514]

            simple_god_message(" appreciates the healing of a fellow creature.");

[10.2432]

[10.2514]

            simple_god_message(" appreciates the healing "
                               "of a fellow creature.");

Deletion in crawl-ref/source/spells1.cc at line 771 [6.616635]
B:BD[10.2579] → [12.381:405]
```
            return (1);
```
Deletion in crawl-ref/source/spells1.cc at line 772 [6.616635]
B:BD[20.665] → [12.406:407]
∅:D[12.407] → [10.2602:2635]
B:BD[20.665] → [10.2602:2635]
```
        nothing_happens = false;
```
Insertion in crawl-ref/source/spells1.cc at line 776 [6.616635]
[6.627176]
[10.2706]
```
        did_something = true;
```
Replacement in crawl-ref/source/spells1.cc at line 792 [6.616635]
B:BD[6.627223] → [10.3213:3243]
```
    else if (nothing_happens)
```
[6.627223]
[10.3243]
```
    if (!did_something)
```
Replacement in crawl-ref/source/spells1.cc at line 796 [6.616635]
B:BD[6.627224] → [12.516:532]
```
    return (1);
```
[6.627224]
[14.476]
```
    return (did_something ? 1 : 0);
```

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

B:BD[6.627294] → [6.627294:627336]

#if 0
char cast_lesser_healing( int pow )

[6.627294]

[6.627336]

// Returns: 1 -- success, 0 -- failure, -1 -- cancel
int cast_healing(int pow, bool divine_ability, const coord_def& where)

Deletion in crawl-ref/source/spells1.cc at line 802 [6.616635]
B:BD[6.627338] → [10.3342:3393]
∅:D[10.3393] → [6.627442:627482]
B:BD[6.627442] → [6.627442:627482]
B:BD[6.627482] → [10.3394:3447]
∅:D[10.3447] → [6.627594:627635]
B:BD[6.627594] → [6.627594:627635]
B:BD[6.627635] → [10.3448:3501]
B:BD[10.3501] → [16.183:190]
∅:D[16.190] → [6.627756:627757]
B:BD[6.627756] → [6.627756:627757]
B:BD[6.627757] → [15.36097:36147]
∅:D[21.225] → [6.627786:627788]
∅:D[17.786] → [6.627786:627788]
∅:D[10.3552] → [6.627786:627788]
∅:D[15.36147] → [6.627786:627788]
∅:D[13.159143] → [6.627786:627788]
B:BD[6.627786] → [6.627786:627788]
```
    return _healing_spell(5 + random2avg(7, 2));
}
char cast_greater_healing( int pow )
{
    return _healing_spell(15 + random2avg(29, 2));
}
char cast_greatest_healing( int pow )
{
    return _healing_spell(50 + random2avg(49, 2));
}
#endif
int cast_healing(int pow, const coord_def& where)
{
```
Replacement in crawl-ref/source/spells1.cc at line 803 [6.616635]
∅:D[21.255] → [6.627824:627825]
B:BD[6.627824] → [6.627824:627825]
B:BD[6.627825] → [15.36148:36213]
```
    return (_healing_spell(pow + roll_dice(2, pow) - 2, where));
```
[21.255]
[9.732]
```
    return (_healing_spell(pow + roll_dice(2, pow) - 2, divine_ability, where));
```
Replacement in crawl-ref/source/beam.cc at line 918 [6.4128068]
B:BD[22.19716] → [22.19716:19730]
```
        true,
```
[22.19716]
[22.19730]
```
        false,
```

Replacement in crawl-ref/source/beam.cc at line 4846 [6.4128068]

B:BD[3.62239] → [3.62239:62304]

            if (cast_healing(5 + damage.roll(), mon->pos()) > 0)

[3.62239]

[3.62304]

            if (cast_healing(5 + damage.roll(), false, mon->pos()) > 0)

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

B:BD[6.4527610] → [23.5300:5365]

        if (!cast_healing(3 + (you.skills[SK_INVOCATIONS] / 6)))

[6.4527610]

[24.3115]

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

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

B:BD[23.5495] → [23.5495:5561]

        if (!cast_healing(10 + (you.skills[SK_INVOCATIONS] / 3)))

[23.5495]

[24.3144]

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

Fix debugging ray zaps (e.g. unknown wands) always setting obvious_effect by

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1753 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1758 [6.293070]

Deletion in crawl-ref/source/spells1.h at line 19 [6.611815]

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

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

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

Deletion in crawl-ref/source/spells1.cc at line 735 [6.616635]

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

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

Deletion in crawl-ref/source/spells1.cc at line 744 [6.616635]

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

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

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

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

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

Deletion in crawl-ref/source/spells1.cc at line 771 [6.616635]

Deletion in crawl-ref/source/spells1.cc at line 772 [6.616635]

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

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

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

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

Deletion in crawl-ref/source/spells1.cc at line 802 [6.616635]

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

Replacement in crawl-ref/source/beam.cc at line 918 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4846 [6.4128068]

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

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