fiddlerwoaroof/crawl - Change E3X5HVN5UN75OMTJA6JFQBNZ54P37NDZLZZF7EFBZZC45KR73YGAC

Fix new firing interface to also apply when selecting items via tile inventory.

(This will also change the quiver, so that tile players no longer need to repeatedly choose the same stack of darts to fire: ff will work nicely.)

Implement first part of FR 1911866: merging W/T, R/P The existing option "easy_unequip" now also allows direct choice of which armour to take off from the 'W' menu, and same for jewellery for 'P'. Warning inscriptions are respected. Now we only need to add a new sorting option sort_equipped that takes care of equipped stuff being listed first in the inventory. Last time I tried something like this (chunk sorting by age) I failed miserably, so I'm making no promises.

Also tweak my recent {tried} modification to only apply to jewellery since for some reasons all unidentified randart weapons show {tried} where jewellery is really picky about which randarts have been tried and which haven't. Probably still needs fixing.

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

Created by j-p-e-g on March 12, 2008

E3X5HVN5UN75OMTJA6JFQBNZ54P37NDZLZZF7EFBZZC45KR73YGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile1.cc at line 4228 [4.96318]

B:BD[4.223523] → [4.223523:223584]

             || type == OBJ_POTIONS || type == OBJ_MISSILES)

[4.223523]

[4.223584]

            || type == OBJ_POTIONS || type == OBJ_MISSILES)
        {

Insertion in crawl-ref/source/tile1.cc at line 4231 [4.96318]
[4.223615]
[4.223615]
```
        }
```

Replacement in crawl-ref/source/tile1.cc at line 4234 [4.96318]

B:BD[4.223642] → [4.223642:223676]

B:BD[4.223676] → [5.142:245]

        if (type == OBJ_WANDS && 
              ((itm->flags & ISFLAG_KNOW_PLUSES )!= 0
               || itm->plus2 == ZAPCOUNT_EMPTY))

[4.223642]

[5.245]

        if ( type == OBJ_WANDS
             && (!(itm->flags & ISFLAG_KNOW_PLUSES )
                 || itm->plus2 == ZAPCOUNT_EMPTY) )

Deletion in crawl-ref/source/monspeak.cc at line 258 [6.1558496]

B:BD[3.7475] → [3.7475:7616]

    // only look at the current player form
    if (is_player_same_species(monster->type, true))
        prefixes.push_back("related");

Replacement in crawl-ref/source/monspeak.cc at line 266 [6.1558496]

∅:D[3.7806] → [7.2749:2909]

B:BD[8.2849] → [7.2749:2909]

    else if (is_good_god(you.religion))
        prefixes.push_back("good god");
    else if (is_evil_god(you.religion))
        prefixes.push_back("evil god");

[3.7806]

[3.7807]

    else
    {
        // only look at the current player form
        if (is_player_same_species(monster->type, true))
            prefixes.push_back("related"); // overkill for Beogh
        if (is_good_god(you.religion))
            prefixes.push_back("good god");
        else if (is_evil_god(you.religion))
            prefixes.push_back("evil god");
    }

Replacement in crawl-ref/source/libgui.cc at line 1364 [4.5793336]

B:BD[9.5603] → [10.2803:3110]

                        {
                            const item_def *weapon = you.weapon();
                            if (weapon && you.inv[ix].launched_by(*weapon))
                                desc += "Fire (f)";
                            else
                                desc += "Throw (t)";

[9.5603]

[9.5651]

                            desc += "Fire (f)";

Deletion in crawl-ref/source/libgui.cc at line 1366 [4.5793336]
B:BD[9.5686] → [10.3111:3137]
```
                        }
```

Replacement in crawl-ref/source/itemname.cc at line 239 [6.2667494]

B:BD[11.2826] → [2.3049:3244]

        const bool  tried     = (!ident && !equipped
                                 && (is_artefact && !item_type_known(*this)
                                     || item_type_tried(*this)));

[11.2826]

[11.2907]

        const bool  tried  =  !ident && !equipped
                               && (item_type_tried(*this)
                                   || this->base_type == OBJ_JEWELLERY
                                      && is_artefact && !item_type_known(*this));

Replacement in crawl-ref/source/item_use.cc at line 756 [6.2781507]
B:BD[6.2797639] → [4.5848127:5848156]
```
void wear_armour( int slot )
```
[6.2797639]
[6.2797662]
```
void wear_armour( int slot ) // slot is for tiles
```

Insertion in crawl-ref/source/item_use.cc at line 985 [6.2781507]

[12.3084]

        if (Options.easy_unequip)
            return (!takeoff_armour(item));

Insertion in crawl-ref/source/item_use.cc at line 1501 [6.2781507]

[13.5684]

    bool was_chosen = (item != -1);
    if (was_chosen)
        beh.item = item; // force item to be the prechosen one

Replacement in crawl-ref/source/item_use.cc at line 1523 [6.2781507]

B:BD[14.4216] → [14.4216:4242]

    if (beh.item != item)

[14.4216]

[14.4242]

    // Same for items selected in tile mode.
    if (was_chosen || beh.item != item)

Replacement in crawl-ref/source/item_use.cc at line 1658 [6.2781507]

B:BD[14.4435] → [13.9271:9389]

    if (item == -1)
    {
        if (! _fire_choose_item_and_target(item, target))
            return;        
    }

[14.4435]

[13.9389]

    if (!_fire_choose_item_and_target(item, target))
        return;

Replacement in crawl-ref/source/item_use.cc at line 2425 [6.2781507]

B:BD[15.749661] → [16.1250:1314]

                && (wepType == MI_DART || wepType == MI_STONE))

[15.749661]

[15.749725]

            && (wepType == MI_DART || wepType == MI_STONE))
        {

Insertion in crawl-ref/source/item_use.cc at line 2428 [6.2781507]
[15.749775]
[15.749775]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 2884 [6.2781507]

B:BD[17.546] → [17.546:611]

    const int eqslot = c == lslot? EQ_LEFT_RING : EQ_RIGHT_RING;

[17.546]

[15.753633]

    const int eqslot = (c == lslot)? EQ_LEFT_RING : EQ_RIGHT_RING;

Insertion in crawl-ref/source/item_use.cc at line 2998 [6.2781507]

[15.754453]

        if (Options.easy_unequip)
            return (!remove_ring(item_slot));

Replacement in crawl-ref/source/item_use.cc at line 3029 [6.2781507]

B:BD[15.755159] → [15.755159:755210]

                && you.equip[EQ_RIGHT_RING] != -1)

