fiddlerwoaroof/crawl - Change L4PKJZERR7WADKWHY3MR6J6OZFREVPL3CB43I6MLJ2BVKWCUTE7AC

Updated changes list.

Give Lugonu's retribution more of the Abyss/distortion theme.

Added extra check for Sif Muna gifts.

Reduced spatial vortex base damage, but give them a distortion attack.

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

Created by dshaligram on March 29, 2007

L4PKJZERR7WADKWHY3MR6J6OZFREVPL3CB43I6MLJ2BVKWCUTE7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 1673 [7.804403]
[2.129]
[6.190977]
```
        {
            do_god_gift();
```
Insertion in crawl-ref/source/religion.cc at line 1676 [7.804403]
[6.190997]
[6.190997]
```
        }
```

Insertion in crawl-ref/source/religion.cc at line 1754 [7.804403]

[8.5924]

[7.861423]


static void lugonu_retribution(int god)
{
    if (coinflip())
    {
        simple_god_message("'s wrath finds you!", god);
        miscast_effect( SPTYP_TRANSLOCATION, 9, 90, 100, "Lugonu's touch" );
        // No return - Lugonu's touch is independent of other effects.
    }
    else if (coinflip())
    {
        // Give extra opportunities for embarrassing teleports.
        simple_god_message("'s wrath finds you!", god);
        mpr("Space warps around you!");
        if (!one_chance_in(3))
            you_teleport2(false);
        else
            random_blink(false);
        // No return.
    }
    
    // abyssal servant theme
    if (random2(you.experience_level) > 7 && !one_chance_in(5))
    {
        if (create_monster(MONS_GREEN_DEATH + random2(3), 0,
                           BEH_HOSTILE, you.x_pos, you.y_pos,
                           MHITYOU, 250) != -1)
        {
            simple_god_message(" sends a demon after you!", god);
        }
        else
        {
            simple_god_message("'s demon is unavoidably detained.", god);
        }
    }
    else
    {
        bool success = false;
        int how_many = 1 + (you.experience_level / 7);

Insertion in crawl-ref/source/religion.cc at line 1796 [7.804403]

[7.861424]

        for (int loopy = 0; loopy < how_many; loopy++)
        {
            if (create_monster(MONS_NEQOXEC + random2(5), 0, BEH_HOSTILE,
                               you.x_pos, you.y_pos, MHITYOU, 250) != -1)
            {
                success = true;
            }
        }
        if (success)
            simple_god_message(" sends minions to punish you.", god);
        else
            simple_god_message("'s minions fail to arrive.", god);
    }
}

Replacement in crawl-ref/source/religion.cc at line 2273 [7.804403]

∅:D[3.628] → [9.1835:2213]

B:BD[9.1835] → [9.1835:2213]

B:BD[9.2213] → [10.3396:3519]

∅:D[10.3519] → [9.2213:2227]

B:BD[9.2213] → [9.2213:2227]

∅:D[9.2315] → [7.876503:876513]

B:BD[7.876503] → [7.876503:876513]

B:BD[7.876513] → [9.2316:2836]

B:BD[9.2836] → [10.3520:3608]

∅:D[10.3608] → [9.2903:2913]

B:BD[9.2903] → [9.2903:2913]

        // abyssal servant theme
        if (random2(you.experience_level) > 7 && !one_chance_in(5))
        {
            if (create_monster(MONS_GREEN_DEATH + random2(3), 0,
                               BEH_HOSTILE, you.x_pos, you.y_pos,
                               MHITYOU, 250) != -1)
            {
                simple_god_message(" sends a demon after you!", god);
            }
            else
            {
                simple_god_message("'s demon is unavoidably detained.", god);
            }
        }
        else
        {
            success = false;
            how_many = 1 + (you.experience_level / 7);
            for (loopy = 0; loopy < how_many; loopy++)
            {
                if (create_monster(MONS_NEQOXEC + random2(5), 0, BEH_HOSTILE,
                                    you.x_pos, you.y_pos, MHITYOU, 250) != -1)
                {
                    success = true;
                }
            }
            if (success)
                simple_god_message(" sends minions to punish you.", god);
            else
                simple_god_message("'s minions fail to arrive.", god);
        }

