fiddlerwoaroof/crawl - Change BTDIRPAGSX5DWEEV62VGTYALWM6G5LKFKHT7HYJXVH7XBA4BPHLQC

Fix the character selecting omitting letters for restricted classes (as

opposed to banned ones). Tweak the code to enforce wearable body armour and shield types for all species. I'm afraid the skills need to be adjusted as well, probably in more detail, but I'm rather clueless on that account.

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

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

BTDIRPAGSX5DWEEV62VGTYALWM6G5LKFKHT7HYJXVH7XBA4BPHLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 6150 [6.962854]
[4.337]
[5.8677]
```
    {
```
Insertion in crawl-ref/source/player.cc at line 6155 [6.962854]
[4.511]
[4.511]
```
    }
```
Insertion in crawl-ref/source/player.cc at line 6157 [6.962854]
[4.520]
[4.520]
```
    {
```
Insertion in crawl-ref/source/player.cc at line 6160 [6.962854]
[4.600]
[7.150]
```
    }
```

Replacement in crawl-ref/source/player.cc at line 6162 [6.962854]

B:BD[7.151] → [8.283:316]

∅:D[8.316] → [7.324:354]

∅:D[4.643] → [7.324:354]

B:BD[9.3473] → [7.324:354]

∅:D[7.354] → [9.3503:3564]

B:BD[9.3503] → [9.3503:3564]

    return random2(shield_class)
        + (random2(stat) / 4)
        + (random2(skill_bump(SK_SHIELDS)) / 4)
        - 1;

[7.151]

[9.3564]

    return (random2(shield_class)
            + (random2(stat) / 4)
            + (random2(skill_bump(SK_SHIELDS)) / 4)
            - 1);

Insertion in crawl-ref/source/newgame.cc at line 3029 [6.1132300]

[10.217]

[11.20613]

// Creates an item of a given base and sub type.
// replacement is used when handing out armour that is not be wearable for
// some species; otherwise use -1.

Replacement in crawl-ref/source/newgame.cc at line 3034 [6.1132300]

B:BD[11.20732] → [11.20732:20850]

                               int sub_type, int qty = 1,
                               int plus = 0, int plus2 = 0)

[11.20732]

[10.450]

                               int sub_type, int replacement = -1,
                               int qty = 1, int plus = 0, int plus2 = 0)

Insertion in crawl-ref/source/newgame.cc at line 3057 [6.1132300]

[10.650]


    // If the character is restricted in wearing armour of equipment slot
    // eqslot, hand out replacement instead.
    if (item.base_type == OBJ_ARMOUR && replacement != -1
        && !you_can_wear(eqslot))
    {
        // Don't replace shields with bucklers for draconians and ogres.
        if (sub_type != ARM_SHIELD
            || !player_genus(GENPC_OGRE) && !player_genus(GENPC_DRACONIAN))
        {
            item.sub_type = replacement;
        }
    }

Replacement in crawl-ref/source/newgame.cc at line 3197 [6.1132300]

B:BD[5.9522] → [3.20345:20393]

∅:D[3.20393] → [12.1992:2099]

B:BD[12.1992] → [12.1992:2099]

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

[5.9522]

[12.2099]

    // Some species cannot wear real armour.
    if (you.skills[ SK_ARMOUR ] && !you_can_wear(EQ_BODY_ARMOUR))

Replacement in crawl-ref/source/newgame.cc at line 3271 [6.1132300]

B:BD[6.1200391] → [11.21092:21149]

∅:D[11.21149] → [13.535:663]

B:BD[13.535] → [13.535:663]

            _newgame_make_item(4, EQ_SHIELD, OBJ_ARMOUR,
                (player_genus(GENPC_DRACONIAN) || you.species == SP_OGRE_MAGE) ?
                    ARM_SHIELD : ARM_BUCKLER);

[6.1200391]

[6.1200673]

            _newgame_make_item(4, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD,
                               ARM_BUCKLER);

