fiddlerwoaroof/crawl - Change C5U3HSOOQ7BKXKXIDS7MLVXUKDTHAWJ5NXNX6YDXTM3GWY5UWX4QC

Finally allow ranged attacks (BEAM_MISSILE) and spells (BEAM_MMISSILE only)

to also saturate the blood with floor.

Add a basic blood scent effect: all hounds, vampires, and the mosquito get M_BLOOD_SCENT which will let them wake up when blood is spilled in their vicinity. smell_blood() is rather similar to noisy(), so monsters will try to seek the origin of the blood spilled.

Player vampires now get a message if blood is spilled outside their LOS, "You smell fresh blood" with a distance estimate ("near-by", "in the distance") added for vampires that are (near) bloodless. Also, the radius a vampire will be capable of smelling blood will increase the thirstier he is.

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

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

C5U3HSOOQ7BKXKXIDS7MLVXUKDTHAWJ5NXNX6YDXTM3GWY5UWX4QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 117 [9.13254]
[7.246]
[8.5]
```
void blood_smell( int strength, int blood_x, int blood_y);
```
Deletion in crawl-ref/source/view.cc at line 1491 [9.16817]
B:BD[9.57811] → [9.57811:57822]
```
    int p;
```
Replacement in crawl-ref/source/view.cc at line 1522 [9.16817]
∅:D[7.13961] → [9.57967:58006]
B:BD[9.57967] → [9.57967:58006]
```
    for (p = 0; p < MAX_MONSTERS; p++)
```
[7.13961]
[9.58006]
```
    for (int p = 0; p < MAX_MONSTERS; p++)
```

Insertion in crawl-ref/source/view.cc at line 1543 [9.16817]

[9.58627]


static const char* _player_vampire_smells_blood(int dist)
{
    // non-hungry vampires get no clear indication of how close the smell is
    if (you.hunger_state > HS_HUNGRY)
        return "";
    if (dist < 16) // 4*4
        return " near-by";
    if (you.hunger_state <= HS_NEAR_STARVING && dist > 64) // 8*8
        return " in the distance";
    return "";
}
void blood_smell( int strength, int blood_x, int blood_y )
{
    struct monsters *monster = 0;       // NULL {dlb}
    const int range = strength * strength;
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS,
         "blood stain at (%d, %d), range of smell = %d",
         blood_x, blood_y, range);
#endif
    // of the player species, only vampires can smell blood
    if (you.species == SP_VAMPIRE)
    {
        // whether they actually do so, depends on their hunger state
        int vamp_strength = strength - 2 * (you.hunger_state - 1);
        if (vamp_strength > 0)
        {
            int vamp_range = vamp_strength * vamp_strength;
            const int player_distance
                = distance( you.x_pos, you.y_pos, blood_x, blood_y );
            if (player_distance <= vamp_range)
            {
#ifdef DEBUG_DIAGNOSTICS
                mprf(MSGCH_DIAGNOSTICS,
                     "Player smells blood, pos: (%d, %d), dist = %d)",
                     you.x_pos, you.y_pos, player_distance);
#endif
                you.check_awaken(range - player_distance);
                // don't message if you can see the square
                if (!see_grid(blood_x, blood_y))
                {
                    mprf("You smell fresh blood%s.",
                         _player_vampire_smells_blood(player_distance));
                }
            }
        }
    }
    for (int p = 0; p < MAX_MONSTERS; p++)
    {
        monster = &menv[p];
        if (monster->type < 0)
            continue;

Insertion in crawl-ref/source/view.cc at line 1607 [9.16817]

[9.58628]

[7.13982]

        if (!mons_class_flag(monster->type, M_BLOOD_SCENT))
            continue;
        if (distance(monster->x, monster->y, blood_x, blood_y) <= range)
        {
            // let sleeping hounds lie
            if (mons_is_sleeping(monster)
                && mons_species(monster->type) != MONS_VAMPIRE)
            {
                // 33% chance of sleeping on
                // 33% of being disturbed (start BEH_WANDER)
                // 33% of being alerted   (start BEH_SEEK)
                if (!one_chance_in(3))
                {
                    if (coinflip())
                    {
#ifdef DEBUG_DIAGNOSTICS
                        mprf(MSGCH_DIAGNOSTICS, "disturbing %s (%d, %d)",
                             monster->name(DESC_PLAIN).c_str(),
                             monster->x, monster->y);
#endif
                        behaviour_event( monster, ME_DISTURB, MHITNOT,
                                         blood_x, blood_y );
                    }
                    continue;
                }
            }
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "alerting %s (%d, %d)",
                 monster->name(DESC_PLAIN).c_str(), monster->x, monster->y);
#endif
            behaviour_event( monster, ME_ALERT, MHITNOT, blood_x, blood_y );
        }
    }
}      // end blood_smell()

