fiddlerwoaroof/crawl - Change RSIUBEQUGNU4LO6KH4PKVROWQS33DAKSY4XFVGN7T3CEKSXABCSAC

Removed all uses of str_monam() outside of mon-util.cc; str_monam() is

now static.

Some description fixes (mainly for mummies and nagas.)

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

Created by haranp on July 7, 2007

RSIUBEQUGNU4LO6KH4PKVROWQS33DAKSY4XFVGN7T3CEKSXABCSAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 145 [10.224557]

B:BD[8.203] → [9.136:198]

                 str_monam( *fmenv, DESC_CAP_THE ).c_str() );

[8.203]

[10.228228]

                 fmenv->name(DESC_CAP_THE, true).c_str() );

Replacement in crawl-ref/source/stuff.cc at line 1119 [10.224557]

B:BD[11.24171] → [9.199:255]

                 str_monam(*mon, DESC_PLAIN).c_str() );

[11.24171]

[12.116470]

                 mon->name(DESC_PLAIN, true).c_str() );

Replacement in crawl-ref/source/spells4.cc at line 1272 [10.436250]

B:BD[8.4466] → [9.269:333]

                  str_monam( menv[mon], DESC_CAP_THE).c_str());

[8.4466]

[10.471795]

                  menv[mon].name(DESC_CAP_THE).c_str());

Replacement in crawl-ref/source/spells4.cc at line 1376 [10.436250]

B:BD[8.5008] → [9.334:394]

             str_monam(*defender, DESC_NOCAP_THE).c_str());

[8.5008]

[10.475076]

             defender->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells4.cc at line 1382 [10.436250]

B:BD[8.5108] → [9.395:456]

             str_monam(*defender, DESC_NOCAP_THE ).c_str());

[8.5108]

[10.475338]

             defender->name(DESC_NOCAP_THE).c_str());

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

B:BD[10.485403] → [9.457:519]

        std::string msg = str_monam(menv[mon], DESC_CAP_THE);

[10.485403]

[10.485465]

        std::string msg = menv[mon].name(DESC_CAP_THE);

Replacement in crawl-ref/source/spells4.cc at line 2303 [10.436250]

B:BD[10.501016] → [9.520:600]

    mprf("%s sways back and forth.",str_monam(menv[mon],DESC_CAP_THE).c_str());

[10.501016]

[10.501132]

    mprf("%s sways back and forth.", menv[mon].name(DESC_CAP_THE).c_str());

Replacement in crawl-ref/source/spells4.cc at line 2361 [10.436250]

B:BD[10.502729] → [9.601:667]

                  str_monam( menv[mon], DESC_CAP_THE ).c_str() );

[10.502729]

[10.502790]

                  menv[mon].name(DESC_CAP_THE).c_str() );

Replacement in crawl-ref/source/spells4.cc at line 2924 [10.436250]

B:BD[10.519441] → [9.668:746]

            mprf("%s twitches.", str_monam(menv[mon], DESC_CAP_THE).c_str());

[10.519441]

[10.519588]

            mprf("%s twitches.", menv[mon].name(DESC_CAP_THE).c_str());

Replacement in crawl-ref/source/spells3.cc at line 206 [10.531613]

B:BD[10.537204] → [9.749:827]

        mprf("You smite %s!", str_monam( *monster, DESC_NOCAP_THE ).c_str());

[10.537204]

[10.537346]

        mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells3.cc at line 209 [10.531613]

B:BD[13.181] → [13.181:261]

        // in my book (the old max damage was around 70, which seems excessive.

[13.181]

[13.261]

        // in my book (the old max damage was around 70, which seems excessive)

Replacement in crawl-ref/source/spells3.cc at line 239 [10.531613]

B:BD[13.380] → [9.828:889]

             str_monam( *monster, DESC_NOCAP_THE ).c_str());

[13.380]

[10.538269]

             monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 839 [10.569242]

B:BD[8.6764] → [9.892:961]

                     str_monam( *monster, DESC_NOCAP_THE ).c_str());

[8.6764]

[10.590850]

                     monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 889 [10.569242]

B:BD[9.997] → [9.997:1060]

                 str_monam(*monster, DESC_NOCAP_THE).c_str());

[9.997]

