fiddlerwoaroof/crawl - Change EHNSGDT6V6X5V2FLZZFSJWIUM5AAQF5KK3ZTSWO6TTWULPOOI4AAC

FR 2093461: add player + allies FRIENDLY_PICKUP mode

Make Roxanne immune to disintegration (like ice statues). Move rock worms a bit lower in the dungeon and increase their damage (a tiny bit).

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

Created by j-p-e-g on March 12, 2009

EHNSGDT6V6X5V2FLZZFSJWIUM5AAQF5KK3ZTSWO6TTWULPOOI4AAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.h at line 568 [5.1682293]
B:BD[4.2602] → [4.2602:2633]
```
bool mons_is_statue( int mc );
```
[4.2602]
[6.463755]
```
bool mons_is_statue( int mc, bool allow_disintegrate = false );
```
Replacement in crawl-ref/source/mon-util.cc at line 644 [5.1699344]
∅:D[7.3007] → [6.470465:470493]
B:BD[6.470465] → [6.470465:470493]
```
bool mons_is_statue(int mc)
```
[7.3007]
[6.470493]
```
bool mons_is_statue(int mc, bool allow_disintegrate)
```

Replacement in crawl-ref/source/mon-util.cc at line 646 [5.1699344]

B:BD[6.470495] → [8.30708:30785]

B:BD[8.30785] → [9.7075:7148]

    return (mc == MONS_ORANGE_STATUE
            || mc == MONS_SILVER_STATUE
            || mc == MONS_ICE_STATUE
            || mc == MONS_ROXANNE);

[6.470495]

[6.470562]

    if (mc == MONS_ORANGE_STATUE || mc == MONS_SILVER_STATUE)
        return (true);
    if (!allow_disintegrate)
        return (mc == MONS_ICE_STATUE || mc == MONS_ROXANNE);
    return (false);

Replacement in crawl-ref/source/mon-util.cc at line 5109 [5.1699344]

∅:D[10.3468] → [11.6743:6812]

B:BD[11.6743] → [11.6743:6812]

                   && !testbits(item.flags, ISFLAG_DROPPED_BY_ALLY))

[10.3468]

[11.6812]

                   && !testbits(item.flags, ISFLAG_DROPPED_BY_ALLY)
                || you.friendly_pickup == FRIENDLY_PICKUP_PLAYER
                   && !(item.flags & (ISFLAG_DROPPED | ISFLAG_THROWN
                                        | ISFLAG_DROPPED_BY_ALLY)))

Deletion in crawl-ref/source/mon-pick.cc at line 668 [5.1767507]
B:BD[12.8344] → [13.6079:6104]
```
    case MONS_ROCK_WORM:
```
Insertion in crawl-ref/source/mon-pick.cc at line 706 [5.1767507]
[12.9269]
[12.9269]
```
    case MONS_ROCK_WORM:
```

Replacement in crawl-ref/source/mon-data.h at line 3039 [5.1826214]

B:BD[14.92939] → [14.92939:93005]

    { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },

[14.92939]

[14.93005]

    { {AT_BITE, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },

Insertion in crawl-ref/source/initfile.cc at line 2110 [5.2957258]

[10.3916]

        else if (field == "player")
            default_friendly_pickup = FRIENDLY_PICKUP_PLAYER;

Insertion in crawl-ref/source/enum.h at line 2983 [5.3287960]
[10.4352]
[10.4352]
```
    FRIENDLY_PICKUP_PLAYER,
```

Replacement in crawl-ref/source/beam.cc at line 4322 [5.4128068]

B:BD[15.55259] → [15.55259:55324]

        && mons_is_statue(mon->type) && !mons_is_icy(mon->type))

[15.55259]

[15.55324]

        && mons_is_statue(mon->type, true))

Insertion in crawl-ref/source/acr.cc at line 1308 [5.4397395]

[16.5274]

    }
    else if (you.friendly_pickup == FRIENDLY_PICKUP_PLAYER)
    {
        mprf("Your intelligent allies may %sonly pick up items dropped by you "
             "and your allies.", now.c_str());

Replacement in crawl-ref/source/acr.cc at line 1316 [5.4397395]

B:BD[16.5329] → [2.4864:4952]

        mprf("Your intelligent allies may %spick up anything they need.", now.c_str());

[16.5329]

[16.5405]

        mprf("Your intelligent allies may %spick up anything they need.",
             now.c_str());

Deletion in crawl-ref/source/acr.cc at line 1320 [5.4397395]
B:BD[16.5420] → [16.5420:5426]
```
    {
```
Deletion in crawl-ref/source/acr.cc at line 1321 [5.4397395]
∅:D[17.4072] → [16.5491:5497]
∅:D[18.38787] → [16.5491:5497]
B:BD[16.5491] → [16.5491:5497]
```
    }
```

Replacement in crawl-ref/source/acr.cc at line 1451 [5.4397395]

∅:D[17.4400] → [10.4651:4754]

B:BD[16.5651] → [10.4651:4754]

        mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ",
            MSGCH_PROMPT);

[17.4400]

[16.5731]

        mpr("Change to (d)efault, (n)othing, (f)riend-dropped, (p)layer, "
            "or (a)ll? ", MSGCH_PROMPT);

Insertion in crawl-ref/source/acr.cc at line 1463 [5.4397395]

[10.4992]

[16.5908]

        else if (type == 'p')
            you.friendly_pickup = FRIENDLY_PICKUP_PLAYER;

Replacement in crawl-ref/docs/options_guide.txt at line 512 [20.63392]
B:BD[11.9937] → [19.2936:2984]
```
default_friendly_pickup = (friend | none | all)
```
[11.9937]
[11.9985]
```
default_friendly_pickup = (friend | player | none | all)
```

Replacement in crawl-ref/docs/options_guide.txt at line 517 [20.63392]

B:BD[11.10214] → [3.13302:13372]

             friend = They will pick up anything they or another ally

[11.10214]

[11.10285]

             friend = They may pick up anything they or another ally

Replacement in crawl-ref/docs/options_guide.txt at line 520 [20.63392]

∅:D[21.3157] → [11.10394:10462]

B:BD[11.10394] → [11.10394:10462]

             all    = They will pick up anything they want to have.

[21.3157]

[11.10462]

             player = Like 'friend', but they may also pick up anything
                      you've dropped or thrown.
             all    = They may pick up anything they want to have.

FR 2093461: add player + allies FRIENDLY_PICKUP mode

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.h at line 568 [5.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 644 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 646 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5109 [5.1699344]

Deletion in crawl-ref/source/mon-pick.cc at line 668 [5.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 706 [5.1767507]

Replacement in crawl-ref/source/mon-data.h at line 3039 [5.1826214]

Insertion in crawl-ref/source/initfile.cc at line 2110 [5.2957258]

Insertion in crawl-ref/source/enum.h at line 2983 [5.3287960]