fiddlerwoaroof/crawl - Change PVCF63CSGNZCD52IBYUBLNYSPRJ2LSAYLF6RUC6I4RZK7FC4EMXQC

Fix [2785020]: Make messages regarding monsters' attacking themselves

more consistent.

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

Created by dolorous on May 1, 2009

PVCF63CSGNZCD52IBYUBLNYSPRJ2LSAYLF6RUC6I4RZK7FC4EMXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/fight.cc at line 2105 [5.3140790]
B:BD[3.58312] → [4.2732:2778]
```
            def_name(DESC_NOCAP_THE).c_str(),
```
[3.58312]
[6.56918]
```
            mons_defender_name().c_str(),
```

Replacement in crawl-ref/source/fight.cc at line 2145 [5.3140790]

B:BD[2.3235] → [2.3235:3290]

                    def_name(DESC_NOCAP_THE).c_str());

[2.3235]

[2.3290]

                    mons_defender_name().c_str());

Replacement in crawl-ref/source/fight.cc at line 3332 [5.3140790]

∅:D[7.7944] → [4.5748:5968]

B:BD[4.5748] → [4.5748:5968]

                mprf( "%s %s %s's last head off!",
                      atk_name(DESC_CAP_THE).c_str(),
                      attacker->conj_verb(verb).c_str(),
                      def_name(DESC_NOCAP_THE).c_str() );

[7.7944]

[7.7945]

                mprf("%s %s %s's last head off!",
                     atk_name(DESC_CAP_THE).c_str(),
                     attacker->conj_verb(verb).c_str(),
                     def_name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/fight.cc at line 3351 [5.3140790]

∅:D[8.5341] → [4.6091:6314]

B:BD[4.6091] → [4.6091:6314]

                mprf( "%s %s one of %s's heads off!",
                      atk_name(DESC_CAP_THE).c_str(),
                      attacker->conj_verb(verb).c_str(),
                      def_name(DESC_NOCAP_THE).c_str() );

[8.5341]

[8.5342]

                mprf("%s %s one of %s's heads off!",
                     atk_name(DESC_CAP_THE).c_str(),
                     attacker->conj_verb(verb).c_str(),
                     def_name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/fight.cc at line 4097 [5.3140790]

B:BD[4.7394] → [4.7394:7446]

                 def_name(DESC_NOCAP_THE).c_str());

[4.7394]

[5.3202992]

                 mons_defender_name().c_str());

Replacement in crawl-ref/source/fight.cc at line 4107 [5.3140790]

B:BD[3.65177] → [3.65177:65233]

    return (weapon? property(*weapon, PWPN_SPEED) : 0);

[3.65177]

[3.65233]

    return (weapon ? property(*weapon, PWPN_SPEED) : 0);

Replacement in crawl-ref/source/fight.cc at line 4422 [5.3140790]

B:BD[4.8020] → [4.8020:8076]

                     def_name(DESC_NOCAP_THE).c_str());

[4.8020]

[8.6272]

                     mons_defender_name().c_str());

Replacement in crawl-ref/source/fight.cc at line 4578 [5.3140790]
∅:D[8.6323] → [3.73607:73637]
B:BD[3.73607] → [3.73607:73637]
```
            mprf("%s %s %s!",
```
[8.6323]
[4.8253]
```
            mprf("%s %s %s%s",
```

Replacement in crawl-ref/source/fight.cc at line 4581 [5.3140790]

B:BD[3.73748] → [4.8303:8355]

                 def_name(DESC_NOCAP_THE).c_str());

[3.73748]

[8.6324]

                 mons_defender_name().c_str(),
                 special_attack_punctuation().c_str());

Replacement in crawl-ref/source/fight.cc at line 4604 [5.3140790]

B:BD[3.74274] → [4.8406:8457]

                 def_name(DESC_NOCAP_THE).c_str(),

[3.74274]

[9.612]

                 mons_defender_name().c_str(),

Replacement in crawl-ref/source/fight.cc at line 4743 [5.3140790]

B:BD[10.11148] → [4.8819:8871]

                 def_name(DESC_NOCAP_THE).c_str());

[10.11148]

[8.6428]

                 mons_defender_name().c_str());