fiddlerwoaroof/crawl - Change VQZEJTCSRZ5RVLCCKUCIS3IVZPFYRC26I74X4WIJAPEY7NYID2UQC

Fixed abjuration (player and monster versions) to work with the new enchantment

duration system. Also strengthened monster abjuration, which became terribly weak after the 0.2 nerf.

Monster abjuration now applies in a circle around the caster, squares adjacent to the caster getting full blast, and weaker abjuration effects going outwards. Player abjuration stays unchanged.

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

Created by dshaligram on July 11, 2007

VQZEJTCSRZ5RVLCCKUCIS3IVZPFYRC26I74X4WIJAPEY7NYID2UQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/stuff.h at line 54 [4.217090]
[3.982]
[4.220038]
```
int fuzz_value(int val, int lowfuzz, int highfuzz, int naverage = 2);
```

Insertion in crawl-ref/source/stuff.cc at line 1036 [4.224557]

[4.242007]

int fuzz_value(int val, int lowfuzz, int highfuzz, int naverage)
{
    const int lfuzz = lowfuzz * val / 100,
        hfuzz = highfuzz * val / 100;
    return val + random2avg(lfuzz + hfuzz + 1, naverage) - lfuzz;
}

Insertion in crawl-ref/source/spells1.cc at line 669 [4.616635]

[4.630116]


    // Scale power into something comparable to summon lifetime.
    const int abjdur = pow * 10;

Replacement in crawl-ref/source/spells1.cc at line 685 [4.616635]

B:BD[5.4868] → [5.4868:5045]

            monster->lose_ench_levels(abj, 1 + (random2(pow) / 8));
        
        if (monster->has_ench(ENCH_ABJ))
            simple_monster_message(monster, " shudders.");

[5.4868]

[4.630782]

        {
            const int sockage = std::max(fuzz_value(abjdur, 60, 30), 40);
#ifdef DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "%s abj: dur: %d, abj: %d",
                 monster->name(DESC_PLAIN).c_str(), abj.duration, sockage);
#endif
            if (!monster->lose_ench_duration(abj, sockage))
                simple_monster_message(monster, " shudders.");
        }

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

B:BD[4.1341924] → [6.14343:14409]

static int monster_abjuration(bool friendly, int pow, bool test);

[4.1341924]

[4.1341985]

static int monster_abjuration(const monsters *mons, bool test);

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

B:BD[6.14470] → [6.14470:14580]

    const bool friendly = mons_friendly(monster);
    if (nearby && monster_abjuration(friendly, 1, true) > 0

[6.14470]

[6.14580]

    if (nearby && monster_abjuration(monster, true) > 0

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

B:BD[6.14609] → [6.14609:14680]

        monster_abjuration( friendly, monster->hit_dice * 10, false );

[6.14609]

[6.14680]

        monster_abjuration(monster, false);

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

B:BD[4.1389438] → [6.21522:21587]

static int monster_abjuration(bool friendly, int pow, bool test)

[4.1389438]

[4.1389498]

static int monster_abjure_square(const coord_def &pos,
                                 int power, int test_only,
                                 int friendly)

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

B:BD[4.1389500] → [6.21588:21638]

    int result = 0;
    monsters *monster = NULL;

[4.1389500]

[4.1389585]

    const int mindex = mgrd(pos);
    if (mindex == NON_MONSTER)
        return (0);
    
    monsters *target = &menv[mindex];
    if (!target->alive() || friendly == mons_friendly(target))
        return (0);

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

B:BD[4.1389586] → [4.1389586:1389653]

    if (!test)
        mpr("Send 'em back where they came from!");

[4.1389586]

[4.1389653]

    mon_enchant abj = target->get_ench(ENCH_ABJ);
    if (abj.ench == ENCH_NONE)
        return (0);

Replacement in crawl-ref/source/mstuff2.cc at line 1939 [4.1340842]
B:BD[4.1389654] → [7.71:107]
```
    if (pow > 60)
        pow = 60;
```
[4.1389654]
[7.107]
```
    power = std::max(20, fuzz_value(power, 40, 25));
```

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

B:BD[7.108] → [7.108:201]

    int abjure_str = 1 + (random2(pow / 3));
    if (abjure_str > 6)
        abjure_str = 6;

[7.108]

[7.201]

    if (test_only)
        return (power > abj.duration? 5 : 1);
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Abj: dur: %d, pow: %d, ndur: %d",
         abj.duration, power, abj.duration - power);
#endif

Replacement in crawl-ref/source/mstuff2.cc at line 1949 [4.1340842]
B:BD[7.206] → [7.206:266]
```
    for (int ab = 0; ab < MAX_MONSTERS && abjure_str; ab++)
```
[7.206]
[4.1389700]
```
    if ((abj.duration -= power) <= 0)
```
Replacement in crawl-ref/source/mstuff2.cc at line 1951 [4.1340842]
B:BD[4.1389729] → [4.1389729:1389758]
```
        monster = &menv[ab];
```
[4.1389706]
[4.1389758]
```
        monster_die(target, KILL_RESET, 0);
        return (5);
    }
```

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

B:BD[4.1389759] → [6.21639:21693]

∅:D[6.21693] → [4.1389815:1389837]

B:BD[4.1389815] → [4.1389815:1389837]

        if (!monster->alive() || !mons_near(monster))
            continue;

[4.1389759]

[4.1389837]

    simple_monster_message(target, " shudders.");
    target->update_ench(abj);
    return (1);
}

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

B:BD[4.1389838] → [6.21694:21742]

∅:D[6.21742] → [4.1389875:1389897]

