fiddlerwoaroof/crawl - Change W2G5DXQQOT5MGRUS4UUUKGPMIXOQWAAUV5REUJM7LAUQJGKCS23QC

Let TSO's weapon blessing for the player create blessed variants of all

long blades, not just demon blades.

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

Created by dolorous on April 15, 2008

W2G5DXQQOT5MGRUS4UUUKGPMIXOQWAAUV5REUJM7LAUQJGKCS23QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/makeitem.cc at line 1485 [3.927]

B:BD[3.52307] → [4.17596:17655]

        case WPN_BLESSED_BLADE:     // special gift of TSO

[3.52307]

[4.17655]

        case WPN_BLESSED_FALCHION:     // special gifts of TSO
        case WPN_BLESSED_LONG_SWORD:
        case WPN_BLESSED_SCIMITAR:
        case WPN_BLESSED_KATANA:
        case WPN_BLESSED_BLADE:
        case WPN_BLESSED_DOUBLE_SWORD:
        case WPN_BLESSED_GREAT_SWORD:
        case WPN_BLESSED_TRIPLE_SWORD:

Replacement in crawl-ref/source/makeitem.cc at line 3411 [3.927]

B:BD[3.117830] → [3.117830:117895]

                                              : WPN_LONG_SWORD);

[3.117830]

[3.117895]

                                              : WPN_BLESSED_LONG_SWORD);

Insertion in crawl-ref/source/itemprop.h at line 472 [7.641567]

[5.447]

[6.85802]

    WPN_BLESSED_FALCHION,
    WPN_BLESSED_LONG_SWORD,
    WPN_BLESSED_SCIMITAR,              //   50
    WPN_BLESSED_KATANA,
    WPN_BLESSED_DOUBLE_SWORD,
    WPN_BLESSED_GREAT_SWORD,
    WPN_BLESSED_TRIPLE_SWORD,

Replacement in crawl-ref/source/itemprop.h at line 480 [7.641567]

B:BD[6.85803] → [6.85803:85886]

    NUM_WEAPONS,                       //   48 - must be last regular member {dlb}

[6.85803]

[6.85886]

    NUM_WEAPONS,                       //   55 - must be last regular member {dlb}

Replacement in crawl-ref/source/itemprop.cc at line 239 [7.646661]

∅:D[8.2633] → [7.656990:657062]