[3.628]

[7.876513]

        lugonu_retribution(god);

Replacement in crawl-ref/source/religion.cc at line 2284 [7.804403]
B:BD[7.876747] → [10.3609:3635]
```
        if (coinflip()) {
```
[7.876747]
[10.3635]
```
        if (coinflip())
        {
```

Replacement in crawl-ref/source/religion.cc at line 2374 [7.804403]

B:BD[9.3140] → [9.3140:3180]

            banished(DNGN_ENTER_ABYSS);

[9.3140]

[9.3180]

            banished(DNGN_ENTER_ABYSS, "Lugonu's wrath");

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

B:BD[6.516659] → [11.572:676]

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

[6.516659]

[7.1887819]

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

Replacement in crawl-ref/source/hiscores.cc at line 516 [7.2987663]

B:BD[12.5028] → [12.5028:5098]

    "xom", "statue", "rotting", "targetting", "spore", "tso_smiting",

[12.5028]

[12.5098]

    "xom", "statue", "rotting", "targeting", "spore", "tso_smiting",

Insertion in crawl-ref/source/fight.h at line 153 [7.3139131]

[13.26890]

    // Returns true if the defender is banished.
    bool distortion_affects_defender();

Insertion in crawl-ref/source/fight.cc at line 1494 [7.3140790]

