fiddlerwoaroof/crawl - Change LNYPEXOYU2MHSCPQOFOA3LL22OY5ONJVQZYEB7DPZ37M6WE4CK5AC

Nemelex changes:

Renamed abilities, and reordered so that you get Draw One before Peek Two
Mark Four and Peek Two now lose some cards from the deck
Viewing a deck now shows which cards have been marked in it Also fixed a small warning in format.cc.

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

Created by haranp on April 3, 2008

LNYPEXOYU2MHSCPQOFOA3LL22OY5ONJVQZYEB7DPZ37M6WE4CK5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/format.cc at line 354 [5.2166]

B:BD[4.3353] → [2.2685:2754]

                const unsigned int left_angle = st.find('<', start);

[4.3353]

[4.3403]

                const size_t left_angle = st.find('<', start);

Replacement in crawl-ref/source/enum.h at line 116 [8.3287960]

B:BD[6.1322] → [7.381:437]

    ABIL_NEMELEX_PEEK_DECK,
    ABIL_NEMELEX_DRAW_CARD,

[6.1322]

[9.410]

    ABIL_NEMELEX_DRAW_ONE,
    ABIL_NEMELEX_PEEK_TWO,

Replacement in crawl-ref/source/enum.h at line 119 [8.3287960]
B:BD[9.440] → [10.37779:37807]
∅:D[10.37807] → [11.907:936]
B:BD[12.1528] → [11.907:936]
```
    ABIL_NEMELEX_MARK_DECK,
    ABIL_NEMELEX_STACK_DECK,
```
[9.440]
[13.20667]
```
    ABIL_NEMELEX_MARK_FOUR,
    ABIL_NEMELEX_STACK_FIVE,
```
Insertion in crawl-ref/source/describe.cc at line 1380 [8.3736416]
[14.11389]
[14.11389]
```
    int last_known_card = -1;
```
Insertion in crawl-ref/source/describe.cc at line 1393 [8.3736416]
[14.11556]
[15.1853]
```
                last_known_card = i;
```

Insertion in crawl-ref/source/describe.cc at line 1397 [8.3736416]