Replacement in crawl-ref/source/newgame.cc at line 3617 [6.1132300]
B:BD[3.23081] → [3.23081:23115]
```
        bool good_choice = false;
```
[3.23081]
[14.14229]
```
        bool good_choice;
```
Deletion in crawl-ref/source/newgame.cc at line 3631 [6.1132300]
B:BD[3.23637] → [3.23637:23673]
```
                good_choice = true;
```

Replacement in crawl-ref/source/newgame.cc at line 3637 [6.1132300]

B:BD[3.23806] → [3.23806:23836]

            if (!good_choice)

[3.23806]

[3.23836]

            if (_class_allowed(you.species, which_job) == CC_BANNED)

Replacement in crawl-ref/source/newgame.cc at line 3842 [6.1132300]

B:BD[6.1216005] → [11.23431:23471]

                _newgame_clear_item(0);

[6.1216005]

[6.1216641]

                _newgame_clear_item(0); // Trolls go unarmed.

Deletion in crawl-ref/source/newgame.cc at line 3844 [6.1132300]
B:BD[6.1216651] → [15.2546:2594]
∅:D[16.258] → [6.1216720:1216730]
∅:D[15.2594] → [6.1216720:1216730]
∅:D[17.9500] → [6.1216720:1216730]
B:BD[6.1216720] → [6.1216720:1216730]
B:BD[6.1216730] → [11.23472:23507]
∅:D[15.2629] → [18.408:440]
∅:D[11.23507] → [18.408:440]
B:BD[18.408] → [18.408:440]
B:BD[18.440] → [5.9783:9784]
∅:D[5.9784] → [11.23508:23651]
B:BD[15.2643] → [11.23508:23651]
∅:D[18.440] → [6.1217319:1217329]
∅:D[15.2784] → [6.1217319:1217329]
∅:D[11.23651] → [6.1217319:1217329]
B:BD[6.1217319] → [6.1217319:1217329]
```
        else if (player_genus(GENPC_DRACONIAN))
        {
            if (!_choose_weapon())
                return (false);
            _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE);
            _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD);
        }
```

Deletion in crawl-ref/source/newgame.cc at line 3853 [6.1132300]

B:BD[6.1217629] → [15.2935:2978]

B:BD[15.2978] → [11.23950:24109]

            if (you.species != SP_VAMPIRE)
            {
                _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_DART,
                                   10 + roll_dice( 2, 10 ));
            }

Replacement in crawl-ref/source/newgame.cc at line 3859 [6.1132300]

B:BD[15.3173] → [11.24146:24295]

            _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_SCALE_MAIL);
            _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD);

[15.3173]

[6.1218445]

            _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_SCALE_MAIL,
                                  ARM_ROBE);
            _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD,
                                  ARM_BUCKLER);
        }
        // For small species, hand out some darts.
        if (player_size(PSIZE_BODY) < SIZE_MEDIUM)
        {
            _newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_DART, -1,
                               10 + roll_dice( 2, 10 ));

Replacement in crawl-ref/source/newgame.cc at line 3922 [6.1132300]

B:BD[11.24396] → [11.24396:24580]

                           you.species == SP_OGRE_MAGE? WPN_QUARTERSTAFF :
                           player_genus(GENPC_DWARVEN)? WPN_HAMMER :
                           WPN_DAGGER);

[11.24396]

[6.1220090]

                           you.species == SP_OGRE_MAGE ? WPN_QUARTERSTAFF :
                           player_genus(GENPC_DWARVEN) ? WPN_HAMMER
                                                       : WPN_DAGGER);

Replacement in crawl-ref/source/newgame.cc at line 3973 [6.1132300]

B:BD[12.2489] → [2.2546:2625]

            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE, 1, 1, 1);

[12.2489]

[2.2625]

        {
            _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_KNIFE, -1,
                               1, 1, 1);
        }

Replacement in crawl-ref/source/newgame.cc at line 3987 [6.1132300]

B:BD[19.312] → [11.24878:24951]

            _newgame_make_item(2, EQ_NONE, OBJ_POTIONS, POT_HEALING, 2);

[19.312]

[5.9823]

            _newgame_make_item(2, EQ_NONE, OBJ_POTIONS, POT_HEALING, -1, 2);

