fiddlerwoaroof/crawl - Change MPQIZUHUAHOF2CKNTLSYCGMR7FIC3EPA2RHZIY6JOQKAS6H6YY4AC

Elyvilon will now rarely (5% chance) protect allies from harm.

Since this only leaves them with 1 hp, they'll soon be dead anyway, so I consider it as a mixture of flavour and a warning to the player to heal the ally in question. Make the retribution healing hostiles effect only happen if you worship an evil god, as is done for the other retribution effects.

Allow healing to choose a target rather than a direction, but allow Revitalisation (Zin!) to only work on the player. (That's how it was intended, I think.)

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

Created by j-p-e-g on March 22, 2008

MPQIZUHUAHOF2CKNTLSYCGMR7FIC3EPA2RHZIY6JOQKAS6H6YY4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 56 [5.611815]

B:BD[5.613353] → [3.170:233]

int cast_healing(int power, int dir_x = 100, int dir_y = 100);

[5.613353]

[6.5293]

int cast_healing(int power, int target_x = -1, int target_y = -1);

Replacement in crawl-ref/source/spells1.cc at line 629 [5.616635]

B:BD[3.1643] → [3.1643:1716]

static int _healing_spell( int healed, int dir_x = 100, int dir_y = 100)

[3.1643]

[5.626181]

static int _healing_spell( int healed, int target_x = -1, int target_y = -1)

Deletion in crawl-ref/source/spells1.cc at line 632 [5.616635]
B:BD[3.1742] → [3.1742:1743]
∅:D[3.1743] → [5.626183:626277]
B:BD[5.626183] → [5.626183:626277]
```
    int mgr = 0;
    struct monsters *monster = 0;       // NULL {dlb}
    struct dist bmove;
```
Replacement in crawl-ref/source/spells1.cc at line 633 [5.616635]
B:BD[5.626278] → [3.1744:1782]
```
    if (dir_x == 100 || dir_y == 100)
```
[5.626278]
[3.1782]
```
    dist bmove;
    if (target_x == -1 || target_y == -1)
```

Replacement in crawl-ref/source/spells1.cc at line 636 [5.616635]

B:BD[3.1788] → [3.1788:1885]

        mpr("Which direction?", MSGCH_PROMPT);
        direction( bmove, DIR_DIR, TARG_FRIEND );

[3.1788]

[3.1885]

        mpr("Heal whom?", MSGCH_PROMPT);
        direction( bmove, DIR_TARGET, TARG_FRIEND );

Replacement in crawl-ref/source/spells1.cc at line 641 [5.616635]

B:BD[3.1906] → [3.1906:1958]

        bmove.dx = dir_x;
        bmove.dy = dir_y;

[3.1906]

[3.1958]

        bmove.tx = target_x;
        bmove.ty = target_y;

Replacement in crawl-ref/source/spells1.cc at line 646 [5.616635]
∅:D[3.1999] → [5.626368:626392]
B:BD[5.626368] → [5.626368:626392]
```
    if (!bmove.isValid)
```
[3.1999]
[5.626392]
```
    if (!bmove.isValid || !in_bounds(bmove.tx, bmove.ty))
```
Replacement in crawl-ref/source/spells1.cc at line 652 [5.616635]
B:BD[5.626515] → [5.626515:626555]
```
    if (bmove.dx == 0 && bmove.dy == 0)
```
[5.626515]
[5.626555]
```
    if (bmove.tx == you.x_pos && bmove.ty == you.y_pos)
```
Replacement in crawl-ref/source/spells1.cc at line 659 [5.616635]
B:BD[5.626649] → [3.2000:2060]
```
    mgr = mgrd[you.x_pos + bmove.dx][you.y_pos + bmove.dy];
```
[5.626649]
[3.2060]
```
    const int mgr = mgrd[bmove.tx][bmove.ty];
```
Replacement in crawl-ref/source/spells1.cc at line 667 [5.616635]
B:BD[5.626753] → [5.626753:626779]
```
    monster = &menv[mgr];
```
[5.626753]
[3.2066]
```
    monsters *monster = &menv[mgr];
```
Replacement in crawl-ref/source/spells1.cc at line 738 [5.616635]
B:BD[5.627757] → [3.3502:3552]
```
int cast_healing( int pow, int dir_x, int dir_y )
```
[5.627757]
[5.627786]
```
int cast_healing( int pow, int target_x, int target_y )
```

Replacement in crawl-ref/source/spells1.cc at line 743 [5.616635]

B:BD[5.627825] → [3.3553:3629]

    return (_healing_spell( pow + roll_dice( 2, pow ) - 2, dir_x, dir_y ));

[5.627825]

[5.627887]

    return (_healing_spell( pow + roll_dice( 2, pow ) - 2, target_x, target_y ));

Replacement in crawl-ref/source/spells1.cc at line 752 [5.616635]
B:BD[6.5502] → [6.5502:5532]
```
    return cast_healing(pow);
```
[6.5502]
[6.5532]
```
    return cast_healing(pow, you.x_pos, you.y_pos); // target yourself
```

Replacement in crawl-ref/source/religion.cc at line 1437 [5.804403]

B:BD[7.182929] → [7.182929:183024]

        case GOD_ELYVILON:
            penance = level;    // healer god cares more about this

[7.182929]

[7.183024]

        case GOD_ELYVILON: // healer god cares more about this
            if (you.penance[GOD_ELYVILON])
                penance = 1;  // if already under penance smaller bonus
            else
                penance = level;

Insertion in crawl-ref/source/monstuff.cc at line 473 [5.1396662]

[8.4907]

[4.3608]

// Elyvilon will occasionally (5% chance) protect the life of
// one of your allies.
static bool _ely_protects_ally(monsters *monster)
{
    ASSERT(you.religion == GOD_ELYVILON);
    
    if (mons_holiness(monster) != MH_NATURAL
        || !mons_friendly(monster)
        || !one_chance_in(20))
    {
        return (false);
    }
    
    if (player_monster_visible(monster) && mons_near(monster))
    {
        monster->hit_points = 1;
        snprintf(info, INFO_SIZE, " protects %s%s from harm!%s",
                 mons_is_unique(monster->type) ? "" : "your ",
                 monster->name(DESC_PLAIN).c_str(),
                 coinflip() ? "" : "  You feel responsible.");
        simple_god_message(info);
    }
    lose_piety(1);
    
    return (true);
}
// Elyvilon retribution effect: heal hostile monsters that were about to
// be killed by you or one of your friends

Insertion in crawl-ref/source/monstuff.cc at line 504 [5.1396662]
[8.4985]
[8.4985]
```
    ASSERT(you.religion != GOD_ELYVILON);
```

Replacement in crawl-ref/source/monstuff.cc at line 506 [5.1396662]

B:BD[8.5018] → [8.5018:5051]

    ASSERT(you.religion != god);

[8.5018]

[2.2577]


    if (!you.penance[god] || !is_evil_god(you.religion))
        return false;

Deletion in crawl-ref/source/monstuff.cc at line 511 [5.1396662]
B:BD[8.5102] → [8.5102:5131]
```
    ASSERT(ely_penance > 0);
```

Replacement in crawl-ref/source/monstuff.cc at line 565 [5.1396662]

B:BD[9.3783] → [8.6320:6386]

B:BD[8.6386] → [4.3768:3819]

∅:D[4.3819] → [8.6436:6442]

B:BD[8.6436] → [8.6436:6442]

    if (you.religion != GOD_ELYVILON && you.penance[GOD_ELYVILON]
        && _ely_heals_monster(monster, killer, i))
    {

[9.3783]

[8.6442]

    // Elyvilon specials
    if (you.religion == GOD_ELYVILON && _ely_protects_ally(monster))
        return (true);
    if (you.religion != GOD_ELYVILON && _ely_heals_monster(monster, killer, i))

Deletion in crawl-ref/source/monstuff.cc at line 571 [5.1396662]
B:BD[8.6465] → [8.6465:6471]
```
    }
```
Insertion in crawl-ref/source/monstuff.cc at line 572 [5.1396662]
[2.2636]
[10.2542]
```
    // Beogh special
```
Replacement in crawl-ref/source/monstuff.cc at line 574 [5.1396662]
B:BD[10.2568] → [10.2568:2569]
[10.2568]
[10.2569]
```
    
```
Insertion in crawl-ref/source/direct.cc at line 473 [5.3697945]
[11.813]
[11.813]
```
            {
```
Insertion in crawl-ref/source/direct.cc at line 475 [5.3697945]
[11.868]
[11.868]
```
            }
```

Replacement in crawl-ref/source/beam.cc at line 2086 [5.4128068]

B:BD[3.7474] → [3.7474:7556]

                             monster->x - you.x_pos, monster->y - you.y_pos) > 0)

[3.7474]

[3.7556]

                             monster->x, monster->y) > 0)

Elyvilon will now rarely (5% chance) protect allies from harm.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells1.h at line 56 [5.611815]

Replacement in crawl-ref/source/spells1.cc at line 629 [5.616635]

Deletion in crawl-ref/source/spells1.cc at line 632 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 633 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 636 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 641 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 646 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 652 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 659 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 667 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 738 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 743 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 752 [5.616635]

Replacement in crawl-ref/source/religion.cc at line 1437 [5.804403]

Insertion in crawl-ref/source/monstuff.cc at line 473 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 504 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 506 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 511 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 565 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 571 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 572 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 574 [5.1396662]

Insertion in crawl-ref/source/direct.cc at line 473 [5.3697945]

Insertion in crawl-ref/source/direct.cc at line 475 [5.3697945]

Replacement in crawl-ref/source/beam.cc at line 2086 [5.4128068]