[14.11597]

        }
        description += "$";
    }
    // Marked cards which we don't know straight off.
    std::vector<card_type> marked_cards;
    for ( int i = last_known_card + 1; i < num_cards; ++i )
    {
        unsigned char flags;
        const card_type card = get_card_and_flags(item, -i-1, flags);
        if ( flags & CFLAG_MARKED )
            marked_cards.push_back(card);
    }
    if ( !marked_cards.empty() )
    {
        std::sort(marked_cards.begin(), marked_cards.end(),
                  compare_card_names);
        description += "Marked card(s): ";
        for ( unsigned int i = 0; i < marked_cards.size(); ++i )
        {
            if ( i != 0 )
                description += ", ";
            description += card_name(marked_cards[i]);

Insertion in crawl-ref/source/describe.cc at line 1424 [8.3736416]
[14.11642]
[14.11642]
```
    // Seen cards in the deck.
```
Replacement in crawl-ref/source/decks.cc at line 732 [8.3987460]
B:BD[10.51451] → [3.56331:56376]
```
static void _deck_peek_ident(item_def& deck)
```
[10.51451]
[10.51495]
```
static void _deck_ident(item_def& deck)
```
Deletion in crawl-ref/source/decks.cc at line 737 [8.3987460]
B:BD[10.51619] → [10.51619:51620]
Deletion in crawl-ref/source/decks.cc at line 738 [8.3987460]
B:BD[10.51682] → [10.51682:51683]

Replacement in crawl-ref/source/decks.cc at line 742 [8.3987460]

B:BD[7.1094] → [7.1094:1147]

// Peek at a deck (show what the next card will be.)

[7.1094]

[7.1147]

// This also shuffles the deck.
static void _deck_lose_card(item_def& deck)
{
    unsigned char flags = 0;
    // Seen cards are only half as likely to fall out,
    // marked cards only one-quarter as likely (note that marked
    // cards are also seen.)
    do {
        _shuffle_deck(deck);
        get_card_and_flags(deck, -1, flags);
    } while ( ((flags & CFLAG_MARKED) && coinflip()) ||
              ((flags & CFLAG_SEEN) && coinflip()) );
    _draw_top_card(deck, false, flags);
    deck.plus2++;
}
// Peek at two cards in a deck, then shuffle them back in.

Replacement in crawl-ref/source/decks.cc at line 763 [8.3987460]

B:BD[12.3461] → [3.56377:56406]

    if ( !_wielding_deck() )

[12.3461]

[9.4133]

    const int slot = _choose_inventory_deck( "Peek at which deck?" );
    if ( slot == -1 )

Deletion in crawl-ref/source/decks.cc at line 766 [8.3987460]
B:BD[9.4139] → [9.4139:4183]
```
        mpr("You aren't wielding a deck!");
```
Replacement in crawl-ref/source/decks.cc at line 769 [8.3987460]
B:BD[10.51791] → [10.51791:51842]
```
    item_def& deck(you.inv[you.equip[EQ_WEAPON]]);
```
[10.51791]
[10.51842]
```
    item_def& deck(you.inv[slot]);
```
Replacement in crawl-ref/source/decks.cc at line 774 [8.3987460]
B:BD[10.51898] → [10.51898:51947]
```
    if (deck.props["num_marked"].get_byte() > 0)
```
[10.51898]
[10.51947]
```
    if ( cards_in_deck(deck) > 2 )
```
Replacement in crawl-ref/source/decks.cc at line 776 [8.3987460]
B:BD[10.51953] → [10.51953:52004]
∅:D[10.52004] → [16.22442:22482]
B:BD[9.4183] → [16.22442:22482]
∅:D[16.22482] → [9.4183:4205]
B:BD[9.4183] → [9.4183:4205]
```
        mpr("You can't peek into a marked deck.");
        crawl_state.zero_turns_taken();
        return false;
```
[10.51953]
[10.52005]
```
        _deck_lose_card(deck);
        mpr("A card falls out of the deck.");
```
Replacement in crawl-ref/source/decks.cc at line 781 [8.3987460]
B:BD[17.48379] → [17.48379:48422]
```
    int          num_cards = cards.size();
```
[17.48379]
[10.52111]
```
    const int    num_cards = cards.size();
```

Replacement in crawl-ref/source/decks.cc at line 783 [8.3987460]

B:BD[10.52112] → [10.52112:52189]

    card_type card1, card2, card3;
    unsigned char flags1, flags2, flags3;

[10.52112]

[10.52189]

    card_type card1, card2;
    unsigned char flags1, flags2;

Deletion in crawl-ref/source/decks.cc at line 790 [8.3987460]
B:BD[10.52313] → [3.56441:56473]
∅:D[3.56473] → [10.52344:52345]
B:BD[10.52344] → [10.52344:52345]
```
        _deck_peek_ident(deck);
```

Deletion in crawl-ref/source/decks.cc at line 801 [8.3987460]

B:BD[10.52687] → [10.52687:52796]

B:BD[10.52796] → [3.56556:56588]

∅:D[3.56588] → [10.52827:53288]

B:BD[10.52827] → [10.52827:53288]

B:BD[10.53288] → [18.7476:7544]

∅:D[18.7544] → [10.53356:53754]

B:BD[10.53356] → [10.53356:53754]


    if (num_cards == 2)
    {
        deck.props["non_brownie_draws"] = (char) 2;
        deck.plus2 = -2;
        _deck_peek_ident(deck);
        mprf("Only two cards in the deck: %s and %s.",
             card_name(card1), card_name(card2));
        mpr("You shuffle the deck.");
        // If both cards are the same, then you know which card you're
        // going to draw both times.
        if (card1 == card2)
        {
            flags1 |= CFLAG_MARKED;
            flags2 |= CFLAG_MARKED;
            you.wield_change = true;
            deck.props["num_marked"] = (char) 2;
        }
        // "Shuffle" the two cards (even if they're the same, since
        // the flags might differ).
        if (coinflip())
        {
            std::swap(card1, card2);
            std::swap(flags1, flags2);
        }
        // After the first of two differing cards is drawn, you know
        // what the second card is going to be.
        if (card1 != card2)
        {
            flags1 |= CFLAG_MARKED;
            deck.props["num_marked"]++;
        }

Deletion in crawl-ref/source/decks.cc at line 802 [8.3987460]
B:BD[19.4408] → [3.56589:56721]
∅:D[3.56721] → [10.53885:53914]
B:BD[10.53885] → [10.53885:53914]
B:BD[10.53914] → [3.56722:56750]
∅:D[3.56750] → [10.53941:53991]
B:BD[10.53941] → [10.53941:53991]
B:BD[10.54034] → [10.54034:54035]
```
        _set_card_and_flags(deck, 0, card1, flags1 | CFLAG_SEEN);
        _set_card_and_flags(deck, 1, card2, flags2 | CFLAG_SEEN);
        return true;
    }
    _deck_peek_ident(deck);
    card3 = get_card_and_flags(deck, 2, flags3);
```
Deletion in crawl-ref/source/decks.cc at line 807 [8.3987460]
B:BD[10.54167] → [10.54167:54220]
```
    if (flags3 & CFLAG_SEEN)
        already_seen++;
```

Replacement in crawl-ref/source/decks.cc at line 808 [8.3987460]

B:BD[10.54221] → [10.54221:54256]

    if (random2(3) < already_seen)

[10.54221]

[10.54256]

    // always increase if seen 2, 50% increase if seen 1
    if ( coinflip() < already_seen)

Replacement in crawl-ref/source/decks.cc at line 812 [8.3987460]

B:BD[10.54300] → [10.54300:54438]

    mprf("You draw three cards from the deck.  They are: %s, %s and %s.",
         card_name(card1), card_name(card2), card_name(card3));

[10.54300]

[10.54438]

    mprf("You draw two cards from the deck. They are: %s and %s.",
         card_name(card1), card_name(card2));

Deletion in crawl-ref/source/decks.cc at line 817 [8.3987460]
B:BD[3.56875] → [3.56875:56937]
```
    _set_card_and_flags(deck, 2, card3, flags3 | CFLAG_SEEN);
```

Insertion in crawl-ref/source/decks.cc at line 821 [8.3987460]

[10.54702]

    // Peeking identifies the deck.
    _deck_ident(deck);
    you.wield_change = true;

Replacement in crawl-ref/source/decks.cc at line 829 [8.3987460]

B:BD[10.54790] → [10.54790:54861]

B:BD[10.54861] → [18.7545:7614]

∅:D[18.7614] → [10.54931:55051]

B:BD[10.54931] → [10.54931:55051]

// them back into the deck without losing any cards.  The player won't
// know what order they're in, and the if the top card is non-marked
// then the player won't know what the next card is.
// Return false if the operation was failed/aborted along the way.

[10.54790]

[10.55051]

// them back into the deck. The player won't know what order they're
// in, and the if the top card is non-marked then the player won't
// know what the next card is.  Return false if the operation was
// failed/aborted along the way.

Replacement in crawl-ref/source/decks.cc at line 835 [8.3987460]

B:BD[10.55070] → [3.56964:56993]

    if ( !_wielding_deck() )

[10.55070]

[10.55098]

    const int slot = _choose_inventory_deck( "Mark which deck?" );
    if ( slot == -1 )

Deletion in crawl-ref/source/decks.cc at line 838 [8.3987460]
B:BD[10.55104] → [10.55104:55148]
```
        mpr("You aren't wielding a deck!");
```
Replacement in crawl-ref/source/decks.cc at line 841 [8.3987460]
B:BD[10.55216] → [10.55216:55267]
```
    item_def& deck(you.inv[you.equip[EQ_WEAPON]]);
```
[10.55216]
[3.56994]
```
    item_def& deck(you.inv[slot]);
```
Replacement in crawl-ref/source/decks.cc at line 848 [8.3987460]
B:BD[12.3525] → [10.55385:55425]
```
        mpr("Deck is already marked.");
```
[12.3525]
[16.22483]
```
        mpr("The deck is already marked.");
```

Insertion in crawl-ref/source/decks.cc at line 853 [8.3987460]

[10.55427]

    // lose some cards, but keep at least two
    if ( cards_in_deck(deck) > 2 )
    {
        const int num_lost = std::min(cards_in_deck(deck)-2, random2(3) + 1);
        for ( int i = 0; i < num_lost; ++i )
            _deck_lose_card(deck);
        if ( num_lost == 1 )
            mpr("A card falls out of the deck.");
        else if ( num_lost > 1 )
            mpr("Some cards fall out of the deck.");
    }

Replacement in crawl-ref/source/decks.cc at line 888 [8.3987460]
B:BD[10.56145] → [10.56145:56190]
```
        return true;
    if (num_cards < 4)
```
[10.56145]
[7.1283]
```
        ;
    else if (num_cards < 4)
```
Insertion in crawl-ref/source/decks.cc at line 898 [8.3987460]
[3.57105]
[10.56357]
```
    _deck_ident(deck);
```
Deletion in crawl-ref/source/decks.cc at line 1048 [8.3987460]
B:BD[20.856] → [10.57774:57858]
∅:D[11.3885] → [12.4025:4089]
∅:D[10.57858] → [12.4025:4089]
B:BD[12.4025] → [12.4025:4089]
B:BD[12.4089] → [16.22647:22687]
∅:D[16.22687] → [12.4089:4118]
B:BD[12.4089] → [12.4089:4118]
```
    CrawlHashTable &props = deck.props;
    if (props["num_marked"].get_byte() > 0)
    {
        mpr("You can't triple draw from a marked deck.");
        crawl_state.zero_turns_taken();
        return false;
    }
```

Replacement in crawl-ref/source/abl-show.cc at line 149 [8.4494389]

B:BD[21.10401] → [7.1899:1953]

B:BD[7.1953] → [10.64008:64064]

∅:D[10.64064] → [7.2003:2036]

B:BD[7.2003] → [7.2003:2036]

    { ABIL_NEMELEX_PEEK_DECK, ABIL_NEMELEX_DRAW_CARD,
      ABIL_NEMELEX_TRIPLE_DRAW, ABIL_NEMELEX_MARK_DECK,
      ABIL_NEMELEX_STACK_DECK },

[21.10401]

[21.10505]

    { ABIL_NEMELEX_DRAW_ONE, ABIL_NEMELEX_PEEK_TWO,
      ABIL_NEMELEX_TRIPLE_DRAW, ABIL_NEMELEX_MARK_FOUR,
      ABIL_NEMELEX_STACK_FIVE },

Replacement in crawl-ref/source/abl-show.cc at line 300 [8.4494389]

B:BD[9.6094] → [7.2037:2110]

B:BD[7.2110] → [22.3196:3266]

    { ABIL_NEMELEX_PEEK_DECK, "Deck Peek", 3, 0, 0, 1, ABFLAG_INSTANT },
    { ABIL_NEMELEX_DRAW_CARD, "Draw Card", 2, 0, 0, 0, ABFLAG_NONE },

[9.6094]

    { ABIL_NEMELEX_DRAW_ONE, "Draw One", 2, 0, 0, 0, ABFLAG_NONE },
    { ABIL_NEMELEX_PEEK_TWO, "Peek at Two", 3, 0, 0, 1, ABFLAG_INSTANT },

Replacement in crawl-ref/source/abl-show.cc at line 303 [8.4494389]

B:BD[9.6170] → [10.64065:64137]

B:BD[10.64137] → [23.835:910]

    { ABIL_NEMELEX_MARK_DECK, "Mark Deck", 4, 0, 125, 5, ABFLAG_NONE },
    { ABIL_NEMELEX_STACK_DECK, "Stack Deck", 5, 0, 250, 10, ABFLAG_NONE },

[9.6170]

[13.23062]

    { ABIL_NEMELEX_MARK_FOUR, "Mark Four", 4, 0, 125, 5, ABFLAG_NONE },
    { ABIL_NEMELEX_STACK_FIVE, "Stack Five", 5, 0, 250, 10, ABFLAG_NONE },

Replacement in crawl-ref/source/abl-show.cc at line 727 [8.4494389]
B:BD[24.414] → [24.414:448]
```
    case ABIL_NEMELEX_STACK_DECK:
```
[24.414]
[24.448]
```
    case ABIL_NEMELEX_STACK_FIVE:
```
Replacement in crawl-ref/source/abl-show.cc at line 732 [8.4494389]
B:BD[24.555] → [10.64138:64171]
```
    case ABIL_NEMELEX_MARK_DECK:
```
[24.555]
[24.583]
```
    case ABIL_NEMELEX_MARK_FOUR:
```
Replacement in crawl-ref/source/abl-show.cc at line 743 [8.4494389]
B:BD[7.2231] → [10.64268:64301]
```
    case ABIL_NEMELEX_PEEK_DECK:
```
[7.2231]
[10.64301]
```
    case ABIL_NEMELEX_PEEK_TWO:
```
Replacement in crawl-ref/source/abl-show.cc at line 748 [8.4494389]
∅:D[10.64414] → [7.2231:2264]
B:BD[7.2231] → [7.2231:2264]
```
    case ABIL_NEMELEX_DRAW_CARD:
```
[10.64414]
[7.2264]
```
    case ABIL_NEMELEX_DRAW_ONE:
```
Replacement in crawl-ref/source/abl-show.cc at line 1724 [8.4494389]
B:BD[7.2564] → [7.2564:2597]
```
    case ABIL_NEMELEX_DRAW_CARD:
```
[7.2564]
[7.2597]
```
    case ABIL_NEMELEX_DRAW_ONE:
```

Replacement in crawl-ref/source/abl-show.cc at line 1730 [8.4494389]

B:BD[25.6725] → [9.6172:6242]

    case ABIL_NEMELEX_TRIPLE_DRAW:
        if ( !deck_triple_draw() )

[25.6725]

[12.5421]

    case ABIL_NEMELEX_PEEK_TWO:
        if ( !deck_peek() )

Replacement in crawl-ref/source/abl-show.cc at line 1733 [8.4494389]
B:BD[12.5447] → [24.845:894]
```
        exercise(SK_EVOCATIONS, 3 + random2(3));
```
[12.5447]
[12.5447]
```
        exercise(SK_EVOCATIONS, 2 + random2(2));
```
Replacement in crawl-ref/source/abl-show.cc at line 1736 [8.4494389]
B:BD[12.5463] → [7.2712:2745]
∅:D[7.2745] → [12.5491:5519]
B:BD[12.5491] → [12.5491:5519]
```
    case ABIL_NEMELEX_PEEK_DECK:
        if ( !deck_peek() )
```
[12.5463]
[11.4822]
```
    case ABIL_NEMELEX_TRIPLE_DRAW:
        if ( !deck_triple_draw() )
```
Replacement in crawl-ref/source/abl-show.cc at line 1739 [8.4494389]
B:BD[11.4848] → [24.895:944]
```
        exercise(SK_EVOCATIONS, 2 + random2(2));
```
[11.4848]
[11.4848]
```
        exercise(SK_EVOCATIONS, 3 + random2(3));
```
Replacement in crawl-ref/source/abl-show.cc at line 1742 [8.4494389]
B:BD[11.4864] → [10.64415:64448]
```
    case ABIL_NEMELEX_MARK_DECK:
```
[11.4864]
[10.64448]
```
    case ABIL_NEMELEX_MARK_FOUR:
```
Replacement in crawl-ref/source/abl-show.cc at line 1748 [8.4494389]
∅:D[10.64567] → [11.4864:4898]
B:BD[11.4864] → [11.4864:4898]
```
    case ABIL_NEMELEX_STACK_DECK:
```
[10.64567]
[11.4898]
```
    case ABIL_NEMELEX_STACK_FIVE:
```

Nemelex changes:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/format.cc at line 354 [5.2166]

Replacement in crawl-ref/source/enum.h at line 116 [8.3287960]

Replacement in crawl-ref/source/enum.h at line 119 [8.3287960]

Insertion in crawl-ref/source/describe.cc at line 1380 [8.3736416]

Insertion in crawl-ref/source/describe.cc at line 1393 [8.3736416]

Insertion in crawl-ref/source/describe.cc at line 1397 [8.3736416]

Insertion in crawl-ref/source/describe.cc at line 1424 [8.3736416]

Replacement in crawl-ref/source/decks.cc at line 732 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 737 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 738 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 742 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 763 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 766 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 769 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 774 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 776 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 781 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 783 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 790 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 801 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 802 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 807 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 808 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 812 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 817 [8.3987460]

Insertion in crawl-ref/source/decks.cc at line 821 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 829 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 835 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 838 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 841 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 848 [8.3987460]

Insertion in crawl-ref/source/decks.cc at line 853 [8.3987460]

Replacement in crawl-ref/source/decks.cc at line 888 [8.3987460]

Insertion in crawl-ref/source/decks.cc at line 898 [8.3987460]

Deletion in crawl-ref/source/decks.cc at line 1048 [8.3987460]

Replacement in crawl-ref/source/abl-show.cc at line 149 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 300 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 303 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 727 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 732 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 743 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 748 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1724 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1730 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1733 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1736 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1739 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1742 [8.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1748 [8.4494389]