fiddlerwoaroof/crawl - Change 4JHALUQLYAZQSH6MHLCS4EIIRHIT3Y4IYT2CE66NHSSWZFZY3SZQC

Implemented a modified version of FR 1994116: change inscription

interface.

Instead of "Do you wish to inscribe this item? (y/n)" directly print "Add what to inscription? (You may also (a)utoinscribe or (c)lear it.)" (a) and (c) only where applicable, of course. This has two benefits: No extra prompt needed to inscribe anything, and I've finally managed to merge both the { prompt and inscribing from viewing into the same function. Escape or pressing Enter on an empty inscription string (or one only consisting of spaces) will return without changing anything.

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

Created by j-p-e-g on June 16, 2008

4JHALUQLYAZQSH6MHLCS4EIIRHIT3Y4IYT2CE66NHSSWZFZY3SZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.h at line 51 [6.3315]

B:BD[4.229] → [5.132:183]

void tutorial_inscription_info(bool autoinscribe);

[4.229]

[7.723]

void tutorial_inscription_info(bool autoinscribe, std::string prompt);

Replacement in crawl-ref/source/tutorial.cc at line 3478 [6.5936]

B:BD[5.2155] → [5.2155:2205]

void tutorial_inscription_info(bool autoinscribe)

[5.2155]

[5.2205]

void tutorial_inscription_info(bool autoinscribe, std::string prompt)

Replacement in crawl-ref/source/tutorial.cc at line 3503 [6.5936]

B:BD[5.2895] → [5.2895:2985]

B:BD[5.2985] → [3.9106:9129]

         "known properties. Here, doing a <w>left mouse click</w> will autoinscribe " EOL
         "this item.";

[5.2895]

[3.9129]

         "known properties.";

Replacement in crawl-ref/source/tutorial.cc at line 3513 [6.5936]

B:BD[3.9248] → [3.9248:9679]

    if (longtext && wherey() <= get_number_of_lines() - 2)
    {
        if (autoinscribe)
        {
            formatted_string::parse_string(
                "<cyan>So, do you wish to inscribe this item? "
                "('a' to autoinscribe) ").display();
        }
        else
        {
            formatted_string::parse_string(
                "<cyan>So, do you wish to inscribe this item? ").display();
        }
    }

[3.9248]

[7.20840]

    // Ask a second time, if it's been a longish interruption.
    if (longtext && !prompt.empty() && wherey() <= get_number_of_lines() - 2)
        formatted_string::parse_string(prompt).display();

Replacement in crawl-ref/source/item_use.cc at line 3537 [9.2781507]
B:BD[8.5258] → [2.11666:11705]
```
    inscribe_item(you.inv[item_slot]);
```
[8.5258]
[10.761245]
```
    inscribe_item(you.inv[item_slot], true);
```
Replacement in crawl-ref/source/describe.h at line 64 [9.3734214]
B:BD[11.458] → [2.12166:12204]
```
void inscribe_item( item_def &item );
```
[11.458]
[9.3735845]
```
void inscribe_item( item_def &item, bool proper_prompt );
```

Replacement in crawl-ref/source/describe.cc at line 1919 [9.3736416]

∅:D[12.501] → [11.672:673]

∅:D[13.7881] → [11.672:673]

B:BD[11.672] → [11.672:673]

B:BD[11.673] → [14.6503:6572]

B:BD[14.6572] → [15.8734:8790]

∅:D[15.8790] → [14.6627:6716]

B:BD[14.6627] → [14.6627:6716]

∅:D[14.6716] → [16.6852:6892]

B:BD[16.6852] → [16.6852:6892]

B:BD[16.6892] → [14.6717:6856]

∅:D[17.6339] → [16.7054:7055]

∅:D[14.6856] → [16.7054:7055]

B:BD[16.7054] → [16.7054:7055]

B:BD[16.7055] → [18.14301:14333]

∅:D[18.14333] → [16.7089:7415]

B:BD[16.7089] → [16.7089:7415]

B:BD[16.7415] → [5.5765:5766]

B:BD[5.5766] → [18.14334:14410]

B:BD[5.5852] → [5.5852:5911]

∅:D[5.5911] → [16.7415:7416]

