fiddlerwoaroof/crawl - Change HG54HNDIBBRTBEXZZXDQJNSL3TDMCCLGL2VUQMN2C2ZR4OV7E42QC

Add wands to the list of items available from acquirement. Weights are

assigned arbitrarily and probably much too good. (There's a 50% chance of getting one of hasting, healing, teleportation, or fireball.)

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

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

HG54HNDIBBRTBEXZZXDQJNSL3TDMCCLGL2VUQMN2C2ZR4OV7E42QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 762 [4.3]

B:BD[3.112] → [3.112:174]

            OBJ_STAVES,  OBJ_FOOD,   OBJ_MISCELLANY, OBJ_GOLD

[3.112]

[3.174]

            OBJ_STAVES,  OBJ_WANDS,  OBJ_MISCELLANY, OBJ_FOOD,  OBJ_GOLD

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

[5.21452]

}
static int _acquirement_wand_subtype()
{
    int picked = NUM_WANDS;
    int total = 0;
    for (int type = 0; type < NUM_WANDS; ++type)
    {
        int w = 0;
        // First, weight according to usefulness.
        // (The numbers are approximately percentages.)
        switch (type)
        {
        case WAND_HASTING:
        case WAND_HEALING:
            w = 15; break;
        case WAND_TELEPORTATION:
        case WAND_FIREBALL:
            w = 10; break;
        case WAND_INVISIBILITY:
        case WAND_DIGGING:
        case WAND_DISINTEGRATION:
        case WAND_POLYMORPH_OTHER:
            w = 7; break;
        case WAND_FIRE:
        case WAND_COLD:
        case WAND_LIGHTNING:
            w = 5; break;
        default:
            w = 1; break;
        }
        // Unknown wands get another huge weight bonus.
        if (get_ident_type(OBJ_WANDS, type) == ID_UNKNOWN_TYPE)
            w += 10;
        total += w;
        if (x_chance_in_y(w, total))
            picked = type;
    }
    return (picked);

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

∅:D[7.6770] → [5.22795:22955]

B:BD[5.22795] → [5.22795:22955]

        case OBJ_MISCELLANY: type_wanted = _acquirement_misc_subtype();  break;
        case OBJ_STAVES: type_wanted = _acquirement_staff_subtype(already_has);

[7.6770]

[5.22955]

        case OBJ_MISCELLANY: type_wanted = _acquirement_misc_subtype(); break;
        case OBJ_WANDS:      type_wanted = _acquirement_wand_subtype(); break;
        case OBJ_STAVES:     type_wanted = _acquirement_staff_subtype(already_has);

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

B:BD[5.22974] → [5.22974:23050]

        case OBJ_JEWELLERY: type_wanted = _acquirement_jewellery_subtype();

[5.22974]

[5.23050]

        case OBJ_JEWELLERY:  type_wanted = _acquirement_jewellery_subtype();

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

B:BD[8.1073] → [9.1270:1410]

        mpr( "[a] Weapon  [b] Armour  [c] Jewellery      [d] Book" );
        mpr( "[e] Staff   [f] Food    [g] Miscellaneous  [h] Gold" );

[8.1024]

[8.1229]

        mpr("[a] Weapon  [b] Armour  [c] Jewellery      [d] Book");
        mpr("[e] Staff   [f] Wand    [g] Miscellaneous  [h] Food  [i] Gold");

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

B:BD[9.1446] → [9.1446:1894]

        case 'a': class_wanted = OBJ_WEAPONS;    break;
        case 'b': class_wanted = OBJ_ARMOUR;     break;
        case 'c': class_wanted = OBJ_JEWELLERY;  break;
        case 'd': class_wanted = OBJ_BOOKS;      break;
        case 'e': class_wanted = OBJ_STAVES;     break;
        case 'f': class_wanted = OBJ_FOOD;       break;
        case 'g': class_wanted = OBJ_MISCELLANY; break;
        case 'h': class_wanted = OBJ_GOLD;       break;

[9.1446]

[10.14911]

        case 'a': case ')':            class_wanted = OBJ_WEAPONS;    break;
        case 'b': case '[':  case ']': class_wanted = OBJ_ARMOUR;     break;
        case 'c': case '=':  case '"': class_wanted = OBJ_JEWELLERY;  break;
        case 'd': case '+':  case ':': class_wanted = OBJ_BOOKS;      break;
        case 'e': case '\\': case '|': class_wanted = OBJ_STAVES;     break;
        case 'f': case '/':            class_wanted = OBJ_WANDS;      break;
        case 'g': case '}':  case '{': class_wanted = OBJ_MISCELLANY; break;
        case 'h': case '%':            class_wanted = OBJ_FOOD;       break;
        case 'i': case '$':            class_wanted = OBJ_GOLD;       break;

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

[2.6476]

    else if (class_wanted == OBJ_WANDS)
        thing.plus = std::max((int) thing.plus, 3 + random2(3));