fiddlerwoaroof/crawl - Change SJP5BHX6MFWF3OSQPEF4WUWZWPUGMOVURTT2CUVT6H3A66LETXUAC

Reintroducing Throwing.

s/SK_RANGED_COMBAT/SK_THROWING Only thrown weapons, darts and slings train Throwing and benefit from this skill. Added Slings/Throwing and Darts/Throwing to the cross training pairs in skill2.cc.

For most cases ranged combat could be simply replaced with throwing. For some, such as effSkill in item_use.cc or starting skills I tried to choose reasonable replacements.

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

Created by j-p-e-g on September 11, 2007

SJP5BHX6MFWF3OSQPEF4WUWZWPUGMOVURTT2CUVT6H3A66LETXUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1178 [11.5936]

B:BD[9.40085] → [10.11168:11253]

∅:D[10.11253] → [9.40170:40203]

B:BD[9.40170] → [9.40170:40203]

              text << "using bow and arrows will raise your Bows and Ranged Combat "
                      "skills.";

[9.40085]

[9.40203]

              text << "using bow and arrows will raise your Bows skill.";

Replacement in crawl-ref/source/tutorial.cc at line 1619 [11.5936]

B:BD[7.7198] → [7.7198:7328]

                ostr << "\n\nSome weapons (including this one), can also be used "
                        "for ranged combat. ";

[7.7198]

[7.7328]

                ostr << "\n\nSome weapons (including this one), can also be "
                        "<w>t<magenta>hrown. ";

Replacement in crawl-ref/source/spells4.cc at line 1940 [12.436250]

B:BD[12.489273] → [13.143831:143914]

    beem.hit = you.dex / 2 + roll_dice( 2, you.skills[SK_RANGED_COMBAT] / 2 + 1 );

[12.489273]

[12.489351]

    beem.hit = you.dex / 2 + roll_dice( 2, you.skills[SK_THROWING] / 2 + 1 );

Replacement in crawl-ref/source/spells4.cc at line 2017 [12.436250]
B:BD[12.491753] → [13.143915:143956]
```
        exercise( SK_RANGED_COMBAT, 1 );
```
[12.491753]
[12.491789]
```
        exercise( SK_THROWING, 1 );
```

Replacement in crawl-ref/source/skills2.cc at line 66 [12.647133]

B:BD[12.649623] → [13.159537:159622]

    {"Ranged Combat", "Chucker", "Thrower", "Deadly Accurate", "Hawkeye", "Sniper"},

[12.649623]

[12.649703]

    {"Throwing", "Chucker", "Thrower", "Deadly Accurate", "Hawkeye", "Sniper"},

Replacement in crawl-ref/source/skills2.cc at line 142 [12.647133]
B:BD[12.653567] → [13.159623:159675]
```
     100,                       // SK_RANGED_COMBAT
```
[12.653567]
[12.653614]
```
     100,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 185 [12.647133]
B:BD[12.657518] → [13.159729:159781]
```
     80,                        // SK_RANGED_COMBAT
```
[12.657518]
[12.657565]
```
     80,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 228 [12.647133]
B:BD[12.659496] → [13.159782:159834]
```
     80,                        // SK_RANGED_COMBAT
```
[12.659496]
[12.659543]
```
     80,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 271 [12.647133]
B:BD[12.661474] → [13.159835:159887]
```
     80,                        // SK_RANGED_COMBAT
```
[12.661474]
[12.661521]
```
     80,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 314 [12.647133]
B:BD[12.663454] → [13.159888:159940]
```
     70,                        // SK_RANGED_COMBAT
```
[12.663454]
[12.663501]
```
     70,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 357 [12.647133]
B:BD[12.665434] → [13.159941:159993]
```
     120,                       // SK_RANGED_COMBAT
```
[12.665434]
[14.495]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 400 [12.647133]
B:BD[12.669396] → [13.160047:160099]
```
     60,                        // SK_RANGED_COMBAT
