fiddlerwoaroof/crawl - Change QYQKV4R47PTERXVFQNNWWQVICGSOMBHW6WM5TAZAKLIYOLLPUAJAC

Condensed monster descriptions.

This has two effecs:

Monster name and equipment are combined in one line, and enchantments are condensed as well.
It's now "The monster wielding a foo comes into view."

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

Created by j-p-e-g on August 22, 2007

QYQKV4R47PTERXVFQNNWWQVICGSOMBHW6WM5TAZAKLIYOLLPUAJAC

Dependencies

In channels

main

Change contents

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

B:BD[6.440589] → [6.440589:440633]

            print_wounds( &menv[monster] );

[6.440589]

[6.440633]

        {
            const monsters *mons = static_cast<const monsters*>(&menv[monster]);
            print_wounds(mons);
        }

Replacement in crawl-ref/source/spells3.cc at line 215 [6.531613]

B:BD[6.537511] → [6.537511:537546]

            print_wounds(monster);

[6.537511]

[6.537546]

        {
            const monsters *mons = static_cast<const monsters*>(monster);
            print_wounds(mons);
        }

Replacement in crawl-ref/source/spells2.cc at line 903 [6.569242]

B:BD[6.592462] → [6.592462:592505]

                    print_wounds(monster);

[6.592462]

[6.592505]

                    const monsters *mons = static_cast<const monsters*>(monster);
                    print_wounds(mons);

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

B:BD[6.627120] → [6.627120:627155]

            print_wounds(monster);

[6.627120]

[6.627155]

        {
            const monsters *mons = static_cast<const monsters*>(monster);
            print_wounds(mons);
        }

Replacement in crawl-ref/source/monstuff.h at line 109 [6.1390580]
B:BD[6.1394455] → [6.1394455:1394500]
```
void print_wounds(struct monsters *monster);
```
[6.1394455]
[6.1394500]
```
void print_wounds(const struct monsters *monster);
```
Replacement in crawl-ref/source/monstuff.cc at line 1356 [6.1396662]
B:BD[6.1433940] → [7.1030:1067]
```
void print_wounds(monsters *monster)
```
[6.1433940]
[6.1433984]
```
void print_wounds(const monsters *monster)
```
Replacement in crawl-ref/source/mon-util.cc at line 2920 [6.1699344]
B:BD[8.17725] → [8.17725:17776]
```
item_def *monsters::mslot_item(mon_inv_type mslot)
```
[8.17725]
[8.17776]
```
item_def *monsters::mslot_item(mon_inv_type mslot) const
```
Replacement in crawl-ref/source/fight.cc at line 555 [6.3140790]
∅:D[9.15434] → [10.34699:34726]
B:BD[10.34699] → [10.34699:34726]
```
        print_wounds(def);
```
[9.15434]
[9.15435]
```
        const monsters *mons = static_cast<const monsters*>(def);
        print_wounds(mons);
```
Replacement in crawl-ref/source/externs.h at line 1090 [6.3270163]
B:BD[11.88505] → [8.21755:21798]
```
    item_def *mslot_item(mon_inv_type sl);
```
[11.88505]
[10.83885]
```
    item_def *mslot_item(mon_inv_type sl) const;
```
Insertion in crawl-ref/source/direct.h at line 56 [6.3696722]
[12.5152]
[13.974734]
```
std::string get_monster_desc(const monsters *mon, bool full_desc = true);
```

Replacement in crawl-ref/source/direct.cc at line 1515 [6.3697945]

B:BD[14.32408] → [14.32408:32585]

static void describe_mons_enchantment(const monsters &mons,
                                      const mon_enchant &ench,
                                      bool paralysed)

[14.32408]

[14.32585]

static std::string describe_mons_enchantment(const monsters &mons,
                                             const mon_enchant &ench,
                                             bool paralysed)

