fiddlerwoaroof/crawl - Change ITDUEUO7XAZANPC4GRB3SEDFBOV7GLFPNPTYE5LYNC3CS6BSVZTQC

Fixed 1609103. A better fix should be implemented sometime.

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

Created by haranp on December 7, 2006

ITDUEUO7XAZANPC4GRB3SEDFBOV7GLFPNPTYE5LYNC3CS6BSVZTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1763 [3.1396662]
B:BD[3.1451237] → [3.1451237:1451291]
```
// INtentionally avoids info and str_pass now. -- bwr
```
[3.1451237]
[3.1451291]
```
// Intentionally avoids info and str_pass now. -- bwr
```
Insertion in crawl-ref/source/fight.cc at line 374 [3.3140790]
[2.880924]
[2.880924]
```
    bool base_nodamage = false;
```

Insertion in crawl-ref/source/fight.cc at line 389 [3.3140790]

[2.881416]

    char base_damage_message[ITEMNAME_SIZE];
    char special_damage_message[ITEMNAME_SIZE];

Insertion in crawl-ref/source/fight.cc at line 397 [3.3140790]
[2.881521]
[2.881521]
```
    special_damage_message[0] = 0;
    base_damage_message[0] = 0;
```

Replacement in crawl-ref/source/fight.cc at line 1046 [3.3140790]

B:BD[3.3168953] → [3.3168953:3169093]

            {
                snprintf( info, INFO_SIZE, "You %s the giant spore.", damage_noise);
                mpr(info);
            }

[3.3168953]

[3.3169093]

                mprf("You %s the giant spore.", damage_noise);

Replacement in crawl-ref/source/fight.cc at line 1048 [3.3140790]

B:BD[3.3169153] → [3.3169153:3169296]

            {
                snprintf( info, INFO_SIZE, "You %s the ball lightning.", damage_noise);
                mpr(info);
            }

[3.3169153]

[2.884490]

                mprf("You %s the ball lightning.", damage_noise);

Replacement in crawl-ref/source/fight.cc at line 1056 [3.3140790]

B:BD[3.3169428] → [3.3169428:3169429]

B:BD[3.3169429] → [2.884518:884784]


            if ( !ur_armed || melee_brand != SPWPN_VORPAL )
            {
                snprintf(info, INFO_SIZE, "You %s %s, but do no damage.",
                         damage_noise, ptr_monam(defender, DESC_NOCAP_THE));
                mpr(info);
            }

[3.3169428]

[3.3169629]

            base_nodamage = true;
            snprintf( base_damage_message, INFO_SIZE, "You %s %s.",
                      damage_noise, ptr_monam(defender, DESC_NOCAP_THE));

Replacement in crawl-ref/source/fight.cc at line 1082 [3.3140790]

B:BD[3.3170258] → [3.3170258:3170448]

        strcpy(info, "You ");
        strcat(info, damage_noise);
        strcat(info, " ");
        strcat(info, ptr_monam(defender, DESC_NOCAP_THE));
        strcat(info, damage_noise2);

[3.3170258]

[3.3170448]

        snprintf(info, INFO_SIZE, "You %s %s%s", damage_noise,
                 ptr_monam(defender, DESC_NOCAP_THE), damage_noise2);

Replacement in crawl-ref/source/fight.cc at line 1222 [3.3140790]

