fiddlerwoaroof/crawl - Change UKYGZDI6PYZPXDACCQGVPHANUP5ADCSNROOZIE7LYIZQWSNFHJZAC

[FR 1816805] Implementing a new species/classes order on the character

         selection screen

This involved the following:

tentative clean-up of newgame.cc (an utter nightmare!)
throw out JOB_QUITTER and SP_UNKx_DRACONIAN as (as far as I can tell) they serve absolutely no purpose (Should they be necessary for scoring etc. it's probably better to put these at the end rather than the middle of the lists.)
breaks saves

I'm quite happy with the new species order, but the order of jobs could be improved. Luckily, changing that is totally easy now. :) See newgame.cc for old vs. new orders.

(And yes, there is an option to keep the old way.)

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

Created by j-p-e-g on March 2, 2008

UKYGZDI6PYZPXDACCQGVPHANUP5ADCSNROOZIE7LYIZQWSNFHJZAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/skills2.cc at line 1161 [11.647133]

∅:D[10.3991] → [11.704442:704451]

B:BD[11.704442] → [11.704442:704451]

B:BD[11.704451] → [2.156:214]

∅:D[2.214] → [11.704509:704607]

B:BD[11.704509] → [11.704509:704607]

B:BD[11.704607] → [7.1425:1475]

∅:D[7.1475] → [11.704657:705070]

B:BD[11.704657] → [11.704657:705070]

B:BD[11.705070] → [12.1708:1755]

∅:D[12.1755] → [11.705117:705675]

∅:D[13.161203] → [11.705117:705675]

B:BD[11.705117] → [11.705117:705675]

B:BD[11.705675] → [10.3992:4043]

∅:D[10.4043] → [11.705726:706328]

B:BD[11.705726] → [11.705726:706328]

B:BD[11.706328] → [10.4044:4143]

     },
    {                           // SP_UNK0_DRACONIAN (27)
     90,                        // SK_FIGHTING
     100,                       // SK_SHORT_BLADES
     100,                       // SK_LONG_BLADES
     100,                       // SK_UNUSED_1
     100,                       // SK_AXES
     100,                       // SK_MACES_FLAILS
     100,                       // SK_POLEARMS
     100,                       // SK_STAVES
     120,                       // SK_SLINGS
     120,                       // SK_BOWS
     120,                       // SK_CROSSBOWS
     120,                       // SK_DARTS
     120,                       // SK_THROWING
     200,                       // SK_ARMOUR
     120,                       // SK_DODGING
     120,                       // SK_STEALTH
     100,                       // SK_STABBING
     100,                       // SK_SHIELDS
     100,                       // SK_TRAPS_DOORS
     100,                       // SK_UNARMED_COMBAT
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     (100 * 130) / 100,         // SK_SPELLCASTING
     100,                       // SK_CONJURATIONS
     120,                       // SK_ENCHANTMENTS
     100,                       // SK_SUMMONINGS
     100,                       // SK_NECROMANCY
     100,                       // SK_TRANSLOCATIONS
     100,                       // SK_TRANSMIGRATION
     100,                       // SK_DIVINATIONS
     100,                       // SK_FIRE_MAGIC
     100,                       // SK_ICE_MAGIC
     100,                       // SK_AIR_MAGIC
     100,                       // SK_EARTH_MAGIC
     100,                       // SK_POISON_MAGIC
     (100 * 75) / 100,          // SK_INVOCATIONS
     (100 * 75) / 100,          // SK_EVOCATIONS

Deletion in crawl-ref/source/skills2.cc at line 1163 [11.647133]

B:BD[11.706436] → [11.706436:706592]

B:BD[11.706592] → [7.1476:1526]

∅:D[7.1526] → [11.706642:707055]

B:BD[11.706642] → [11.706642:707055]

B:BD[11.707055] → [12.1756:1803]

∅:D[12.1803] → [11.707102:707660]

∅:D[13.161256] → [11.707102:707660]

B:BD[11.707102] → [11.707102:707660]

B:BD[11.707660] → [10.4144:4195]

∅:D[10.4195] → [11.707711:708313]

B:BD[11.707711] → [11.707711:708313]

B:BD[11.708313] → [10.4196:4295]

∅:D[10.4295] → [11.708412:708421]

B:BD[11.708412] → [11.708412:708421]

    {                           // SP_UNK1_DRACONIAN (28)
     90,                        // SK_FIGHTING
     100,                       // SK_SHORT_BLADES
     100,                       // SK_LONG_BLADES
     100,                       // SK_UNUSED_1
     100,                       // SK_AXES
     100,                       // SK_MACES_FLAILS
     100,                       // SK_POLEARMS
     100,                       // SK_STAVES
     120,                       // SK_SLINGS
     120,                       // SK_BOWS
     120,                       // SK_CROSSBOWS
     120,                       // SK_DARTS
     120,                       // SK_THROWING
     200,                       // SK_ARMOUR
     120,                       // SK_DODGING
     120,                       // SK_STEALTH
     100,                       // SK_STABBING
     100,                       // SK_SHIELDS
     100,                       // SK_TRAPS_DOORS
     100,                       // SK_UNARMED_COMBAT
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     100,                       // undefined
     (100 * 130) / 100,         // SK_SPELLCASTING
     100,                       // SK_CONJURATIONS
     120,                       // SK_ENCHANTMENTS
     100,                       // SK_SUMMONINGS
     100,                       // SK_NECROMANCY
     100,                       // SK_TRANSLOCATIONS
     100,                       // SK_TRANSMIGRATION
     100,                       // SK_DIVINATIONS
     100,                       // SK_FIRE_MAGIC
     100,                       // SK_ICE_MAGIC
     100,                       // SK_AIR_MAGIC
     100,                       // SK_EARTH_MAGIC
     100,                       // SK_POISON_MAGIC
     (100 * 75) / 100,          // SK_INVOCATIONS
     (100 * 75) / 100,          // SK_EVOCATIONS
     },

Deletion in crawl-ref/source/player.cc at line 401 [11.962854]
B:BD[11.966430] → [11.966430:966486]
```
    case SP_UNK0_DRACONIAN:
    case SP_UNK1_DRACONIAN:
```
Deletion in crawl-ref/source/player.cc at line 2985 [11.962854]
B:BD[11.1016738] → [11.1016738:1016810]
```
            case SP_UNK0_DRACONIAN:
            case SP_UNK1_DRACONIAN:
```

Deletion in crawl-ref/source/player.cc at line 3023 [11.962854]

B:BD[11.1018561] → [11.1018561:1018649]

                    case SP_UNK0_DRACONIAN:
                    case SP_UNK1_DRACONIAN:

Deletion in crawl-ref/source/player.cc at line 3810 [11.962854]
∅:D[14.1762] → [11.1038948:1039028]
B:BD[11.1038948] → [11.1038948:1039028]
```
                case SP_UNK0_DRACONIAN:
                case SP_UNK1_DRACONIAN:
```

Replacement in crawl-ref/source/player.cc at line 4578 [11.962854]

∅:D[15.230] → [11.1056028:1056162]

∅:D[16.276] → [11.1056028:1056162]

∅:D[17.904] → [11.1056028:1056162]

∅:D[18.1305] → [11.1056028:1056162]

B:BD[11.1056028] → [11.1056028:1056162]

B:BD[11.1056162] → [19.7139:7213]

      "HO", "Ko", "Mu", "Na", "Gn", "Og", "Tr", "OM", "Dr", "Dr", 
      "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", 
      "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp", "HD", "El" };

[17.904]

[11.1056218]

      "HO", "Ko", "Mu", "Na", "Gn", "Og", "Tr", "OM",
      // the draconians
      "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr",
      "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp",
      // placeholders
      "HD", "El" };

Replacement in crawl-ref/source/player.cc at line 4639 [11.962854]
B:BD[11.1057514] → [11.1057514:1057576]
```
      "CK", "Tm", "He", "XX", "Re", "St", "Mo", "Wr", "Wn" };
```
[11.1057514]
[11.1057576]
```
      "CK", "Tm", "He", "Re", "St", "Mo", "Wr", "Wn" };
```

Replacement in crawl-ref/source/player.cc at line 4646 [11.962854]

B:BD[11.1057928] → [11.1057928:1058006]

      "Chaos Knight", "Transmuter", "Healer", "Quitter", "Reaver", "Stalker",

[11.1057928]

[11.1058006]

      "Chaos Knight", "Transmuter", "Healer", "Reaver", "Stalker",