Replacement in crawl-ref/source/monstuff.cc at line 657 [9.1396662]

B:BD[10.1366] → [5.2542:2567]

∅:D[10.1397] → [11.313:387]

∅:D[5.2567] → [11.313:387]

B:BD[11.313] → [11.313:387]

    bool death_message =
        !silent && mons_near(monster) && player_monster_visible(monster);

[10.1366]

[12.12114]

    bool death_message
        = !silent && mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 1455 [9.1396662]
∅:D[13.7866] → [14.10639:10682]
B:BD[14.10639] → [14.10639:10682]
```
            && MONST_INTERESTING(monster))
```
[13.7866]
[15.565]
```
        && MONST_INTERESTING(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 1967 [9.1396662]

B:BD[9.1438378] → [2.71:188]

        if (mon->behaviour != BEH_CORNERED && mon->behaviour != BEH_PANIC &&
            mon->behaviour != BEH_FLEE)

[9.1438378]

[9.1438422]

        if (mon->behaviour != BEH_CORNERED && mon->behaviour != BEH_PANIC
            && mon->behaviour != BEH_FLEE)
        {

Insertion in crawl-ref/source/monstuff.cc at line 1971 [9.1396662]
[9.1438461]
[9.1438461]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 3521 [9.1396662]

B:BD[16.2659] → [16.2659:2753]

        bool was_visible =
            mons_near(monster) && player_monster_visible(monster);

[16.2659]

[17.201]

        bool was_visible
                 = mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 3941 [9.1396662]

B:BD[9.1490229] → [9.1490229:1490296]

    bool finalAnswer = false;   // as in: "Is that your...?" {dlb}

[9.1490229]

[6.6695]

    bool finalAnswer   = false;   // as in: "Is that your...?" {dlb}

Replacement in crawl-ref/source/mon-util.h at line 107 [9.1682293]

B:BD[18.67930] → [4.2547:2609]

    M_RESERVED          = (1<<15),        // currently UNUSED

[18.67930]

[18.67988]

    M_BLOOD_SCENT       = (1<<15),        // monster can smell blood

Replacement in crawl-ref/source/mon-util.cc at line 3740 [9.1699344]

B:BD[19.16195] → [19.16195:16267]

            mprf("%s %s!",
                 name(DESC_CAP_THE).c_str(),

[19.16195]

[19.16267]

        {
            mprf("%s %s!", name(DESC_CAP_THE).c_str(),

Insertion in crawl-ref/source/mon-util.cc at line 3743 [9.1699344]
[19.16333]
[19.16333]
```
        }
```
Insertion in crawl-ref/source/mon-util.cc at line 4106 [9.1699344]
[20.396]
[20.396]
```
        {
```
Insertion in crawl-ref/source/mon-util.cc at line 4109 [9.1699344]
[20.498]
[21.7163]
```
        }
```

Replacement in crawl-ref/source/mon-util.cc at line 4195 [9.1699344]

B:BD[13.15963] → [13.15963:16015]

                    && !has_ench( ENCH_SUBMERGED ))

[13.15963]

[13.16015]

                 && !has_ench( ENCH_SUBMERGED ))

Insertion in crawl-ref/source/mon-util.cc at line 4228 [9.1699344]
[22.1800]
[22.1800]
```
            {
```
Insertion in crawl-ref/source/mon-util.cc at line 4231 [9.1699344]
[22.1913]
[22.1913]
```
            }
