fiddlerwoaroof/crawl - Change S4BRP4VHB23F2FCC6BXNAN2MZRVUGW7QMXUEOAVZVGFXKXJPVLLQC

Overhaul of species/class combinations

(overall 36 combinations added, 26 removed)

Magical classes

Cj: -MD En: +Gn, -MD He: +Gn, +Ha, -HO, -SE Re: +MD, -Dr St: +Ha, -HO Su: +Mu, -HE VM: -Dr Wr: +Dr, +Ha Wz: +Mu

all Elementalists: -Ce

Fighter classes

As: -HE, -Mu Be: +MD, +SE CK: -Dr Cr: +MD, +Mf DK: -Dr Fi: -DE, -Dr, -GE, -Mu Gl: +Ko, +Og, -MD Hu: +DE, +Og Mo: +Ce, -DE, -HE Pa: +Ce, +Mf Pr: +DS, +Mu (both Y. only), +Ha, +Ko Th: +Sp, -Dr, -GE, -HE Wn: +Ce, Dr, HO, Ke, Ko, Mf, Mu, Na, OM, SE, Vp

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

Created by j-p-e-g on August 9, 2007

S4BRP4VHB23F2FCC6BXNAN2MZRVUGW7QMXUEOAVZVGFXKXJPVLLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/newgame.cc at line 886 [5.1132300]

[5.1154709]

        if (player_genus(GENPC_DRACONIAN, speci))
            return false;

Insertion in crawl-ref/source/newgame.cc at line 893 [5.1132300]

[5.1154795]

        case SP_MUMMY:
        case SP_GREY_ELF:
        case SP_DEEP_ELF:

Insertion in crawl-ref/source/newgame.cc at line 902 [5.1132300]
[5.1154874]
[5.1154874]
```
        if (speci == SP_MUMMY)
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 926 [5.1132300]
B:BD[5.1155376] → [5.1155376:1155442]
```
        if (species_is_undead( speci ))
            return false;
```
Deletion in crawl-ref/source/newgame.cc at line 931 [5.1132300]
B:BD[5.1155526] → [5.1155526:1155554]
```
        case SP_DEMONSPAWN:
```
Deletion in crawl-ref/source/newgame.cc at line 932 [5.1132300]
B:BD[5.1155577] → [5.1155577:1155603]
```
        case SP_HALFLING:
```
Deletion in crawl-ref/source/newgame.cc at line 933 [5.1132300]
B:BD[5.1155626] → [5.1155626:1155650]
```
        case SP_KOBOLD:
```
Insertion in crawl-ref/source/newgame.cc at line 939 [5.1132300]
[5.1155796]
[5.1155796]
```
        case SP_GHOUL:
        case SP_VAMPIRE:
```

Insertion in crawl-ref/source/newgame.cc at line 948 [5.1132300]

[5.1155914]

            return false;
        if (player_genus(GENPC_DRACONIAN, speci))

Deletion in crawl-ref/source/newgame.cc at line 959 [5.1132300]
B:BD[5.1156097] → [5.1156097:1156123]
```
        case SP_SPRIGGAN:
```
Insertion in crawl-ref/source/newgame.cc at line 960 [5.1132300]
[5.1156146]
[5.1156146]
```
        case SP_HIGH_ELF:
        case SP_GREY_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 977 [5.1132300]
B:BD[5.1156449] → [5.1156449:1156473]
```
        case SP_KOBOLD:
```
Deletion in crawl-ref/source/newgame.cc at line 978 [5.1132300]
B:BD[5.1156495] → [5.1156495:1156517]
```
        case SP_OGRE:
```
Insertion in crawl-ref/source/newgame.cc at line 981 [5.1132300]
[5.1156593]
[5.1156593]
```
        case SP_MOUNTAIN_DWARF:
```
Insertion in crawl-ref/source/newgame.cc at line 1017 [5.1132300]
[5.1157347]
[5.1157347]
```
        case SP_CENTAUR:
        case SP_MERFOLK:
```
Insertion in crawl-ref/source/newgame.cc at line 1034 [5.1132300]
[5.1157660]
[5.1157660]
```
        case SP_MUMMY:
```
Insertion in crawl-ref/source/newgame.cc at line 1040 [5.1132300]
[5.1157781]
[5.1157781]
```
        case SP_HIGH_ELF:
```
Insertion in crawl-ref/source/newgame.cc at line 1047 [5.1132300]
[5.1157863]
[5.1157863]
```
        if (speci == SP_SLUDGE_ELF)
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1063 [5.1132300]
B:BD[5.1158232] → [5.1158232:1158264]
```
        case SP_MOUNTAIN_DWARF:
