fiddlerwoaroof/crawl - Change PHBACPMH3F34GODHVDKNCMXWU373RJQGVTDLBFCCDLLWDXVYOLTAC

Another clean up, and add some new weapon speech.

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

Created by j-p-e-g on July 7, 2008

PHBACPMH3F34GODHVDKNCMXWU373RJQGVTDLBFCCDLLWDXVYOLTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 435 [15.3]
∅:D[14.167] → [15.12000:12029]
∅:D[16.223] → [15.12000:12029]
∅:D[17.904] → [15.12000:12029]
B:BD[15.12000] → [15.12000:12029]
```
    if (random2(sever) <= 1)
```
[16.223]
[15.12029]
```
    if (x_chance_in_y(2, sever))
```
Replacement in crawl-ref/source/xom.cc at line 459 [15.3]
B:BD[15.13306] → [15.13306:13340]
```
    else if (random2(sever) <= 2)
```
[15.13306]
[15.13340]
```
    else if (x_chance_in_y(3, sever))
```
Replacement in crawl-ref/source/xom.cc at line 465 [15.3]
B:BD[15.13421] → [15.13421:13455]
```
    else if (random2(sever) <= 3)
```
[15.13421]
[15.13455]
```
    else if (x_chance_in_y(4, sever))
```
Replacement in crawl-ref/source/xom.cc at line 547 [15.3]
B:BD[15.14592] → [15.14592:14626]
```
    else if (random2(sever) <= 4)
```
[15.14592]
[15.14626]
```
    else if (x_chance_in_y(5, sever))
```
Replacement in crawl-ref/source/xom.cc at line 553 [15.3]
B:BD[16.1454] → [12.4:38]
```
    else if (random2(sever) <= 5)
```
[16.1454]
[16.1488]
```
    else if (x_chance_in_y(6, sever))
```
Replacement in crawl-ref/source/xom.cc at line 589 [15.3]
B:BD[15.15724] → [12.39:73]
```
    else if (random2(sever) <= 6)
```
[15.15724]
[15.15791]
```
    else if (x_chance_in_y(7, sever))
```
Replacement in crawl-ref/source/xom.cc at line 617 [15.3]
B:BD[15.16547] → [12.74:108]
```
    else if (random2(sever) <= 7)
```
[15.16547]
[15.16581]
```
    else if (x_chance_in_y(8, sever))
```
Replacement in crawl-ref/source/xom.cc at line 623 [15.3]
B:BD[15.16645] → [12.109:143]
```
    else if (random2(sever) <= 8)
```
[15.16645]
[12.143]
```
    else if (x_chance_in_y(9, sever))
```
Replacement in crawl-ref/source/xom.cc at line 633 [15.3]
∅:D[12.390] → [16.2181:2215]
B:BD[15.16645] → [16.2181:2215]
```
    else if (random2(sever) <= 9)
```
[12.390]
[15.16697]
```
    else if (x_chance_in_y(10, sever))
```
Replacement in crawl-ref/source/xom.cc at line 656 [15.3]
B:BD[15.17517] → [16.2591:2626]
```
    else if (random2(sever) <= 10)
```
[15.17517]
[15.17551]
```
    else if (x_chance_in_y(11, sever))
```
Replacement in crawl-ref/source/xom.cc at line 692 [15.3]
B:BD[15.18354] → [16.2869:2904]
```
    else if (random2(sever) <= 11)
```
[15.18354]
[15.18424]
```
    else if (x_chance_in_y(12, sever))
```
Replacement in crawl-ref/source/xom.cc at line 738 [15.3]
B:BD[15.19790] → [15.19790:19823]
```
        if (random2(sever) <= 2)
```
[15.19790]
[15.19823]
```
        if (x_chance_in_y(3, sever))
```
Replacement in crawl-ref/source/xom.cc at line 746 [15.3]
B:BD[15.20422] → [15.20422:20460]
```
        else if (random2(sever) <= 3)
```
[15.20422]
[15.20460]
```
        else if (x_chance_in_y(4, sever))
```
Replacement in crawl-ref/source/xom.cc at line 755 [15.3]
B:BD[15.21043] → [15.21043:21081]
```
        else if (random2(sever) <= 4)
```
[15.21043]
[15.21081]
```
        else if (x_chance_in_y(5, sever))
```
Replacement in crawl-ref/source/xom.cc at line 764 [15.3]
B:BD[15.21605] → [15.21605:21643]
```
        else if (random2(sever) <= 5)
```
[15.21605]
[15.21643]
```
        else if (x_chance_in_y(6, sever))
```
Replacement in crawl-ref/source/xom.cc at line 773 [15.3]
B:BD[15.22226] → [16.4283:4321]
```
        else if (random2(sever) <= 6)
```
[15.22226]
[15.22282]
```
        else if (x_chance_in_y(7, sever))
```
Replacement in crawl-ref/source/xom.cc at line 796 [15.3]
B:BD[15.23136] → [16.4722:4760]
```
        else if (random2(sever) <= 7)
```
[15.23136]
[15.23207]
```
        else if (x_chance_in_y(8, sever))
```
Replacement in crawl-ref/source/xom.cc at line 824 [15.3]
B:BD[15.23955] → [16.5173:5211]
```
        else if (random2(sever) <= 8)
```
[15.23955]
[15.24011]
```
        else if (x_chance_in_y(9, sever))
```
Replacement in crawl-ref/source/xom.cc at line 855 [15.3]
B:BD[15.24903] → [15.24903:24941]
```
        else if (random2(sever) <= 9)
```
[15.24903]
[15.24941]
```
        else if (x_chance_in_y(10, sever))
```
Replacement in crawl-ref/source/xom.cc at line 895 [15.3]
B:BD[15.26044] → [15.26044:26083]
```
        else if (random2(sever) <= 10)
```
[15.26044]
[15.26083]
```
        else if (x_chance_in_y(11, sever))
```

Replacement in crawl-ref/source/view.cc at line 807 [20.16817]

B:BD[18.46] → [19.52:126]

        if (you.piety > random2(MAX_PIETY) && !you.penance[you.religion])

[18.46]

[21.817]

        if (x_chance_in_y(you.piety, MAX_PIETY) && !you.penance[you.religion])

Replacement in crawl-ref/source/view.cc at line 890 [20.16817]

B:BD[18.4476] → [22.7:86]

    if (!force && (!you.turn_is_over || random2(30) < you.skills[SK_STEALTH]))

[18.4476]