```
[12.669396]
[12.669443]
```
     60,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 443 [12.647133]
B:BD[12.671375] → [13.160100:160152]
```
     130,                       // SK_RANGED_COMBAT
```
[12.671375]
[12.671422]
```
     130,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 486 [12.647133]
B:BD[12.673352] → [13.160153:160205]
```
     60,                        // SK_RANGED_COMBAT
```
[12.673352]
[12.673399]
```
     60,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 529 [12.647133]
B:BD[12.675328] → [13.160206:160258]
```
     140,                       // SK_RANGED_COMBAT
```
[12.675328]
[12.675375]
```
     140,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 572 [12.647133]
B:BD[12.677303] → [13.160259:160311]
```
     120,                       // SK_RANGED_COMBAT
```
[12.677303]
[12.677350]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 615 [12.647133]
B:BD[12.679279] → [13.160312:160364]
```
     100,                       // SK_RANGED_COMBAT
```
[12.679279]
[12.679326]
```
     100,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 658 [12.647133]
B:BD[12.681254] → [13.160365:160417]
```
     100,                       // SK_RANGED_COMBAT
```
[12.681254]
[12.681301]
```
     100,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 701 [12.647133]
B:BD[12.683230] → [13.160418:160470]
```
     130,                       // SK_RANGED_COMBAT
```
[12.683230]
[12.683277]
```
     130,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 744 [12.647133]
B:BD[12.685210] → [13.160471:160523]
```
     150,                       // SK_RANGED_COMBAT
```
[12.685210]
[12.685257]
```
     150,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 787 [12.647133]
B:BD[12.687195] → [13.160524:160576]
```
     120,                       // SK_RANGED_COMBAT
```
[12.687195]
[12.687242]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 830 [12.647133]
B:BD[12.689181] → [13.160626:160678]
```
     120,                       // SK_RANGED_COMBAT
```
[12.689181]
[12.689228]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 873 [12.647133]
B:BD[12.691167] → [13.160729:160781]
```
     120,                       // SK_RANGED_COMBAT
```
[12.691167]
[12.691214]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 916 [12.647133]
B:BD[12.693154] → [13.160782:160834]
```
     120,                       // SK_RANGED_COMBAT
```
[12.693154]
[12.693201]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 959 [12.647133]
B:BD[12.695139] → [13.160835:160887]
```
     120,                       // SK_RANGED_COMBAT
```
[12.695139]
[12.695186]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1002 [12.647133]
B:BD[12.697125] → [13.160888:160940]
```
     120,                       // SK_RANGED_COMBAT
```
[12.697125]
[12.697172]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1045 [12.647133]
B:BD[12.699112] → [13.160992:161044]
```
     120,                       // SK_RANGED_COMBAT
```
[12.699112]
[12.699159]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1088 [12.647133]
B:BD[12.701100] → [13.161045:161097]
```
     120,                       // SK_RANGED_COMBAT
```
[12.701100]
[12.701147]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1131 [12.647133]
B:BD[12.703085] → [13.161098:161150]
```
     120,                       // SK_RANGED_COMBAT
```
[12.703085]
[12.703132]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1174 [12.647133]
B:BD[12.705070] → [13.161151:161203]
```
     120,                       // SK_RANGED_COMBAT
```
[12.705070]
[12.705117]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1217 [12.647133]
B:BD[12.707055] → [13.161204:161256]
```
     120,                       // SK_RANGED_COMBAT
```
[12.707055]
[12.707102]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1260 [12.647133]
B:BD[12.709040] → [13.161257:161309]
```
     120,                       // SK_RANGED_COMBAT
```
[12.709040]
[12.709087]
```
     120,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1303 [12.647133]
B:BD[12.711018] → [13.161310:161362]
```
     60,                        // SK_RANGED_COMBAT
```
[12.711018]
[12.711065]
```
     60,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1346 [12.647133]
B:BD[12.712996] → [13.161363:161415]
```
     110,                       // SK_RANGED_COMBAT
