fiddlerwoaroof/crawl - Change CH7JECYYH35H4TRHRNRTRJCQTQLZ2WRH62TKV72SUIU2RTK5OH7AC

Removed: safe_autopickup, safe_zero_exp, lowercase_invocations,

always_greet, terse_hand, increasing_skill_progress, use_notes, confirm_self_target. (default_autoprayer still exists.)

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

Created by haranp on November 16, 2007

CH7JECYYH35H4TRHRNRTRJCQTQLZ2WRH62TKV72SUIU2RTK5OH7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills2.cc at line 1881 [12.647133]

∅:D[10.194] → [11.130:359]

∅:D[13.380] → [11.130:359]

B:BD[11.130] → [11.130:359]

                    if ( !Options.increasing_skill_progress )
                        cprintf( " (%d)", (100 - percent_done) / 10 );
                    else
                        cprintf( " (%2d%%)", (percent_done / 5) * 5 );

[10.194]

[11.359]

                    cprintf( " (%2d%%)", (percent_done / 5) * 5 );

Replacement in crawl-ref/source/player.cc at line 3211 [12.962854]

B:BD[12.1025853] → [12.1025853:1025939]

                    mpr("You have gained the ability to fly.", MSGCH_INTRINSIC_GAIN);

[12.1025853]

[12.1025939]

                {
                    mpr("You have gained the ability to fly.",
                        MSGCH_INTRINSIC_GAIN);
                }

Deletion in crawl-ref/source/player.cc at line 3248 [12.962854]
B:BD[12.1026579] → [14.505:536]
```
        if (Options.use_notes)
```
Insertion in crawl-ref/source/player.cc at line 3263 [12.962854]
[14.974]
[14.974]
Replacement in crawl-ref/source/output.cc at line 322 [12.1088282]
B:BD[12.1094221] → [12.1094221:1094261]
```
        if (you.equip[EQ_WEAPON] != -1)
```
[12.1094221]
[12.1094261]
```
        if (you.weapon())
```
Replacement in crawl-ref/source/output.cc at line 324 [12.1088282]
B:BD[12.1094360] → [12.1094360:1094361]
B:BD[12.1094361] → [15.3014:3079]
```
            const item_def& wpn = you.inv[you.equip[EQ_WEAPON]];
```
[12.1094271]
[15.3079]
```
            const item_def& wpn = *you.weapon();
```

Replacement in crawl-ref/source/output.cc at line 332 [12.1088282]

B:BD[12.1094530] → [15.3187:3213]

B:BD[15.3213] → [16.223:340]

            cprintf("%s",
                    wpn.name(DESC_INVENTORY,
                             Options.terse_hand).substr(0,38).c_str());

[12.1094530]

[12.1094561]

            cprintf("%s", wpn.name(DESC_INVENTORY, true).substr(0,38).c_str());

Replacement in crawl-ref/source/monplace.cc at line 1447 [12.1641732]

B:BD[6.387] → [6.387:500]

              && (!Options.safe_zero_exp ||
                  !mons_class_flag( monster->type, M_NO_EXP_GAIN )))

[6.387]

[17.11952]

              && !mons_class_flag( monster->type, M_NO_EXP_GAIN ))

Replacement in crawl-ref/source/misc.cc at line 1547 [12.1933596]

B:BD[18.1733] → [18.1733:1822]

        (Options.safe_zero_exp &&
         mons_class_flag( mon->type, M_NO_EXP_GAIN ));

[18.1733]

[18.1822]

        mons_class_flag(mon->type, M_NO_EXP_GAIN);

