fiddlerwoaroof/crawl - Change ZCRK2DJ5VKECRQXZTWT4NUDL2VT5ZHUK7NT6NQPLRJ56TDX5PJSAC

Removed amnesia/forgetfullness trap, mutation and scroll. The

mutation has been replaced with an involuntary shouting mutation, and the trap with an alarm trap. The scroll hasn't been replaced with anything, and the frequency of scrolls of random uselessness has thus doubled; someone needs to re-do the scroll frequencies.

Also added a "drifting" mutation, which causes the player to sometimes drift in a random direction after moving.

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

Created by zelgadis on October 14, 2007

ZCRK2DJ5VKECRQXZTWT4NUDL2VT5ZHUK7NT6NQPLRJ56TDX5PJSAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 359 [6.5308]

B:BD[6.13823] → [6.13823:13982]

    case TRAP_AMNESIA:
        mpr("You feel momentarily disoriented.");
        if (!wearing_amulet(AMU_CLARITY))
            forget_map(random2avg(100, 2));

[6.13823]

[6.13982]

    case TRAP_ALARM:
        if (silenced(you.x_pos, you.y_pos))
        {
            if (trap_known)
                mpr("The alarm is silenced.");
            else
                grd[you.x_pos][you.y_pos] = DNGN_UNDISCOVERED_TRAP;
            return;
        }
        noisy(12, you.x_pos, you.y_pos, "An alarm trap emits a blaring wail!");

Replacement in crawl-ref/source/traps.cc at line 848 [6.5308]
B:BD[6.23341] → [6.23341:23364]
```
    case TRAP_AMNESIA:
```
[6.23341]
[6.23364]
```
    case TRAP_ALARM:
```
Deletion in crawl-ref/source/shopping.cc at line 1263 [7.759950]
B:BD[7.791475] → [7.791475:791511]
```
            case SCR_FORGETFULNESS:
```
Insertion in crawl-ref/source/player.cc at line 5543 [7.962854]
[8.502]
[8.502]
```
    case TRAN_SERPENT_OF_HELL:
```

Insertion in crawl-ref/source/player.cc at line 5547 [7.962854]

[8.570]

    case TRAN_BAT:
        return "squeak";
    case TRAN_AIR:
        return "__NONE";

Replacement in crawl-ref/source/player.cc at line 5552 [7.962854]

B:BD[8.583] → [8.583:606]

        return "yell";

[8.583]

[8.606]

        if (you.mutation[MUT_SCREAM])
            return "scream";
        else
            return "yell";

Replacement in crawl-ref/source/output.cc at line 1952 [7.1088282]
B:BD[9.9859] → [9.9859:9886]
```
            case MUT_LOST:
```
[9.9859]
[9.9886]
```
            case MUT_SCREAM:
```

Replacement in crawl-ref/source/output.cc at line 1955 [7.1088282]

B:BD[9.9950] → [9.9950:10020]

                snprintf(info, INFO_SIZE, "forgetfulness %d", level);

[9.9950]

[9.10020]

                snprintf(info, INFO_SIZE, "screaming %d", level);

Replacement in crawl-ref/source/mutation.cc at line 194 [7.1263003]

B:BD[7.1268781] → [7.1268781:1268918]

    {"You occasionally forget where you are.",
     "You sometimes forget where you are.",
     "You frequently forget where you are."},

[7.1268781]

[7.1268918]

    {"You occasionally scream uncontrollably.",
     "You sometimes scream uncontrollably.",
     "You frequently scream uncontrollably."},

Insertion in crawl-ref/source/mutation.cc at line 282 [7.1263003]

[7.1272103]

    {"You occasionally drift when moving.",
     "You sometimes drift when moving.",
     "You frequently drift when moving."},

Deletion in crawl-ref/source/mutation.cc at line 288 [7.1263003]
B:BD[7.1272157] → [7.1272157:1272175]
```
    {"", "", ""},
```

Replacement in crawl-ref/source/mutation.cc at line 465 [7.1263003]

