fiddlerwoaroof/crawl - Change 2ESKXYN266CEMLSL6DNCKG4REDO34FXL4ODVGMWDJTNJRKMXWCRQC

Implemented Nemelex's 'sneak peek' ability.

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

Created by haranp on May 11, 2007

2ESKXYN266CEMLSL6DNCKG4REDO34FXL4ODVGMWDJTNJRKMXWCRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 466 [4.5936]

B:BD[3.15857] → [3.15857:16289]

    std::string text;
    text =  "To move your character, use the numpad; try Numlock both on and off. "
            "If your system has no number pad, or if you are familiar with the vi "
            "keys, movement is also possible with <w>hjklyubn<magenta>. A basic "
            "command list can be found under <w>?<magenta>, and the most important "
            "commands will be explained to you as it becomes necessary. ";

[3.15857]

[5.1676]

    std::string text =
        "To move your character, use the numpad; try Numlock both on and off. "
        "If your system has no number pad, or if you are familiar with the vi "
        "keys, movement is also possible with <w>hjklyubn<magenta>. A basic "
        "command list can be found under <w>?<magenta>, and the most "
        "important commands will be explained to you as it becomes necessary.";

Replacement in crawl-ref/source/tutorial.cc at line 618 [4.5936]

B:BD[3.21386] → [3.21386:21474]

    for ( long i = 0; i < TUT_EVENTS_NUM; ++i )
        Options.tutorial_events[i] = 0;

[3.21386]

[3.21474]

    Options.tutorial_events.init(false);

Replacement in crawl-ref/source/religion.cc at line 157 [7.804403]

B:BD[6.2171] → [2.163:228]

    { "", "draw cards with careful consideration", "", "", "" },

[6.2171]

[6.2205]

    { "peek at the first card of a deck",
      "draw cards with careful consideration",
      "",
      "",
      "" },

Replacement in crawl-ref/source/religion.cc at line 237 [7.804403]

B:BD[6.4315] → [2.229:294]

    { "", "draw cards with careful consideration", "", "", "" },

[6.4315]

[6.4349]

    { "peek at the first card of a deck",
      "draw cards with careful consideration",
      "",
      "",
      "" },

Insertion in crawl-ref/source/itemname.cc at line 30 [7.2667494]
[7.2668117]
[8.359875]
```
#include "decks.h"
```

Insertion in crawl-ref/source/itemname.cc at line 1335 [7.2667494]

[9.33752]

[7.2733052]

            if ( subtype_to_decktype(item_typ) != DECK_OF_PUNISHMENT &&
                 this->special != 0 )
            {
                // an inscribed deck!
                buff << " {"
                     << card_name(static_cast<card_type>(this->special - 1))
                     << "}";
            }

Deletion in crawl-ref/source/it_use3.cc at line 615 [7.2870456]

B:BD[7.2890085] → [7.2890085:2890172]

            deck_of_cards(DECK_OF_WONDERS);
            pract = 1;
            break;

Deletion in crawl-ref/source/it_use3.cc at line 616 [7.2870456]

B:BD[7.2890210] → [7.2890210:2890299]

            deck_of_cards(DECK_OF_SUMMONING);
            pract = 1;
            break;

Deletion in crawl-ref/source/it_use3.cc at line 617 [7.2870456]

B:BD[7.2890333] → [7.2890333:2890419]

            deck_of_cards(DECK_OF_TRICKS);
            pract = 1;
            break;

Replacement in crawl-ref/source/it_use3.cc at line 618 [7.2870456]
B:BD[7.2890452] → [7.2890452:2890494]
```
            deck_of_cards(DECK_OF_POWER);
```
[7.2890452]
[7.2890494]
```
            evoke_deck(wpn);
```
Deletion in crawl-ref/source/invent.cc at line 759 [7.2920632]
B:BD[10.1005] → [10.1005:1043]
```
    char prompt[ITEMNAME_SIZE + 100];
```

Replacement in crawl-ref/source/invent.cc at line 761 [7.2920632]

B:BD[10.1126] → [10.1126:1187]

B:BD[10.1187] → [11.26354:26407]

∅:D[11.26407] → [10.1251:1293]

B:BD[10.1251] → [10.1251:1293]

        snprintf(prompt, sizeof prompt, "Really choose %s?",
                 item.name(DESC_INVENTORY).c_str());
        return yesno(prompt, false, 'n');