Replacement in crawl-ref/source/items.cc at line 2957 [12.2584728]
B:BD[12.2657601] → [19.7634:7687]
```
            && you.duration[DUR_TRANSFORMATION] > 0)
```
[12.2657601]
[19.7687]
```
        && you.duration[DUR_TRANSFORMATION] > 0)
```
Replacement in crawl-ref/source/items.cc at line 2963 [12.2584728]
B:BD[20.641281] → [20.641281:641334]
```
    if ( Options.safe_autopickup && !i_feel_safe() )
```
[20.641281]
[19.7737]
```
    if ( !i_feel_safe() )
```
Deletion in crawl-ref/source/initfile.cc at line 603 [12.2957258]
B:BD[20.792247] → [20.792247:792282]
```
    always_greet           = true;
```
Deletion in crawl-ref/source/initfile.cc at line 611 [12.2957258]
∅:D[21.612] → [20.792536:792571]
∅:D[22.2714] → [20.792536:792571]
B:BD[20.792536] → [20.792536:792571]
```
    confirm_self_target    = true;
```
Deletion in crawl-ref/source/initfile.cc at line 612 [12.2957258]
∅:D[23.210] → [24.143:178]
∅:D[4.301] → [24.143:178]
B:BD[20.792571] → [24.143:178]
```
    safe_autopickup        = true;
```
Deletion in crawl-ref/source/initfile.cc at line 614 [12.2957258]
∅:D[24.178] → [20.792607:792642]
∅:D[10.992] → [20.792607:792642]
∅:D[25.1297] → [20.792607:792642]
B:BD[20.792607] → [20.792607:792642]
```
    use_notes              = true;
```
Deletion in crawl-ref/source/initfile.cc at line 621 [12.2957258]
∅:D[10.1031] → [26.144:179]
B:BD[20.792778] → [26.144:179]
∅:D[26.179] → [27.143:181]
B:BD[20.792814] → [27.143:181]
∅:D[27.181] → [20.792853:792854]
B:BD[20.792853] → [20.792853:792854]
```
    terse_hand             = true;
    increasing_skill_progress = true;
```
Deletion in crawl-ref/source/initfile.cc at line 679 [12.2957258]
∅:D[19.8911] → [20.793943:793978]
B:BD[20.793943] → [20.793943:793978]
```
    safe_zero_exp          = true;
```
Deletion in crawl-ref/source/initfile.cc at line 698 [12.2957258]
B:BD[12.2965419] → [2.143:179]
∅:D[2.179] → [12.2965464:2965465]
∅:D[20.794559] → [12.2965464:2965465]
B:BD[12.2965464] → [12.2965464:2965465]
```
    lowercase_invocations  = true; 
```
Deletion in crawl-ref/source/initfile.cc at line 1813 [12.2957258]
∅:D[20.802466] → [28.411989:411995]
B:BD[28.411989] → [28.411989:411995]
B:BD[28.412171] → [28.412171:412258]
B:BD[28.412258] → [20.802467:802524]
```
    }
    else if (key == "always_greet")
    {
        // show greeting when reloading game
        always_greet = read_bool( field, always_greet );
```
Deletion in crawl-ref/source/initfile.cc at line 1968 [12.2957258]
B:BD[20.804779] → [20.804779:804828]
B:BD[20.804828] → [17.13970:14041]
∅:D[17.14041] → [20.804892:804898]
B:BD[20.804892] → [20.804892:804898]
```
    else if (key == "confirm_self_target")
    {
        confirm_self_target = read_bool( field, confirm_self_target );
    }
```
Deletion in crawl-ref/source/initfile.cc at line 1973 [12.2957258]
∅:D[29.337] → [23.316:322]
B:BD[23.316] → [23.316:322]
∅:D[23.322] → [20.804898:804937]
B:BD[20.804898] → [20.804898:804937]
∅:D[20.804937] → [28.415809:415815]
B:BD[28.415809] → [28.415809:415815]
B:BD[28.415815] → [17.14042:14105]
```
    }
    else if (key == "safe_autopickup")
    {
        safe_autopickup = read_bool( field, safe_autopickup );
```
Deletion in crawl-ref/source/initfile.cc at line 2047 [12.2957258]
∅:D[25.1423] → [20.805000:805090]
∅:D[30.4587] → [20.805000:805090]
∅:D[31.12198] → [20.805000:805090]
B:BD[20.805000] → [20.805000:805090]
B:BD[20.805090] → [7.4996:5002]
```
    else if (key == "use_notes")
    {
        use_notes = read_bool( field, use_notes );
    }
```

Deletion in crawl-ref/source/initfile.cc at line 2063 [12.2957258]

∅:D[20.805387] → [28.416024:416070]

B:BD[28.416024] → [28.416024:416070]