[22.86]

    if (!force && (!you.turn_is_over
                   || x_chance_in_y(you.skills[SK_STEALTH], 30)))
    {

Insertion in crawl-ref/source/view.cc at line 894 [20.16817]
[22.102]
[22.102]
```
    }
```
Replacement in crawl-ref/source/view.cc at line 1280 [20.16817]
B:BD[20.48998] → [23.29:68]
```
    if (random2(stealth) <= mons_perc)
```
[20.48998]
[23.68]
```
    if (x_chance_in_y(mons_perc + 1, stealth))
```

Replacement in crawl-ref/source/traps.cc at line 257 [25.5308]

∅:D[24.2189] → [25.10553:10621]

B:BD[25.10553] → [25.10553:10621]

            if (poison && random2(100) < 50 - (3 * player_AC()) / 2

[24.2189]

[25.10621]

            if (poison && x_chance_in_y(50 - (3 * player_AC()) / 2, 100)

Replacement in crawl-ref/source/traps.cc at line 724 [25.5308]
∅:D[26.469] → [27.1256:1295]
∅:D[24.2224] → [27.1256:1295]
B:BD[27.1256] → [27.1256:1295]
```
    // Berserkers get a fighting bonus
```
[24.2224]
[27.1295]
```
    // Berserkers get a fighting bonus.
```

Replacement in crawl-ref/source/traps.cc at line 728 [25.5308]

B:BD[27.1548] → [27.1548:1603]

    // check stats
    if (you.strength > random2(18))

[27.1354]

[27.1603]

    // Check stats.
    if (x_chance_in_y(you.strength, 18))

Replacement in crawl-ref/source/traps.cc at line 731 [25.5308]
B:BD[27.1621] → [27.1621:1652]
```
    if (you.dex > random2(12))
```
[27.1621]
[27.1652]
```
    if (x_chance_in_y(you.dex, 12))
```
Replacement in crawl-ref/source/traps.cc at line 733 [25.5308]
B:BD[27.1670] → [27.1670:1710]
```
    if (player_evasion() > random2(20))
```
[27.1670]
[27.1710]
```
    if (x_chance_in_y(player_evasion(), 20))
```
Replacement in crawl-ref/source/traps.cc at line 736 [25.5308]
B:BD[27.1729] → [27.1729:1768]
```
    // monsters around you add urgency
```
[27.1729]
[27.1768]
```
    // Monsters around you add urgency.
```

Replacement in crawl-ref/source/traps.cc at line 743 [25.5308]

∅:D[28.134] → [27.1845:1938]

B:BD[27.1845] → [27.1845:1938]

    // confusion makes the whole thing somewhat harder
    // (less so for trying to escape)

[28.134]

[27.1938]

    // Confusion makes the whole thing somewhat harder
    // (less so for trying to escape).

Replacement in crawl-ref/source/traps.cc at line 753 [25.5308]
∅:D[24.2226] → [28.135:177]
B:BD[27.2088] → [28.135:177]
```
    // damaged nets are easier to destroy
```
[24.2226]
[28.177]
```
    // Damaged nets are easier to destroy.
```

Replacement in crawl-ref/source/traps.cc at line 758 [25.5308]

∅:D[24.2268] → [28.251:328]

B:BD[28.251] → [28.251:328]

        // ... and easier to slip out of (but only if escape looks feasible)

[24.2268]

[28.328]

        // ... and easier to slip out of (but only if escape looks feasible).

Replacement in crawl-ref/source/traps.cc at line 763 [25.5308]
∅:D[28.441] → [27.2088:2149]
B:BD[27.2088] → [27.2088:2149]
```
    // if undecided, choose damaging approach (it's quicker)
```
[28.441]
[27.2149]
```
    // If undecided, choose damaging approach (it's quicker).
```

Replacement in crawl-ref/source/traps.cc at line 770 [25.5308]

B:BD[27.2250] → [27.2250:2441]

// calls the above function to decide on how to get free
// note that usually the net will be damaged until trying to slip out
// becomes feasible (for size etc.), so it may take even longer

[27.2250]

[27.2441]

// Calls the above function to decide on how to get free.
// Note that usually the net will be damaged until trying to slip out
// becomes feasible (for size etc.), so it may take even longer.

Replacement in crawl-ref/source/traps.cc at line 790 [25.5308]

B:BD[25.20477] → [27.2678:2730]

B:BD[27.2730] → [24.2269:2346]

∅:D[24.2346] → [27.2808:2853]

B:BD[27.2808] → [27.2808:2853]

    if (do_what <= 0) // you try to destroy the net
    {                 // for previously undamaged nets this takes at least 2
                      // and at most 8 turns

[25.20477]

[27.2853]

    if (do_what <= 0) // You try to destroy the net
    {
        // For previously undamaged nets this takes at least 2 and at most
        // 8 turns.

Replacement in crawl-ref/source/traps.cc at line 806 [25.5308]

B:BD[27.3153] → [28.456:537]

        // medium sized characters are at disadvantage and sometimes get a bonus

[27.3153]

[28.537]

        // Medium sized characters are at disadvantage and sometimes
        // get a bonus.

Replacement in crawl-ref/source/traps.cc at line 837 [25.5308]

B:BD[25.21305] → [27.3639:3765]

        // occasionally decrease duration a bit
        // (this is so switching from damage to escape does not hurt as much)

[25.21305]

[26.844]

        // Occasionally decrease duration a bit
        // (this is so switching from damage to escape does not hurt as much).

Replacement in crawl-ref/source/traps.cc at line 847 [25.5308]
B:BD[27.3833] → [27.3833:3903]
```
   else // you try to escape (takes at least 3 turns, and at most 10)
```
[27.3833]
[27.3903]
```
   else
```

Insertion in crawl-ref/source/traps.cc at line 849 [25.5308]

[27.3908]

[26.1047]

        // You try to escape (takes at least 3 turns, and at most 10).

Replacement in crawl-ref/source/traps.cc at line 855 [25.5308]

∅:D[24.2358] → [28.627:708]

B:BD[25.21411] → [28.627:708]

        // medium sized characters are at disadvantage and sometimes get a bonus

[24.2358]

[28.708]

        // Medium sized characters are at disadvantage and sometimes
        // get a bonus.

Replacement in crawl-ref/source/spl-cast.cc at line 1103 [20.293070]

B:BD[29.3568] → [29.3568:3634]

                && you.piety >= 100 && random2(150) <= you.piety)

[29.3568]

[20.312904]

                && you.piety >= 100 && x_chance_in_y(you.piety + 1, 150))

Replacement in crawl-ref/source/spl-cast.cc at line 1106 [20.293070]
B:BD[20.312967] → [3.29:64]
```
                return SPRET_FAIL;
```
[20.312967]
[20.312999]
```
                return (SPRET_FAIL);
```

Replacement in crawl-ref/source/spl-cast.cc at line 2899 [20.293070]

B:BD[30.18029] → [30.18029:18101]

B:BD[30.18101] → [31.161:203]

        && (!player_under_penance() && you.piety >= piety_breakpoint(1)
            && you.piety > random2(150)))

[30.18029]

[30.18144]

        && !player_under_penance() && you.piety >= piety_breakpoint(1)
        && x_chance_in_y(you.piety, 150))

Replacement in crawl-ref/source/spl-book.cc at line 1314 [20.397614]

B:BD[32.1357] → [32.1357:1423]

        && random2(4) < player_mutation_level(MUT_BLURRY_VISION))

[32.1357]

[20.429876]

        && x_chance_in_y(player_mutation_level(MUT_BLURRY_VISION), 4))

Replacement in crawl-ref/source/spells4.cc at line 1979 [20.436250]

B:BD[20.507972] → [20.507972:508037]

        if (okay_to_dest && pow >= 80 && random2(500) < pow / 5)

[20.507972]

[20.508037]

        if (okay_to_dest && pow >= 80 && x_chance_in_y(pow / 5, 500))

Replacement in crawl-ref/source/religion.cc at line 1002 [20.804403]

B:BD[33.4082] → [9.2651:2707]

∅:D[9.2707] → [33.4137:4200]

B:BD[33.4137] → [33.4137:4200]

           && random2(piety_breakpoint(1)) <= you.piety
        || random2(MAX_PIETY) <= you.piety && one_chance_in(3)

[33.4082]

[33.4200]

           && x_chance_in_y(you.piety + 1, piety_breakpoint(1))
        || x_chance_in_y(you.piety + 1, MAX_PIETY) && one_chance_in(3)

Replacement in crawl-ref/source/religion.cc at line 1211 [20.804403]
∅:D[7.2582] → [34.2641:2690]
B:BD[34.2641] → [34.2641:2690]
```
        if (random2(100) <= mon->max_hit_points)
```
[7.2582]
[35.2528]
```
        if (x_chance_in_y(mon->max_hit_points + 1, 100))
```
Replacement in crawl-ref/source/religion.cc at line 3603 [20.804403]
B:BD[36.4124] → [36.4124:4160]
```
        if (chance >= random2(100))
```
[36.4124]
[36.4160]
```
        if (x_chance_in_y(chance + 1, 100))
```

Replacement in crawl-ref/source/religion.cc at line 5203 [20.804403]

B:BD[37.2961] → [37.2961:3033]

        if (you.attribute[ATTR_CARD_COUNTDOWN] && random2(800) < value)

[37.2961]

[37.3033]

        if (you.attribute[ATTR_CARD_COUNTDOWN] && x_chance_in_y(value, 800))

Replacement in crawl-ref/source/religion.cc at line 5214 [20.804403]

B:BD[37.3455] → [37.3455:3508]

            || value/2 >= random2(30 + you.piety/2))

[37.3455]

[37.3508]

            || x_chance_in_y(value/2 + 1, 30 + you.piety/2))

Deletion in crawl-ref/source/religion.cc at line 5244 [20.804403]