```
[12.712996]
[12.713043]
```
     110,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1389 [12.647133]
B:BD[12.714975] → [13.161416:161468]
```
     90,                        // SK_RANGED_COMBAT
```
[12.714975]
[12.715022]
```
     90,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1432 [12.647133]
B:BD[12.716954] → [13.161469:161521]
```
     90,                        // SK_RANGED_COMBAT
```
[12.716954]
[12.717001]
```
     90,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1475 [12.647133]
B:BD[12.718934] → [13.161522:161574]
```
     110,                       // SK_RANGED_COMBAT
```
[12.718934]
[12.718981]
```
     110,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1518 [12.647133]
B:BD[12.720910] → [13.161575:161627]
```
     130,                       // SK_RANGED_COMBAT
```
[12.720910]
[12.720957]
```
     130,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1561 [12.647133]
B:BD[12.722886] → [13.161628:161680]
```
     90,                        // SK_RANGED_COMBAT
```
[12.722886]
[12.722933]
```
     90,                        // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1604 [12.647133]
B:BD[12.724864] → [13.161681:161733]
```
     100,                       // SK_RANGED_COMBAT
```
[12.724864]
[12.724911]
```
     100,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1647 [12.647133]
B:BD[15.2021] → [5.1003:1055]
```
     140,                       // SK_RANGED_COMBAT
```
[15.2021]
[15.2068]
```
     140,                       // SK_THROWING
```
Replacement in crawl-ref/source/skills2.cc at line 1702 [12.647133]
B:BD[12.726816] → [13.161734:161781]
```
        120,               // SK_RANGED_COMBAT
```
[12.726816]
[12.726858]
```
        120,               // SK_THROWING
```

Replacement in crawl-ref/source/skills2.cc at line 1764 [12.647133]

B:BD[13.161970] → [13.161970:162037]

    SK_RANGED_COMBAT, SK_SLINGS, SK_BOWS, SK_CROSSBOWS, SK_DARTS,

[13.161970]

[13.162037]

    SK_BOWS, SK_CROSSBOWS, SK_THROWING, SK_SLINGS, SK_DARTS,

Replacement in crawl-ref/source/skills2.cc at line 2367 [12.647133]
B:BD[12.744026] → [13.164299:164356]
```
    int effSkill = you.skills[SK_RANGED_COMBAT] * 2 + 1;
```
[12.744026]
[12.744078]
```
    int effSkill = you.skills[SK_THROWING] * 2 + 1;
```
Replacement in crawl-ref/source/skills.cc at line 193 [12.745542]
B:BD[12.750138] → [12.750138:750164]
```
    if (exsk < SK_SLINGS)
```
[12.750138]
[12.750164]
```
    if (exsk < SK_ARMOUR)
```

Insertion in crawl-ref/source/skills.cc at line 223 [12.745542]

[12.751180]

        {
            bonus += random2(3);
        }
        
        /* Slings and Throwing */
        if ((exsk == SK_SLINGS || exsk == SK_THROWING)
            && (you.skills[SK_SLINGS] > you.skills[exsk]
                || you.skills[SK_THROWING] > you.skills[exsk]))

Insertion in crawl-ref/source/skills.cc at line 234 [12.745542]

[12.751233]


        /* Darts and Throwing */
        if ((exsk == SK_DARTS || exsk == SK_THROWING)
            && (you.skills[SK_DARTS] > you.skills[exsk]
                || you.skills[SK_THROWING] > you.skills[exsk]))
        {
            bonus += random2(3);
        }

Replacement in crawl-ref/source/religion.cc at line 429 [12.804403]

B:BD[16.920] → [16.920:996]

    const int best_missile_skill = best_skill(SK_SLINGS, SK_RANGED_COMBAT);

[16.920]

[16.996]

    const int best_missile_skill = best_skill(SK_SLINGS, SK_THROWING);