B:BD[3.3175346] → [3.3175346:3175418]

                            snprintf( info, INFO_SIZE, "%s is jolted!",

[3.3175346]

[3.3175418]

                            snprintf( special_damage_message, INFO_SIZE,
                                      "%s is jolted!",

Deletion in crawl-ref/source/fight.cc at line 1225 [3.3140790]
B:BD[3.3175493] → [3.3175493:3175532]
```
                            mpr(info);
```

Replacement in crawl-ref/source/fight.cc at line 1229 [3.3140790]

B:BD[3.3175608] → [3.3175608:3175691]

                case STAFF_COLD:    // FIXME: I don't think I used these right ...

[3.3175608]

[3.3175691]

                case STAFF_COLD: // FIXME: I don't think I used these right ...

Replacement in crawl-ref/source/fight.cc at line 1240 [3.3140790]

B:BD[3.3176007] → [3.3176007:3176077]


                        snprintf( info, INFO_SIZE, "You freeze %s!",

[3.3176007]

[3.3176077]

                        snprintf( special_damage_message, INFO_SIZE,
                                  "You freeze %s!",

Deletion in crawl-ref/source/fight.cc at line 1243 [3.3140790]
B:BD[3.3176150] → [3.3176150:3176185]
```
                        mpr(info);
```

Replacement in crawl-ref/source/fight.cc at line 1254 [3.3140790]

B:BD[3.3176510] → [3.3176510:3176578]

                        snprintf( info, INFO_SIZE, "You crush %s!",

[3.3176510]

[3.3176578]

                        snprintf( special_damage_message, INFO_SIZE,
                                  "You crush %s!",

Deletion in crawl-ref/source/fight.cc at line 1257 [3.3140790]
B:BD[3.3176651] → [3.3176651:3176686]
```
                        mpr(info);
```

Replacement in crawl-ref/source/fight.cc at line 1271 [3.3140790]

B:BD[3.3177087] → [3.3177087:3177154]

                        snprintf( info, INFO_SIZE, "You burn %s!",

[3.3177087]

[3.3177154]

                        snprintf( special_damage_message, INFO_SIZE,
                                  "You burn %s!",

Deletion in crawl-ref/source/fight.cc at line 1274 [3.3140790]
B:BD[3.3177227] → [3.3177227:3177262]
```
                        mpr(info);
```

Insertion in crawl-ref/source/fight.cc at line 1285 [3.3140790]

[3.3177624]

                    {
                        // HACK: poison_monster emits a message, so
                        // we need to get ours out first.
                        if ( base_nodamage )
                        {
                            mpr(base_damage_message);
                            base_nodamage = false; // don't double-message
                        }

Insertion in crawl-ref/source/fight.cc at line 1294 [3.3140790]
[3.3177680]
[3.3177680]
```
                    }
```

Replacement in crawl-ref/source/fight.cc at line 1306 [3.3140790]

B:BD[3.3178026] → [3.3178026:3178247]

                        {
                            snprintf( info, INFO_SIZE, "%s convulses in agony!",
                                      ptr_monam(defender, DESC_CAP_THE) );
                            mpr(info);

[3.3178026]

[3.3178247]

                        {                            
                            snprintf( special_damage_message, INFO_SIZE,
                                      "%s convulses in agony!",
                                      ptr_monam(defender, DESC_CAP_THE));

Replacement in crawl-ref/source/fight.cc at line 1380 [3.3140790]

B:BD[3.3180344] → [3.3180344:3180462]

                    strcpy(info, "You burn ");
                    strcat(info, ptr_monam(defender, DESC_NOCAP_THE));

[3.3180344]

[3.3180462]

                    snprintf(special_damage_message, INFO_SIZE,
                             "You burn %s",
                             ptr_monam(defender, DESC_NOCAP_THE));

Replacement in crawl-ref/source/fight.cc at line 1385 [3.3140790]

B:BD[3.3180500] → [3.3180500:3180543]

                        strcat(info, ".");

[3.3180500]

[3.3180543]

                        strcat(special_damage_message, ".");

Replacement in crawl-ref/source/fight.cc at line 1387 [3.3140790]

B:BD[3.3180585] → [3.3180585:3180628]

                        strcat(info, "!");

[3.3180585]

[3.3180628]

                        strcat(special_damage_message, "!");

Replacement in crawl-ref/source/fight.cc at line 1389 [3.3140790]

B:BD[3.3180653] → [3.3180653:3180729]

                        strcat(info, "!!");
                    mpr(info);

[3.3180653]

[3.3180729]

                        strcat(special_damage_message, "!!");

Replacement in crawl-ref/source/fight.cc at line 1404 [3.3140790]

B:BD[3.3181109] → [3.3181109:3181229]

                    strcpy(info, "You freeze ");
                    strcat(info, ptr_monam(defender, DESC_NOCAP_THE));

[3.3181109]

[3.3181229]

                    snprintf(special_damage_message, INFO_SIZE,
                             "You freeze %s",
                             ptr_monam(defender, DESC_NOCAP_THE));

Replacement in crawl-ref/source/fight.cc at line 1409 [3.3140790]

B:BD[3.3181267] → [3.3181267:3181310]

                        strcat(info, ".");

[3.3181267]

[3.3181310]

                        strcat(special_damage_message, ".");

Replacement in crawl-ref/source/fight.cc at line 1411 [3.3140790]

B:BD[3.3181352] → [3.3181352:3181395]

                        strcat(info, "!");

[3.3181352]

[3.3181395]

                        strcat(special_damage_message, "!");

Replacement in crawl-ref/source/fight.cc at line 1413 [3.3140790]

B:BD[3.3181420] → [3.3181420:3181464]

                        strcat(info, "!!");

[3.3181420]

[3.3181464]

                        strcat(special_damage_message, "!!");

Replacement in crawl-ref/source/fight.cc at line 1448 [3.3140790]

B:BD[3.3182361] → [3.3182361:3182428]

                    mpr("There is a sudden explosion of sparks!");

[3.3182361]

[3.3182428]

                    strcpy(special_damage_message,
                           "There is a sudden explosion of sparks!");

Insertion in crawl-ref/source/fight.cc at line 1461 [3.3140790]

[3.3182782]

                {
                    // HACK - poison_monster bites us again
                    if ( base_nodamage )
                    {
                        mpr(base_damage_message);
                        base_nodamage = false;
                    }

Insertion in crawl-ref/source/fight.cc at line 1469 [3.3140790]
[3.3182834]
[3.3182834]
```
                }
```

Replacement in crawl-ref/source/fight.cc at line 1476 [3.3140790]

B:BD[3.3182999] → [3.3182999:3183172]

                strcpy(info, "You drain ");
                strcat(info, ptr_monam(defender, DESC_NOCAP_THE));
                strcat(info, "!");
                mpr(info);

[3.3182999]

[3.3183172]

                snprintf(special_damage_message, INFO_SIZE, "You drain %s!",
                         ptr_monam(defender, DESC_NOCAP_THE));

Replacement in crawl-ref/source/fight.cc at line 1499 [3.3140790]

B:BD[3.3183868] → [2.885791:885947]

                if (damage_done < 1)
                    mprf(MSGCH_PLAIN, "You strike %s.",
                         ptr_monam(defender, DESC_NOCAP_THE));

[3.3183868]

                // note: leaving special_damage_message empty because there
                // isn't one.

Replacement in crawl-ref/source/fight.cc at line 1506 [3.3140790]

B:BD[3.3183993] → [2.885948:886007]

∅:D[2.886007] → [3.3184058:3184313]

B:BD[3.3184058] → [3.3184058:3184313]

                if (mons_holiness(defender) != MH_NATURAL)
                    break;
                else if (mons_res_negative_energy(defender) > 0)
                    break;
                else if (damage_done < 1)
                    break;
                else if (you.hp == you.hp_max || one_chance_in(5))

[3.3183993]

[3.3184313]

                if (mons_holiness(defender) != MH_NATURAL ||
                    mons_res_negative_energy(defender) > 0 ||
                    damage_done < 1 || you.hp == you.hp_max ||
                    one_chance_in(5))

Insertion in crawl-ref/source/fight.cc at line 1512 [3.3140790]

[3.3184341]

                // We only get here if we've done base damage, so no
                // worries on that score.

Insertion in crawl-ref/source/fight.cc at line 1536 [3.3140790]

[3.3185137]

                    // see previous HACKs
                    if ( base_nodamage )
                    {
                        mpr(base_damage_message);
                        base_nodamage = false;
                    }

Insertion in crawl-ref/source/fight.cc at line 1552 [3.3140790]

[3.3185518]

                    // see previous HACKs
                    if ( base_nodamage )
                    {
                        mpr(base_damage_message);
                        base_nodamage = false;
                    }

Insertion in crawl-ref/source/fight.cc at line 1572 [3.3140790]

[3.3186095]

                        if ( base_nodamage )
                        {
                            mpr(base_damage_message);
                            base_nodamage = false;
                        }

Replacement in crawl-ref/source/fight.cc at line 1586 [3.3140790]

B:BD[3.3186432] → [3.3186432:3186630]

                    strcpy(info, "Space bends around ");
                    strcat(info, ptr_monam(defender, DESC_NOCAP_THE));
                    strcat(info, ".");
                    mpr(info);

[3.3186432]

[3.3186630]

                    snprintf(special_damage_message, INFO_SIZE,
                             "Space bends around %s.",
                             ptr_monam(defender, DESC_NOCAP_THE));

Replacement in crawl-ref/source/fight.cc at line 1595 [3.3140790]

B:BD[3.3186785] → [3.3186785:3186992]

                    strcpy(info, "Space warps horribly around ");
                    strcat(info, ptr_monam(defender, DESC_NOCAP_THE));
                    strcat(info, "!");
                    mpr(info);

[3.3186785]

[3.3186992]

                    snprintf( special_damage_message, INFO_SIZE,
                              "Space warps horribly around %s!",
                              ptr_monam(defender, DESC_NOCAP_THE));

Insertion in crawl-ref/source/fight.cc at line 1610 [3.3140790]

[3.3187289]

                    if ( base_nodamage )
                    {
                        mpr(base_damage_message);
                        base_nodamage = false;
                    }

Insertion in crawl-ref/source/fight.cc at line 1621 [3.3140790]

[3.3187445]

                    if ( base_nodamage )
                        mpr(base_damage_message);

Replacement in crawl-ref/source/fight.cc at line 1629 [3.3140790]

B:BD[3.3187605] → [3.3187605:3187623]

[3.3187605]

[3.3187623]

                {                    
                    if ( base_nodamage )
                    {
                        mpr(base_damage_message);
                        base_nodamage = false;
                    }

Insertion in crawl-ref/source/fight.cc at line 1657 [3.3140790]

[3.3188384]

        if ( base_nodamage )
        {
            if ( specdam > 0 )
                mpr(base_damage_message);
            else
                mprf("You %s %s, but do no damage.",
                     damage_noise, ptr_monam(defender, DESC_NOCAP_THE));
        }
        if ( special_damage_message[0] )
            mpr(special_damage_message);