B:BD[37.4375] → [37.4375:4932]

    case GOD_OKAWARU:
    case GOD_MAKHLEB:
        if (item.base_type == OBJ_CORPSES
            || value >= random2(200)
            || (player_under_penance() && value >= random2(5)))
        {
            gain_piety(1);
            relative_piety_gain = PIETY_SOME;
        }
        break;
    case GOD_SIF_MUNA:
        if (value >= 150)       // no point in saccing stacks to Sif
        {
            gain_piety(1 + random2(3));
            relative_piety_gain = PIETY_SOME;
        }
        break;
    case GOD_KIKUBAAQUDGHA:
    case GOD_TROG:

Replacement in crawl-ref/source/religion.cc at line 5252 [20.804403]
B:BD[37.5073] → [37.5073:5105]
```
    return relative_piety_gain;
```
[37.5073]
[38.795]
```
    return (relative_piety_gain);
```

Replacement in crawl-ref/source/religion.cc at line 5652 [20.804403]

∅:D[39.2826] → [40.601:670]

B:BD[40.601] → [40.601:670]

    bool anytime = (one_chance_in(10) || you.piety > random2(1000));

[39.2826]

[41.5494]

    bool anytime = (one_chance_in(10) || x_chance_in_y(you.piety, 1000));

Replacement in crawl-ref/source/religion.cc at line 5694 [20.804403]

B:BD[42.1677] → [42.1677:1735]

B:BD[42.1735] → [5.2509:2580]

    if (you.religion != god && you.religion != GOD_XOM &&
        !player_under_penance() && you.piety > random2(MAX_PIETY * 2))

[42.1677]

[42.1796]

    if (you.religion != god && you.religion != GOD_XOM
        && !player_under_penance() && x_chance_in_y(you.piety, MAX_PIETY * 2))

Replacement in crawl-ref/source/religion.cc at line 5802 [20.804403]

B:BD[15.31093] → [15.31093:31145]

            delta = (random2(1000) < 511) ? 1 : -1;

[15.31093]

[15.31145]

            delta = (x_chance_in_y(511, 1000) ? 1 : -1);

Replacement in crawl-ref/source/randart.cc at line 832 [20.893152]

B:BD[20.915536] → [43.3760:3812]

    bool done_powers = (random2(12 < power_level));

[20.915536]

[43.3812]

    // This can't be right. random2(boolean) == 0, always. (jpeg)
//    bool done_powers = (random2(12 < power_level));

Insertion in crawl-ref/source/randart.cc at line 835 [20.893152]

[43.3813]

[44.3266]

   // Try to improve items that still have a low power level.
   bool done_powers = x_chance_in_y(power_level, 12);

Replacement in crawl-ref/source/player.cc at line 2855 [20.962854]

B:BD[45.16546] → [45.16546:16609]

                && (force || random2(100) < chance_forgotten))

[45.16546]

[45.16609]

                && (force || x_chance_in_y(chance_forgotten, 100)))

Replacement in crawl-ref/source/player.cc at line 6736 [20.962854]
B:BD[46.1304] → [46.1304:1352]
```
    if (asleep() && random2(50) <= disturbance)
```
[46.1304]
[46.1352]
```
    if (asleep() && x_chance_in_y(disturbance + 1, 50))
```
Replacement in crawl-ref/source/ouch.cc at line 280 [20.1104358]
B:BD[20.1110237] → [20.1110237:1110279]
```
        if (random2(20) <= acid_strength)
```
[20.1110237]
[20.1110279]
```
        if (x_chance_in_y(acid_strength + 1, 20))
```
Replacement in crawl-ref/source/ouch.cc at line 312 [20.1104358]
B:BD[20.1110844] → [20.1110844:1110893]
```
    else if (random2(20) <= acid_strength)
    {
```
[20.1110844]
[20.1110893]
```
    if (x_chance_in_y(acid_strength + 1, 20))
```
Replacement in crawl-ref/source/ouch.cc at line 315 [20.1104358]
B:BD[20.1110929] → [20.1110929:1110988]
```
    }
}                               // end weapon_acid()
```
[20.1110929]
[20.1110988]
```
}
```

Replacement in crawl-ref/source/monstuff.cc at line 2269 [20.1396662]

B:BD[47.6693] → [47.6693:6739]

                if (random2(count_grids) < 3)

[47.6693]

[47.6739]

                if (x_chance_in_y(3, count_grids))

Replacement in crawl-ref/source/monstuff.cc at line 3541 [20.1396662]

∅:D[48.3812] → [49.5226:5279]

B:BD[49.5226] → [49.5226:5279]

                        if (random2(mons_count) < 2)

[48.3812]

[50.6518]

                        if (x_chance_in_y(2, mons_count))

Replacement in crawl-ref/source/monstuff.cc at line 4236 [20.1396662]

B:BD[20.1478280] → [51.3141:3205]

        if (monster->type != MONS_HELL_HOUND && random2(13) < 3

[52.12935]

[20.1478346]

        if (monster->type != MONS_HELL_HOUND && x_chance_in_y(3, 13)

Replacement in crawl-ref/source/monstuff.cc at line 5627 [20.1396662]
∅:D[53.2842] → [54.3266:3305]
B:BD[54.3266] → [54.3266:3305]
```
    return (random2(25) < regen_rate);
```
[53.2842]
[55.910]
```
    return (x_chance_in_y(regen_rate, 25));
```

Replacement in crawl-ref/source/monstuff.cc at line 5999 [20.1396662]

B:BD[56.2226] → [57.8270:8315]

                if (random2(2 + pfound) < 2)

[56.2226]

[57.8315]

                if (x_chance_in_y(2, 2 + pfound))

Replacement in crawl-ref/source/monstuff.cc at line 7033 [20.1396662]
∅:D[58.6864] → [59.679:731]
B:BD[59.679] → [59.679:731]
```
            if (1 + random2(5) < monster->hit_dice)
```
[58.6864]
[58.6865]
```
            if (x_chance_in_y(monster->hit_dice - 1, 5))
```

Replacement in crawl-ref/source/mon-util.cc at line 5692 [20.1699344]

B:BD[60.15831] → [60.15831:15891]

            if (random2(SIZE_GIANT - mon_size) <= mon_size)

[60.15831]

[60.15891]

            if (x_chance_in_y(mon_size + 1, SIZE_GIANT - mon_size))

Replacement in crawl-ref/source/mon-util.cc at line 5898 [20.1699344]
∅:D[61.2595] → [62.3102:3166]
B:BD[63.25857] → [62.3102:3166]
```
            || random2(1000) < ( 1000 / ((15 * hit_dice) / 5)))
```
[61.2595]
[63.25936]
```
            || x_chance_in_y(1000 / (15 * hit_dice / 5), 1000))
```
Replacement in crawl-ref/source/mon-util.cc at line 6384 [20.1699344]
B:BD[54.6674] → [54.6674:6721]
```
        && damage > 8 && random2(50) < damage)
```
[54.6674]
[54.6721]
```
        && damage > 8 && x_chance_in_y(damage, 50))
```
Replacement in crawl-ref/source/misc.cc at line 1128 [20.1933596]
B:BD[64.6015] → [64.6015:6045]
```
    if (amount > random2(20))
```
[64.6015]
[64.6045]
```
    if (x_chance_in_y(amount, 20))
```

Replacement in crawl-ref/source/misc.cc at line 1272 [20.1933596]

B:BD[65.11114] → [65.11114:11163]

                    && random2(17) <= effective)

[65.11114]

[66.1186]

                    && x_chance_in_y(effective + 1, 17))

Replacement in crawl-ref/source/misc.cc at line 1279 [20.1933596]

B:BD[65.11298] → [65.11298:11352]

                         && random2(17) <= effective)

[65.11298]

[66.1509]

                         && x_chance_in_y(effective + 1, 17))

Replacement in crawl-ref/source/mapdef.cc at line 1838 [68.594797]

B:BD[67.2771] → [67.2771:2822]

        if (random2(totweight += weight) < weight)

[67.2771]

[67.2822]

        if (x_chance_in_y(weight, totweight += weight))

Replacement in crawl-ref/source/mapdef.cc at line 2269 [68.594797]

B:BD[67.4667] → [67.4667:4719]

        if (random2(cumulative += weight) < weight)

[67.4667]

[67.4719]

        if (x_chance_in_y(weight, cumulative += weight))

Replacement in crawl-ref/source/mapdef.cc at line 2676 [68.594797]