Replacement in crawl-ref/source/ouch.cc at line 714 [12.1104358]

B:BD[17.34515] → [17.34515:34587]

        if (you.skills[SK_RANGED_COMBAT] <= (you.experience_level / 4))

[17.34515]

[17.34587]

        if (you.skills[SK_THROWING] <= (you.experience_level / 4))

Replacement in crawl-ref/source/newgame.cc at line 2531 [12.1132300]

B:BD[12.1193851] → [13.391468:391541]

        { SK_DARTS, SK_RANGED_COMBAT, SK_ARMOUR, SK_DODGING, SK_STEALTH,

[12.1193851]

[12.1193919]

        { SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, SK_STEALTH,

Replacement in crawl-ref/source/newgame.cc at line 2543 [12.1132300]

B:BD[12.1194462] → [13.391607:391680]

          SK_DARTS, SK_RANGED_COMBAT, SK_ARMOUR, SK_DODGING, SK_STEALTH,

[12.1194462]

[12.1194530]

          SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, SK_STEALTH,

Replacement in crawl-ref/source/newgame.cc at line 2554 [12.1132300]

B:BD[12.1195047] → [13.391681:391754]

          SK_DARTS, SK_RANGED_COMBAT, SK_ARMOUR, SK_DODGING, SK_STEALTH,

[12.1195047]

[12.1195115]

          SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, SK_STEALTH,

Replacement in crawl-ref/source/newgame.cc at line 2567 [12.1132300]

B:BD[12.1195744] → [13.391755:391828]

          SK_DARTS, SK_RANGED_COMBAT, SK_ARMOUR, SK_DODGING, SK_STEALTH,

[12.1195744]

[12.1195812]

          SK_DARTS, SK_THROWING, SK_ARMOUR, SK_DODGING, SK_STEALTH,

Replacement in crawl-ref/source/newgame.cc at line 2800 [12.1132300]

B:BD[12.1203022] → [13.392035:392118]

    else if (you.skills[ SK_RANGED_COMBAT ] && one_chance_in(3)) // these are rare

[12.1203022]

[12.1203100]

    else if (you.skills[ SK_THROWING ] && one_chance_in(3)) // these are rare

Replacement in crawl-ref/source/newgame.cc at line 2834 [12.1132300]

B:BD[12.1204478] → [12.1204478:1204612]

            you.inv[3].quantity = 0;            // remove potion
            you.inv[3].base_type = 0;               // forget potion

[12.1204478]

[12.1204612]

            you.inv[3].quantity = 0;           // remove potion
            you.inv[3].base_type = 0;          // forget potion

Replacement in crawl-ref/source/newgame.cc at line 2844 [12.1132300]

B:BD[12.1204901] → [12.1204901:1204970]

            you.inv[3].base_type = 0;               // forget potion

[12.1204901]

[12.1204970]

            you.inv[3].base_type = 0;           // forget potion

Insertion in crawl-ref/source/newgame.cc at line 2846 [12.1132300]

[12.1205007]

            // lower throwing skill (useless with arrows anyway)
            you.skills[SK_THROWING]--;

Replacement in crawl-ref/source/newgame.cc at line 2855 [12.1132300]

B:BD[12.1205237] → [12.1205237:1205306]

            you.inv[3].base_type = 0;               // forget potion

[12.1205237]

[12.1205306]

            you.inv[3].base_type = 0;           // forget potion

Insertion in crawl-ref/source/newgame.cc at line 2857 [12.1132300]

[12.1205343]

            // lower throwing skill
            you.skills[SK_THROWING]--;

Replacement in crawl-ref/source/newgame.cc at line 2866 [12.1132300]

B:BD[12.1205561] → [12.1205561:1205635]

            you.inv[0].sub_type = WPN_DAGGER;       // up knife to dagger

[12.1205561]

[12.1205635]

            you.inv[0].sub_type = WPN_DAGGER;   // up knife to dagger

Replacement in crawl-ref/source/newgame.cc at line 3503 [12.1132300]
B:BD[12.1218872] → [13.392808:392854]
```
            you.skills[SK_RANGED_COMBAT] = 1;
```
[12.1218872]
[12.1218913]
```
            you.skills[SK_THROWING] = 1;
```
Replacement in crawl-ref/source/newgame.cc at line 3530 [12.1132300]
∅:D[6.603] → [13.392928:392974]
B:BD[12.1219858] → [13.392928:392974]
```
            you.skills[SK_RANGED_COMBAT] = 2;
```
[6.603]
[18.338]
```
            you.skills[SK_THROWING] = 2;
```
Replacement in crawl-ref/source/newgame.cc at line 3792 [12.1132300]
B:BD[12.1225657] → [13.393027:393069]
```
        you.skills[SK_RANGED_COMBAT] = 1;
```
[12.1225657]
[12.1225694]
```
        you.skills[SK_THROWING] = 1;
```

Replacement in crawl-ref/source/newgame.cc at line 3994 [12.1132300]

B:BD[12.1232019] → [13.393070:393112]

        you.skills[SK_RANGED_COMBAT] = 1;

[12.1232019]

[12.1232056]

        // DE still get Throwing skill because of Assassin/darts association
        you.skills[SK_THROWING] = 1;

Replacement in crawl-ref/source/newgame.cc at line 4000 [12.1132300]
B:BD[12.1232185] → [13.393113:393160]
```
            you.skills[SK_RANGED_COMBAT] += 1;
```
[12.1232185]
[12.1232227]
```
            you.skills[SK_THROWING] += 1;
```
Replacement in crawl-ref/source/newgame.cc at line 4081 [12.1132300]
B:BD[12.1234956] → [13.393207:393253]
```
            you.skills[SK_RANGED_COMBAT] = 2;
```
[12.1234956]
[12.1234997]
```
            you.skills[SK_THROWING] = 2;
```
Replacement in crawl-ref/source/newgame.cc at line 4139 [12.1132300]
B:BD[12.1236890] → [13.393254:393296]
```
        you.skills[SK_RANGED_COMBAT] = 3;
```
[12.1236890]
[12.1236927]
```
        you.skills[SK_THROWING] = 1;
```
Insertion in crawl-ref/source/newgame.cc at line 4153 [12.1132300]
[12.1237403]
[12.1237403]
```
            you.skills[SK_THROWING] += 2;
```
Replacement in crawl-ref/source/newgame.cc at line 4174 [12.1132300]
B:BD[12.1238039] → [12.1238039:1238081]
```
            you.skills[SK_CROSSBOWS] = 2;
```
[12.1238039]
[12.1238081]
```
            you.skills[SK_CROSSBOWS] = 3;
```
Replacement in crawl-ref/source/newgame.cc at line 4181 [12.1132300]
B:BD[12.1238255] → [13.393297:393344]
```
            you.skills[SK_RANGED_COMBAT] += 1;
```
[12.1238255]
[12.1238297]
```
            you.skills[SK_THROWING] += 3;
```
Replacement in crawl-ref/source/newgame.cc at line 4188 [12.1132300]
B:BD[12.1238481] → [12.1238481:1238518]
```
            you.skills[SK_BOWS] = 2;
```
[12.1238481]
[12.1238518]
```
            you.skills[SK_BOWS] = 3;
```
Replacement in crawl-ref/source/newgame.cc at line 4381 [12.1132300]
B:BD[12.1245157] → [13.393561:393605]
```
            you.skills[SK_RANGED_COMBAT]++;
```
[12.1245157]
[12.1245196]
```
            you.skills[SK_THROWING]++;
```
Replacement in crawl-ref/source/newgame.cc at line 4427 [12.1132300]
B:BD[12.1246748] → [13.393606:393648]
```
        you.skills[SK_RANGED_COMBAT] = 2;
```
[12.1246748]
[12.1246785]
```
        you.skills[SK_THROWING] = 2;
```
Replacement in crawl-ref/source/newgame.cc at line 4500 [12.1132300]
B:BD[12.1249323] → [13.393649:393691]
```
        you.skills[SK_RANGED_COMBAT] = 1;
```
[12.1249323]
[12.1249360]
```
        you.skills[SK_THROWING] = 1;
```
Replacement in crawl-ref/source/newgame.cc at line 4832 [12.1132300]
B:BD[12.1256733] → [13.393692:393734]
```
        you.skills[SK_RANGED_COMBAT] = 2;
```
[12.1256697]
[12.1256770]
```
        you.skills[SK_THROWING] = 2;
```
Replacement in crawl-ref/source/itemprop.cc at line 1523 [13.646661]
B:BD[13.691254] → [13.691254:691285]
```
    return (SK_RANGED_COMBAT);
```
[13.691254]
[13.691285]
```
    return (SK_THROWING);
```
Replacement in crawl-ref/source/item_use.cc at line 1666 [12.2781507]
∅:D[19.289] → [13.742599:742658]
B:BD[12.2816572] → [13.742599:742658]
```
        const int rc_skill = you.skills[SK_RANGED_COMBAT];
```
[19.289]
[13.742658]
```
//        const int throw_skill = you.skills[SK_THROWING];
```

Insertion in crawl-ref/source/item_use.cc at line 1730 [12.2781507]

[13.744499]

        // [jpeg] Throwing now only affects actual throwing weapons,
        // i.e. not launched ones. (Sep 10, 2007)

Replacement in crawl-ref/source/item_use.cc at line 1734 [12.2781507]

B:BD[13.744549] → [13.744549:744602]

        effSkill = (shoot_skill * 2 + rc_skill) / 3;

[13.744549]

[12.2817679]

//        effSkill = (shoot_skill * 2 + throw_skill) / 3;
        effSkill = shoot_skill;

Replacement in crawl-ref/source/item_use.cc at line 1743 [12.2781507]
B:BD[12.2817791] → [13.744834:744894]
```
        // effSkill = you.skills[SK_RANGED_COMBAT] * 2 + 1;
```
[12.2817791]
[13.744894]
```
        // effSkill = you.skills[SK_THROWING] * 2 + 1;
```

Replacement in crawl-ref/source/item_use.cc at line 1867 [12.2781507]

B:BD[12.2821785] → [12.2821785:2821901]

B:BD[12.2821901] → [13.747239:747282]

        // all launched weapons have a slight chance of improving
        // throwing skill
        if (coinflip())
            exercise(SK_RANGED_COMBAT, 1);

[12.2821785]

[13.747282]

        // Slings and Darts train Throwing a bit
        if (launcher_skill == SK_SLINGS || launcher_skill == SK_DARTS)
        {
            if (coinflip())
                exercise(SK_THROWING, 1);

Replacement in crawl-ref/source/item_use.cc at line 1873 [12.2781507]

B:BD[13.747283] → [13.747283:747416]

        // all launched weapons get a minor tohit boost from throwing skill.
        exHitBonus += you.skills[SK_RANGED_COMBAT] / 5;

[13.747283]

[12.2821939]

            // they also get a minor tohit boost from throwing skill.
            exHitBonus += you.skills[SK_THROWING] / 5;
        }

Replacement in crawl-ref/source/item_use.cc at line 1946 [12.2781507]
B:BD[13.748512] → [13.748512:748555]
```
                 random2(100) < rc_skill )
```
[13.748512]
[20.22117]
```
                 random2(100) < shoot_skill )
```

Replacement in crawl-ref/source/item_use.cc at line 1970 [12.2781507]

B:BD[21.2322] → [22.12329:12401]

                     !one_chance_in(1 + skill_bump(SK_RANGED_COMBAT)));

[21.2322]

[12.2825397]

                     !one_chance_in(1 + skill_bump(SK_THROWING)));