[14.59673]

}
bool melee_attack::distortion_affects_defender()
{
    //jmf: blink frogs *like* distortion
    // I think could be amended to let blink frogs "grow" like
    // jellies do {dlb}
    if (defender->id() == MONS_BLINK_FROG)
    {
        if (one_chance_in(5))
        {
            emit_nodmg_hit_message();
            special_damage_message =
                make_stringf("%s %s in the translocular energy.",
                             defender->name(DESC_CAP_THE).c_str(),
                             defender->conj_verb("bask").c_str());
                
            defender->heal(1 + random2avg(7, 2), true); // heh heh
        }
        return (false);
    }
        
    if (one_chance_in(3))
    {
        special_damage_message =
            make_stringf(
                "Space bends around %s.",
                defender->name(DESC_NOCAP_THE).c_str());
        special_damage += 1 + random2avg(7, 2);
        return (false);
    }
    if (one_chance_in(3))
    {
        special_damage_message =
            make_stringf(
                "Space warps horribly around %s!",
                defender->name(DESC_NOCAP_THE).c_str());
            
        special_damage += 3 + random2avg(24, 2);
        return (false);
    }
    if (one_chance_in(3))
    {
        emit_nodmg_hit_message();
        defender->blink();
        return (false);
    }
    // Used to be coinflip() || coinflip() for players, just coinflip()
    // for monsters; this is a compromise. Note that it makes banishment
    // a touch more likely for players, and a shade less likely for
    // monsters.
    if (!one_chance_in(3))
    {
        emit_nodmg_hit_message();
        defender->teleport(coinflip(), one_chance_in(5));
        return (false);
    }
    if (you.level_type != LEVEL_ABYSS && coinflip())
    {
        emit_nodmg_hit_message();
        defender->banish( atk? atk->name(DESC_PLAIN, true)
                          : attacker->name(DESC_PLAIN) );
        return (true);
    }
    return (false);

Replacement in crawl-ref/source/fight.cc at line 1738 [7.3140790]

B:BD[13.61576] → [13.61576:61863]

B:BD[13.61863] → [14.62847:63188]

∅:D[14.63188] → [13.62063:62412]

B:BD[13.62063] → [13.62063:62412]

∅:D[13.62412] → [7.3175607:3175608]

B:BD[7.3175607] → [7.3175607:3175608]

B:BD[7.3175608] → [13.62413:62575]

B:BD[13.62575] → [14.63189:63250]

∅:D[14.63250] → [13.62628:62723]

B:BD[13.62628] → [13.62628:62723]

∅:D[13.62723] → [7.3175775:3175776]

B:BD[7.3175775] → [7.3175775:3175776]

B:BD[7.3175776] → [13.62724:62802]

B:BD[13.62802] → [14.63251:63282]

∅:D[14.63282] → [13.62834:62863]

B:BD[13.62834] → [13.62834:62863]

∅:D[13.62863] → [7.3175834:3175835]

B:BD[7.3175834] → [7.3175834:3175835]

B:BD[7.3175835] → [14.63283:63560]

∅:D[14.63560] → [13.62888:62936]

B:BD[13.62888] → [13.62888:62936]

B:BD[13.62936] → [14.63561:63623]

∅:D[14.63623] → [13.62983:63012]

B:BD[13.62983] → [13.62983:63012]

∅:D[13.63012] → [7.3175951:3175952]

B:BD[7.3175951] → [7.3175951:3175952]

B:BD[7.3175952] → [15.15442:15499]

∅:D[15.15499] → [13.63037:63085]

B:BD[13.63037] → [13.63037:63085]

B:BD[13.63085] → [5.7805:7930]

        //jmf: blink frogs *like* distortion
        // I think could be amended to let blink frogs "grow" like
        // jellies do {dlb}
        if (defender->id() == MONS_BLINK_FROG)
        {
            if (one_chance_in(5))
            {
                emit_nodmg_hit_message();
                special_damage_message =
                    make_stringf("%s %s in the translocular energy.",
                                 defender->name(DESC_CAP_THE).c_str(),
                                 defender->conj_verb("bask").c_str());
                
                defender->heal(1 + random2avg(7, 2), true); // heh heh
            }
            break;
        }
        
        if (one_chance_in(3))
        {
            special_damage_message =
                make_stringf(
                     "Space bends around %s.",
                     defender->name(DESC_NOCAP_THE).c_str());
            special_damage += 1 + random2avg(7, 2);
            break;
        }
        if (one_chance_in(3))
        {
            special_damage_message =
                make_stringf(
                    "Space warps horribly around %s!",
                    defender->name(DESC_NOCAP_THE).c_str());
            
            special_damage += 3 + random2avg(24, 2);
            break;
        }
        if (one_chance_in(3))
        {
            emit_nodmg_hit_message();
            defender->blink();
            break;
        }
        // Used to be coinflip() || coinflip() for players, just coinflip()
        // for monsters; this is a compromise. Note that it makes banishment
        // a touch more likely for players, and a shade less likely for
        // monsters.
        if (!one_chance_in(3))
        {
            emit_nodmg_hit_message();
            defender->teleport(coinflip(), one_chance_in(5));
            break;
        }
        if (you.level_type != LEVEL_ABYSS && coinflip())
        {
            emit_nodmg_hit_message();
            defender->banish( atk? atk->name(DESC_PLAIN, true)
                              : attacker->name(DESC_PLAIN) );

[13.61576]

[13.63130]

        if (distortion_affects_defender())

Deletion in crawl-ref/source/fight.cc at line 1740 [7.3140790]
B:BD[13.63157] → [13.63157:63167]
```
        }
```

Insertion in crawl-ref/source/fight.cc at line 2875 [7.3140790]

[14.77341]

        break;
    case AF_DISTORT:
        distortion_affects_defender();

Replacement in crawl-ref/source/enum.h at line 2291 [7.3287960]
B:BD[14.90417] → [14.90417:90430]
```
    AF_KLOWN
```
[14.90417]
[14.90430]
```
    AF_KLOWN,
    AF_DISTORT
```
Replacement in crawl-ref/docs/changes.stone_soup at line 5 [18.210753]
B:BD[16.684] → [17.49244:49264]
∅:D[17.49264] → [16.711:748]
B:BD[16.711] → [16.711:748]
```
* New entry levels.
* New special levels (Elf:7, Coc:7).
```
[16.684]
[17.49265]
```
* More vaults and special level layouts.
```
Insertion in crawl-ref/docs/changes.stone_soup at line 7 [18.210753]
[17.49299]
[16.748]
```
* Revamped dungeon overview and character information screens.
```
Insertion in crawl-ref/docs/changes.stone_soup at line 9 [18.210753]
[16.787]
[16.787]
```
* 'v' examines monsters, items, etc., '?' gives help.
```
Replacement in crawl-ref/docs/changes.stone_soup at line 13 [18.210753]
∅:D[4.7458] → [16.874:924]
B:BD[16.874] → [16.874:924]
```
* Rods of striking now also get magic reservoirs.
```
[4.7458]
[16.924]
```
* Rods of striking also get magic reservoirs.
```

Replacement in crawl-ref/docs/changes.stone_soup at line 16 [18.210753]

B:BD[16.1022] → [16.1022:1048]

* Some mutations cleanup.

[16.1022]

[16.1048]

* Mutation and species abilities cleanup.
* Sif Muna gives gifts on piety gain; Sif Munites do not need to pray.
* Low-HD monsters are less likely to give piety when killed.

Replacement in crawl-ref/docs/changes.stone_soup at line 20 [18.210753]

B:BD[16.1100] → [16.1100:1163]

* Character names can now includes spaces, dashes and periods.

[16.1100]

[16.1163]

* Character names can now include spaces, dashes and periods. On Unix,
  character names can also end with a digit.

Replacement in crawl-ref/docs/changes.stone_soup at line 37 [18.210753]
B:BD[16.1866] → [16.1866:1909]
```
* Shop purchase now asks for confirmation.
```
[16.1866]
[16.1909]
```
* Shop purchase asks for confirmation.
```
Replacement in crawl-ref/docs/changes.stone_soup at line 59 [18.210753]
B:BD[16.2947] → [16.2947:2977]
```
* Fix Abyss banishment crash.
```
[16.2947]
[16.2977]
```
* Fixed Abyss banishment crash.
```

Replacement in crawl-ref/docs/changes.stone_soup at line 77 [18.210753]

∅:D[4.7501] → [16.3812:3846]

B:BD[16.3812] → [16.3812:3846]

* no_dark_brand defaults to true.

[4.7501]

[16.3846]

* no_dark_brand defaults to true, since the option is otherwise too obscure to
  find (and the problem it addresses is widespread on Unix terms).
* Added a synthetic cursor (use_fake_cursor = yes) for terms that cannot draw
  cursors on black/darkgrey spaces.

Insertion in crawl-ref/docs/changes.stone_soup at line 83 [18.210753]
[16.3935]
[16.3935]
```
* Deflect missiles is less effective.
```

Insertion in crawl-ref/docs/changes.stone_soup at line 94 [18.210753]

[4.7598]

[16.4434]

* Monsters dying to friendlies' poison, or damaging clouds are now
  correctly attributed as collateral kills.

Updated changes list.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 1673 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 1676 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 1754 [7.804403]

Insertion in crawl-ref/source/religion.cc at line 1796 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 2273 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 2284 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 2374 [7.804403]

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

Replacement in crawl-ref/source/hiscores.cc at line 516 [7.2987663]

Insertion in crawl-ref/source/fight.h at line 153 [7.3139131]

Insertion in crawl-ref/source/fight.cc at line 1494 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 1738 [7.3140790]

Deletion in crawl-ref/source/fight.cc at line 1740 [7.3140790]

Insertion in crawl-ref/source/fight.cc at line 2875 [7.3140790]

Replacement in crawl-ref/source/enum.h at line 2291 [7.3287960]

Replacement in crawl-ref/docs/changes.stone_soup at line 5 [18.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 7 [18.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 9 [18.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 13 [18.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 16 [18.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 20 [18.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 37 [18.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 59 [18.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 77 [18.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 83 [18.210753]

Insertion in crawl-ref/docs/changes.stone_soup at line 94 [18.210753]