[10.592116]

                 monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 947 [10.569242]

B:BD[9.1104] → [9.1104:1167]

                 str_monam(*monster, DESC_NOCAP_THE).c_str());

[9.1104]

[10.593777]

                 monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 1023 [10.569242]

B:BD[8.7040] → [9.1168:1225]

         str_monam( *monster, DESC_NOCAP_THE ).c_str());

[8.7040]

[10.595874]

         monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 1080 [10.569242]

B:BD[8.7363] → [9.1226:1283]

         str_monam( *monster, DESC_NOCAP_THE ).c_str());

[8.7363]

[10.597438]

         monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 1084 [10.569242]
B:BD[10.597487] → [10.597487:597509]
```
    struct bolt beam;
```
[10.597487]
[10.597509]
```
    bolt beam;
```

Replacement in crawl-ref/source/spells1.cc at line 539 [10.616635]

B:BD[10.626832] → [9.1286:1363]

        mprf("You heal %s.", str_monam( *monster, DESC_NOCAP_THE ).c_str());

[10.626832]

[10.626973]

        mprf("You heal %s.", monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/mstuff2.cc at line 184 [10.1340842]

B:BD[14.17294] → [9.1464:1530]

                    msg += str_monam( *monster, DESC_NOCAP_THE );

[14.17294]

[10.1346629]

                    msg += monster->name(DESC_NOCAP_THE);

Replacement in crawl-ref/source/mstuff2.cc at line 294 [10.1340842]

B:BD[10.1350264] → [9.1531:1600]

                      str_monam( *monster, DESC_NOCAP_THE ).c_str(),

[10.1350264]

[12.397362]

                      monster->name(DESC_NOCAP_THE).c_str(),

Replacement in crawl-ref/source/mstuff2.cc at line 1207 [10.1340842]
B:BD[12.404102] → [9.1601:1658]
```
    std::string msg = str_monam(*monster, DESC_CAP_THE);
```
[12.404102]
[5.1455]
```
    std::string msg = monster->name(DESC_CAP_THE);
```

Replacement in crawl-ref/source/mstuff2.cc at line 1233 [10.1340842]

B:BD[12.404422] → [9.1659:1724]

                  str_monam( *monster, DESC_NOCAP_A ).c_str() );

[12.404422]

[10.1373542]

                  monster->name(DESC_NOCAP_A).c_str() );

Replacement in crawl-ref/source/mstuff2.cc at line 1239 [10.1340842]

B:BD[12.404500] → [9.1725:1790]

                  str_monam( *monster, DESC_NOCAP_A ).c_str() );

[12.404500]

[10.1373778]

                  monster->name(DESC_NOCAP_A).c_str() );

Replacement in crawl-ref/source/monstuff.cc at line 394 [10.1396662]

∅:D[6.930] → [9.1793:1871]

B:BD[15.412] → [9.1793:1871]

                           str_monam(*monster, DESC_NOCAP_A, true).c_str()));

[6.930]

[15.481]

                           monster->name(DESC_NOCAP_A, true).c_str()));

Replacement in crawl-ref/source/monstuff.cc at line 519 [10.1396662]

B:BD[14.18099] → [9.1872:1939]

                     str_monam(*monster, DESC_NOCAP_THE).c_str());

[14.18099]

[16.1171]

                     monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/monstuff.cc at line 1077 [10.1396662]

B:BD[17.7927] → [9.1940:2014]

                       str_monam(*monster, DESC_NOCAP_A, true).c_str()));

[17.7927]

[17.7989]

                       monster->name(DESC_NOCAP_A, true).c_str()));

Replacement in crawl-ref/source/monstuff.cc at line 1871 [10.1396662]

B:BD[10.1451608] → [9.2109:2174]

                  str_monam(*monster, descrip).c_str(), event );

[10.1451608]

[10.1451669]

                  monster->name(descrip).c_str(), event );

Replacement in crawl-ref/source/monstuff.cc at line 4082 [10.1396662]

B:BD[9.2869] → [9.2869:2937]

                 str_monam(*m2, DESC_PLAIN).c_str(), m2->x, m2->y);

[9.2869]

[12.442370]

                 m2->name(DESC_PLAIN).c_str(), m2->x, m2->y);