Replacement in crawl-ref/source/direct.cc at line 1522 [6.3697945]
B:BD[14.32746] → [15.12030:12046]
```
        return;
```
[14.32746]
[15.12046]
```
        return "";
```
Replacement in crawl-ref/source/direct.cc at line 1525 [6.3697945]
∅:D[15.12111] → [14.32746:32762]
B:BD[14.32746] → [14.32746:32762]
B:BD[14.32762] → [16.23928:23989]
```
        return;
    std::string msg = mons_pronoun(mons.type, PRONOUN_CAP);
```
[15.12111]
[17.473888]
```
        return "";
```
Replacement in crawl-ref/source/direct.cc at line 1530 [6.3697945]
B:BD[14.32883] → [16.23990:24022]
∅:D[16.24022] → [14.32922:32937]
B:BD[14.32922] → [14.32922:32937]
```
        msg += " is poisoned.";
        break;
```
[14.32883]
[18.1646]
```
        return "poisoned";
```
Replacement in crawl-ref/source/direct.cc at line 1532 [6.3697945]
B:BD[18.1666] → [16.24023:24051]
∅:D[16.24051] → [18.1701:1716]
B:BD[18.1701] → [18.1701:1716]
```
        msg += " is sick.";
        break;
```
[18.1666]
[14.32937]
```
        return "sick";
```
Replacement in crawl-ref/source/direct.cc at line 1534 [6.3697945]
B:BD[14.32956] → [16.24052:24115]
∅:D[16.24115] → [14.33026:33041]
B:BD[14.33026] → [14.33026:33041]
```
        msg += " is rotting away."; //jmf: "covered in sores"?
        break;
```
[14.32956]
[14.33041]
```
        return "rotting away"; //jmf: "covered in sores"?
```
Replacement in crawl-ref/source/direct.cc at line 1536 [6.3697945]
B:BD[14.33066] → [16.24116:24154]
∅:D[16.24154] → [14.33111:33126]
B:BD[14.33111] → [14.33111:33126]
```
        msg += " is softly glowing.";
        break;
```
[14.33066]
[14.33126]
```
        return "softly glowing";
```
Replacement in crawl-ref/source/direct.cc at line 1538 [6.3697945]
B:BD[14.33146] → [16.24155:24192]
∅:D[16.24192] → [14.33190:33205]
B:BD[14.33190] → [14.33190:33205]
```
        msg += " is moving slowly.";
        break;
```
[14.33146]
[15.12112]
```
        return "moving slowly";
```
Replacement in crawl-ref/source/direct.cc at line 1540 [6.3697945]
B:BD[15.12135] → [16.24193:24224]
∅:D[16.24224] → [15.12173:12188]
B:BD[15.12173] → [15.12173:12188]
```
        msg += " is berserk!";
        break;
```
[15.12135]
[14.33205]
```
        return "berserk";
```
Replacement in crawl-ref/source/direct.cc at line 1542 [6.3697945]
B:BD[14.33226] → [16.24225:24268]
∅:D[16.24268] → [14.33276:33291]
B:BD[14.33276] → [14.33276:33291]
```
        msg += " is moving very quickly.";
        break;
```
[14.33226]
[14.33291]
```
        return "moving very quickly";
```
Replacement in crawl-ref/source/direct.cc at line 1544 [6.3697945]
B:BD[14.33316] → [16.24269:24327]
∅:D[16.24327] → [14.33381:33396]
B:BD[14.33381] → [14.33381:33396]
```
        msg += " appears to be bewildered and confused.";
        break;
```
[14.33316]
[14.33396]
```
        return "bewildered and confused";
```
Replacement in crawl-ref/source/direct.cc at line 1546 [6.3697945]
B:BD[14.33417] → [16.24328:24372]
∅:D[16.24372] → [14.33468:33483]
B:BD[14.33468] → [14.33468:33483]
```
        msg += " is slightly transparent.";
        break;
```
[14.33417]
[14.33483]
```
        return "slightly transparent";
```
Replacement in crawl-ref/source/direct.cc at line 1548 [6.3697945]
B:BD[14.33504] → [16.24373:24411]
∅:D[16.24411] → [14.33549:33564]
B:BD[14.33549] → [14.33549:33564]
```
        msg += " is in your thrall.";
        break;
```
[14.33504]
[14.33564]
```
        return "in your thrall";
```
Replacement in crawl-ref/source/direct.cc at line 1550 [6.3697945]
B:BD[14.33592] → [16.24412:24460]
∅:D[16.24460] → [14.33647:33662]
B:BD[14.33647] → [14.33647:33662]
```
        msg += " is covered in liquid flames.";
        break;
```
[14.33592]
[5.25579]
```
        return "covered in liquid flames";
```
Replacement in crawl-ref/source/direct.cc at line 1552 [6.3697945]
B:BD[5.25601] → [5.25601:25658]
```
        msg += " is entangled in a net.";
        break;
```
[5.25601]
[14.33662]
```
        return "entangled in a net";
```
Replacement in crawl-ref/source/direct.cc at line 1554 [6.3697945]
B:BD[14.33675] → [16.24461:24482]
∅:D[16.24482] → [14.33696:33711]
B:BD[14.33696] → [14.33696:33711]
```
        msg.clear();
        break;
```
[14.33675]
[14.33711]
```
        return "";
```
Deletion in crawl-ref/source/direct.cc at line 1556 [6.3697945]
B:BD[14.33731] → [16.24483:24532]
```
    if (!msg.empty())
        mpr(msg.c_str());
```
Replacement in crawl-ref/source/direct.cc at line 1558 [6.3697945]
B:BD[19.15179] → [19.15179:15231]
```
static void describe_monster_weapon(monsters *mons)
```
[19.15179]
[19.15231]
```
static std::string describe_monster_weapon(const monsters *mons)
```
Insertion in crawl-ref/source/direct.cc at line 1560 [6.3697945]
[19.15233]
[19.15233]
```
    std::string desc = "";
```

