fiddlerwoaroof/crawl - Change HHHZGZT7QAERYSE26QGJPFAV6TQQXXECP6RTCLF6SZQ5L6GTXPWAC

sExperimentally tweak armour acquirement to give out more equipment for

secondary slots. (Okawaru still uses the old 50% armour, rest secondary chances.)

If mundane items are created, preferably replace subtype with an unfilled equipment slot. When trying this in wizard mode, this never came up, though: ~50 acquirements while naked and all were egos, with a few artefacts strewn in. I then ran some tests when enforcing non-egos, and this worked fine. (And yes, I did take the hack out again.)

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

Created by j-p-e-g on August 6, 2009

HHHZGZT7QAERYSE26QGJPFAV6TQQXXECP6RTCLF6SZQ5L6GTXPWAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/effects.cc at line 877 [6.3382105]
B:BD[5.3475] → [5.3475:3524]
```
static armour_type _acquirement_armour_subtype()
```
[5.3475]
[6.3394641]
```
static armour_type _pick_wearable_armour(const armour_type arm)
```

Replacement in crawl-ref/source/effects.cc at line 879 [6.3382105]

B:BD[6.3394643] → [5.3525:3585]

B:BD[5.3585] → [4.9592:9652]

∅:D[4.9652] → [5.3644:3875]

B:BD[5.3644] → [5.3644:3875]

    // Increasing the representation of the non-body armour
    // slots here to make up for the fact that there's only
    // one type of item for most of them. -- bwr
    //
    // NUM_ARMOURS is body armour and handled below
    armour_type result = (coinflip()) ? NUM_ARMOURS
                                      : _random_nonbody_armour_type();

[6.3394643]

[7.4269]

    armour_type result = arm;

Replacement in crawl-ref/source/effects.cc at line 898 [6.3382105]

B:BD[5.4365] → [5.4365:4521]

        if (result == ARM_GLOVES
            || result == ARM_BOOTS
            || result == ARM_CENTAUR_BARDING
            || result == ARM_NAGA_BARDING)

[5.4365]

[5.4521]

        if (arm == ARM_GLOVES
            || arm == ARM_BOOTS
            || arm == ARM_CENTAUR_BARDING
            || arm == ARM_NAGA_BARDING)

Replacement in crawl-ref/source/effects.cc at line 905 [6.3382105]
B:BD[5.4592] → [5.4592:4631]
```
        else if (result == ARM_SHIELD)
```
[5.4592]
[5.4631]
```
        else if (arm == ARM_SHIELD)
```
Replacement in crawl-ref/source/effects.cc at line 912 [6.3382105]
B:BD[5.4851] → [5.4851:4891]
```
        else if (result == NUM_ARMOURS)
```
[5.4851]
[5.4891]
```
        else if (arm == NUM_ARMOURS)
```

Replacement in crawl-ref/source/effects.cc at line 919 [6.3382105]

B:BD[5.5007] → [5.5007:5073]

        if (result == ARM_BOOTS || result == ARM_CENTAUR_BARDING)

[5.5007]

[5.5073]

        if (arm == ARM_BOOTS || arm == ARM_CENTAUR_BARDING)

Replacement in crawl-ref/source/effects.cc at line 924 [6.3382105]

B:BD[5.5149] → [5.5149:5212]

        if (result == ARM_BOOTS || result == ARM_NAGA_BARDING)

[5.5149]

[5.5212]

        if (arm == ARM_BOOTS || arm == ARM_NAGA_BARDING)

Replacement in crawl-ref/source/effects.cc at line 929 [6.3382105]

B:BD[5.5283] → [5.5283:5356]

        if (result == ARM_CENTAUR_BARDING || result == ARM_NAGA_BARDING)

[5.5283]

[5.5356]

        if (arm == ARM_CENTAUR_BARDING || arm == ARM_NAGA_BARDING)

Replacement in crawl-ref/source/effects.cc at line 935 [6.3382105]

B:BD[5.5464] → [5.5464:5576]

    if (result == ARM_BOOTS && !player_has_feet()
        || result == ARM_GLOVES && you.has_claws(false) >= 3)

[5.5464]

[6.3396439]

    if (arm == ARM_BOOTS && !player_has_feet()
        || arm == ARM_GLOVES && you.has_claws(false) >= 3)

Replacement in crawl-ref/source/effects.cc at line 946 [6.3382105]
B:BD[5.5868] → [5.5868:5897]
```
    if (result == ARM_HELMET
```
[5.5868]
[5.5897]
```
    if (arm == ARM_HELMET
```
Insertion in crawl-ref/source/effects.cc at line 951 [6.3382105]
[5.6025]
[6.3396809]
```
    return (result);
}
```

Insertion in crawl-ref/source/effects.cc at line 954 [6.3382105]

[6.3396810]

[3.2731]