B:BD[28.416070] → [20.805388:805585]

    }
    else if (key == "terse_hand")
    {
        terse_hand = read_bool( field, terse_hand );
    }
    else if (key == "increasing_skill_progress")
    {
        increasing_skill_progress = read_bool( field, increasing_skill_progress );

Deletion in crawl-ref/source/initfile.cc at line 2087 [12.2957258]
B:BD[28.416835] → [28.416835:416886]
B:BD[28.416886] → [20.806024:806114]
∅:D[20.806114] → [28.416992:416998]
B:BD[28.416992] → [28.416992:416998]
```
    else if (key == "lowercase_invocations")
    {
        lowercase_invocations 
                = read_bool(field, lowercase_invocations);
    }
```
Deletion in crawl-ref/source/initfile.cc at line 2535 [12.2957258]
B:BD[28.425887] → [20.811260:811297]
∅:D[20.811297] → [28.425926:425932]
B:BD[28.425926] → [28.425926:425932]
B:BD[28.425932] → [17.14242:14299]
∅:D[17.14299] → [28.426009:426015]
∅:D[20.811348] → [28.426009:426015]
B:BD[28.426009] → [28.426009:426015]
```
    else if (key == "safe_zero_exp")
    {
        safe_zero_exp = read_bool(field, safe_zero_exp);
    }
```
Deletion in crawl-ref/source/externs.h at line 1513 [12.3270163]
B:BD[12.3283583] → [12.3283583:3283658]
```
    bool        always_greet;   // display greeting message when reloading
```

Deletion in crawl-ref/source/externs.h at line 1517 [12.3270163]

∅:D[9.933] → [20.898768:898921]

B:BD[12.3283843] → [20.898768:898921]

    bool        increasing_skill_progress; // skills go from 0-10 or 10-0
    bool        confirm_self_target; // require confirmation before selftarget

Deletion in crawl-ref/source/externs.h at line 1518 [12.3270163]
∅:D[23.401] → [20.898921:898996]
B:BD[20.898921] → [20.898921:898996]
```
    bool        safe_autopickup; // don't autopickup when monsters visible
```
Deletion in crawl-ref/source/externs.h at line 1522 [12.3270163]
B:BD[20.899137] → [22.2726:2783]
```
    bool        use_notes;      // take (and dump) notes
```
Deletion in crawl-ref/source/externs.h at line 1540 [12.3270163]
B:BD[12.3284803] → [12.3284803:3284877]
```
    bool        terse_hand;     // use terse description for wielded item
```
Deletion in crawl-ref/source/externs.h at line 1552 [12.3270163]
B:BD[12.3285411] → [12.3285411:3285491]
```
    bool        lowercase_invocations;          // prefer lowercase invocations
```
Deletion in crawl-ref/source/externs.h at line 1642 [12.3270163]
∅:D[32.1703] → [20.900463:900540]
B:BD[28.445452] → [20.900463:900540]
```
    bool        safe_zero_exp; // If true, you feel safe around 0xp monsters
```
Replacement in crawl-ref/source/direct.cc at line 335 [12.3697945]
B:BD[33.20725] → [33.20725:20788]
```
        if (mode == TARG_ENEMY && Options.confirm_self_target)
```
[33.20725]
[33.20788]
```
        if (mode == TARG_ENEMY)
```

Replacement in crawl-ref/source/direct.cc at line 825 [12.3697945]

B:BD[34.1289] → [34.1289:1359]

                 mode == TARG_ENEMY && Options.confirm_self_target &&

[34.1289]

[5.394]

                 mode == TARG_ENEMY &&

Replacement in crawl-ref/source/delay.cc at line 1173 [12.3963459]

B:BD[35.802] → [35.802:868]

            if (Options.autopickup_on && Options.safe_autopickup)

[35.802]

[35.868]

            if (Options.autopickup_on)

Deletion in crawl-ref/source/clua.cc at line 2081 [28.483969]
B:BD[28.529379] → [28.529379:529443]
```
    { "always_greet", &Options.always_greet, option_hboolean },
```

Deletion in crawl-ref/source/clua.cc at line 2086 [28.483969]

∅:D[9.1083] → [28.529627:529687]

B:BD[28.529627] → [28.529627:529687]

B:BD[28.529687] → [20.1206484:1206652]

    { "terse_hand", &Options.terse_hand, option_hboolean },
    { "increasing_skill_progress", &Options.increasing_skill_progress, option_hboolean },
    { "confirm_self_target", &Options.confirm_self_target, option_hboolean },

Deletion in crawl-ref/source/clua.cc at line 2087 [28.483969]
∅:D[23.2319] → [20.1206652:1206722]
B:BD[20.1206652] → [20.1206652:1206722]
```
    { "safe_autopickup", &Options.safe_autopickup, option_hboolean },
```
Deletion in crawl-ref/source/clua.cc at line 2089 [28.483969]
B:BD[20.1206790] → [20.1206790:1206848]
```
    { "use_notes", &Options.use_notes, option_hboolean },
```

Deletion in crawl-ref/source/clua.cc at line 2092 [28.483969]

B:BD[28.529889] → [28.529889:529992]

    { "lowercase_invocations", &Options.lowercase_invocations, 
                    option_hboolean },

Deletion in crawl-ref/source/clua.cc at line 2097 [28.483969]
B:BD[28.530326] → [20.1206910:1206976]
```
    { "safe_zero_exp", &Options.safe_zero_exp, option_hboolean },
```
Replacement in crawl-ref/source/chardump.cc at line 559 [12.4100336]
∅:D[36.5213] → [20.1214709:1214772]
B:BD[20.1214709] → [20.1214709:1214772]
```
    if ( note_list.size() == 0 || Options.use_notes == false )
```
[36.5213]
[17.18888]
```
    if ( note_list.empty() )
```

Insertion in crawl-ref/source/acr.cc at line 180 [12.4397395]

[30.10168]

[37.2160]

static void show_commandline_options_help();
static void wanderer_startup_message();
static void god_greeting_message( bool game_start );
static void take_starting_note();
static void startup_tutorial();

Replacement in crawl-ref/source/acr.cc at line 202 [12.4397395]

B:BD[12.4403345] → [12.4403345:4403851]

B:BD[12.4403851] → [38.2560:2630]

B:BD[38.2630] → [39.903:972]

∅:D[39.972] → [12.4403851:4404131]

∅:D[38.2682] → [12.4403851:4404131]

B:BD[12.4403851] → [12.4403851:4404131]

B:BD[12.4404131] → [40.2309:2559]

∅:D[40.2559] → [12.4404298:4404315]

B:BD[12.4404298] → [12.4404298:4404315]

        // print help
        puts("Command line options:");
        puts("  -name <string>   character name");
        puts("  -race <arg>      preselect race (by letter, abbreviation, or name)");
        puts("  -class <arg>     preselect class (by letter, abbreviation, or name)");
        puts("  -pizza <string>  crawl pizza");
        puts("  -plain           don't use IBM extended characters");
        puts("  -dir <path>      crawl directory");
        puts("  -rc <file>       init file name");
        puts("  -morgue <dir>    directory to save character dumps");
        puts("  -macro <dir>     directory to save/find macro.txt");
        puts("");
        puts("Command line options override init file options, which override");
        puts("environment options (CRAWL_NAME, CRAWL_PIZZA, CRAWL_DIR, CRAWL_RC).");
        puts("");
        puts("Highscore list options: (Can now be redirected to more, etc)");
        puts("  -scores [N]            highscore list");
        puts("  -tscores [N]           terse highscore list");
        puts("  -vscores [N]           verbose highscore list");
        puts("  -scorefile <filename>  scorefile to report on");
        exit(1);

[12.4403345]

[12.4404315]

        show_commandline_options_help();
        return 1;

Replacement in crawl-ref/source/acr.cc at line 218 [12.4397395]
∅:D[41.2055] → [12.4404621:4404638]
B:BD[12.4404621] → [12.4404621:4404638]
```
        exit(0);
```
[41.2055]
[12.4404638]
```
        return 0;
```

Deletion in crawl-ref/source/acr.cc at line 231 [12.4397395]

∅:D[42.46908] → [12.4404981:4405031]

∅:D[43.88745] → [12.4404981:4405031]

B:BD[12.4404981] → [12.4404981:4405031]

B:BD[12.4405031] → [44.3468:3689]

    if (game_start || Options.always_greet)
    {
        msg::stream << "Welcome, " << you.your_name << " the "
                    << species_name( you.species,you.experience_level )
                    << " " << you.class_name << "."
                    << std::endl;

Replacement in crawl-ref/source/acr.cc at line 232 [12.4397395]

B:BD[45.50089] → [45.50089:50206]

B:BD[45.50206] → [46.6880:6916]

        // Activate markers only after the welcome message, so the
        // player can see any resulting messages.
        env.markers.activate_all();

[45.50089]

[12.4405216]

    msg::stream << "Welcome, " << you.your_name << " the "
                << species_name( you.species,you.experience_level )
                << " " << you.class_name << "."
                << std::endl;

Replacement in crawl-ref/source/acr.cc at line 237 [12.4397395]

B:BD[12.4405217] → [12.4405217:4405598]

        // Starting messages can go here as this should only happen
        // at the start of a new game -- bwr
        // This message isn't appropriate for Options.always_greet
        if (you.char_class == JOB_WANDERER && game_start)
        {
            int skill_levels = 0;
            for (int i = 0; i <= NUM_SKILLS; i++)
                skill_levels += you.skills[ i ];

[12.4405217]

[12.4405598]

    // Activate markers only after the welcome message, so the
    // player can see any resulting messages.
    env.markers.activate_all();

Replacement in crawl-ref/source/acr.cc at line 241 [12.4397395]

B:BD[12.4405599] → [12.4405599:4406102]

            if (skill_levels <= 2)
            {
                // Demigods and Demonspawn wanderers stand to not be
                // able to see any of their skills at the start of
                // the game (one or two skills should be easily guessed
                // from starting equipment)... Anyways, we'll give the
                // player a message to warn them (and give a reason why). -- bwr
                mpr("You wake up in a daze, and can't recall much.");
            }
        }

[12.4405599]

[12.4406102]

    if (game_start && you.char_class == JOB_WANDERER)
        wanderer_startup_message();

Replacement in crawl-ref/source/acr.cc at line 244 [12.4397395]

B:BD[12.4406103] → [12.4406103:4407472]

B:BD[12.4407472] → [8.372:490]

∅:D[8.490] → [47.22779:22803]

B:BD[12.4407472] → [47.22779:22803]

B:BD[47.22803] → [48.2465:2565]

∅:D[48.2565] → [47.22880:22899]

B:BD[47.22880] → [47.22880:22899]

∅:D[47.22899] → [12.4407472:4407518]

B:BD[12.4407472] → [12.4407472:4407518]

        // These need some work -- should make sure that the god's
        // name is metioned, else the message might be confusing.
        switch (you.religion)
        {
        case GOD_ZIN:
            simple_god_message( " says: Spread the light, my child." );
            break;
        case GOD_SHINING_ONE:
            simple_god_message( " says: Smite the infidels!" );
            break;
        case GOD_KIKUBAAQUDGHA:
        case GOD_YREDELEMNUL:
        case GOD_NEMELEX_XOBEH:
            simple_god_message( " says: Welcome..." );
            break;
        case GOD_XOM:
            if (game_start)
                simple_god_message( " says: A new plaything!" );
            break;
        case GOD_VEHUMET:
            god_speaks( you.religion, "Let it end in hellfire!");
            break;
        case GOD_OKAWARU:
            simple_god_message(" says: Welcome, disciple.");
            break;
        case GOD_MAKHLEB:
            god_speaks( you.religion, "Blood and souls for Makhleb!" );
            break;
        case GOD_SIF_MUNA:
            simple_god_message( " whispers: I know many secrets...");
            break;
        case GOD_TROG:
            simple_god_message( " says: Kill them all!" );
            break;
        case GOD_ELYVILON:
            simple_god_message( " says: Go forth and aid the weak!" );
            break;
        case GOD_LUGONU:
            simple_god_message( " says: Spread carnage and corruption!");
            break;
        case GOD_BEOGH:
            simple_god_message(
                " says: Drown the unbelievers in a sea of blood!");
            break;
        default:
            break;
        }

[12.4406103]

[12.4407518]

    god_greeting_message( game_start );

Replacement in crawl-ref/source/acr.cc at line 246 [12.4397395]

B:BD[12.4407519] → [12.4407519:4407612]

        // warn player about their weapon, if unsuitable
        wield_warning(false);
    }

[12.4407519]

[12.4407612]

    // warn player about their weapon, if unsuitable
    wield_warning(false);

Replacement in crawl-ref/source/acr.cc at line 250 [12.4397395]
B:BD[49.1771] → [49.1771:1781]
```
    {    
```
[49.1771]
[49.1781]
```
    {
```

Replacement in crawl-ref/source/acr.cc at line 252 [12.4397395]

B:BD[49.1816] → [49.1816:1994]

B:BD[49.1994] → [44.3690:3904]

∅:D[44.3904] → [50.12150:12151]

B:BD[49.2138] → [50.12150:12151]

∅:D[50.12151] → [49.2139:2208]

B:BD[43.89179] → [49.2139:2208]

B:BD[49.2208] → [50.12152:12162]

∅:D[50.12162] → [49.2222:2223]

B:BD[49.2222] → [49.2222:2223]

B:BD[49.2223] → [50.12163:12404]

B:BD[50.12404] → [51.652:720]

∅:D[51.720] → [50.12474:12780]

B:BD[50.12474] → [50.12474:12780]

        {
            // don't allow triggering at game start 
            Options.tut_just_triggered = true;
            // print stats and everything
            prep_input();
            msg::streams(MSGCH_TUTORIAL)
                << "Press any key to start the tutorial intro, "
                "or Escape to skip it."
                << std::endl;
            const int ch = c_getch();
            if (ch != ESCAPE)
                tut_starting_screen();
        }
        std::ostringstream notestr;
        notestr << you.your_name << ", the "
                << species_name(you.species,you.experience_level) << " "
                << you.class_name
                << ", began the quest for the Orb.";
        take_note(Note(NOTE_MESSAGE, 0, 0, notestr.str().c_str()));
        notestr.str("");
        notestr.clear();
        notestr << "HP: " << you.hp << "/" << you.hp_max
                << " MP: " << you.magic_points << "/" << you.max_magic_points;
        take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0,
                       notestr.str().c_str()));