B:BD[16.7415] → [16.7415:7416]

∅:D[5.6334] → [19.40808:40862]

B:BD[16.7416] → [19.40808:40862]

B:BD[19.40862] → [5.6335:6370]

∅:D[5.6370] → [19.40921:40927]

B:BD[19.40921] → [19.40921:40927]

∅:D[19.40927] → [16.7416:7451]

B:BD[16.7416] → [16.7416:7451]

B:BD[16.7452] → [16.7452:7487]

B:BD[16.7487] → [19.40928:40935]

∅:D[11.710] → [20.845:855]

∅:D[16.7487] → [20.845:855]

∅:D[19.40935] → [20.845:855]

B:BD[20.845] → [20.845:855]

B:BD[20.855] → [11.711:839]

B:BD[11.839] → [21.3702:3716]

∅:D[21.3716] → [16.7488:7528]

B:BD[11.839] → [16.7488:7528]

∅:D[22.3282] → [21.3797:3811]

B:BD[21.3797] → [21.3797:3811]

∅:D[11.920] → [20.903:913]

∅:D[21.3811] → [20.903:913]

∅:D[16.7528] → [20.903:913]

B:BD[20.903] → [20.903:913]

B:BD[20.913] → [5.6371:6476]

∅:D[5.6476] → [17.6340:6401]

B:BD[16.7591] → [17.6340:6401]

B:BD[17.6401] → [15.8791:8832]

∅:D[15.8832] → [17.6441:6442]

B:BD[17.6441] → [17.6441:6442]

B:BD[17.6442] → [14.6857:6900]

B:BD[14.6900] → [23.6072:6114]

∅:D[23.6114] → [14.6901:6944]

B:BD[17.6523] → [14.6901:6944]

∅:D[14.6944] → [17.6524:6534]

B:BD[16.7655] → [17.6524:6534]


        std::string ainscrip;
        if (is_random_artefact(item))
            ainscrip = _randart_auto_inscription(item);
        // Only allow autoinscription if we don't have all the text
        // already.
        const bool allow_autoinscribe =
            is_random_artefact(item)
            && !ainscrip.empty()
            && item.inscription.find(ainscrip) == std::string::npos;
        if (allow_autoinscribe)
        {
            formatted_string::parse_string(
                "<cyan>Do you wish to inscribe this item? "
                "('a' to autoinscribe) ").display();
        }
        else
        {
            formatted_string::parse_string(
                "<cyan>Do you wish to inscribe this item? ").display();
        }
        if (Options.tutorial_left && wherey() <= get_number_of_lines() - 5)
            tutorial_inscription_info(allow_autoinscribe);
#ifdef USE_TILE
        const int keyin = getch_ck();
        if (toupper(keyin) == 'Y')
#else
        const int keyin = getch();
        if (toupper(keyin) == 'Y')
#endif
        {
            char buf[79];
            cprintf("\nInscribe with what? ");
            if (!cancelable_get_line(buf, sizeof buf))
            {
                item.inscription = buf;
            }
        }
        else if (allow_autoinscribe
                 && (toupper(keyin) == 'A' || keyin == CK_MOUSE_B1))
        {
            // Remove previous randart inscription
            _trim_randart_inscrip(item);
            if (!item.inscription.empty())
                item.inscription += ", ";
            item.inscription += ainscrip;
        }

[13.7881]

[20.913]

        inscribe_item(item, false);

Deletion in crawl-ref/source/describe.cc at line 1921 [9.3736416]
B:BD[20.919] → [11.921:965]
```
    else if (getch() == 0)
        getch();
```

Replacement in crawl-ref/source/describe.cc at line 1923 [9.3736416]

B:BD[2.12207] → [2.12207:12242]

void inscribe_item(item_def &item)

[2.12207]

[2.12242]

// There are currently two ways to inscribe an item:
// * using the inscribe command ('{') -> proper_prompt = true
// * from the inventory when viewing an item -> proper_prompt = false
//
// Thus, proper_prompt also controls whether a tutorial explanation can be
// shown, or whether the pre- and post-inscription item names need to be
// printed.
void inscribe_item(item_def &item, bool proper_prompt)