Deletion in crawl-ref/source/player.cc at line 4655 [11.962854]
B:BD[11.1058152] → [11.1058152:1058205]
```
        if (i == JOB_QUITTER)
            continue;
```
Replacement in crawl-ref/source/player.cc at line 4667 [11.962854]
B:BD[11.1058486] → [11.1058486:1058550]
```
    ASSERT( which_job < NUM_JOBS && which_job != JOB_QUITTER );
```
[11.1058486]
[11.1058550]
```
    ASSERT( which_job < NUM_JOBS );
```
Deletion in crawl-ref/source/player.cc at line 4686 [11.962854]
B:BD[11.1058878] → [11.1058878:1058931]
```
        if (i == JOB_QUITTER)
            continue;
```
Replacement in crawl-ref/source/player.cc at line 4703 [11.962854]
B:BD[11.1059325] → [11.1059325:1059389]
```
    ASSERT( which_job < NUM_JOBS && which_job != JOB_QUITTER );
```
[11.1059325]
[11.1059389]
```
    ASSERT( which_job < NUM_JOBS );
```
Deletion in crawl-ref/source/newgame.cc at line 125 [11.1132300]
∅:D[20.913] → [21.1326:1418]
B:BD[11.1136460] → [21.1326:1418]
```
static species_type letter_to_species(int keyn);
static job_type letter_to_class(int keyn);
```

Insertion in crawl-ref/source/newgame.cc at line 136 [11.1132300]

[13.381659]

[22.214741]


/* March 2008: change order of species and jobs on character selection screen
   as suggested by Markus Maier. Summarizing comments below are copied directly
   from Markus' SourceForge comments. */
// listed in two columns to match the selection screen output
// Take care to list all valid species here, or they cannot be directly chosen.
// The red draconian is later replaced by a random variant.
// The old and new lists are expected to have the same length.
static species_type old_species_order[] = {
    SP_HUMAN,       SP_HIGH_ELF,
    SP_GREY_ELF,    SP_DEEP_ELF,
    SP_SLUDGE_ELF,  SP_MOUNTAIN_DWARF,
    SP_HALFLING,    SP_HILL_ORC,
    SP_KOBOLD,      SP_MUMMY,
    SP_NAGA,        SP_GNOME,
    SP_OGRE,        SP_TROLL,
    SP_OGRE_MAGE,   SP_RED_DRACONIAN,
    SP_CENTAUR,     SP_DEMIGOD,
    SP_SPRIGGAN,    SP_MINOTAUR,
    SP_DEMONSPAWN,  SP_GHOUL,
    SP_KENKU,       SP_MERFOLK,
    SP_VAMPIRE
};

Insertion in crawl-ref/source/newgame.cc at line 161 [11.1132300]

[22.214742]

[23.7761]

// Fantasy staples and humanoid creatures come first, then dimunitive and
// stealthy creatures, then monstrous creatures, then planetouched and after
// all living creatures finally the undead. (MM)
static species_type new_species_order[] = {
    // comparatively human-like looks
    SP_HUMAN,       SP_HIGH_ELF,
    SP_GREY_ELF,    SP_DEEP_ELF,
    SP_SLUDGE_ELF,  SP_MOUNTAIN_DWARF,
    SP_HILL_ORC,    SP_MERFOLK,
    // small species
    SP_HALFLING,    SP_GNOME,
    SP_KOBOLD,      SP_SPRIGGAN,
    // significantly different body type than human
    SP_NAGA,        SP_CENTAUR,
    SP_OGRE,        SP_OGRE_MAGE,
    SP_TROLL,       SP_MINOTAUR,
    SP_KENKU,       SP_RED_DRACONIAN,
    // celestial species
    SP_DEMIGOD,     SP_DEMONSPAWN,
    // undead species
    SP_MUMMY,       SP_GHOUL,
    SP_VAMPIRE
};

Insertion in crawl-ref/source/newgame.cc at line 186 [11.1132300]

[23.7808]

{
    const int num_drac = SP_PALE_DRACONIAN - SP_RED_DRACONIAN;
    return static_cast<species_type>(SP_RED_DRACONIAN + random2(num_drac));
}
static species_type get_species(const int index)

Replacement in crawl-ref/source/newgame.cc at line 193 [11.1132300]

B:BD[23.7810] → [23.7810:7879]

    return static_cast<species_type>(SP_RED_DRACONIAN + random2(9));

[23.7810]

[23.7879]

    if (index < 0 || (unsigned int) index >= ARRAYSIZE(old_species_order))
    {
        return (SP_UNKNOWN);
    }
    return (Options.use_old_selection_order ? old_species_order[index]
                                            : new_species_order[index]);
}
// listed in two columns to match the selection screen output
// Take care to list all valid classes here, or they cannot be directly chosen.
// The old and new lists are expected to have the same length.
static job_type old_jobs_order[] = {
    JOB_FIGHTER,            JOB_WIZARD,
    JOB_PRIEST,             JOB_THIEF,
    JOB_GLADIATOR,          JOB_NECROMANCER,
    JOB_PALADIN,            JOB_ASSASSIN,
    JOB_BERSERKER,          JOB_HUNTER,
    JOB_CONJURER,           JOB_ENCHANTER,
    JOB_FIRE_ELEMENTALIST,  JOB_ICE_ELEMENTALIST,
    JOB_SUMMONER,           JOB_AIR_ELEMENTALIST,
    JOB_EARTH_ELEMENTALIST, JOB_CRUSADER,
    JOB_DEATH_KNIGHT,       JOB_VENOM_MAGE,
    JOB_CHAOS_KNIGHT,       JOB_TRANSMUTER,
    JOB_HEALER,             JOB_REAVER,
    JOB_STALKER,            JOB_MONK,
    JOB_WARPER,             JOB_WANDERER
};
// First plain fighters, then religious fighters, then spell-casting
// fighters, then primary spell-casters, then stabbers and shooters. (MM)
static job_type new_jobs_order[] = {
    // fighters
    JOB_FIGHTER,            JOB_GLADIATOR,
    JOB_MONK,               JOB_BERSERKER,
    // religious professions (incl. Berserker above)
    JOB_PALADIN,            JOB_PRIEST,
    JOB_CHAOS_KNIGHT,       JOB_DEATH_KNIGHT,
    JOB_HEALER,             JOB_CRUSADER,
    // general and niche spellcasters (incl. Crusader above)
    JOB_REAVER,             JOB_WIZARD,
    JOB_CONJURER,           JOB_ENCHANTER,
    JOB_SUMMONER,           JOB_NECROMANCER,
    JOB_WARPER,             JOB_TRANSMUTER,
    JOB_FIRE_ELEMENTALIST,  JOB_ICE_ELEMENTALIST,
    JOB_AIR_ELEMENTALIST,   JOB_EARTH_ELEMENTALIST,
    // poison specialists and stabbers
    JOB_VENOM_MAGE,         JOB_STALKER,
    JOB_THIEF,              JOB_ASSASSIN,
    JOB_HUNTER,             JOB_WANDERER
};
static job_type get_class(const int index)
{
    if (index < 0 || (unsigned int) index >= ARRAYSIZE(old_jobs_order))
    {
       return JOB_UNKNOWN;
    }
    return (Options.use_old_selection_order? old_jobs_order[index]
                                           : new_jobs_order[index]);

Replacement in crawl-ref/source/newgame.cc at line 258 [11.1132300]
B:BD[22.214784] → [22.214784:214810]
```
    ng_race = ng_cls = 0;
```
[22.214784]
[22.214810]
```
    ng_race   = ng_cls = 0;
```

Replacement in crawl-ref/source/newgame.cc at line 260 [11.1132300]

B:BD[22.214833] → [22.214833:214910]

    ng_ck = GOD_NO_GOD;
    ng_dk = DK_NO_SELECTION;
    ng_pr = GOD_NO_GOD;

[22.214833]

[22.214910]

    ng_ck     = GOD_NO_GOD;
    ng_dk     = DK_NO_SELECTION;
    ng_pr     = GOD_NO_GOD;

Replacement in crawl-ref/source/newgame.cc at line 264 [11.1132300]
B:BD[22.214939] → [13.381660:381692]
```
    ng_book = SBT_NO_SELECTION;
```
[22.214939]
[22.214939]
```
    ng_book   = SBT_NO_SELECTION;
```
Replacement in crawl-ref/source/newgame.cc at line 287 [11.1132300]
B:BD[24.300] → [24.300:348]
```
    Options.weapon       = Options.prev_weapon;
```
[24.300]
[22.215570]
```
    Options.chaos_knight = Options.prev_ck;
```
Deletion in crawl-ref/source/newgame.cc at line 289 [11.1132300]
B:BD[22.215614] → [22.215614:215658]
```
    Options.chaos_knight = Options.prev_ck;
```
Insertion in crawl-ref/source/newgame.cc at line 290 [11.1132300]
[22.215702]
[24.349]
```
    Options.weapon       = Options.prev_weapon;
```
Replacement in crawl-ref/source/newgame.cc at line 298 [11.1132300]
B:BD[22.215871] → [22.215871:215921]
```
    return Options.prev_race && Options.prev_cls;
```
[22.215871]
[22.215921]
```
    return (Options.prev_race && Options.prev_cls);
```

Replacement in crawl-ref/source/newgame.cc at line 303 [11.1132300]

B:BD[22.215974] → [14.4388:4505]

    species_type prace = letter_to_species(race);
    return prace != SP_UNKNOWN? species_name(prace, 1) : "Random";

[22.215974]

[22.216068]

    species_type prace = get_species(letter_to_index(race));
    return (prace == SP_UNKNOWN? "Random" : species_name(prace, 1));

Replacement in crawl-ref/source/newgame.cc at line 309 [11.1132300]

B:BD[22.216124] → [21.1419:1459]

∅:D[21.1459] → [22.216165:216230]

B:BD[22.216165] → [22.216165:216230]

    int pcls = letter_to_class(oclass);
    return pcls != JOB_UNKNOWN? get_class_name(pcls) : "Random";

[22.216124]

[22.216230]

    job_type pclass = get_class(letter_to_index(oclass));
    return (pclass == JOB_UNKNOWN? "Random" : get_class_name(pclass));

Insertion in crawl-ref/source/newgame.cc at line 323 [11.1132300]
[22.216550]
[22.216550]
```
        
```

Replacement in crawl-ref/source/newgame.cc at line 362 [11.1132300]

B:BD[25.475] → [25.475:888]

    return (species
            && species != NUM_SPECIES
            && species != SP_UNKNOWN
            && !((display?
                  (species > SP_RED_DRACONIAN
                   && species <= SP_BASE_DRACONIAN)
                  : (species >= SP_UNK0_DRACONIAN
                     && species <= SP_BASE_DRACONIAN))
                 || species == SP_ELF
                 || species == SP_HILL_DWARF));
}