static armour_type _acquirement_armour_subtype(bool okawaru)
{
    // Increasing the representation of the non-body armour
    // slots here to make up for the fact that there's only
    // one type of item for most of them. -- bwr
    //
    // NUM_ARMOURS is body armour and handled below
    armour_type result = NUM_ARMOURS;
    if (okawaru)
    {
        if (coinflip())
            result = _random_nonbody_armour_type();
    }
    else
    {
        static const equipment_type armour_slots[] =
            {  EQ_SHIELD, EQ_CLOAK, EQ_HELMET, EQ_GLOVES, EQ_BOOTS   };
        equipment_type picked = EQ_BODY_ARMOUR;
        const int num_slots = ARRAYSZ(armour_slots);
        // Start count at 1, for body armour (already picked).
        for (int i = 0, count = 1; i < num_slots; ++i)
            if (you_can_wear(armour_slots[i], true) && one_chance_in(++count))
                picked = armour_slots[i];
        switch (picked)
        {
        case EQ_SHIELD:
            result = ARM_SHIELD; break;
        case EQ_CLOAK:
            result = ARM_CLOAK; break;
        case EQ_HELMET:
            result = ARM_HELMET; break;
        case EQ_GLOVES:
            result = ARM_GLOVES; break;
        case EQ_BOOTS:
            result = ARM_BOOTS; break;
        default:
        case EQ_BODY_ARMOUR:
            result = NUM_ARMOURS; break;
        }
    }
    result = _pick_wearable_armour(result);

Replacement in crawl-ref/source/effects.cc at line 1025 [6.3382105]

B:BD[6.3397875] → [5.6678:6730]

        // everyone can wear things made from hides

[6.3397875]

[5.6730]

        // Everyone can wear things made from hides.

Insertion in crawl-ref/source/effects.cc at line 1043 [6.3382105]

[5.7416]

[6.3398587]


// If armour acquirement turned up a non-ego non-artefact armour item,
// see whether the player has any unfilled equipment slots. If so,
// hand out a mundane (and possibly negatively enchanted) item of that
// type. Otherwise, keep the original armour.
static void _try_give_mundane_armour(item_def &arm)
{
    static const equipment_type armour_slots[] =
        {  EQ_SHIELD, EQ_CLOAK, EQ_HELMET, EQ_GLOVES, EQ_BOOTS   };
    equipment_type picked = EQ_BODY_ARMOUR;
    const int num_slots = ARRAYSZ(armour_slots);
    for (int i = 0, count = 0; i < num_slots; ++i)
    {
        if (!you_can_wear(armour_slots[i]))
            continue;
        if (you.equip[armour_slots[i]] != -1)
            continue;
        if (one_chance_in(++count))
            picked = armour_slots[i];
    }

Insertion in crawl-ref/source/effects.cc at line 1067 [6.3382105]

[6.3398588]

[5.7417]

    // All available secondary slots already filled.
    if (picked == EQ_BODY_ARMOUR)
        return;
    armour_type result = NUM_ARMOURS;
    switch (picked)
    {
    case EQ_SHIELD:
        result = ARM_SHIELD; break;
    case EQ_CLOAK:
        result = ARM_CLOAK; break;
    case EQ_HELMET:
        result = ARM_HELMET; break;
    case EQ_GLOVES:
        result = ARM_GLOVES; break;
    case EQ_BOOTS:
        result = ARM_BOOTS; break;
    default:
        return;
    }
    // Clear the description flag.
    set_equip_desc(arm, ISFLAG_NO_DESC);
    arm.sub_type = _pick_wearable_armour(result);
    arm.plus = random2(5) - 2;
    int max_ench = armour_max_enchant(arm);
    if (arm.plus > max_ench)
        arm.plus = max_ench;
    else if (arm.plus < -max_ench)
        arm.plus = -max_ench;
}

Replacement in crawl-ref/source/effects.cc at line 1360 [6.3382105]

B:BD[5.21524] → [5.21524:21576]

                                     int &quantity)

[5.21524]

[5.21576]

                                     int &quantity, int agent = -1)

Replacement in crawl-ref/source/effects.cc at line 1394 [6.3382105]

B:BD[5.22635] → [5.22635:22715]

        case OBJ_ARMOUR:   type_wanted = _acquirement_armour_subtype();  break;

[5.22635]

[5.22795]

        case OBJ_ARMOUR:
        {
            const bool okawaru = (agent == GOD_OKAWARU);
            type_wanted = _acquirement_armour_subtype(okawaru);
            break;
        }

Insertion in crawl-ref/source/effects.cc at line 1716 [6.3382105]

[8.1353]

[6.3417525]


        // Well, the item may have fallen in the drink, but the intent is
        // that acquirement happened. -- bwr
        return (true);

Replacement in crawl-ref/source/effects.cc at line 1726 [6.3382105]

B:BD[9.16248] → [10.3347:3425]

            int type_wanted = _find_acquirement_subtype(class_wanted, quant);

[9.16248]

[11.2768]

            int type_wanted = _find_acquirement_subtype(class_wanted, quant,
                                                        agent);

Insertion in crawl-ref/source/effects.cc at line 1745 [6.3382105]

[2.3410]

[12.5766]


            // For mundane armour, try to change the subtype to something
            // matching a currently unfilled equipment slot.
            if (doodad.base_type == OBJ_ARMOUR && !is_artefact(doodad)
                && get_armour_ego_type(doodad) == SPARM_NORMAL)
            {
                _try_give_mundane_armour(doodad);
                if (agent == GOD_OKAWARU && doodad.plus < 0)
                    doodad.plus = 0;
            }

Insertion in crawl-ref/source/debug.cc at line 3454 [6.4016436]
[8.5165]
[13.1717]
```
    mpr("Results written into 'items.stat'.");
```
Insertion in crawl-ref/source/debug.cc at line 3677 [6.4016436]
[13.8233]
[6.4057134]
```
    mpr("Results written into 'items.stat'.");
```