fiddlerwoaroof/crawl - Change SJJMO4TFG3QO46SLHUFSUYXXVZJDULVYTU4RTCM7TQPIGHZTWBDAC

* Add ability descriptions to the database search.

Xom no longer gifts stuff that unquestionably makes for a more boring adventure (scrolls of Detect/Remove Curse, Magic Mapping, Identify; potion of cure mutation, amulet of resist mutation, ring of control teleport).
Xom's "niceness" is no longer automatically defined by his mood, but it's now randomly picked according to piety > random2(200), which translates to nice, else the opposite. A "beloved toy" is extremely likely to get nice effects, and vice versa for the "beloved plaything".
In xom_acts, instead of 50% chance for piety flip, there's now a 20% chance of piety being randomly rerolled.

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

Created by j-p-e-g on March 20, 2009

SJJMO4TFG3QO46SLHUFSUYXXVZJDULVYTU4RTCM7TQPIGHZTWBDAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 106 [9.3]
[8.139]
[8.139]
```
    {
```
Insertion in crawl-ref/source/xom.cc at line 117 [9.3]
[7.605]
[10.747]
```
    }
```

Replacement in crawl-ref/source/xom.cc at line 140 [9.3]

B:BD[5.280] → [5.280:350]

        return (you.gift_timeout > 0 && you.piety > (MAX_PIETY / 2));

[5.280]

[5.350]

        return (you.gift_timeout > 0 && you.piety > random2(MAX_PIETY));

Replacement in crawl-ref/source/xom.cc at line 224 [9.3]
B:BD[8.1716] → [8.1716:1756]
```
        xom_acts(abs(you.piety - 100));
```
[8.1716]
[8.1756]
```
        xom_acts(xom_is_nice());
```

Replacement in crawl-ref/source/xom.cc at line 1815 [9.3]

B:BD[9.22226] → [8.5244:5321]

        else if (x_chance_in_y(7, sever) && (you.level_type != LEVEL_ABYSS))

[9.22226]

[9.22282]

        else if (x_chance_in_y(7, sever) && you.level_type != LEVEL_ABYSS)

Replacement in crawl-ref/source/xom.cc at line 2034 [9.3]

B:BD[2.79] → [2.79:137]

                       "Xom happily agrees.", which_god);

[2.79]

[11.3970]

                               "Xom happily agrees.", which_god);

Replacement in crawl-ref/source/xom.cc at line 2082 [9.3]

B:BD[12.474] → [13.5352:5399]

    if (you.religion == GOD_XOM && coinflip())

[12.474]

[13.5399]

    if (you.religion == GOD_XOM && one_chance_in(5))

Replacement in crawl-ref/source/xom.cc at line 2085 [9.3]
∅:D[4.70] → [14.5:48]
∅:D[13.5405] → [14.5:48]
∅:D[8.7227] → [14.5:48]
B:BD[15.50] → [14.5:48]
```
        you.piety = MAX_PIETY - you.piety;
```
[4.70]
[4.71]
```
        you.piety = random2(MAX_PIETY+1);
```

Replacement in crawl-ref/source/xom.cc at line 2104 [9.3]

B:BD[16.397] → [16.397:529]

        + you.attribute[ATTR_DEMONIC_RUNES]
        + you.attribute[ATTR_ABYSSAL_RUNES]
        - you.attribute[ATTR_RUNES_IN_ZOT];

[16.397]

[17.2061]

                       + you.attribute[ATTR_DEMONIC_RUNES]
                       + you.attribute[ATTR_ABYSSAL_RUNES]
                       - you.attribute[ATTR_RUNES_IN_ZOT];

Insertion in crawl-ref/source/makeitem.cc at line 814 [18.927]

[18.23208]

[19.4449]

// Does Xom consider an item boring?
static bool _is_boring_item(int type, int sub_type)
{
    switch (type)
    {
    case OBJ_POTIONS:
        return (sub_type == POT_CURE_MUTATION);
    case OBJ_SCROLLS:
        // The corresponding spells are considered "boring", so Xom
        // shouldn't gift these scrolls either.
        switch (sub_type)
        {
        case SCR_DETECT_CURSE:
        case SCR_REMOVE_CURSE:
        case SCR_IDENTIFY:
        case SCR_MAGIC_MAPPING:
            return (true);
        default:
            break;
        }
        break;
    case OBJ_JEWELLERY:
        return (sub_type == RING_TELEPORT_CONTROL
                || sub_type == AMU_RESIST_MUTATION);
    default:
        break;
    }
    return (false);
}

Replacement in crawl-ref/source/makeitem.cc at line 2334 [18.927]

B:BD[19.9192] → [19.9192:9242]

                                  int item_level)

[19.9192]

[20.40969]

                                  int item_level, int agent)

Replacement in crawl-ref/source/makeitem.cc at line 2378 [18.927]