Replacement in crawl-ref/source/direct.cc at line 1562 [6.3697945]

B:BD[19.15263] → [19.15263:15373]

    const item_def *weap = mons->mslot_item(MSLOT_WEAPON),
        *alt = mons->mslot_item(MSLOT_ALT_WEAPON);

[19.15263]

[19.15373]

    const item_def *weap = mons->mslot_item(MSLOT_WEAPON);
    const item_def *alt = mons->mslot_item(MSLOT_ALT_WEAPON);

Replacement in crawl-ref/source/direct.cc at line 1582 [6.3697945]
B:BD[19.15817] → [19.15817:15833]
```
        return;
```
[19.15817]
[19.15833]
```
        return (desc);
```

Replacement in crawl-ref/source/direct.cc at line 1584 [6.3697945]

B:BD[19.15838] → [19.15838:15954]

    std::ostringstream msg;
    msg << mons_pronoun( mons->type, PRONOUN_CAP )
        << " is wielding " << name1;

[19.15838]

[19.15954]

    desc += " wielding ";
    desc += name1;

Replacement in crawl-ref/source/direct.cc at line 1588 [6.3697945]

B:BD[19.15979] → [19.15979:16033]

        msg << " and " << name2;
    
    msg << ".";

[19.15979]

[19.16033]

    {
        desc += " and ";
        desc += name2;
    }

Replacement in crawl-ref/source/direct.cc at line 1593 [6.3697945]
B:BD[19.16038] → [19.16038:16066]
```
    mpr(msg.str().c_str());
```
[19.16038]
[20.3980]
```
    return (desc);
```
Insertion in crawl-ref/source/direct.cc at line 1595 [6.3697945]
[20.3982]
[20.3982]

Insertion in crawl-ref/source/direct.cc at line 1612 [6.3697945]

[20.4385]

[14.33769]


static void describe_monster(const monsters *mon)
{
    // first print type and equipment
    std::string text = get_monster_desc(mon);
    text += ".";
    print_formatted_paragraph(text, get_number_of_cols());
    if (mon->type == MONS_HYDRA)
    {
        mprf("It has %d head%s.", mon->number,
             (mon->number > 1? "s" : ""));
    }

Insertion in crawl-ref/source/direct.cc at line 1627 [6.3697945]

[14.33770]

[17.473889]

    print_wounds(mon);
    
    if (!mons_is_mimic(mon->type) && mons_behaviour_perceptible(mon))
    {
       if (mon->behaviour == BEH_SLEEP)
       {
           mprf("%s appears to be resting.",
                mons_pronoun(mon->type, PRONOUN_CAP));
       }
       // Applies to both friendlies and hostiles
       else if (mon->behaviour == BEH_FLEE)
       {
           mprf("%s is retreating.",
                mons_pronoun(mon->type, PRONOUN_CAP));
       }
       // hostile with target != you
       else if (!mons_friendly(mon) && mon->foe != MHITYOU)
       {
           // special case: batty monsters get set to BEH_WANDER as
           // part of their special behaviour.
           if (!testbits(mon->flags, MF_BATTY))
           {
               mprf("%s doesn't appear to have noticed you.",
                    mons_pronoun(mon->type, PRONOUN_CAP));
           }
       }
    }
    if (mon->attitude == ATT_FRIENDLY)
        mprf("%s is friendly.", mons_pronoun(mon->type, PRONOUN_CAP));
    else if (mon->attitude == ATT_NEUTRAL)
        mprf("%s is indifferent to you.",
             mons_pronoun(mon->type, PRONOUN_CAP));
    std::string desc = "";
    std::string last_desc = "";
    std::string tmp = "";
    
    const bool paralysed = mons_is_paralysed(mon);
    if (paralysed)
        last_desc += "paralysed";
    for (mon_enchant_list::const_iterator e = mon->enchantments.begin();
         e != mon->enchantments.end(); ++e)
    {
         tmp = describe_mons_enchantment(*mon, e->second, paralysed);
         if (!tmp.empty())
         {
             if (!desc.empty())
                 desc += ", ";
             desc += last_desc;
             last_desc = tmp;
         }
    }
    
    if (!last_desc.empty())
    {
        if (!desc.empty())
            desc += ", and ";
        desc += last_desc;
    }
    if (!desc.empty())
    {
        text = mons_pronoun(mon->type, PRONOUN_CAP);
        text += " is ";
        text += desc;
        text += ".";
        print_formatted_paragraph(text, get_number_of_cols());
    }
}
std::string get_monster_desc(const monsters *mon, bool full_desc)
{
    std::string desc = mon->name(DESC_CAP_A);
    const int mon_arm = mon->inv[MSLOT_ARMOUR];
    std::string weap = "";
    if (mon->type != MONS_DANCING_WEAPON)
        weap = describe_monster_weapon(mon);
    if (!weap.empty())
    {
        if (full_desc)
            desc += ",";
        desc += weap;
    }
    if (full_desc && mon_arm != NON_ITEM)
    {
        desc += ", ";
        if (!weap.empty())
            desc += "and ";
        desc += "wearing ";
        desc += mitm[mon_arm].name(DESC_NOCAP_A);
    }
    
    return desc;
}