B:BD[7.656990] → [7.656990:657062]

    { WPN_FALCHION,          "falchion",            8,  2, 13, 170,  4,

[8.2633]

[9.5008]

    { WPN_FALCHION,             "falchion",         8,  2, 13, 170,  4,
        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
        DAMV_SLICING, 10 },     // or perhaps DAMV_CHOPPING is more apt?
    { WPN_BLESSED_FALCHION,     "blessed blade",   10,  2, 11, 170,  4,
        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
        DAMV_SLICING, 10 },     // or perhaps DAMV_CHOPPING is more apt?
    { WPN_LONG_SWORD,           "long sword",      10, 1, 14, 160,  3,
        SK_LONG_BLADES,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
        DAMV_SLICING, 10 },
    { WPN_BLESSED_LONG_SWORD,   "blessed blade",   12, 0, 13, 160,  3,

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

∅:D[9.5076] → [10.869:939]

B:BD[7.657130] → [10.869:939]

∅:D[10.939] → [7.657196:657267]

B:BD[7.657196] → [7.657196:657267]

        DAMV_SLICING, 10 },  // or perhaps DAMV_CHOPPING is more apt?
    { WPN_LONG_SWORD,        "long sword",         10, 1, 14, 160,  3,

[9.5076]

[9.5077]

        DAMV_SLICING, 10 },
    { WPN_SCIMITAR,             "scimitar",        11, -1, 14, 170,  3,

Replacement in crawl-ref/source/itemprop.cc at line 254 [7.646661]
∅:D[10.968] → [7.657359:657431]
B:BD[7.657359] → [7.657359:657431]
```
    { WPN_SCIMITAR,          "scimitar",           11, -1, 14, 170,  3,
```
[10.968]
[9.5146]
```
    { WPN_BLESSED_SCIMITAR,     "blessed blade",   12, -1, 12, 170,  3,
```
Replacement in crawl-ref/source/itemprop.cc at line 257 [7.646661]
∅:D[10.997] → [7.657523:657594]
B:BD[7.657523] → [7.657523:657594]
```
    { WPN_KATANA,            "katana",             13, 2, 13, 160,  3,
```
[10.997]
[9.5215]
```
    { WPN_KATANA,               "katana",          13, 2, 13, 160,  3,
```

Replacement in crawl-ref/source/itemprop.cc at line 260 [7.646661]

∅:D[10.1025] → [7.657686:657758]

B:BD[7.657686] → [7.657686:657758]

    { WPN_DEMON_BLADE,       "demon blade",        13, -1, 15, 200,  4,

[10.1025]

[9.5284]

    { WPN_BLESSED_KATANA,       "blessed blade",   14, 1, 13, 160,  3,
        SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
        DAMV_SLICING, 2 },
    { WPN_DEMON_BLADE,          "demon blade",     13, -1, 15, 200,  4,

Replacement in crawl-ref/source/itemprop.cc at line 266 [7.646661]
∅:D[10.1053] → [7.657850:657921]
B:BD[7.657850] → [7.657850:657921]
```
    { WPN_BLESSED_BLADE,     "blessed blade",      14, 0, 14, 200,  4,
```
[10.1053]
[9.5353]
```
    { WPN_BLESSED_BLADE,        "blessed blade",   14, -2, 14, 200,  4,
```

Replacement in crawl-ref/source/itemprop.cc at line 269 [7.646661]

∅:D[10.1081] → [7.658013:658085]

B:BD[7.658013] → [7.658013:658085]

    { WPN_DOUBLE_SWORD,      "double sword",       15, -2, 16, 220,  5,

[10.1081]

[9.5422]

    { WPN_DOUBLE_SWORD,         "double sword",    15, -2, 16, 220,  5,
        SK_LONG_BLADES,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
        DAMV_SLICING, 2 },
    { WPN_BLESSED_DOUBLE_SWORD, "blessed blade",   15, -2, 15, 220,  5,

Replacement in crawl-ref/source/itemprop.cc at line 275 [7.646661]

∅:D[10.1109] → [7.658177:658249]

B:BD[7.658177] → [7.658177:658249]

    { WPN_GREAT_SWORD,       "great sword",        16, -3, 17, 250,  6,

[10.1109]

[9.5491]

    { WPN_GREAT_SWORD,          "great sword",     16, -3, 17, 250,  6,
        SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
        DAMV_SLICING, 10 },
    { WPN_BLESSED_GREAT_SWORD,  "blessed blade",   17, -5, 17, 250,  6,

Replacement in crawl-ref/source/itemprop.cc at line 281 [7.646661]

∅:D[10.1138] → [7.658341:658413]

B:BD[7.658341] → [7.658341:658413]

    { WPN_TRIPLE_SWORD,      "triple sword",       19, -4, 19, 260,  6,

[10.1138]

[9.5560]

    { WPN_TRIPLE_SWORD,         "triple sword",    19, -4, 19, 260,  6,
        SK_LONG_BLADES,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
        DAMV_SLICING, 2 },
    { WPN_BLESSED_TRIPLE_SWORD, "blessed blade",   19, -5, 18, 260,  6,

Replacement in crawl-ref/source/itemprop.cc at line 435 [7.646661]
B:BD[11.9406] → [11.9406:9449]
```
    COMPILE_CHECK(NUM_WEAPONS  == 48, c2);
```
[11.9406]
[11.9449]
```
    COMPILE_CHECK(NUM_WEAPONS  == 55, c2);
```

Insertion in crawl-ref/source/itemprop.cc at line 1449 [7.646661]

[7.684589]

    case WPN_BLESSED_FALCHION:
    case WPN_BLESSED_LONG_SWORD:
    case WPN_BLESSED_SCIMITAR:
    case WPN_BLESSED_KATANA:

Insertion in crawl-ref/source/itemprop.cc at line 1454 [7.646661]

[7.684617]

    case WPN_BLESSED_DOUBLE_SWORD:
    case WPN_BLESSED_GREAT_SWORD:
    case WPN_BLESSED_TRIPLE_SWORD:

Insertion in crawl-ref/source/itemprop.cc at line 1633 [7.646661]

[2.3105]

        case WPN_BLESSED_FALCHION:
        case WPN_BLESSED_LONG_SWORD:
        case WPN_BLESSED_SCIMITAR:
        case WPN_BLESSED_KATANA:

Insertion in crawl-ref/source/itemprop.cc at line 1638 [7.646661]

[2.3137]

        case WPN_BLESSED_DOUBLE_SWORD:
        case WPN_BLESSED_GREAT_SWORD:
        case WPN_BLESSED_TRIPLE_SWORD:

Insertion in crawl-ref/source/itemprop.cc at line 1661 [7.646661]

[12.3935]

    case WPN_FALCHION:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_FALCHION;
        break;
    case WPN_LONG_SWORD:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_LONG_SWORD;
        break;
    case WPN_SCIMITAR:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_SCIMITAR;
        break;

Insertion in crawl-ref/source/itemprop.cc at line 1686 [7.646661]

[12.4015]

    case WPN_KATANA:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_KATANA;
        break;
    case WPN_DOUBLE_SWORD:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_DOUBLE_SWORD;
        break;
    case WPN_GREAT_SWORD:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_GREAT_SWORD;
        break;
    case WPN_TRIPLE_SWORD:
        if (!allow_blessed)
            return (false);
        item.sub_type = WPN_BLESSED_TRIPLE_SWORD;
        break;