fiddlerwoaroof/crawl - Change C5VA63WAQRWPENIMXRPUPZLZJMC77PL2B3A77HYFWDCZU5QDG7VQC

[1746247] Award experience for confused monsters killing themselves and other

monsters.

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

Created by dshaligram on July 8, 2007

C5VA63WAQRWPENIMXRPUPZLZJMC77PL2B3A77HYFWDCZU5QDG7VQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1716 [6.436250]
B:BD[6.483314] → [7.3047:3087]
```
    menv[mon].add_ench(ENCH_CONFUSION);
```
[6.483314]
[6.483361]
```
    menv[mon].add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU));
```

Replacement in crawl-ref/source/spells4.cc at line 1782 [6.436250]

B:BD[6.485076] → [7.3128:3172]

        menv[mon].add_ench(ENCH_CONFUSION);

[6.485076]

[6.485127]

        menv[mon].add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU));

Replacement in crawl-ref/source/monstuff.h at line 53 [6.1390580]

B:BD[8.151] → [4.490:563]

void mons_check_pool(monsters *monster, killer_type killer = KILL_MISC);

[8.151]

[6.1392125]

void mons_check_pool(monsters *monster, killer_type killer = KILL_NONE,
                     int killnum = -1);

Insertion in crawl-ref/source/monstuff.cc at line 368 [6.1396662]

[9.609]

[10.2771]


static void give_adjusted_experience(monsters *monster, killer_type killer,
                                     bool pet_kill)
{
    if (YOU_KILL(killer))
        gain_exp( exper_value( monster ) );
    else if (pet_kill)
        gain_exp( exper_value( monster ) / 2 + 1 );
}
static bool is_pet_kill(killer_type killer, int i)
{
    if (!MON_KILL(killer))
        return (false);
    if (i == ANON_FRIENDLY_MONSTER)
        return (true);
    if (i < 0 || i >= MAX_MONSTERS)
        return (false);
    const monsters *m = &menv[i];
    if (mons_friendly(m))
        return (true);
    // Check if the monster was confused by you or a friendly, which
    // makes casualties to this monster collateral kills.
    const mon_enchant me = m->get_ench(ENCH_CONFUSION);
    return (me.ench == ENCH_CONFUSION
            && (me.who == KC_YOU || me.who == KC_FRIENDLY));
}

Replacement in crawl-ref/source/monstuff.cc at line 405 [6.1396662]
∅:D[11.412338] → [6.1405710:1405759]
B:BD[6.1405710] → [6.1405710:1405759]
B:BD[6.1405759] → [8.288:313]
```
    int monster_killed = monster_index(monster);
    bool death_message =
```
[12.7312]
[8.313]
```
    const int monster_killed = monster_index(monster);
    const bool death_message =
```

Insertion in crawl-ref/source/monstuff.cc at line 415 [6.1396662]

[13.76]

    // Award experience for suicide if the suicide was caused by the
    // player.
    if (MON_KILL(killer) && monster_killed == i)
    {
        const mon_enchant me = monster->get_ench(ENCH_CONFUSION);
        if (me.ench == ENCH_CONFUSION && me.who == KC_YOU)
            killer = KILL_YOU_CONF;
    }

Deletion in crawl-ref/source/monstuff.cc at line 437 [6.1396662]
B:BD[13.497] → [13.497:498]

Replacement in crawl-ref/source/monstuff.cc at line 468 [6.1396662]

B:BD[6.1406710] → [7.7187:7362]

    const bool pet_kill =
        (MON_KILL(killer)
         && (i == ANON_FRIENDLY_MONSTER ||
             ((i >= 0 && i < 200) 
              && mons_friendly(&menv[i]))));

[6.1406710]

[6.1406837]

    const bool pet_kill = is_pet_kill(killer, i);

Replacement in crawl-ref/source/monstuff.cc at line 484 [6.1396662]

B:BD[6.1407319] → [6.1407319:1407516]

        {
            if (YOU_KILL(killer))
                gain_exp( exper_value( monster ) );
            else if (pet_kill)
                gain_exp( exper_value( monster ) / 2 + 1 );
        }

[6.1407319]

[6.1407516]

            give_adjusted_experience(monster, killer, pet_kill);

Replacement in crawl-ref/source/monstuff.cc at line 495 [6.1396662]

B:BD[8.599] → [8.599:661]

                monster, " vaporizes!", MSGCH_MONSTER_DAMAGE,

[8.599]

[8.661]

                monster, " vapourises!", MSGCH_MONSTER_DAMAGE,

Replacement in crawl-ref/source/monstuff.cc at line 499 [6.1396662]

B:BD[6.1407949] → [6.1407949:1408147]

        {
            if (YOU_KILL(killer))
                gain_exp( exper_value( monster ) );
            else if (pet_kill)
                gain_exp( exper_value( monster ) / 2 + 1 );
        }

[6.1407949]

[14.5261]

            give_adjusted_experience(monster, killer, pet_kill);

Replacement in crawl-ref/source/monstuff.cc at line 523 [6.1396662]

B:BD[6.1408477] → [6.1408477:1408674]

        {
            if (YOU_KILL(killer))
                gain_exp( exper_value( monster ) );
            else if (pet_kill)
                gain_exp( exper_value( monster ) / 2 + 1 );
        }

[6.1408477]

[6.1408674]

            give_adjusted_experience(monster, killer, pet_kill);