[15.755159]

[15.755210]

            && you.equip[EQ_RIGHT_RING] != -1)
        {

Insertion in crawl-ref/source/item_use.cc at line 3032 [6.2781507]
[15.755252]
[15.755252]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 3037 [6.2781507]

B:BD[17.895] → [17.895:1007]

                                        OPER_REMOVE) ||
            !remove_ring( you.equip[EQ_AMULET], true ))

[17.895]

[17.1007]

                                        OPER_REMOVE)
            || !remove_ring( you.equip[EQ_AMULET], true ))
        {

Insertion in crawl-ref/source/item_use.cc at line 3041 [6.2781507]
[17.1033]
[15.755384]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 3259 [6.2781507]

∅:D[17.1237] → [18.367932:368012]

B:BD[18.367932] → [18.367932:368012]

B:BD[18.368012] → [19.6085:6141]

∅:D[19.6141] → [20.80683:80826]

B:BD[15.758727] → [20.80683:80826]

∅:D[20.80826] → [18.368069:368099]

∅:D[15.758800] → [18.368069:368099]

B:BD[18.368069] → [18.368069:368099]

            slot == -1? prompt_invent_item( "Remove which piece of jewellery?",
                                            MT_INVLIST,
                                            OBJ_JEWELLERY, true, true, true,
                                            0, NULL, OPER_REMOVE)
                      : slot;

[17.1237]

[6.2837775]

            (slot == -1)? prompt_invent_item( "Remove which piece of jewellery?",
                                              MT_INVLIST,
                                              OBJ_JEWELLERY, true, true, true,
                                              0, NULL, OPER_REMOVE)
                        : slot;

Replacement in crawl-ref/source/item_use.cc at line 3289 [6.2781507]

B:BD[21.280] → [21.280:352]

    else if (!check_warning_inscriptions(you.inv[you.equip[hand_used]],

[21.280]

[21.352]

    if (!check_warning_inscriptions(you.inv[you.equip[hand_used]],

Insertion in crawl-ref/source/invent.cc at line 1147 [6.2920632]

[22.1126]

[21.1368]

        if (oper == OPER_WEAR)
        {
            if (item.base_type != OBJ_ARMOUR)
                return (true);
            // don't ask if item already worn
            int equip = you.equip[get_armour_slot(item)];
            if (equip != -1 && item.link == equip)
                return (check_old_item_warning(item, oper));
        }
        else if (oper == OPER_PUTON)
        {
            if (item.base_type != OBJ_JEWELLERY)
                return (true);
            // don't ask if item already worn
            int equip = -1;
            if (jewellery_is_amulet(item))
                equip = you.equip[EQ_AMULET];
            else
            {
                equip = you.equip[EQ_LEFT_RING];
                if (equip != -1 && item.link == equip)
                    return (check_old_item_warning(item, oper));
                // or maybe the other ring?
                equip = you.equip[EQ_RIGHT_RING];
            }
                
            if (equip != -1 && item.link == equip)
                return (check_old_item_warning(item, oper));
        }