fiddlerwoaroof/crawl - Change QDBILCQHREAKSVXBJJGE2EPNR4ATTQWUZMV7BLJYZWWUI737TSKQC

Add Ely's pacifying monsters effect:

When a follower of Elyvilon attempts to heal a hostile monster (via ability or wand) there's a chance, depending on the healing value, max monster hp and monster type, that Ely will make that monster become neutral. If this happens, Ely hands out a bit of piety and his follower gains half of the monster's xp value.

If the pacifying attempt fails, the monster is never healed, though you still lose your ressources (mana, piety, charges).

Killing neutral monsters currently means you won't get any xp. Also, Ely dislikes this and hands out penance for doing so.

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

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

QDBILCQHREAKSVXBJJGE2EPNR4ATTQWUZMV7BLJYZWWUI737TSKQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 56 [4.611815]
B:BD[4.613353] → [5.152524:152553]
```
int cast_healing(int power);
```
[4.613353]
[6.5293]
```
int cast_healing(int power, int dir_x = 100, int dir_y = 100);
```
Insertion in crawl-ref/source/spells1.cc at line 45 [4.616635]
[7.175]
[4.617597]
```
#include "religion.h"
```
Replacement in crawl-ref/source/spells1.cc at line 575 [4.616635]
∅:D[5.158990] → [4.625891:625943]
B:BD[4.625891] → [4.625891:625943]
```
}                               // end cast_big_c()
```
[5.158990]
[4.625943]
```
}
```
Replacement in crawl-ref/source/spells1.cc at line 582 [4.616635]
∅:D[8.2345] → [4.626089:626140]
∅:D[9.4324] → [4.626089:626140]
∅:D[10.5039] → [4.626089:626140]
B:BD[4.626089] → [4.626089:626140]
```
}                               // end big_cloud()
```
[9.4324]
[4.626140]
```
}
```

Replacement in crawl-ref/source/spells1.cc at line 584 [4.616635]

B:BD[4.626141] → [5.158991:159030]

static int healing_spell( int healed )

[4.626141]

[4.626181]

static bool _mons_hostile(const monsters *mon)
{
    // needs to be done this way because of friendly/neutral enchantments
    return (!mons_friendly(mon) && !mons_neutral(mon));
}
static bool _can_pacify_monster(const monsters *mon, const int healed)
{
    ASSERT(you.religion == GOD_ELYVILON);
    if (healed < 1)
        return false;
    if (mons_friendly(mon) || mons_neutral(mon))
        return false;
    // Ely only cares about natural monsters
    if (mons_holiness(mon) != MH_NATURAL)
        return false;
    if (mons_intel(mon->type) <= I_PLANT) // no self-awareness
        return false;
    if (mons_is_sleeping(mon)) // not aware of what is happening
        return false;
    const int factor = (mons_intel(mon->type) <= I_ANIMAL) ? 3 : // animals
                       (is_player_same_species(mon->type)) ? 2   // same species
                                                           : 1;  // other
    const int random_factor = random2(you.skills[SK_INVOCATIONS] * healed/3);
    
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS,
         "pacifying %s? max hp: %d, factor: %d, Inv: %d, healed: %d, rnd: %d",
         mon->name(DESC_PLAIN).c_str(), mon->max_hit_points, factor,
         you.skills[SK_INVOCATIONS], healed, random_factor);
#endif
    if (mon->max_hit_points < factor * random_factor)
        return true;
    return false;
}
static int _healing_spell( int healed, int dir_x = 100, int dir_y = 100)

Insertion in crawl-ref/source/spells1.cc at line 631 [4.616635]
[4.626183]
[4.626183]
```
    ASSERT(healed >= 1);
```

Replacement in crawl-ref/source/spells1.cc at line 637 [4.616635]

B:BD[4.626278] → [4.626278:626321]

B:BD[4.626321] → [11.1066:1112]

∅:D[11.1112] → [4.626367:626368]

∅:D[5.159083] → [4.626367:626368]

B:BD[4.626367] → [4.626367:626368]

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

[4.626278]

[4.626368]

    if (dir_x == 100 || dir_y == 100)
    {
        mpr("Which direction?", MSGCH_PROMPT);
        direction( bmove, DIR_DIR, TARG_FRIEND );
    }
    else
    {
        bmove.dx = dir_x;
        bmove.dy = dir_y;
        bmove.isValid = true;
    }

Deletion in crawl-ref/source/spells1.cc at line 654 [4.616635]
B:BD[4.626453] → [4.626453:626514]
```
    mgr = mgrd[you.x_pos + bmove.dx][you.y_pos + bmove.dy];
```
Insertion in crawl-ref/source/spells1.cc at line 662 [4.616635]
[4.626649]
[4.626649]
```
    mgr = mgrd[you.x_pos + bmove.dx][you.y_pos + bmove.dy];
    
```

Insertion in crawl-ref/source/spells1.cc at line 671 [4.616635]

