fiddlerwoaroof/crawl - Change Z63Q4DA5J5TZAC5LN55UD4CLADUMU5Z73TGEVE2YUXCHIST2Y4QAC

Changing screaming mutation to influence both frequency

and volume of shouting -> yelling -> screaming. Reduced frequency of level 2 and 3 to make up for greater range. When paralysed, you are unable to scream.

Also cleaning up mutation listings.

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

Created by j-p-e-g on October 22, 2007

Z63Q4DA5J5TZAC5LN55UD4CLADUMU5Z73TGEVE2YUXCHIST2Y4QAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 5590 [5.962854]

[4.267]

    if (you.duration[DUR_PARALYSIS])
        return (true);

Replacement in crawl-ref/source/player.cc at line 5611 [5.962854]

∅:D[3.671] → [4.570:583]

B:BD[4.570] → [4.570:583]

B:BD[4.583] → [3.672:739]

    default:
        if (you.mutation[MUT_SCREAM])
            return "scream";

[3.671]

[3.739]

    default: // depends on SCREAM mutation
        if (you.mutation[MUT_SCREAM] <= 1)
            return "shout";
        else if (you.mutation[MUT_SCREAM] == 2)
            return "yell";

Replacement in crawl-ref/source/player.cc at line 5617 [5.962854]
B:BD[3.752] → [3.752:779]
```
            return "yell";
```
[3.752]
[4.606]
```
            return "scream";
```
Insertion in crawl-ref/source/mutation.cc at line 108 [5.1263003]
[5.1265454]
[5.1265454]
```
     
```
Deletion in crawl-ref/source/mutation.cc at line 175 [5.1263003]
B:BD[5.1267932] → [5.1267932:1267933]

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

B:BD[5.1268781] → [3.891:984]

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

[5.1268781]

[3.984]

    {"You occasionally shout uncontrollably.",
     "You sometimes yell uncontrollably.",

Insertion in crawl-ref/source/mutation.cc at line 211 [5.1263003]
[5.1269448]
[5.1269448]
Deletion in crawl-ref/source/mutation.cc at line 213 [5.1263003]
B:BD[5.1269454] → [5.1269454:1269455]
Insertion in crawl-ref/source/mutation.cc at line 257 [5.1263003]
[5.1271217]
[5.1271217]
Deletion in crawl-ref/source/mutation.cc at line 294 [5.1263003]
B:BD[5.1272203] → [5.1272203:1272204]
Deletion in crawl-ref/source/mutation.cc at line 335 [5.1263003]
B:BD[5.1274126] → [5.1274126:1274127]
Insertion in crawl-ref/source/mutation.cc at line 393 [5.1263003]
[5.1276577]
[5.1276577]
Insertion in crawl-ref/source/mutation.cc at line 422 [5.1263003]
[2.1243]
[5.1277511]
Deletion in crawl-ref/source/mutation.cc at line 454 [5.1263003]
B:BD[5.1278610] → [5.1278610:1278616]
```
// 30
```
Insertion in crawl-ref/source/mutation.cc at line 455 [5.1263003]
[5.1278617]
[5.1278617]
```
// 30
```

Replacement in crawl-ref/source/mutation.cc at line 469 [5.1263003]

B:BD[5.1279033] → [3.1161:1268]

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

[5.1279033]

[5.1279128]

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

Replacement in crawl-ref/source/mutation.cc at line 472 [5.1263003]

B:BD[5.1279129] → [5.1279129:1279236]

    {"You feel a little disoriented.", "You feel a little disoriented.",
     "Where the Hells are you?"},

[5.1279129]

[5.1279236]

    {"You feel the urge to shout.", "You feel a strong urge to yell.",
     "You feel a strong urge to scream."},

Insertion in crawl-ref/source/mutation.cc at line 485 [5.1263003]
[5.1279646]
[5.1279646]
Deletion in crawl-ref/source/mutation.cc at line 487 [5.1263003]
B:BD[5.1279652] → [5.1279652:1279653]
Insertion in crawl-ref/source/mutation.cc at line 513 [5.1263003]
[5.1280916]
[6.10032]
```
    
```
Deletion in crawl-ref/source/mutation.cc at line 515 [5.1263003]
B:BD[6.10041] → [6.10041:10042]
Deletion in crawl-ref/source/mutation.cc at line 545 [5.1263003]
B:BD[5.1281559] → [5.1281559:1281560]
Deletion in crawl-ref/source/mutation.cc at line 575 [5.1263003]
B:BD[5.1283074] → [5.1283074:1283084]
```
    // 80
```
Insertion in crawl-ref/source/mutation.cc at line 576 [5.1263003]
[5.1283085]
[5.1283085]
```
    // 80
```
Insertion in crawl-ref/source/mutation.cc at line 679 [5.1263003]
[5.1287071]
[5.1287071]
Deletion in crawl-ref/source/mutation.cc at line 681 [5.1263003]
B:BD[5.1287077] → [5.1287077:1287078]

Replacement in crawl-ref/source/mutation.cc at line 698 [5.1263003]

B:BD[5.1287636] → [3.1408:1480]

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

[5.1287636]

[3.1480]

    {"Your urge to shout disappears.", "Your urge to yell lessens.",

Deletion in crawl-ref/source/mutation.cc at line 712 [5.1263003]
B:BD[5.1288162] → [5.1288162:1288168]
```
// 40
```
Insertion in crawl-ref/source/mutation.cc at line 713 [5.1263003]
[5.1288169]
[5.1288169]
```
// 40
```
Insertion in crawl-ref/source/mutation.cc at line 742 [5.1263003]
[5.1288930]
[5.1288930]

Replacement in crawl-ref/source/items.cc at line 2672 [5.2584728]

B:BD[3.2995] → [3.2995:3055]

        && (random2(100) <= you.mutation[MUT_SCREAM] * 5) )

[3.2995]

[3.3055]

        && (random2(100) <= 2 + you.mutation[MUT_SCREAM] * 3) )