Deletion in crawl-ref/source/direct.cc at line 1754 [6.3697945]
B:BD[6.3718899] → [6.3718899:3718900]
B:BD[6.3718955] → [6.3718955:3719010]
B:BD[6.3719010] → [21.3422:3477]
∅:D[21.3477] → [22.12783:12784]
∅:D[23.12622] → [22.12783:12784]
∅:D[8.23994] → [22.12783:12784]
B:BD[22.12783] → [22.12783:12784]
B:BD[22.12784] → [19.16067:16163]
```
        const int mon_arm = menv[i].inv[MSLOT_ARMOUR];
        mprf("%s.", menv[i].name(DESC_CAP_A).c_str());
        if (menv[i].type != MONS_DANCING_WEAPON)
            describe_monster_weapon(&menv[i]);
```

Replacement in crawl-ref/source/direct.cc at line 1755 [6.3697945]

B:BD[6.3720034] → [6.3720034:3720067]

B:BD[6.3720067] → [24.1656:1752]

B:BD[24.1752] → [25.28269:28329]

∅:D[25.28329] → [6.3720328:3720369]

B:BD[6.3720328] → [6.3720328:3720369]

B:BD[6.3720369] → [24.1813:1918]

∅:D[24.1918] → [6.3720491:3720525]

B:BD[6.3720491] → [6.3720491:3720525]

        if (mon_arm != NON_ITEM)
            mprf("%s is wearing %s.",
                 mons_pronoun(menv[i].type, PRONOUN_CAP),
                 mitm[mon_arm].name(DESC_NOCAP_A).c_str());
        if (menv[i].type == MONS_HYDRA)
            mprf("It has %d head%s.", menv[i].number,
                 (menv[i].number > 1? "s" : ""));;
        print_wounds(&menv[i]);

[6.3720034]

[6.3720526]

        describe_monster(&menv[i]);

Deletion in crawl-ref/source/direct.cc at line 1759 [6.3697945]

B:BD[6.3720600] → [26.6018:6073]

∅:D[26.6073] → [6.3720658:3720730]

∅:D[13.982509] → [6.3720658:3720730]

B:BD[6.3720658] → [6.3720658:3720730]

B:BD[6.3720730] → [2.284:334]

∅:D[2.334] → [24.1982:2045]

B:BD[24.1982] → [24.1982:2045]

∅:D[24.2045] → [6.3720898:3720912]

B:BD[6.3720898] → [6.3720898:3720912]

B:BD[6.3720912] → [17.474123:474244]

B:BD[17.474244] → [24.2046:2151]

∅:D[24.2151] → [17.474398:474527]

B:BD[17.474398] → [17.474398:474527]

∅:D[17.474527] → [6.3721095:3721290]

B:BD[6.3721095] → [6.3721095:3721290]

B:BD[6.3721290] → [2.335:402]