[10.1126]

[12.783240]

        std::string prompt = "Really choose ";
        prompt += item.name(DESC_INVENTORY);
        prompt += '?';
        return yesno(prompt.c_str(), false, 'n');

Insertion in crawl-ref/source/enum.h at line 117 [7.3287960]
[2.440]
[13.4312]
```
    ABIL_NEMELEX_PEEK,
```

Insertion in crawl-ref/source/enum.h at line 509 [7.3287960]

[14.1297]

[12.905946]

};
enum card_type
{
    CARD_BLANK = 0,             //    0
    CARD_BUTTERFLY,
    CARD_WRAITH,
    CARD_EXPERIENCE,
    CARD_WEALTH,
    CARD_INTELLIGENCE,          //    5
    CARD_STRENGTH,
    CARD_QUICKSILVER,
    CARD_STUPIDITY,
    CARD_WEAKNESS,
    CARD_SLOTH,                 //   10
    CARD_SHUFFLE,
    CARD_FREAK,
    CARD_DEATH,
    CARD_NORMALITY,
    CARD_SHADOW,                //   15
    CARD_GATE,
    CARD_STATUE,
    CARD_ACQUISITION,
    CARD_HASTEN,
    CARD_DEMON_LESSER,          //   20
    CARD_DEMON_COMMON,
    CARD_DEMON_GREATER,
    CARD_DEMON_SWARM,
    CARD_YAK,
    CARD_FIEND,                 //   25
    CARD_DRAGON,
    CARD_GOLEM,
    CARD_THING_FUGLY,
    CARD_LICH,
    CARD_HORROR_UNSEEN,         //   30
    CARD_BLINK,
    CARD_TELEPORT,
    CARD_TELEPORT_NOW,
    CARD_RAGE,
    CARD_LEVITY,                //   35
    CARD_VENOM,
    CARD_XOM,
    CARD_SLOW,
    CARD_DECAY,
    CARD_HEALING,               //   40
    CARD_HEAL_WOUNDS,
    CARD_TORMENT,
    CARD_FOUNTAIN,
    CARD_ALTAR,
    CARD_FAMINE,                //   45
    CARD_FEAST,
    CARD_WILD_MAGIC,
    CARD_VIOLENCE,
    CARD_PROTECTION,
    CARD_KNOWLEDGE,             //   50
    CARD_MAZE,
    CARD_PANDEMONIUM,
    CARD_IMPRISONMENT,
    CARD_RULES_FOR_BRIDGE,      //   54
    NUM_CARDS,                  // must remain last regular member {dlb}
    CARD_RANDOM = 255           // must remain final member {dlb}

Replacement in crawl-ref/source/decks.h at line 18 [7.3986924]

B:BD[7.3987150] → [7.3987150:3987371]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: it_use_3 - religion
 * *********************************************************************** */

[7.3987150]

[15.5360]

#include "externs.h"
const char* card_name(card_type card);
void evoke_deck(item_def& deck);

Insertion in crawl-ref/source/decks.h at line 25 [7.3986924]
[2.522]
[7.3987417]
```
bool deck_peek();
const char* card_name(card_type card);
```

Deletion in crawl-ref/source/decks.cc at line 35 [7.3987460]

B:BD[7.3988207] → [15.5404:5419]

∅:D[15.5419] → [7.3988272:3989692]

B:BD[7.3988272] → [7.3988272:3989692]

enum card_type
{
    CARD_BLANK = 0,             //    0
    CARD_BUTTERFLY,
    CARD_WRAITH,
    CARD_EXPERIENCE,
    CARD_WEALTH,
    CARD_INTELLIGENCE,          //    5
    CARD_STRENGTH,
    CARD_QUICKSILVER,
    CARD_STUPIDITY,
    CARD_WEAKNESS,
    CARD_SLOTH,                 //   10
    CARD_SHUFFLE,
    CARD_FREAK,
    CARD_DEATH,
    CARD_NORMALITY,
    CARD_SHADOW,                //   15
    CARD_GATE,
    CARD_STATUE,
    CARD_ACQUISITION,
    CARD_HASTEN,
    CARD_DEMON_LESSER,          //   20
    CARD_DEMON_COMMON,
    CARD_DEMON_GREATER,
    CARD_DEMON_SWARM,
    CARD_YAK,
    CARD_FIEND,                 //   25
    CARD_DRAGON,
    CARD_GOLEM,
    CARD_THING_FUGLY,
    CARD_LICH,
    CARD_HORROR_UNSEEN,         //   30
    CARD_BLINK,
    CARD_TELEPORT,
    CARD_TELEPORT_NOW,
    CARD_RAGE,
    CARD_LEVITY,                //   35
    CARD_VENOM,
    CARD_XOM,
    CARD_SLOW,
    CARD_DECAY,
    CARD_HEALING,               //   40
    CARD_HEAL_WOUNDS,
    CARD_TORMENT,
    CARD_FOUNTAIN,
    CARD_ALTAR,
    CARD_FAMINE,                //   45
    CARD_FEAST,
    CARD_WILD_MAGIC,
    CARD_VIOLENCE,
    CARD_PROTECTION,
    CARD_KNOWLEDGE,             //   50
    CARD_MAZE,
    CARD_PANDEMONIUM,
    CARD_IMPRISONMENT,
    CARD_RULES_FOR_BRIDGE,      //   54
    NUM_CARDS,                  // must remain last regular member {dlb}
    CARD_RANDOM = 255           // must remain final member {dlb}
};

Replacement in crawl-ref/source/decks.cc at line 153 [7.3987460]
B:BD[7.3991731] → [2.545:590]
```
static const char* card_name(card_type card)
```
[7.3991731]
[2.590]
```
const char* card_name(card_type card)
```
Replacement in crawl-ref/source/decks.cc at line 282 [7.3987460]
B:BD[2.4071] → [2.4071:4095]
```
bool deck_triple_draw()
```
[2.4071]
[2.4095]
```
static bool wielding_deck()
```

Replacement in crawl-ref/source/decks.cc at line 284 [7.3987460]

B:BD[2.4097] → [2.4097:4133]