B:BD[69.5434] → [69.5434:5508]

    {
        if (random2(cumulative += repl[i].second) < repl[i].second)

[69.5434]

[69.5508]

        if (x_chance_in_y(repl[i].second, cumulative += repl[i].second))

Deletion in crawl-ref/source/mapdef.cc at line 2678 [68.594797]
B:BD[69.5544] → [69.5544:5550]
```
    }
```

Replacement in crawl-ref/source/mapdef.cc at line 2768 [68.594797]

B:BD[70.5658] → [70.5658:5729]

        if (random2(cweight += colours[i].second) < colours[i].second)

[70.5658]

[70.5729]

        if (x_chance_in_y(colours[i].second, cweight += colours[i].second))

Replacement in crawl-ref/source/mapdef.cc at line 3080 [68.594797]

B:BD[71.9729] → [71.9729:9794]

        if (random2(tweight += feat.genweight) < feat.genweight)

[71.9729]

[71.9794]

        if (x_chance_in_y(feat.genweight, tweight += feat.genweight))

Replacement in crawl-ref/source/makeitem.cc at line 867 [72.927]

B:BD[72.24646] → [73.2731:2790]

B:BD[73.2790] → [74.4511:4541]

    if (item_level > 6 && random2(100) < (10 + item_level)
        && one_chance_in(30))

[72.24646]

[74.4541]

    if (item_level > 6 && one_chance_in(30)
        && x_chance_in_y(10 + item_level, 100))

Replacement in crawl-ref/source/makeitem.cc at line 872 [72.927]
∅:D[74.4554] → [73.2823:2867]
B:BD[75.1689] → [73.2823:2867]
```
    else if (random2(20) < 20 - item_level)
```
[74.4554]
[73.2867]
```
    else if (x_chance_in_y(20 - item_level, 20))
```

Replacement in crawl-ref/source/makeitem.cc at line 881 [72.927]

B:BD[72.24882] → [75.1818:1872]

            if (weapon_rarity(wpntype) > random2(10))

[72.24882]

[75.1872]

            if (x_chance_in_y(weapon_rarity(wpntype), 10))

Replacement in crawl-ref/source/makeitem.cc at line 896 [72.927]

B:BD[75.2213] → [75.2213:2265]

        && random2(4000) <= 100 + (item_level * 3))

[75.2213]

[72.26303]

        && x_chance_in_y(101 + (item_level * 3), 4000))

Replacement in crawl-ref/source/makeitem.cc at line 947 [72.927]

B:BD[75.3479] → [75.3479:3559]

        && random2(3000) <= 30 + (item_level * 3)
        && one_chance_in(12))

[75.3479]

[75.3559]

        && one_chance_in(12)
        && x_chance_in_y(31 + (item_level * 3), 3000))

Replacement in crawl-ref/source/makeitem.cc at line 1178 [72.927]

B:BD[75.8669] → [75.8669:8750]

        if (!(force_good || is_demonic(item) || random2(300) <= 100+item_level))

[75.8669]

[75.8750]

        if (!force_good && !is_demonic(item)
            && !x_chance_in_y(101 + item_level, 300))
        {

Insertion in crawl-ref/source/makeitem.cc at line 1182 [72.927]
[75.8772]
[75.8772]
```
        }
```

Replacement in crawl-ref/source/makeitem.cc at line 1566 [72.927]

B:BD[76.8533] → [74.5839:5887]

            || random2(200) <= 50 + item_level)

[76.8533]

[77.10476]

            || x_chance_in_y(51 + item_level, 200))

Replacement in crawl-ref/source/makeitem.cc at line 1798 [72.927]
B:BD[72.62856] → [75.25585:25626]
```
    if (10 + item_level >= random2(100))
```
[72.62856]
[75.25626]
```
    if (x_chance_in_y(11 + item_level, 100))
```

Replacement in crawl-ref/source/makeitem.cc at line 1812 [72.927]

B:BD[75.26045] → [78.5723:5790]

    if (item_level > 2 && random2(4000) <= (100 + item_level * 3))

[75.26045]

[75.26113]

    if (item_level > 2 && x_chance_in_y(101 + item_level * 3, 4000))

Replacement in crawl-ref/source/makeitem.cc at line 2042 [72.927]

B:BD[75.32730] → [75.32730:32806]

            if (force_type == OBJ_RANDOM && random2(50) <= 10 + item_level)

[75.32730]

[75.32806]

            if (force_type == OBJ_RANDOM && x_chance_in_y(11 + item_level, 50))

Replacement in crawl-ref/source/makeitem.cc at line 2109 [72.927]
∅:D[79.1864] → [75.34435:34479]
∅:D[76.9594] → [75.34435:34479]
B:BD[75.34435] → [75.34435:34479]
```
        || 50 + item_level >= random2(250))
```
[76.9594]
[75.34479]
```
        || x_chance_in_y(51 + item_level, 250))
```

Replacement in crawl-ref/source/makeitem.cc at line 2114 [72.927]

B:BD[72.78259] → [75.34550:34630]

        if (item.sub_type <= ARM_PLATE_MAIL && 20 + item_level >= random2(300))

[72.78259]

[75.34630]

        if (item.sub_type <= ARM_PLATE_MAIL
            && x_chance_in_y(21 + item_level, 300))
        {

Insertion in crawl-ref/source/makeitem.cc at line 2118 [72.927]
[75.34667]
[72.79994]
```
        }
```

Replacement in crawl-ref/source/makeitem.cc at line 2121 [72.927]

B:BD[74.8158] → [74.8158:8207]

            && (30 + item_level >= random2(350))

[74.8158]

[74.8207]

            && x_chance_in_y(31 + item_level, 350)

Replacement in crawl-ref/source/makeitem.cc at line 2473 [72.927]

B:BD[74.10991] → [74.10991:11066]

                && random2(item_level+1) + 1 < book_rarity(item.sub_type))

[74.10991]

[75.47266]

                && x_chance_in_y(book_rarity(item.sub_type)-1, item_level+1))

Replacement in crawl-ref/source/makeitem.cc at line 2482 [72.927]

B:BD[72.85258] → [75.47501:47606]

        // tome of destruction: rare!
        if ( item_level > 10 && random2(7000) <= item_level + 20 )

[72.85258]

[75.47606]

        // Tome of destruction: rare!
        if (item_level > 10 && x_chance_in_y(21 + item_level, 7000))

Replacement in crawl-ref/source/makeitem.cc at line 2486 [72.927]

B:BD[72.85300] → [75.47653:47757]

        // skill manuals - also rare
        if ( item_level >  6 && random2(4000) <= item_level + 20 )

[72.85300]

[75.47757]

        // Skill manuals - also rare.
        if (item_level > 6 && x_chance_in_y(21 + item_level, 4000))

Replacement in crawl-ref/source/makeitem.cc at line 2491 [72.927]

B:BD[72.85503] → [75.47805:47887]

    // Determine which skill for a manual
    if ( item.sub_type == BOOK_MANUAL )

[72.85503]

[75.47887]

    // Determine which skill for a manual.
    if (item.sub_type == BOOK_MANUAL)

Replacement in crawl-ref/source/makeitem.cc at line 2541 [72.927]

B:BD[75.49288] → [6.2672:2723]

∅:D[6.2723] → [75.49340:49370]

B:BD[75.49340] → [75.49340:49370]

        && random2(2000) <= 100 + (item_level * 3)
        && one_chance_in(20))

[75.49288]

[75.49370]

        && one_chance_in(20)
        && x_chance_in_y(101 + item_level * 3, 2000))

Replacement in crawl-ref/source/makeitem.cc at line 2620 [72.927]

B:BD[75.51251] → [75.51251:51318]

            if (random2(25) < 9)        // 36% of such rings {dlb}

[75.51251]

[72.91308]

            if (x_chance_in_y(9, 25))        // 36% of such rings {dlb}

Replacement in crawl-ref/source/makeitem.cc at line 2632 [72.927]

B:BD[75.51569] → [75.51569:51621]

        && random2(4000) <= 100 + (item_level * 3))

[75.51569]

[75.51621]

        && x_chance_in_y(101 + item_level * 3, 4000))

Replacement in crawl-ref/source/makeitem.cc at line 2745 [72.927]

B:BD[75.55139] → [75.55139:55205]

        if (item_level > 7 && (20 + item_level) >= random2(3500))

[75.55139]

[75.55205]

        if (item_level > 7 && x_chance_in_y(21 + item_level, 3500))