∅:D[2.402] → [27.586:653]

B:BD[27.586] → [27.586:653]

∅:D[27.653] → [6.3721510:3721534]

B:BD[6.3721510] → [6.3721510:3721534]

        else if (mons_behaviour_perceptible(&menv[i]))
        {
            if (menv[i].behaviour == BEH_SLEEP)
            {
                mprf("%s appears to be resting.",
                     mons_pronoun(menv[i].type, PRONOUN_CAP));
            }
            // Applies to both friendlies and hostiles
            else if (menv[i].behaviour == BEH_FLEE)
            {
                mprf("%s is retreating.",
                     mons_pronoun(menv[i].type, PRONOUN_CAP));
            }
            // hostile with target != you
            else if (!mons_friendly(&menv[i]) && menv[i].foe != MHITYOU)
            {
                // special case: batty monsters get set to BEH_WANDER as
                // part of their special behaviour.
                if (!testbits(menv[i].flags, MF_BATTY))
                    mprf("%s doesn't appear to have noticed you.",
                         mons_pronoun(menv[i].type, PRONOUN_CAP));
            }
        }

Deletion in crawl-ref/source/direct.cc at line 1760 [6.3697945]

B:BD[6.3721535] → [6.3721535:3721581]

B:BD[6.3721581] → [27.654:732]

B:BD[27.732] → [3.13731:13886]

∅:D[3.13886] → [28.160:323]

B:BD[27.732] → [28.160:323]

∅:D[28.323] → [6.3721734:3721735]

∅:D[27.732] → [6.3721734:3721735]

B:BD[6.3721734] → [6.3721734:3721735]

B:BD[6.3721735] → [14.33771:33902]

∅:D[14.33902] → [6.3721786:3721796]

B:BD[6.3721786] → [6.3721786:3721796]

B:BD[6.3721796] → [29.11081:11151]

∅:D[29.11151] → [6.3723514:3723524]

∅:D[14.33966] → [6.3723514:3723524]

B:BD[6.3723514] → [6.3723514:3723524]

        if (menv[i].attitude == ATT_FRIENDLY)
            mprf("%s is friendly.", mons_pronoun(menv[i].type, PRONOUN_CAP));
        else if (menv[i].attitude == ATT_NEUTRAL)
            mprf("%s is indifferent to you.",
                 mons_pronoun(menv[i].type, PRONOUN_CAP));
        const bool paralysed = mons_is_paralysed(&menv[i]);
        if (paralysed)
            mprf("%s is paralysed.", mons_pronoun(menv[i].type, PRONOUN_CAP));
        for (mon_enchant_list::const_iterator e = menv[i].enchantments.begin();
             e != menv[i].enchantments.end(); ++e)
        {
            describe_mons_enchantment(menv[i], e->second, paralysed);
        }

Replacement in crawl-ref/source/delay.cc at line 997 [6.3963459]

B:BD[30.954] → [30.954:1006]

B:BD[30.1006] → [21.4134:4183]

            mprf(MSGCH_WARN, "%s comes into view.",
                 mon->name(DESC_CAP_A).c_str());

[30.954]

[4.23423]

        {
            std::string text = get_monster_desc(mon, false);
            text += " comes into view.";
            print_formatted_paragraph(text, get_number_of_cols(), MSGCH_WARN);
        }

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

B:BD[6.4241260] → [6.4241260:4241291]

            print_wounds(mon);

[6.4241260]

[6.4241291]

        {
            const monsters *mons = static_cast<const monsters*>(mon);
            print_wounds(mons);
        }

Condensed monster descriptions.

Dependencies

In channels

Change contents

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

Replacement in crawl-ref/source/spells3.cc at line 215 [6.531613]

Replacement in crawl-ref/source/spells2.cc at line 903 [6.569242]

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

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

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

Replacement in crawl-ref/source/mon-util.cc at line 2920 [6.1699344]

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

Replacement in crawl-ref/source/externs.h at line 1090 [6.3270163]

Insertion in crawl-ref/source/direct.h at line 56 [6.3696722]

Replacement in crawl-ref/source/direct.cc at line 1515 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1522 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1525 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1530 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1532 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1534 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1536 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1538 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1540 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1542 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1544 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1546 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1548 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1550 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1552 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1554 [6.3697945]

Deletion in crawl-ref/source/direct.cc at line 1556 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1558 [6.3697945]

Insertion in crawl-ref/source/direct.cc at line 1560 [6.3697945]