B:BD[7.1279033] → [7.1279033:1279128]

    {"Your muscles feel loose.", "Your muscles feel loose.",
     "Your muscles feel loose."},

[7.1279033]

[7.1279128]

    {"You feel the urge to scream.", "You feel the urge to scream.",
     "You feel the urge to scream."},

Replacement in crawl-ref/source/mutation.cc at line 531 [7.1263003]

B:BD[7.1281459] → [7.1281459:1281477]

    {"", "", ""},

[7.1281459]

[7.1281477]

    {"Your movements feel uncertain.",
     "Your movements feel even more uncertian.",
     "Your movements feel even more uncertian."},

Replacement in crawl-ref/source/mutation.cc at line 693 [7.1263003]

B:BD[7.1287636] → [7.1287636:1287737]

    {"You feel less disoriented.", "You feel less disoriented.",
     "You feel less disoriented."},

[7.1287636]

[7.1287737]

    {"Your urge to scream disappears.", "Your urge to scream lessens.",
     "Your urge to scream lessens."},

Replacement in crawl-ref/source/mutation.cc at line 749 [7.1263003]

B:BD[7.1289030] → [7.1289030:1289048]

    {"", "", ""},

[7.1289030]

[7.1289048]

    {"Your movements feel completely certain again.",
     "Your movements feel more certain.",
     "Your movements feel more certain."},

Replacement in crawl-ref/source/mutation.cc at line 853 [7.1263003]
B:BD[5.1929] → [5.1929:1953]
```
    { MUT_LOST, 6, 3 },
```
[5.1929]
[5.1953]
```
    { MUT_SCREAM, 6, 3 },
```
Insertion in crawl-ref/source/mutation.cc at line 887 [7.1263003]
[5.2866]
[5.2866]
```
// 65
```
Insertion in crawl-ref/source/mutation.cc at line 890 [7.1263003]
[5.2897]
[5.2897]
```
    { MUT_DRIFTING, 3, 3 },
```
Replacement in crawl-ref/source/mutation.cc at line 892 [7.1263003]
B:BD[5.2898] → [5.2898:2924]
```
    // Four placeholders:
```
[5.2898]
[5.2924]
```
    // Three placeholders:
```
Deletion in crawl-ref/source/mutation.cc at line 896 [7.1263003]
B:BD[5.3017] → [5.3017:3048]
```
    { RANDOM_MUTATION, 0, 3 },
```
Replacement in crawl-ref/source/mutation.cc at line 1279 [7.1263003]
B:BD[10.37253] → [10.37253:37272]
```
    case MUT_LOST:
```
[10.37253]
[10.37272]
```
    case MUT_SCREAM:
```
Insertion in crawl-ref/source/mutation.cc at line 1292 [7.1263003]
[10.37537]
[10.37537]
```
    case MUT_DRIFTING:
```

Replacement in crawl-ref/source/mutation.cc at line 1402 [7.1263003]

B:BD[10.38276] → [10.38276:38325]

                case 4: mutat = MUT_LOST; break;

[10.38276]

[10.38325]

                case 4: mutat = MUT_SCREAM; break;

Replacement in crawl-ref/source/mutation.cc at line 2388 [7.1263003]

B:BD[7.1334078] → [7.1334078:1334130]

                     (temp_rand ==  3) ? MUT_LOST :

[7.1334078]

[7.1334130]

                     (temp_rand ==  3) ? MUT_SCREAM :

Replacement in crawl-ref/source/mstuff2.cc at line 148 [7.1340842]

B:BD[7.1345115] → [7.1345115:1345463]

    // amnesia traps do not affect monsters (yet) and
    // only monsters of normal+ IQ will direct a msg
    // to the player - also, *never* revealed: {dlb}
    case TRAP_AMNESIA:
        if (mons_intel(monster->type) > I_ANIMAL)
            simple_monster_message(monster,
                                   " seems momentarily disoriented.");

[7.1345115]