Replacement in crawl-ref/source/makeitem.cc at line 3054 [72.927]
B:BD[72.104650] → [72.104650:104702]
```
        if (random2(5) < 3)     // give hand weapon
```
[72.104650]
[72.104702]
```
        if (x_chance_in_y(3, 5))     // give hand weapon
```
Replacement in crawl-ref/source/makeitem.cc at line 3071 [72.927]
B:BD[72.105424] → [72.105424:105476]
```
        if (random2(5) < 3)     // give hand weapon
```
[72.105424]
[72.105476]
```
        if (x_chance_in_y(3, 5))     // give hand weapon
```

Replacement in crawl-ref/source/makeitem.cc at line 3094 [72.927]

B:BD[72.105983] → [72.105983:106042]

        if (random2(5) < 3)     // < 1 // give hand weapon

[72.105983]

[72.106042]

        if (x_chance_in_y(3, 5))     // give hand weapon

Replacement in crawl-ref/source/makeitem.cc at line 3650 [72.927]
B:BD[72.123424] → [72.123424:123471]
```
        if (random2(100) <= 9 + mon->hit_dice)
```
[72.123424]
[72.123471]
```
        if (x_chance_in_y(10 + mon->hit_dice, 100))
```
Replacement in crawl-ref/source/makeitem.cc at line 3728 [72.927]
B:BD[4.291] → [4.291:323]
```
            if (random2(5) < 2)
```
[4.291]
[4.323]
```
            if (x_chance_in_y(2, 5))
```
Replacement in crawl-ref/source/makeitem.cc at line 3958 [72.927]
B:BD[72.126583] → [72.126583:126611]
```
        if (random2(5) < 2)
```
[72.126583]
[72.126611]
```
        if (x_chance_in_y(2, 5))
```
Replacement in crawl-ref/source/makeitem.cc at line 4122 [72.927]
B:BD[72.130000] → [72.130000:130046]
```
        if (random2(100) < 9 + mon->hit_dice)
```
[72.130000]
[72.130046]
```
        if (x_chance_in_y(9 + mon->hit_dice, 100))
```
Replacement in crawl-ref/source/makeitem.cc at line 4198 [72.927]
∅:D[80.3270] → [15.47881:47921]
B:BD[15.47881] → [15.47881:47921]
```
    if (random2(35) <= item_level + 10)
```
[80.3270]
[15.47921]
```
    if (x_chance_in_y(11 + item_level, 35))
```
Replacement in crawl-ref/source/makeitem.cc at line 4205 [72.927]
B:BD[15.48033] → [15.48033:48073]
```
    if (random2(60) <= item_level + 10)
```
[15.48033]
[79.1865]
```
    if (x_chance_in_y(11 + item_level, 60))
```

Replacement in crawl-ref/source/makeitem.cc at line 4208 [72.927]

B:BD[15.48104] → [15.48104:48166]

    if (10 + item_level >= random2(400) && one_chance_in(20))

[15.48104]

[79.1933]

    if (one_chance_in(20) && x_chance_in_y(11 + item_level, 400))

Replacement in crawl-ref/source/makeitem.cc at line 4211 [72.927]

B:BD[15.48215] → [15.48215:48277]

    if (10 + item_level >= random2(500) && one_chance_in(20))

[15.48215]

[15.48277]

    if (one_chance_in(20) && x_chance_in_y(11 + item_level, 500))

Replacement in crawl-ref/source/makeitem.cc at line 4213 [72.927]

B:BD[15.48283] → [79.2012:2064]

        // other dragon hides/armour or animal skin

[15.48283]

        // Other dragon hides/armour or animal skin.

Replacement in crawl-ref/source/items.cc at line 175 [20.2584728]

B:BD[20.2588454] → [20.2588454:2588566]

    // 2. avoid shops by avoiding (0,5..9)
    // 3. avoid monster inventory by iterating over the dungeon grid

[20.2588454]

[81.703]

    // 2. Avoid shops by avoiding (0,5..9).
    // 3. Avoid monster inventory by iterating over the dungeon grid.

Replacement in crawl-ref/source/items.cc at line 180 [20.2584728]
B:BD[20.2588646] → [20.2588646:2588681]
```
            // 1. not near player!
```
[20.2588646]
[20.2588681]
```
            // 1. Not near player!
```

Replacement in crawl-ref/source/items.cc at line 189 [20.2584728]

B:BD[81.800] → [82.6260:6316]

            // iterate through the grids list of items:

[81.800]

[81.801]

            // Iterate through the grids list of items.

Replacement in crawl-ref/source/items.cc at line 194 [20.2584728]

B:BD[20.2589063] → [83.6124:6190]

                if (_item_ok_to_clean(item) && random2(100) < 15)

[20.2589063]

[20.2589128]

                if (_item_ok_to_clean(item) && x_chance_in_y(15, 100))

Replacement in crawl-ref/source/items.cc at line 199 [20.2584728]

B:BD[20.2589225] → [20.2589225:2589277]

                        // 7. move uniques to abyss

[20.2589225]

[84.2645]

                        // 7. Move uniques to abyss.

Replacement in crawl-ref/source/items.cc at line 205 [20.2584728]

B:BD[20.2589537] → [20.2589537:2589584]

                        // 9. unmark unrandart

[20.2589537]

[84.2777]

                        // 9. Unmark unrandart.

Replacement in crawl-ref/source/items.cc at line 216 [20.2584728]
B:BD[20.2589944] → [20.2589944:2589974]
```
            } // end for item
```
[20.2589944]
[20.2589974]
```
            }
```

Replacement in crawl-ref/source/item_use.cc at line 2245 [20.2781507]

B:BD[85.13902] → [85.13902:13949]

                && random2(100) < shoot_skill)

[85.13902]

[86.22117]

                && x_chance_in_y(shoot_skill, 100))

Replacement in crawl-ref/source/item_use.cc at line 2254 [20.2781507]

B:BD[68.748889] → [87.580:638]

        else if (!teleport && random2(100) < shoot_skill)

[68.748889]

[20.2824966]

        else if (!teleport && x_chance_in_y(shoot_skill, 100))

Replacement in crawl-ref/source/item_use.cc at line 2417 [20.2781507]

B:BD[85.14870] → [85.14870:14925]

            && random2(100) < you.skills[SK_THROWING])

[85.14870]

[88.4998]

            && x_chance_in_y(you.skills[SK_THROWING], 100))

Replacement in crawl-ref/source/item_use.cc at line 3939 [20.2781507]

B:BD[89.5985] → [89.5985:6046]

        || enchant_level >= 4 && random2(9) < enchant_level)

[89.5985]

[20.2852867]

        || enchant_level >= 4 && x_chance_in_y(enchant_level, 9))

Replacement in crawl-ref/source/item_use.cc at line 4063 [20.2781507]

B:BD[90.6022] → [90.6022:6073]

        || arm.plus >= 3 && random2(8) < arm.plus)

[90.6022]

[20.2856562]

        || arm.plus >= 3 && x_chance_in_y(arm.plus, 8))

Replacement in crawl-ref/source/it_use3.cc at line 226 [20.2870456]
B:BD[20.2876443] → [20.2876443:2876490]
```
        if (random2(8) <= player_spec_death())
```
[20.2876413]
[20.2876490]
```
        if (x_chance_in_y(player_spec_death() + 1, 8))
```

Replacement in crawl-ref/source/it_use3.cc at line 517 [20.2870456]

B:BD[20.2884491] → [20.2884491:2884553]

                if (you.skills[SK_EVOCATIONS] >= random2(10))

[20.2884491]

[20.2884553]

                if (x_chance_in_y(you.skills[SK_EVOCATIONS] + 1, 10))

Replacement in crawl-ref/source/it_use3.cc at line 566 [20.2870456]

∅:D[32.29464] → [91.2621:2687]

B:BD[20.2885775] → [91.2621:2687]

                && you.skills[SK_EVOCATIONS] + 10 >= random2(40))

[32.29464]

[20.2885837]

                && x_chance_in_y(you.skills[SK_EVOCATIONS] + 11, 40))

Replacement in crawl-ref/source/it_use3.cc at line 698 [20.2870456]

B:BD[20.2892077] → [92.2799:2871]

    bool friendly = (you.skills[SK_EVOCATIONS] / 3 + 10 > random2(20));