Replacement in crawl-ref/source/item_use.cc at line 2008 [12.2781507]

B:BD[12.2826503] → [13.749042:749101]

            exHitBonus = you.skills[SK_RANGED_COMBAT] * 2;

[12.2826503]

[12.2826557]

            exHitBonus = you.skills[SK_THROWING] * 2;

Replacement in crawl-ref/source/item_use.cc at line 2012 [12.2781507]

B:BD[12.2826636] → [13.749102:749186]

                (10 * (you.skills[SK_RANGED_COMBAT] / 2 + you.strength - 10)) / 12;

[12.2826636]

[12.2826715]

                (10 * (you.skills[SK_THROWING] / 2 + you.strength - 10)) / 12;

Replacement in crawl-ref/source/item_use.cc at line 2030 [12.2781507]

B:BD[22.12823] → [22.12823:12893]

                exHitBonus += (you.skills[SK_RANGED_COMBAT] * 2) / 3;

[22.12823]

[22.12893]

                exHitBonus += (you.skills[SK_THROWING] * 2) / 3;

Replacement in crawl-ref/source/item_use.cc at line 2032 [12.2781507]

B:BD[22.12948] → [22.12948:13012]

                exDamBonus += you.skills[SK_RANGED_COMBAT] / 5;

[22.12948]

