fiddlerwoaroof/crawl - Change 6TEISZD7HYSSL24EOKIBNURU66KGSQX7B7SNAHBP4DQSAOTGH2MQC

Remove Beogh recalling orcs for you, and instead try harder to find

existing followers on the level (with decreasing chances) to bless them. This lowers probability of the reinforcement effect from 10% to 2.5% if bless_follower() is called without any parameters in the first place.

Greatly reduce chances for orcs talking, and tidy up monspeak.txt a bit to make comparing chances easier.

Add the promised friendly pickup toggle (command on Ctrl-T), and a new option for its default value. Modify documentation accordingly.

Fix 1947256: hunger state not shown at game reload.

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

Created by j-p-e-g on April 26, 2008

6TEISZD7HYSSL24EOKIBNURU66KGSQX7B7SNAHBP4DQSAOTGH2MQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.cc at line 1017 [10.804403]

B:BD[9.2514] → [7.8921:9129]


// If there are no nearby followers, try to recall some on the level.
static int _beogh_blessing_recalling()
{
    std::vector<int> recalled;
    FixedVector < char, 2 > empty;
    empty[0] = empty[1] = 0;

Deletion in crawl-ref/source/religion.cc at line 1018 [10.804403]

B:BD[7.9130] → [7.9130:9606]

∅:D[7.9606] → [9.2514:2515]

B:BD[9.2514] → [9.2514:2515]

B:BD[9.2515] → [7.9607:10272]

    monsters *mon;
    for (int loopy = 0; loopy < MAX_MONSTERS; loopy++)
    {
        mon = &menv[loopy];
        if (mon->type == -1)
            continue;
        if (!is_orcish_follower(mon))
            continue;
        recalled.push_back(loopy);
    }
    if (recalled.empty())
        return 0;
    int count_recalled = 0;
    int total          = recalled.size();
    int amount         = 1 + random2(4) + random2(4);
    bool recall_all    = (total <= amount);
    for (unsigned int loopy = 0; loopy < recalled.size(); loopy++)
    {
        mon = &menv[recalled[loopy]];
        if (!recall_all && total == amount)
            recall_all = true;
        if (recall_all || random2(total) < amount)
        {
            if (empty_surrounds(you.x_pos, you.y_pos, DNGN_FLOOR, 3,
                                false, empty)
                && mon->move_to_pos( coord_def(empty[0], empty[1])) )
            {
                count_recalled++;
                amount--;
            }
            else
                break;    // no more room to place monsters
        }
        total--;
    }
    return (count_recalled);
}

Replacement in crawl-ref/source/religion.cc at line 1082 [10.804403]

B:BD[11.3208] → [12.2512:2580]

// one, bless a random follower within sight of the player, if any.

[11.3208]

[13.2869]

// one, bless a random follower within sight of the player, if any, or,
// with decreasing chances, any follower on the level.
// Blessing can be enforced with a wizard mode command.

Deletion in crawl-ref/source/religion.cc at line 1090 [10.804403]
B:BD[14.2903] → [15.2539:2564]
∅:D[15.2564] → [14.2903:2928]
B:BD[14.2903] → [14.2903:2928]
```
    std::string pronoun;
    std::string blessed;
```
Deletion in crawl-ref/source/religion.cc at line 1095 [10.804403]
B:BD[16.2962] → [16.2962:3004]
∅:D[17.2855] → [14.2983:2984]
∅:D[16.3004] → [14.2983:2984]
B:BD[14.2983] → [14.2983:2984]
B:BD[14.2984] → [15.2565:2592]
```
    if (chance > 2)
        return false;
    bool is_near = false;
```

Replacement in crawl-ref/source/religion.cc at line 1102 [10.804403]

∅:D[7.10330] → [16.3072:3140]

B:BD[18.3046] → [16.3072:3140]

B:BD[16.3140] → [7.10331:10405]

        // Choose a random follower in LOS, preferably a named one.
        follower = choose_random_nearby_monster(0, suitable, true, true);

[7.10330]

[7.10405]

        if (chance > 2)
            return false;

Replacement in crawl-ref/source/religion.cc at line 1105 [10.804403]

B:BD[7.10406] → [7.10406:10597]

        if (follower == NON_MONSTER)
        {
            // Try again, without the LOS restriction.
            follower = choose_random_nearby_monster(0, suitable, false, true);
        }

[7.10406]