[25.475]

[25.888]

    if (!species) // species only start at 1
        return (false);
    if (species >= SP_ELF) // these are all invalid
        return (false);
    // no problem with these
    if (species <= SP_RED_DRACONIAN || species > SP_BASE_DRACONIAN) 
        return (true);

Replacement in crawl-ref/source/newgame.cc at line 372 [11.1132300]

B:BD[25.889] → [25.889:1092]

static species_type random_species()
{
    species_type sp = SP_UNKNOWN;
    do
        sp = static_cast<species_type>( random2(NUM_SPECIES) );
    while (!is_species_valid_choice(sp));
    return (sp);

[25.889]

[11.1137652]

    // draconians other than red return false if display == true
    return (!display);

Replacement in crawl-ref/source/newgame.cc at line 485 [11.1132300]

B:BD[13.382761] → [13.382761:382857]

            || desc == PDESCS(PDC_CLEAR)
            || desc == PDESCQ(PDQ_GLUGGY, PDC_WHITE));

[13.382761]

[13.382857]

             || desc == PDESCS(PDC_CLEAR)
             || desc == PDESCQ(PDQ_GLUGGY, PDC_WHITE));

Replacement in crawl-ref/source/newgame.cc at line 495 [11.1132300]

B:BD[26.24359] → [26.24359:24614]

B:BD[26.24614] → [5.193:259]

    branches[BRANCH_ORCISH_MINES].startdepth = random_range(6, 11);
    branches[BRANCH_ELVEN_HALLS].startdepth = random_range(3, 4);
    branches[BRANCH_LAIR].startdepth = random_range(8, 13);
    branches[BRANCH_HIVE].startdepth = random_range(11, 16);
    branches[BRANCH_SLIME_PITS].startdepth = random_range(8, 10);

[26.24359]

[27.681]

    branches[BRANCH_ORCISH_MINES].startdepth      = random_range(6, 11);
    branches[BRANCH_ELVEN_HALLS].startdepth       = random_range(3, 4);
    branches[BRANCH_LAIR].startdepth              = random_range(8, 13);
    branches[BRANCH_HIVE].startdepth              = random_range(11, 16);
    branches[BRANCH_SLIME_PITS].startdepth        = random_range(8, 10);

Replacement in crawl-ref/source/newgame.cc at line 502 [11.1132300]

B:BD[27.709] → [27.709:773]

        branches[BRANCH_SWAMP].startdepth = random_range(2, 7);

[27.709]

[28.487]

        branches[BRANCH_SWAMP].startdepth  = random_range(2, 7);

Replacement in crawl-ref/source/newgame.cc at line 507 [11.1132300]

B:BD[27.844] → [27.844:892]

        branches[BRANCH_SWAMP].startdepth = -1;

[27.844]

[28.537]

        branches[BRANCH_SWAMP].startdepth  = -1;

Replacement in crawl-ref/source/newgame.cc at line 510 [11.1132300]

∅:D[27.964] → [26.24739:24926]

B:BD[26.24739] → [26.24739:24926]

    branches[BRANCH_SNAKE_PIT].startdepth = random_range(3, 8);
    branches[BRANCH_VAULTS].startdepth = random_range(14, 19);
    branches[BRANCH_CRYPT].startdepth = random_range(2, 4);

[27.964]

[26.24926]

    branches[BRANCH_SNAKE_PIT].startdepth      = random_range(3, 8);
    branches[BRANCH_VAULTS].startdepth         = random_range(14, 19);
    branches[BRANCH_CRYPT].startdepth          = random_range(2, 4);

Replacement in crawl-ref/source/newgame.cc at line 514 [11.1132300]

B:BD[26.24995] → [26.24995:25054]

    branches[BRANCH_TOMB].startdepth = random_range(2, 3);

[26.24995]

[13.382891]

    branches[BRANCH_TOMB].startdepth           = random_range(2, 3);

Insertion in crawl-ref/source/newgame.cc at line 622 [11.1132300]
[29.3445]
[29.3445]
```
        {
```
Insertion in crawl-ref/source/newgame.cc at line 624 [11.1132300]
[29.3491]
[29.3491]
```
        }
```

Replacement in crawl-ref/source/newgame.cc at line 887 [11.1132300]

B:BD[4.240] → [4.240:364]

            && !class_allowed(letter_to_species(Options.race),
                              letter_to_class(Options.cls)))

[4.240]

[4.364]

            && !class_allowed(get_species(letter_to_index(Options.race)),
                              get_class(letter_to_index(Options.cls))))

Replacement in crawl-ref/source/newgame.cc at line 943 [11.1132300]
B:BD[29.9603] → [29.9603:9630]
```
    you.normal_vision = 8;
```
[29.9603]
[29.9630]
```
    you.normal_vision  = 8;
```
Deletion in crawl-ref/source/newgame.cc at line 1633 [11.1132300]
B:BD[11.1167911] → [11.1167911:1167986]
```
    case JOB_QUITTER:   // shouldn't happen since 'x' is handled specially
```
Insertion in crawl-ref/source/newgame.cc at line 1676 [11.1132300]
[20.1884]
[30.74743]
```
                    
```

Replacement in crawl-ref/source/newgame.cc at line 1842 [11.1132300]

B:BD[11.1170349] → [22.218395:218485]

B:BD[22.218485] → [31.1485:1515]

∅:D[31.1515] → [22.218515:218559]

B:BD[22.218515] → [22.218515:218559]

B:BD[22.218559] → [20.2562:2571]

    ng_weapon = (Options.random_pick || 
                Options.weapon == WPN_RANDOM || 
                keyin == '*')
        ? WPN_RANDOM : you.inv[0].sub_type;

[11.1170349]

[20.2571]

    ng_weapon = (Options.random_pick || Options.weapon == WPN_RANDOM
                 || keyin == '*') ? WPN_RANDOM
                                  : you.inv[0].sub_type;