[20.2892077]

[93.3029]

    bool friendly = x_chance_in_y(10 + you.skills[SK_EVOCATIONS] / 3, 20);

Replacement in crawl-ref/source/it_use3.cc at line 963 [20.2870456]
B:BD[20.2900053] → [20.2900053:2900108]
```
    if (random2(100) < 60 + you.skills[SK_EVOCATIONS])
```
[20.2900053]
[20.2900108]
```
    if (x_chance_in_y(60 + you.skills[SK_EVOCATIONS], 100))
```
Insertion in crawl-ref/source/ghost.cc at line 536 [94.9890]
[94.26186]
[94.26186]
```
// Returns the number of extra ghosts allowed on the level.
```

Replacement in crawl-ref/source/ghost.cc at line 558 [94.9890]

∅:D[95.396] → [94.26882:27077]

∅:D[8.4298] → [94.26882:27077]

B:BD[94.26882] → [94.26882:27077]

    if ((lev < 9 && you.where_are_you == BRANCH_MAIN_DUNGEON)
        || (subdepth < 2 && you.where_are_you == BRANCH_LAIR)
        || (subdepth < 2 && you.where_are_you == BRANCH_ORCISH_MINES))

[8.4298]

[94.27077]

    if (lev < 9 && you.where_are_you == BRANCH_MAIN_DUNGEON
        || subdepth < 2 && you.where_are_you == BRANCH_LAIR
        || subdepth < 2 && you.where_are_you == BRANCH_ORCISH_MINES)
    {

Insertion in crawl-ref/source/ghost.cc at line 563 [94.9890]
[94.27097]
[94.27097]
```
    }
```

Replacement in crawl-ref/source/ghost.cc at line 567 [94.9890]

B:BD[94.27191] → [94.27191:27258]

        || (you.where_are_you == BRANCH_MAIN_DUNGEON && lev < 15))

[94.27191]

[94.27258]

        || you.where_are_you == BRANCH_MAIN_DUNGEON && lev < 15)
    {

Insertion in crawl-ref/source/ghost.cc at line 570 [94.9890]
[94.27278]
[94.27278]
```
    }
```

Replacement in crawl-ref/source/ghost.cc at line 572 [94.9890]

B:BD[94.27279] → [94.27279:27337]

    return 1 + (random2(20) < lev) + (random2(40) < lev);

[94.27279]

[94.27337]

    return (1 + x_chance_in_y(lev, 20) + x_chance_in_y(lev, 40));

Replacement in crawl-ref/source/food.cc at line 1776 [20.3043806]

B:BD[96.8845] → [96.8845:8898]

                else if (random2(duration) < hp_amt)

[96.8845]

[96.8898]

                else if (x_chance_in_y(hp_amt, duration))

Replacement in crawl-ref/source/food.cc at line 2262 [20.3043806]

B:BD[97.401] → [97.401:464]

        && random2(GOURMAND_MAX) < you.duration[DUR_GOURMAND])

[97.401]

[20.3081877]

        && x_chance_in_y(you.duration[DUR_GOURMAND], GOURMAND_MAX))

Replacement in crawl-ref/source/fight.cc at line 1480 [20.3140790]

B:BD[98.47465] → [98.47465:47516]

        && random2(100) < you.skills[ wpn_skill ])

[98.47465]

[98.47516]

        && x_chance_in_y(you.skills[ wpn_skill ], 100))

Replacement in crawl-ref/source/fight.cc at line 1545 [20.3140790]

∅:D[99.7914] → [98.49310:49377]

B:BD[98.49310] → [98.49310:49377]

            if (random2(200) <= you.skills[SK_STABBING] + you.dex)

[99.7914]

[20.3163320]

            if (x_chance_in_y(you.skills[SK_STABBING] + you.dex + 1, 200))

Replacement in crawl-ref/source/fight.cc at line 2322 [20.3140790]

B:BD[98.61184] → [100.2908:2952]

∅:D[100.2952] → [101.62472:62533]

B:BD[101.62472] → [101.62472:62533]

        if (defender->res_negative_energy()
            && random2(8) <= attacker->skill(SK_NECROMANCY))

[98.61184]

[98.61287]

        if (!defender->res_negative_energy()
            && x_chance_in_y(attacker->skill(SK_NECROMANCY) + 1, 8))

Replacement in crawl-ref/source/fight.cc at line 2353 [20.3140790]

B:BD[102.509] → [102.509:577]

            // declaring these just to pass to the enchant function

[102.509]

[102.577]

            // Declaring these just to pass to the enchant function.

Replacement in crawl-ref/source/fight.cc at line 2589 [20.3140790]
∅:D[2.160] → [98.66143:66201]
B:BD[98.66143] → [98.66143:66201]
```
        // cap chance at 30% -- let staff of Olgreb shine
```
[2.160]
[98.66201]
```
        // Cap chance at 30% -- let staff of Olgreb shine.
```
Replacement in crawl-ref/source/fight.cc at line 2595 [20.3140790]
B:BD[20.3182082] → [98.66326:66364]
```
        if (random2(100) < temp_rand)
```
[20.3182082]
[98.66364]
```
        if (x_chance_in_y(temp_rand, 100))
```

Replacement in crawl-ref/source/fight.cc at line 2608 [20.3140790]

B:BD[20.3182519] → [98.66639:66692]

        if (random2(8) <= you.skills[SK_NECROMANCY])

[20.3182519]

[98.66692]

        if (x_chance_in_y(you.skills[SK_NECROMANCY] + 1, 8))

Deletion in crawl-ref/source/fight.cc at line 2879 [20.3140790]
∅:D[103.297] → [98.73514:73549]
∅:D[104.352] → [98.73514:73549]
∅:D[105.3300] → [98.73514:73549]
B:BD[98.73514] → [98.73514:73549]
```
    // This ordering is important!
```
Insertion in crawl-ref/source/fight.cc at line 2880 [20.3140790]
[20.3192930]
[106.5017]
```
    // This ordering is important!
```

Replacement in crawl-ref/source/fight.cc at line 2922 [20.3140790]

B:BD[106.5503] → [106.5503:5580]

        stab_attempt = (random2(roll) <= you.skills[SK_STABBING] + you.dex);

[106.5503]

[98.74630]

    {
        stab_attempt = x_chance_in_y(you.skills[SK_STABBING] + you.dex + 1,
                                     roll);
    }

Replacement in crawl-ref/source/fight.cc at line 3506 [20.3140790]

B:BD[101.69652] → [101.69652:69715]

    if (arm && coinflip() && random2(1000) <= item_mass(*arm))

[101.69652]

[101.69715]

    if (arm && coinflip() && x_chance_in_y(item_mass(*arm) + 1, 1000))

Replacement in crawl-ref/source/fight.cc at line 3713 [20.3140790]
∅:D[107.5440] → [101.74370:74428]
B:BD[101.74370] → [101.74370:74428]
```
        if (defender->res_negative_energy() > random2(3))
```
[107.5440]
[101.74428]
```
        if (x_chance_in_y(defender->res_negative_energy(), 3))
```

Replacement in crawl-ref/source/effects.cc at line 2477 [20.3382105]

B:BD[108.10579] → [108.10579:10651]

    // Adjust the player's stats if s/he has the deterioration mutation

[108.10579]

[32.33164]

    // Adjust the player's stats if s/he has the deterioration mutation.

Replacement in crawl-ref/source/effects.cc at line 2479 [20.3382105]

B:BD[32.33213] → [32.33213:33290]

        && random2(200) <= player_mutation_level(MUT_DETERIORATION) * 5 - 2)

[32.33213]

[108.10759]

        && x_chance_in_y(player_mutation_level(MUT_DETERIORATION) * 5 - 1, 200))

Replacement in crawl-ref/source/effects.cc at line 2534 [20.3382105]

B:BD[109.2762] → [109.2762:2817]

            && random2(25) <= you.magic_contamination)

[109.2762]

[109.2817]

            && x_chance_in_y(you.magic_contamination + 1, 25))

Replacement in crawl-ref/source/effects.cc at line 2540 [20.3382105]

B:BD[109.3022] → [110.3000:3060]

                 && random2(25) <= you.magic_contamination)

[109.3022]

[108.12778]

                 && x_chance_in_y(you.magic_contamination + 1, 25))