[18.3111]

        // Choose a random follower in LOS, preferably a named one (10% chance).
        follower = choose_random_nearby_monster(0, suitable, true, true);

Replacement in crawl-ref/source/religion.cc at line 1110 [10.804403]

B:BD[14.3089] → [7.10598:10693]

            // If no follower was chosen, either send
            // reinforcement or get out.

[14.3089]

[7.10693]

            if (coinflip())
                return false;

Replacement in crawl-ref/source/religion.cc at line 1113 [10.804403]

B:BD[7.10694] → [7.10694:10853]

            // First, try to recall orcish followers on level.
            int  recalled   = _beogh_blessing_recalling();
            bool reinforced = false;

[7.10694]

[7.10853]

            // Try again, without the LOS restriction (5% chance).
            follower = choose_random_nearby_monster(0, suitable, false, true);

Replacement in crawl-ref/source/religion.cc at line 1116 [10.804403]
B:BD[7.10854] → [7.10854:10884]
```
            if (recalled < 3)
```
[7.10854]
[14.3118]
```
            if (follower == NON_MONSTER)
```

Replacement in crawl-ref/source/religion.cc at line 1118 [10.804403]

B:BD[14.3132] → [7.10885:10947]

                reinforced = _beogh_blessing_reinforcement();

[14.3132]

[7.10947]

                if (coinflip())
                    return false;

Replacement in crawl-ref/source/religion.cc at line 1121 [10.804403]

B:BD[7.10948] → [7.10948:11008]

                if (!reinforced || !recalled && coinflip())

[7.10948]

[19.2639]

                // Try *again*, on the entire level (2.5% chance).
                follower = choose_random_monster_on_level(0, suitable,
                                                          false, false, true);
                if (follower == NON_MONSTER)

Replacement in crawl-ref/source/religion.cc at line 1127 [10.804403]

B:BD[19.2657] → [7.11009:11212]

                    // Try again, or possibly send more reinforcement.
                    if (_beogh_blessing_reinforcement())
                        reinforced = true;
                }
            }

[19.2657]

[20.2927]

                    // If no follower was found, attempt to send
                    // reinforcement.
                    bool reinforced = _beogh_blessing_reinforcement();
                    if (!reinforced || coinflip())
                    {
                        // Try again, or possibly send more reinforcement.
                        if (_beogh_blessing_reinforcement())
                            reinforced = true;
                    }

Replacement in crawl-ref/source/religion.cc at line 1138 [10.804403]

B:BD[20.2928] → [7.11213:11330]

            if (recalled || reinforced)
            {
                pronoun = "";
                blessed = "you";

[20.2928]

[20.3219]

                    if (!reinforced)
                        return false;

Deletion in crawl-ref/source/religion.cc at line 1141 [10.804403]

B:BD[20.3220] → [7.11331:11440]

                if (recalled)
                    result = "recalling";
                else if (reinforced)

Replacement in crawl-ref/source/religion.cc at line 1142 [10.804403]

B:BD[7.11486] → [7.11486:11567]

∅:D[7.11567] → [16.4050:4051]

B:BD[14.3339] → [16.4050:4051]

B:BD[16.4051] → [7.11568:11604]

                else
                    result = "recalling and reinforcement";
                goto blessing_done;

[7.11486]

[14.3339]

                    goto blessing_done;
                }

Insertion in crawl-ref/source/religion.cc at line 1147 [10.804403]
[18.3205]
[15.2636]
```
    ASSERT(follower != -1 && follower != NON_MONSTER);
```
Insertion in crawl-ref/source/religion.cc at line 1149 [10.804403]
[15.2637]
[16.4104]
```
    // Else, apply blessing to chosen follower.
```
Deletion in crawl-ref/source/religion.cc at line 1151 [10.804403]
∅:D[16.4131] → [15.2637:2667]
B:BD[15.2637] → [15.2637:2667]
```
    is_near = mons_near(mon);
```
Replacement in crawl-ref/source/religion.cc at line 1152 [10.804403]
B:BD[21.2887] → [3.2512:2570]
∅:D[22.2568] → [15.2690:2760]
∅:D[3.2570] → [15.2690:2760]
B:BD[15.2690] → [15.2690:2760]
∅:D[23.2630] → [24.2509:2510]
∅:D[15.2760] → [24.2509:2510]
∅:D[25.3119] → [24.2509:2510]
∅:D[14.3483] → [24.2509:2510]
B:BD[26.2533] → [24.2509:2510]
B:BD[24.2510] → [27.2974:2995]
```
    pronoun = (mons_is_unique(mon->type)) ? "" : "your ";
    blessed = (is_near) ? mon->name(DESC_PLAIN).c_str() : "follower";
    if (chance == 0)
```
[21.2887]
[28.2645]
```
    if (chance == 0) // 5% chance of holy branding, or priesthood
```