Replacement in crawl-ref/source/monstuff.cc at line 4185 [10.1396662]

B:BD[16.4687] → [9.2938:2995]

                 str_monam(*mons, DESC_CAP_THE).c_str(),

[16.4687]

[16.4735]

                 mons->name(DESC_CAP_THE).c_str(),

Replacement in crawl-ref/source/monstuff.cc at line 4693 [10.1396662]

B:BD[8.15543] → [9.2996:3060]

                 str_monam( *monster, DESC_CAP_THE ).c_str() );

[8.15543]

[10.1545660]

                 monster->name(DESC_CAP_THE).c_str() );

Replacement in crawl-ref/source/monstuff.cc at line 5044 [10.1396662]

B:BD[18.353] → [9.3061:3124]

                  str_monam(*montarget, DESC_PLAIN).c_str() );

[18.353]

[18.411]

                  montarget->name(DESC_PLAIN).c_str() );

Replacement in crawl-ref/source/monstuff.cc at line 5170 [10.1396662]

B:BD[19.778] → [9.3125:3187]

                 str_monam(*monster, DESC_NOCAP_A).c_str()));

[19.778]

[12.447794]

                 monster->name(DESC_NOCAP_A).c_str()));

Replacement in crawl-ref/source/monspeak.cc at line 159 [10.1558496]

B:BD[10.1559687] → [9.3235:3301]

    const std::string m_name = str_monam(*monster, DESC_CAP_THE);

[10.1559687]

[9.3301]

    const std::string m_name = monster->name(DESC_CAP_THE);

Replacement in crawl-ref/source/monplace.cc at line 404 [10.1641732]
B:BD[10.1650903] → [9.5062:5115]
```
            msg = str_monam( menv[id], DESC_CAP_A );
```
[10.1650903]
[10.1650965]
```
            msg = menv[id].name(DESC_CAP_A);
```
Deletion in crawl-ref/source/mon-util.h at line 123 [10.1682293]
∅:D[20.4428] → [10.1688407:1688408]
∅:D[21.6024] → [10.1688407:1688408]
B:BD[10.1688407] → [10.1688407:1688408]
B:BD[10.1688408] → [9.5427:5539]
∅:D[9.5539] → [22.1855:1903]
B:BD[22.1855] → [22.1855:1903]
```
// this is the old monam(), ptr_monam()
std::string str_monam(const monsters& mon, description_level_type desc,
                      bool force_seen = false);
```

Replacement in crawl-ref/source/mon-util.cc at line 1365 [10.1699344]

B:BD[10.1727011] → [9.5664:5736]

∅:D[9.5736] → [22.2110:2149]

B:BD[22.2110] → [22.2110:2149]

std::string str_monam(const monsters& mon, description_level_type desc,
                      bool force_seen)

[10.1727011]

[22.2149]

static std::string str_monam(const monsters& mon, description_level_type desc,
                             bool force_seen)

Deletion in crawl-ref/source/mon-util.cc at line 1378 [10.1699344]
B:BD[9.6051] → [9.6051:6100]
```
            mpr("XXX OOPS!", MSGCH_DIAGNOSTICS);
```

Insertion in crawl-ref/source/mon-util.cc at line 2840 [10.1699344]

[23.9866]

{
    return this->name(desc, false);
}
std::string monsters::name(description_level_type desc, bool force_vis) const

Replacement in crawl-ref/source/mon-util.cc at line 2851 [10.1699344]
B:BD[24.1621] → [9.9746:9794]
```
    std::string mname = str_monam(*this, desc);
```
[24.1621]
[24.1668]
```
    std::string mname = str_monam(*this, desc, force_vis);
```

Deletion in crawl-ref/source/mon-util.cc at line 2855 [10.1699344]

B:BD[25.3018] → [25.3018:3173]


std::string monsters::name(description_level_type desc, bool force_vis) const
{
    if (!force_vis || !has_ench(ENCH_INVIS))
        return (name(desc));

Deletion in crawl-ref/source/mon-util.cc at line 2856 [10.1699344]
B:BD[25.3174] → [25.3174:3259]
∅:D[25.3259] → [23.9904:9907]
B:BD[23.9904] → [23.9904:9907]
```
    monsters m = *this;
    m.del_ench(ENCH_INVIS, true);
    return (m.name(desc));
}
```

Replacement in crawl-ref/source/misc.cc at line 1942 [10.1933596]

B:BD[26.256] → [9.9844:9898]

                 str_monam(m, DESC_NOCAP_A).c_str());