[22.13012]

                exDamBonus += you.skills[SK_THROWING] / 5;

Replacement in crawl-ref/source/item_use.cc at line 2041 [12.2781507]

B:BD[22.13306] → [4.255:393]

                exHitBonus += (skill_bump(SK_RANGED_COMBAT) * 7 / 2);
                exDamBonus += you.skills[SK_RANGED_COMBAT] * 3 / 5;

[22.13306]

[12.2827182]

                exHitBonus += (skill_bump(SK_THROWING) * 7 / 2);
                exDamBonus += you.skills[SK_THROWING] * 3 / 5;

Replacement in crawl-ref/source/item_use.cc at line 2052 [12.2781507]

B:BD[4.446] → [4.446:506]

                exercise(SK_RANGED_COMBAT, 1 + coinflip());

[4.446]

[22.13987]

                exercise(SK_THROWING, 1 + coinflip());

Replacement in crawl-ref/source/item_use.cc at line 2055 [12.2781507]

B:BD[8.24432] → [8.24432:24484]

                // Nets use throwing and T&D skills

[8.24432]

[8.24484]

                // Nets use throwing skill

Replacement in crawl-ref/source/item_use.cc at line 2063 [12.2781507]

B:BD[8.24678] → [8.24678:24748]

                exHitBonus += (skill_bump(SK_RANGED_COMBAT) * 7 / 2);

