fiddlerwoaroof/crawl - Change 7OC5HCGLN26GDA5SQTWKBSUZYZDZJXWIVMJ4NKKXREOEEPUGQ4YQC

Extend on Haran's monster resistance description. Thanks, Haran! :)

Now lists:

all resistances on one line, sorted by resistance level.
susceptibility
magic immunity
see/sense invisible
monster speed
flying/levitating

An example output:

A fire vortex

A swirling cloud of flame.

It is extremely resistant to fire, very resistant to electricity, and resistant to poison. It is susceptible to cold. It is immune to magical enchantments. It is fast. It can levitate.

I also removed all those symbol/quote/etc. checks from the database lookup. Instead describe_monster() is now called directly, so the descriptions are now identical when (v)iewing a monster and when searching the database.

In other news, I removed Eringya's Surprising Bouquet since I doubt we'll ever get it implemented, disagree balance-wise, and it was shamelessly nicked from Pratchett in the first place. Breaks saves.

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

Created by j-p-e-g on January 11, 2009

7OC5HCGLN26GDA5SQTWKBSUZYZDZJXWIVMJ4NKKXREOEEPUGQ4YQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-data.h at line 2426 [6.268152]
B:BD[6.289602] → [6.289602:289714]
B:BD[6.289714] → [7.123999:124017]
B:BD[7.124017] → [8.4175:4183]
B:BD[8.4183] → [9.2725:2733]
B:BD[9.2733] → [10.3951:3964]
B:BD[10.3964] → [11.3124:3132]
∅:D[9.2733] → [12.8220:8243]
∅:D[11.3132] → [12.8220:8243]
∅:D[10.3964] → [12.8220:8243]
B:BD[8.4183] → [12.8220:8243]
B:BD[12.8243] → [13.3611:3622]
∅:D[13.3622] → [6.289721:289727]
∅:D[8.4193] → [6.289721:289727]
∅:D[12.8253] → [6.289721:289727]
B:BD[6.289721] → [6.289721:289727]
```
    SPELL_ERINGYAS_SURPRISING_BOUQUET, "Eringya's Surprising Bouquet",
     SPTYP_TRANSMIGRATION | SPTYP_EARTH,
     SPFLAG_NONE,
     4,
     0,
     -1, -1,
     0,
     NULL,
     false,
     false
},
{
```
Deletion in crawl-ref/source/spl-book.cc at line 490 [6.397614]
B:BD[6.410685] → [6.410685:410763]
```
     SPELL_NO_SPELL,  //jmf: SPELL_ERINGYAS_SURPRISING_BOUQUET, when finished
```
Insertion in crawl-ref/source/spl-book.cc at line 491 [6.397614]
[6.410784]
[6.410784]
```
     SPELL_NO_SPELL,
```

Replacement in crawl-ref/source/enum.h at line 2793 [6.3287960]

B:BD[6.3367478] → [14.4580:4638]

∅:D[14.4638] → [6.3367610:3367684]

B:BD[6.3367610] → [6.3367610:3367684]

    SPELL_EVAPORATE,    // turn a potion into a cloud 190
    SPELL_ERINGYAS_SURPRISING_BOUQUET, // turn sticks into herbivore food

[6.3367478]

[6.3367684]

    SPELL_EVAPORATE,    // 190, turn a potion into a cloud

Replacement in crawl-ref/source/enum.h at line 2798 [6.3287960]

B:BD[6.3368054] → [6.3368054:3368120]

    SPELL_MAXWELLS_SILVER_HAMMER,      // vorpal-brand maces etc.

[6.3367986]

[6.3368120]

    SPELL_MAXWELLS_SILVER_HAMMER,      // 195, vorpal-brand maces etc.

Replacement in crawl-ref/source/enum.h at line 2802 [6.3287960]
B:BD[14.4733] → [14.4733:4780]
∅:D[14.4780] → [7.929191:929225]
B:BD[6.3368306] → [7.929191:929225]
```
    SPELL_SIMULACRUM,                  //  200
    SPELL_CONJURE_BALL_LIGHTNING,
```
[14.4733]
[15.781]
```
    SPELL_SIMULACRUM,
    SPELL_CONJURE_BALL_LIGHTNING,      //  200
```

Replacement in crawl-ref/source/enum.h at line 2807 [6.3287960]