[4.626779]

    
    // don't heal monster you can't pacify
    if (you.religion == GOD_ELYVILON && _mons_hostile(monster)
        && !_can_pacify_monster(monster, healed))
    {
        canned_msg(MSG_NOTHING_HAPPENS);
        return -1;
    }

Insertion in crawl-ref/source/spells1.cc at line 680 [4.616635]
[4.626780]
[4.626780]
```
    bool nothing_happens = true;
```

Insertion in crawl-ref/source/spells1.cc at line 691 [4.616635]

[12.655]

        }
        
        if (you.religion == GOD_ELYVILON && !_mons_hostile(monster))
        {
            simple_god_message(" appreciates the healing of a fellow creature.");
            if (one_chance_in(8))
                gain_piety(1);
            return 1;

Insertion in crawl-ref/source/spells1.cc at line 700 [4.616635]
[12.665]
[4.627155]
```
        nothing_happens = false;
```
Replacement in crawl-ref/source/spells1.cc at line 702 [4.616635]
B:BD[4.627161] → [4.627161:627170]
```
    else
```
[4.627161]
[4.627170]
```
    
    if (you.religion == GOD_ELYVILON && _mons_hostile(monster))
```

Replacement in crawl-ref/source/spells1.cc at line 705 [4.616635]

B:BD[4.627176] → [4.627176:627217]

        canned_msg(MSG_NOTHING_HAPPENS);

[4.627176]

[4.627217]

        simple_god_message(" supports your offer of peace.");
        simple_monster_message( monster, " turns neutral." );
        monster->attitude = ATT_NEUTRAL;
        monster->flags |= MF_WAS_NEUTRAL;
        // give half of the monster's xp
        unsigned int exp_gain = 0, avail_gain = 0;
        gain_exp( exper_value(monster) / 2 + 1, &exp_gain, &avail_gain );
        monster->flags |= MF_GOT_HALF_XP;
        // finally give a small piety return
        gain_piety(1 + random2(healed/15));

Insertion in crawl-ref/source/spells1.cc at line 718 [4.616635]

[4.627223]

    else if (nothing_happens)
        canned_msg(MSG_NOTHING_HAPPENS);

Replacement in crawl-ref/source/spells1.cc at line 722 [4.616635]
B:BD[4.627238] → [4.627238:627293]
```
}                               // end healing_spell()
```
[4.627238]
[4.627293]
```
}                               // end _healing_spell()
```

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

B:BD[4.627338] → [4.627338:627442]

    return healing_spell(5 + random2avg(7, 2));
}                               // end lesser healing()

[4.627338]

[4.627442]

    return _healing_spell(5 + random2avg(7, 2));
}

Replacement in crawl-ref/source/spells1.cc at line 732 [4.616635]

B:BD[4.627482] → [4.627482:627594]

    return healing_spell(15 + random2avg(29, 2));
}                               // end cast_greater_healing()

[4.627482]

[4.627594]

    return _healing_spell(15 + random2avg(29, 2));
}

Replacement in crawl-ref/source/spells1.cc at line 737 [4.616635]

B:BD[4.627635] → [4.627635:627748]

    return healing_spell(50 + random2avg(49, 2));
}                               // end cast_greatest_healing()

[4.627635]

[4.627748]

    return _healing_spell(50 + random2avg(49, 2));
}

Replacement in crawl-ref/source/spells1.cc at line 741 [4.616635]
B:BD[4.627757] → [5.159115:159143]
```
int cast_healing( int pow )
```
[4.627757]
[4.627786]
```
int cast_healing( int pow, int dir_x, int dir_y )
```

Replacement in crawl-ref/source/spells1.cc at line 746 [4.616635]

B:BD[4.627825] → [4.627825:627887]

    return (healing_spell( pow + roll_dice( 2, pow ) - 2 ));

[4.627825]

[4.627887]

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

Insertion in crawl-ref/source/religion.cc at line 1449 [4.804403]

[4.837356]

[13.258]

    case DID_KILL_NEUTRAL:
        if (you.religion == GOD_ELYVILON)
        {
             simple_god_message(" did not appreciate that!");
             ret = true;
             piety_change = -(level/2 + 1);
             penance = std::min(level, 5);
        }
        break;

Deletion in crawl-ref/source/religion.cc at line 1825 [4.804403]
B:BD[6.6316] → [14.3033:3091]
```
    case DID_KILL_NEUTRAL:                      // unused
```
Replacement in crawl-ref/source/monstuff.cc at line 395 [4.1396662]
B:BD[15.438] → [16.204:259]
```
static void give_monster_experience( monsters *victim,
```
[15.438]
[16.259]
```
static void _give_monster_experience( monsters *victim,
```

Insertion in crawl-ref/source/monstuff.cc at line 424 [4.1396662]

[17.2690]

[3.2625]

    const bool already_got_half_xp = testbits(monster->flags, MF_GOT_HALF_XP);

Replacement in crawl-ref/source/monstuff.cc at line 431 [4.1396662]

∅:D[18.3297] → [19.994:1048]

B:BD[20.11215] → [19.994:1048]

        gain_exp( experience, exp_gain, avail_gain );

[18.3297]