```
Insertion in crawl-ref/source/mon-util.cc at line 5126 [9.1699344]
[23.1643]
[24.15563]
```
                {
```
Insertion in crawl-ref/source/mon-util.cc at line 5129 [9.1699344]
[24.15687]
[24.15687]
```
                }
```
Replacement in crawl-ref/source/mon-data.h at line 677 [9.1826214]
B:BD[25.20265] → [25.20265:20283]
```
    M_WARM_BLOOD,
```
[25.20265]
[25.20283]
```
    M_WARM_BLOOD | M_BLOOD_SCENT,
```
Replacement in crawl-ref/source/mon-data.h at line 688 [9.1826214]
∅:D[26.3036] → [27.975:1009]
B:BD[9.1831708] → [27.975:1009]
```
    M_SENSE_INVIS | M_WARM_BLOOD,
```
[26.3036]
[7.493745]
```
    M_SENSE_INVIS | M_WARM_BLOOD | M_BLOOD_SCENT,
```
Replacement in crawl-ref/source/mon-data.h at line 699 [9.1826214]
B:BD[25.20677] → [25.20677:20711]
```
    M_SENSE_INVIS | M_WARM_BLOOD,
```
[25.20677]
[25.20711]
```
    M_SENSE_INVIS | M_WARM_BLOOD | M_BLOOD_SCENT,
```
Replacement in crawl-ref/source/mon-data.h at line 710 [9.1826214]
B:BD[25.21068] → [25.21068:21102]
```
    M_WARM_BLOOD | M_SENSE_INVIS,
```
[25.21068]
[25.21102]
```
    M_WARM_BLOOD | M_SENSE_INVIS | M_BLOOD_SCENT,
```
Replacement in crawl-ref/source/mon-data.h at line 721 [9.1826214]
B:BD[25.21446] → [25.21446:21480]
```
    M_SENSE_INVIS | M_WARM_BLOOD,
```
[25.21446]
[25.21480]
```
    M_SENSE_INVIS | M_WARM_BLOOD | M_BLOOD_SCENT,
```
Replacement in crawl-ref/source/mon-data.h at line 743 [9.1826214]
B:BD[25.22140] → [25.22140:22188]
```
    M_SENSE_INVIS | M_EVIL | M_SPECIAL_ABILITY,
```
[25.22140]
[25.22188]
```
    M_SENSE_INVIS | M_EVIL | M_SPECIAL_ABILITY | M_BLOOD_SCENT,
```
Replacement in crawl-ref/source/mon-data.h at line 1455 [9.1826214]
B:BD[25.43703] → [25.43703:43716]
```
    M_FLIES,
```
[25.43703]
[25.43716]
```
    M_FLIES | M_BLOOD_SCENT,
```

Replacement in crawl-ref/source/mon-data.h at line 2604 [9.1826214]

B:BD[25.82063] → [28.7294:7347]

    M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS,

[25.82063]

[25.82105]

    M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS | M_BLOOD_SCENT,

Replacement in crawl-ref/source/mon-data.h at line 2615 [9.1826214]

B:BD[25.82474] → [28.7348:7413]

    M_FIGHTER | M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS,

[25.82474]

[25.82528]

    M_FIGHTER | M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS | M_BLOOD_SCENT,

Replacement in crawl-ref/source/mon-data.h at line 2626 [9.1826214]

B:BD[25.82914] → [28.7414:7477]

    M_SPELLCASTER | M_SEE_INVIS | M_FLIES | M_EVIL | M_SPEAKS,

[25.82914]

[25.82966]

    M_SPELLCASTER | M_SEE_INVIS | M_FLIES | M_EVIL | M_SPEAKS | M_BLOOD_SCENT,

Insertion in crawl-ref/source/misc.cc at line 344 [9.1933596]

[29.6300]

[7.544399]

            
        // if old or new blood on square, the smell reaches further
        if (env.map[x][y].property == FPROP_BLOODY)
            blood_smell(12, x, y);
        else // still allow a lingering smell
            blood_smell(7, x, y);

Replacement in crawl-ref/source/beam.cc at line 1613 [9.4128068]

B:BD[7.1230881] → [30.7198:7249]

        hurted =
            resist_adjust_damage(

[7.1230881]

[30.7249]

        hurted
            = resist_adjust_damage(

Replacement in crawl-ref/source/beam.cc at line 1617 [9.4128068]

∅:D[3.8459] → [30.7274:7442]

B:BD[30.7274] → [30.7274:7442]

                pbolt.flavour == BEAM_FIRE
                ? monster->res_fire()
                : monster->res_steam(),
                hurted,
                true);

[3.8459]

[31.31188]

                (pbolt.flavour == BEAM_FIRE) ? monster->res_fire()
                                             : monster->res_steam(),
                hurted, true);

Deletion in crawl-ref/source/beam.cc at line 1730 [9.4128068]
B:BD[9.4182846] → [9.4182846:4182856]
```
        {
```
Replacement in crawl-ref/source/beam.cc at line 1731 [9.4128068]
∅:D[6.13643] → [9.4182923:4182933]
∅:D[13.36075] → [9.4182923:4182933]
B:BD[9.4182923] → [9.4182923:4182933]
```
        }