[26.256]

[27.1965]

                 m.name(DESC_NOCAP_A).c_str());

Replacement in crawl-ref/source/insult.cc at line 44 [10.2941230]

B:BD[10.2942232] → [9.10499:10566]

    const std::string mon_name = str_monam( *mons, DESC_CAP_THE );

[10.2942232]

[10.2942292]

    const std::string mon_name = mons->name(DESC_CAP_THE);

Replacement in crawl-ref/source/insult.cc at line 85 [10.2941230]

B:BD[10.2943237] → [9.10756:10823]

    const std::string mon_name = str_monam( *mons, DESC_CAP_THE );

[10.2943237]

[10.2943297]

    const std::string mon_name = mons->name(DESC_CAP_THE);

Replacement in crawl-ref/source/hiscores.cc at line 810 [10.2987663]

B:BD[12.823615] → [9.11143:11216]

            death_source_name = str_monam(*monster, DESC_NOCAP_A, true);

[12.823615]

[12.823706]

            death_source_name = monster->name(DESC_NOCAP_A, true);

Replacement in crawl-ref/source/files.cc at line 932 [10.3084589]

B:BD[7.1732] → [7.1732:1791]

                 str_monam(*fmenv, DESC_CAP_THE).c_str());

[7.1732]

[28.9641]

                 fmenv->name(DESC_CAP_THE, true).c_str());

Replacement in crawl-ref/source/fight.cc at line 857 [10.3140790]

B:BD[9.11706] → [9.11706:11757]

                << str_monam(*def, DESC_NOCAP_THE)

[9.11706]

[9.11757]

                << def->name(DESC_NOCAP_THE)

Replacement in crawl-ref/source/fight.cc at line 880 [10.3140790]

B:BD[4.316] → [4.316:367]

                << str_monam(*def, DESC_NOCAP_THE)

[4.316]

[4.367]

                << def->name(DESC_NOCAP_THE)

Replacement in crawl-ref/source/fight.cc at line 2012 [10.3140790]

B:BD[9.12054] → [9.12054:12134]

                        << str_monam(*def, DESC_NOCAP_THE) << '.' << std::endl;

[9.12054]

[23.68220]

                        << def->name(DESC_NOCAP_THE) << '.' << std::endl;

Replacement in crawl-ref/source/fight.cc at line 3413 [10.3140790]

B:BD[23.80387] → [9.12135:12201]

                  str_monam(*defender, DESC_NOCAP_THE).c_str() );

[23.80387]

[23.80444]

                  defender->name(DESC_NOCAP_THE).c_str() );

Replacement in crawl-ref/source/fight.cc at line 3418 [10.3140790]

B:BD[23.80534] → [9.12202:12268]

                  str_monam(*defender, DESC_NOCAP_THE).c_str() );

[23.80534]

[23.80591]

                  defender->name(DESC_NOCAP_THE).c_str() );

Replacement in crawl-ref/source/fight.cc at line 3425 [10.3140790]

B:BD[23.80735] → [9.12269:12335]

                  str_monam(*defender, DESC_NOCAP_THE).c_str() );

[23.80735]

[23.80792]

                  defender->name(DESC_NOCAP_THE).c_str() );

Replacement in crawl-ref/source/fight.cc at line 3430 [10.3140790]

B:BD[23.80873] → [9.12336:12402]

                  str_monam(*defender, DESC_NOCAP_THE).c_str() );

[23.80873]

[23.80930]

                  defender->name(DESC_NOCAP_THE).c_str() );

Replacement in crawl-ref/source/fight.cc at line 3435 [10.3140790]

B:BD[23.81008] → [9.12403:12462]

              str_monam(*defender, DESC_CAP_THE).c_str(),

[23.81008]

[23.81058]

              defender->name(DESC_CAP_THE).c_str(),

Replacement in crawl-ref/source/direct.cc at line 1604 [10.3697945]

B:BD[10.3719010] → [29.23933:23994]

        mprf("%s.", str_monam(menv[i], DESC_CAP_A).c_str());