B:BD[16.791] → [17.3739:3786]

B:BD[17.3786] → [18.8539:8558]

    SPELL_SUMMON_UGLY_THING,           //  205
    SPELL_PETRIFY,

[16.791]

[12.51935]

    SPELL_SUMMON_UGLY_THING,
    SPELL_PETRIFY,                     //  205

Replacement in crawl-ref/source/enum.h at line 2814 [6.3287960]

B:BD[12.52081] → [18.8559:8628]

    SPELL_FAKE_RAKSHASA_SUMMON,        //  210
    SPELL_STEAM_BALL,

[12.52081]

[17.3861]

    SPELL_FAKE_RAKSHASA_SUMMON,
    SPELL_STEAM_BALL,                  //  210

Replacement in crawl-ref/source/enum.h at line 2819 [6.3287960]

B:BD[12.52227] → [18.8629:8701]

    SPELL_POISON_SPLASH,               //  215
    SPELL_SUMMON_UNDEAD,

[12.52227]

[17.3936]

    SPELL_POISON_SPLASH,
    SPELL_SUMMON_UNDEAD,               //  215

Replacement in crawl-ref/source/enum.h at line 2824 [6.3287960]

B:BD[12.52377] → [18.8702:8774]

    SPELL_MIASMA,                      //  220
    SPELL_SUMMON_DRAKES,

[12.52377]

[17.4003]

    SPELL_MIASMA,
    SPELL_SUMMON_DRAKES,               //  220

Replacement in crawl-ref/source/enum.h at line 2829 [6.3287960]

B:BD[2.12894] → [2.12894:12963]

    SPELL_STICKY_FLAME_SPLASH,         // 225
    SPELL_FIRE_BREATH,

[2.12894]

[2.12963]

    SPELL_STICKY_FLAME_SPLASH,
    SPELL_FIRE_BREATH,                 // 225

Replacement in crawl-ref/source/enum.h at line 2835 [6.3287960]
B:BD[19.3171] → [3.3200:3215]
```
    NUM_SPELLS
```
[19.3171]
[6.3369252]
```
    NUM_SPELLS                         // 229
```

Insertion in crawl-ref/source/describe.cc at line 2593 [6.3736416]

[5.2857]