Replacement in crawl-ref/source/religion.cc at line 1200 [10.804403]

B:BD[25.3193] → [25.3193:3237]

    // or at least uncurse it, if possible.

[25.3193]

[24.2563]

    // or at least uncurse it, if possible (10% chance).
    // This will happen if the above blessing attempts are unsuccessful.

Insertion in crawl-ref/source/religion.cc at line 1246 [10.804403]

[29.3823]

[30.2523]

    // These effects happen if no other blessing was chosen (90%), or if
    // the above attempts all were unsuccessful.

Insertion in crawl-ref/source/religion.cc at line 1274 [10.804403]
[21.3244]
[30.3315]
```
        // deliberate fallthrough for the healing effects
```
Replacement in crawl-ref/source/religion.cc at line 1280 [10.804403]
B:BD[30.3514] → [31.5656:5708]
```
            if (coinflip() && _blessing_balms(mon))
```
[30.3514]
[11.4021]
```
            if (coinflip())
```

Replacement in crawl-ref/source/religion.cc at line 1282 [10.804403]

B:BD[11.4035] → [30.3566:3643]

                result = "divine balms";
                goto blessing_done;

[11.4035]

[30.3643]

                if (_blessing_balms(mon))
                {
                    result = "divine balms";
                    goto blessing_done;
                }
                else if (force)
                    mpr("Couldn't apply balms.");

Insertion in crawl-ref/source/religion.cc at line 1294 [10.804403]
[11.4408]
[30.3749]
```
            // Maybe give an extra hit point.
```
Replacement in crawl-ref/source/religion.cc at line 1319 [10.804403]
B:BD[29.3926] → [16.4132:4159]
```
    std::string whom = "";
```
[29.3926]
[7.11605]
```
    bool see_follower = false;
```
Replacement in crawl-ref/source/religion.cc at line 1322 [10.804403]
∅:D[7.11606] → [16.4159:4192]
B:BD[16.4159] → [16.4159:4192]
```
    if (follower != NON_MONSTER)
```
[7.11606]
[7.11607]
```
    std::string whom = "";
    if (follower == NON_MONSTER)
        whom = "you";
    else
```

Replacement in crawl-ref/source/religion.cc at line 1327 [10.804403]

B:BD[7.11613] → [7.11613:11720]

        if (!mons_near(mon) || !player_monster_visible(mon))
            whom = "a follower";
        else

[7.11613]

[7.11720]

        if (mons_near(mon) && player_monster_visible(mon))
            see_follower = true;
        if (see_follower)
        {

Insertion in crawl-ref/source/religion.cc at line 1333 [10.804403]

[7.11769]

            if (whom.empty())
                whom = "your " + mon->name(DESC_PLAIN);
        }
        else // cannot see who was blessed
            whom = "a follower";

Deletion in crawl-ref/source/religion.cc at line 1340 [10.804403]
∅:D[16.4238] → [17.3835:3892]
B:BD[17.3835] → [17.3835:3892]
```
    if (whom.empty())
        whom = pronoun + blessed;
```
Replacement in crawl-ref/source/religion.cc at line 1346 [10.804403]
B:BD[15.2900] → [15.2900:2924]
```
    if (mon && is_near)
```
[15.2900]
[15.2924]
```
    if (see_follower)
```

Insertion in crawl-ref/source/monstuff.h at line 131 [10.1390580]

[16.4396]

[32.3313]


int choose_random_monster_on_level(int weight,
                                   bool (*suitable)(const monsters* mon) =
                                       choose_any_monster,
                                   bool in_sight = true, bool near_by = false,
                                   bool prefer_named = false);

Insertion in crawl-ref/source/monstuff.cc at line 2599 [10.1396662]