[7.1345463]

    // alarm trap aren't set off by hostile monsters, because that would
    // be way too nasty for the player.
    case TRAP_ALARM:
        if (!mons_friendly(monster) || silenced(monster->x, monster->y))
        {
            if (trapKnown && you.can_see(monster) 
                && !silenced(you.x_pos, you.y_pos))
            {
                mpr("The alarm trap makes no noise.");
            }
            return;
        }
        noisy(12, monster->x, monster->y);
        if (!silenced(you.x_pos, you.y_pos))
        {
            if (monsterNearby)
            {
                mpr("You hear a blaring wail!", MSGCH_SOUND);
                if (you.can_see(monster))
                    revealTrap = true;
            }
            else
                mpr("You hear a distant blaring wail!", MSGCH_SOUND);
        }

Replacement in crawl-ref/source/makeitem.cc at line 2533 [11.927]

B:BD[11.86098] → [11.86098:86248]

                     (temp_rand > 374) ? SCR_FORGETFULNESS :     //  3.26%
                     (temp_rand > 344) ? SCR_RANDOM_USELESSNESS ://  3.26%

[11.86098]

[11.86248]

                     //(temp_rand > 374) ? SCR_FORGETFULNESS :     //  3.26%
                     (temp_rand > 344) ? SCR_RANDOM_USELESSNESS ://  6.52%

Replacement in crawl-ref/source/items.cc at line 2658 [7.2584728]

B:BD[7.2652443] → [7.2652443:2652513]

B:BD[7.2652513] → [2.127:310]

    // If the player has the lost mutation forget portions of the map
    if (you.mutation[MUT_LOST] && !wearing_amulet(AMU_CLARITY) &&
        (random2(100) <= you.mutation[MUT_LOST] * 5) )
        forget_map(5 + random2(you.mutation[MUT_LOST] * 10));

[7.2652443]

[7.2652679]

    if (you.mutation[MUT_SCREAM]
        && (random2(100) <= you.mutation[MUT_SCREAM] * 5) )
    {
        yell(true);
    }

Deletion in crawl-ref/source/itemprop.h at line 313 [12.641567]
B:BD[6.81677] → [6.81677:81700]
```
    SCR_FORGETFULNESS,
```

Replacement in crawl-ref/source/itemprop.h at line 315 [12.641567]

B:BD[6.81748] → [6.81748:81815]

    SCR_VORPALISE_WEAPON,              //   20
    SCR_RECHARGING,

[6.81748]

[6.81815]

    SCR_VORPALISE_WEAPON,
    SCR_RECHARGING,                    //   20

Deletion in crawl-ref/source/itemname.cc at line 535 [7.2667494]
B:BD[13.11848] → [13.11848:11905]
```
    case SCR_FORGETFULNESS:      return "forgetfulness";
```

Deletion in crawl-ref/source/item_use.cc at line 3715 [7.2781507]

B:BD[7.2861870] → [7.2861870:2862048]

        break;
    case SCR_FORGETFULNESS:
        mpr("You feel momentarily disoriented.");
        if (!wearing_amulet(AMU_CLARITY))
            forget_map(50 + random2(50));

Replacement in crawl-ref/source/enum.h at line 1983 [7.3287960]
B:BD[7.3348679] → [7.3348679:3348726]
```
    MUT_LOST,                          //   35
```
[7.3348679]
[7.3348726]
```
    MUT_SCREAM,                        //   35
```
Insertion in crawl-ref/source/enum.h at line 2014 [7.3287960]
[3.820]
[7.3349633]
```
    MUT_DRIFTING,
```
Replacement in crawl-ref/source/enum.h at line 2503 [7.3287960]
B:BD[7.3373409] → [7.3373409:3373456]
```
    TRAP_AMNESIA,                      //    5
```
[7.3373409]
[7.3373456]
```
    TRAP_ALARM,                        //    5
```
Replacement in crawl-ref/source/effects.h at line 95 [7.3378996]
B:BD[7.3381729] → [7.3381729:3381746]
```
void yell(void);
```
[7.3381729]
[7.3381746]
```
void yell(bool force = false);
```
Replacement in crawl-ref/source/effects.cc at line 1690 [7.3382105]
B:BD[7.3426379] → [7.3426379:3426395]
```
void yell(void)
```
[7.3426379]
[7.3426395]
```
void yell(bool force)
```
Deletion in crawl-ref/source/effects.cc at line 1695 [7.3382105]
B:BD[7.3426477] → [7.3426477:3426478]
B:BD[7.3426478] → [8.864:926]
∅:D[8.926] → [7.3426518:3426594]
B:BD[7.3426518] → [7.3426518:3426594]
```
    if (silenced(you.x_pos, you.y_pos) || you.cannot_speak())
    {
        mpr("You are unable to make a sound!");
        return;
    }
```

