fiddlerwoaroof/crawl - Change BNZD2CICSMU33O4Y2CG7HHVB4P34MCRVZG4LA6TRZE5DGSI672JQC

Clean up and consolidate random_uselessness(), as well as its associated

outsourced text.

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

Created by dolorous on May 31, 2008

BNZD2CICSMU33O4Y2CG7HHVB4P34MCRVZG4LA6TRZE5DGSI672JQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 676 [5.293070]
∅:D[3.1221] → [4.127235:127284]
B:BD[4.127235] → [4.127235:127284]
```
        random_uselessness( 2 + random2(7), 0 );
```
[3.1221]
[4.127284]
```
        random_uselessness();
```
Replacement in crawl-ref/source/spl-cast.cc at line 2300 [5.293070]
B:BD[6.5940] → [6.5940:5991]
```
            random_uselessness(2 + random2(7), 0);
```
[6.5940]
[5.347499]
```
            random_uselessness();
```
Replacement in crawl-ref/source/spl-cast.cc at line 2996 [5.293070]
B:BD[6.23602] → [6.23602:23653]
```
            random_uselessness(2 + random2(7), 0);
```
[6.23602]
[6.23653]
```
            random_uselessness();
```
Deletion in crawl-ref/source/misc.h at line 107 [5.1928926]
B:BD[7.866] → [8.2579:2616]
```
std::string weird_roaring_animal();
```
Deletion in crawl-ref/source/misc.cc at line 2417 [5.1933596]
B:BD[8.2693] → [8.2693:2730]
B:BD[8.2730] → [9.2673:2722]
∅:D[9.2722] → [7.2475:2477]
B:BD[7.2475] → [7.2475:2477]
B:BD[5.1976921] → [5.1976921:1976922]
```
std::string weird_roaring_animal()
{
    return getMiscString("roaring_animal_name");
}
```
Replacement in crawl-ref/source/item_use.cc at line 4208 [5.2781507]
B:BD[5.2860268] → [5.2860268:2860323]
```
            random_uselessness(random2(9), item_slot);
```
[5.2860268]
[10.368376]
```
            random_uselessness(item_slot);
```
Replacement in crawl-ref/source/item_use.cc at line 4231 [5.2781507]
B:BD[5.2860847] → [5.2860847:2860898]
```
        random_uselessness(random2(9), item_slot);
```
[5.2860847]
[5.2860898]
```
        random_uselessness(item_slot);
```
Replacement in crawl-ref/source/effects.h at line 60 [5.3378996]
B:BD[5.3380420] → [5.3380420:3380488]
```
void random_uselessness(unsigned char ru, unsigned char sc_read_2);
```
[5.3380420]
[5.3380488]
```
void random_uselessness(int scroll_slot = -1);
```
Replacement in crawl-ref/source/effects.cc at line 732 [5.3382105]
B:BD[5.3390821] → [5.3390821:3390888]
```
void random_uselessness(unsigned char ru, unsigned char sc_read_2)
```
[5.3390821]
[5.3390888]
```
void random_uselessness(int scroll_slot)
```

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

B:BD[5.3390907] → [5.3390907:3390974]

    int temp_rand = 0;          // probability determination {dlb}

[5.3390890]

[5.3390974]

    int temp_rand = random2(8);
    // If this isn't from a scroll, skip the first two possibilities.
    if (scroll_slot == -1)
        temp_rand = 2 + random2(6);

Replacement in crawl-ref/source/effects.cc at line 740 [5.3382105]
B:BD[5.3390975] → [5.3390975:3390991]
```
    switch (ru)
```
[5.3390975]
[5.3390991]
```
    switch (temp_rand)
```
Replacement in crawl-ref/source/effects.cc at line 748 [5.3382105]
B:BD[5.3391260] → [5.3391260:3391307]
```
        inc_inv_item_quantity( sc_read_2, 1 );
```
[5.3391260]
[5.3391307]
```
        inc_inv_item_quantity(scroll_slot, 1);
```
Deletion in crawl-ref/source/effects.cc at line 766 [5.3382105]
B:BD[5.3391828] → [11.23166:23275]
∅:D[12.2801] → [5.3392423:3392451]
∅:D[13.2874] → [5.3392423:3392451]
∅:D[14.2995] → [5.3392423:3392451]
∅:D[8.3262] → [5.3392423:3392451]
∅:D[15.22808] → [5.3392423:3392451]
∅:D[11.23275] → [5.3392423:3392451]
B:BD[5.3392423] → [5.3392423:3392451]
```
        mprf("You hear the distant roaring of an enraged %s!",
             weird_roaring_animal().c_str());
        break;
    case 4:
```
Replacement in crawl-ref/source/effects.cc at line 774 [5.3382105]
B:BD[5.3393189] → [5.3393189:3393201]
```
    case 5:
```
[5.3393189]
[5.3393201]
```
    case 4:
```
Replacement in crawl-ref/source/effects.cc at line 778 [5.3382105]
B:BD[5.3393289] → [5.3393289:3393301]
```
    case 6:
```
[5.3393289]
[5.3393333]
```
    case 5:
```
Replacement in crawl-ref/source/effects.cc at line 786 [5.3382105]
B:BD[5.3393581] → [5.3393581:3393593]
```
    case 7:
```
[5.3393581]
[2.2811]
```
    case 6:
```
Replacement in crawl-ref/source/effects.cc at line 791 [5.3382105]
B:BD[5.3393701] → [5.3393701:3393713]
```
    case 8:
```
[5.3393701]
[2.2877]
```
    case 7:
```
Replacement in crawl-ref/source/dat/database/miscname.txt at line 8 [17.3342]
B:BD[8.3464] → [16.2884:2923]
```
# roaring animals, smells, and sounds.
```
[8.3464]
[17.3645]
```
# smells, and sounds.
```