static const char* _get_resist_name(mon_resist_flags res_type)
{
    switch (res_type)
    {
    case MR_RES_ELEC:
        return "electricity";
    case MR_RES_POISON:
        return "poison";
    case MR_RES_FIRE:
        return "fire";
    case MR_RES_STEAM:
        return "steam";
    case MR_RES_COLD:
        return "cold";
    case MR_RES_ACID:
        return "acid";
    default:
        return "buggy resistance";
    }
}
static int _get_resist_level(const mon_resist_def resist,
                             mon_resist_flags res_type)
{
    switch (res_type)
    {
    case MR_RES_ELEC:
        return resist.elec;
    case MR_RES_POISON:
        return resist.poison;
    case MR_RES_FIRE:
        return resist.fire;
    case MR_RES_STEAM:
        return resist.steam;
    case MR_RES_COLD:
        return resist.cold;
    case MR_RES_ACID:
        return resist.acid;
    default:
        return (0);
    }
}
// Describe a monster's (intrinsic) resistances, speed and a few other
// attributes.
static std::string _monster_stat_description(const monsters& mon)
{
    const char* modifiers[] = {
        "susceptible",          // -1
        "resistant",            // +1
        "very resistant",       // +2
        "extremely resistant"   // +3
    };
    const mon_resist_def resist = get_mons_resists(&mon);
    std::vector<mon_resist_flags> resists;
    resists.push_back(MR_RES_ELEC);
    resists.push_back(MR_RES_POISON);
    resists.push_back(MR_RES_FIRE);
    resists.push_back(MR_RES_STEAM);
    resists.push_back(MR_RES_COLD);
    resists.push_back(MR_RES_ACID);
    std::vector<std::string> extreme_resists;
    std::vector<std::string> high_resists;
    std::vector<std::string> base_resists;
    std::vector<std::string> suscept;
    for (unsigned int i = 0; i < resists.size(); ++i)
    {
        int level = _get_resist_level(resist, resists[i]);
        const char* attackname = _get_resist_name(resists[i]);
        if (level != 0)
        {
            const int offset = (level < 0) ? 0 : std::min(level, 3);
            switch (offset)
            {
                case 0:
                    suscept.push_back(attackname);
                    break;
                case 1:
                    base_resists.push_back(attackname);
                    break;
                case 2:
                    high_resists.push_back(attackname);
                    break;
                case 3:
                    extreme_resists.push_back(attackname);
                    break;
            }
        }
    }
    std::string result = "";
    const char* pronoun = mons_pronoun(static_cast<monster_type>(mon.type),
                                       PRONOUN_CAP, true);
    std::vector<std::string> all_resists;
    if (!extreme_resists.empty())
    {
        result  = modifiers[3];
        result += " to ";
        result += comma_separated_line(extreme_resists.begin(),
                                       extreme_resists.end(),
                                       " and ", ", ");
        all_resists.push_back(result);
    }
    if (!high_resists.empty())
    {
        result  = modifiers[2];
        result += " to ";
        result += comma_separated_line(high_resists.begin(),
                                       high_resists.end(),
                                       " and ", ", ");
        all_resists.push_back(result);
    }
    if (!base_resists.empty())
    {
        result  = modifiers[1];
        result += " to ";
        result += comma_separated_line(base_resists.begin(),
                                       base_resists.end(),
                                       " and ", ", ");
        all_resists.push_back(result);
    }
    if (!all_resists.empty())
    {
        result  = pronoun;
        result += " is ";
        result += comma_separated_line(all_resists.begin(),
                                       all_resists.end(),
                                       ", and ", ", ");
        result += ".$";
    }
    // Is monster susceptible to anything? (On a new line.)
    if (!suscept.empty())
    {
        result += pronoun;
        result += " is ";
        result += modifiers[0];
        result += " to ";
        result += comma_separated_line(suscept.begin(),
                                       suscept.end(),
                                       " and ", ", ");
        result += ".$";
    }
    // Magic resistance at MAG_IMMUNE.
    if (mons_immune_magic(&mon))
    {
        result += pronoun;
        result += " is immune to magical enchantments.$";
    }
    // Seeing/sensing invisible.
    if (mons_class_flag(mon.type, M_SEE_INVIS))
    {
        result += pronoun;
        result += " can see invisible.$";
    }
    else if (mons_class_flag(mon.type, M_SENSE_INVIS))
    {
        result += pronoun;
        result += " can sense the presence of invisible creatures.$";
    }
    // Unusual monster speed.
    const int speed = mons_speed(mon.type);
    if (speed < 10 || speed > 10)
    {
        result += pronoun;
        result += " is ";
        if (speed < 7)
            result += "very slow";
        else if (speed < 10)
            result += "slow";
        else if (speed > 20)
            result += "extremely fast";
        else if (speed > 15)
            result += "very fast";
        else if (speed > 10)
            result += "fast";
        result += ".$";
    }
    // Can the monster fly/levitate?
    const flight_type fly = mons_class_flies(mon.type);
    if (fly != FL_NONE)
    {
        result += pronoun;
        result += " can ";
        result += (fly == FL_FLY ? "fly" : "levitate");
        result += ".$";
    }
    return result;
}
/*

Insertion in crawl-ref/source/describe.cc at line 2823 [6.3736416]
[5.3822]
[5.3822]
Replacement in crawl-ref/source/describe.cc at line 2834 [6.3736416]
B:BD[5.4360] → [5.4360:4365]
```
    
```
[5.4360]
[6.3886599]
```
*/
```

Replacement in crawl-ref/source/describe.cc at line 2977 [6.3736416]

B:BD[5.4518] → [5.4518:4565]

        body << _monster_resists_string(mons);

[5.4518]

[5.4565]

    {
        std::string result = _monster_stat_description(mons);
        if (!result.empty())
            body << "$" << result;
    }

Insertion in crawl-ref/source/command.cc at line 1295 [6.4082507]
[20.3000]
[21.12304]
```
            monsters mon;
            mon.type = mon_num;
```
Deletion in crawl-ref/source/command.cc at line 1300 [6.4082507]
B:BD[21.12373] → [21.12373:12403]
∅:D[21.12403] → [22.9804:9805]
B:BD[22.9804] → [22.9804:9805]
B:BD[22.9805] → [21.12404:12440]
∅:D[21.12440] → [22.9837:9838]
B:BD[22.9837] → [22.9837:9838]
```
                monsters mon;
                mon.type = mon_num;
