fiddlerwoaroof/crawl - Change LBAEEWNFLP57VMYSLRSTQ5MNHSQJVFWYWQBMPXUQIOAVEP3YF7KAC

Code cleanups with monster speech (targeted beams, etc.)

Paranoia for [2482120] ("you resist" message across the level.)

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

Created by haranp on February 28, 2009

LBAEEWNFLP57VMYSLRSTQ5MNHSQJVFWYWQBMPXUQIOAVEP3YF7KAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 149 [4.1340842]

[4.1351921]


    if (spell_cast == SPELL_CANTRIP)
        do_noise = false;       // Spell itself does the messaging

Replacement in crawl-ref/source/mstuff2.cc at line 219 [4.1340842]

B:BD[4.1352547] → [5.2856:2903]

∅:D[6.2587] → [4.1352586:1352636]

∅:D[5.2903] → [4.1352586:1352636]

B:BD[4.1352586] → [4.1352586:1352636]

B:BD[4.1352636] → [7.2689:2733]

∅:D[7.2733] → [4.1352785:1352786]

B:BD[4.1352785] → [4.1352785:1352786]

B:BD[4.1352786] → [7.2734:2957]

∅:D[7.2957] → [4.1352974:1352975]

B:BD[4.1352974] → [4.1352974:1352975]

B:BD[4.1353106] → [4.1353106:1353121]

            monster_type mon = MONS_GIANT_BAT;
            if (!one_chance_in(3))
            {
                int temp_rand = random2(4);
                mon = (temp_rand == 0) ? MONS_ORANGE_RAT :
                      (temp_rand == 1) ? MONS_GREEN_RAT :
                      (temp_rand == 2) ? MONS_GREY_RAT
                                       : MONS_RAT;
            }

[4.1352547]

[8.2565]

            const monster_type rats[] = { MONS_ORANGE_RAT, MONS_GREEN_RAT,
                                          MONS_GREY_RAT,   MONS_RAT };
            const monster_type mon = (one_chance_in(3) ? MONS_GIANT_BAT
                                                       : RANDOM_ELEMENT(rats));

Replacement in crawl-ref/source/mstuff2.cc at line 780 [4.1340842]

B:BD[9.5768] → [3.4334:4390]

        if (monsters* mtarg = monster_at(pbolt.target))

[9.5768]

[9.5894]

        if (const monsters* mtarg = monster_at(pbolt.target))

Replacement in crawl-ref/source/mstuff2.cc at line 794 [4.1340842]

B:BD[10.3574] → [10.3574:3686]

                if (*ai == monster->pos())
                    continue;
                if (*ai == you.pos())

[10.3574]

[10.3686]

                const actor* act = actor_at(*ai);
                if (act && act != monster && you.can_see(act))

Replacement in crawl-ref/source/mstuff2.cc at line 798 [4.1340842]

B:BD[10.3747] → [10.3747:3831]

                    target    = "you";
                    break;
                }

[10.3747]

[11.2841]


                    if (act->atype() == ACT_PLAYER || one_chance_in(++count))
                        target = act->name(DESC_NOCAP_THE);

Replacement in crawl-ref/source/mstuff2.cc at line 802 [4.1340842]

B:BD[11.2842] → [3.4391:4485]

∅:D[3.4485] → [10.3946:4055]

B:BD[10.3946] → [10.3946:4055]

B:BD[10.4055] → [3.4486:4544]

                const monsters *m = monster_at(*ai);
                if (m && you.can_see(m))
                {
                    targ_prep = "next to";
                    if (one_chance_in(count++))
                        target = m->name(DESC_NOCAP_THE);

[11.2842]

[10.4121]

                    if (act->atype() == ACT_PLAYER)
                        break;

Replacement in crawl-ref/source/mstuff2.cc at line 867 [4.1340842]

B:BD[10.5119] → [10.5119:5243]

                    if (*ai == monster->pos())
                        continue;
                    if (*ai == you.pos())

[10.5119]

[10.5243]

                    const actor* act = monster_at(*ai);
                    if (act && act != monster && you.can_see(act))

Replacement in crawl-ref/source/mstuff2.cc at line 871 [4.1340842]

B:BD[10.5309] → [10.5309:5405]

                        target    = "you";
                        break;
                    }

[10.5309]

[10.5405]

                        if (act->atype() == ACT_PLAYER
                            || one_chance_in(++count))
                        {
                            target = act->name(DESC_NOCAP_THE);
                        }

Replacement in crawl-ref/source/mstuff2.cc at line 877 [4.1340842]

B:BD[10.5406] → [3.4796:4901]

∅:D[3.4901] → [10.5530:5648]

B:BD[10.5530] → [10.5530:5648]

B:BD[10.5648] → [3.4902:4965]

                    const monsters *m2 = monster_at(*ai);
                    if (m2 && you.can_see(m2))
                    {
                        targ_prep = "past";
                        if (one_chance_in(count++))
                            target = m2->name(DESC_NOCAP_THE);

[10.5406]

[10.5719]

                        if (act->atype() == ACT_PLAYER)
                            break;

Replacement in crawl-ref/source/mstuff2.cc at line 885 [4.1340842]

B:BD[2.3247] → [2.3247:3433]

    const actor*    foe   = monster->get_foe();
    const monsters* m_foe = (foe && foe->atype() == ACT_MONSTER) ?
                            dynamic_cast<const monsters*>(foe) : NULL;

[2.3247]

[2.3433]

    const actor* foe = monster->get_foe();

Replacement in crawl-ref/source/mstuff2.cc at line 894 [4.1340842]

B:BD[2.3884] → [2.3884:3939]

    if (targeted && target == "nothing" && foe != NULL

[2.3884]

[2.3939]

    if (targeted
        && target == "nothing"

Replacement in crawl-ref/source/mstuff2.cc at line 897 [4.1340842]

B:BD[2.4006] → [2.4006:4075]

        && (you.can_see(foe) || foe == &you) && !monster->confused()

[2.4006]

[2.4075]

        && foe != NULL
        && you.can_see(foe)
        && !monster->confused()

Replacement in crawl-ref/source/mstuff2.cc at line 902 [4.1340842]

B:BD[2.4120] → [2.4120:4350]

        if (foe == &you)
            target = "you";
        else
            target = m_foe->name(DESC_NOCAP_THE);
        if (pbolt.aimed_at_spot)
            targ_prep = "next to";
        else
            targ_prep = "past";

[2.4120]

[2.4350]

        target = foe->name(DESC_NOCAP_THE);
        targ_prep = (pbolt.aimed_at_spot ? "next to" : "past");

Replacement in crawl-ref/source/monspeak.cc at line 782 [4.1558496]

∅:D[12.9850] → [13.1903:1985]

B:BD[4.1583437] → [13.1903:1985]

            else if (param == "ENCHANT" && !silence || param == "VISUAL ENCHANT")

[12.9850]

[12.9851]

            else if (param == "ENCHANT" && !silence
                     || param == "VISUAL ENCHANT")