[49.1816]

[52.728]

            startup_tutorial();
        take_starting_note();

Deletion in crawl-ref/source/acr.cc at line 257 [12.4397395]
B:BD[12.4407630] → [12.4407630:4407636]
```
    {
```
Deletion in crawl-ref/source/acr.cc at line 258 [12.4397395]
B:BD[12.4407683] → [12.4407683:4407689]
```
    }
```
Deletion in crawl-ref/source/acr.cc at line 260 [12.4397395]
B:BD[12.4407735] → [12.4407735:4407736]

Insertion in crawl-ref/source/acr.cc at line 266 [12.4397395]

[20.1256305]

[12.4407860]


static void show_commandline_options_help()
{
    puts("Command line options:");
    puts("  -name <string>   character name");
    puts("  -race <arg>      preselect race (by letter, abbreviation, or name)");
    puts("  -class <arg>     preselect class (by letter, abbreviation, or name)");
    puts("  -pizza <string>  crawl pizza");
    puts("  -plain           don't use IBM extended characters");
    puts("  -dir <path>      crawl directory");
    puts("  -rc <file>       init file name");
    puts("  -morgue <dir>    directory to save character dumps");
    puts("  -macro <dir>     directory to save/find macro.txt");
    puts("");
    puts("Command line options override init file options, which override");
    puts("environment options (CRAWL_NAME, CRAWL_PIZZA, CRAWL_DIR, CRAWL_RC).");
    puts("");
    puts("Highscore list options: (Can now be redirected to more, etc)");
    puts("  -scores [N]            highscore list");
    puts("  -tscores [N]           terse highscore list");
    puts("  -vscores [N]           verbose highscore list");
    puts("  -scorefile <filename>  scorefile to report on");
}
static void wanderer_startup_message()
{
    int skill_levels = 0;
    for (int i = 0; i < NUM_SKILLS; i++)
        skill_levels += you.skills[ i ];
    
    if (skill_levels <= 2)
    {
        // Demigods and Demonspawn wanderers stand to not be
        // able to see any of their skills at the start of
        // the game (one or two skills should be easily guessed
        // from starting equipment)... Anyways, we'll give the
        // player a message to warn them (and give a reason why). -- bwr
        mpr("You wake up in a daze, and can't recall much.");
    }
}
static void god_greeting_message( bool game_start )
{
    switch (you.religion)
    {
    case GOD_ZIN:
        simple_god_message( " says: Spread the light, my child." );
        break;
    case GOD_SHINING_ONE:
        simple_god_message( " says: Smite the infidels!" );
        break;
    case GOD_KIKUBAAQUDGHA:
    case GOD_YREDELEMNUL:
    case GOD_NEMELEX_XOBEH:
        simple_god_message( " says: Welcome..." );
        break;
    case GOD_XOM:
        if (game_start)
            simple_god_message( " says: A new plaything!" );
        break;
    case GOD_VEHUMET:
        god_speaks( you.religion, "Let it end in hellfire!");
        break;
    case GOD_OKAWARU:
        simple_god_message(" says: Welcome, disciple.");
        break;
    case GOD_MAKHLEB:
        god_speaks( you.religion, "Blood and souls for Makhleb!" );
        break;
    case GOD_SIF_MUNA:
        simple_god_message( " whispers: I know many secrets...");
        break;
    case GOD_TROG:
        simple_god_message( " says: Kill them all!" );
        break;
    case GOD_ELYVILON:
        simple_god_message( " says: Go forth and aid the weak!" );
        break;
    case GOD_LUGONU:
        simple_god_message( " says: Spread carnage and corruption!");
        break;
    case GOD_BEOGH:
        simple_god_message(
            " says: Drown the unbelievers in a sea of blood!");
        break;
    case GOD_NO_GOD:
    case NUM_GODS:
    case GOD_RANDOM:
        break;
    }
}
static void take_starting_note()
{
    std::ostringstream notestr;
    notestr << you.your_name << ", the "
            << species_name(you.species,you.experience_level) << " "
            << you.class_name
            << ", began the quest for the Orb.";
    take_note(Note(NOTE_MESSAGE, 0, 0, notestr.str().c_str()));

Insertion in crawl-ref/source/acr.cc at line 367 [12.4397395]

[12.4407861]

[12.4407922]

    notestr.str("");
    notestr.clear();
    notestr << "HP: " << you.hp << "/" << you.hp_max
            << " MP: " << you.magic_points << "/" << you.max_magic_points;
    take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0,
                   notestr.str().c_str()));
}
static void startup_tutorial()
{
    // don't allow triggering at game start 
    Options.tut_just_triggered = true;
    // print stats and everything
    prep_input();
    msg::streams(MSGCH_TUTORIAL)
        << "Press any key to start the tutorial intro, or Escape to skip it."
        << std::endl;
    const int ch = c_getch();
    if (ch != ESCAPE)
        tut_starting_screen();
}