Deletion in crawl-ref/source/effects.cc at line 2657 [20.3382105]
∅:D[111.3817] → [108.17242:17286]
B:BD[108.17242] → [108.17242:17286]
```
    // jmf: moved huge thing to religion.cc
```

Replacement in crawl-ref/source/effects.cc at line 2660 [20.3382105]

B:BD[32.33333] → [112.2998:3070]

        && (random2(100) <= 2 + player_mutation_level(MUT_SCREAM) * 3))

[32.33333]

[108.17407]

        && x_chance_in_y(3 + player_mutation_level(MUT_SCREAM) * 3, 100))

Replacement in crawl-ref/source/dungeon.cc at line 7701 [20.3429798]
B:BD[113.158770] → [114.24258:24305]
```
    return random2(size.x + size.y) < size.x ?
```
[113.158770]
[13.13176]
```
    return x_chance_in_y(size.x, size.x + size.y) ?
```
Replacement in crawl-ref/source/describe.cc at line 746 [20.3736416]
B:BD[20.3753305] → [115.13025:13050]
```
    if (random2(40) < 3)
```
[20.3753305]
[20.3753366]
```
    if (x_chance_in_y(3, 40))
```

Replacement in crawl-ref/source/decks.cc at line 2228 [20.3987460]

B:BD[115.20187] → [115.20187:20264]

            && random2(8) < 1 + count_neighbours(p.x, p.y, DNGN_DEEP_WATER))

[115.20187]

[116.7861]

            && x_chance_in_y(1+count_neighbours(p.x, p.y, DNGN_DEEP_WATER), 8))

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 70 [117.5869]
[117.7564]
[117.7564]
```
@The_weapon@ sings an ear-splitting high note.
```
Replacement in crawl-ref/source/dat/database/wpnnoise.txt at line 75 [117.5869]
B:BD[117.7609] → [117.7609:7655]
```
@The_weapon@ sings a catchy @tune_or_melody@.
```
[117.7609]
[117.7655]
```
@The_weapon@ @sings_or_hums@ a catchy @tune_or_melody@.
```
Replacement in crawl-ref/source/dat/database/wpnnoise.txt at line 94 [117.5869]
B:BD[117.7954] → [117.7954:7998]
```
@The_weapon@ hums a slow and mournful tune.
```
[117.7954]
[117.7998]
```
@The_weapon@ @sings_or_hums@ a slow and mournful tune.
```
Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 109 [117.5869]
[117.8323]
[117.8323]
```
@The_weapon@ raucously launches into song.
```

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 133 [117.5869]

[117.8842]


@The_weapon@ sings a song about @song_theme@.
@The_weapon@ composes a hymn about @song_theme@.
@The_weapon@ composes a ballad about your adventures.

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 191 [117.5869]
[117.10007]
[117.10007]
```
@The_weapon@ asks you for a rhyme on '@rhyme_word@'.
```

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 201 [117.5869]

[117.10230]


@The_weapon@ says, "Whips just don't cut it for me, don't you agree?"
@The_weapon@ muses on the connection between 'duet' and 'duel'.
@Your_weapon@ wails, "I am too young to rust!"

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 231 [117.5869]
[117.10728]
[117.10728]
```
@Your_weapon@ intones a prayer.
```
Deletion in crawl-ref/source/dat/database/wpnnoise.txt at line 235 [117.5869]
B:BD[117.10764] → [117.10764:10801]
```
@Your_weapon@ hurls insults at you.
```
Deletion in crawl-ref/source/dat/database/wpnnoise.txt at line 261 [117.5869]
B:BD[117.11491] → [117.11491:11539]
```
@Your_weapon@ wails, "I am too young to rust!"
```

Replacement in crawl-ref/source/dat/database/wpnnoise.txt at line 264 [117.5869]

B:BD[117.11628] → [117.11628:11717]

@Your_weapon@ fumes, "Being battered, bent and broken sure is better than this boredom!"

[117.11628]

[117.11717]

@Your_weapon@ fumes, "Being battered, bent, and broken sure is better than this boredom!"

Replacement in crawl-ref/source/dat/database/wpnnoise.txt at line 282 [117.5869]
B:BD[117.12139] → [117.12139:12199]
```
@Your_weapon@ says, "How I wish you were a better fighter."
```
[117.12139]
[117.12199]
```
@Your_weapon@ sighs, "How I wish you were a better fighter."
```

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 287 [117.5869]

[117.12326]


@Your_weapon@ cries out, "You certainly can't call me dull!"
@Your_weapon@ tells you the story of its previous owner's @demise_or_death@.
@Your_weapon@ brightly announces, "I've got so much to tell you!"
@Your_weapon@ comments on your fighting techniques.
@Your_weapon@ says, "You could say something too, you know."
@Your_weapon@ complains, "Are you always this @silent@?"
@Your_weapon@ says, "Why don't you say something for a change?"
@Your_weapon@ asks, "Did you take a vow of silence?"
@Your_weapon@ shouts a battle cry!
@Your_weapon@ shouts, "Onwards!  It's kill or die!"
@Your_weapon@ says, "You can tell me everything!  I can keep a secret!"
@Your_weapon@ grouses, "Silence can be so depressing."

Deletion in crawl-ref/source/dat/database/wpnnoise.txt at line 352 [117.5869]
B:BD[117.12984] → [117.12984:13017]
```
@Your_weapon@ intones a prayer.
```
Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 386 [117.5869]
[117.13588]
[117.13588]
```
@Your_weapon@ cheers!
```
Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 516 [117.5869]
[117.15100]
[117.15100]
```
%%%%
sings_or_hums
sings
hums
```

Insertion in crawl-ref/source/dat/database/wpnnoise.txt at line 571 [117.5869]

[118.2820]

rhyme_word
fountain of blood
killing spree
battlefield
%%%%
song_theme
battle and fame
death and destruction
the glory of death
%%%%
silent
uncommunicative
taciturn
quiet
silent
boring
%%%%

Replacement in crawl-ref/source/cloud.cc at line 544 [20.4095717]
B:BD[119.8741] → [119.8741:8786]
```
        if (player_prot_life() > random2(3))
```
[119.8741]
[119.8786]
```
        if (x_chance_in_y(player_prot_life(), 3))
```
Replacement in crawl-ref/source/beam.cc at line 745 [20.4128068]
∅:D[120.12348] → [20.4133454:4133521]
B:BD[20.4133454] → [20.4133454:4133521]
```
        ret.size += (random2( num_dice ) < max_damage % num_dice);
```
[120.12348]
[20.4133521]
```
        ret.size += x_chance_in_y(max_damage % num_dice, num_dice);
```

Replacement in crawl-ref/source/beam.cc at line 4057 [20.4128068]

∅:D[121.1020] → [68.1245045:1245126]

B:BD[20.4231691] → [68.1245045:1245126]

            && random2(1000) <= item_mass( you.inv[you.equip[EQ_BODY_ARMOUR]] ))

[121.1020]

[20.4231772]

            && x_chance_in_y(item_mass(you.inv[you.equip[EQ_BODY_ARMOUR]]) + 1,
                             1000))

Replacement in crawl-ref/source/beam.cc at line 4110 [20.4128068]

B:BD[120.37208] → [120.37208:37347]

                && (hurted || (beam.ench_power == AUTOMATIC_HIT
                               && random2(100) < 90 - (3 * player_AC()))))

[120.37208]

[120.37347]

                && (hurted || beam.ench_power == AUTOMATIC_HIT
                              && x_chance_in_y(90 - 3 * player_AC(), 100)))

Replacement in crawl-ref/source/beam.cc at line 4119 [20.4128068]

B:BD[68.1245597] → [120.37511:37566]

            if (random2(100) < 90 - (3 * player_AC()))

[68.1245597]

[120.37566]

            if (x_chance_in_y(90 - 3 * player_AC(), 100))

Replacement in crawl-ref/source/beam.cc at line 4740 [20.4128068]

B:BD[120.38548] → [120.38548:38606]

                    && random2(100) < 90 - (3 * mon->ac))

[120.38548]

[120.38606]

                    && x_chance_in_y(90 - 3 * mon->ac, 100))

Deletion in crawl-ref/source/beam.cc at line 4745 [20.4128068]
B:BD[120.38747] → [120.38747:38765]
```
                {
```
Deletion in crawl-ref/source/beam.cc at line 4746 [20.4128068]
B:BD[120.38801] → [120.38801:38819]
```
                }
```