Insertion in crawl-ref/source/effects.cc at line 1707 [7.3382105]

[8.1264]

[7.3426594]

    else if (shout_verb == "squeak")
        noise_level = 4;
    else if (shout_verb == "__NONE")
        noise_level = 0;
    if (silenced(you.x_pos, you.y_pos) || you.cannot_speak())
        noise_level = 0;
    if (noise_level == 0)
    {
        if (force)
        {
            if (shout_verb == "__NONE")
                mpr("You must scream but have no lips!");
            else
                mprf("A %s rips itself from your lips, but you make no sound!",
                     shout_verb.c_str());
        }
        else
            mpr("You are unable to make a sound!");

Insertion in crawl-ref/source/effects.cc at line 1728 [7.3382105]

[7.3426595]

        return;
    }
    if (force)
    {
        mprf("A %s rips itself from your lips!", shout_verb.c_str());
        noisy( noise_level, you.x_pos, you.y_pos );
        return;
    }

Replacement in crawl-ref/source/dungeon.cc at line 2018 [7.3429798]
B:BD[14.118390] → [15.10418:10447]
```
        type = TRAP_AMNESIA;
```
[14.118390]
[14.118424]
```
        type = TRAP_ALARM;
```
Replacement in crawl-ref/source/direct.cc at line 1482 [7.3697945]
∅:D[16.36612] → [15.15641:15668]
B:BD[15.15641] → [15.15641:15668]
B:BD[15.15668] → [16.36613:36650]
```
        case TRAP_AMNESIA:
            return ("amnesia trap");
```
[16.36612]
[15.15709]
```
        case TRAP_ALARM:
            return ("alarm trap");
```
Replacement in crawl-ref/source/describe.cc at line 369 [7.3736416]
B:BD[12.983115] → [12.983115:983151]
```
    "teleport", "amnesia", "blade",
```
[12.983115]
[17.25663]
```
    "teleport", "alarm", "blade",
```

Deletion in crawl-ref/source/describe.cc at line 2408 [7.3736416]

B:BD[7.3812511] → [7.3812511:3812663]

        case SCR_FORGETFULNESS:
            description += "This scroll induces "
                "an irritating disorientation. ";
            break;

Replacement in crawl-ref/source/decks.cc at line 1775 [7.3987460]

B:BD[18.25672] → [18.25672:25737]

        MUT_TELEPORT, MUT_DEFORMED, MUT_LOST, MUT_DETERIORATION,

[18.25672]

[18.25737]

        MUT_TELEPORT, MUT_DEFORMED, MUT_SCREAM, MUT_DETERIORATION,

Replacement in crawl-ref/source/debug.cc at line 1817 [7.4016436]
B:BD[4.1013] → [4.1013:1025]
```
    "lost",
```
[4.1013]
[4.1025]
```
    "scream",
```
Replacement in crawl-ref/source/debug.cc at line 1848 [7.4016436]
B:BD[4.1602] → [4.1602:1610]
```
    "",
```
[4.1602]
[4.1610]
```
    "drifting",
```

Replacement in crawl-ref/source/acr.cc at line 3580 [7.4397395]

B:BD[7.4472803] → [7.4472803:4472923]

// Called when the player moves by walking/running. Also calls
// attack function and trap function etc when necessary.

[7.4472803]

[12.1280545]