Replacement in crawl-ref/source/newgame.cc at line 4136 [6.1132300]

B:BD[11.25335] → [11.25335:25397]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART,

[11.25335]

[11.25397]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1,

Replacement in crawl-ref/source/newgame.cc at line 4156 [6.1132300]

B:BD[6.1226089] → [12.6393:6462]

∅:D[12.6462] → [6.1226132:1226142]

B:BD[6.1226132] → [6.1226132:1226142]

B:BD[6.1226142] → [11.25564:25714]

∅:D[10.3254] → [6.1226628:1226661]

∅:D[11.25714] → [6.1226628:1226661]

B:BD[6.1226628] → [6.1226628:1226661]

B:BD[6.1226661] → [11.25715:25900]

∅:D[10.3437] → [6.1227150:1227160]

∅:D[11.25900] → [6.1227150:1227160]

B:BD[6.1227150] → [6.1227150:1227160]

        if (player_genus(GENPC_DRACONIAN) || you.species == SP_OGRE)
        {
            _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ANIMAL_SKIN);
            _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD);
        }
        else
        {
            _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR,
                               ARM_LEATHER_ARMOUR);
            _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_BUCKLER);
        }

[6.1226089]

[20.235]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR,
                              ARM_LEATHER_ARMOUR, ARM_ANIMAL_SKIN);
        _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD,
                              ARM_BUCKLER);

Replacement in crawl-ref/source/newgame.cc at line 4164 [6.1132300]

B:BD[21.1255] → [11.25901:25979]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, 4);

[21.1255]

[21.1256]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1,
                               4);

Replacement in crawl-ref/source/newgame.cc at line 4199 [6.1132300]

B:BD[11.26323] → [11.26323:26389]

        _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD);

[11.26323]

[11.26389]

        _newgame_make_item(2, EQ_SHIELD, OBJ_ARMOUR, ARM_SHIELD, ARM_BUCKLER);

Replacement in crawl-ref/source/newgame.cc at line 4212 [6.1132300]

B:BD[6.1230030] → [11.26456:26595]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_DAGGER, 1,
                           1 + to_hit_bonus, 1 + (2 - to_hit_bonus));

[6.1230030]

[11.26595]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_DAGGER, -1,
                           1, 1 + to_hit_bonus, 1 + (2 - to_hit_bonus));

Replacement in crawl-ref/source/newgame.cc at line 4224 [6.1132300]

B:BD[6.1231587] → [11.26795:26861]

            _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART,

[6.1231587]

[11.26861]

            _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1,

Replacement in crawl-ref/source/newgame.cc at line 4230 [6.1132300]

B:BD[22.134] → [11.26919:26987]

            _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_NEEDLE,

[22.134]

[11.26987]

            _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_NEEDLE, -1,

Replacement in crawl-ref/source/newgame.cc at line 4233 [6.1132300]

B:BD[23.254] → [11.27041:27109]

            _newgame_make_item(5, EQ_NONE, OBJ_MISSILES, MI_NEEDLE,

[23.254]

[11.27109]

            _newgame_make_item(5, EQ_NONE, OBJ_MISSILES, MI_NEEDLE, -1,

Replacement in crawl-ref/source/newgame.cc at line 4261 [6.1132300]
B:BD[6.1232766] → [6.1232766:1232805]
```
            you.equip[EQ_WEAPON] = -1;
```
[6.1232756]
[6.1232815]
```
            you.equip[EQ_WEAPON] = -1; // Trolls fight unarmed.
```

Replacement in crawl-ref/source/newgame.cc at line 4270 [6.1132300]

B:BD[6.1233568] → [11.27376:27455]

∅:D[11.27455] → [10.5009:5064]

B:BD[10.5009] → [10.5009:5064]

∅:D[10.5064] → [6.1233771:1233822]

B:BD[6.1233771] → [6.1233771:1233822]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR);
        if (!can_wear_armour(you.inv[1], false, true))
            you.inv[1].sub_type = ARM_ANIMAL_SKIN;

[6.1233568]

[6.1234305]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR,
                              ARM_ANIMAL_SKIN);

