fiddlerwoaroof/crawl - Change RR2J4VLJCZSAKY3HNS334KI4YUAPOMSETO2HGCGEEIUCUJAYAGSQC

Deck stacking implemented. Five cards (or less, if there are less) are

drawn, you get to stack them in any order, and the rest of the deck is discarded. The next card is inscribed on the deck; the remainder can be seen with 'v'. This is now Nemelex's top ability.

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

Created by haranp on May 11, 2007

RR2J4VLJCZSAKY3HNS334KI4YUAPOMSETO2HGCGEEIUCUJAYAGSQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 161 [3.804403]
B:BD[2.727] → [2.727:739]
```
      "" },
```
[2.727]
[4.2205]
```
      "stack decks" },
```
Replacement in crawl-ref/source/religion.cc at line 241 [3.804403]
B:BD[2.849] → [2.849:861]
```
      "" },
```
[2.849]
[4.4349]
```
      "stack decks" },
```

Replacement in crawl-ref/source/output.cc at line 353 [3.1088282]

B:BD[5.3213] → [5.3213:3288]

                    wpn.name(DESC_INVENTORY, Options.terse_hand).c_str());

[5.3213]

[3.1094561]

                    wpn.name(DESC_INVENTORY,
                             Options.terse_hand).substr(0,38).c_str());

Insertion in crawl-ref/source/itemprop.h at line 150 [6.641567]
[6.646616]
[7.5515]
```
bool is_deck(const item_def &item);
```

Insertion in crawl-ref/source/itemprop.cc at line 2136 [6.646661]

[7.5692]

[8.760]

bool is_deck(const item_def &item)
{
    return item.base_type == OBJ_MISCELLANY
        && (item.sub_type == MISC_DECK_OF_TRICKS
            || item.sub_type == MISC_DECK_OF_SUMMONINGS
            || item.sub_type == MISC_DECK_OF_POWER
            || item.sub_type == MISC_DECK_OF_WONDERS);
}

Replacement in crawl-ref/source/itemname.cc at line 1335 [3.2667494]

B:BD[9.33752] → [2.972:1082]

            if ( subtype_to_decktype(item_typ) != DECK_OF_PUNISHMENT &&
                 this->special != 0 )

[9.33752]

[2.1082]

            if ( is_deck(*this) && item_plus2 != 0 )

Replacement in crawl-ref/source/itemname.cc at line 1339 [3.2667494]

B:BD[2.1163] → [2.1163:1240]

                     << card_name(static_cast<card_type>(this->special - 1))

[2.1163]

[2.1240]

                     << card_name(static_cast<card_type>(item_plus2 - 1))

Insertion in crawl-ref/source/enum.h at line 118 [3.3287960]
[2.1528]
[10.4312]
```
    ABIL_NEMELEX_STACK_DECK,
```
Insertion in crawl-ref/source/describe.cc at line 38 [3.3736416]
[3.3737391]
[3.3737391]
```
#include "decks.h"
```

Insertion in crawl-ref/source/describe.cc at line 3059 [3.3736416]

[3.3839154]

    if ( is_deck(item) && item.plus2 != 0 )
    {
        description += "$Next card(s): ";
        description += card_name(static_cast<card_type>(item.plus2 - 1));
        long spec = item.special;
        while ( spec )
        {
            description += ", ";
            description += card_name(static_cast<card_type>((spec & 0xFF)-1));
            spec >>= 8;
        }
        description += "$";
    }

Insertion in crawl-ref/source/decks.h at line 26 [3.3986924]
[2.3090]
[2.3090]
```
bool deck_stack();
```
Insertion in crawl-ref/source/decks.cc at line 23 [3.3987460]
[3.3987794]
[3.3987794]
```
#include "itemprop.h"
```
Replacement in crawl-ref/source/decks.cc at line 175 [3.3987460]
B:BD[11.1348] → [11.1348:1399]
```
    case CARD_STATUE: return "the Crystal Statue";
```
[11.1348]
[11.1399]
```
    case CARD_STATUE: return "a statue";
```
Replacement in crawl-ref/source/decks.cc at line 178 [3.3987460]
B:BD[11.1486] → [11.1486:1539]
```
    case CARD_DEMON_LESSER: return "a little demon";
```
[11.1486]
[11.1539]
```
    case CARD_DEMON_LESSER: return "a demon";
```

Replacement in crawl-ref/source/decks.cc at line 180 [3.3987460]