B:BD[21.8298] → [21.8298:8420]

        while ( stype == POT_POISON && item_level < 1
                || stype == POT_STRONG_POISON && item_level < 11 );

[21.8298]

[22.5376]

        while (stype == POT_POISON && item_level < 1
               || stype == POT_STRONG_POISON && item_level < 11
               || agent == GOD_XOM && _is_boring_item(OBJ_POTIONS, stype));

Replacement in crawl-ref/source/makeitem.cc at line 2382 [18.927]

B:BD[22.5377] → [19.9243:9459]

        if ( stype == POT_GAIN_STRENGTH || stype == POT_GAIN_DEXTERITY
             || stype == POT_GAIN_INTELLIGENCE || stype == POT_EXPERIENCE
             || stype == POT_MAGIC || stype == POT_RESTORE_ABILITIES )

[22.5377]

[23.10291]

        if (stype == POT_GAIN_STRENGTH || stype == POT_GAIN_DEXTERITY
            || stype == POT_GAIN_INTELLIGENCE || stype == POT_EXPERIENCE
            || stype == POT_MAGIC || stype == POT_RESTORE_ABILITIES)

Replacement in crawl-ref/source/makeitem.cc at line 2396 [18.927]

B:BD[19.9526] → [19.9526:9576]

                                  int item_level)

[19.9526]

[20.43492]

                                  int item_level, int agent)

Replacement in crawl-ref/source/makeitem.cc at line 2405 [18.927]

B:BD[22.5379] → [24.3687:4341]

        // total weight: 10000
        item.sub_type = random_choose_weighted(
            1797, SCR_IDENTIFY,
            1305, SCR_REMOVE_CURSE,
            802, SCR_TELEPORTATION,
            642, SCR_DETECT_CURSE,
            321, SCR_FEAR,
            321, SCR_NOISE,
            321, SCR_MAGIC_MAPPING,
            321, SCR_FOG,
            321, SCR_RANDOM_USELESSNESS,
            321, SCR_CURSE_WEAPON,
            321, SCR_CURSE_ARMOUR,
            321, SCR_RECHARGING,
            321, SCR_BLINKING,
            161, SCR_PAPER,
            321, SCR_ENCHANT_ARMOUR,
            321, SCR_ENCHANT_WEAPON_I,
            321, SCR_ENCHANT_WEAPON_II,

[22.5379]

[24.4341]

        do
        {
            // total weight: 10000
            item.sub_type = random_choose_weighted(
                1797, SCR_IDENTIFY,
                1305, SCR_REMOVE_CURSE,
                802, SCR_TELEPORTATION,
                642, SCR_DETECT_CURSE,
                321, SCR_FEAR,
                321, SCR_NOISE,
                321, SCR_MAGIC_MAPPING,
                321, SCR_FOG,
                321, SCR_RANDOM_USELESSNESS,
                321, SCR_CURSE_WEAPON,
                321, SCR_CURSE_ARMOUR,
                321, SCR_RECHARGING,
                321, SCR_BLINKING,
                161, SCR_PAPER,
                321, SCR_ENCHANT_ARMOUR,
                321, SCR_ENCHANT_WEAPON_I,
                321, SCR_ENCHANT_WEAPON_II,

Replacement in crawl-ref/source/makeitem.cc at line 2427 [18.927]

B:BD[24.4342] → [24.4342:4489]

            // Don't create ?oImmolation at low levels (encourage read-ID)
            321, (item_level < 4 ? SCR_TELEPORTATION : SCR_IMMOLATION),

[24.4342]

[24.4489]

                // Don't create ?oImmolation at low levels (encourage read-ID)
                321, (item_level < 4 ? SCR_TELEPORTATION : SCR_IMMOLATION),

Replacement in crawl-ref/source/makeitem.cc at line 2430 [18.927]

B:BD[24.4490] → [24.4490:4747]

B:BD[24.4747] → [3.2501:2575]

            // Medium-level scrolls
            160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ACQUIREMENT),
            160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ENCHANT_WEAPON_III),
            160, (depth_mod < 4 ? SCR_DETECT_CURSE  : SCR_SUMMONING),
            160, (depth_mod < 4 ? SCR_PAPER :         SCR_VULNERABILITY),

[24.4490]

[18.84696]

                // Medium-level scrolls
                160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ACQUIREMENT),
                160, (depth_mod < 4 ? SCR_TELEPORTATION : SCR_ENCHANT_WEAPON_III),
                160, (depth_mod < 4 ? SCR_DETECT_CURSE  : SCR_SUMMONING),
                160, (depth_mod < 4 ? SCR_PAPER :         SCR_VULNERABILITY),

Replacement in crawl-ref/source/makeitem.cc at line 2436 [18.927]