Deletion in crawl-ref/source/newgame.cc at line 1938 [11.1132300]
B:BD[11.1177327] → [11.1177327:1177383]
```
    case SP_UNK0_DRACONIAN:
    case SP_UNK1_DRACONIAN:
```

Replacement in crawl-ref/source/newgame.cc at line 2251 [11.1132300]

B:BD[13.387706] → [13.387706:387818]

    if (!name[1] && (*name == '.' ||
                      *name == '*' ||
                      *name == '?'))

[13.387706]

[13.387818]

    if (!name[1] && (*name == '.' || *name == '*' || *name == '?'))

Replacement in crawl-ref/source/newgame.cc at line 2360 [11.1132300]

B:BD[32.3227] → [32.3227:3459]

∅:D[32.3459] → [33.41184:41198]

B:BD[33.41184] → [33.41184:41198]

∅:D[33.41198] → [11.1185474:1185475]

∅:D[13.390313] → [11.1185474:1185475]

B:BD[11.1185474] → [11.1185474:1185475]

B:BD[11.1185475] → [13.390314:390465]

B:BD[13.390465] → [3.1417:1482]

                 "  If you've never been here before, you might want to try "
                 "out" EOL "  the Dungeon Crawl tutorial. To do this, press "
                 "<white>T</white> on the next" EOL "  screen.").display();
        }    
        MenuEntry *title = new MenuEntry("Or choose an existing character:");
        title->colour = LIGHTCYAN;
        char_menu.set_title( title );
        for (unsigned int i = 0; i < existing_chars.size(); ++i)

[32.3227]

[22.219545]

                "  If you've never been here before, you might want to try out" EOL
                "  the Dungeon Crawl tutorial. To do this, press "
                "<white>T</white> on the next" EOL
                "  screen.").display();
        }
        else

Replacement in crawl-ref/source/newgame.cc at line 2367 [11.1132300]

B:BD[22.219555] → [13.390535:390604]

B:BD[13.390604] → [32.3460:3533]

∅:D[32.3533] → [13.390665:390730]

B:BD[13.390665] → [13.390665:390730]

            std::string desc = " " + existing_chars[i].short_desc();
            if (static_cast<int>(desc.length()) >= get_number_of_cols())
                desc = desc.substr(0, get_number_of_cols() - 1);

[22.219555]

[11.1185615]

             MenuEntry *title = new MenuEntry("Or choose an existing character:");
             title->colour = LIGHTCYAN;
             char_menu.set_title( title );
             for (unsigned int i = 0; i < existing_chars.size(); ++i)
             {
                 std::string desc = " " + existing_chars[i].short_desc();
                 if (static_cast<int>(desc.length()) >= get_number_of_cols())
                     desc = desc.substr(0, get_number_of_cols() - 1);

Replacement in crawl-ref/source/newgame.cc at line 2376 [11.1132300]

B:BD[11.1185616] → [13.390731:390860]

            MenuEntry *me = new MenuEntry(desc);
            me->data = &existing_chars[i];
            char_menu.add_entry(me);

[11.1185616]

[11.1185706]

                 MenuEntry *me = new MenuEntry(desc);
                 me->data = &existing_chars[i];
                 char_menu.add_entry(me);
             }
             char_menu.set_flags(MF_NOWRAP | MF_SINGLESELECT);

Deletion in crawl-ref/source/newgame.cc at line 2382 [11.1132300]
B:BD[11.1185716] → [34.1902:1960]
```
        char_menu.set_flags(MF_NOWRAP | MF_SINGLESELECT);
```
Insertion in crawl-ref/source/newgame.cc at line 2625 [11.1132300]
[35.834]
[35.834]
```
    {
```
Insertion in crawl-ref/source/newgame.cc at line 2628 [11.1132300]
[35.899]
[35.899]
```
    }
```

Deletion in crawl-ref/source/newgame.cc at line 2842 [11.1132300]

∅:D[36.1105] → [11.1205922:1205925]

B:BD[11.1205922] → [11.1205922:1205925]

B:BD[11.1205925] → [21.3577:3619]

∅:D[21.3619] → [22.219653:219655]

B:BD[22.219653] → [22.219653:219655]

B:BD[22.219655] → [37.1624:2667]

∅:D[37.2667] → [22.221221:221245]

B:BD[22.221221] → [22.221221:221245]

}
static job_type letter_to_class(int keyn)
{
    switch ( keyn )
    {
    case 'a': return JOB_FIGHTER;
    case 'b': return JOB_WIZARD;
    case 'c': return JOB_PRIEST;
    case 'd': return JOB_THIEF;
    case 'e': return JOB_GLADIATOR;
    case 'f': return JOB_NECROMANCER;
    case 'g': return JOB_PALADIN;
    case 'h': return JOB_ASSASSIN;
    case 'i': return JOB_BERSERKER;
    case 'j': return JOB_HUNTER;
    case 'k': return JOB_CONJURER;
    case 'l': return JOB_ENCHANTER;
    case 'm': return JOB_FIRE_ELEMENTALIST;
    case 'n': return JOB_ICE_ELEMENTALIST;
    case 'o': return JOB_SUMMONER;
    case 'p': return JOB_AIR_ELEMENTALIST;
    case 'q': return JOB_EARTH_ELEMENTALIST;
    case 'r': return JOB_CRUSADER;
    case 's': return JOB_DEATH_KNIGHT;
    case 't': return JOB_VENOM_MAGE;
    case 'u': return JOB_CHAOS_KNIGHT;
    case 'v': return JOB_TRANSMUTER;
    case 'w': return JOB_HEALER;
    case 'y': return JOB_REAVER;
    case 'z': return JOB_STALKER;
    case 'A': return JOB_MONK;
    case 'B': return JOB_WARPER;
    case 'C': return JOB_WANDERER;
    }
    return JOB_UNKNOWN;

Deletion in crawl-ref/source/newgame.cc at line 2844 [11.1132300]

B:BD[22.221248] → [21.3620:3668]

∅:D[21.3668] → [22.221288:221290]

B:BD[22.221288] → [22.221288:221290]

B:BD[22.221290] → [25.1163:1209]

B:BD[25.1209] → [38.189:209]

∅:D[38.209] → [25.1228:1262]

B:BD[25.1228] → [25.1228:1262]

∅:D[25.1262] → [15.354:516]

B:BD[15.354] → [15.354:516]

B:BD[15.516] → [23.7934:7975]

∅:D[23.7975] → [15.560:689]

B:BD[15.560] → [15.560:689]

B:BD[15.689] → [25.1263:1339]

∅:D[15.731] → [22.222487:222532]

∅:D[25.1339] → [22.222487:222532]

B:BD[22.222487] → [22.222487:222532]

B:BD[22.222532] → [13.392179:392241]

∅:D[13.392241] → [22.222594:222627]

B:BD[22.222594] → [22.222594:222627]

B:BD[22.222627] → [13.392242:392335]

B:BD[13.392335] → [25.1340:1459]

∅:D[25.1459] → [22.222747:222750]

B:BD[22.222747] → [22.222747:222750]

static species_type letter_to_species(int keyn)
{
    const int offset = letter_to_index(keyn);
    if (offset < 0)
        return (SP_UNKNOWN);
    
    int rc;
    if ( offset + SP_HUMAN < SP_RED_DRACONIAN )
        rc = offset + SP_HUMAN;
    else if ( offset + SP_HUMAN == SP_RED_DRACONIAN ) // random draco
        rc = random_draconian_species();
    else                        // skip over draconian species
        rc = offset + (SP_BASE_DRACONIAN - SP_RED_DRACONIAN) + 1;
    return (rc >= NUM_SPECIES? SP_UNKNOWN : static_cast<species_type>(rc));
}
static char species_to_letter(int spec)
{
    if (spec > SP_RED_DRACONIAN && spec <= SP_BASE_DRACONIAN)
        spec = SP_RED_DRACONIAN;
    else if (spec > SP_BASE_DRACONIAN)
        spec -= SP_BASE_DRACONIAN - SP_RED_DRACONIAN;
    int letter = 'a' + spec - 1;
    if (letter > 'z')
        letter = 'A' + (letter - 'z') - 1;
    return (letter);
}

Deletion in crawl-ref/source/newgame.cc at line 2847 [11.1132300]
B:BD[11.1206119] → [11.1206119:1206120]

Replacement in crawl-ref/source/newgame.cc at line 2855 [11.1132300]

B:BD[22.222779] → [22.222779:222834]

        you.char_class = letter_to_class(Options.cls);

[22.222779]

[22.222834]

        you.char_class = get_class(letter_to_index(Options.cls));

Insertion in crawl-ref/source/newgame.cc at line 2862 [11.1132300]

[11.1206235]

    // the list musn't be longer than the number of actual species
    COMPILE_CHECK(ARRAYSIZE(old_species_order) <= NUM_SPECIES, c1);
    
    // check whether the two lists have the same size
    COMPILE_CHECK(ARRAYSIZE(old_species_order) == ARRAYSIZE(new_species_order), c2);
    const int num_species = ARRAYSIZE(old_species_order);

Replacement in crawl-ref/source/newgame.cc at line 2871 [11.1132300]
B:BD[11.1206247] → [39.131:179]
```
    bool prevraceok = Options.prev_race == '*';
```
[11.1206247]
[11.1206247]
```
    bool prevraceok = (Options.prev_race == '*');
```

Insertion in crawl-ref/source/newgame.cc at line 2900 [11.1132300]

[22.223676]

                
            textcolor( WHITE ); // for the tutorial

Replacement in crawl-ref/source/newgame.cc at line 2911 [11.1132300]

B:BD[11.1206396] → [40.2026:2118]

        cprintf("You can be:  (Press ? for more information, %% for a list of aptitudes)");

[11.1206396]

[22.223856]

        cprintf("You can be:  "
                "(Press ? for more information, %% for a list of aptitudes)");

Replacement in crawl-ref/source/newgame.cc at line 2920 [11.1132300]

B:BD[22.223956] → [22.223956:224009]

        for (int i = SP_HUMAN; i < NUM_SPECIES; ++i)

[22.223956]

[22.224009]

               
        for (int i = 0; i < num_species; ++i)

Replacement in crawl-ref/source/newgame.cc at line 2923 [11.1132300]

B:BD[22.224019] → [14.4506:4572]

            const species_type si = static_cast<species_type>(i);

[22.224019]

[14.4572]

            const species_type si = get_species(i);

Replacement in crawl-ref/source/newgame.cc at line 2928 [11.1132300]
B:BD[22.224110] → [22.224110:224160]
```
            if (you.char_class != JOB_UNKNOWN && 
```
[22.224110]
[14.4619]
```
            if (you.char_class != JOB_UNKNOWN &&
```
Insertion in crawl-ref/source/newgame.cc at line 2930 [11.1132300]
[14.4671]
[22.224215]
```
            {
```
Insertion in crawl-ref/source/newgame.cc at line 2932 [11.1132300]
[22.224241]
[22.224241]
```
            }
```
Replacement in crawl-ref/source/newgame.cc at line 2935 [11.1132300]
B:BD[22.224269] → [14.4672:4722]
```
            char sletter = species_to_letter(si);
```
[22.224269]
[22.224318]
```
            char sletter = index_to_letter(i);
```

Replacement in crawl-ref/source/newgame.cc at line 2937 [11.1132300]

B:BD[22.224370] → [41.2664:2694]

B:BD[41.2694] → [14.4723:4774]

                     sletter,
                     species_name(si, 1).c_str());