Replacement in crawl-ref/source/abl-show.cc at line 2221 [12.4494389]

B:BD[12.4549380] → [53.9506:9573]

∅:D[53.9573] → [54.1164:1251]

B:BD[54.1164] → [54.1164:1251]

            set_god_ability_helper(god_abilities[you.religion][i],
                                   (Options.lowercase_invocations ? 'a' : 'A') + num);

[12.4549380]

[54.1251]

            set_god_ability_helper(god_abilities[you.religion][i], 'a' + num);

Replacement in crawl-ref/source/abl-show.cc at line 2240 [12.4494389]

B:BD[12.4550162] → [55.22747:22875]

∅:D[55.22875] → [12.4551066:4551067]

B:BD[12.4551066] → [12.4551066:4551067]

B:BD[12.4551067] → [55.22876:22927]

    // skip over a-e if player prefers them for invocations
    const int startpoint = (Options.lowercase_invocations ? 5 : 0);
    for (int slot = startpoint; slot < 52; slot++)

[12.4550162]

[56.3694]

    // skip over a-e (invocations)
    for (int slot = 5; slot < 52; slot++)

Replacement in crawl-ref/source/abl-show.cc at line 2250 [12.4494389]

B:BD[12.4551594] → [55.23018:23133]

    // if we skipped over a-e to reserve them, try them now
    for (int slot = startpoint - 1; slot >= 0; slot--)