    if (you.equip[EQ_WEAPON] == -1)

[2.4097]

[2.4133]

    if ( you.equip[EQ_WEAPON] == -1 )
        return false;
    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 );
}
bool deck_peek()
{
    if ( !wielding_deck() )

Insertion in crawl-ref/source/decks.cc at line 299 [7.3987460]

[2.4262]

[7.3993304]

    if ( item.special != 0 )
    {
        mpr("You already know what the next card will be.");
        return false;
    }
    const deck_type dtype = subtype_to_decktype(item.sub_type);
    const card_type chosen = choose_one_card(dtype, false);
    msg::stream << "You see " << card_name(chosen) << '.' << std::endl;
    item.special = chosen + 1;
    you.wield_change = true;
    return true;
}

Replacement in crawl-ref/source/decks.cc at line 312 [7.3987460]

B:BD[7.3993305] → [2.4263:4376]

    if ( item.base_type != OBJ_MISCELLANY ||
         subtype_to_decktype(item.sub_type) == DECK_OF_PUNISHMENT )

[7.3993305]

[2.4376]

bool deck_triple_draw()
{
    if ( !wielding_deck() )

Insertion in crawl-ref/source/decks.cc at line 320 [7.3987460]

[2.4455]

    item_def& item(you.inv[you.equip[EQ_WEAPON]]);
    if ( item.special != 0 )
    {
        mpr("You can't triple draw from a marked deck.");
        return false;
    }

Replacement in crawl-ref/source/decks.cc at line 369 [7.3987460]
B:BD[2.5715] → [2.5715:5716]
[2.5715]
[2.5716]
```
    you.wield_change = true;
```
Replacement in crawl-ref/source/decks.cc at line 373 [7.3987460]
B:BD[2.5736] → [2.5736:5777]
```
void deck_of_cards(deck_type which_deck)
```
[2.5736]
[2.5777]
```
void evoke_deck( item_def& deck )
```

Replacement in crawl-ref/source/decks.cc at line 375 [7.3987460]

B:BD[2.5779] → [2.5779:5854]

    int brownie_points = 0;     // for passing to did_god_conduct() {dlb}

[2.5779]

[2.5854]

    const deck_type which_deck = subtype_to_decktype(deck.sub_type);

Replacement in crawl-ref/source/decks.cc at line 377 [7.3987460]

B:BD[2.5885] → [2.5885:5955]

∅:D[2.5955] → [15.6636:6655]

B:BD[7.3993305] → [15.6636:6655]

∅:D[15.6655] → [7.3993319:3993469]

B:BD[7.3993319] → [7.3993319:3993469]

    
    const card_type chosen = choose_one_card(which_deck, true);
    cards(chosen);
    // Decks of punishment aren't objects in the game,
    // its just Nemelex's form of punishment -- bwr
    if (which_deck != DECK_OF_PUNISHMENT)

[2.5885]

[7.3993469]

    if ( deck.special == 0 )

Replacement in crawl-ref/source/decks.cc at line 379 [7.3987460]

B:BD[7.3993475] → [7.3993475:3993766]

        you.inv[you.equip[EQ_WEAPON]].plus--;
        if (you.inv[you.equip[EQ_WEAPON]].plus == 0)
        {
            mpr("The deck of cards disappears in a puff of smoke.");
            unwield_item(you.equip[EQ_WEAPON]);
            dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );

[7.3993475]

[7.3993766]

        deck_of_cards(which_deck);
    }
    else
    {
        cards(static_cast<card_type>(deck.special - 1));
        deck.special = 0;
        you.wield_change = true;
    }
    deck.plus--;