```
[6.13643]
[9.4182933]

Replacement in crawl-ref/source/beam.cc at line 1762 [9.4128068]

B:BD[9.4183506] → [9.4183506:4183557]

            monster->hit_points -= 2 + random2(3);

[9.4183506]

[9.4183557]

            monster->hit_points     -= 2 + random2(3);

Replacement in crawl-ref/source/beam.cc at line 2299 [9.4128068]
B:BD[9.4200136] → [9.4200136:4200184]
```
    pbolt.beam_source = monster_index(monster);
```
[9.4200136]
[7.1234888]
```
    pbolt.beam_source   = monster_index(monster);
```

Replacement in crawl-ref/source/beam.cc at line 2301 [9.4128068]

B:BD[7.1234946] → [7.1234946:1235012]

∅:D[7.1235012] → [9.4200305:4200371]

B:BD[9.4200305] → [9.4200305:4200371]

    pbolt.smart_monster = (mons_intel(monster->type) == I_HIGH ||
                          mons_intel(monster->type) == I_NORMAL);

[7.1234946]

[32.417]

    pbolt.smart_monster = (mons_intel(monster->type) == I_HIGH
                           || mons_intel(monster->type) == I_NORMAL);

Replacement in crawl-ref/source/beam.cc at line 3486 [9.4128068]

B:BD[7.1244905] → [7.1244905:1244970]

            beam.name.c_str(), (engulfs) ? "engulfs" : "hits" );

[7.1244905]

[9.4230983]

          beam.name.c_str(), (engulfs) ? "engulfs" : "hits" );

Replacement in crawl-ref/source/beam.cc at line 3489 [9.4128068]

B:BD[9.4231004] → [7.1244971:1245044]

    int burn_power = (beam.is_explosion) ? 5 : ((beam.is_beam) ? 3 : 2);

[9.4231004]

[9.4231075]

    int burn_power = (beam.is_explosion) ? 5 :
                          (beam.is_beam) ? 3 : 2;

Insertion in crawl-ref/source/beam.cc at line 3531 [9.4128068]

[9.4231878]

    // if the beam is an actual missile or of the MMISSILE type (Earth magic)
    // might bleed on the floor
    if (!engulfs
        && (beam.flavour == BEAM_MISSILE || beam.flavour == BEAM_MMISSILE))
    {
        int blood = hurted/2; // assumes DVORP_PIERCING, factor: 0.5
        if (blood > you.hp)
            blood = you.hp;
            
        bleed_onto_floor(you.x_pos, you.y_pos, -1, blood, true);
    }

Insertion in crawl-ref/source/beam.cc at line 3870 [9.4128068]
[33.4110]
[33.4110]
```
            {
```
Insertion in crawl-ref/source/beam.cc at line 3873 [9.4128068]
[33.4214]
[33.4214]
```
            }
