fiddlerwoaroof/crawl - Change 3GRGONHWIZ7PTTNMJ6CIZEMIKC7N2DTU62BLJ5QG4E7RGA5O2XMAC

s/LONG_SWORDS/LONG_BLADES/ (cbus).

Use skill_name() to describe weapon skills.

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

Created by dshaligram on January 10, 2008

3GRGONHWIZ7PTTNMJ6CIZEMIKC7N2DTU62BLJ5QG4E7RGA5O2XMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile2.cc at line 2197 [3.13289]
B:BD[3.76740] → [3.76740:76770]
```
    if (sk == SK_LONG_SWORDS)
```
[3.76740]
[3.76770]
```
    if (sk == SK_LONG_BLADES)
```
Replacement in crawl-ref/source/skills2.cc at line 134 [4.647133]
B:BD[4.653104] → [4.653104:653154]
```
     100,                       // SK_LONG_SWORDS
```
[4.653104]
[4.653154]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 177 [4.647133]
B:BD[4.657055] → [4.657055:657105]
```
     70,                        // SK_LONG_SWORDS
```
[4.657055]
[4.657105]
```
     70,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 220 [4.647133]
B:BD[4.659033] → [4.659033:659083]
```
     95,                        // SK_LONG_SWORDS
```
[4.659033]
[4.659083]
```
     95,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 263 [4.647133]
B:BD[4.661011] → [4.661011:661061]
```
     105,                       // SK_LONG_SWORDS
```
[4.661011]
[4.661061]
```
     105,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 306 [4.647133]
B:BD[4.662991] → [4.662991:663041]
```
     110,                       // SK_LONG_SWORDS
```
[4.662991]
[4.663041]
```
     110,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 349 [4.647133]
B:BD[4.664971] → [5.214:264]
```
     90,                        // SK_LONG_SWORDS
```
[4.664971]
[5.264]
```
     90,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 392 [4.647133]
B:BD[4.668933] → [4.668933:668983]
```
     100,                       // SK_LONG_SWORDS
```
[4.668933]
[4.668983]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 435 [4.647133]
B:BD[4.670912] → [4.670912:670962]
```
     80,                        // SK_LONG_SWORDS
```
[4.670912]
[4.670962]
```
     80,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 478 [4.647133]
B:BD[4.672889] → [4.672889:672939]
```
     100,                       // SK_LONG_SWORDS
```
[4.672889]
[4.672939]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 521 [4.647133]
B:BD[4.674865] → [4.674865:674915]
```
     140,                       // SK_LONG_SWORDS
```
[4.674865]
[4.674915]
```
     140,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 564 [4.647133]
B:BD[4.676840] → [4.676840:676890]
```
     100,                       // SK_LONG_SWORDS
```
[4.676840]
[4.676890]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 607 [4.647133]
B:BD[4.678816] → [4.678816:678866]
```
     100,                       // SK_LONG_SWORDS
```
[4.678816]
[4.678866]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 650 [4.647133]
B:BD[4.680791] → [4.680791:680841]
```
     120,                       // SK_LONG_SWORDS
```
[4.680791]
[4.680841]
```
     120,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 693 [4.647133]
B:BD[4.682767] → [4.682767:682817]
```
     150,                       // SK_LONG_SWORDS
```
[4.682767]
[4.682817]
```
     150,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 736 [4.647133]
B:BD[4.684747] → [4.684747:684797]
```
     100,                       // SK_LONG_SWORDS
```
[4.684747]
[4.684797]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 779 [4.647133]
B:BD[4.686732] → [4.686732:686782]
```
     100,                       // SK_LONG_SWORDS
```
[4.686732]
[4.686782]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 822 [4.647133]
B:BD[4.688718] → [4.688718:688768]
```
     100,                       // SK_LONG_SWORDS
```
[4.688718]
[4.688768]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 865 [4.647133]
B:BD[4.690704] → [4.690704:690754]
```
     100,                       // SK_LONG_SWORDS