```
Insertion in crawl-ref/source/newgame.cc at line 1088 [5.1132300]
[5.1158830]
[5.1158830]
```
        case SP_DEEP_ELF:
        case SP_SLUDGE_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1092 [5.1132300]
B:BD[5.1158924] → [5.1158924:1158952]
```
        case SP_SLUDGE_ELF:
```
Insertion in crawl-ref/source/newgame.cc at line 1097 [5.1132300]
[5.1159076]
[4.229]
```
        case SP_OGRE:
```
Insertion in crawl-ref/source/newgame.cc at line 1121 [5.1132300]
[5.1159551]
[5.1159551]
```
        case SP_MOUNTAIN_DWARF:
```
Deletion in crawl-ref/source/newgame.cc at line 1135 [5.1132300]
B:BD[5.1159809] → [5.1159809:1159832]
```
        case SP_GNOME:
```
Insertion in crawl-ref/source/newgame.cc at line 1142 [5.1132300]
[5.1160004]
[5.1160004]
```
        case SP_MOUNTAIN_DWARF:
```
Insertion in crawl-ref/source/newgame.cc at line 1166 [5.1132300]
[5.1160513]
[5.1160513]
```
        case SP_CENTAUR:
```
Insertion in crawl-ref/source/newgame.cc at line 1193 [5.1132300]
[5.1161119]
[5.1161119]
```
        case SP_CENTAUR:
```
Replacement in crawl-ref/source/newgame.cc at line 1202 [5.1132300]
B:BD[5.1161274] → [3.9011:9069]
∅:D[3.9069] → [5.1161274:1161314]
B:BD[5.1161274] → [5.1161274:1161314]
```
        if (speci == SP_VAMPIRE)
            return true;
        if (species_is_undead( speci ))
```
[5.1161274]
[5.1161314]
```
        if (player_genus(GENPC_DRACONIAN, speci))
```
Insertion in crawl-ref/source/newgame.cc at line 1214 [5.1132300]
[5.1161545]
[5.1161545]
```
        case SP_GHOUL:
        case SP_HIGH_ELF:
```
Insertion in crawl-ref/source/newgame.cc at line 1241 [5.1132300]
[5.1162127]
[5.1162127]
```
        case SP_CENTAUR:
```
Insertion in crawl-ref/source/newgame.cc at line 1266 [5.1132300]
[5.1162684]
[5.1162684]
```
        case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 1273 [5.1132300]
B:BD[5.1162765] → [5.1162765:1162839]
```
        if (player_genus(GENPC_DWARVEN, speci))
            return false;
```
Deletion in crawl-ref/source/newgame.cc at line 1281 [5.1132300]
B:BD[5.1163038] → [5.1163038:1163105]
```
        //case SP_HALFLING: //jmf: they're such good enchanters...
```
Deletion in crawl-ref/source/newgame.cc at line 1288 [5.1132300]
B:BD[5.1163271] → [5.1163271:1163296]
```
        case SP_MERFOLK:
```

Insertion in crawl-ref/source/newgame.cc at line 1297 [5.1132300]

[5.1163483]

        if (player_genus(GENPC_DRACONIAN, speci))
            return false;

Deletion in crawl-ref/source/newgame.cc at line 1307 [5.1132300]
B:BD[5.1163662] → [5.1163662:1163689]
```
        // case SP_KOBOLD:
```

Insertion in crawl-ref/source/newgame.cc at line 1323 [5.1132300]

[5.1164061]

        if (player_genus(GENPC_DRACONIAN, speci))
            return false;

Insertion in crawl-ref/source/newgame.cc at line 1345 [5.1132300]

[5.1164512]

            return false;
        if (player_genus(GENPC_DRACONIAN, speci))

Deletion in crawl-ref/source/newgame.cc at line 1393 [5.1132300]
B:BD[5.1165483] → [5.1165483:1165532]
```
        case SP_GNOME:
        case SP_HALFLING:
```
Insertion in crawl-ref/source/newgame.cc at line 1401 [5.1132300]
[5.1165725]
[5.1165725]
```
        case SP_HILL_ORC:
        case SP_SLUDGE_ELF:
```

Insertion in crawl-ref/source/newgame.cc at line 1411 [5.1132300]

[5.1165870]

        if (player_genus(GENPC_DRACONIAN, speci))
            return false;

Deletion in crawl-ref/source/newgame.cc at line 1420 [5.1132300]
B:BD[5.1166033] → [5.1166033:1166065]
```
        case SP_MOUNTAIN_DWARF:
```
Deletion in crawl-ref/source/newgame.cc at line 1442 [5.1132300]
B:BD[5.1166594] → [5.1166594:1166620]
```
        case SP_HALFLING:
```
Insertion in crawl-ref/source/newgame.cc at line 1446 [5.1132300]
[5.1166718]
[5.1166718]
```
        case SP_HILL_ORC:
```
Deletion in crawl-ref/source/newgame.cc at line 1458 [5.1132300]
B:BD[5.1166895] → [5.1166895:1166920]
```
        case SP_CENTAUR:
```
Insertion in crawl-ref/source/newgame.cc at line 1465 [5.1132300]
[5.1167115]
[5.1167115]
```
        case SP_HIGH_ELF:
        case SP_DEEP_ELF:
```
Replacement in crawl-ref/source/newgame.cc at line 1476 [5.1132300]
B:BD[5.1167318] → [5.1167318:1167344]
```
            return false;
```
[5.1167318]
[5.1167344]
```
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1485 [5.1132300]
B:BD[5.1167518] → [5.1167518:1167544]
```
        case SP_HALFLING:
```

Insertion in crawl-ref/source/newgame.cc at line 1496 [5.1132300]

[5.1167744]

        if (species_is_undead( speci ))
            return true;
        if (player_genus(GENPC_DRACONIAN, speci))
            return true;

Replacement in crawl-ref/source/newgame.cc at line 1506 [5.1132300]

B:BD[5.1167853] → [6.383767:383790]

        case SP_GHOUL:

[5.1167853]

        case SP_KOBOLD:
        case SP_NAGA:
        case SP_HILL_ORC:
        case SP_OGRE_MAGE:
        case SP_CENTAUR:
        case SP_KENKU:
        case SP_MERFOLK:
        case SP_SLUDGE_ELF:

Insertion in crawl-ref/source/newgame.cc at line 2632 [5.1132300]

[5.1197684]

    
    // ogres and draconians cannot wear armour
    if ((you.species == SP_OGRE_MAGE || player_genus(GENPC_DRACONIAN))
        && you.skills[ SK_ARMOUR ])
    {
        you.skills[ SK_ARMOUR ] = 0;

Insertion in crawl-ref/source/newgame.cc at line 2639 [5.1132300]

[5.1197685]

[6.391829]

        do
        {
            skill = random2( num_all_skills );
        }
        while (skill == SK_ARMOUR && you.skills[all_skills[ skill ]]);
        you.skills[ skill ] = 1;
    }

Replacement in crawl-ref/source/newgame.cc at line 3407 [5.1132300]

B:BD[5.1215267] → [5.1215267:1215375]

        if (you.species == SP_OGRE || you.species == SP_TROLL
            || player_genus(GENPC_DRACONIAN))

[5.1215267]

[5.1215375]

        if (you.species == SP_OGRE || you.species == SP_TROLL)

Deletion in crawl-ref/source/newgame.cc at line 3428 [5.1132300]

B:BD[5.1216295] → [5.1216295:1216580]

B:BD[5.1216627] → [5.1216627:1216641]

            else if (player_genus(GENPC_DRACONIAN))
            {
                you.inv[2].quantity = 1;
                you.inv[2].base_type = OBJ_ARMOUR;
                you.inv[2].sub_type = ARM_SHIELD;
                you.inv[2].plus = 0;
                you.inv[2].special = 0;
            }

Insertion in crawl-ref/source/newgame.cc at line 3436 [5.1132300]
[5.1216927]
[3.9501]
```
            
```

Deletion in crawl-ref/source/newgame.cc at line 3439 [5.1132300]

