fiddlerwoaroof/crawl - Change HP72STXEK6KJ5SAPZKKLLAXC5HB7J4E6X6NK2BNFP6GARF52K5RQC

Change Options.autopickup_on from boolean to 3-state: 1 (autopick up), 0

(autopickup off), -1 (autopickup turned off automatically). Only in the latter case does killing an invisible monster turn autopickup (back) on.

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

Created by j-p-e-g on April 24, 2009

HP72STXEK6KJ5SAPZKKLLAXC5HB7J4E6X6NK2BNFP6GARF52K5RQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/xom.cc at line 1013 [5.3]
B:BD[5.11755] → [6.34:55]
```
    bool rc = false;
```

Insertion in crawl-ref/source/xom.cc at line 1020 [5.3]

[4.215]

[7.1113]


        if (pot == POT_EXPERIENCE && !one_chance_in(6))
            pot = POT_BERSERK_RAGE;

Replacement in crawl-ref/source/xom.cc at line 1059 [5.3]

B:BD[6.300] → [6.300:384]

    if (pot == POT_EXPERIENCE && !one_chance_in(6))
        pot = POT_BERSERK_RAGE;

[6.300]

[6.384]

    god_speaks(GOD_XOM, _get_xom_speech("potion effect").c_str());
    if (pot == POT_BERSERK_RAGE)
        you.berserk_penalty = NO_BERSERK_PENALTY;

Replacement in crawl-ref/source/xom.cc at line 1064 [5.3]

B:BD[6.385] → [6.385:447]

    if (pot != POT_BERSERK_RAGE || you.can_go_berserk(false))

[6.385]

[6.447]

    // Take a note.
    std::string potion_msg = "potion effect ";
    switch (pot)

Replacement in crawl-ref/source/xom.cc at line 1068 [5.3]

B:BD[6.453] → [6.453:524]

        god_speaks(GOD_XOM, _get_xom_speech("potion effect").c_str());

[6.453]

[8.4]

    case POT_HEALING:       potion_msg += "(healing)"; break;
    case POT_HEAL_WOUNDS:   potion_msg += "(heal wounds)"; break;
    case POT_MAGIC:         potion_msg += "(magic)"; break;
    case POT_SPEED:         potion_msg += "(speed)"; break;
    case POT_MIGHT:         potion_msg += "(might)"; break;
    case POT_INVISIBILITY:  potion_msg += "(invisibility)"; break;
    case POT_BERSERK_RAGE:  potion_msg += "(berserk)"; break;
    case POT_EXPERIENCE:    potion_msg += "(experience)"; break;
    default:                potion_msg += "(other)"; break;
    }
    take_note(Note(NOTE_XOM_EFFECT, you.piety, -1, potion_msg.c_str()), true);

Replacement in crawl-ref/source/xom.cc at line 1080 [5.3]

B:BD[8.5] → [6.525:616]

        if (pot == POT_BERSERK_RAGE)
            you.berserk_penalty = NO_BERSERK_PENALTY;

[8.5]

[9.6]

    potion_effect(pot, 150);

Replacement in crawl-ref/source/xom.cc at line 1082 [5.3]

B:BD[9.7] → [2.544:619]

∅:D[2.619] → [7.2099:2674]

B:BD[7.2099] → [7.2099:2674]

B:BD[7.2674] → [2.620:727]

∅:D[2.727] → [6.617:650]

∅:D[7.2752] → [6.617:650]

B:BD[9.7] → [6.617:650]

∅:D[10.102] → [5.11888:11889]

∅:D[6.650] → [5.11888:11889]

B:BD[5.11888] → [5.11888:11889]

B:BD[5.11889] → [6.651:676]

B:BD[6.676] → [3.4:5]

∅:D[3.5] → [6.676:693]

B:BD[6.676] → [6.676:693]

        // Take a note.
        std::string potion_msg = "potion effect ";
        switch (pot)
        {
        case POT_HEALING:       potion_msg += "(healing)"; break;
        case POT_HEAL_WOUNDS:   potion_msg += "(heal wounds)"; break;
        case POT_SPEED:         potion_msg += "(speed)"; break;
        case POT_MIGHT:         potion_msg += "(might)"; break;
        case POT_INVISIBILITY:  potion_msg += "(invisibility)"; break;
        case POT_BERSERK_RAGE:  potion_msg += "(berserk)"; break;
        case POT_EXPERIENCE:    potion_msg += "(experience)"; break;
        default:                potion_msg += "(other)"; break;
        }
        take_note(Note(NOTE_XOM_EFFECT, you.piety, -1,
                       potion_msg.c_str()), true);
        potion_effect(pot, 150);
        rc = true;
    }
    return (rc);

[9.7]

[6.693]

    return (true);

Replacement in crawl-ref/source/xom.cc at line 1635 [5.3]

B:BD[6.4508] → [11.1316:1378]

    // Don't make the player go berserk if there's no danger.