B:BD[4.1389875] → [4.1389875:1389897]

        if (friendly == mons_friendly(monster))
            continue;

[4.1389838]

[4.1389897]

static int apply_radius_around_square(
    const coord_def &c, int radius,
    int (*fn)(const coord_def &, int, int, int),
    int pow, int par1, int par2)
{
    int res = 0;
    for (int yi = -radius; yi <= radius; ++yi)
    {
        const coord_def c1(c.x - radius, c.y + yi);
        const coord_def c2(c.x + radius, c.y + yi);
        if (in_bounds(c1))
            res += fn(c1, pow, par1, par2);
        if (in_bounds(c2))
            res += fn(c2, pow, par1, par2);
    }

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

B:BD[4.1389898] → [5.6807:6907]

∅:D[5.6907] → [4.1390001:1390023]

B:BD[4.1390001] → [4.1390001:1390023]

        mon_enchant abjLevel = monster->get_ench(ENCH_ABJ);
        if (abjLevel.ench == ENCH_NONE)
            continue;

[4.1389898]

[4.1390023]

    for (int xi = -radius + 1; xi < radius; ++xi)
    {
        const coord_def c1(c.x + xi, c.y - radius);
        const coord_def c2(c.x + xi, c.y + radius);
        if (in_bounds(c1))
            res += fn(c1, pow, par1, par2);
        if (in_bounds(c2))
            res += fn(c2, pow, par1, par2);
    }
    return (res);
}

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

B:BD[4.1390024] → [4.1390024:1390042]

        result++;

[4.1390024]

[4.1390042]

static int monster_abjuration(const monsters *caster, bool test)
{
    const bool friendly = mons_friendly(caster);
    int maffected = 0;

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

B:BD[4.1390043] → [4.1390043:1390083]

        if (test)
            continue;

[4.1390043]

[4.1390128]

    if (!test)
        mpr("Send 'em back where they came from!");

Replacement in crawl-ref/source/mstuff2.cc at line 1996 [4.1340842]
B:BD[4.1390129] → [5.6908:6947]
∅:D[8.124] → [4.1390173:1390174]
∅:D[7.299] → [4.1390173:1390174]
∅:D[9.524] → [4.1390173:1390174]
∅:D[5.6947] → [4.1390173:1390174]
B:BD[4.1390173] → [4.1390173:1390174]
B:BD[4.1390174] → [5.6948:6982]
∅:D[5.6982] → [4.1390209:1390340]
B:BD[4.1390209] → [4.1390209:1390340]
B:BD[4.1390340] → [5.6983:7027]
∅:D[5.7027] → [4.1390447:1390457]
B:BD[4.1390447] → [4.1390447:1390457]
```
        abjLevel.degree -= abjure_str;
        if (abjLevel.degree <= 0)
            monster_die(monster, KILL_RESET, 0);
        else
        {
            simple_monster_message(monster, " shudders.");
            monster->update_ench(abjLevel);
        }
```
[4.1390129]
[9.525]
```
    int pow = std::min(caster->hit_dice * 90, 2500);
```

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

B:BD[9.526] → [7.300:359]

∅:D[8.159] → [9.551:570]

∅:D[7.359] → [9.551:570]

B:BD[9.551] → [9.551:570]

        if (!(abjure_str = div_rand_round(abjure_str, 2)))
            break;

[9.526]

[4.1390457]

    // Abjure radius.
    for (int rad = 1; rad < 5 && pow >= 30; ++rad)
    {
        maffected +=
            apply_radius_around_square(
                caster->pos(), rad, monster_abjure_square,
                pow, test, friendly);
        pow = pow * 2 / 5;

Insertion in crawl-ref/source/mstuff2.cc at line 2007 [4.1340842]
[4.1390463]
[4.1390463]
```
    return (maffected);
}
```
Deletion in crawl-ref/source/mstuff2.cc at line 2010 [4.1340842]
B:BD[4.1390464] → [4.1390464:1390543]
B:BD[4.1390543] → [10.409532:409533]
```
    return result;
}                               // end monster_abjuration()
```

Deletion in crawl-ref/source/mon-util.cc at line 4261 [4.1699344]

B:BD[2.6221] → [2.6221:6436]

int mon_enchant::apply_fuzz(int dur, int lowfuzz, int highfuzz) const
{
    const int lfuzz = lowfuzz * dur / 100,
        hfuzz = highfuzz * dur / 100;
    return dur + random2avg(lfuzz + hfuzz + 1, 2) - lfuzz;
}

Deletion in crawl-ref/source/mon-util.cc at line 4327 [4.1699344]

B:BD[2.8462] → [2.8462:8666]


#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Ench for %s: raw turn duration for %s (%d) == %d",
         mons->name(DESC_PLAIN).c_str(), std::string(*this).c_str(),
         deg, cturn);
#endif

Replacement in crawl-ref/source/mon-util.cc at line 4332 [4.1699344]
B:BD[2.8775] → [2.8775:8828]
```
    raw_duration = apply_fuzz(raw_duration, 60, 40);
```
[2.8775]
[2.8828]
```
    raw_duration = fuzz_value(raw_duration, 60, 40);
```

Deletion in crawl-ref/source/mon-util.cc at line 4350 [4.1699344]

B:BD[2.9311] → [2.9311:9507]

        
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Ench on %s: ench energy for %s: %d",
         mons->name(DESC_PLAIN).c_str(), std::string(*this).c_str(),
         duration);
#endif

Deletion in crawl-ref/source/externs.h at line 973 [4.3270163]
B:BD[2.10540] → [2.10540:10591]
```
    int apply_fuzz(int dur, int lo, int hi) const;
```