fiddlerwoaroof/crawl - Change RGY2525RQH7SSGM6ZVI7CZL4WMNFZK2WRABOSIWRKQYYOU2RWN4QC

s/CAUGHT/HELD/

Gladiators now start with 4 nets.

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

Created by j-p-e-g on August 22, 2007

RGY2525RQH7SSGM6ZVI7CZL4WMNFZK2WRABOSIWRKQYYOU2RWN4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 913 [6.39949]

B:BD[5.168] → [5.168:241]

    if (kbhit() || you.duration[DUR_CONF] || you.attribute[ATTR_CAUGHT])

[5.168]

[6.63376]

    if (kbhit() || you.duration[DUR_CONF] || you.attribute[ATTR_HELD])

Replacement in crawl-ref/source/spells4.cc at line 3005 [8.436250]

∅:D[7.345] → [5.568:626]

B:BD[5.568] → [5.568:626]

               (&menv[mon])->del_ench(ENCH_CAUGHT, true);

[7.345]

[5.639]

               (&menv[mon])->del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/spells1.cc at line 120 [8.616635]
B:BD[8.619202] → [5.656:700]
```
            if (you.attribute[ATTR_CAUGHT])
```
[8.619202]
[7.352]
```
            if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/spells1.cc at line 126 [8.616635]
∅:D[7.545] → [5.700:748]
B:BD[5.700] → [5.700:748]
```
                you.attribute[ATTR_CAUGHT] = 0;
```
[7.545]
[7.546]
```
                you.attribute[ATTR_HELD] = 0;
```
Replacement in crawl-ref/source/spells1.cc at line 177 [8.616635]
B:BD[5.759] → [5.759:799]
```
        if (you.attribute[ATTR_CAUGHT])
```
[5.759]
[7.561]
```
        if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/spells1.cc at line 183 [8.616635]
∅:D[7.718] → [5.799:843]
B:BD[5.799] → [5.799:843]
```
            you.attribute[ATTR_CAUGHT] = 0;
```
[7.718]
[7.719]
```
            you.attribute[ATTR_HELD] = 0;
```
Replacement in crawl-ref/source/player.cc at line 3298 [8.962854]
B:BD[8.1034114] → [7.746:782]
```
    if (you.attribute[ATTR_CAUGHT])
```
[8.1034114]
[3.171]
```
    if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/player.cc at line 5348 [8.962854]
B:BD[5.890] → [5.890:927]
```
    return (attribute[ATTR_CAUGHT]);
```
[5.890]
[5.927]
```
    return (attribute[ATTR_HELD]);
```
Replacement in crawl-ref/source/output.cc at line 559 [8.1088282]
B:BD[3.228] → [3.228:268]
```
        if (you.attribute[ATTR_CAUGHT])
```
[3.228]
[3.268]
```
        if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/output.cc at line 1481 [8.1088282]
B:BD[7.974] → [7.974:1010]
```
    if (you.attribute[ATTR_CAUGHT])
```
[7.974]
[3.341]
```
    if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/newgame.cc at line 3823 [8.1132300]
B:BD[2.236] → [2.236:270]
```
        you.inv[3].quantity  = 1;
```
[2.236]
[2.270]
```
        you.inv[3].quantity  = 4;
```
Replacement in crawl-ref/source/newgame.cc at line 3825 [8.1132300]
B:BD[2.315] → [2.315:358]
```
        you.inv[3].sub_type  = MI_JAVELIN;
```
[2.315]
[2.358]
```
        you.inv[3].sub_type  = MI_THROWING_NET;
```

Replacement in crawl-ref/source/mstuff2.cc at line 936 [8.1340842]

B:BD[9.3977] → [5.2239:2325]

    if (monster->has_ench(ENCH_CAUGHT))
        monster->del_ench(ENCH_CAUGHT, true);

[9.3977]

[5.2325]

    if (monster->has_ench(ENCH_HELD))
        monster->del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/monstuff.cc at line 1192 [8.1396662]
B:BD[5.3340] → [5.3340:3384]
```
            monster->add_ench(ENCH_CAUGHT);
```
[5.3340]
[5.3384]
```
            monster->add_ench(ENCH_HELD);