[32.3748]

    return choose_random_monster_on_level(weight, suitable, in_sight, true,
                                          prefer_named);
}
int choose_random_monster_on_level(int weight,
                                   bool (*suitable)(const monsters* mon),
                                   bool in_sight, bool near_by,
                                   bool prefer_named)
{

Replacement in crawl-ref/source/monstuff.cc at line 2612 [10.1396662]

B:BD[32.3808] → [32.3808:3864]

B:BD[32.3864] → [7.12308:12364]

∅:D[7.12364] → [32.3916:3984]

B:BD[32.3916] → [32.3916:3984]

B:BD[32.3984] → [7.12365:12437]

    int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
    int yend   = you.y_pos + 9, xend   = you.x_pos + 9;
    if ( xstart < 0 ) xstart = 0;
    if ( ystart < 0 ) ystart = 0;
    if ( xend >= GXM )  xend = GXM;
    if ( yend >= GYM )  yend = GYM;

[32.3808]

[32.4054]

    int xstart = 0, ystart = 0;
    int xend = GXM, yend = GYM;

Insertion in crawl-ref/source/monstuff.cc at line 2615 [10.1396662]

[32.4055]

    if (near_by)
    {
        xstart = you.x_pos - 9;
        ystart = you.y_pos - 9;
          xend = you.x_pos + 9;
          yend = you.y_pos + 9;
        if ( xstart < 0 ) xstart = 0;
        if ( ystart < 0 ) ystart = 0;
        if ( xend >= GXM )  xend = GXM;
        if ( yend >= GYM )  yend = GYM;
    }

Replacement in crawl-ref/source/mon-util.cc at line 3694 [10.1699344]

B:BD[33.6098] → [34.25143:25309]

        // Friendlies may only pick up stuff dropped by (other) allies.
        if (mons_friendly(this)
            && !testbits(item.flags, ISFLAG_DROPPED_BY_ALLY))

[33.6098]

[34.25309]

        // Depending on the friendly pickup toggle, your allies may not pick
        // up anything, or only stuff dropped by (other) allies.
        if (mons_friendly(this))

Replacement in crawl-ref/source/mon-util.cc at line 3698 [10.1699344]

B:BD[34.25319] → [34.25319:25345]

            return false;

[34.25319]

[34.25345]

            if (Options.friendly_pickup < 0
                || Options.friendly_pickup == 0
                   && !testbits(item.flags, ISFLAG_DROPPED_BY_ALLY))
            {
                return false;
            }

Deletion in crawl-ref/source/mon-util.cc at line 3706 [10.1699344]
∅:D[34.25356] → [33.6098:6178]
B:BD[33.6098] → [33.6098:6178]
```
        // These are not important enough for pickup when seeking, fleeing etc.
```

Insertion in crawl-ref/source/mon-util.cc at line 3709 [10.1699344]

[33.6379]

[8.3574]

            // These are not important enough for pickup when
            // seeking, fleeing etc.

Replacement in crawl-ref/source/misc.cc at line 157 [10.1933596]

B:BD[35.6843] → [35.6843:6903]

        item.flags    &= ~(ISFLAG_THROWN | ISFLAG_DROPPED);

[35.6843]

[35.6903]

        item.flags &= ~(ISFLAG_THROWN | ISFLAG_DROPPED);

Deletion in crawl-ref/source/misc.cc at line 2016 [10.1933596]
B:BD[36.9735] → [36.9735:9741]
```
    {
```
Deletion in crawl-ref/source/misc.cc at line 2017 [10.1933596]
B:BD[36.9783] → [36.9783:9789]
```
    }
```
Deletion in crawl-ref/source/misc.cc at line 2018 [10.1933596]
B:BD[10.1954662] → [10.1954662:1954668]
```
    {
```
Deletion in crawl-ref/source/misc.cc at line 2019 [10.1933596]
B:BD[10.1954706] → [10.1954706:1954712]
```
    }
```
Deletion in crawl-ref/source/misc.cc at line 2020 [10.1933596]
B:BD[10.1954763] → [10.1954763:1954769]
```
    {
```
Deletion in crawl-ref/source/misc.cc at line 2021 [10.1933596]
B:BD[10.1954813] → [10.1954813:1954819]
```
    }
```
Deletion in crawl-ref/source/misc.cc at line 2022 [10.1933596]
∅:D[37.1835] → [36.9836:9842]
B:BD[36.9836] → [36.9836:9842]
```
    {
```
Deletion in crawl-ref/source/misc.cc at line 2023 [10.1933596]
∅:D[37.1881] → [36.9881:9887]
B:BD[36.9881] → [36.9881:9887]
```
    }
```

Replacement in crawl-ref/source/misc.cc at line 2040 [10.1933596]

B:BD[38.126] → [39.10942:11004]

        if (!(you.wizard && crawl_state.is_replaying_keys()))

[38.126]

[39.11004]

        if (!you.wizard || !crawl_state.is_replaying_keys())

Replacement in crawl-ref/source/misc.cc at line 2134 [10.1933596]

∅:D[40.1905] → [41.42176:42202]

B:BD[10.1957682] → [41.42176:42202]

B:BD[41.42202] → [42.12560:12620]

∅:D[42.12620] → [41.42263:42299]

B:BD[41.42263] → [41.42263:42299]

    const bool newlevel =
        load(stair_taken, LOAD_ENTER_LEVEL, old_level_type,
             old_level, old_where);

[40.1905]

[39.11025]

    const bool newlevel = load(stair_taken, LOAD_ENTER_LEVEL, old_level_type,
                               old_level, old_where);

Insertion in crawl-ref/source/misc.cc at line 2142 [10.1933596]
[39.11119]
[39.11119]
```
        Options.friendly_pickup = Options.default_friendly_pickup;
```

Replacement in crawl-ref/source/misc.cc at line 2690 [10.1933596]

B:BD[41.43209] → [41.43209:43291]

B:BD[41.43291] → [43.299:345]

∅:D[43.345] → [41.43291:43424]

B:BD[41.43291] → [41.43291:43424]

    if ( Options.autoprayer_on == false ||
         you.religion == GOD_NO_GOD ||
         you.religion == GOD_NEMELEX_XOBEH ||
         you.duration[DUR_PRAYER] ||
         grid_altar_god( grd[you.x_pos][you.y_pos] ) != GOD_NO_GOD ||
         !i_feel_safe() )

[41.43209]

[43.346]

    if ( Options.autoprayer_on == false
         || you.religion == GOD_NO_GOD
         || you.religion == GOD_NEMELEX_XOBEH
         || you.duration[DUR_PRAYER]
         || grid_altar_god( grd[you.x_pos][you.y_pos] ) != GOD_NO_GOD
         || !i_feel_safe() )

Deletion in crawl-ref/source/items.cc at line 934 [10.2584728]
B:BD[44.345758] → [44.345758:345764]
```
    {
```
Deletion in crawl-ref/source/items.cc at line 936 [10.2584728]
B:BD[44.345833] → [44.345833:345839]
```
    }
```

Insertion in crawl-ref/source/items.cc at line 1583 [10.2584728]

[44.354701]

    // remove "dropped by ally" flag
    item.flags &= ~(ISFLAG_DROPPED_BY_ALLY);

Insertion in crawl-ref/source/initfile.cc at line 630 [10.2957258]

[45.791306]

[46.4444]

    default_friendly_pickup = 0; // allies may only pickup items
    friendly_pickup         = 0; // dropped by allies

Insertion in crawl-ref/source/initfile.cc at line 1805 [10.2957258]

[47.5066]

    else if (key == "default_friendly_pickup")
    {
        if (field == "none")
            friendly_pickup = -1;
        else if (field == "all")
            friendly_pickup = 1;
        else if (field == "friend")
            friendly_pickup = 0;
    }

Replacement in crawl-ref/source/initfile.cc at line 1975 [10.2957258]
B:BD[48.1040] → [6.2652:2657]
```
    
```
[48.1040]
[6.2657]
Replacement in crawl-ref/source/initfile.cc at line 2261 [10.2957258]
B:BD[45.807074] → [6.2688:2693]
```
    
```
[45.807074]
[6.2693]
Replacement in crawl-ref/source/initfile.cc at line 2425 [10.2957258]
B:BD[47.7614] → [49.7063:7068]
```
    
```
[47.7614]
[49.7068]
Replacement in crawl-ref/source/food.cc at line 81 [10.3043806]
B:BD[10.3045535] → [5.7671:7699]
```
    if (hunger_amount == 0)
```
[10.3045535]
[5.7699]
```
    if (hunger_amount == 0 && !suppress_msg)
```
Insertion in crawl-ref/source/externs.h at line 1588 [10.3270163]
[45.898659]
[46.4486]
```
    int         default_friendly_pickup;
    int         friendly_pickup;
```
Insertion in crawl-ref/source/enum.h at line 434 [10.3287960]
[10.3303627]
[10.3303627]
```
    CMD_TOGGLE_FRIENDLY_PICKUP,
```

Replacement in crawl-ref/source/effects.cc at line 1950 [10.3382105]

B:BD[10.3427592] → [2.283:425]

        if (!targ.isValid || mgrd[targ.tx][targ.ty] == NON_MONSTER ||
            !player_monster_visible(&env.mons[mgrd[targ.tx][targ.ty]]))

[10.3427592]

[10.3427660]

        if (!targ.isValid || mgrd[targ.tx][targ.ty] == NON_MONSTER
            || !player_monster_visible(&env.mons[mgrd[targ.tx][targ.ty]]))

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2115 [51.307]
B:BD[50.4722] → [34.26136:26141]
```
w:80
```
[50.4722]
[50.4727]
```
w:60
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2118 [51.307]
B:BD[50.4735] → [50.4735:4740]
```
w:30
```
[50.4735]
[50.4740]
```
w:1
```
Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2121 [51.307]
[50.4764]
[50.4764]
```
w:5
@_hostile_beogh_speech_@
%%%%
_hostile_beogh_speech_
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2183 [51.307]
B:BD[52.4492] → [34.26142:26147]
```
w:50
```
[52.4492]
[52.4497]
```
w:30
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2187 [51.307]
B:BD[50.5739] → [50.5739:5744]
```
w:30
```
[50.5739]
[50.5744]
```
w:1
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2190 [51.307]
B:BD[50.5773] → [50.5773:5778]
```
w:30
```
[50.5773]
[50.5778]
```
w:1
```
Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2194 [51.307]
[53.5245]
[53.5245]
```
@_friendly_beogh_speech_@
%%%%
_friendly_beogh_speech_
w:5
```
Insertion in crawl-ref/source/command.cc at line 1523 [10.4082507]
[45.1191320]
[54.2345]
```
            "\n"
```

Replacement in crawl-ref/source/command.cc at line 1600 [10.4082507]

B:BD[55.6055] → [55.6055:6107]

            "<w>Ctrl-A</w> : toggle auto-pickup\n",

[55.6055]

[55.6107]

            "<w>Ctrl-A</w> : toggle auto-pickup\n"
            "<w>Ctrl-T</w> : toggle ally pickup behaviour\n",

Insertion in crawl-ref/source/acr.cc at line 1251 [10.4397395]
[56.25960]
[56.25960]
```
    case CMD_TOGGLE_FRIENDLY_PICKUP:
```

Insertion in crawl-ref/source/acr.cc at line 2018 [10.4397395]

[57.17726]

[45.1265280]

    case CMD_TOGGLE_FRIENDLY_PICKUP:
        // Toggle pickup mode for friendlies.
        if (Options.friendly_pickup == -1)
        {
            Options.friendly_pickup = 0;
            mpr("Your allies may now only pick up items dropped by allies.");
        }
        else if (Options.friendly_pickup == 0)
        {
            Options.friendly_pickup = 1;
            mpr("Your allies may now pick up anything they need.");
        }
        else
        {
            Options.friendly_pickup = -1;
            mpr("Your allies are now forbidden to pick up anything at all.");
        }
        break;

Replacement in crawl-ref/source/acr.cc at line 2854 [10.4397395]

B:BD[58.5826] → [58.5826:5847]

B:BD[58.5847] → [59.34955:35011]

                10 +
                player_mutation_level(MUT_BERSERK) * 25

[58.5826]

[59.35011]

                10 + player_mutation_level(MUT_BERSERK) * 25

Replacement in crawl-ref/source/acr.cc at line 3543 [10.4397395]
B:BD[45.1277131] → [60.7949:7991]
```
    case CONTROL('T'): return CMD_NO_CMD;
```
[45.1277131]
[45.1277182]
```
    case CONTROL('T'): return CMD_TOGGLE_FRIENDLY_PICKUP;
```
Replacement in crawl-ref/source/acr.cc at line 3971 [10.4397395]
B:BD[10.4470601] → [10.4470601:4470626]
```
    make_hungry(0,true);
```
[10.4470601]
[10.4470626]
```
    make_hungry(0, true);
```
Replacement in crawl-ref/source/acr.cc at line 4004 [10.4397395]
∅:D[61.559] → [44.552536:552635]
∅:D[62.1607] → [44.552536:552635]
∅:D[63.7684] → [44.552536:552635]
B:BD[44.552536] → [44.552536:552635]
```
    // Mark items in inventory as of unknown origin.
    origin_set_inventory(origin_set_unknown);
```
[61.559]
[44.552635]
```
    Options.friendly_pickup = Options.default_friendly_pickup;
```

Insertion in crawl-ref/source/acr.cc at line 4011 [10.4397395]

[45.1280205]

        // Mark items in inventory as of unknown origin.
        origin_set_inventory(origin_set_unknown);

Insertion in crawl-ref/init.txt at line 104 [10.4830895]
[64.2965]
[65.2920]
```
# default_friendly_pickup = friend
```

Replacement in crawl-ref/docs/options_guide.txt at line 27 [64.63392]

B:BD[66.6521] → [66.6521:6591]

                assign_item_slot, drop_mode, pickup_mode, drop_filter

[66.6521]

[4.2797]

                assign_item_slot, drop_mode, pickup_mode, drop_filter,
                default_friendly_pickup

Insertion in crawl-ref/docs/options_guide.txt at line 428 [64.63392]

[67.14274]

[68.14340]


default_friendly_pickup = (none | friend | all)
        Using an in-game toggle, you can control what types of items
        your allies will pick up:
             none   = They won't pick up anything at all.
                      (This is the old friendly pick up behaviour.)
             friend = They will pick up anything they or another ally 
                      dropped, e.g. if another ally dies.
                      (This is the default value.)
             all    = They will pick up anything they want to have.
                      (This is how it works for hostile monsters.)
        This option controls which is the default setting for this toggle
        when you start or reload a game, or when you enter a level for
        the first time.
        Note that monsters have their own reasonings for which items they
        may need, and when they feel safe enough to pick them up. Except
        for "none", these options won't let you override these. 
        Also, friendly jellies won't ever eat any items, regardless of this 
        option.

Insertion in crawl-ref/docs/crawl_manual.txt at line 2357 [64.108269]

[69.14428]

[70.6861]

    Ctrl-T              Toggle your allies' pickup behaviour between three
                        settings: don't pick up anything, only pick up
                        items dropped by allies, pick up anything.

Replacement in crawl-ref/docs/crawl_manual.txt at line 2508 [64.108269]
B:BD[64.197149] → [71.26677:26702]
```
                        
```
[72.2667]
[64.197149]

Remove Beogh recalling orcs for you, and instead try harder to find

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/religion.cc at line 1017 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 1018 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1082 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 1090 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 1095 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1102 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1105 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1110 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1113 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1116 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1118 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1121 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1127 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1138 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 1141 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1142 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 1147 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 1149 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 1151 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1152 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1200 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 1246 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 1274 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1280 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1282 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 1294 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1319 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1322 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1327 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 1333 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 1340 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1346 [10.804403]

Insertion in crawl-ref/source/monstuff.h at line 131 [10.1390580]

Insertion in crawl-ref/source/monstuff.cc at line 2599 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2612 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2615 [10.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 3694 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3698 [10.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3706 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3709 [10.1699344]

Replacement in crawl-ref/source/misc.cc at line 157 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2016 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2017 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2018 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2019 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2020 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2021 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2022 [10.1933596]

Deletion in crawl-ref/source/misc.cc at line 2023 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 2040 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 2134 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 2142 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 2690 [10.1933596]

Deletion in crawl-ref/source/items.cc at line 934 [10.2584728]

Deletion in crawl-ref/source/items.cc at line 936 [10.2584728]

Insertion in crawl-ref/source/items.cc at line 1583 [10.2584728]

Insertion in crawl-ref/source/initfile.cc at line 630 [10.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1805 [10.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1975 [10.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2261 [10.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2425 [10.2957258]

Replacement in crawl-ref/source/food.cc at line 81 [10.3043806]

Insertion in crawl-ref/source/externs.h at line 1588 [10.3270163]

Insertion in crawl-ref/source/enum.h at line 434 [10.3287960]

Replacement in crawl-ref/source/effects.cc at line 1950 [10.3382105]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2115 [51.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2118 [51.307]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2121 [51.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2183 [51.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2187 [51.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2190 [51.307]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2194 [51.307]

Insertion in crawl-ref/source/command.cc at line 1523 [10.4082507]

Replacement in crawl-ref/source/command.cc at line 1600 [10.4082507]

Insertion in crawl-ref/source/acr.cc at line 1251 [10.4397395]

Insertion in crawl-ref/source/acr.cc at line 2018 [10.4397395]