[18.3298]

        if (already_got_half_xp)
            gain_exp( experience / 2, exp_gain, avail_gain );
        else
            gain_exp( experience, exp_gain, avail_gain );

Insertion in crawl-ref/source/monstuff.cc at line 439 [4.1396662]
[17.2899]
[18.3440]
```
        {
```
Insertion in crawl-ref/source/monstuff.cc at line 441 [4.1396662]
[18.3493]
[18.3493]
```
        }
```
Replacement in crawl-ref/source/monstuff.cc at line 443 [4.1396662]
∅:D[19.1048] → [15.638:661]
∅:D[18.3499] → [15.638:661]
∅:D[20.11281] → [15.638:661]
B:BD[15.638] → [15.638:661]
```
    else if (pet_kill)
```
[18.3499]
[19.1049]
```
    else if (pet_kill && !already_got_half_xp)
```

Replacement in crawl-ref/source/monstuff.cc at line 447 [4.1396662]

∅:D[17.2936] → [16.468:589]

B:BD[19.1138] → [16.468:589]

        give_monster_experience( monster, killer_index, experience,
                                 created_friendly );

[17.2936]

[15.713]

        _give_monster_experience( monster, killer_index, experience,
                                  created_friendly );

Replacement in crawl-ref/source/monstuff.cc at line 451 [4.1396662]
B:BD[15.716] → [15.716:767]
```
static bool is_pet_kill(killer_type killer, int i)
```
[15.716]
[15.767]
```
static bool _is_pet_kill(killer_type killer, int i)
```
Replacement in crawl-ref/source/monstuff.cc at line 680 [4.1396662]
∅:D[21.9487] → [15.1706:1756]
B:BD[4.1406710] → [15.1706:1756]
```
    const bool pet_kill = is_pet_kill(killer, i);
```
[21.9487]
[4.1406837]
```
    const bool pet_kill = _is_pet_kill(killer, i);
```
Replacement in crawl-ref/source/monstuff.cc at line 799 [4.1396662]
B:BD[14.3530] → [14.3530:3568]
```
                if (created_friendly)
```
[14.3530]
[14.3568]
```
                if (was_neutral)
```

Replacement in crawl-ref/source/mon-data.h at line 100 [4.1826214]

B:BD[4.1829039] → [22.2434:2496]

   - How smart it is: I_PLANT < I_ANIMAL < I_NORMAL < I_HIGH.

[4.1829039]

[22.2496]

   - How smart it is: I_PLANT < I_INSECT < I_ANIMAL < I_NORMAL < I_HIGH.

Replacement in crawl-ref/source/enum.h at line 644 [4.3287960]
∅:D[2.3435] → [14.3967:4017]
B:BD[5.908773] → [14.3967:4017]
```
    DID_KILL_NEUTRAL,                   // unused
```
[2.3435]
[5.908773]
```
    DID_KILL_NEUTRAL,
```

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

B:BD[14.4245] → [14.4245:4314]

    MF_BAND_MEMBER        = 0x4000  // Created as a member of a band

[14.4245]

[4.3342202]

    MF_BAND_MEMBER        = 0x4000, // Created as a member of a band
    MF_GOT_HALF_XP        = 0x8000  // player already got half xp value earlier

Replacement in crawl-ref/source/beam.cc at line 2083 [4.4128068]

B:BD[4.4191529] → [4.4191529:4191604]

        if (heal_monster( monster, 5 + roll_dice( pbolt.damage ), false ))

[4.4191529]

[4.4191604]

        if (YOU_KILL(pbolt.thrower))
        {
            if (cast_healing(5 + roll_dice( pbolt.damage ),
                             monster->x - you.x_pos, monster->y - you.y_pos) > 0)
            {
                pbolt.obvious_effect = true;
            }
            pbolt.msg_generated = true; // to avoid duplicate "nothing happens"
        }
        else if (heal_monster( monster, 5 + roll_dice( pbolt.damage ), false ))

Add Ely's pacifying monsters effect:

Dependencies

In channels

Change contents

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

Insertion in crawl-ref/source/spells1.cc at line 45 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 575 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 582 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 584 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 631 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 637 [4.616635]

Deletion in crawl-ref/source/spells1.cc at line 654 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 662 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 671 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 680 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 691 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 700 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 702 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 705 [4.616635]

Insertion in crawl-ref/source/spells1.cc at line 718 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 722 [4.616635]

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

Replacement in crawl-ref/source/spells1.cc at line 732 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 737 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 741 [4.616635]

Replacement in crawl-ref/source/spells1.cc at line 746 [4.616635]

Insertion in crawl-ref/source/religion.cc at line 1449 [4.804403]

Deletion in crawl-ref/source/religion.cc at line 1825 [4.804403]

Replacement in crawl-ref/source/monstuff.cc at line 395 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 424 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 431 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 439 [4.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 441 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 443 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 447 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 451 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 680 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 799 [4.1396662]

Replacement in crawl-ref/source/mon-data.h at line 100 [4.1826214]

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

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

Replacement in crawl-ref/source/beam.cc at line 2083 [4.4128068]