fiddlerwoaroof/crawl - Change CRCKW7MAFIP2MB6ZNPVZXUHBGSPQNTYHGDVF2TCM2K6XLRUTUW4QC

We're not quite ready for engulfing monsters yet, changed AT_ENGULF to AT_HIT.

Corrected command-line summary of the -macro option. Player aux unarmed was reusing the primary attack damage, fixed. Ghosts and pandemonium demons were getting 4 attacks where they should get only 1, fixed.

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

Created by dshaligram on February 24, 2007

CRCKW7MAFIP2MB6ZNPVZXUHBGSPQNTYHGDVF2TCM2K6XLRUTUW4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 636 [3.1699344]

B:BD[2.9983] → [2.9983:10047]

        return mon_attack_def::attk(ghost.values[GVAL_DAMAGE]);

[2.9983]

[2.10047]

    {
        if (attk_number == 0)
            return mon_attack_def::attk(ghost.values[GVAL_DAMAGE]);
        else
            return mon_attack_def::attk(0, AT_NONE);
    }

Replacement in crawl-ref/source/mon-data.h at line 389 [3.1826214]

B:BD[4.495290] → [2.19304:19410]

    { {AT_ENGULF, AF_FIRE, 30}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

[4.495290]

[3.1835962]

    { {AT_HIT, AF_FIRE, 30}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

Replacement in crawl-ref/source/mon-data.h at line 1549 [3.1826214]

B:BD[4.506475] → [2.29397:29502]

    { {AT_ENGULF, AF_FIRE, 5}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

[4.506475]

[3.1863617]

    { {AT_HIT, AF_FIRE, 5}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

Replacement in crawl-ref/source/mon-data.h at line 1561 [3.1826214]

B:BD[4.506627] → [2.29503:29610]

    { {AT_ENGULF, AF_PLAIN, 15}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

[4.506627]

[3.1863944]

    { {AT_HIT, AF_PLAIN, 15}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

Replacement in crawl-ref/source/mon-data.h at line 2568 [3.1826214]

B:BD[4.516659] → [2.38505:38612]

    { {AT_ENGULF, AF_PLAIN, 50}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

[4.516659]

[3.1887819]

    { {AT_HIT, AF_PLAIN, 50}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },

Replacement in crawl-ref/source/fight.cc at line 760 [3.3140790]
B:BD[5.41611] → [5.41611:41651]
```
        hurt_monster(def, damage_done);
```
[5.41611]
[3.3158328]
```
        hurt_monster(def, aux_damage);
```
Insertion in crawl-ref/source/fight.cc at line 762 [3.3140790]
[3.3158329]
[5.41652]
```
    damage_done = aux_damage;
    
```
Replacement in crawl-ref/source/fight.cc at line 809 [3.3140790]
B:BD[5.42750] → [5.42750:42778]
```
    if (special_damage < 3)
```
[5.42750]
[5.42778]
```
    if (special_damage < 6)
```
Replacement in crawl-ref/source/fight.cc at line 811 [3.3140790]
B:BD[5.42798] → [5.42798:42831]
```
    else if (special_damage < 7)
```
[5.42798]
[5.42831]
```
    else
```
Deletion in crawl-ref/source/fight.cc at line 813 [3.3140790]
B:BD[5.42851] → [5.42851:42881]
```
    else
        return "!!";
```

Replacement in crawl-ref/source/acr.cc at line 194 [3.4397395]

B:BD[6.2630] → [6.2630:2682]

        puts("  -macro <file>    macro file name");

[6.2630]

[3.4403851]

        puts("  -macro <dir>     directory to save/find macro.txt");

Replacement in crawl-ref/source/Kills.cc at line 389 [7.558235]
B:BD[7.571312] → [7.571312:571348]
```
    else if (ends_with(name, "lf"))
```
[7.571312]
[7.571348]
```
    else if (ends_with(name, "elf") || ends_with(name, "olf"))
```

We're not quite ready for engulfing monsters yet, changed AT_ENGULF to AT_HIT.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 636 [3.1699344]

Replacement in crawl-ref/source/mon-data.h at line 389 [3.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1549 [3.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1561 [3.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2568 [3.1826214]

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

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

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

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

Deletion in crawl-ref/source/fight.cc at line 813 [3.3140790]

Replacement in crawl-ref/source/acr.cc at line 194 [3.4397395]

Replacement in crawl-ref/source/Kills.cc at line 389 [7.558235]