Insertion in crawl-ref/source/dat/database/miscname.txt at line 159 [17.3342]

[17.4488]


%%%%
smell_name
baking bread
burning hair
coffee
fire and brimstone
salt
womething weird
sulphur
tea
wet wool

Deletion in crawl-ref/source/dat/database/miscname.txt at line 200 [17.3342]
∅:D[9.3863] → [8.3589:3606]
B:BD[8.3589] → [8.3589:3606]
B:BD[8.3614] → [8.3614:3615]
B:BD[8.3615] → [18.2776:2789]
∅:D[18.2789] → [8.3620:3621]
∅:D[19.2793] → [8.3620:3621]
B:BD[8.3620] → [8.3620:3621]
B:BD[8.3621] → [18.2790:2803]
∅:D[18.2803] → [8.3634:3635]
B:BD[8.3634] → [8.3634:3635]
B:BD[8.3635] → [18.2804:2811]
```
%%%%
smell_name
baking bread
burning hair
coffee
```
Replacement in crawl-ref/source/dat/database/miscname.txt at line 201 [17.3342]
B:BD[8.3649] → [18.2812:2831]
```
fire and brimstone
```
[8.3649]
[19.2821]
```
yak
```
Deletion in crawl-ref/source/dat/database/miscname.txt at line 203 [17.3342]
B:BD[19.2822] → [18.2832:2837]
∅:D[19.2827] → [8.3665:3666]
∅:D[18.2837] → [8.3665:3666]
B:BD[8.3665] → [8.3665:3666]
B:BD[8.3666] → [18.2838:2854]
∅:D[19.2844] → [8.3675:3676]
∅:D[18.2854] → [8.3675:3676]
B:BD[8.3675] → [8.3675:3676]
B:BD[8.3676] → [18.2855:2863]
∅:D[18.2863] → [8.3684:3685]
B:BD[8.3684] → [8.3684:3685]
B:BD[8.3685] → [18.2864:2873]
B:BD[18.2873] → [16.3091:3092]
```
salt
womething weird
sulphur
wet wool
```
Replacement in crawl-ref/source/dat/database/miscname.txt at line 214 [17.3342]
B:BD[16.3216] → [16.3216:3230]
```
roaring flame
```
[16.3216]
[16.3230]
```
roaring flames
```
Replacement in crawl-ref/source/dat/database/miscname.txt at line 218 [17.3342]
B:BD[16.3249] → [16.3249:3272]
```
the bellowing of a yak
```
[16.3249]
[8.3704]
```
the distant roaring of an enraged @roaring_animal_name@
```

Clean up and consolidate random_uselessness(), as well as its associated

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 676 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2300 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2996 [5.293070]

Deletion in crawl-ref/source/misc.h at line 107 [5.1928926]

Deletion in crawl-ref/source/misc.cc at line 2417 [5.1933596]

Replacement in crawl-ref/source/item_use.cc at line 4208 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4231 [5.2781507]

Replacement in crawl-ref/source/effects.h at line 60 [5.3378996]

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

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

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

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

Deletion in crawl-ref/source/effects.cc at line 766 [5.3382105]

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

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

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

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

Replacement in crawl-ref/source/dat/database/miscname.txt at line 8 [17.3342]

Insertion in crawl-ref/source/dat/database/miscname.txt at line 159 [17.3342]

Deletion in crawl-ref/source/dat/database/miscname.txt at line 200 [17.3342]

Replacement in crawl-ref/source/dat/database/miscname.txt at line 201 [17.3342]

Deletion in crawl-ref/source/dat/database/miscname.txt at line 203 [17.3342]

Replacement in crawl-ref/source/dat/database/miscname.txt at line 214 [17.3342]

Replacement in crawl-ref/source/dat/database/miscname.txt at line 218 [17.3342]