fiddlerwoaroof/crawl - Change QNIVOT7FCTRM5EQ3MYMMTSNO5KR7IF7QVBQZ5F5TSJ4SCLCOVPZQC

Rename shadows brand into reaping for unique name.

Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>

Created by Eino Keskitalo on October 29, 2009

QNIVOT7FCTRM5EQ3MYMMTSNO5KR7IF7QVBQZ5F5TSJ4SCLCOVPZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 4280 [9.1699344]
B:BD[7.4257] → [8.2958:2985]
```
        case SPWPN_SHADOW:
```
[7.4257]
[8.2985]
```
        case SPWPN_REAPING:
```
Replacement in crawl-ref/source/makeitem.cc at line 1431 [10.927]
B:BD[3.4686] → [3.4686:4721]
```
                rc = SPWPN_SHADOW;
```
[3.4686]
[3.4721]
```
                rc = SPWPN_REAPING;
```
Replacement in crawl-ref/source/itemprop.h at line 114 [11.641567]
B:BD[6.2927] → [6.2927:2945]
```
    SPWPN_SHADOW,
```
[6.2927]
[12.5296]
```
    SPWPN_REAPING,
```
Replacement in crawl-ref/source/itemprop.h at line 353 [11.641567]
B:BD[13.4015] → [13.4015:4033]
```
    SPMSL_SHADOW,
```
[13.4015]
[2.2853]
```
    SPMSL_REAPING,
```

Replacement in crawl-ref/source/itemname.cc at line 343 [9.2667494]

B:BD[13.4405] → [13.4405:4476]

    case SPWPN_SHADOW: return ((terse) ? " (shadow)" : " of shadows");

[13.4405]

[14.15976]

    case SPWPN_REAPING: return ((terse) ? " (reap)" : " of reaping");

Replacement in crawl-ref/source/itemname.cc at line 1168 [9.2667494]

B:BD[13.5210] → [13.5210:5306]

            case SPMSL_SHADOW:
                buff << ((terse) ? " (shadow)" : " of shadows");

[13.5210]

[13.5306]

            case SPMSL_REAPING:
                buff << ((terse) ? " (reap)" : " of reaping");

Replacement in crawl-ref/source/item_use.cc at line 624 [9.2781507]
B:BD[9.2792894] → [8.3391:3426]
```
                case SPWPN_SHADOW:
```
[9.2792894]
[8.3426]
```
                case SPWPN_REAPING:
```

Replacement in crawl-ref/source/item_use.cc at line 1735 [9.2781507]

B:BD[13.8314] → [13.8314:8393]

static bool _shadow_hit_victim(bolt& beam, actor* victim, int dmg, int corpse)

[13.8314]

[13.8393]

static bool _reaping_hit_victim(bolt& beam, actor* victim, int dmg, int corpse)

Replacement in crawl-ref/source/item_use.cc at line 1963 [9.2781507]

B:BD[15.6684] → [15.6684:6805]

    const bool shadow       = (bow_brand  == SPWPN_SHADOW
                               || ammo_brand == SPMSL_SHADOW);

[15.6684]

[13.14257]

    const bool reaping      = (bow_brand  == SPWPN_REAPING
                               || ammo_brand == SPMSL_REAPING);

Replacement in crawl-ref/source/item_use.cc at line 2029 [9.2781507]

B:BD[13.16247] → [13.16247:16317]

    if (shadow)
        beam.hit_funcs.push_back(_shadow_hit_victim);

[13.16247]

[13.16317]

    if (reaping)
        beam.hit_funcs.push_back(_reaping_hit_victim);

Replacement in crawl-ref/source/item_use.cc at line 2034 [9.2781507]
B:BD[13.16394] → [13.16394:16442]
```
    if (shadow && ammo.special != SPMSL_SHADOW)
```
[13.16394]
[13.16442]
```
    if (reaping && ammo.special != SPMSL_REAPING)
```

Replacement in crawl-ref/source/item_use.cc at line 2129 [9.2781507]

B:BD[13.18538] → [13.18538:18603]

    if (bow_brand == SPWPN_SHADOW && ammo_brand == SPMSL_SHADOW)

[13.18538]

[16.33866]

    if (bow_brand == SPWPN_REAPING && ammo_brand == SPMSL_REAPING)

Replacement in crawl-ref/source/item_use.cc at line 2951 [9.2781507]

B:BD[13.19403] → [15.6806:6871]

    if (ammo_brand == SPMSL_SHADOW || bow_brand == SPWPN_SHADOW)

[13.19403]

[13.19469]

    if (ammo_brand == SPMSL_REAPING || bow_brand == SPWPN_REAPING)

Replacement in crawl-ref/source/item_use.cc at line 2954 [9.2781507]

B:BD[13.19518] → [13.19518:19590]

                        bow_brand == SPWPN_SHADOW || ammo_brand_known);

[13.19518]

[17.2759]

                        bow_brand == SPWPN_REAPING || ammo_brand_known);

Replacement in crawl-ref/source/goditem.cc at line 77 [4.4997]

B:BD[4.6574] → [4.6574:6624]

                  || item_brand == SPWPN_SHADOW);

[4.6574]

[4.6624]

                  || item_brand == SPWPN_REAPING);

Replacement in crawl-ref/source/goditem.cc at line 83 [4.4997]

B:BD[4.6731] → [4.6731:6796]

        retval = is_demonic(item) || item_brand == SPMSL_SHADOW;

[4.6731]

[4.6796]

        retval = is_demonic(item) || item_brand == SPMSL_REAPING;

Replacement in crawl-ref/source/describe.cc at line 848 [9.3736416]
B:BD[18.41247] → [18.41247:41274]
```
        case SPWPN_SHADOW:
```
[18.41247]
[18.41274]
```
        case SPWPN_REAPING:
```
Replacement in crawl-ref/source/describe.cc at line 1068 [9.3736416]
B:BD[19.6327] → [8.4631:4658]
```
        case SPMSL_SHADOW:
```
[19.6327]
[8.4658]
```
        case SPMSL_REAPING:
```

Replacement in crawl-ref/source/artefact.cc at line 771 [9.893152]

B:BD[5.3169] → [5.3169:3235]

                                     (tmp >= 13) ? SPWPN_SHADOW :

[5.3169]

[5.3235]

                                     (tmp >= 13) ? SPWPN_REAPING :

Rename shadows brand into reaping for unique name.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 4280 [9.1699344]

Replacement in crawl-ref/source/makeitem.cc at line 1431 [10.927]

Replacement in crawl-ref/source/itemprop.h at line 114 [11.641567]

Replacement in crawl-ref/source/itemprop.h at line 353 [11.641567]