[12.4551594]

[12.4551621]

    // if we can't find anything else, try a-e
    for (int slot = 4; slot >= 0; slot--)

Deletion in crawl-ref/init.txt at line 70 [12.4830895]
B:BD[57.2512] → [24.419:445]
```
# safe_autopickup = false
```
Deletion in crawl-ref/init.txt at line 71 [12.4830895]
∅:D[24.445] → [57.2537:2561]
∅:D[25.1740] → [57.2537:2561]
B:BD[57.2537] → [57.2537:2561]
```
# safe_zero_exp = false
```
Deletion in crawl-ref/init.txt at line 87 [12.4830895]
B:BD[57.3087] → [24.616:646]
```
# confirm_self_target = false
```
Deletion in crawl-ref/init.txt at line 151 [12.4830895]
B:BD[24.941] → [24.941:973]
```
# lowercase_invocations = false
```
Deletion in crawl-ref/init.txt at line 168 [12.4830895]
B:BD[58.561] → [58.561:582]
```
# terse_hand = false
```
Deletion in crawl-ref/init.txt at line 169 [12.4830895]
B:BD[57.4496] → [24.1173:1232]
```
# always_greet = false
# increasing_skill_progress = false
```
Deletion in crawl-ref/init.txt at line 240 [12.4830895]
B:BD[12.4840704] → [57.5552:5572]
```
# use_notes = false
```

Replacement in crawl-ref/docs/crawl_options.txt at line 22 [57.63392]

B:BD[22.3549] → [22.3549:3736]

                safe_autopickup, autopickup_no_burden, safe_zero_exp,
                pickup_thrown, pickup_dropped, assign_item_slot,
                drop_mode, pickup_mode, drop_filter

[22.3549]

[22.3736]

                autopickup_no_burden, pickup_thrown, pickup_dropped,
                assign_item_slot, drop_mode, pickup_mode, drop_filter

Replacement in crawl-ref/docs/crawl_options.txt at line 26 [57.63392]