static void drift_player(int move_x, int move_y)
{
    int drift_dir = -1;
    int okay_dirs = 0;
    for (int i = 0; i < 8; i++)
    {
        const coord_def      drift_delta = Compass[i];
        const coord_def      new_pos     = you.pos() + drift_delta;
        const unsigned short targ_monst  = mgrd(new_pos);
        if (you.can_pass_through(new_pos)
            && !is_grid_dangerous(grd(new_pos))
            && (targ_monst == NON_MONSTER ||
                mons_is_submerged(&menv[targ_monst])))
        {
            if (one_chance_in(++okay_dirs))
                drift_dir = i;
        }
    }
    if (okay_dirs > 0)
    {
        const coord_def drift_delta = Compass[drift_dir];
        const coord_def new_pos     = you.pos() + drift_delta;
        if (drift_delta == coord_def(-move_x, -move_y))
            mpr("You drift backwards.");
        else if (drift_delta == coord_def(move_x, move_y))
            mpr("You drift forwards.");
        else
            mpr("You drift.");
        move_player_to_grid(new_pos.x, new_pos.y, true, true, false);
    }
}
// Called when the player moves by walking/running. Also calls attack
// function etc when necessary.

Insertion in crawl-ref/source/acr.cc at line 3722 [7.4397395]

[12.1281748]

[7.4477613]


        if (you.mutation[MUT_DRIFTING]
            && (random2(100) <= you.mutation[MUT_DRIFTING] * 5) )
        {
            drift_player(move_x, move_y);
        }

Insertion in crawl-ref/source/acr.cc at line 3735 [7.4397395]
[19.724]
[7.4480027]

Removed amnesia/forgetfullness trap, mutation and scroll. The

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/traps.cc at line 359 [6.5308]

Replacement in crawl-ref/source/traps.cc at line 848 [6.5308]

Deletion in crawl-ref/source/shopping.cc at line 1263 [7.759950]

Insertion in crawl-ref/source/player.cc at line 5543 [7.962854]

Insertion in crawl-ref/source/player.cc at line 5547 [7.962854]

Replacement in crawl-ref/source/player.cc at line 5552 [7.962854]

Replacement in crawl-ref/source/output.cc at line 1952 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1955 [7.1088282]

Replacement in crawl-ref/source/mutation.cc at line 194 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 282 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 288 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 465 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 531 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 693 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 749 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 853 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 887 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 890 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 892 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 896 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1279 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 1292 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1402 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2388 [7.1263003]

Replacement in crawl-ref/source/mstuff2.cc at line 148 [7.1340842]

Replacement in crawl-ref/source/makeitem.cc at line 2533 [11.927]

Replacement in crawl-ref/source/items.cc at line 2658 [7.2584728]

Deletion in crawl-ref/source/itemprop.h at line 313 [12.641567]

Replacement in crawl-ref/source/itemprop.h at line 315 [12.641567]

Deletion in crawl-ref/source/itemname.cc at line 535 [7.2667494]

Deletion in crawl-ref/source/item_use.cc at line 3715 [7.2781507]

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

Insertion in crawl-ref/source/enum.h at line 2014 [7.3287960]

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

Replacement in crawl-ref/source/effects.h at line 95 [7.3378996]

Replacement in crawl-ref/source/effects.cc at line 1690 [7.3382105]

Deletion in crawl-ref/source/effects.cc at line 1695 [7.3382105]

Insertion in crawl-ref/source/effects.cc at line 1707 [7.3382105]

Insertion in crawl-ref/source/effects.cc at line 1728 [7.3382105]

Replacement in crawl-ref/source/dungeon.cc at line 2018 [7.3429798]

Replacement in crawl-ref/source/direct.cc at line 1482 [7.3697945]

Replacement in crawl-ref/source/describe.cc at line 369 [7.3736416]

Deletion in crawl-ref/source/describe.cc at line 2408 [7.3736416]

Replacement in crawl-ref/source/decks.cc at line 1775 [7.3987460]

Replacement in crawl-ref/source/debug.cc at line 1817 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 1848 [7.4016436]

Replacement in crawl-ref/source/acr.cc at line 3580 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3722 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3735 [7.4397395]