B:BD[18.84697] → [24.4818:5083]

            // High-level scrolls
            160, (depth_mod < 7 ? SCR_TELEPORTATION : SCR_VORPALISE_WEAPON),
            160, (depth_mod < 7 ? SCR_DETECT_CURSE  : SCR_TORMENT),
            160, (depth_mod < 7 ? SCR_DETECT_CURSE  : SCR_HOLY_WORD),
            0);

[18.84697]

[20.45944]

                // High-level scrolls
                160, (depth_mod < 7 ? SCR_TELEPORTATION : SCR_VORPALISE_WEAPON),
                160, (depth_mod < 7 ? SCR_DETECT_CURSE  : SCR_TORMENT),
                160, (depth_mod < 7 ? SCR_DETECT_CURSE  : SCR_HOLY_WORD),
                0);
        }
        while (agent == GOD_XOM && _is_boring_item(OBJ_SCROLLS, item.sub_type));

Replacement in crawl-ref/source/makeitem.cc at line 2631 [18.927]

B:BD[19.11624] → [19.11624:11693]

                                     int force_type, int item_level)

[19.11624]

[20.50362]

                                     int force_type, int item_level, int agent)

Replacement in crawl-ref/source/makeitem.cc at line 2645 [18.927]

B:BD[19.11808] → [19.11808:11946]

        item.sub_type = (one_chance_in(4) ? get_random_amulet_type()
                                          : get_random_ring_type());

[19.11808]

[19.11946]

        do
        {
            item.sub_type = (one_chance_in(4) ? get_random_amulet_type()
                                              : get_random_ring_type());
        }
        while (agent == GOD_XOM
               && _is_boring_item(OBJ_JEWELLERY, item.sub_type));

Replacement in crawl-ref/source/makeitem.cc at line 2854 [18.927]

B:BD[20.56272] → [19.13214:13275]

        _generate_potion_item(item, force_type, item_level);

[20.56272]

[20.56332]

        _generate_potion_item(item, force_type, item_level, agent);

Replacement in crawl-ref/source/makeitem.cc at line 2858 [18.927]

B:BD[20.56370] → [19.13276:13337]

        _generate_scroll_item(item, force_type, item_level);

[20.56370]

[20.56430]

        _generate_scroll_item(item, force_type, item_level, agent);

Replacement in crawl-ref/source/makeitem.cc at line 2862 [18.927]

B:BD[20.56470] → [19.13338:13418]

        _generate_jewellery_item(item, allow_uniques, force_type,  item_level);

[20.56470]

[20.56549]

        _generate_jewellery_item(item, allow_uniques, force_type, item_level,
                                 agent);

Replacement in crawl-ref/source/invent.cc at line 742 [26.2920632]

B:BD[25.5113] → [25.5113:5225]

                const std::string misc = "Miscellaneous";
                subtitle += std::string(misc.length()

[25.5113]

[25.5225]

                const std::string str = "Magical Devices"; // longest string
                subtitle += std::string(str.length()

Insertion in crawl-ref/source/command.cc at line 1125 [26.4082507]

[27.3636]


static bool _ability_filter(std::string key, std::string body)
{
    key = lowercase_string(key);
    if (string_matches_ability_name(key))
        return (false);

Insertion in crawl-ref/source/command.cc at line 1132 [26.4082507]
[27.3637]
[28.51582]
```
    return (true);
}
```

Replacement in crawl-ref/source/command.cc at line 1499 [26.4082507]

B:BD[27.3715] → [27.3715:3762]

        "(B)ranch, or (C)ard?", MSGCH_PROMPT);

[27.3715]

[29.7291]

        "(A)bility, (B)ranch, or (C)ard?", MSGCH_PROMPT);

Insertion in crawl-ref/source/command.cc at line 1532 [26.4082507]

[30.18751]

[27.3763]

    case 'A':
        type   = "ability";
        filter = _ability_filter;
        break;

Replacement in crawl-ref/source/abl-show.h at line 77 [26.4492997]
∅:D[6.2930] → [31.3662:3663]
B:BD[31.3662] → [31.3662:3663]
[6.2930]
[6.2931]
```
bool string_matches_ability_name(const std::string key);
```

Insertion in crawl-ref/source/abl-show.cc at line 315 [26.4494389]

[26.4503869]

[26.4504059]


bool string_matches_ability_name(const std::string key)
{
    for (int i = ABIL_SPIT_POISON; i <= ABIL_RENOUNCE_RELIGION; ++i)
    {
        const ability_def abil = get_ability_def((ability_type) i);
        if (abil.ability == ABIL_NON_ABILITY)
            continue;

Insertion in crawl-ref/source/abl-show.cc at line 324 [26.4494389]

[26.4504060]

[32.68196]

        std::string name = lowercase_string(ability_name(abil.ability));
        if (name.find(key) != std::string::npos)
            return (true);
    }
    return (false);
}