Replacement in crawl-ref/source/describe.cc at line 1932 [9.3736416]

B:BD[2.12244] → [2.12244:12305]

    mpr(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);

[2.12244]

[2.12305]

    if (proper_prompt)
        mpr(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);

Insertion in crawl-ref/source/describe.cc at line 1935 [9.3736416]
[2.12306]
[2.12306]
```
    const bool is_inscribed = !item.inscription.empty();
```

Insertion in crawl-ref/source/describe.cc at line 1938 [9.3736416]

[2.12333]

    // Only allow autoinscription if we don't have all the text
    // already.
    bool need_autoinscribe = false;

Insertion in crawl-ref/source/describe.cc at line 1942 [9.3736416]
[2.12367]
[2.12367]
```
    {
```

Insertion in crawl-ref/source/describe.cc at line 1944 [9.3736416]

[2.12419]

        if (!ainscrip.empty()
            && (!is_inscribed
                || item.inscription.find(ainscrip) == std::string::npos))
        {
            need_autoinscribe = true;
        }
    }

Replacement in crawl-ref/source/describe.cc at line 1952 [9.3736416]

B:BD[2.12420] → [2.12420:12669]

    // Only allow autoinscription if we don't have all the text
    // already.
    const bool autoinscribe =
            is_random_artefact(item)
            && !ainscrip.empty()
            && item.inscription.find(ainscrip) == std::string::npos;

[2.12420]

[9.3844736]

    std::string prompt = (is_inscribed ? "Add what to inscription? "
                                       : "Inscribe with what? ");
    if (need_autoinscribe || is_inscribed)
    {
        prompt += "(You may also ";
        if (need_autoinscribe)
        {
            prompt += "(a)utoinscribe";
            if (is_inscribed)
                prompt += " or ";
        }
        if (is_inscribed)
            prompt += "(c)lear it";
        prompt += ".) ";
    }
    if (proper_prompt)
        mpr(prompt.c_str(), MSGCH_PROMPT);
    else
    {
        prompt = "<cyan>" + prompt + "</cyan>";
        formatted_string::parse_string(prompt).display();

Replacement in crawl-ref/source/describe.cc at line 1975 [9.3736416]

B:BD[9.3844737] → [2.12670:12778]

    mprf( MSGCH_PROMPT, "Inscribe with what%s? ",
          autoinscribe ? " ('a' to autoinscribe)" : "" );

[9.3844737]

        if (Options.tutorial_left  && wherey() <= get_number_of_lines() - 5)
            tutorial_inscription_info(need_autoinscribe, prompt);
    }

Replacement in crawl-ref/source/describe.cc at line 1991 [9.3736416]

B:BD[2.13063] → [2.13063:13140]

        if (autoinscribe && buf[1] == 0 && (buf[0] == 'a' || buf[0] == 'A'))

[2.13063]

[2.13140]

        if (need_autoinscribe && buf[1] == 0
            && (buf[0] == 'a' || buf[0] == 'A'))

Replacement in crawl-ref/source/describe.cc at line 2002 [9.3736416]

B:BD[2.13381] → [2.13381:13443]

        else
            item.inscription = std::string(buf);

[2.13381]

[2.13443]

        else if (is_inscribed && buf[1] == 0
                 && (buf[0] == 'c' || buf[0] == 'C'))
        {
            item.inscription.clear();
        }
        else if (strlen(buf) > 0)
        {
            if (is_inscribed)
                item.inscription += ", ";
            item.inscription += std::string(buf);
        }

Replacement in crawl-ref/source/describe.cc at line 2015 [9.3736416]

B:BD[2.13444] → [2.13444:13543]

        mpr(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);
        you.wield_change  = true;

[2.13444]

[2.13543]

        if (proper_prompt)
        {
            mpr(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);
            you.wield_change  = true;
        }

Replacement in crawl-ref/source/describe.cc at line 2021 [9.3736416]
B:BD[2.13549] → [2.13549:13564]
```
    else
    {
```
[2.13549]
[2.13564]
```
    else if (proper_prompt)
```
Deletion in crawl-ref/source/describe.cc at line 2023 [9.3736416]
B:BD[2.13592] → [2.13592:13598]
```
    }
```