fiddlerwoaroof/crawl - Change EC76VUBNPZVDOVDX3KPSDF3KCNMOOGXZEALYVDATPE42BCA4GUVQC

Properly name spectral things made from uniques via Death Channel.

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

Created by dolorous on December 30, 2008

EC76VUBNPZVDOVDX3KPSDF3KCNMOOGXZEALYVDATPE42BCA4GUVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1264 [3.1396662]

B:BD[3.1412047] → [3.1412047:1412120]

                    inc_mp( 1 + random2(monster->hit_dice / 2), false );

[3.1412047]

[3.1412120]

                    inc_mp(1 + random2(monster->hit_dice / 2), false);

Replacement in crawl-ref/source/monstuff.cc at line 1284 [3.1396662]

B:BD[3.1412340] → [4.2838:2912]

                const monster_type spectre = mons_species(monster->type);

[3.1412340]

[5.2862]

                const int type = monster->type;
                const int spectre_type = mons_species(type);
                const std::string name_plain = monster->name(DESC_PLAIN);

Replacement in crawl-ref/source/monstuff.cc at line 1289 [3.1396662]

B:BD[4.2986] → [6.2750:2818]

∅:D[6.2818] → [4.3049:3088]

B:BD[4.3049] → [4.3049:3088]

B:BD[4.3088] → [2.2624:2932]

                if ((spectre != MONS_HYDRA || monster->number != 0)
                    && create_monster(
                        mgen_data(MONS_SPECTRAL_THING, BEH_FRIENDLY,
                                  0, monster->pos(), you.pet_target,
                                  0, static_cast<god_type>(you.attribute[ATTR_DIVINE_DEATH_CHANNEL]),
                                  spectre, monster->number)) != -1)

[4.2986]

[3.1412564]

                if (spectre_type != MONS_HYDRA || monster->number != 0)

Replacement in crawl-ref/source/monstuff.cc at line 1291 [3.1396662]

B:BD[3.1412582] → [3.1412582:1412688]

                    if (death_message)
                        mpr("A glowing mist starts to gather...");

[3.1412582]

[3.1412688]

                    const int spectre =
                        create_monster(
                            mgen_data(MONS_SPECTRAL_THING, BEH_FRIENDLY,
                                0, monster->pos(), you.pet_target,
                                0, static_cast<god_type>(you.attribute[ATTR_DIVINE_DEATH_CHANNEL]),
                                spectre_type, monster->number)) != -1)
                    if (spectre != -1)
                    {
                        if (death_message)
                            mpr("A glowing mist starts to gather...");
                        if (mons_is_unique(type))
                        {
                            menv[spectre].mname = name_plain;
                            // Special case for Blork the orc: shorten
                            // his name to "Blork" to avoid mentions of
                            // "Blork the orc the spectral orc".
                            if (type == MONS_BLORK_THE_ORC)
                                menv[spectre].mname = "Blork";
                        }
                    }