```

Replacement in crawl-ref/source/monstuff.cc at line 1220 [8.1396662]

B:BD[5.3401] → [5.3401:3487]

    if (monster->has_ench(ENCH_CAUGHT))
        monster->del_ench(ENCH_CAUGHT, true);

[5.3401]

[10.420352]

    if (monster->has_ench(ENCH_HELD))
        monster->del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/monstuff.cc at line 2718 [8.1396662]

B:BD[8.1483884] → [5.3566:3652]

                if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_CAUGHT))

[8.1483884]

[8.1483936]

                if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_HELD))

Replacement in crawl-ref/source/monstuff.cc at line 2728 [8.1396662]

B:BD[8.1484193] → [5.3653:3735]

            if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_CAUGHT))

[8.1484193]

[8.1484241]

            if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_HELD))

Replacement in crawl-ref/source/monstuff.cc at line 4100 [8.1396662]

B:BD[5.9194] → [5.9194:9252]

                    monster->del_ench(ENCH_CAUGHT, true);

[5.9194]

[5.9252]

                    monster->del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/monspeak.cc at line 376 [8.1558496]
B:BD[8.1567098] → [5.9411:9456]
```
    else if (monster->has_ench(ENCH_CAUGHT))
```
[8.1567098]
[5.9456]
```
    else if (monster->has_ench(ENCH_HELD))
```
Replacement in crawl-ref/source/mon-util.cc at line 1726 [8.1699344]
B:BD[5.12439] → [5.12439:12478]
```
    return (m->has_ench(ENCH_CAUGHT));
```
[5.12439]
[10.482317]
```
    return (m->has_ench(ENCH_HELD));
```
Replacement in crawl-ref/source/mon-util.cc at line 3699 [8.1699344]
B:BD[5.13165] → [5.13165:13187]
```
    case ENCH_CAUGHT:
```
[5.13165]
[7.1324]
```
    case ENCH_HELD:
```
Replacement in crawl-ref/source/mon-util.cc at line 3828 [8.1699344]
B:BD[11.19155] → [5.13267:13293]
```
        case ENCH_CAUGHT:
```
[11.19155]
[5.13293]
```
        case ENCH_HELD:
```
Replacement in crawl-ref/source/mon-util.cc at line 3934 [8.1699344]
B:BD[5.13347] → [5.13347:13369]
```
    case ENCH_CAUGHT:
```
[5.13347]
[5.13369]
```
    case ENCH_HELD:
```
Replacement in crawl-ref/source/mon-util.cc at line 3943 [8.1699344]
B:BD[5.13845] → [5.13845:13880]
```
            del_ench(ENCH_CAUGHT);
```
[5.13845]
[5.13880]
```
            del_ench(ENCH_HELD);
```

Replacement in crawl-ref/source/mon-util.cc at line 4043 [8.1699344]

B:BD[5.17162] → [5.17162:17207]

                del_ench(ENCH_CAUGHT, true);

[5.17162]

[5.17207]

                del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/mon-util.cc at line 4585 [8.1699344]
B:BD[12.7253] → [5.17254:17276]
```
    case ENCH_CAUGHT:
```
[12.7253]
[5.17276]
```
    case ENCH_HELD:
```

Replacement in crawl-ref/source/misc.cc at line 898 [8.1933596]

B:BD[5.17821] → [5.17821:17881]

    if (!mons_is_caught(mon) && mon->add_ench(ENCH_CAUGHT))

[5.17821]

[5.17881]

    if (mons->type == MONS_OOZE || mons->type == MONS_PULSATING_LUMP)
    {
        simple_monster_message(mon, " oozes right through the net!");
        return;
    }
    if (!mons_is_caught(mon) && mon->add_ench(ENCH_HELD))

Replacement in crawl-ref/source/misc.cc at line 930 [8.1933596]
B:BD[5.18186] → [5.18186:18223]
```
    if (!you.attribute[ATTR_CAUGHT])