[8.24678]

[8.24748]

                exHitBonus += (skill_bump(SK_THROWING) * 7 / 2);

Replacement in crawl-ref/source/item_use.cc at line 2068 [12.2781507]

B:BD[8.24902] → [8.24902:24949]

                exercise(SK_RANGED_COMBAT, 1);

[8.24902]

[8.24949]

                exercise(SK_THROWING, 1);

Replacement in crawl-ref/source/item_use.cc at line 2083 [12.2781507]
B:BD[12.2827493] → [13.749785:749828]
```
            exercise(SK_RANGED_COMBAT, 1);
```
[12.2827493]
[13.749828]
```
            exercise(SK_THROWING, 1);
```

Replacement in crawl-ref/source/item_use.cc at line 2087 [12.2781507]

B:BD[13.749923] → [13.749923:749982]

             random2(100) < you.skills[SK_RANGED_COMBAT] )

[13.749923]

[20.22453]

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

Replacement in crawl-ref/source/item_use.cc at line 2143 [12.2781507]
B:BD[12.2828581] → [13.750550:750593]
```
            exercise(SK_RANGED_COMBAT, 1);
```
[12.2828581]
[12.2828619]
```
            exercise(SK_THROWING, 1);
```
Replacement in crawl-ref/source/enum.h at line 3168 [12.3287960]
B:BD[12.3356754] → [13.928201:928223]
```
    SK_RANGED_COMBAT,
```
[12.3356754]
[12.3356771]
```
    SK_THROWING,
```
Replacement in crawl-ref/source/effects.cc at line 586 [12.3382105]
B:BD[2.2374] → [2.2374:2418]
```
            if (wskill == SK_RANGED_COMBAT)
```
[2.2374]
[2.2418]
```
            if (wskill == SK_THROWING)
```
Replacement in crawl-ref/source/effects.cc at line 596 [12.3382105]
B:BD[13.939856] → [13.939856:939894]
```
        int skill = SK_RANGED_COMBAT;
```
[13.939856]
[13.939894]
```
        int skill = SK_THROWING;
```
Replacement in crawl-ref/source/debug.cc at line 1682 [12.4016436]
B:BD[13.1026693] → [13.1026693:1026747]
```
    you.skills[SK_RANGED_COMBAT]   = skill * 15 / 27;
```
[13.1026693]
[13.1026747]
```
    you.skills[SK_THROWING]        = skill * 15 / 27;
```
Replacement in crawl-ref/source/clua.cc at line 1389 [23.483969]
B:BD[13.1206136] → [13.1206136:1206171]
```
    if (skill == SK_RANGED_COMBAT)
```
[13.1206136]
[13.1206171]
```
    if (skill == SK_THROWING)
```
Replacement in crawl-ref/source/beam.cc at line 3436 [12.4128068]
B:BD[3.385] → [3.385:425]
```
    skill_type type = SK_RANGED_COMBAT;
```
[3.385]
[3.425]
```
    skill_type type = SK_THROWING;
```

