fiddlerwoaroof/crawl - Change 2W34FMSGJ2BZY7QQM6X6RTVRXXI2H72Z2MH75SU3SDL4FN4G74KAC

Fixed two aquirement bugs:

Nagas and centaurs were never getting barding.
Vampires were only getting one potion of blood if they acquired food.

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

Created by zelgadis on December 8, 2007

2W34FMSGJ2BZY7QQM6X6RTVRXXI2H72Z2MH75SU3SDL4FN4G74KAC

Dependencies

In channels

main

Change contents

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

B:BD[5.536] → [5.536:585]

                                    int &unique)

[5.536]

[6.3394641]

                                    int &quantity)

Replacement in crawl-ref/source/effects.cc at line 712 [6.3382105]
B:BD[7.24736] → [8.1609:1646]
```
            unique = 2 + random2(4);
```
[7.24736]
[7.24736]
```
            quantity = 2 + random2(4);
```

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

B:BD[6.3397875] → [6.3397875:3397958]

        // quantity is handled by unique for food
        unique = 3 + random2(5);

[6.3397875]

[6.3397958]

        quantity = 3 + random2(5);

Replacement in crawl-ref/source/effects.cc at line 740 [6.3382105]
B:BD[6.3398094] → [6.3398094:3398135]
```
            unique += random2avg(10, 2);
```
[6.3398094]
[6.3398135]
```
            quantity += random2avg(10, 2);
```

Deletion in crawl-ref/source/effects.cc at line 862 [6.3382105]

B:BD[6.3400395] → [6.3400395:3400452]

B:BD[6.3400452] → [4.544:678]

∅:D[4.678] → [6.3400595:3400654]

∅:D[9.1387] → [6.3400595:3400654]

∅:D[10.5347] → [6.3400595:3400654]

B:BD[6.3400595] → [6.3400595:3400654]

        // mutation specific problems (horns allow caps)
        if ((type_wanted == ARM_BOOTS && !player_has_feet())
            || (you.has_claws(false) >= 3 && type_wanted == ARM_GLOVES))
        {
            type_wanted = OBJ_RANDOM;
        }

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

B:BD[6.3400841] → [6.3400841:3400912]

            if (type_wanted == ARM_GLOVES || type_wanted == ARM_BOOTS)

[6.3400841]

[6.3400912]

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

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

[6.3401431]

[6.3401558]

            break;
        case SP_NAGA:
            if (type_wanted == ARM_BOOTS || type_wanted == ARM_CENTAUR_BARDING)
                type_wanted = ARM_NAGA_BARDING;

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

[6.3401578]

        case SP_CENTAUR:
            if (type_wanted == ARM_BOOTS || type_wanted == ARM_NAGA_BARDING)
                type_wanted = ARM_CENTAUR_BARDING;
            break;

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

[6.3401595]

            if (type_wanted == ARM_CENTAUR_BARDING 
                || type_wanted == ARM_NAGA_BARDING)
            {
                type_wanted = ARM_BOOTS;
            }

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

[6.3401614]

        }
        // mutation specific problems (horns allow caps)
        if ((type_wanted == ARM_BOOTS && !player_has_feet())
            || (you.has_claws(false) >= 3 && type_wanted == ARM_GLOVES))
        {
            type_wanted = OBJ_RANDOM;

Insertion in crawl-ref/source/effects.cc at line 1352 [6.3382105]
[6.3417546]
[5.1920]
```
        int quant = 1;
```

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

B:BD[11.16248] → [3.57756:57784]

∅:D[3.57784] → [12.1929:2007]

B:BD[5.2009] → [12.1929:2007]

            int unique = 1;
            int type_wanted = find_acquirement_subtype(class_wanted, unique);

[11.16248]

[8.1647]

            int type_wanted = find_acquirement_subtype(class_wanted, quant);

Deletion in crawl-ref/source/effects.cc at line 1361 [6.3382105]
∅:D[5.2084] → [11.16248:16307]
B:BD[11.16248] → [11.16248:16307]
```
            // BCR - unique is now used for food quantity.
```

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

[6.3417883]

        // give some more gold
        if ( class_wanted == OBJ_GOLD )
            thing.quantity += 150;
        else if (quant > 1)
            thing.quantity = quant;

Deletion in crawl-ref/source/effects.cc at line 1578 [6.3382105]

∅:D[13.944413] → [6.3423883:3423997]

B:BD[6.3423883] → [6.3423883:3423997]

B:BD[6.3423997] → [13.944414:944469]

∅:D[13.944469] → [6.3424065:3424117]

B:BD[6.3424065] → [6.3424065:3424117]

B:BD[6.3424117] → [13.944470:944528]

∅:D[13.944528] → [6.3424271:3424342]

B:BD[6.3424271] → [6.3424271:3424342]

B:BD[6.3424342] → [13.944529:944645]

∅:D[13.944645] → [6.3424487:3424505]

B:BD[6.3424487] → [6.3424487:3424505]

B:BD[6.3424505] → [13.944646:944720]

                }
                break;
            case ARM_BOOTS:
                if (you.species == SP_NAGA)
                    thing.sub_type = ARM_NAGA_BARDING;
                else if (you.species == SP_CENTAUR)
                    thing.sub_type = ARM_CENTAUR_BARDING;
                // fix illegal barding ego types caused by above hack
                if (thing.sub_type != ARM_BOOTS &&
                    get_armour_ego_type(thing) == SPARM_RUNNING)
                {
                    set_item_ego_type( thing, OBJ_ARMOUR, SPARM_NORMAL );

Deletion in crawl-ref/source/effects.cc at line 1581 [6.3382105]

B:BD[13.944762] → [13.944762:945091]

B:BD[13.945091] → [2.918:957]

∅:D[2.957] → [13.945114:945439]

B:BD[13.945114] → [13.945114:945439]

∅:D[13.945439] → [6.3424593:3424635]

B:BD[6.3424593] → [6.3424593:3424635]

            case ARM_NAGA_BARDING:
            case ARM_CENTAUR_BARDING:
                // make barding appropriate
                if (you.species == SP_NAGA )
                    thing.sub_type = ARM_NAGA_BARDING;
                else if ( you.species == SP_CENTAUR )
                    thing.sub_type = ARM_CENTAUR_BARDING;
                else
                {
                    thing.sub_type = ARM_BOOTS;
                    // Fix illegal ego types
                    if (get_armour_ego_type(thing) == SPARM_COLD_RESISTANCE ||
                        get_armour_ego_type(thing) == SPARM_FIRE_RESISTANCE)
                        set_item_ego_type(thing, OBJ_ARMOUR, SPARM_NORMAL);
                }
                break;