∅:D[3.9616] → [5.1216983:1217258]

B:BD[5.1216983] → [5.1216983:1217258]

B:BD[5.1217305] → [5.1217305:1217319]


            if (you.species == SP_MUMMY)
            {
                you.inv[2].quantity = 1;
                you.inv[2].base_type = OBJ_ARMOUR;
                you.inv[2].sub_type = ARM_SHIELD;
                you.inv[2].plus = 0;
                you.inv[2].special = 0;
            }

Insertion in crawl-ref/source/newgame.cc at line 3597 [5.1132300]

[5.1222495]

[5.1222534]

        
        if (you.species == SP_KOBOLD || you.species == SP_HALFLING)
            you.inv[0].sub_type = WPN_KNIFE;

Deletion in crawl-ref/source/newgame.cc at line 3619 [5.1132300]
B:BD[5.1223082] → [5.1223082:1223123]
```
        you.skills[SK_MACES_FLAILS] = 2;
```
Deletion in crawl-ref/source/newgame.cc at line 3620 [5.1132300]
B:BD[5.1223158] → [5.1223158:1223159]

Insertion in crawl-ref/source/newgame.cc at line 3621 [5.1132300]

[5.1223199]

[7.18178]

        
        if (you.species == SP_KOBOLD || you.species == SP_HALFLING)
        {
            you.skills[SK_SHORT_BLADES] = 1;
            you.skills[SK_STAVES] = 2;
        }
        else
            you.skills[SK_MACES_FLAILS] = 2;

Deletion in crawl-ref/source/newgame.cc at line 3630 [5.1132300]

B:BD[7.18179] → [7.18179:18327]

        // disallow invalid choices
        if (you.species != SP_HILL_ORC && Options.priest == GOD_BEOGH)
            Options.priest = GOD_NO_GOD;

Replacement in crawl-ref/source/newgame.cc at line 3631 [5.1132300]

B:BD[5.1223200] → [5.1223200:1223274]

B:BD[5.1223274] → [8.1174:1250]

∅:D[8.1250] → [5.1223317:1223387]

∅:D[9.231337] → [5.1223317:1223387]

B:BD[5.1223317] → [5.1223317:1223387]

        if (Options.priest != GOD_NO_GOD && Options.priest != GOD_RANDOM)
            ng_pr = you.religion = static_cast<god_type>( Options.priest );
        else if (Options.random_pick || Options.priest == GOD_RANDOM)

[5.1223200]

[9.231338]

        // set gods
        if (you.species == SP_MUMMY || you.species == SP_DEMONSPAWN)

Replacement in crawl-ref/source/newgame.cc at line 3634 [5.1132300]

∅:D[9.231348] → [5.1223387:1223454]

B:BD[5.1223387] → [5.1223387:1223454]

B:BD[5.1223454] → [7.18328:18510]

∅:D[7.18510] → [9.231349:231381]

B:BD[5.1223454] → [9.231349:231381]

            you.religion = coinflip() ? GOD_YREDELEMNUL : GOD_ZIN;
            
            // for orcs 50% chance of Beogh instead
            if (you.species == SP_HILL_ORC && coinflip())
                you.religion = GOD_BEOGH;
                
            ng_pr = GOD_RANDOM;

[9.231348]

[9.231381]

            you.religion = GOD_YREDELEMNUL;

Replacement in crawl-ref/source/newgame.cc at line 3638 [5.1132300]

B:BD[5.1223477] → [5.1223477:1223499]

            clrscr();

[5.1223477]