[10.3719010]

[30.12783]

        mprf("%s.", menv[i].name(DESC_CAP_A).c_str());

Replacement in crawl-ref/source/describe.cc at line 3540 [10.3736416]
B:BD[12.988435] → [9.12625:12683]
```
    description << str_monam( mons, DESC_CAP_A ) << "$$";
```
[12.988435]
[31.38858]
```
    description << mons.name(DESC_CAP_A) << "$$";
```

Replacement in crawl-ref/source/describe.cc at line 3557 [10.3736416]

B:BD[31.39685] → [9.12684:12752]

    description << getLongDescription(str_monam(mons, DESC_PLAIN));

[31.39685]

[32.3493]

    description << getLongDescription(mons.name(DESC_PLAIN));

Deletion in crawl-ref/source/describe.cc at line 3577 [10.3736416]
B:BD[10.3902706] → [10.3902706:3902735]
B:BD[10.3902735] → [33.2956:3050]
∅:D[33.3050] → [10.3902735:3902763]
B:BD[10.3902735] → [10.3902735:3902763]
B:BD[10.3902763] → [33.3051:3158]
∅:D[33.3158] → [10.3903013:3903029]
B:BD[10.3903013] → [10.3903013:3903029]
```
    case MONS_GREATER_MUMMY:
        description << "The embalmed and undead corpse of an ancient ruler.";
        break;
    case MONS_MUMMY_PRIEST:
        description << "The embalmed and undead corpse of an ancient "
            "servant of darkness.";
        break;
```

Replacement in crawl-ref/source/describe.cc at line 3585 [10.3736416]

B:BD[10.3903525] → [33.3159:3205]

∅:D[33.3205] → [10.3903571:3903637]

B:BD[10.3903571] → [10.3903571:3903637]

            description << "These nagas are "
                "often used as guardians by powerful creatures.";

[10.3903525]

[10.3903637]

            description << getLongDescription("naga")
                        << "$These nagas are often used as guardians "
                "by powerful creatures.$";

Replacement in crawl-ref/source/describe.cc at line 3590 [10.3736416]

B:BD[10.3903688] → [33.3206:3268]

            description << "It looks strong and aggressive.";

[10.3903688]

[10.3903750]

            description << getLongDescription("naga")
                        << "$It looks strong and aggressive.$";

Replacement in crawl-ref/source/describe.cc at line 3594 [10.3736416]

B:BD[10.3903798] → [33.3269:3338]

            description << "An eldritch nimbus trails its motions.";

[10.3903798]

[10.3903868]

            description << getLongDescription("naga")
                        << "$An eldritch nimbus trails its motions.$";

Replacement in crawl-ref/source/describe.cc at line 3598 [10.3736416]

B:BD[10.3903919] → [33.3339:3406]

            description << "It bears scars of many past battles.";

[10.3903919]

[10.3903987]

            description << getLongDescription("naga")
                        << "$It bears scars of many past battles.$";

Deletion in crawl-ref/source/describe.cc at line 3656 [10.3736416]

∅:D[33.5438] → [10.3938640:3938656]

∅:D[31.39961] → [10.3938640:3938656]

B:BD[10.3938640] → [10.3938640:3938656]

B:BD[10.3938809] → [10.3938809:3938833]

B:BD[10.3938833] → [33.5439:5675]

        break;
    case MONS_SHUGGOTH:
        description << "A vile creature with an elongated head, spiked tail "
            "and wicked six-fingered claws. Its awesome strength is matched "
            "by its umbrage at being transported to this backwater dimension.";

Replacement in crawl-ref/source/delay.cc at line 979 [10.3963459]

B:BD[3.1006] → [3.1006:1061]

                 str_monam(*mon, DESC_CAP_A).c_str());

[3.1006]

[34.2321]

                 mon->name(DESC_CAP_A).c_str());

Replacement in crawl-ref/source/delay.cc at line 982 [10.3963459]

B:BD[35.2805] → [9.12855:12926]

        fs.cprintf("%s (", str_monam(*mon, DESC_PLAIN, true).c_str());

[35.2805]

[35.2861]

        fs.cprintf("%s (", mon->name(DESC_PLAIN, true).c_str());