Replacement in crawl-ref/source/newgame.cc at line 4280 [6.1132300]
B:BD[6.1234494] → [6.1234494:1234534]
```
            you.skills[SK_DODGING] = 2;
```
[6.1234494]
[6.1234534]
```
            you.skills[SK_DODGING]   = 2;
```

Replacement in crawl-ref/source/newgame.cc at line 4290 [6.1132300]

B:BD[6.1234799] → [6.1234799:1234836]

B:BD[6.1234877] → [6.1234877:1234956]

            you.skills[SK_AXES] = 3;
            you.skills[SK_ARMOUR] = 2;
            you.skills[SK_DODGING] = 2;

[6.1234799]

[24.4316]

            you.skills[SK_AXES]     = 3;
            you.skills[SK_ARMOUR]   = 2;
            you.skills[SK_DODGING]  = 2;

Replacement in crawl-ref/source/newgame.cc at line 4299 [6.1132300]

B:BD[11.27523] → [11.27523:27602]

∅:D[11.27602] → [10.5209:5393]

B:BD[10.5209] → [10.5209:5393]

        _newgame_make_item(2, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR);
        if (!can_wear_armour(you.inv[2], false, true))
        {
            you.inv[2].sub_type =
                player_genus(GENPC_DRACONIAN)? ARM_ROBE : ARM_ANIMAL_SKIN;
        }

[11.27523]

[6.1235516]

        _newgame_make_item(2, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR,
                           (player_genus(GENPC_DRACONIAN) ? ARM_ROBE
                                                          : ARM_ANIMAL_SKIN));

Replacement in crawl-ref/source/newgame.cc at line 4415 [6.1132300]

∅:D[25.8615] → [11.28215:28281]

B:BD[6.1239824] → [11.28215:28281]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_DART,

[25.8615]

[11.28281]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_DART, -1,

Replacement in crawl-ref/source/newgame.cc at line 4429 [6.1132300]

∅:D[3.27799] → [11.28406:28472]

B:BD[6.1240394] → [11.28406:28472]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_DART,

[3.27799]

[11.28472]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_DART, -1,

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

B:BD[11.28860] → [11.28860:28932]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_STONE, 20);

[11.28860]

[5.9841]

            _newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_STONE, -1, 20);

Replacement in crawl-ref/source/newgame.cc at line 4528 [6.1132300]
∅:D[3.28179] → [11.29161:29224]
B:BD[6.1245361] → [11.29161:29224]
```
        _newgame_make_item(1, EQ_NONE, OBJ_MISSILES, MI_ARROW,
```
[3.28179]
[11.29224]
```
        _newgame_make_item(1, EQ_NONE, OBJ_MISSILES, MI_ARROW, -1,
```

Replacement in crawl-ref/source/newgame.cc at line 4535 [6.1132300]

B:BD[6.1246251] → [11.29410:29481]

        _newgame_make_item(4, EQ_NONE, OBJ_POTIONS, POT_CONFUSION, 2);

[6.1246204]

[11.29481]

        _newgame_make_item(4, EQ_NONE, OBJ_POTIONS, POT_CONFUSION, -1, 2);

Insertion in crawl-ref/source/newgame.cc at line 4568 [6.1132300]
[11.29727]
[6.1247930]

Replacement in crawl-ref/source/newgame.cc at line 4576 [6.1132300]

B:BD[6.1248406] → [11.29728:29807]

∅:D[10.7333] → [12.6579:6649]

∅:D[11.29807] → [12.6579:6649]

B:BD[6.1248406] → [12.6579:6649]

B:BD[12.6649] → [11.29808:29854]

∅:D[11.29854] → [12.6697:6707]

B:BD[12.6697] → [12.6697:6707]

∅:D[12.6707] → [6.1248477:1248521]

B:BD[6.1248477] → [6.1248477:1248521]

B:BD[6.1248521] → [12.6708:6718]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR);
        if (you.species == SP_SPRIGGAN || you.species == SP_OGRE_MAGE
            || player_genus(GENPC_DRACONIAN))
        {
            you.inv[1].sub_type = ARM_ROBE;
        }