[5.1223499]

            // disallow invalid choices
            if (you.species != SP_HILL_ORC && Options.priest == GOD_BEOGH)
                Options.priest = GOD_NO_GOD;
            if (Options.priest != GOD_NO_GOD && Options.priest != GOD_RANDOM)
                ng_pr = you.religion = static_cast<god_type>( Options.priest );
            else if (Options.random_pick || Options.priest == GOD_RANDOM)
            {
                you.religion = coinflip() ? GOD_YREDELEMNUL : GOD_ZIN;
            
                // for orcs 50% chance of Beogh instead
                if (you.species == SP_HILL_ORC && coinflip())
                    you.religion = GOD_BEOGH;
                
                ng_pr = GOD_RANDOM;
            }
            else
            {
                clrscr();

Replacement in crawl-ref/source/newgame.cc at line 3658 [5.1132300]

B:BD[5.1223500] → [5.1223500:1223596]

            textcolor( CYAN );
            cprintf(EOL " Which god do you wish to serve?" EOL);

[5.1223500]

[5.1223596]

                textcolor( CYAN );
                cprintf(EOL " Which god do you wish to serve?" EOL);

Replacement in crawl-ref/source/newgame.cc at line 3661 [5.1132300]

B:BD[5.1223597] → [5.1223597:1223762]

B:BD[5.1223762] → [7.18511:18663]

B:BD[7.18663] → [2.2769:2927]

            textcolor( LIGHTGREY );
            cprintf("a - Zin (for traditional priests)" EOL);
            cprintf("b - Yredelemnul (for priests of death)" EOL);
            if (you.species == SP_HILL_ORC)
                cprintf("c - Beogh (priest of Orcs)" EOL);
                
            textcolor( BROWN );
            cprintf(EOL "* - Random choice; "
                        "Bksp - Back to species and class selection; "
                        "X - Quit" EOL);

[5.1223597]

[7.18713]

                textcolor( LIGHTGREY );
                cprintf("a - Zin (for traditional priests)" EOL);
                cprintf("b - Yredelemnul (for priests of death)" EOL);
                if (you.species == SP_HILL_ORC)
                    cprintf("c - Beogh (priest of Orcs)" EOL);

Replacement in crawl-ref/source/newgame.cc at line 3667 [5.1132300]

B:BD[7.18714] → [7.18714:18835]

            if (Options.prev_pr == GOD_BEOGH && you.species != SP_HILL_ORC)
               Options.prev_pr = GOD_NO_GOD;

[7.18714]

[9.231392]

                textcolor( BROWN );
                cprintf(EOL "* - Random choice; "
                            "Bksp - Back to species and class selection; "
                            "X - Quit" EOL);
                if (Options.prev_pr == GOD_BEOGH && you.species != SP_HILL_ORC)
                    Options.prev_pr = GOD_NO_GOD;

Replacement in crawl-ref/source/newgame.cc at line 3675 [5.1132300]

B:BD[9.231393] → [9.231393:231670]

B:BD[9.231670] → [7.18836:18900]

∅:D[7.18900] → [9.231670:231739]

B:BD[9.231670] → [9.231670:231739]

            if (Options.prev_pr != GOD_NO_GOD)
            {
                textcolor(BROWN);
                cprintf(EOL "Enter - %s" EOL,
                        Options.prev_pr == GOD_ZIN? "Zin" :
                        Options.prev_pr == GOD_YREDELEMNUL? "Yredelemnul" :
                        Options.prev_pr == GOD_BEOGH? "Beogh" :
                                            "Random");
            }

[9.231393]

[5.1223762]

                if (Options.prev_pr != GOD_NO_GOD)
                {
                    textcolor(BROWN);
                    cprintf(EOL "Enter - %s" EOL,
                            Options.prev_pr == GOD_ZIN? "Zin" :
                            Options.prev_pr == GOD_YREDELEMNUL? "Yredelemnul" :
                            Options.prev_pr == GOD_BEOGH? "Beogh" :
                                               "Random");
                }

Replacement in crawl-ref/source/newgame.cc at line 3685 [5.1132300]

B:BD[5.1223763] → [5.1223763:1223810]

          getkey:
            keyn = get_ch();

[5.1223763]

[9.231740]

               getkey:
                keyn = get_ch();

Replacement in crawl-ref/source/newgame.cc at line 3688 [5.1132300]

B:BD[9.231741] → [9.231741:231981]

B:BD[9.231981] → [7.18901:19010]

            if ((keyn == '\r' || keyn == '\n') 
                    && Options.prev_pr != GOD_NO_GOD)
            {
                keyn =  Options.prev_pr == GOD_ZIN? 'a' :
                        Options.prev_pr == GOD_YREDELEMNUL? 'b' :
                        Options.prev_pr == GOD_BEOGH? 'c' :
                                            '*';

[9.231741]

[5.1223810]

                if ((keyn == '\r' || keyn == '\n')
                     && Options.prev_pr != GOD_NO_GOD)
                {
                     keyn =  Options.prev_pr == GOD_ZIN? 'a' :
                             Options.prev_pr == GOD_YREDELEMNUL? 'b' :
                             Options.prev_pr == GOD_BEOGH? 'c' :
                                                '*';

Replacement in crawl-ref/source/newgame.cc at line 3696 [5.1132300]
B:BD[5.1223811] → [9.232031:232045]
```
            }
```
[5.1223811]
[9.232045]
```
                }
```

Replacement in crawl-ref/source/newgame.cc at line 3698 [5.1132300]

∅:D[9.232058] → [5.1223811:1223851]

B:BD[5.1223811] → [5.1223811:1223851]

B:BD[5.1223851] → [2.2928:3116]

∅:D[2.3116] → [7.19011:19033]

B:BD[5.1223851] → [7.19011:19033]

∅:D[7.19033] → [9.232081:232151]

B:BD[9.232081] → [9.232081:232151]

B:BD[9.232151] → [7.19034:19142]

∅:D[7.19142] → [9.232151:232174]

B:BD[9.232151] → [9.232151:232174]

∅:D[9.232174] → [5.1223851:1224029]

B:BD[5.1223851] → [5.1223851:1224029]

B:BD[5.1224029] → [7.19143:19213]

            switch (keyn)
            {
            case CK_BKSP:
            case ' ':
                return false;
            case 'X':
                cprintf(EOL "Goodbye!");
                end(0);
                break;
            case '*':
                you.religion = coinflip()? GOD_ZIN : GOD_YREDELEMNUL;
                if (you.species == SP_HILL_ORC && coinflip())
                    you.religion = GOD_BEOGH;
                break;
            case 'a':
                you.religion = GOD_ZIN;
                break;
            case 'b':
                you.religion = GOD_YREDELEMNUL;
                break;
            case 'c':
                if (you.species == SP_HILL_ORC)

[9.232058]

[7.19213]

                switch (keyn)

Replacement in crawl-ref/source/newgame.cc at line 3700 [5.1132300]

B:BD[7.19231] → [7.19231:19341]

∅:D[7.19341] → [5.1224029:1224093]

B:BD[5.1224029] → [5.1224029:1224093]

                   you.religion = GOD_BEOGH;
                   break;
                } // else fall through
            default:
                goto getkey;
            }

[7.19231]

[9.232175]

                case CK_BKSP:
                case ' ':
                    return false;
                case 'X':
                    cprintf(EOL "Goodbye!");
                    end(0);
                    break;
                case '*':
                    you.religion = coinflip()? GOD_ZIN : GOD_YREDELEMNUL;
                    if (you.species == SP_HILL_ORC && coinflip())
                        you.religion = GOD_BEOGH;
                    break;
                case 'a':
                    you.religion = GOD_ZIN;
                    break;
                case 'b':
                    you.religion = GOD_YREDELEMNUL;
                    break;
                case 'c':
                    if (you.species == SP_HILL_ORC)
                    {
                        you.religion = GOD_BEOGH;
                        break;
                    } // else fall through
                default:
                    goto getkey;
                }

Replacement in crawl-ref/source/newgame.cc at line 3728 [5.1132300]

B:BD[9.232176] → [7.19342:19402]

            ng_pr = keyn == '*'? GOD_RANDOM : you.religion;

[9.232176]

[5.1224093]

                ng_pr = keyn == '*'? GOD_RANDOM : you.religion;
            }