```
[4.690704]
[4.690754]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 908 [4.647133]
B:BD[4.692691] → [4.692691:692741]
```
     100,                       // SK_LONG_SWORDS
```
[4.692691]
[4.692741]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 951 [4.647133]
B:BD[4.694676] → [4.694676:694726]
```
     100,                       // SK_LONG_SWORDS
```
[4.694676]
[4.694726]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 994 [4.647133]
B:BD[4.696662] → [4.696662:696712]
```
     100,                       // SK_LONG_SWORDS
```
[4.696662]
[4.696712]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1037 [4.647133]
B:BD[4.698649] → [4.698649:698699]
```
     100,                       // SK_LONG_SWORDS
```
[4.698649]
[4.698699]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1080 [4.647133]
B:BD[4.700637] → [4.700637:700687]
```
     100,                       // SK_LONG_SWORDS
```
[4.700637]
[4.700687]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1123 [4.647133]
B:BD[4.702622] → [4.702622:702672]
```
     100,                       // SK_LONG_SWORDS
```
[4.702622]
[4.702672]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1166 [4.647133]
B:BD[4.704607] → [4.704607:704657]
```
     100,                       // SK_LONG_SWORDS
```
[4.704607]
[4.704657]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1209 [4.647133]
B:BD[4.706592] → [4.706592:706642]
```
     100,                       // SK_LONG_SWORDS
```
[4.706592]
[4.706642]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1252 [4.647133]
B:BD[4.708577] → [4.708577:708627]
```
     100,                       // SK_LONG_SWORDS
```
[4.708577]
[4.708627]
```
     100,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1295 [4.647133]
B:BD[4.710555] → [4.710555:710605]
```
     110,                       // SK_LONG_SWORDS
```
[4.710555]
[4.710605]
```
     110,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1338 [4.647133]
B:BD[4.712533] → [4.712533:712583]
```
     110,                       // SK_LONG_SWORDS
```
[4.712533]
[4.712583]
```
     110,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1381 [4.647133]
B:BD[4.714512] → [4.714512:714562]
```
     140,                       // SK_LONG_SWORDS
```
[4.714512]
[4.714562]
```
     140,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1424 [4.647133]
B:BD[4.716491] → [4.716491:716541]
```
     70,                        // SK_LONG_SWORDS
```
[4.716491]
[4.716541]
```
     70,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1467 [4.647133]
B:BD[4.718471] → [4.718471:718521]
```
     110,                       // SK_LONG_SWORDS
```
[4.718471]
[4.718521]
```
     110,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1510 [4.647133]
B:BD[4.720447] → [4.720447:720497]
```
     110,                       // SK_LONG_SWORDS
```
[4.720447]
[4.720497]
```
     110,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1553 [4.647133]
B:BD[4.722423] → [4.722423:722473]
```
     75,                        // SK_LONG_SWORDS
```
[4.722423]
[4.722473]
```
     75,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1596 [4.647133]
B:BD[4.724401] → [4.724401:724451]
```
     90,                        // SK_LONG_SWORDS
```
[4.724401]
[4.724451]
```
     90,                        // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1639 [4.647133]
B:BD[6.1558] → [6.1558:1608]
```
     110,                       // SK_LONG_SWORDS
```
[6.1558]
[6.1608]
```
     110,                       // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1694 [4.647133]
B:BD[4.726403] → [4.726403:726448]
```
        100,               // SK_LONG_SWORDS
```
[4.726403]
[4.726448]
```
        100,               // SK_LONG_BLADES
```
Replacement in crawl-ref/source/skills2.cc at line 1761 [4.647133]
∅:D[7.72244] → [8.161826:161885]
B:BD[8.161826] → [8.161826:161885]
```
    SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_SWORDS, SK_AXES,
```
[7.72244]
[8.161885]
```
    SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, SK_AXES,