Replacement in crawl-ref/source/effects.cc at line 1705 [5.3382105]
B:BD[4.1064] → [4.1064:1090]
```
    int noise_level = 12;
```
[4.1064]
[4.1090]
```
    int noise_level = 12; // "shout"
```

Insertion in crawl-ref/source/effects.cc at line 1716 [5.3382105]

[3.3487]

    else if (shout_verb == "yell")
        noise_level = 14;
    else if (shout_verb == "scream")
        noise_level = 16;

Replacement in crawl-ref/source/effects.cc at line 1728 [5.3382105]

B:BD[3.3637] → [3.3637:3735]

            if (shout_verb == "__NONE")
                mpr("You must scream but have no lips!");

[3.3637]

[3.3735]

            if (shout_verb == "__NONE" || you.paralysed())
                mprf("You feel a strong urge to %s, but you are unable to make a sound!",
                     shout_verb == "__NONE" ? "scream" : shout_verb.c_str());

Replacement in crawl-ref/source/effects.cc at line 1732 [5.3382105]

B:BD[3.3752] → [3.3752:3832]

                mprf("A %s rips itself from your lips, but you make no sound!",

[3.3752]

[3.3832]

                mprf("You feel a %s rip itself from your throat, but you make no sound!",

Replacement in crawl-ref/source/effects.cc at line 1743 [5.3382105]

B:BD[3.3994] → [3.3994:4064]

        mprf("A %s rips itself from your lips!", shout_verb.c_str());

[3.3994]

[3.4064]

        mprf("A %s rips itself from your throat!", shout_verb.c_str());

Changing screaming mutation to influence both frequency

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.cc at line 5590 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5611 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5617 [5.962854]

Insertion in crawl-ref/source/mutation.cc at line 108 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 175 [5.1263003]

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

Insertion in crawl-ref/source/mutation.cc at line 211 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 213 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 257 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 294 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 335 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 393 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 422 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 454 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 455 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 469 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 472 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 485 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 487 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 513 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 515 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 545 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 575 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 576 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 679 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 681 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 698 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 712 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 713 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 742 [5.1263003]

Replacement in crawl-ref/source/items.cc at line 2672 [5.2584728]

Replacement in crawl-ref/source/effects.cc at line 1705 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 1716 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 1728 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 1732 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 1743 [5.3382105]