Insertion in crawl-ref/source/monstuff.cc at line 531 [6.1396662]
[6.1408854]
[15.243832]
```
        case KILL_YOU_CONF:     /* You kill by confusion */
```
Insertion in crawl-ref/source/monstuff.cc at line 756 [6.1396662]
[11.417067]
[16.1609]
```
        default:
```
Replacement in crawl-ref/source/monstuff.cc at line 764 [6.1396662]
B:BD[6.1415931] → [6.1415931:1415961]
```
        if (YOU_KILL(killer))
```
[6.1415931]
[6.1415961]
```
        if (YOU_KILL(killer) && killer != KILL_YOU_CONF)
```
Replacement in crawl-ref/source/monstuff.cc at line 774 [6.1396662]
B:BD[6.1416262] → [6.1416262:1416292]
```
        if (YOU_KILL(killer))
```
[6.1416262]
[6.1416292]
```
        if (YOU_KILL(killer) && killer != KILL_YOU_CONF)
```

Replacement in crawl-ref/source/monstuff.cc at line 846 [6.1396662]

B:BD[16.1673] → [16.1673:1767]

∅:D[16.1767] → [15.244648:244740]

B:BD[15.244648] → [15.244648:244740]

        monster_drop_ething(monster, 
                            killer == KILL_YOU_MISSILE 
                            || killer == KILL_YOU
                            || pet_kill);

[16.1673]

[6.1418882]

        monster_drop_ething(monster, YOU_KILL(killer) || pet_kill);

Replacement in crawl-ref/source/monstuff.cc at line 4187 [6.1396662]

B:BD[8.4124] → [4.931:988]

void mons_check_pool(monsters *mons, killer_type killer)

[8.4124]

[8.4173]

void mons_check_pool(monsters *mons, killer_type killer, int killnum)

Replacement in crawl-ref/source/monstuff.cc at line 4229 [6.1396662]

B:BD[8.5154] → [8.5154:5215]

            
            monster_die(mons, killer, 0, true);

[8.5154]

[8.5215]


            if (killer == KILL_NONE)
            {
                // Self-kill.
                killer  = KILL_MON;
                killnum = monster_index(mons);
            }
            monster_die(mons, killer, killnum, true);

Insertion in crawl-ref/source/fight.cc at line 1732 [6.3140790]
[5.605]
[5.605]
```
            beam_temp.thrower = KILL_YOU;
```

Replacement in crawl-ref/source/fight.cc at line 1734 [6.3140790]

B:BD[5.661] → [5.661:717]

            mons_ench_f2( def, beam_temp );

[5.661]

[5.717]

            mons_ench_f2( def, beam_temp );

Replacement in crawl-ref/source/enum.h at line 1710 [6.3287960]
B:BD[6.3326306] → [6.3326306:3326353]
```
    KILL_YOU = 1,                      //    1
```
[6.3326306]
[6.3326353]
```
    KILL_NONE = 0,
    KILL_YOU,                          //    1
```
Insertion in crawl-ref/source/enum.h at line 1715 [6.3287960]
[6.3326411]
[6.3326411]
```
    KILL_YOU_CONF,
```

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

B:BD[6.3326521] → [6.3326521:3326586]

#define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE)

[6.3326521]

[6.3326586]

#define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE \
                     || (x) == KILL_YOU_CONF)

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

B:BD[7.35695] → [7.35695:35801]

            const monsters &mons = menv[beam.beam_source];
            if (mons.attitude == ATT_FRIENDLY)

[7.35695]

[7.35801]

            const monsters *mons = &menv[beam.beam_source];
            if (mons_friendly(mons))

Insertion in crawl-ref/source/beam.cc at line 1853 [6.4128068]
[6.4187192]
[6.4187192]
```
    const kill_category kc = origin == MHITYOU? KC_YOU : KC_OTHER;
```

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

B:BD[6.4188297] → [3.1833:1876]

        if (monster->add_ench(wh_enchant))

[6.4188297]

[6.4188345]

        if (monster->add_ench(mon_enchant(wh_enchant, 0, kc)))

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

B:BD[17.742] → [7.36368:36413]

            && monster->add_ench(ENCH_SLOW))

[17.742]

[6.4190558]

            && monster->add_ench(mon_enchant(ENCH_SLOW, 0, whose_kill(pbolt))))

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

B:BD[6.4193595] → [7.36548:36595]

        if (monster->add_ench(ENCH_CONFUSION))

[6.4193595]

[6.4193647]

        if (monster->add_ench(
                mon_enchant(ENCH_CONFUSION, 0, whose_kill(pbolt))))

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

B:BD[18.3792] → [2.191:241]

        mons_check_pool(monster, pbolt.killer());

[18.3792]

[18.4379]

        mons_check_pool(monster, pbolt.killer(), pbolt.beam_source);

Replacement in crawl-ref/source/Kills.cc at line 84 [15.558235]

B:BD[15.560551] → [11.1284656:1284680]

∅:D[11.1284680] → [15.560574:560787]

B:BD[15.560574] → [15.560574:560787]

    kill_category kc = 
        (killer == KILL_YOU || killer == KILL_YOU_MISSILE)? KC_YOU :
        (ispet)?                                            KC_FRIENDLY :
                                                            KC_OTHER;

[15.560551]

[15.560787]

    const kill_category kc = 
        YOU_KILL(killer)? KC_YOU :
        ispet?            KC_FRIENDLY :
                          KC_OTHER;

[1746247] Award experience for confused monsters killing themselves and other

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1716 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1782 [6.436250]

Replacement in crawl-ref/source/monstuff.h at line 53 [6.1390580]

Insertion in crawl-ref/source/monstuff.cc at line 368 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 405 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 415 [6.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 437 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 468 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 484 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 495 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 499 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 523 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 531 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 756 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 764 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 774 [6.1396662]