```

Replacement in crawl-ref/source/skills.cc at line 196 [4.745542]

B:BD[4.750201] → [4.750201:750265]

        if ((exsk == SK_SHORT_BLADES || exsk == SK_LONG_SWORDS)

[4.750201]

[4.750265]

        if ((exsk == SK_SHORT_BLADES || exsk == SK_LONG_BLADES)

Replacement in crawl-ref/source/skills.cc at line 198 [4.745542]

B:BD[4.750328] → [4.750328:750395]

                || you.skills[SK_LONG_SWORDS] > you.skills[exsk]))

[4.750328]

[4.750395]

                || you.skills[SK_LONG_BLADES] > you.skills[exsk]))

Replacement in crawl-ref/source/religion.cc at line 3146 [4.804403]

B:BD[8.194860] → [8.194860:194922]

            && weapon_skill( you.inv[wpn] ) == SK_LONG_SWORDS

[8.194860]

[8.194922]

            && weapon_skill( you.inv[wpn] ) == SK_LONG_BLADES

Replacement in crawl-ref/source/newgame.cc at line 2448 [4.1132300]
B:BD[4.1192882] → [4.1192882:1192907]
```
    case SK_LONG_SWORDS:
```
[4.1192882]
[4.1192907]
```
    case SK_LONG_BLADES:
```

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

B:BD[4.1194931] → [4.1194931:1194996]

          SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_SWORDS, SK_AXES,

[4.1194931]

[4.1194996]

          SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, SK_AXES,

Replacement in crawl-ref/source/newgame.cc at line 2555 [4.1132300]

B:BD[4.1195628] → [4.1195628:1195693]

          SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_SWORDS, SK_AXES,

[4.1195628]

[4.1195693]

          SK_FIGHTING, SK_SHORT_BLADES, SK_LONG_BLADES, SK_AXES,

Replacement in crawl-ref/source/newgame.cc at line 3580 [4.1132300]
B:BD[4.1229911] → [4.1229911:1229951]
```
        you.skills[SK_LONG_SWORDS] = 3;
```
[4.1229911]
[4.1229951]
```
        you.skills[SK_LONG_BLADES] = 3;
```
Replacement in crawl-ref/source/makeitem.cc at line 98 [9.927]
B:BD[9.3233] → [9.3233:3262]
```
        case SK_LONG_SWORDS:
```
[9.3233]
[9.3262]
```
        case SK_LONG_BLADES:
```

Replacement in crawl-ref/source/itemprop.cc at line 241 [8.646661]

B:BD[8.657062] → [8.657062:657130]

        SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

[8.657062]

[10.869]

        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 244 [8.646661]

B:BD[8.657267] → [8.657267:657335]

        SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

[8.657267]

[10.940]

        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 247 [8.646661]

B:BD[8.657431] → [8.657431:657499]

        SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

[8.657431]

[10.969]

        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 250 [8.646661]

B:BD[8.657594] → [8.657594:657662]

        SK_LONG_SWORDS,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,

[8.657594]

[10.998]

        SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 253 [8.646661]

B:BD[8.657758] → [8.657758:657826]

        SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

[8.657758]

[10.1026]

        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 256 [8.646661]

B:BD[8.657921] → [8.657921:657989]

        SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

[8.657921]

[10.1054]

        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 259 [8.646661]

B:BD[8.658085] → [8.658085:658153]

        SK_LONG_SWORDS,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,

[8.658085]

[10.1082]

        SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 262 [8.646661]

B:BD[8.658249] → [8.658249:658317]

        SK_LONG_SWORDS,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,

[8.658249]

[10.1110]

        SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 265 [8.646661]

B:BD[8.658413] → [8.658413:658481]

        SK_LONG_SWORDS,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,

[8.658413]

[10.1139]

        SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,

Replacement in crawl-ref/source/itemprop.cc at line 687 [8.646661]

B:BD[2.542] → [2.542:599]

                || (weapon_skill(item) == SK_LONG_SWORDS

[2.542]

[2.599]

                || (weapon_skill(item) == SK_LONG_BLADES

Replacement in crawl-ref/source/itemprop.cc at line 719 [8.646661]

B:BD[11.554] → [2.762:819]

                || (weapon_skill(item) == SK_LONG_SWORDS

[11.554]

[2.819]

                || (weapon_skill(item) == SK_LONG_BLADES

Replacement in crawl-ref/source/itemprop.cc at line 758 [8.646661]

B:BD[12.669] → [2.975:1029]

            if ((weapon_skill(item) == SK_LONG_SWORDS

[12.669]

[2.1029]

            if ((weapon_skill(item) == SK_LONG_BLADES

Replacement in crawl-ref/source/fight.cc at line 1286 [4.3140790]
B:BD[13.48121] → [13.48121:48146]
```
    case SK_LONG_SWORDS:
```
[13.48121]
[13.48146]
```
    case SK_LONG_BLADES:
```
Replacement in crawl-ref/source/fight.cc at line 3775 [4.3140790]
B:BD[4.3265963] → [4.3265963:3266009]
```
    case SK_LONG_SWORDS:      ret = 3; break;
```
[4.3265963]
[4.3266009]
```
    case SK_LONG_BLADES:      ret = 3; break;
```
Replacement in crawl-ref/source/enum.h at line 2217 [4.3287960]
B:BD[4.3356482] → [4.3356482:3356502]
```
    SK_LONG_SWORDS,
```
[4.3356482]
[4.3356502]
```
    SK_LONG_BLADES,
```

Replacement in crawl-ref/source/describe.cc at line 966 [4.3736416]

B:BD[4.3774665] → [4.3774665:3774822]

B:BD[4.3774822] → [8.985291:985317]

∅:D[8.985317] → [4.3774822:3775730]

B:BD[4.3774822] → [4.3774822:3775730]

B:BD[4.3775730] → [14.511:568]

∅:D[14.568] → [4.3775788:3776086]

B:BD[4.3775788] → [4.3775788:3776086]

        switch (item.sub_type)
        {
        case WPN_SLING:
            description += " 'slings' category. ";
            break;
        case WPN_BOW:
        case WPN_LONGBOW:
            description += " 'bows' category. ";
            break;
        case WPN_HAND_CROSSBOW:
        case WPN_CROSSBOW:
            description += " 'crossbows' category. ";
            break;
        case WPN_BLOWGUN:
            description += " 'darts' category. ";
            break;
        default:
            // Melee weapons
            switch (weapon_skill(item.base_type, item.sub_type))
            {
            case SK_SHORT_BLADES:
                description += " 'short blades' category. ";
                break;
            case SK_LONG_SWORDS:
                description += " 'long swords' category. ";
                break;
            case SK_AXES:
                description += " 'axes' category. ";
                break;
            case SK_MACES_FLAILS:
                description += " 'maces and flails' category. ";
                break;
            case SK_POLEARMS:
                description += " 'polearms' category. ";
                break;
            case SK_STAVES:
                description += " 'staves' category. ";
                break;
            default:
                description += " 'bug' category. ";
                DEBUGSTR("Unknown weapon type");
                break;
            }
        }

[4.3774665]

[4.3776086]

        const skill_type skill =
            is_range_weapon(item)? range_skill(item) : weapon_skill(item);
        description +=
            make_stringf(" '%s' category. ",
                         skill == SK_FIGHTING? "buggy"
                         : skill_name(skill));

s/LONG_SWORDS/LONG_BLADES/ (cbus).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile2.cc at line 2197 [3.13289]

Replacement in crawl-ref/source/skills2.cc at line 134 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 177 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 220 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 263 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 306 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 349 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 392 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 435 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 478 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 521 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 564 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 607 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 650 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 693 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 736 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 779 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 822 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 865 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 908 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 951 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 994 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1037 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1080 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1123 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1166 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1209 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1252 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1295 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1338 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1381 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1424 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1467 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1510 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1553 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1596 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1639 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1694 [4.647133]

Replacement in crawl-ref/source/skills2.cc at line 1761 [4.647133]