Replacement in crawl-ref/source/beam.cc at line 4751 [20.4128068]

B:BD[120.38998] → [120.38998:39056]

                    if ( skill_level + 25 > random2(50) )

[120.38998]

[120.39056]

                    if (x_chance_in_y(skill_level + 25, 50))

Replacement in crawl-ref/source/beam.cc at line 4753 [20.4128068]

B:BD[120.39095] → [120.39095:39148]

                    if ( skill_level > random2(50) )

[120.39095]

[120.39148]

                    if (x_chance_in_y(skill_level, 50))

Replacement in crawl-ref/source/acr.cc at line 2854 [20.4397395]

B:BD[122.6150] → [11.3235:3304]

            if (you.religion == GOD_TROG && you.piety > random2(150)

[122.6150]

[11.3304]

            if (you.religion == GOD_TROG && x_chance_in_y(you.piety, 150)

Replacement in crawl-ref/source/acr.cc at line 2952 [20.4397395]
B:BD[20.4456418] → [20.4456418:4456469]
```
        else if (random2(20) <= (you.rotting - 1))
```
[20.4456418]
[20.4456469]
```
        else if (x_chance_in_y(you.rotting, 20))
```

Replacement in crawl-ref/source/acr.cc at line 2983 [20.4397395]

B:BD[20.4457347] → [123.18342:18403]

        if (random2(5) <= (you.duration[DUR_POISONING] - 1))

[20.4457347]

[20.4457391]

        if (x_chance_in_y(you.duration[DUR_POISONING], 5))

Replacement in crawl-ref/source/acr.cc at line 3099 [20.4397395]

B:BD[124.7637] → [32.35138:35265]

    if ( !you.cannot_act() && !player_mutation_level(MUT_BLURRY_VISION)
         && random2(50) < you.skills[SK_TRAPS_DOORS] )

[124.7637]

[46.3372]

    if (!you.cannot_act() && !player_mutation_level(MUT_BLURRY_VISION)
        && x_chance_in_y(you.skills[SK_TRAPS_DOORS], 50))

Replacement in crawl-ref/source/acr.cc at line 3102 [20.4397395]
∅:D[46.3378] → [125.361:424]
B:BD[125.361] → [125.361:424]
```
        search_around(false); // check nonadjacent squares too
```
[46.3378]
[46.3379]
```
        search_around(false); // Check nonadjacent squares too.
```
Replacement in crawl-ref/source/acr.cc at line 3107 [20.4397395]
B:BD[20.4458873] → [68.1270311:1270317]
```
#if 0
```
[20.4458873]
[126.7102]
```
#ifdef DEBUG_STEALTH
```

Replacement in crawl-ref/source/abyss.cc at line 234 [20.4482606]

B:BD[20.4486316] → [20.4486316:4486387]

            if (grd[i][j] == DNGN_UNSEEN && random2(100) <= thickness)

[20.4486316]

[20.4486387]

            if (grd[i][j] == DNGN_UNSEEN && x_chance_in_y(thickness + 1, 100))

Replacement in crawl-ref/settings/messages.txt at line 38 [127.4815]
B:BD[127.5854] → [10.3992:4030]
```
msc = darkgrey:miss(es)? (the|you|it)
```
[127.5854]
[10.4030]
```
msc = darkgrey:plain:miss(es)? (the|you|it)
```

Replacement in crawl-ref/README.txt at line 28 [20.4589025]

B:BD[20.4589827] → [128.7025:7098]

∅:D[128.7098] → [129.3822:3938]

B:BD[129.3822] → [129.3822:3938]

Additionally, you may want to print out the file keys.pdf from the /docs
folder. Besides a full list of command keys (don't bother with it), it contains 
two pages of help for new players.

[20.4589827]

[130.3705]

If you're used to playing an older version, you might want to print out the 
file key_changes.pdf from the /docs for an easy reference of new commands
and changed key settings.

Insertion in crawl-ref/README.txt at line 56 [20.4589025]
[128.7634]
[128.7634]
```
* quickstart.pdf     The same file, in pdf format.
```

Replacement in crawl-ref/README.txt at line 59 [20.4589025]

B:BD[128.7867] → [128.7867:8009]

* keys.pdf           A printable document, listing all commands and it also
                     contains a very short guide for new players.

[128.7757]

[20.4591866]

* tiles_help.txt     An explanation of the Tiles interface.
* key_changes.pdf    A printable document, listing all new commands and 
                     changed key settings.

Another clean up, and add some new weapon speech.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 435 [15.3]

Replacement in crawl-ref/source/xom.cc at line 459 [15.3]

Replacement in crawl-ref/source/xom.cc at line 465 [15.3]

Replacement in crawl-ref/source/xom.cc at line 547 [15.3]

Replacement in crawl-ref/source/xom.cc at line 553 [15.3]

Replacement in crawl-ref/source/xom.cc at line 589 [15.3]

Replacement in crawl-ref/source/xom.cc at line 617 [15.3]

Replacement in crawl-ref/source/xom.cc at line 623 [15.3]

Replacement in crawl-ref/source/xom.cc at line 633 [15.3]

Replacement in crawl-ref/source/xom.cc at line 656 [15.3]

Replacement in crawl-ref/source/xom.cc at line 692 [15.3]

Replacement in crawl-ref/source/xom.cc at line 738 [15.3]

Replacement in crawl-ref/source/xom.cc at line 746 [15.3]

Replacement in crawl-ref/source/xom.cc at line 755 [15.3]

Replacement in crawl-ref/source/xom.cc at line 764 [15.3]

Replacement in crawl-ref/source/xom.cc at line 773 [15.3]

Replacement in crawl-ref/source/xom.cc at line 796 [15.3]

Replacement in crawl-ref/source/xom.cc at line 824 [15.3]

Replacement in crawl-ref/source/xom.cc at line 855 [15.3]

Replacement in crawl-ref/source/xom.cc at line 895 [15.3]

Replacement in crawl-ref/source/view.cc at line 807 [20.16817]

Replacement in crawl-ref/source/view.cc at line 890 [20.16817]

Insertion in crawl-ref/source/view.cc at line 894 [20.16817]

Replacement in crawl-ref/source/view.cc at line 1280 [20.16817]

Replacement in crawl-ref/source/traps.cc at line 257 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 724 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 728 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 731 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 733 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 736 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 743 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 753 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 758 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 763 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 770 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 790 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 806 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 837 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 847 [25.5308]

Insertion in crawl-ref/source/traps.cc at line 849 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 855 [25.5308]

Replacement in crawl-ref/source/spl-cast.cc at line 1103 [20.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1106 [20.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2899 [20.293070]

Replacement in crawl-ref/source/spl-book.cc at line 1314 [20.397614]

Replacement in crawl-ref/source/spells4.cc at line 1979 [20.436250]

Replacement in crawl-ref/source/religion.cc at line 1002 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 1211 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 3603 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 5203 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 5214 [20.804403]

Deletion in crawl-ref/source/religion.cc at line 5244 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 5252 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 5652 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 5694 [20.804403]

Replacement in crawl-ref/source/religion.cc at line 5802 [20.804403]

Replacement in crawl-ref/source/randart.cc at line 832 [20.893152]

Insertion in crawl-ref/source/randart.cc at line 835 [20.893152]

Replacement in crawl-ref/source/player.cc at line 2855 [20.962854]

Replacement in crawl-ref/source/player.cc at line 6736 [20.962854]

Replacement in crawl-ref/source/ouch.cc at line 280 [20.1104358]

Replacement in crawl-ref/source/ouch.cc at line 312 [20.1104358]

Replacement in crawl-ref/source/ouch.cc at line 315 [20.1104358]

Replacement in crawl-ref/source/monstuff.cc at line 2269 [20.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3541 [20.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4236 [20.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5627 [20.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5999 [20.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7033 [20.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 5692 [20.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5898 [20.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6384 [20.1699344]

Replacement in crawl-ref/source/misc.cc at line 1128 [20.1933596]

Replacement in crawl-ref/source/misc.cc at line 1272 [20.1933596]

Replacement in crawl-ref/source/misc.cc at line 1279 [20.1933596]

Replacement in crawl-ref/source/mapdef.cc at line 1838 [68.594797]