[22.224370]

[22.224448]

                     sletter, species_name(si, 1).c_str());

Insertion in crawl-ref/source/newgame.cc at line 2941 [11.1132300]
[22.224529]
[22.224529]
```
                
```
Insertion in crawl-ref/source/newgame.cc at line 2969 [11.1132300]
[22.225218]
[42.259]
```
            {
```
Insertion in crawl-ref/source/newgame.cc at line 2972 [11.1132300]
[42.368]
[22.225303]
```
            }
```
Insertion in crawl-ref/source/newgame.cc at line 2974 [11.1132300]
[22.225347]
[22.225347]
```
            {
```
Insertion in crawl-ref/source/newgame.cc at line 2978 [11.1132300]
[22.225494]
[22.225494]
```
            }
```
Replacement in crawl-ref/source/newgame.cc at line 2998 [11.1132300]
B:BD[22.225564] → [39.382:405]
```
    if ( keyn == '?' )
```
[22.225564]
[43.445]
```
    switch (keyn)
```

Insertion in crawl-ref/source/newgame.cc at line 3000 [11.1132300]

[43.451]

[44.65]

    case 'X':
        cprintf(EOL "Goodbye!");
        end(0);
        break;
    case CK_BKSP:
    case ' ':
        you.species = SP_UNKNOWN;
        Options.race = 0;
        return true;
    case '!':
        pick_random_species_and_class();
        Options.random_pick = true; // used to give random weapon/god as well
        ng_random = true;
        return false;
    case '\r':
    case '\n':
        if (Options.prev_race && prevraceok)
            keyn = Options.prev_race;
        break;
    case '\t':
        if (prev_startup_options_set())
        {
            if (Options.prev_randpick ||
                (Options.prev_race == '*' && Options.prev_cls == '*'))
            {
                Options.random_pick = true;
                ng_random = true;
                pick_random_species_and_class();
                return false;
            }
            set_startup_options();
            you.species = SP_UNKNOWN;
            you.char_class = JOB_UNKNOWN;
            return true;
        }
        break;
    // access to the help files
    case '?':

Replacement in crawl-ref/source/newgame.cc at line 3040 [11.1132300]
B:BD[40.2149] → [40.2149:2189]
```
    }
    else if ( keyn == '%' )
    {
```
[40.2149]
[40.2189]
```
    case '%':
```
Insertion in crawl-ref/source/newgame.cc at line 3043 [11.1132300]
[43.511]
[43.511]
```
    default:
        break;
```

Replacement in crawl-ref/source/newgame.cc at line 3047 [11.1132300]

∅:D[43.518] → [22.225564:225726]

B:BD[22.225564] → [22.225564:225726]

    if ((keyn == '\r' || keyn == '\n') && Options.prev_race && prevraceok)
        keyn = Options.prev_race;
    if (keyn == '\t' && prev_startup_options_set())

[43.518]

[22.225726]

    // These are handled specially as they _could_ be set
    // using Options.race or prev_race
    if (keyn == 'T') // easy to set in init.txt

Replacement in crawl-ref/source/newgame.cc at line 3051 [11.1132300]
B:BD[22.225732] → [22.225732:225770]
B:BD[22.225770] → [39.406:473]
∅:D[39.473] → [11.1207733:1207743]
∅:D[22.225841] → [11.1207733:1207743]
B:BD[11.1207733] → [11.1207733:1207743]
B:BD[11.1207743] → [22.225842:225983]
∅:D[22.225983] → [11.1207793:1207803]
B:BD[11.1207793] → [11.1207793:1207803]
B:BD[11.1207803] → [22.225984:226015]
B:BD[22.226015] → [21.3850:3884]
∅:D[21.3884] → [22.226040:226099]
B:BD[22.226040] → [22.226040:226099]
∅:D[22.226099] → [11.1207803:1207810]
B:BD[11.1207803] → [11.1207803:1207810]
B:BD[11.1207810] → [22.226100:226146]
B:BD[22.226146] → [21.3885:3919]
∅:D[21.3919] → [22.226171:226218]
B:BD[22.226171] → [22.226171:226218]
```
        if (Options.prev_randpick || 
            (Options.prev_race == '*' && Options.prev_cls == '*'))
        {
            Options.random_pick = true;
            ng_random = true;
            pick_random_species_and_class();
            return false;
        }
        set_startup_options();
        you.species = SP_UNKNOWN;
        you.char_class = JOB_UNKNOWN;
        return true;
    }
    if (keyn == CK_BKSP || keyn == ' ')
    {
        you.species = SP_UNKNOWN;
        Options.race = 0;
        return true;
```
[22.225732]
[22.226218]
```
        return !pick_tutorial();
```
Replacement in crawl-ref/source/newgame.cc at line 3053 [11.1132300]
B:BD[22.226224] → [22.226224:226225]
[22.226224]
[39.474]
```
    
```
Replacement in crawl-ref/source/newgame.cc at line 3055 [11.1132300]
B:BD[39.509] → [39.509:530]
```
    if (keyn == '*')
```
[39.509]
[22.226261]
```
    if (randrace)
```
Insertion in crawl-ref/source/newgame.cc at line 3057 [11.1132300]
[22.226267]
[22.226267]
```
        int index;
```

Replacement in crawl-ref/source/newgame.cc at line 3059 [11.1132300]