```
[5.18186]
[5.18223]
```
    if (!you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/misc.cc at line 932 [8.1933596]
B:BD[5.18229] → [5.18229:18270]
```
        you.attribute[ATTR_CAUGHT] = 10;
```
[5.18229]
[5.18270]
```
        you.attribute[ATTR_HELD] = 10;
```
Replacement in crawl-ref/source/misc.cc at line 1819 [8.1933596]
B:BD[5.19003] → [7.3038:3082]
```
            if (you.attribute[ATTR_CAUGHT])
```
[5.19003]
[7.3082]
```
            if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/misc.cc at line 1937 [8.1933596]
B:BD[5.20240] → [5.20240:20282]
```
        mon->del_ench(ENCH_CAUGHT, true);
```
[5.20240]
[5.20282]
```
        mon->del_ench(ENCH_HELD, true);
```

Replacement in crawl-ref/source/misc.cc at line 1961 [8.1933596]

B:BD[5.21107] → [5.21107:21157]

                mon->del_ench(ENCH_CAUGHT, true);

[5.21018]

[7.3190]

                mon->del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/misc.cc at line 1983 [8.1933596]
B:BD[5.21676] → [5.21676:21714]
```
    mon->del_ench(ENCH_CAUGHT, true);
```
[5.21676]
[7.3264]
```
    mon->del_ench(ENCH_HELD, true);
```
Replacement in crawl-ref/source/misc.cc at line 1999 [8.1933596]
B:BD[5.22250] → [5.22250:22290]
```
        you.attribute[ATTR_CAUGHT] = 0;
```
[5.22250]
[5.22290]
```
        you.attribute[ATTR_HELD] = 0;
```
Replacement in crawl-ref/source/misc.cc at line 2032 [8.1933596]
B:BD[5.23068] → [5.23068:23112]
```
            you.attribute[ATTR_CAUGHT] = 0;
```
[5.23068]
[5.23112]
```
            you.attribute[ATTR_HELD] = 0;
```
Replacement in crawl-ref/source/misc.cc at line 2039 [8.1933596]
B:BD[5.23234] → [5.23234:23272]
```
        you.attribute[ATTR_CAUGHT]--;
```
[5.23234]
[5.23272]
```
        you.attribute[ATTR_HELD]--;
```
Replacement in crawl-ref/source/misc.cc at line 2042 [8.1933596]
B:BD[5.23326] → [5.23326:23368]
```
            you.attribute[ATTR_CAUGHT]--;
```
[5.23326]
[5.23368]
```
            you.attribute[ATTR_HELD]--;
```
Replacement in crawl-ref/source/misc.cc at line 2045 [8.1933596]
B:BD[5.23430] → [5.23430:23472]
```
            you.attribute[ATTR_CAUGHT]--;
```
[5.23430]
[5.23472]
```
            you.attribute[ATTR_HELD]--;
```
Replacement in crawl-ref/source/misc.cc at line 2047 [8.1933596]
B:BD[5.23473] → [5.23473:23518]
```
        if (you.attribute[ATTR_CAUGHT] <= 0)
```
[5.23473]
[5.23518]
```
        if (you.attribute[ATTR_HELD] <= 0)
```
Replacement in crawl-ref/source/misc.cc at line 2050 [8.1933596]
B:BD[5.23577] → [5.23577:23621]
```
            you.attribute[ATTR_CAUGHT] = 0;
```
[5.23577]
[7.3364]
```
            you.attribute[ATTR_HELD] = 0;
```

Replacement in crawl-ref/source/items.cc at line 1304 [8.2584728]

B:BD[8.2614080] → [5.23900:23974]

    if (you.attribute[ATTR_CAUGHT] && mitm[obj].base_type == OBJ_MISSILES

[8.2614080]

[7.3606]

    if (you.attribute[ATTR_HELD] && mitm[obj].base_type == OBJ_MISSILES

Replacement in crawl-ref/source/enum.h at line 256 [8.3287960]
B:BD[8.3295002] → [5.25275:25326]
```
    ATTR_CAUGHT,                // caught in a net
```
[8.3295002]
[13.14625]
```
    ATTR_HELD,                  // caught in a net
```
Replacement in crawl-ref/source/enum.h at line 1292 [8.3287960]
B:BD[14.11977] → [5.25327:25371]
```
    ENCH_CAUGHT,         // caught in a net
```
[14.11977]
[15.2558]
```
    ENCH_HELD,           // caught in a net
```
Replacement in crawl-ref/source/direct.cc at line 1553 [8.3697945]
∅:D[4.1816] → [5.25579:25601]
B:BD[11.33662] → [5.25579:25601]
```
    case ENCH_CAUGHT:
```
[4.1816]
[4.1817]
```
    case ENCH_HELD:
```

Replacement in crawl-ref/source/describe.cc at line 1380 [8.3736416]

B:BD[5.25841] → [5.25841:25921]

            description += "Unfortunately, it is too large for you to throw. ";

[5.25841]

[5.25921]

            description += "Unfortunately, it is too large and awkward "
                           "for you to use. ";

Replacement in crawl-ref/source/beam.cc at line 2397 [8.4128068]

B:BD[7.4435] → [7.4435:4511]

        if (you.x_pos == x && you.y_pos == y && !you.attribute[ATTR_CAUGHT]

[7.4435]

[7.4511]

        if (you.x_pos == x && you.y_pos == y && !you.attribute[ATTR_HELD]

Replacement in crawl-ref/source/acr.cc at line 1014 [8.4397395]
B:BD[16.409] → [7.4682:4718]
```
    if (you.attribute[ATTR_CAUGHT])
```
[16.409]
[7.4718]
```
    if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/acr.cc at line 1047 [8.4397395]
B:BD[17.10574] → [7.4789:4825]
```
    if (you.attribute[ATTR_CAUGHT])
```
[17.10574]
[7.4825]
```
    if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/acr.cc at line 1259 [8.4397395]
B:BD[7.4923] → [7.4923:4968]
```
        else if (you.attribute[ATTR_CAUGHT])
```
[7.4923]
[7.4968]
```
        else if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/acr.cc at line 1275 [8.4397395]
B:BD[18.26086] → [7.5048:5093]
```
        else if (you.attribute[ATTR_CAUGHT])
```
[18.26086]
[7.5093]
```
        else if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/acr.cc at line 2597 [8.4397395]
B:BD[5.26887] → [5.26887:26923]
```
    if (you.attribute[ATTR_CAUGHT])
```
[5.26887]
[5.26923]
```
    if (you.attribute[ATTR_HELD])
```
Replacement in crawl-ref/source/acr.cc at line 2981 [8.4397395]
B:BD[5.27509] → [5.27509:27545]
```
    if (you.attribute[ATTR_CAUGHT])
```
[5.27509]
[5.27545]
```
    if (you.attribute[ATTR_HELD])
```

s/CAUGHT/HELD/

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 913 [6.39949]

Replacement in crawl-ref/source/spells4.cc at line 3005 [8.436250]

Replacement in crawl-ref/source/spells1.cc at line 120 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 126 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 177 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 183 [8.616635]

Replacement in crawl-ref/source/player.cc at line 3298 [8.962854]

Replacement in crawl-ref/source/player.cc at line 5348 [8.962854]

Replacement in crawl-ref/source/output.cc at line 559 [8.1088282]

Replacement in crawl-ref/source/output.cc at line 1481 [8.1088282]

Replacement in crawl-ref/source/newgame.cc at line 3823 [8.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3825 [8.1132300]

Replacement in crawl-ref/source/mstuff2.cc at line 936 [8.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 1192 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1220 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2718 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2728 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4100 [8.1396662]

Replacement in crawl-ref/source/monspeak.cc at line 376 [8.1558496]

Replacement in crawl-ref/source/mon-util.cc at line 1726 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3699 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3828 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3934 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3943 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4043 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4585 [8.1699344]

Replacement in crawl-ref/source/misc.cc at line 898 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 930 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 932 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 1819 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 1937 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 1961 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 1983 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 1999 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 2032 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 2039 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 2042 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 2045 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 2047 [8.1933596]

Replacement in crawl-ref/source/misc.cc at line 2050 [8.1933596]

Replacement in crawl-ref/source/items.cc at line 1304 [8.2584728]

Replacement in crawl-ref/source/enum.h at line 256 [8.3287960]

Replacement in crawl-ref/source/enum.h at line 1292 [8.3287960]

Replacement in crawl-ref/source/direct.cc at line 1553 [8.3697945]

Replacement in crawl-ref/source/describe.cc at line 1380 [8.3736416]

Replacement in crawl-ref/source/beam.cc at line 2397 [8.4128068]

Replacement in crawl-ref/source/acr.cc at line 1014 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1047 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1259 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1275 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 2597 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 2981 [8.4397395]