B:BD[22.3819] → [59.2665:2756]

                confirm_self_target, default_target,
                target_unshifted_dirs

[22.3819]

[60.386]

                default_target, target_unshifted_dirs

Replacement in crawl-ref/docs/crawl_options.txt at line 50 [57.63392]

∅:D[31.19398] → [22.4451:4527]

B:BD[22.4451] → [22.4451:4527]

B:BD[22.4527] → [9.1162:1333]

                auto_list, lowercase_invocations, easy_open, easy_butcher, 
                always_confirm_butcher, easy_unequip, easy_confirm,
                easy_quit_item_prompts, easy_exit_menu, default_autoprayer,
                sort_menus

[31.19398]

[31.19399]

                auto_list, easy_open, easy_butcher, always_confirm_butcher,
                easy_unequip, easy_confirm, easy_quit_item_prompts,
                easy_exit_menu, default_autoprayer, sort_menus

Replacement in crawl-ref/docs/crawl_options.txt at line 54 [57.63392]

∅:D[31.19441] → [22.4701:4777]

B:BD[22.4701] → [22.4701:4777]

B:BD[22.4777] → [7.10840:11025]

                hp_warning, mp_warning, hp_colour, mp_colour, always_greet,
                terse_hand, delay_message_clear, menu_colour,
                menu_colour_prefix_id, menu_colour_prefix_class
                message_colour, increasing_skill_progress,

[31.19441]

[7.11025]

                hp_warning, mp_warning, hp_colour, mp_colour,
                delay_message_clear, menu_colour, menu_colour_prefix_id,
                menu_colour_prefix_class, message_colour,

Replacement in crawl-ref/docs/crawl_options.txt at line 77 [57.63392]

B:BD[22.5405] → [22.5405:5479]

                use_notes, note_items, ood_interesting, note_hp_percent,

[22.5405]

[22.5479]

                note_items, ood_interesting, note_hp_percent,

Deletion in crawl-ref/docs/crawl_options.txt at line 309 [57.63392]

∅:D[22.9049] → [24.10439:10463]

B:BD[24.10439] → [24.10439:10463]

B:BD[24.10463] → [22.9050:9249]


safe_autopickup = true
        When set, autopickup will not operate if there are visible unfriendly
        monsters (or statues.) If safe_zero_exp is set (the default), zero-XP
        monsters are considered friendly.

Deletion in crawl-ref/docs/crawl_options.txt at line 315 [57.63392]

B:BD[24.10642] → [24.10642:10663]

B:BD[24.10663] → [22.9324:9549]

∅:D[22.9549] → [24.10867:10868]

B:BD[24.10867] → [24.10867:10868]

safe_zero_exp = true
        If set, presence of only zero experience monsters (like plants) will
        cause autopickups, even if safe_autopickup=true is set. This option 
        also settles whether autoprayer considers such monsters risky.

Replacement in crawl-ref/docs/crawl_options.txt at line 317 [57.63392]

∅:D[22.9629] → [61.4104:4312]

B:BD[61.4104] → [61.4104:4312]

        which can make life much easier for hunter types. If you use this, be
        aware that autopickup uses a turn - use Ctrl-A to turn it off while
        you're fighting, or use safe_autopickup=true.

[22.9629]

[24.11230]

        which can make life much easier for hunter types. Be aware that
        autopickup uses a turn, though it won't trigger if you can see
        monsters.

Deletion in crawl-ref/docs/crawl_options.txt at line 393 [57.63392]

∅:D[23.2485] → [24.16013:16041]

∅:D[22.11410] → [24.16013:16041]

B:BD[24.16013] → [24.16013:16041]

B:BD[24.16041] → [22.11411:11635]


confirm_self_target = true
        Setting this to true will make Crawl ask for confirmation whenever
        selecting the character as the target of a non-friendly-targeted spell 
        (i.e., something other than haste, healing or invisibility.)

Deletion in crawl-ref/docs/crawl_options.txt at line 717 [57.63392]
B:BD[24.26037] → [24.26037:26066]
B:BD[24.26066] → [22.17655:17811]
∅:D[22.17811] → [58.3710:3773]
B:BD[58.3710] → [58.3710:3773]
∅:D[58.3773] → [24.26168:26169]
B:BD[24.26168] → [24.26168:26169]
```
lowercase_invocations = true
        Set this option to true if you prefer to have invocations on 'a'-'e' 
        instead of the older 'A'-'E'. Note that you can change the letters of
        invocations (and other abilites) with the '=' command.
```

Deletion in crawl-ref/docs/crawl_options.txt at line 897 [57.63392]

∅:D[22.20127] → [62.3969:3970]

B:BD[62.3969] → [62.3969:3970]

B:BD[62.3970] → [58.3975:3993]

B:BD[58.3993] → [22.20128:20366]


terse_hand = true
        Set this to false to have the "in hand" description on the main screen 
        the same as the inventory. The default setting of true will give the 
        newer more terse description that should fit the limited space better.

Deletion in crawl-ref/docs/crawl_options.txt at line 903 [57.63392]
B:BD[24.29582] → [24.29582:29602]
B:BD[24.29602] → [22.20367:20471]
∅:D[22.20471] → [24.29692:29693]
B:BD[24.29692] → [24.29692:29693]
```
always_greet = true
        always_greet will give the race/class and god messages everytime the 
        game is started. 
```