Replacement in crawl-ref/source/debug.cc at line 930 [10.4016436]

B:BD[8.22092] → [9.12932:12989]

         str_monam(menv[i], DESC_CAP_THE, true).c_str(),

[8.22092]

[8.22170]

         menv[i].name(DESC_CAP_THE, true).c_str(),

Replacement in crawl-ref/source/debug.cc at line 966 [10.4016436]

B:BD[8.23649] → [9.12990:13059]

          : str_monam(menv[menv[i].foe], DESC_PLAIN, true).c_str()),

[8.23649]

[8.23778]

          : menv[menv[i].foe].name(DESC_PLAIN, true).c_str()),

Replacement in crawl-ref/source/debug.cc at line 1100 [10.4016436]

B:BD[8.24907] → [9.13060:13134]

                             j, str_monam( menv[j], DESC_CAP_A ).c_str(),

[8.24907]

[8.24974]

                             j, menv[j].name(DESC_CAP_A, true).c_str(),

Replacement in crawl-ref/source/debug.cc at line 1162 [10.4016436]

B:BD[10.4056735] → [9.13212:13285]

        if (str_monam(monster, DESC_PLAIN, true).find("questionable") !=

[10.4056735]

[9.13285]

        if (monster.name(DESC_PLAIN, true).find("questionable") !=

Replacement in crawl-ref/source/debug.cc at line 1700 [10.4016436]

B:BD[12.1031970] → [9.13363:13441]

    fprintf(o, "Monster   : %s\n", str_monam(mon, DESC_PLAIN, true).c_str());

[12.1031970]

[12.1032088]

    fprintf(o, "Monster   : %s\n", mon.name(DESC_PLAIN, true).c_str());

Replacement in crawl-ref/source/debug.cc at line 1712 [10.4016436]

B:BD[12.1032533] → [9.13442:13502]

            str_monam(menv[mon], DESC_PLAIN, true).c_str(),

[12.1032533]

[12.1032592]

            menv[mon].name(DESC_PLAIN, true).c_str(),

Deletion in crawl-ref/source/dat/descript.txt at line 160 [30.17579]

B:BD[30.22346] → [30.22346:22464]

B:BD[30.22464] → [2.2079:3018]

%%%%
guardian naga
A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
"The insensible son of Pandu sank down till he reached the Naga kingdom.
Nagas, furnished with fangs containing virulent venom, bit him by
thousands. The vegetable poison, mingled in the blood of the son of the
Wind god, was neutralised by the snake-poison. The serpents had bitten
all over his frame, except his chest, the skin of which was so tough that
their fangs could not penetrate it.
"On regaining consciousness, the son of Kunti burst his bands and began
to press the snakes down under the ground. A remnant fled for life, and
going to their king Vasuki, represented, 'O king of snakes, a man drowned
under the water, bound in chords of shrubs; probably he had drunk poison.
For when he fell amongst us, he was insensible. But when we began to bite
him, he regained his senses, and bursting his fetters, commenced laying
at us. May it please Your Majesty to enquire who is.'"
	-_The Mahabharata, Sambhava Parva, Section CXXVIII

Insertion in crawl-ref/source/dat/descript.txt at line 668 [30.17579]

[30.35628]

%%%%
shuggoth
A vile creature with an elongated head, spiked tail and wicked six-fingered claws. Its awesome strength is matched by its umbrage at being transported to this backwater dimension.

Deletion in crawl-ref/source/dat/descript.txt at line 707 [30.17579]

B:BD[30.36375] → [30.36375:36491]

B:BD[30.36491] → [2.5105:6044]

∅:D[2.6044] → [30.36491:36609]

B:BD[30.36491] → [30.36491:36609]

B:BD[30.36609] → [2.6045:6984]

%%%%
naga mage
A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake. 
"The insensible son of Pandu sank down till he reached the Naga kingdom.
Nagas, furnished with fangs containing virulent venom, bit him by
thousands. The vegetable poison, mingled in the blood of the son of the
Wind god, was neutralised by the snake-poison. The serpents had bitten
all over his frame, except his chest, the skin of which was so tough that
their fangs could not penetrate it.
"On regaining consciousness, the son of Kunti burst his bands and began
to press the snakes down under the ground. A remnant fled for life, and
going to their king Vasuki, represented, 'O king of snakes, a man drowned
under the water, bound in chords of shrubs; probably he had drunk poison.
For when he fell amongst us, he was insensible. But when we began to bite
him, he regained his senses, and bursting his fetters, commenced laying
at us. May it please Your Majesty to enquire who is.'"
	-_The Mahabharata, Sambhava Parva, Section CXXVIII
%%%%
naga warrior
A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake. 
"The insensible son of Pandu sank down till he reached the Naga kingdom.
Nagas, furnished with fangs containing virulent venom, bit him by
thousands. The vegetable poison, mingled in the blood of the son of the
Wind god, was neutralised by the snake-poison. The serpents had bitten
all over his frame, except his chest, the skin of which was so tough that
their fangs could not penetrate it.
"On regaining consciousness, the son of Kunti burst his bands and began
to press the snakes down under the ground. A remnant fled for life, and
going to their king Vasuki, represented, 'O king of snakes, a man drowned
under the water, bound in chords of shrubs; probably he had drunk poison.
For when he fell amongst us, he was insensible. But when we began to bite
him, he regained his senses, and bursting his fetters, commenced laying
at us. May it please Your Majesty to enquire who is.'"
	-_The Mahabharata, Sambhava Parva, Section CXXVIII

Deletion in crawl-ref/source/dat/descript.txt at line 985 [30.17579]

B:BD[30.40863] → [30.40863:40982]

B:BD[30.40982] → [2.6985:7924]

%%%%
greater naga
A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake. 
"The insensible son of Pandu sank down till he reached the Naga kingdom.
Nagas, furnished with fangs containing virulent venom, bit him by
thousands. The vegetable poison, mingled in the blood of the son of the
Wind god, was neutralised by the snake-poison. The serpents had bitten
all over his frame, except his chest, the skin of which was so tough that
their fangs could not penetrate it.
"On regaining consciousness, the son of Kunti burst his bands and began
to press the snakes down under the ground. A remnant fled for life, and
going to their king Vasuki, represented, 'O king of snakes, a man drowned
under the water, bound in chords of shrubs; probably he had drunk poison.
For when he fell amongst us, he was insensible. But when we began to bite
him, he regained his senses, and bursting his fetters, commenced laying
at us. May it please Your Majesty to enquire who is.'"
	-_The Mahabharata, Sambhava Parva, Section CXXVIII

Replacement in crawl-ref/source/dat/descript.txt at line 1007 [30.17579]
B:BD[30.41451] → [30.41451:41468]
```
A greater mummy.
```
[30.41451]
[30.41468]
```
The embalmed and undead corpse of an ancient ruler.
```
Replacement in crawl-ref/source/dat/descript.txt at line 1011 [30.17579]
B:BD[30.41486] → [36.1120:1136]
```
A mummy priest.
```
[30.41486]
[30.41501]
```
The embalmed and undead corpse of an ancient servant of darkness.
```

Replacement in crawl-ref/source/beam.cc at line 1996 [10.4128068]

B:BD[37.3048] → [9.13622:13698]

        const std::string monster_name = str_monam(*monster, DESC_CAP_THE);

[37.3048]

[37.3123]

        const std::string monster_name = monster->name(DESC_CAP_THE);

Replacement in crawl-ref/source/beam.cc at line 2980 [10.4128068]
B:BD[25.10060] → [9.13699:13751]
```
        return str_monam( menv[bsrc], DESC_PLAIN );
```
[25.10060]
[38.426]
```
        return menv[bsrc].name(DESC_PLAIN);
```

Replacement in crawl-ref/source/beam.cc at line 3582 [10.4128068]

B:BD[39.411] → [9.13752:13832]

             str_monam(*mon, DESC_PLAIN).c_str(),hurt, raw_damage, hurt_final);

[39.411]

[10.4237417]

             mon->name(DESC_PLAIN).c_str(), hurt, raw_damage, hurt_final);

Replacement in crawl-ref/source/beam.cc at line 3667 [10.4128068]

B:BD[9.14092] → [9.14092:14145]

             str_monam(*mon, DESC_NOCAP_THE).c_str()

[9.14092]

[9.14145]

             mon->name(DESC_NOCAP_THE).c_str()