B:BD[11.1585] → [11.1585:1851]

    case CARD_DEMON_GREATER: return "a huge demon";
    case CARD_DEMON_SWARM: return "a swarm of little demons";
    case CARD_YAK: return "a huge, shaggy yak";
    case CARD_FIEND: return "a huge, scaly devil";
    case CARD_DRAGON: return "a huge, scaly dragon";

[11.1585]

[11.1851]

    case CARD_DEMON_GREATER: return "a demon";
    case CARD_DEMON_SWARM: return "a demon";
    case CARD_YAK: return "a yak";
    case CARD_FIEND: return "a devil";
    case CARD_DRAGON: return "a dragon";

Replacement in crawl-ref/source/decks.cc at line 187 [3.3987460]

B:BD[11.1946] → [11.1946:2016]

    case CARD_LICH: return "a very irritated-looking skeletal thing";

[11.1946]

[11.2016]

    case CARD_LICH: return "a lich";

Replacement in crawl-ref/source/decks.cc at line 189 [3.3987460]

B:BD[11.2045] → [11.2045:2123]

        return player_see_invis() ? "a hideous abomination" : "a blank card";

[11.2045]

[11.2123]

        return player_see_invis() ? "an abomination" : "a blank card";

Replacement in crawl-ref/source/decks.cc at line 191 [3.3987460]

B:BD[11.2160] → [11.2160:2310]

    case CARD_TELEPORT: return "the Portal of Delayed Transposition";
    case CARD_TELEPORT_NOW: return "the Portal of Instantaneous Transposition";

[11.2160]

[11.2310]

    case CARD_TELEPORT: return "the Portal";
    case CARD_TELEPORT_NOW: return "the Portal";

Replacement in crawl-ref/source/decks.cc at line 199 [3.3987460]

B:BD[11.2542] → [11.2542:2725]

    case CARD_HEALING: return "the Elixir of Health";
    case CARD_HEAL_WOUNDS: return "the Symbol of Immediate Regeneration";
    case CARD_TORMENT: return "the Symbol of Torment";

[11.2542]

[11.2725]

    case CARD_HEALING: return "Health";
    case CARD_HEAL_WOUNDS: return "Health";
    case CARD_TORMENT: return "Torment";

Replacement in crawl-ref/source/decks.cc at line 213 [3.3987460]

B:BD[11.3212] → [11.3212:3284]

    case CARD_RULES_FOR_BRIDGE: return "the rules for contract bridge";

[11.3212]

[11.3284]

    case CARD_RULES_FOR_BRIDGE: return "the rules";

Replacement in crawl-ref/source/decks.cc at line 287 [3.3987460]

B:BD[2.3259] → [2.3259:3439]

    const item_def& item = you.inv[you.equip[EQ_WEAPON]];
    return ( item.base_type == OBJ_MISCELLANY &&
             subtype_to_decktype(item.sub_type) != DECK_OF_PUNISHMENT );

[2.3259]

[2.3439]

    return is_deck(you.inv[you.equip[EQ_WEAPON]]);

Replacement in crawl-ref/source/decks.cc at line 298 [3.3987460]
B:BD[11.4262] → [2.3490:3519]
```
    if ( item.special != 0 )
```
[11.4262]
[2.3519]
```
    if ( item.plus2 != 0 )
```

Replacement in crawl-ref/source/decks.cc at line 306 [3.3987460]

B:BD[2.3810] → [2.3810:3841]

    item.special = chosen + 1;

[2.3810]