Replacement in crawl-ref/source/beam.cc at line 3449 [12.4128068]

B:BD[3.820] → [3.820:880]

    return you.skills[type] + you.skills[SK_RANGED_COMBAT];

[3.820]

[13.1246410]

    if (type == SK_DARTS || type == SK_SLINGS)
        return (you.skills[type] + you.skills[SK_THROWING]);
        
    return (2 * you.skills[type]);

Reintroducing Throwing.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1178 [11.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1619 [11.5936]

Replacement in crawl-ref/source/spells4.cc at line 1940 [12.436250]

Replacement in crawl-ref/source/spells4.cc at line 2017 [12.436250]

Replacement in crawl-ref/source/skills2.cc at line 66 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 142 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 185 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 228 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 271 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 314 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 357 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 400 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 443 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 486 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 529 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 572 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 615 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 658 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 701 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 744 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 787 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 830 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 873 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 916 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 959 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1002 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1045 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1088 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1131 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1174 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1217 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1260 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1303 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1346 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1389 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1432 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1475 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1518 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1561 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1604 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1647 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1702 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 1764 [12.647133]

Replacement in crawl-ref/source/skills2.cc at line 2367 [12.647133]

Replacement in crawl-ref/source/skills.cc at line 193 [12.745542]

Insertion in crawl-ref/source/skills.cc at line 223 [12.745542]

Insertion in crawl-ref/source/skills.cc at line 234 [12.745542]

Replacement in crawl-ref/source/religion.cc at line 429 [12.804403]

Replacement in crawl-ref/source/ouch.cc at line 714 [12.1104358]

Replacement in crawl-ref/source/newgame.cc at line 2531 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2543 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2554 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2567 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2800 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2834 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2844 [12.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2846 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2855 [12.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2857 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2866 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3503 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3530 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3792 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3994 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4000 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4081 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4139 [12.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4153 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4174 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4181 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4188 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4381 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4427 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4500 [12.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4832 [12.1132300]

Replacement in crawl-ref/source/itemprop.cc at line 1523 [13.646661]