Replacement in crawl-ref/source/newgame.cc at line 3794 [5.1132300]
B:BD[5.1226089] → [5.1226089:1226132]
```
        if (player_genus(GENPC_DRACONIAN))
```
[5.1226089]
[5.1226132]
```
        if (player_genus(GENPC_DRACONIAN) || you.species == SP_OGRE)
```

Insertion in crawl-ref/source/newgame.cc at line 4118 [5.1132300]

[4.1120]

[5.1236778]

        else if (you.species == SP_OGRE)
            you.inv[2].sub_type = ARM_ANIMAL_SKIN;

Deletion in crawl-ref/source/newgame.cc at line 4127 [5.1132300]
B:BD[5.1236928] → [5.1236928:1237013]
```
        // Removing spellcasting -- bwr
        // you.skills[SK_SPELLCASTING] = 1;
```
Insertion in crawl-ref/source/newgame.cc at line 4131 [5.1132300]
[5.1237101]
[4.1161]
```
        case SP_OGRE:
```
Deletion in crawl-ref/source/newgame.cc at line 4263 [5.1132300]
B:BD[5.1241068] → [5.1241068:1241116]
```
            //you.skills [SK_ENCHANTMENTS] = 1;
```
Deletion in crawl-ref/source/newgame.cc at line 4270 [5.1132300]
B:BD[5.1241305] → [5.1241305:1241353]
```
            //you.skills [SK_ENCHANTMENTS] = 1;
```
Deletion in crawl-ref/source/newgame.cc at line 4277 [5.1132300]
B:BD[5.1241540] → [5.1241540:1241588]
```
            //you.skills [SK_ENCHANTMENTS] = 1;
```