[6.1248406]

[10.7334]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR,
                           ARM_ROBE);

Replacement in crawl-ref/source/newgame.cc at line 4583 [6.1132300]

B:BD[11.30003] → [11.30003:30065]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART,

[11.30003]

[11.30065]

        _newgame_make_item(4, EQ_NONE, OBJ_MISSILES, MI_DART, -1,

Replacement in crawl-ref/source/newgame.cc at line 4770 [6.1132300]

B:BD[6.1253491] → [11.30705:30831]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_SHORT_SWORD, 1,
                           random2(3), random2(3));

[6.1253491]

[6.1253789]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_SHORT_SWORD, -1,
                           1, random2(3), random2(3));

Replacement in crawl-ref/source/newgame.cc at line 4783 [6.1132300]

B:BD[6.1254054] → [11.30864:30975]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE, 1,
                           random2(3));

[6.1254054]

[6.1254285]

        _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE, -1,
                           1, random2(3));

Insertion in crawl-ref/source/newgame.cc at line 4961 [6.1132300]
[11.31627]
[11.31627]

Replacement in crawl-ref/source/newgame.cc at line 4975 [6.1132300]

B:BD[6.1258097] → [11.31693:31832]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_DAGGER, 1,
                           1 + to_hit_bonus, 1 + (2 - to_hit_bonus));

[6.1258097]

[11.31832]

        _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_DAGGER, -1,
                           1, 1 + to_hit_bonus, 1 + (2 - to_hit_bonus));

Insertion in crawl-ref/source/newgame.cc at line 4993 [6.1132300]
[6.1259598]
[11.32032]
```
        you.equip[EQ_WEAPON] = -1; // Monks fight unarmed.
```
Deletion in crawl-ref/source/newgame.cc at line 4996 [6.1132300]
∅:D[10.9145] → [6.1259811:1259846]
∅:D[11.32101] → [6.1259811:1259846]
B:BD[6.1259811] → [6.1259811:1259846]
```
        you.equip[EQ_WEAPON] = -1;
```

Replacement in crawl-ref/source/itemprop.cc at line 844 [26.646661]

B:BD[26.669341] → [26.669341:669413]

// These functions handle the description and subtypes for helmets/caps

[26.669341]

[26.669413]

// These functions handle the description and subtypes for helmets/caps.

Replacement in crawl-ref/source/itemprop.cc at line 944 [26.646661]

B:BD[26.672859] → [26.672859:672932]

    // artefact armours have no ego type, must look up powers separately

[26.672859]

[27.2895]

    // Artefact armours have no ego type, must look up powers separately.

Replacement in crawl-ref/source/itemprop.cc at line 955 [26.646661]
∅:D[27.2936] → [26.673122:673167]
B:BD[26.673122] → [26.673122:673167]
```
// Armour information and checking functions
```
[27.2936]
[26.673167]
```
// Armour information and checking functions.
```
Replacement in crawl-ref/source/itemprop.cc at line 1001 [26.646661]
B:BD[26.674138] → [26.674138:674191]
```
}                               // end hide2armour()
```
[26.674138]
[26.674191]
```
}
```
Replacement in crawl-ref/source/item_use.cc at line 984 [6.2781507]
B:BD[6.2801361] → [28.3180:3242]
∅:D[28.3242] → [6.2801425:2801467]
B:BD[6.2801425] → [6.2801425:2801467]
```
    if (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE
        || player_genus(GENPC_DRACONIAN))
```
[6.2801361]
[6.2801467]
```
    if (player_genus(GENPC_OGRE) || player_genus(GENPC_DRACONIAN))
```

Fix the character selecting omitting letters for restricted classes (as

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.cc at line 6150 [6.962854]

Insertion in crawl-ref/source/player.cc at line 6155 [6.962854]

Insertion in crawl-ref/source/player.cc at line 6157 [6.962854]

Insertion in crawl-ref/source/player.cc at line 6160 [6.962854]