fiddlerwoaroof/crawl - Change YMC3RKF4Z7DOHZNGG7INC343SXCTWOPK7ISD42I3WA3AZZNVBGIAC

Mixed commit of small additions/changes.

FR 1870139: output "Tele" among enchantment abbrevs when "about to teleport" FR 1834016: print item slots along with rotting message (I added an option for this as I personally don't need this.)

Gods:

Add ^ line for Zin's mutation protection.
Modify protection from harm adjectives in ^ screen to make difference between Ely and Zin/TSO more obvious.

Tiles: Bug 1870238: Show mimics to be "autopickuable" (green frame).

Smarter handling of L-click actions in inventory.
code clean-up

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

Created by j-p-e-g on January 13, 2008

YMC3RKF4Z7DOHZNGG7INC343SXCTWOPK7ISD42I3WA3AZZNVBGIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile1.cc at line 3586 [6.96318]
B:BD[6.213181] → [6.213181:213182]
[6.213181]
[6.213182]
```
    
```

Replacement in crawl-ref/source/tile1.cc at line 3595 [6.96318]

B:BD[6.213419] → [6.213419:213465]

B:BD[6.213465] → [3.635:686]

    if (menv[idx].type >=  MONS_DRACONIAN && 
        menv[idx].type <= MONS_DRACONIAN_SCORCHER)

[6.213419]

[6.213513]

    if (menv[idx].type >= MONS_GOLD_MIMIC &&
        menv[idx].type <= MONS_POTION_MIMIC)
    {
        const monsters *mon = &menv[idx];
        if (!mons_is_known_mimic(mon))
        {
            item_def item;
            get_mimic_item( mon, item );
            if (item_needs_autopickup(item))
            {
                if (foreground)
                    env.tile_bg[ep.x-1][ep.y-1] |= TILE_FLAG_CURSOR3;
                else
                    env.tile_bk_bg[gx][gy] |= TILE_FLAG_CURSOR3;
            }
        }
    }
    else if (menv[idx].type >=  MONS_DRACONIAN &&
             menv[idx].type <= MONS_DRACONIAN_SCORCHER)

Insertion in crawl-ref/source/output.cc at line 518 [7.1088282]

[7.1097307]

        }
        if (you.duration[DUR_TELEPORT])
        {
            textcolor( LIGHTBLUE );
            cprintf( "Tele " );

Replacement in crawl-ref/source/output.cc at line 1204 [7.1088282]

B:BD[8.9214] → [8.9214:9283]

                      || you.religion == GOD_ZIN && you.piety >= 180

[8.9214]

[8.9283]

                      || you.religion == GOD_ZIN && you.piety >= 150

Insertion in crawl-ref/source/libgui.cc at line 26 [6.5793336]
[6.5793959]
[6.5793959]
```
#include "itemprop.h"
```
Replacement in crawl-ref/source/libgui.cc at line 1076 [6.5793336]
B:BD[6.5822492] → [6.5822492:5822537]
```
        if( (*r)->mouse_pos(mx, my, cx, cy))
```
[6.5822492]
[6.5822537]
```
        
        if ( (*r)->mouse_pos(mx, my, cx, cy))
```
Replacement in crawl-ref/source/libgui.cc at line 1080 [6.5793336]
B:BD[6.5822574] → [4.182499:182523]
```
        mx0 = (*r)->mx;
```
[6.5822574]
[6.5822595]
```
            mx0 = (*r)->mx;
```
Replacement in crawl-ref/source/libgui.cc at line 1089 [6.5793336]
B:BD[6.5822705] → [6.5822705:5822732]
```
    if(id == REGION_TDNGN)
```
[6.5822705]
[6.5822732]
```
    if (id == REGION_TDNGN)
```
Replacement in crawl-ref/source/libgui.cc at line 1091 [6.5793336]
B:BD[6.5822738] → [4.182524:182533]
```
    x--;
```
[6.5822738]
[6.5822744]
```
        x--;
```
Replacement in crawl-ref/source/libgui.cc at line 1103 [6.5793336]
B:BD[6.5823010] → [4.182534:182566]
```
    x = x + y * mx0;
    y = 0;
```
[6.5823010]
[6.5823036]
```
        x = x + y * mx0;
        y = 0;
```
Insertion in crawl-ref/source/libgui.cc at line 1157 [6.5793336]
[6.5823936]
[6.5823936]
```
        
```

Replacement in crawl-ref/source/libgui.cc at line 1233 [6.5793336]

B:BD[6.5825860] → [9.3149:3273]

                    if (type != OBJ_CORPSES || you.species == SP_VAMPIRE)
                        desc += EOL "[L-Click] ";

[6.5825860]

                    desc += EOL;
                    
                    if (type != OBJ_CORPSES
                        || you.species == SP_VAMPIRE
                           && you.inv[ix].sub_type != CORPSE_SKELETON
                           && you.inv[ix].special >= 100)
                    {
                        desc += "[L-Click] ";

Replacement in crawl-ref/source/libgui.cc at line 1242 [6.5793336]

B:BD[6.5825861] → [6.5825861:5825960]

                    if (itemlist_iflag[cx] & TILEI_FLAG_EQUIP)
                        type += 18;

[6.5825861]

[6.5825960]

                        if (itemlist_iflag[cx] & TILEI_FLAG_EQUIP)
                        {
                            if (you.equip[EQ_WEAPON] == ix)
                            {
                                if (type == OBJ_JEWELLERY || type == OBJ_ARMOUR
                                    || type == OBJ_WEAPONS || type == OBJ_STAVES)
                                {
                                    type = OBJ_WEAPONS + 18;
                                }
                            }
                            else
                                type += 18;
                        }

Replacement in crawl-ref/source/libgui.cc at line 1256 [6.5793336]

B:BD[6.5825961] → [6.5825961:5826017]

B:BD[6.5826138] → [6.5826138:5826257]

B:BD[6.5826257] → [9.3274:3433]

∅:D[9.3433] → [6.5826257:5826511]

B:BD[6.5826257] → [6.5826257:5826511]

B:BD[6.5826511] → [5.2607:2840]

                    switch (type)
                    {
                    case OBJ_WEAPONS:
                    case OBJ_STAVES:
                        desc += "*(w)ield";
                        break;
                    case OBJ_WEAPONS + 18:
                    case OBJ_STAVES + 18:
                        desc += "unwield";
                        break;
                    case OBJ_MISSILES:
                        desc += "*(t)hrow";
                        break;
                    case OBJ_WANDS:
                        desc += "*(z)ap";
                        break;
                    case OBJ_BOOKS:
                        if (item_type_known(you.inv[ix])
                            && you.inv[ix].sub_type != BOOK_MANUAL
                            && you.inv[ix].sub_type != BOOK_DESTRUCTION)

[6.5825961]

[5.2840]

                        switch (type)

Replacement in crawl-ref/source/libgui.cc at line 1258 [6.5793336]

B:BD[5.2866] → [5.2866:2917]

                            desc += "*(M)emorize";

[5.2866]

[5.2917]

                        // first equipable categories
                        case OBJ_WEAPONS:
                        case OBJ_STAVES:
                            desc += "*(w)ield";
                            break;
                        case OBJ_WEAPONS + 18:
                        case OBJ_STAVES + 18:
                            desc += "unwield";
                            break;
                        case OBJ_ARMOUR:
                            desc += "*(W)ear";
                            break;
                        case OBJ_ARMOUR + 18:
                            desc += "*(T)ake off";
                            break;
                        case OBJ_JEWELLERY:
                            desc += "*(P)ut on";
                            break;
                        case OBJ_JEWELLERY + 18:
                            desc += "*(R)emove";
                            break;
                        case OBJ_MISSILES:
                            desc += "*(t)hrow";
                            break;
                        case OBJ_WANDS:
                            desc += "*(z)ap";
                            break;
                        case OBJ_BOOKS:
                            if (item_type_known(you.inv[ix])
                                && you.inv[ix].sub_type != BOOK_MANUAL
                                && you.inv[ix].sub_type != BOOK_DESTRUCTION)
                            {
                                desc += "*(M)emorize";
                                break;
                            }
                            // else fall-through
                        case OBJ_SCROLLS:
                            desc += "*(r)ead";

Insertion in crawl-ref/source/libgui.cc at line 1297 [6.5793336]

[5.2952]

                        case OBJ_POTIONS:
                            desc += "*(q)uaff";
                            break;
                        case OBJ_FOOD:
                            desc += "*(e)at";
                            break;
                        case OBJ_CORPSES:
                            if (you.species == SP_VAMPIRE)
                                desc += "drink blood";
                            break;
                        default:
                            desc += "*Use it";

Deletion in crawl-ref/source/libgui.cc at line 1310 [6.5793336]

B:BD[5.2978] → [5.2978:3023]

∅:D[5.3023] → [6.5826511:5826549]

B:BD[6.5826511] → [6.5826511:5826549]

B:BD[6.5826585] → [6.5826585:5826628]

B:BD[6.5826628] → [9.3434:3465]

B:BD[6.5826659] → [6.5826659:5826744]

B:BD[6.5826744] → [9.3549:3670]

∅:D[9.3670] → [6.5826744:5826857]

B:BD[6.5826744] → [6.5826744:5826857]

B:BD[6.5826857] → [9.3671:3902]

∅:D[9.3902] → [6.5826857:5826888]

B:BD[6.5826857] → [6.5826857:5826888]

B:BD[6.5826888] → [9.3903:4278]

∅:D[9.4278] → [6.5826888:5826960]

B:BD[6.5826888] → [6.5826888:5826960]

                        // else fall-through
                    case OBJ_SCROLLS:
                        desc += "*(r)ead";
                        break;
                    case OBJ_JEWELLERY:
                        desc += "*(P)ut on";
                        break;
                    case OBJ_JEWELLERY + 18:
                        desc += "*(R)emove";
                        break;
                    case OBJ_POTIONS:
                        desc += "*(q)uaff";
                        break;
                    case OBJ_ARMOUR:
                        desc += "*(W)ear";
                        break;
                    case OBJ_ARMOUR + 18:
                        desc += "*(T)ake off";
                        break;
                    case OBJ_FOOD:
                        desc += "*(e)at";
                        break;
                    case OBJ_CORPSES:
                        if (you.species == SP_VAMPIRE)
                            desc += "drink blood";
                        else // no action possible
                            desc += EOL;
                        break;
                    default:
                        desc += "*Use it";

Insertion in crawl-ref/source/item_use.cc at line 4418 [7.2781507]
[6.5849539]
[6.5849539]
```
    bool equipped_weapon = false;
```

Insertion in crawl-ref/source/item_use.cc at line 4424 [7.2781507]

[6.5849662]

            if (i == EQ_WEAPON)
                equipped_weapon = true;

Replacement in crawl-ref/source/item_use.cc at line 4434 [7.2781507]

B:BD[6.5849846] → [6.5849846:5849883]

    if (you.equip[EQ_WEAPON] == idx)

[6.5849846]

[6.5849883]

    // Note that this is only a problem for equipables
    // (otherwise it would only waste a turn)
    if (you.equip[EQ_WEAPON] == idx
        && (you.inv[idx].base_type == OBJ_ARMOUR
            || you.inv[idx].base_type == OBJ_JEWELLERY))

Insertion in crawl-ref/source/item_use.cc at line 4446 [7.2781507]
[6.5850047]
[6.5850047]
Replacement in crawl-ref/source/item_use.cc at line 4483 [7.2781507]
B:BD[6.5851041] → [6.5851041:5851067]
```
            if (equipped)
```
[6.5851041]
[6.5851067]
```
            if (equipped && !equipped_weapon)
```

Replacement in crawl-ref/source/item_use.cc at line 4504 [7.2781507]

B:BD[9.5215] → [9.5215:5258]

            if (you.species != SP_VAMPIRE)

[9.5215]

[9.5258]

            if (you.species != SP_VAMPIRE
                || you.inv[idx].sub_type == CORPSE_SKELETON
                || you.inv[idx].special < 100)
            {

Insertion in crawl-ref/source/item_use.cc at line 4509 [7.2781507]
[9.5281]
[9.5281]
```
            }
```
Replacement in crawl-ref/source/item_use.cc at line 4535 [7.2781507]
B:BD[6.5851998] → [6.5851998:5852024]
```
            if (equipped)
```
[6.5851998]
[6.5852024]
```
            if (equipped && !equipped_weapon)
```
Insertion in crawl-ref/source/initfile.cc at line 616 [7.2957258]
[10.320]
[11.792387]
```
    list_rotten            = false;
```

Replacement in crawl-ref/source/externs.h at line 1570 [7.3270163]

B:BD[7.3283718] → [11.898692:898767]

∅:D[11.898767] → [7.3283783:3283843]

B:BD[7.3283783] → [7.3283783:3283843]

    bool        easy_unequip;   // allow auto-removing of armour / jewelry
    bool        easy_butcher;   // open doors with movement

[7.3283718]

[10.863]

    bool        easy_unequip;   // allow auto-removing of armour / jewellery
    bool        easy_butcher;   // autoswap to butchering tool

Replacement in crawl-ref/source/externs.h at line 1573 [7.3270163]

B:BD[11.898921] → [12.332:401]

    bool        default_target;  // start targeting on a real target

[10.933]

[13.1468]

    bool        list_rotten;    // list slots for rotting corpses/chunks
    bool        default_target; // start targeting on a real target

Replacement in crawl-ref/source/externs.h at line 1577 [7.3270163]
∅:D[13.1547] → [11.898996:899067]
∅:D[14.1561] → [11.898996:899067]
B:BD[11.898996] → [11.898996:899067]
```
    bool        note_skill_max; // take note when skills reach new max
```
[14.1561]
[11.899067]
```
    bool        note_skill_max;  // take note when skills reach new max
```

Replacement in crawl-ref/source/externs.h at line 1579 [7.3270163]

B:BD[15.2783] → [16.8278:8337]

    std::string user_note_prefix; // Prefix for user notes

[11.899137]

[11.899189]

    std::string user_note_prefix;// Prefix for user notes

Replacement in crawl-ref/source/effects.cc at line 1915 [7.3382105]

B:BD[17.1455] → [17.1455:1495]

        "Brimstone rains from above." :

[17.1455]

[17.1495]

                            "Brimstone rains from above." :

Replacement in crawl-ref/source/effects.cc at line 2031 [7.3382105]
B:BD[17.5444] → [17.5444:5479]
```
    bool new_rotting_item = false;
```
[17.5444]
[17.5479]
```
    std::vector<char> rotten_items;
```

Replacement in crawl-ref/source/effects.cc at line 2086 [7.3382105]

B:BD[17.7079] → [17.7079:7117]

            new_rotting_item = true;

[17.7079]

[17.7117]

            rotten_items.push_back(index_to_letter( i ));

Replacement in crawl-ref/source/effects.cc at line 2091 [7.3382105]
B:BD[17.7187] → [17.7187:7213]
```
    if (new_rotting_item)
```
[17.7187]
[17.7213]
```
    if (!rotten_items.empty())
```
Replacement in crawl-ref/source/effects.cc at line 2093 [7.3382105]
B:BD[17.7219] → [17.7219:7265]
```
        // XXX: should probably still notice?
```
[17.7219]
[17.7265]
```
        std::string msg = "";
        
```

Replacement in crawl-ref/source/effects.cc at line 2106 [7.3382105]

B:BD[17.7676] → [17.7676:7749]

                mpr( ((temp_rand  < 5) ? "You smell something rotten." :

[17.7676]

[17.7749]

                msg = (temp_rand  < 5) ? "You smell something rotten." :

Replacement in crawl-ref/source/effects.cc at line 2109 [7.3382105]

B:BD[17.7879] → [17.7879:8010]

                                       : "There is something rotten in your inventory."),
                    MSGCH_ROTTEN_MEAT );

[17.7879]

[17.8010]

                                       : "There is something rotten in your inventory.";

Replacement in crawl-ref/source/effects.cc at line 2115 [7.3382105]

B:BD[17.8136] → [17.8136:8209]

                mpr( ((temp_rand  < 5) ? "You smell something rotten." :

[17.8136]

[17.8209]

                msg = (temp_rand  < 5) ? "You smell something rotten." :

Replacement in crawl-ref/source/effects.cc at line 2118 [7.3382105]

B:BD[17.8368] → [17.8368:8503]

                                       : "Wow! There is something tasty in your inventory."),
                    MSGCH_ROTTEN_MEAT );

[17.8368]

[17.8503]

                                       : "Wow! There is something tasty in your inventory.";

Replacement in crawl-ref/source/effects.cc at line 2123 [7.3382105]

B:BD[17.8588] → [17.8588:8661]

                mpr( ((temp_rand  < 5) ? "You smell something rotten." :

[17.8588]

[17.8661]

                msg = (temp_rand  < 5) ? "You smell something rotten." :

Replacement in crawl-ref/source/effects.cc at line 2126 [7.3382105]

B:BD[17.8815] → [17.8815:8963]

                                       : "Ugh! There is something really disgusting in your inventory."), 
                    MSGCH_ROTTEN_MEAT );

[17.8815]

[17.8963]

                                       : "Ugh! There is something really disgusting in your inventory.";

Insertion in crawl-ref/source/effects.cc at line 2129 [7.3382105]

[17.9000]

        }
        else if (Options.list_rotten)
            msg = "Something in your inventory has become rotten.";
            
        if (Options.list_rotten)
        {
            mprf(MSGCH_ROTTEN_MEAT, "%s (slot%s %s)",
                 msg.c_str(),
                 rotten_items.size() > 1 ? "s" : "",
                 comma_separated_line(rotten_items.begin(),
                                      rotten_items.end()).c_str());

Insertion in crawl-ref/source/effects.cc at line 2141 [7.3382105]

[17.9010]

        else if (!msg.empty())
            mpr(msg.c_str(), MSGCH_ROTTEN_MEAT);

Replacement in crawl-ref/source/describe.cc at line 2480 [7.3736416]

B:BD[7.3955704] → [18.1928:2122]

            const char *how = (you.piety >= 150)  ? "carefully" :
                              (you.piety >=  90)  ? "often" :
                              (you.piety >=  30)  ? "sometimes" :

[7.3955704]

[18.2122]

            int prayer_prot = 0;
            if (you.religion == GOD_ELYVILON && you.piety > 30)
                prayer_prot = 100 - 3000/you.piety;
            int prot_chance = 10 + you.piety/10 + prayer_prot; // chance * 100
    
            const char *how = (prot_chance >= 85) ? "carefully" :
                              (prot_chance >= 55) ? "often" :
                              (prot_chance >= 25) ? "sometimes" :

Replacement in crawl-ref/source/describe.cc at line 2500 [7.3736416]
B:BD[19.737] → [20.1103:1156]
```
        if (which_god == GOD_ZIN && you.piety >= 30)
```
[19.737]
[20.1156]
```
        if (which_god == GOD_ZIN)
```

Replacement in crawl-ref/source/describe.cc at line 2503 [7.3736416]

B:BD[20.1195] → [20.1195:1268]

B:BD[20.1268] → [2.3898:3953]

            cprintf("Praying to %s will provide sustenance if starving."
                    EOL, god_name(which_god).c_str());

[20.1195]

[21.1451]

            if (you.piety >= 30)
                cprintf("Praying to %s will provide sustenance if starving."
                            EOL, god_name(which_god).c_str());
            const char *how = (you.piety >= 150) ? "carefully" : // res mut. 3
                              (you.piety >= 100) ? "often" :
                              (you.piety >=  50) ? "sometimes" :
                                                   "occasionally";
                                                   
            cprintf("%s %s shields you from mutagenic effects." EOL,
                    god_name(which_god).c_str(), how);

Replacement in crawl-ref/source/describe.cc at line 2515 [7.3736416]
B:BD[21.1461] → [21.1461:1497]
```
        if (which_god == GOD_TROG)
```
[21.1461]
[21.1497]
```
        else if (which_god == GOD_TROG)
```
Insertion in crawl-ref/init.txt at line 179 [7.4830895]
[22.3473]
[23.824]
```
# list_rotten = true
```

Replacement in crawl-ref/docs/crawl_options.txt at line 59 [24.63392]

B:BD[16.11088] → [22.5530:5588]

                item_stack_summary_minimum, menu_colour,

[16.11088]

[22.5588]

                item_stack_summary_minimum, list_rotten, menu_colour,

Insertion in crawl-ref/docs/crawl_options.txt at line 1001 [24.63392]

[22.29759]

[25.29581]


list_rotten = false
        Setting this to true will print a list of inventory slots for
	all corpses and chunks that have become rotten along with the
	rotting message, in the form of 
	  "You smell something rotten. (slots f and m)"
        Additionally, this option will make a default message appear
	for Trolls, as well.

Mixed commit of small additions/changes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile1.cc at line 3586 [6.96318]

Replacement in crawl-ref/source/tile1.cc at line 3595 [6.96318]

Insertion in crawl-ref/source/output.cc at line 518 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 1204 [7.1088282]

Insertion in crawl-ref/source/libgui.cc at line 26 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1076 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1080 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1089 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1091 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1103 [6.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1157 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1233 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1242 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1256 [6.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1258 [6.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1297 [6.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1310 [6.5793336]

Insertion in crawl-ref/source/item_use.cc at line 4418 [7.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4424 [7.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4434 [7.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4446 [7.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4483 [7.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4504 [7.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4509 [7.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4535 [7.2781507]

Insertion in crawl-ref/source/initfile.cc at line 616 [7.2957258]