B:BD[22.226278] → [25.1533:1661]

            keyn = species_to_letter(random_species());
        while (!is_species_valid_choice(letter_to_species(keyn), false)

[22.226278]

[25.1661]

        {
            index = random2(num_species);
        }
        while (!is_species_valid_choice(get_species(index), false)

Replacement in crawl-ref/source/newgame.cc at line 3064 [11.1132300]

B:BD[25.1713] → [25.1713:1791]

∅:D[25.1791] → [22.226438:226444]

B:BD[22.226438] → [22.226438:226444]

B:BD[22.226444] → [39.531:557]

∅:D[39.557] → [11.1207891:1208016]

B:BD[11.1207891] → [11.1207891:1208016]

B:BD[11.1208016] → [22.226445:226471]

∅:D[22.226471] → [11.1208016:1208038]

B:BD[11.1208016] → [11.1208016:1208038]

                   !class_allowed(letter_to_species(keyn), you.char_class)));
    }
    else if (keyn == '!')
    {
        pick_random_species_and_class();
        Options.random_pick = true; // used to give random weapon/god as well
        ng_random = true;
        return false;

[25.1713]

[11.1208038]

                   !class_allowed(get_species(index), you.char_class)));
        keyn = index_to_letter(index);

Replacement in crawl-ref/source/newgame.cc at line 3068 [11.1132300]
B:BD[11.1208044] → [30.76310:76336]
```
    else if (keyn == 'T')
```
[11.1208044]
[30.76336]
```
    
    if (keyn >= 'a' && keyn <= 'z' || keyn >= 'A' && keyn <= 'Z')
```
Replacement in crawl-ref/source/newgame.cc at line 3071 [11.1132300]
B:BD[30.76342] → [30.76342:76375]
```
        return !pick_tutorial();
```
[30.76342]
[30.76375]
```
        you.species = get_species(letter_to_index(keyn));
```
Replacement in crawl-ref/source/newgame.cc at line 3073 [11.1132300]
∅:D[30.76381] → [11.1208045:1208046]
B:BD[11.1208045] → [11.1208045:1208046]
B:BD[11.1208046] → [25.1792:1911]
```
    if ((you.species = letter_to_species(keyn)) == SP_UNKNOWN
        || !is_species_valid_choice(you.species, false))
```
[30.76381]
[11.1208064]
```
        
    if (!is_species_valid_choice( you.species ))
```
Replacement in crawl-ref/source/newgame.cc at line 3076 [11.1132300]
B:BD[11.1208070] → [22.226523:226545]
```
        switch (keyn)
```
[11.1208070]
[11.1209900]
```
        if (Options.race != 0)
```

Replacement in crawl-ref/source/newgame.cc at line 3078 [11.1132300]

B:BD[11.1209910] → [22.226546:226816]

        case 'X':
            cprintf(EOL "Goodbye!");
            end(0);
            break;
        default:
            if (Options.race != 0)
            {
                Options.race = 0;
                printed = false;
            }
            goto spec_query;

[11.1209910]

[11.1209969]

            Options.race = 0;
            printed = false;

Insertion in crawl-ref/source/newgame.cc at line 3081 [11.1132300]
[11.1209979]
[11.1210004]
```
        goto spec_query;
```
Insertion in crawl-ref/source/newgame.cc at line 3083 [11.1132300]
[11.1210010]
[21.3984]
Replacement in crawl-ref/source/newgame.cc at line 3085 [11.1132300]
∅:D[21.4051] → [22.226870:226930]
B:BD[22.226870] → [22.226870:226930]
```
            && !class_allowed(you.species, you.char_class))
```
[21.4051]
[22.226930]
```
        && !class_allowed(you.species, you.char_class))
    {
```
Insertion in crawl-ref/source/newgame.cc at line 3088 [11.1132300]
[22.226955]
[11.1210010]
```
    }
```

Insertion in crawl-ref/source/newgame.cc at line 3093 [11.1132300]

[39.594]

[11.1210090]


    if (you.species == SP_RED_DRACONIAN)
        you.species = random_draconian_species();

Deletion in crawl-ref/source/newgame.cc at line 3102 [11.1132300]
B:BD[11.1210200] → [11.1210200:1210201]

Insertion in crawl-ref/source/newgame.cc at line 3115 [11.1132300]

[22.227091]

[11.1210332]

    // the list musn't be longer than the number of actual classes
    COMPILE_CHECK(ARRAYSIZE(old_jobs_order) <= NUM_JOBS, c1);
    // check whether the two lists have the same size
    COMPILE_CHECK(ARRAYSIZE(old_jobs_order) == ARRAYSIZE(new_jobs_order), c2);
    const int num_classes = ARRAYSIZE(old_jobs_order);

Replacement in crawl-ref/source/newgame.cc at line 3124 [11.1132300]
B:BD[11.1210343] → [39.595:643]
```
    bool prevclassok = Options.prev_cls == '*';
```
[11.1210343]
[11.1210343]
```
    bool prevclassok = (Options.prev_cls == '*');
```

Replacement in crawl-ref/source/newgame.cc at line 3136 [11.1132300]

B:BD[21.4281] → [41.2745:2849]

            cprintf("%s.",
                    species_name(you.species,you.experience_level).c_str());

[21.4281]

[11.1210614]

            cprintf("%s.", species_name(you.species, 1).c_str());
            textcolor( WHITE );

Replacement in crawl-ref/source/newgame.cc at line 3148 [11.1132300]

B:BD[11.1210747] → [40.2225:2324]

        cprintf("You can be: (Press ? for more information, %% for a list of aptitudes)" EOL EOL);

[11.1210747]

[11.1210805]

        cprintf("You can be:  "
                "(Press ? for more information, %% for a list of aptitudes)" EOL EOL);

Replacement in crawl-ref/source/newgame.cc at line 3153 [11.1132300]
B:BD[21.4449] → [21.4449:4492]
```
        for (int i = 0; i < NUM_JOBS; i++)
```
[21.4449]
[11.1210958]
```
        for (int i = 0; i < num_classes; i++)
```

Replacement in crawl-ref/source/newgame.cc at line 3155 [11.1132300]

B:BD[11.1210968] → [21.4493:4643]

            if (you.species != SP_UNKNOWN ?
                !class_allowed(you.species, static_cast<job_type>(i)) :
                i == JOB_QUITTER)

[11.1210968]