Replacement in crawl-ref/source/newgame.cc at line 4458 [5.1132300]

B:BD[5.1248406] → [5.1248406:1248477]

        if (you.species == SP_SPRIGGAN || you.species == SP_OGRE_MAGE)

[5.1248406]

[5.1248477]

        if (you.species == SP_SPRIGGAN || you.species == SP_OGRE_MAGE
              || player_genus(GENPC_DRACONIAN))
        {

Replacement in crawl-ref/source/newgame.cc at line 4462 [5.1132300]
B:BD[5.1248521] → [5.1248521:1248522]
[5.1248521]
[5.1248522]
```
        }
```
Deletion in crawl-ref/source/newgame.cc at line 4497 [5.1132300]
B:BD[5.1249713] → [5.1249713:1249793]
```
        //if (you.species == SP_OGRE_MAGE) you.inv_sub_type [0] = WPN_GLAIVE;
```
Insertion in crawl-ref/source/newgame.cc at line 4500 [5.1132300]
[5.1249884]
[2.3293]
```
        
```
Insertion in crawl-ref/source/newgame.cc at line 4503 [5.1132300]
[2.3349]
[5.1249948]
```
            
```
Insertion in crawl-ref/source/newgame.cc at line 4536 [5.1132300]
[5.1250983]
[2.3350]
```
        
```
Insertion in crawl-ref/source/newgame.cc at line 4539 [5.1132300]
[2.3406]
[5.1251047]
Insertion in crawl-ref/source/newgame.cc at line 4675 [5.1132300]
[2.3817]
[5.1254030]

Replacement in crawl-ref/source/newgame.cc at line 4772 [5.1132300]

B:BD[10.36018] → [10.36018:36158]

            // the new (piety-aware) Xom uses gift_timeout in his own special
            // way... (namely, a countdown to becoming bored)

[10.36018]

[10.36158]

            // the new Xom also uses gift_timeout in his own special way...
            // (namely, a countdown to becoming bored)

Insertion in crawl-ref/source/newgame.cc at line 4829 [5.1132300]
[5.1257097]
[2.4166]
Insertion in crawl-ref/source/newgame.cc at line 4832 [5.1132300]
[2.4222]
[5.1257161]
Deletion in crawl-ref/source/newgame.cc at line 4880 [5.1132300]
B:BD[5.1258736] → [5.1258736:1258790]
```
        //you.inv[3].sub_type = BOOK_YOUNG_POISONERS;
```
Deletion in crawl-ref/source/newgame.cc at line 4896 [5.1132300]
B:BD[5.1259366] → [6.393735:393819]
∅:D[6.393819] → [5.1259445:1259481]
B:BD[5.1259445] → [5.1259445:1259481]
```
        //you.skills[SK_RANGED_COMBAT] = 1; //jmf: removed these, added magic below
        //you.skills[SK_DARTS] = 1;
```

Overhaul of species/class combinations

Magical classes

Fighter classes

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/newgame.cc at line 886 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 893 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 902 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 926 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 931 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 932 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 933 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 939 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 948 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 959 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 960 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 977 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 978 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 981 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1017 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1034 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1040 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1047 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1063 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1088 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1092 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1097 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1121 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1135 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1142 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1166 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1193 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1202 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1214 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1241 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1266 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1273 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1281 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1288 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1297 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1307 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1323 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1345 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1393 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1401 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1411 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1420 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1442 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1446 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1458 [5.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1465 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1476 [5.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1485 [5.1132300]