```
Deletion in crawl-ref/source/command.cc at line 1316 [6.4082507]
∅:D[21.13039] → [22.10345:10346]
B:BD[22.10345] → [22.10345:10346]
B:BD[22.10346] → [23.4055:4133]
∅:D[23.4133] → [21.13080:13112]
B:BD[21.13080] → [21.13080:13112]
```
                const monsters m = mon;
                describe_monsters(m);
                return (false);
```

Insertion in crawl-ref/source/command.cc at line 1317 [6.4082507]

[21.13126]

[22.10411]

            else
                mon.base_monster = MONS_PROGRAM_BUG;

Replacement in crawl-ref/source/command.cc at line 1320 [6.4082507]

B:BD[22.10412] → [21.13127:13301]

∅:D[24.673] → [22.10480:10481]

∅:D[21.13301] → [22.10480:10481]

B:BD[22.10480] → [22.10480:10481]

B:BD[22.10481] → [21.13302:13425]

B:BD[21.13425] → [25.5563:5619]

B:BD[25.5619] → [26.35642:35694]

∅:D[25.5619] → [22.10649:10650]

∅:D[21.13486] → [22.10649:10650]

∅:D[26.35694] → [22.10649:10650]

B:BD[22.10649] → [22.10649:10650]

B:BD[22.10650] → [21.13487:13610]

B:BD[21.13610] → [25.5620:5746]

B:BD[25.5746] → [26.35695:35747]

            std::string symbol = "";
            symbol += get_monster_data(mon_num)->showchar;
            if (isupper(symbol[0]))
                symbol = "cap-" + symbol;
            std::string symbol_prefix = "__";
            symbol_prefix += symbol;
            symbol_prefix += "_prefix";
            prefix = getLongDescription(symbol_prefix);
            quote += getQuoteString(symbol_prefix);
            std::string symbol_suffix = "__";
            symbol_suffix += symbol;
            symbol_suffix += "_suffix";
            suffix += getLongDescription(symbol_suffix);
            suffix += getLongDescription(symbol_suffix + "_lookup");
            quote += getQuoteString(symbol_suffix);

[22.10412]

[21.13665]

            const monsters m = mon;
            describe_monsters(m);
            return (false);

Replacement in crawl-ref/source/command.cc at line 1628 [6.4082507]

B:BD[27.1031] → [4.2999:3050]

∅:D[4.3050] → [27.1075:1196]

∅:D[28.14625] → [27.1075:1196]

B:BD[27.1075] → [27.1075:1196]

        if (!_do_description(regex, type, footer))
        {
            DEBUGSTR("do_description() returned false for exact_match");
            return (false);
        }

[27.1031]

[27.1196]

        _do_description(regex, type, footer);

Replacement in crawl-ref/source/acr.cc at line 4639 [6.4397395]

B:BD[14.5514] → [18.12175:12230]

    COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 223 , c6);

[14.5514]

[14.5569]

    COMPILE_CHECK(NUM_SPELLS == 229             , c6);

Extend on Haran's monster resistance description. Thanks, Haran! :)

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-data.h at line 2426 [6.268152]

Deletion in crawl-ref/source/spl-book.cc at line 490 [6.397614]

Insertion in crawl-ref/source/spl-book.cc at line 491 [6.397614]

Replacement in crawl-ref/source/enum.h at line 2793 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2798 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2802 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2807 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2814 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2819 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2824 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2829 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2835 [6.3287960]

Insertion in crawl-ref/source/describe.cc at line 2593 [6.3736416]

Insertion in crawl-ref/source/describe.cc at line 2823 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2834 [6.3736416]

Replacement in crawl-ref/source/describe.cc at line 2977 [6.3736416]

Insertion in crawl-ref/source/command.cc at line 1295 [6.4082507]

Deletion in crawl-ref/source/command.cc at line 1300 [6.4082507]

Deletion in crawl-ref/source/command.cc at line 1316 [6.4082507]

Insertion in crawl-ref/source/command.cc at line 1317 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 1320 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 1628 [6.4082507]

Replacement in crawl-ref/source/acr.cc at line 4639 [6.4397395]