[11.1211016]

            if (you.species != SP_UNKNOWN
                && !class_allowed(you.species, get_class(i)))
            {

Insertion in crawl-ref/source/newgame.cc at line 3159 [11.1132300]
[11.1211042]
[11.1211042]
```
            }
```
Replacement in crawl-ref/source/newgame.cc at line 3168 [11.1132300]
B:BD[11.1211114] → [13.392709:392757]
```
            cprintf( "%s", get_class_name(i) );
```
[11.1211114]
[11.1211156]
```
            cprintf( "%s", get_class_name(get_class(i)) );
```
Insertion in crawl-ref/source/newgame.cc at line 3183 [11.1132300]
[21.4683]
[43.519]
```
        {
```
Insertion in crawl-ref/source/newgame.cc at line 3188 [11.1132300]
[22.228518]
[22.228518]
```
        }
```
Insertion in crawl-ref/source/newgame.cc at line 3190 [11.1132300]
[22.228531]
[43.724]
```
        {
```
Insertion in crawl-ref/source/newgame.cc at line 3194 [11.1132300]
[22.228639]
[11.1211457]
```
        }
```
Insertion in crawl-ref/source/newgame.cc at line 3201 [11.1132300]
[22.228838]
[22.228838]
```
            {
```
Insertion in crawl-ref/source/newgame.cc at line 3205 [11.1132300]
[22.228986]
[22.228986]
```
            }
```
Replacement in crawl-ref/source/newgame.cc at line 3225 [11.1132300]
B:BD[43.867] → [39.848:871]
```
    if ( keyn == '?' )
```
[43.867]
[43.890]
```
    switch (keyn)
```

Insertion in crawl-ref/source/newgame.cc at line 3227 [11.1132300]

[43.896]

[44.101]

    case 'X':
        cprintf(EOL "Goodbye!");
        end(0);
        break;
     case ESCAPE:
     case CK_BKSP:
     case ' ':
        if (keyn != ' ' || you.species == SP_UNKNOWN)
        {
            you.char_class = JOB_UNKNOWN;
            return false;
        }
    case 'T':
        return pick_tutorial();
    case '!':
        pick_random_species_and_class();
        // used to give random weapon/god as well
        Options.random_pick = true;
        ng_random = true;
        return true;
    case '\r':
    case '\n':
        if (Options.prev_cls && prevclassok)
            keyn = Options.prev_cls;
        break;
    case '\t':
        if (prev_startup_options_set())
        {
            if (Options.prev_randpick ||
                (Options.prev_race == '*' && Options.prev_cls == '*'))
            {
                Options.random_pick = true;
                ng_random = true;
                pick_random_species_and_class();
                return true;
            }
            set_startup_options();
            // Toss out old species selection, if any.
            you.species = SP_UNKNOWN;
            you.char_class = JOB_UNKNOWN;
            return false;
        }
        break;
    // help files
    case '?':

Replacement in crawl-ref/source/newgame.cc at line 3276 [11.1132300]
∅:D[43.957] → [11.1211803:1211809]
∅:D[22.229095] → [11.1211803:1211809]
B:BD[11.1211803] → [11.1211803:1211809]
B:BD[11.1211809] → [40.2325:2359]
```
    }
    else if ( keyn == '%' )
    {
```
[43.957]
[40.2359]
```
    case '%':
```
Insertion in crawl-ref/source/newgame.cc at line 3279 [11.1132300]
[40.2425]
[40.2425]
```
    default:
        break;
```

Replacement in crawl-ref/source/newgame.cc at line 3283 [11.1132300]

B:BD[11.1211810] → [22.229096:229204]

    if ((keyn == '\r' || keyn == '\n') && Options.prev_cls && prevclassok)
        keyn = Options.prev_cls;

[11.1211810]

[11.1213837]

    job_type chosen_job = JOB_UNKNOWN;
    if (keyn == '*')
    {
        // pick a job at random... see god retribution for proof this
        // is uniform. -- bwr
        int job_count = 0;

Replacement in crawl-ref/source/newgame.cc at line 3290 [11.1132300]

B:BD[11.1213838] → [22.229205:229301]

B:BD[22.229301] → [24.458:529]

    if (keyn == '\t' && prev_startup_options_set())
    {
        if (Options.prev_randpick || 
                (Options.prev_race == '*' && Options.prev_cls == '*'))

[11.1213838]

[11.1213881]

        for (int i = 0; i < NUM_JOBS; i++)

Replacement in crawl-ref/source/newgame.cc at line 3292 [11.1132300]

B:BD[11.1213891] → [22.229373:229513]

∅:D[22.229513] → [11.1214072:1214082]

B:BD[11.1214072] → [11.1214072:1214082]

B:BD[11.1214082] → [22.229514:229545]

∅:D[22.229545] → [11.1214082:1214083]

B:BD[11.1214082] → [11.1214082:1214083]

B:BD[11.1214083] → [22.229546:229597]

B:BD[22.229597] → [21.4684:4718]

∅:D[21.4718] → [22.229622:229660]

B:BD[22.229622] → [22.229622:229660]

            Options.random_pick = true;
            ng_random = true;
            pick_random_species_and_class();
            return true;
        }
        set_startup_options();
        // Toss out old species selection, if any.
        you.species = SP_UNKNOWN;
        you.char_class = JOB_UNKNOWN;

[11.1213891]

[22.229660]

             if (you.species == SP_UNKNOWN ||
                 class_allowed(you.species, static_cast<job_type>(i)))
             {
                 job_count++;
                 if (one_chance_in( job_count ))
                     chosen_job = static_cast<job_type>(i);
             }
         }
         ASSERT( chosen_job != JOB_UNKNOWN );

Replacement in crawl-ref/source/newgame.cc at line 3302 [11.1132300]
∅:D[22.229661] → [11.1214247:1214269]
B:BD[11.1214247] → [11.1214247:1214269]
```
        return false;
```
[22.229661]
[11.1214269]
```
         ng_cls = '*';
```

Replacement in crawl-ref/source/newgame.cc at line 3304 [11.1132300]

B:BD[11.1214275] → [6.193:299]

    
    job_type chosen_job = JOB_UNKNOWN;
    if ((chosen_job = letter_to_class(keyn)) == JOB_UNKNOWN)

[11.1214275]

[11.1214301]

    else if (keyn >= 'a' && keyn <= 'z' || keyn >= 'A' && keyn <= 'Z')

Replacement in crawl-ref/source/newgame.cc at line 3306 [11.1132300]

B:BD[11.1214307] → [39.872:897]

∅:D[39.897] → [22.229755:229904]

B:BD[22.229755] → [22.229755:229904]

B:BD[22.229904] → [21.4719:4759]

∅:D[21.4759] → [22.229930:229931]

B:BD[22.229930] → [22.229930:229931]

B:BD[22.229931] → [21.4760:4807]

∅:D[45.578] → [22.229978:229992]

∅:D[21.4807] → [22.229978:229992]

B:BD[22.229978] → [22.229978:229992]

B:BD[22.229992] → [46.173:244]

B:BD[46.244] → [21.4808:4931]

∅:D[21.4931] → [22.230059:230162]

B:BD[22.230059] → [22.230059:230162]

B:BD[22.230162] → [21.4932:4988]

∅:D[21.4988] → [22.230195:230227]

B:BD[22.230195] → [22.230195:230227]

B:BD[22.230227] → [21.4989:5031]

B:BD[21.5031] → [6.300:330]

        if (keyn == '*')
        {
            // pick a job at random... see god retribution for proof this
            // is uniform. -- bwr
            int job_count = 0;
            job_type job = JOB_UNKNOWN;
            for (int i = 0; i < NUM_JOBS; i++)
            {
                if ( i == JOB_QUITTER )
                    continue;
                if (you.species == SP_UNKNOWN ||
                    class_allowed(you.species, static_cast<job_type>(i)))
                {
                    job_count++;
                    if (one_chance_in( job_count ))
                        job = static_cast<job_type>(i);
                }
            }
            ASSERT( job != JOB_UNKNOWN );
            chosen_job = job;

[11.1214307]

[22.230343]

         chosen_job = get_class(letter_to_index(keyn));
    }

Replacement in crawl-ref/source/newgame.cc at line 3309 [11.1132300]
B:BD[22.230344] → [39.898:924]
∅:D[39.924] → [22.230370:230380]
B:BD[22.230370] → [22.230370:230380]
B:BD[22.230380] → [39.925:955]
```
            ng_cls = '*';
        }
        else if (keyn == '!')
```
[22.230344]
[11.1214407]
```
    if (chosen_job == JOB_UNKNOWN)
    {
        if (Options.cls != 0)
```

Replacement in crawl-ref/source/newgame.cc at line 3313 [11.1132300]

B:BD[11.1214417] → [22.230411:230605]

∅:D[22.230605] → [11.1214475:1214485]

B:BD[11.1214475] → [11.1214475:1214485]

B:BD[11.1214485] → [30.76603:76697]

B:BD[30.76697] → [21.5032:5095]

∅:D[21.5095] → [22.230656:230804]

B:BD[22.230656] → [22.230656:230804]

            pick_random_species_and_class();
            // used to give random weapon/god as well
            Options.random_pick = true;
            ng_random = true;
            return true;
        }
        else if (keyn == 'T')
        {
            return pick_tutorial();
        }        
        else if ((keyn == ' ' && you.species == SP_UNKNOWN) ||
                    keyn == 'x' || keyn == ESCAPE || keyn == CK_BKSP)
        {
            you.char_class = JOB_UNKNOWN;
            return false;

[11.1214417]

[22.230804]

            Options.cls = 0;
            printed = false;

Replacement in crawl-ref/source/newgame.cc at line 3316 [11.1132300]

B:BD[22.230814] → [22.230814:231110]

        else if (keyn == 'X')
        {
            cprintf(EOL "Goodbye!");
            end(0);
        }
        else
        {
            if (Options.cls != 0)
            {
                Options.cls = 0;
                printed = false;
            }
            goto job_query;
        }

[22.230814]

[11.1214509]

        goto job_query;

Replacement in crawl-ref/source/newgame.cc at line 3318 [11.1132300]
B:BD[11.1214515] → [11.1214515:1214516]
[11.1214515]
[24.530]
```
    
```

Replacement in crawl-ref/source/newgame.cc at line 3334 [11.1132300]

∅:D[6.417] → [24.621:692]

B:BD[11.1214714] → [24.621:692]

    return you.char_class != JOB_UNKNOWN && you.species != SP_UNKNOWN;

[6.417]

[11.1214731]

    return (you.char_class != JOB_UNKNOWN && you.species != SP_UNKNOWN);

Insertion in crawl-ref/source/newgame.cc at line 3427 [11.1132300]
[11.1219818]
[47.294]
```
            you.skills[SK_THROWING] = 2;
            
```

Replacement in crawl-ref/source/newgame.cc at line 3431 [11.1132300]

B:BD[48.603] → [12.4078:4119]

∅:D[12.4119] → [47.338:451]

B:BD[13.392974] → [47.338:451]

            you.skills[SK_THROWING] = 2;
            you.skills[((coinflip() || you.species == SP_VAMPIRE)?
                SK_STABBING : SK_SHIELDS)]++;

[48.603]

[11.1219966]

                
            if (you.species == SP_VAMPIRE || coinflip())
                you.skills[SK_STABBING]++;
            else
                you.skills[SK_SHIELDS]++;

Deletion in crawl-ref/source/mon-util.cc at line 5589 [11.1699344]
B:BD[49.24078] → [49.24078:24134]
```
    case SP_UNK0_DRACONIAN:
    case SP_UNK1_DRACONIAN:
```
Replacement in crawl-ref/source/initfile.cc at line 610 [11.2957258]
B:BD[50.10524] → [51.2125:2179]
```
    scroll_margin_x   = 2;
    scroll_margin_y   = 2;
```
[50.10524]
[50.10578]
```
    scroll_margin_x  = 2;
    scroll_margin_y  = 2;
```
Replacement in crawl-ref/source/initfile.cc at line 618 [11.2957258]
B:BD[52.280] → [53.553:576]
```
    show_beam = false;
```
[52.280]
[13.791334]
```
    show_beam  = false;
```

Replacement in crawl-ref/source/initfile.cc at line 620 [11.2957258]

B:BD[13.791335] → [13.791335:791462]

    prev_race = 0;
    prev_cls  = 0;
    prev_ck   = GOD_NO_GOD;
    prev_dk   = DK_NO_SELECTION;
    prev_pr   = GOD_NO_GOD;

[13.791335]

[13.791462]

    use_old_selection_order = false;
    prev_race   = 0;
    prev_cls    = 0;
    prev_ck     = GOD_NO_GOD;
    prev_dk     = DK_NO_SELECTION;
    prev_pr     = GOD_NO_GOD;

Replacement in crawl-ref/source/initfile.cc at line 627 [11.2957258]
B:BD[13.791493] → [13.791493:791527]
```
    prev_book = SBT_NO_SELECTION;
```
[13.791493]
[13.791527]
```
    prev_book   = SBT_NO_SELECTION;
```

Insertion in crawl-ref/source/initfile.cc at line 1719 [11.2957258]

[54.5853881]

[13.799895]

    else if (key == "use_old_selection_order")
    {
        // use old order of species/classes on selection screen?
        use_old_selection_order = read_bool( field, use_old_selection_order );
    }

Insertion in crawl-ref/source/externs.h at line 1576 [11.3270163]
[8.3837]
[8.3837]
```
    
```

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

[11.3284199]

[8.4127]

    
    bool        use_old_selection_order; // use old order of species/classes in
                                         // selection screen

Replacement in crawl-ref/source/enum.h at line 1314 [11.3287960]

B:BD[11.3324880] → [11.3324880:3325112]

    JOB_HEALER,                        //   22
    JOB_QUITTER,                       //   23 -- this is job 'x', don't use
    JOB_REAVER,                        //   24
    JOB_STALKER,                       //   25
    JOB_MONK,

[11.3324880]

[11.3325112]

    JOB_HEALER,
    JOB_REAVER,
    JOB_STALKER,
    JOB_MONK,                          //   25

Replacement in crawl-ref/source/enum.h at line 1319 [11.3287960]
B:BD[11.3325128] → [11.3325128:3325175]
```
    JOB_WANDERER,                      //   23
```
[11.3325128]
[11.3325175]
```
    JOB_WANDERER,                      //   27
```
Replacement in crawl-ref/source/enum.h at line 2332 [11.3287960]
B:BD[11.3361584] → [11.3361584:3361602]
```
    SP_OGRE_MAGE,
```
[11.3361584]
[11.3361602]
```
    SP_OGRE_MAGE,                      //   15
```
Replacement in crawl-ref/source/enum.h at line 2342 [11.3287960]
B:BD[11.3361862] → [11.3361862:3361908]
B:BD[11.3361908] → [13.929029:929052]
B:BD[13.929052] → [9.4439:4455]
```
    SP_UNK0_DRACONIAN,
    SP_UNK1_DRACONIAN,
    SP_BASE_DRACONIAN,
    SP_CENTAUR,
```
[11.3361862]
[11.3361978]
```
    SP_BASE_DRACONIAN,                 //   25
    SP_CENTAUR,       
```
Replacement in crawl-ref/source/enum.h at line 2345 [11.3287960]
B:BD[11.3361994] → [9.4456:4503]
```
    SP_SPRIGGAN,                       //   30
```
[11.3361994]
[11.3362011]
```
    SP_SPRIGGAN, 
```
Replacement in crawl-ref/source/enum.h at line 2347 [11.3287960]
B:BD[11.3362028] → [11.3362028:3362047]
B:BD[11.3362047] → [9.4504:4518]
```
    SP_DEMONSPAWN,
    SP_GHOUL,
```
[11.3362028]
[11.3362094]
```
    SP_DEMONSPAWN,                     //   30
    SP_GHOUL,         
```
Replacement in crawl-ref/source/enum.h at line 2350 [11.3287960]
B:BD[11.3362108] → [9.4519:4566]
∅:D[9.4566] → [55.357:373]
B:BD[11.3362124] → [55.357:373]
```
    SP_MERFOLK,                        //   35
    SP_VAMPIRE,
```
[11.3362108]
[56.417]
```
    SP_MERFOLK,
    SP_VAMPIRE,                        //   34
```
Deletion in crawl-ref/source/effects.cc at line 971 [11.3382105]
B:BD[22.450060] → [22.450060:450124]
```
        case SP_UNK0_DRACONIAN:
        case SP_UNK1_DRACONIAN:
```

Replacement in crawl-ref/source/acr.cc at line 4374 [11.4397395]

B:BD[9.5349] → [9.5349:5404]

    COMPILE_CHECK(SP_MERFOLK == 35              , c3);

[9.5349]

[9.5404]

    COMPILE_CHECK(SP_VAMPIRE == 34              , c3);

Insertion in crawl-ref/init.txt at line 45 [11.4830895]
[57.1911]
[58.1729]
```
# use_old_selection_order = false
```

Insertion in crawl-ref/docs/crawl_options.txt at line 201 [57.63392]

[59.7670]

use_old_selection_order = false
        If set to true, the character selection screen will offer 
	species and classes in the order of version 0.3 and earlier.

[FR 1816805] Implementing a new species/classes order on the character

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/skills2.cc at line 1161 [11.647133]

Deletion in crawl-ref/source/skills2.cc at line 1163 [11.647133]

Deletion in crawl-ref/source/player.cc at line 401 [11.962854]

Deletion in crawl-ref/source/player.cc at line 2985 [11.962854]

Deletion in crawl-ref/source/player.cc at line 3023 [11.962854]

Deletion in crawl-ref/source/player.cc at line 3810 [11.962854]

Replacement in crawl-ref/source/player.cc at line 4578 [11.962854]

Replacement in crawl-ref/source/player.cc at line 4639 [11.962854]

Replacement in crawl-ref/source/player.cc at line 4646 [11.962854]

Deletion in crawl-ref/source/player.cc at line 4655 [11.962854]

Replacement in crawl-ref/source/player.cc at line 4667 [11.962854]

Deletion in crawl-ref/source/player.cc at line 4686 [11.962854]

Replacement in crawl-ref/source/player.cc at line 4703 [11.962854]

Deletion in crawl-ref/source/newgame.cc at line 125 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 136 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 161 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 186 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 193 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 258 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 260 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 264 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 287 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 289 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 290 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 298 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 303 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 309 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 323 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 362 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 372 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 485 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 495 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 502 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 507 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 510 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 514 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 622 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 624 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 887 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 943 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1633 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1676 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1842 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1938 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2251 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2360 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2367 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2376 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2382 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2625 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2628 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2842 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2844 [11.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2847 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2855 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2862 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2871 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2900 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2911 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2920 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2923 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2928 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2930 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2932 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2935 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2937 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2941 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2969 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2972 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2974 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2978 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2998 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 3000 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3040 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 3043 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3047 [11.1132300]