Deletion in crawl-ref/docs/crawl_options.txt at line 981 [57.63392]

∅:D[3.350] → [24.30585:30693]

∅:D[63.2713] → [24.30585:30693]

∅:D[64.4408] → [24.30585:30693]

B:BD[24.30585] → [24.30585:30693]

B:BD[24.30693] → [65.291:438]

∅:D[65.438] → [24.30832:30929]

B:BD[24.30832] → [24.30832:30929]


increasing_skill_progress = true
        This affects the appearance of the skills screen ('m'). With the 
        default true, the progress for getting new levels is shown with
        increasing percentiles, so that immediately after level up it will
        read (0%). With false, you get the old behaviour which counts backwards
        from 10.

Replacement in crawl-ref/docs/crawl_options.txt at line 1199 [57.63392]
B:BD[24.37904] → [24.37904:37922]
B:BD[24.37922] → [22.24819:24892]
```
use_notes = true
        Set to true to get note-taking. The following events are logged:
```
[24.37904]
[22.24892]
```
The following events are logged:
```
Replacement in crawl-ref/docs/crawl_options.txt at line 1214 [57.63392]
∅:D[18.6697] → [22.25476:25539]
B:BD[22.25476] → [22.25476:25539]
```
        You can use the command ':' for manually adding notes.
```
[18.6697]
[7.12691]
```
You can use the command ':' for manually adding notes.
```

Removed: safe_autopickup, safe_zero_exp, lowercase_invocations,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/skills2.cc at line 1881 [12.647133]

Replacement in crawl-ref/source/player.cc at line 3211 [12.962854]

Deletion in crawl-ref/source/player.cc at line 3248 [12.962854]

Insertion in crawl-ref/source/player.cc at line 3263 [12.962854]

Replacement in crawl-ref/source/output.cc at line 322 [12.1088282]

Replacement in crawl-ref/source/output.cc at line 324 [12.1088282]

Replacement in crawl-ref/source/output.cc at line 332 [12.1088282]

Replacement in crawl-ref/source/monplace.cc at line 1447 [12.1641732]

Replacement in crawl-ref/source/misc.cc at line 1547 [12.1933596]

Replacement in crawl-ref/source/items.cc at line 2957 [12.2584728]

Replacement in crawl-ref/source/items.cc at line 2963 [12.2584728]

Deletion in crawl-ref/source/initfile.cc at line 603 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 611 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 612 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 614 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 621 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 679 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 698 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1813 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1968 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1973 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2047 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2063 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2087 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 2535 [12.2957258]

Deletion in crawl-ref/source/externs.h at line 1513 [12.3270163]

Deletion in crawl-ref/source/externs.h at line 1517 [12.3270163]

Deletion in crawl-ref/source/externs.h at line 1518 [12.3270163]

Deletion in crawl-ref/source/externs.h at line 1522 [12.3270163]

Deletion in crawl-ref/source/externs.h at line 1540 [12.3270163]

Deletion in crawl-ref/source/externs.h at line 1552 [12.3270163]

Deletion in crawl-ref/source/externs.h at line 1642 [12.3270163]

Replacement in crawl-ref/source/direct.cc at line 335 [12.3697945]

Replacement in crawl-ref/source/direct.cc at line 825 [12.3697945]

Replacement in crawl-ref/source/delay.cc at line 1173 [12.3963459]

Deletion in crawl-ref/source/clua.cc at line 2081 [28.483969]

Deletion in crawl-ref/source/clua.cc at line 2086 [28.483969]

Deletion in crawl-ref/source/clua.cc at line 2087 [28.483969]

Deletion in crawl-ref/source/clua.cc at line 2089 [28.483969]

Deletion in crawl-ref/source/clua.cc at line 2092 [28.483969]

Deletion in crawl-ref/source/clua.cc at line 2097 [28.483969]

Replacement in crawl-ref/source/chardump.cc at line 559 [12.4100336]

Insertion in crawl-ref/source/acr.cc at line 180 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 202 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 218 [12.4397395]

Deletion in crawl-ref/source/acr.cc at line 231 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 232 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 237 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 241 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 244 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 246 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 250 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 252 [12.4397395]

Deletion in crawl-ref/source/acr.cc at line 257 [12.4397395]

Deletion in crawl-ref/source/acr.cc at line 258 [12.4397395]

Deletion in crawl-ref/source/acr.cc at line 260 [12.4397395]

Insertion in crawl-ref/source/acr.cc at line 266 [12.4397395]

Insertion in crawl-ref/source/acr.cc at line 367 [12.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 2221 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2240 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 2250 [12.4494389]

Deletion in crawl-ref/init.txt at line 70 [12.4830895]

Deletion in crawl-ref/init.txt at line 71 [12.4830895]

Deletion in crawl-ref/init.txt at line 87 [12.4830895]

Deletion in crawl-ref/init.txt at line 151 [12.4830895]

Deletion in crawl-ref/init.txt at line 168 [12.4830895]

Deletion in crawl-ref/init.txt at line 169 [12.4830895]

Deletion in crawl-ref/init.txt at line 240 [12.4830895]