Replacement in crawl-ref/source/decks.cc at line 389 [7.3987460]

B:BD[7.3993767] → [7.3993767:3993887]

            // these bonuses happen only when the deck expires {dlb}:
            brownie_points = (coinflip()? 2 : 1);

[7.3993767]

[7.3993887]

    int brownie_points = 0;
    if ( deck.plus == 0 )
    {
        mpr("The deck of cards disappears in a puff of smoke.");       
        unwield_item(you.equip[EQ_WEAPON]);            
        dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );

Replacement in crawl-ref/source/decks.cc at line 396 [7.3987460]

B:BD[7.3993888] → [7.3993888:3994066]

            if (which_deck == DECK_OF_WONDERS)
                brownie_points += 2;
            else if (which_deck == DECK_OF_POWER)
                brownie_points++;
        }

[7.3993888]

[7.3994066]

        // these bonuses happen only when the deck expires {dlb}:
        brownie_points = (coinflip() ? 2 : 1);

Replacement in crawl-ref/source/decks.cc at line 399 [7.3987460]

B:BD[7.3994067] → [7.3994067:3994182]

        // this bonus happens with every use {dlb}:
        if (which_deck == DECK_OF_WONDERS || one_chance_in(3))

[7.3994067]

[7.3994182]

        if (which_deck == DECK_OF_WONDERS)
            brownie_points += 2;
        else if (which_deck == DECK_OF_POWER)

Insertion in crawl-ref/source/decks.cc at line 403 [7.3987460]
[7.3994212]
[7.3994212]
```
    }
```

Replacement in crawl-ref/source/decks.cc at line 405 [7.3987460]

B:BD[7.3994213] → [12.1023612:1023664]

∅:D[12.1023664] → [7.3994260:3994266]

B:BD[7.3994260] → [7.3994260:3994266]

        did_god_conduct(DID_CARDS, brownie_points);
    }

[7.3994213]

[7.3994266]

    // this bonus happens with every use {dlb}:
    if (which_deck == DECK_OF_WONDERS || one_chance_in(3))
        brownie_points++;
    did_god_conduct(DID_CARDS, brownie_points);
}

Replacement in crawl-ref/source/decks.cc at line 412 [7.3987460]

B:BD[7.3994267] → [7.3994267:3994334]

    return;
}                               // end deck_of_cards()

[7.3994267]

[7.3994334]

void deck_of_cards(deck_type which_deck)
{
    cards(choose_one_card(which_deck, true));
}

Replacement in crawl-ref/source/abl-show.cc at line 130 [7.4494389]

B:BD[6.10401] → [2.6010:6078]

    { ABIL_NON_ABILITY, ABIL_NEMELEX_TRIPLE_DRAW, ABIL_NON_ABILITY,

[6.10401]

[6.10461]

    { ABIL_NEMELEX_PEEK, ABIL_NEMELEX_TRIPLE_DRAW, ABIL_NON_ABILITY,

Insertion in crawl-ref/source/abl-show.cc at line 274 [7.4494389]
[2.6170]
[2.6170]
```
    { ABIL_NEMELEX_PEEK, "Deck Peek", 3, 0, 0, 1, ABFLAG_INSTANT },
```

Insertion in crawl-ref/source/abl-show.cc at line 1558 [7.4494389]

[2.6242]

            return false;
        break;
    case ABIL_NEMELEX_PEEK:
        if ( !deck_peek() )