[6.4508]

[11.1378]

    // Don't make the player go berserk etc. if there's no danger.

Insertion in crawl-ref/source/xom.cc at line 2164 [5.3]
[12.11644]
[12.11644]
```
    bool flavour_only = false;
```
Replacement in crawl-ref/source/items.cc at line 2353 [14.2584728]
B:BD[13.7577] → [13.7577:7609]
```
    if (!Options.autopickup_on)
```
[13.7577]
[13.7687]
```
    if (Options.autopickup_on <= 0)
```
Replacement in crawl-ref/source/initfile.cc at line 687 [14.2957258]
∅:D[15.10579] → [16.791253:791279]
B:BD[16.791253] → [16.791253:791279]
```
    autopickup_on = true;
```
[15.10579]
[17.3738]
```
    autopickup_on    = 1;
```

Replacement in crawl-ref/source/initfile.cc at line 2111 [14.2957258]

B:BD[18.4936] → [18.4936:5001]

    else BOOL_OPTION_NAMED("default_autopickup", autopickup_on);

[18.4936]

[19.7840]

    else if (key == "default_autopickup")
    {
        if (_read_bool(field, true))
            autopickup_on = 1;
        else
            autopickup_on = 0;
    }

Replacement in crawl-ref/source/externs.h at line 1955 [14.3270163]
∅:D[20.8695] → [16.898597:898628]
∅:D[15.15788] → [16.898597:898628]
B:BD[14.3283231] → [16.898597:898628]
```
    bool        autopickup_on;
```
[15.15788]
[19.8167]
```
    int         autopickup_on;
```
Replacement in crawl-ref/source/delay.cc at line 1920 [14.3963459]
B:BD[7.15357] → [7.15357:15392]
```
        if (Options.autopickup_on)
```
[7.15357]
[7.15392]
```
        if (Options.autopickup_on > 0)
```
Replacement in crawl-ref/source/delay.cc at line 1922 [14.3963459]
B:BD[7.15402] → [7.15402:15445]
```
            Options.autopickup_on = false;
```
[7.15402]
[7.15445]
```
            Options.autopickup_on = -1;
```
Replacement in crawl-ref/source/delay.cc at line 1932 [14.3963459]
B:BD[7.15734] → [7.15734:15771]
```
    else if (!Options.autopickup_on)
```
[7.15734]
[7.15771]
```
    else if (Options.autopickup_on < 0) // was turned off automatically
```
Replacement in crawl-ref/source/delay.cc at line 1934 [14.3963459]
B:BD[7.15777] → [7.15777:15815]
```
        Options.autopickup_on = true;
```
[7.15777]
[7.15815]
```
        Options.autopickup_on = 1;
```

Replacement in crawl-ref/source/beam.cc at line 4951 [14.4128068]

B:BD[21.64319] → [21.64319:64797]

                {
                    // Also turn off autopickup.
                    Options.autopickup_on = false;
                    mpr("Deactivating autopickup; reactivate with Ctrl-A.",
                        MSGCH_WARN);
                    if (Options.tutorial_left)
                    {
                        learned_something_new(TUT_INVISIBLE_DANGER);
                        Options.tut_seen_invisible = you.num_turns;
                    }
                }

[21.64319]

[21.64797]

                    autotoggle_autopickup(true);

Replacement in crawl-ref/source/acr.cc at line 1444 [14.4397395]

B:BD[16.1264974] → [22.20561:20622]

        _toggle_flag( &Options.autopickup_on, "Autopickup");

[16.1264974]

[16.1265143]

        if (Options.autopickup_on < 1)
            Options.autopickup_on = 1;
        else
            Options.autopickup_on = 0;
        mprf("Autopickup is now %s.", Options.autopickup_on > 0 ? "on" : "off");

Change Options.autopickup_on from boolean to 3-state: 1 (autopick up), 0

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/xom.cc at line 1013 [5.3]

Insertion in crawl-ref/source/xom.cc at line 1020 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1059 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1064 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1068 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1080 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1082 [5.3]

Replacement in crawl-ref/source/xom.cc at line 1635 [5.3]

Insertion in crawl-ref/source/xom.cc at line 2164 [5.3]

Replacement in crawl-ref/source/items.cc at line 2353 [14.2584728]

Replacement in crawl-ref/source/initfile.cc at line 687 [14.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2111 [14.2957258]

Replacement in crawl-ref/source/externs.h at line 1955 [14.3270163]

Replacement in crawl-ref/source/delay.cc at line 1920 [14.3963459]

Replacement in crawl-ref/source/delay.cc at line 1922 [14.3963459]

Replacement in crawl-ref/source/delay.cc at line 1932 [14.3963459]

Replacement in crawl-ref/source/delay.cc at line 1934 [14.3963459]

Replacement in crawl-ref/source/beam.cc at line 4951 [14.4128068]

Replacement in crawl-ref/source/acr.cc at line 1444 [14.4397395]