[2.3841]

    item.plus2 = chosen + 1;
    you.wield_change = true;
    return true;
}
bool deck_stack()
{
    if ( !wielding_deck() )
    {
        mpr("You aren't wielding a deck!");
        return false;
    }
    item_def& item(you.inv[you.equip[EQ_WEAPON]]);
    if ( item.plus2 != 0 )
    {
        mpr("You can't stack a marked deck.");
        return false;
    }
    const int num_to_stack = (item.plus < 5 ? item.plus : 5);
    const deck_type dtype = subtype_to_decktype(item.sub_type);
    std::vector<card_type> draws;
    for ( int i = 0; i < num_to_stack; ++i )
        draws.push_back(choose_one_card(dtype, false));
    if ( draws.size() == 1 )
        mpr("There's only one card left!");
    else
        mpr("Order the cards (bottom to top)...", MSGCH_PROMPT);
    item.special = 0;
    while ( draws.size() > 1 )
    {
        for ( unsigned int i = 0; i < draws.size(); ++i )
        {
            msg::stream << (static_cast<char>(i + 'a')) << " - "
                        << card_name(draws[i]) << std::endl;
        }
        int selected = -1;
        while ( 1 )
        {
            const int keyin = tolower(get_ch());
            if (keyin >= 'a' && keyin < 'a' + static_cast<int>(draws.size()))
            {
                selected = keyin - 'a';
                break;
            }
            else
            {
                canned_msg(MSG_HUH);
            }
        }
        item.special <<= 8;
        item.special += draws[selected] + 1;
        draws.erase(draws.begin() + selected);
        mpr("Next card?", MSGCH_PROMPT);
    }
    item.plus2 = draws[0] + 1;
    item.plus = num_to_stack;   // no more deck after the stack

Replacement in crawl-ref/source/decks.cc at line 380 [3.3987460]
B:BD[2.3996] → [2.3996:4025]
```
    if ( item.special != 0 )
```
[2.3996]
[2.4025]
```
    if ( item.plus2 != 0 )
```

Replacement in crawl-ref/source/decks.cc at line 407 [3.3987460]

B:BD[11.5137] → [11.5137:5233]

        int keyin = get_ch();
        if ( isalpha(keyin) )
            keyin = tolower(keyin);

[11.5137]

[11.5233]

        const int keyin = tolower(get_ch());

Insertion in crawl-ref/source/decks.cc at line 430 [3.3987460]

[11.5736]

[2.4149]

// In general, if the next cards in a deck are known, they will
// be stored in plus2 (the next card) and special (up to 4 cards
// after that, bitpacked.)
// Hidden assumption: no more than 126 cards, otherwise the 5th
// card could clobber the sign bit in special.

Replacement in crawl-ref/source/decks.cc at line 439 [3.3987460]
B:BD[11.5885] → [2.4254:4283]
```
    if ( deck.special == 0 )
```
[11.5885]
[3.3993469]
```
    if ( deck.plus2 == 0 )
```

Replacement in crawl-ref/source/decks.cc at line 445 [3.3987460]

B:BD[2.4340] → [2.4340:4423]

        cards(static_cast<card_type>(deck.special - 1));
        deck.special = 0;

[2.4340]

[2.4423]

        // draw the marked card
        cards(static_cast<card_type>(deck.plus2 - 1));
        // If there are more marked cards, shift them up
        if ( deck.special )
        {
            const short next_card = (deck.special & 0xFF);
            deck.special >>= 8;
            deck.plus2 = next_card;
        }
        else
        {
            deck.plus2 = 0;
        }

Replacement in crawl-ref/source/decks.cc at line 958 [3.3987460]

B:BD[12.1594] → [12.1594:1646]

                 "before you!" : "at your feet!" );

[12.1594]

[3.4008697]

                 "before you" : "at your feet" );

Replacement in crawl-ref/source/abl-show.cc at line 131 [3.4494389]
∅:D[2.5351] → [4.10461:10505]
∅:D[11.6078] → [4.10461:10505]
B:BD[4.10461] → [4.10461:10505]
```
      ABIL_NON_ABILITY, ABIL_NON_ABILITY },
```
[2.5351]
[4.10505]
```
      ABIL_NON_ABILITY, ABIL_NEMELEX_STACK_DECK },
```
Insertion in crawl-ref/source/abl-show.cc at line 275 [3.4494389]
[2.5420]
[11.6170]
```
    { ABIL_NEMELEX_STACK_DECK, "Stack Deck", 5, 0, 150, 6, ABFLAG_NONE },
```

Insertion in crawl-ref/source/abl-show.cc at line 1564 [3.4494389]

[2.5519]

[11.6242]

            return false;
        break;
    case ABIL_NEMELEX_STACK_DECK:
        if ( !deck_stack() )

Deck stacking implemented. Five cards (or less, if there are less) are

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 161 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 241 [3.804403]

Replacement in crawl-ref/source/output.cc at line 353 [3.1088282]

Insertion in crawl-ref/source/itemprop.h at line 150 [6.641567]

Insertion in crawl-ref/source/itemprop.cc at line 2136 [6.646661]

Replacement in crawl-ref/source/itemname.cc at line 1335 [3.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1339 [3.2667494]

Insertion in crawl-ref/source/enum.h at line 118 [3.3287960]

Insertion in crawl-ref/source/describe.cc at line 38 [3.3736416]

Insertion in crawl-ref/source/describe.cc at line 3059 [3.3736416]

Insertion in crawl-ref/source/decks.h at line 26 [3.3986924]

Insertion in crawl-ref/source/decks.cc at line 23 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 175 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 178 [3.3987460]