```
Insertion in crawl-ref/source/beam.cc at line 4022 [9.4128068]
[34.6042]
[34.6042]
```
                     
```

Replacement in crawl-ref/source/beam.cc at line 4039 [9.4128068]

B:BD[35.14042] → [35.14042:14092]

B:BD[35.14092] → [36.5193:5240]

∅:D[36.5240] → [35.14145:14174]

B:BD[35.14145] → [35.14145:14174]

             player_monster_visible(&menv[tid])? 
             mon->name(DESC_NOCAP_THE).c_str()
             : "something");

[35.14042]

[9.4240296]

             player_monster_visible(&menv[tid]) ?
                 mon->name(DESC_NOCAP_THE).c_str() : "something");

Replacement in crawl-ref/source/beam.cc at line 4047 [9.4128068]

B:BD[9.4240485] → [9.4240485:4240528]

                && YOU_KILL(beam.thrower))

[9.4240485]

[7.1250265]

            && YOU_KILL(beam.thrower))
        {

Insertion in crawl-ref/source/beam.cc at line 4050 [9.4128068]
[7.1250341]
[9.4240693]
```
        }
```

Insertion in crawl-ref/source/beam.cc at line 4061 [9.4128068]

[9.4240949]

    // if the beam is an actual missile or of the MMISSILE type (Earth magic)
    // might bleed on the floor
    if (!engulfs
        && (beam.flavour == BEAM_MISSILE || beam.flavour == BEAM_MMISSILE))
    {
        // using raw_damage instead of the flavoured one!
        int blood = raw_damage/2; // assumes DVORP_PIERCING, factor: 0.5
        if (blood > mon->hit_points)
            blood = mon->hit_points;
        bleed_onto_floor(mon->x, mon->y, mon->type, blood, true);
    }

Replacement in crawl-ref/source/beam.cc at line 4076 [9.4128068]
B:BD[9.4241091] → [9.4241091:4241092]
[9.4241010]
[9.4241092]
```
    
```

Replacement in crawl-ref/source/beam.cc at line 4100 [9.4128068]

B:BD[9.4241581] → [9.4241581:4241664]

        /* looks for missiles which aren't poison but
           are poison*ed* */

[9.4241581]

[37.4077]

        /* looks for missiles which aren't poison but are poison*ed* */

Finally allow ranged attacks (BEAM_MISSILE) and spells (BEAM_MMISSILE only)

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.h at line 117 [9.13254]

Deletion in crawl-ref/source/view.cc at line 1491 [9.16817]

Replacement in crawl-ref/source/view.cc at line 1522 [9.16817]

Insertion in crawl-ref/source/view.cc at line 1543 [9.16817]

Insertion in crawl-ref/source/view.cc at line 1607 [9.16817]

Replacement in crawl-ref/source/monstuff.cc at line 657 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1455 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1967 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1971 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3521 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3941 [9.1396662]

Replacement in crawl-ref/source/mon-util.h at line 107 [9.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 3740 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3743 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4106 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4109 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4195 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4228 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4231 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5126 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5129 [9.1699344]

Replacement in crawl-ref/source/mon-data.h at line 677 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 688 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 699 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 710 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 721 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 743 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1455 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2604 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2615 [9.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2626 [9.1826214]

Insertion in crawl-ref/source/misc.cc at line 344 [9.1933596]

Replacement in crawl-ref/source/beam.cc at line 1613 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 1617 [9.4128068]

Deletion in crawl-ref/source/beam.cc at line 1730 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 1731 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 1762 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 2299 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 2301 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 3486 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 3489 [9.4128068]

Insertion in crawl-ref/source/beam.cc at line 3531 [9.4128068]

Insertion in crawl-ref/source/beam.cc at line 3870 [9.4128068]

Insertion in crawl-ref/source/beam.cc at line 3873 [9.4128068]

Insertion in crawl-ref/source/beam.cc at line 4022 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 4039 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 4047 [9.4128068]

Insertion in crawl-ref/source/beam.cc at line 4050 [9.4128068]

Insertion in crawl-ref/source/beam.cc at line 4061 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 4076 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 4100 [9.4128068]