fiddlerwoaroof/crawl - Change RNJX2RDBDA62DSAUIWVVPFS7YNIU3GEOXDWJUABDS5DS5QGS3LAQC

Fix potions of decay created by mummy curse sometimes being inscribed.

Change inscription prompt to work as intended by David, after all. :) Make manuals use a reading counter (plus2) that is initialized with 3 + random2(15). Once it reaches 0, the manual crumbles to dust.

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

Created by j-p-e-g on July 7, 2008

RNJX2RDBDA62DSAUIWVVPFS7YNIU3GEOXDWJUABDS5DS5QGS3LAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3162 [7.16817]

B:BD[6.2275] → [6.2275:2329]

    // if close to top of known map, put min_y on top

[6.2275]

[6.2329]

    // If close to top of known map, put min_y on top

Replacement in crawl-ref/source/util/docs/README.tex at line 94 [5.14047]

B:BD[5.17398] → [5.17398:17476]

\key{crawl\_macros.txt} explains macros and key bindings. You should probably

[5.17398]

[5.17476]

\key{macros\_guide.txt} explains macros and key bindings. You should probably

Replacement in crawl-ref/source/misc.cc at line 972 [7.1933596]

B:BD[8.18688] → [9.5386:5436]

    // just in case
    you.wield_change  = true;

[8.18688]

[9.5436]

    if (you.equip[EQ_WEAPON] == obj)
        you.wield_change = true;

Replacement in crawl-ref/source/misc.cc at line 999 [7.1933596]
∅:D[9.6044] → [8.19145:19190]
B:BD[8.19145] → [8.19145:19190]
```
            you.inv[m].quantity   += amount;
```
[9.6044]
[9.6045]
```
            you.inv[m].quantity += amount;
```

Replacement in crawl-ref/source/misc.cc at line 1018 [7.1933596]

B:BD[10.8966] → [8.19413:19710]

        item_def &item = you.inv[freeslot];
        item.link      = freeslot;
        item.slot      = index_to_letter(item.link);
        item.base_type = OBJ_POTIONS;
        item.sub_type  = POT_DECAY;
        item.quantity  = amount;
        item.x         = -1;
        item.y         = -1;

[10.8966]

[11.10101]

        item_def &item   = you.inv[freeslot];
        item.link        = freeslot;
        item.slot        = index_to_letter(item.link);
        item.base_type   = OBJ_POTIONS;
        item.sub_type    = POT_DECAY;
        item.quantity    = amount;
        item.x           = -1;
        item.y           = -1;

Replacement in crawl-ref/source/misc.cc at line 1027 [7.1933596]

∅:D[11.10140] → [12.5639:5677]

B:BD[12.5639] → [12.5639:5677]

∅:D[12.5677] → [8.19738:19822]

B:BD[8.19738] → [8.19738:19822]

B:BD[8.19822] → [9.6186:6226]

        item.plus      = potion.plus;
        item.plus2     = 0;
        item.special   = 0;
        item.flags     = 0;
        item.colour    = potion.colour;

[11.10140]

[8.19822]

        item.plus        = potion.plus;
        item.plus2       = 0;
        item.special     = 0;
        item.flags       = 0;
        item.colour      = potion.colour;
        item.inscription = "";

Replacement in crawl-ref/source/makeitem.cc at line 2456 [13.927]
B:BD[13.85210] → [14.46683:46719]
```
    if ( force_type != OBJ_RANDOM )
```
[13.85210]
[14.46719]
```
    if (force_type != OBJ_RANDOM)
```

Insertion in crawl-ref/source/makeitem.cc at line 2503 [13.927]

[14.48179]

        // Set number of reads possible before it "crumbles to dust".
        item.plus2 = 3 + random2(15);

Replacement in crawl-ref/source/makeitem.cc at line 2900 [13.927]

B:BD[15.14097] → [15.14097:14184]

        && (one_chance_in(3)
            || get_equip_race(item) && one_chance_in(7)))

[15.14097]

[15.14184]

        && (one_chance_in(3) || get_equip_race(item) && one_chance_in(7)))

Deletion in crawl-ref/source/makeitem.cc at line 3462 [13.927]
B:BD[13.117455] → [13.117455:117465]
```
        {
```
Deletion in crawl-ref/source/makeitem.cc at line 3463 [13.927]
B:BD[13.117509] → [13.117509:117519]
```
        }
```
Replacement in crawl-ref/source/it_use3.cc at line 945 [7.2870456]
B:BD[7.2899574] → [7.2899574:2899601]
```
    if (one_chance_in(10))
```
[7.2899574]
[7.2899601]
```
    if (--manual.plus2 <= 0)
```
Deletion in crawl-ref/source/it_use3.cc at line 951 [7.2870456]
B:BD[7.2899714] → [7.2899714:2899720]
```
    {
```
Replacement in crawl-ref/source/it_use3.cc at line 952 [7.2870456]
∅:D[16.3151] → [7.2899771:2899777]
B:BD[7.2899771] → [7.2899771:2899777]
```
    }
```
[16.3151]
[17.51526]
Deletion in crawl-ref/source/effects.cc at line 1496 [7.3382105]
B:BD[18.1320] → [19.4405:4415]
```
        {
```
Replacement in crawl-ref/source/effects.cc at line 1497 [7.3382105]
∅:D[4.7151] → [19.4416:4426]
B:BD[20.30247] → [19.4416:4426]
```
        }
```
[4.7151]
[4.7152]

Insertion in crawl-ref/source/effects.cc at line 1507 [7.3382105]

[2.3425]

[21.2768]

            if (class_wanted == OBJ_BOOKS)
                type_wanted = BOOK_MANUAL;

Replacement in crawl-ref/source/describe.cc at line 2062 [7.3736416]

B:BD[22.12420] → [3.4064:4199]

    std::string prompt = (is_inscribed ? "Add what to inscription? "
                                       : "Inscribe with what? ");

[22.12420]

[3.4199]

    std::string prompt = (is_inscribed ? "Add to inscription? "
                                       : "Inscribe item? ");

Replacement in crawl-ref/source/describe.cc at line 2072 [7.3736416]
B:BD[3.4395] → [3.4395:4429]
```
                prompt += " or ";
```
[3.4395]
[3.4429]
```
                prompt += ", or ";
```

Replacement in crawl-ref/source/describe.cc at line 2086 [7.3736416]

B:BD[7.3844737] → [3.4721:4798]

        if (Options.tutorial_left  && wherey() <= get_number_of_lines() - 5)

[7.3844737]

[3.4798]

        if (Options.tutorial_left && wherey() <= get_number_of_lines() - 5)

Replacement in crawl-ref/source/describe.cc at line 2090 [7.3736416]

B:BD[7.3844738] → [22.12779:12844]

    char buf[79];
    if (!cancelable_get_line(buf, sizeof buf))

[7.3844738]

[22.12844]

    int keyin = tolower(c_getch());
    switch (keyin)

Replacement in crawl-ref/source/describe.cc at line 2093 [7.3736416]

B:BD[22.12850] → [22.12850:13062]

        // Strip spaces from the end.
        for (int i = strlen(buf) - 1; i >= 0; i--)
        {
            if (isspace( buf[i] ))
                buf[i] = 0;
            else
                break;
        }

[22.12850]

[22.13062]

    case 'a':
        // Remove previous randart inscription
        _trim_randart_inscrip(item);

Replacement in crawl-ref/source/describe.cc at line 2097 [7.3736416]

B:BD[22.13063] → [3.4871:4965]

∅:D[3.4965] → [22.13140:13242]

B:BD[22.13140] → [22.13140:13242]

        if (need_autoinscribe && buf[1] == 0
            && (buf[0] == 'a' || buf[0] == 'A'))
        {
            // Remove previous randart inscription
            _trim_randart_inscrip(item);

[22.13063]

[22.13242]

        if (!item.inscription.empty())
            item.inscription += ", ";

Replacement in crawl-ref/source/describe.cc at line 2100 [7.3736416]

B:BD[22.13243] → [22.13243:13328]

            if (!item.inscription.empty())
                item.inscription += ", ";

[22.13243]

[22.13328]

        item.inscription += ainscrip;
        break;
    case 'c':
        item.inscription.clear();
        break;
    case 'y':
    {
        prompt = (is_inscribed ? "Add what to inscription? "
                               : "Inscribe with what? ");

Replacement in crawl-ref/source/describe.cc at line 2110 [7.3736416]

B:BD[22.13329] → [22.13329:13381]

B:BD[22.13381] → [3.4966:5065]

            item.inscription += ainscrip;
        }
        else if (is_inscribed && buf[1] == 0
                 && (buf[0] == 'c' || buf[0] == 'C'))

[22.13329]

[3.5065]

        if (proper_prompt)
            mpr(prompt.c_str(), MSGCH_PROMPT);
        else

Replacement in crawl-ref/source/describe.cc at line 2114 [7.3736416]

B:BD[3.5075] → [3.5075:5113]

            item.inscription.clear();

[3.5075]

[3.5113]

            prompt = EOL "<cyan>" + prompt + "</cyan>";
            formatted_string::parse_string(prompt).display();

Replacement in crawl-ref/source/describe.cc at line 2117 [7.3736416]

B:BD[3.5123] → [3.5123:5157]

        else if (strlen(buf) > 0)

[3.5123]

[3.5157]


        char buf[79];
        if (!cancelable_get_line(buf, sizeof buf))

Replacement in crawl-ref/source/describe.cc at line 2121 [7.3736416]

B:BD[3.5167] → [3.5167:5239]

            if (is_inscribed)
                item.inscription += ", ";

[3.5167]

[3.5239]

            // Strip spaces from the end.
            for (int i = strlen(buf) - 1; i >= 0; i--)
            {
                if (isspace( buf[i] ))
                    buf[i] = 0;
                else
                    break;
            }

Replacement in crawl-ref/source/describe.cc at line 2130 [7.3736416]

B:BD[3.5240] → [3.5240:5300]

            item.inscription += std::string(buf);
        }

[3.5240]

[22.13443]

            if (strlen(buf) > 0)
            {
                if (is_inscribed)
                    item.inscription += ", ";

Replacement in crawl-ref/source/describe.cc at line 2135 [7.3736416]

B:BD[22.13444] → [3.5301:5328]

        if (proper_prompt)

[22.13444]

[3.5328]

                item.inscription += std::string(buf);
            }
        }
        else if (proper_prompt)

Replacement in crawl-ref/source/describe.cc at line 2140 [7.3736416]

B:BD[3.5338] → [3.5338:5445]

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

[3.5338]

[3.5445]

            canned_msg(MSG_OK);
            return;

Insertion in crawl-ref/source/describe.cc at line 2143 [7.3736416]
[3.5455]
[22.13543]
```
        break;
```

Replacement in crawl-ref/source/describe.cc at line 2145 [7.3736416]

B:BD[22.13549] → [3.5456:5484]

∅:D[3.5484] → [22.13564:13592]

B:BD[22.13564] → [22.13564:13592]

    else if (proper_prompt)
        canned_msg(MSG_OK);

[22.13549]

[22.13598]

    default:
        if (proper_prompt)
            canned_msg(MSG_OK);
        return;
    }
    if (proper_prompt)
    {
        mpr(item.name(DESC_INVENTORY).c_str(), MSGCH_EQUIPMENT);
        you.wield_change  = true;
    }

Insertion in crawl-ref/source/debug.cc at line 1373 [7.4016436]
[23.8251]
[7.4041256]

Replacement in crawl-ref/source/debug.cc at line 1375 [7.4016436]

B:BD[7.4041298] → [7.4041298:4041361]

                    mitm[thing_created].plus = special_wanted;

[7.4041298]

[7.4041361]

                {
                    mitm[thing_created].plus  = special_wanted;
                    mitm[thing_created].plus2 = 3 + random2(15);
                }

Replacement in crawl-ref/source/dat/database/help.txt at line 67 [25.4716]
B:BD[24.13262] → [24.13262:13310]
```
<w>-</w>/<w>+</w>    : Scroll level map up/down
```
[24.13262]
[24.13310]
```
<w>-</w>/<w>+</w>    : Scroll level map 20 grids up/down.
```

Fix potions of decay created by mummy curse sometimes being inscribed.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 3162 [7.16817]

Replacement in crawl-ref/source/util/docs/README.tex at line 94 [5.14047]

Replacement in crawl-ref/source/misc.cc at line 972 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 999 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 1018 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 1027 [7.1933596]

Replacement in crawl-ref/source/makeitem.cc at line 2456 [13.927]

Insertion in crawl-ref/source/makeitem.cc at line 2503 [13.927]

Replacement in crawl-ref/source/makeitem.cc at line 2900 [13.927]

Deletion in crawl-ref/source/makeitem.cc at line 3462 [13.927]

Deletion in crawl-ref/source/makeitem.cc at line 3463 [13.927]

Replacement in crawl-ref/source/it_use3.cc at line 945 [7.2870456]

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

Replacement in crawl-ref/source/it_use3.cc at line 952 [7.2870456]

Deletion in crawl-ref/source/effects.cc at line 1496 [7.3382105]

Replacement in crawl-ref/source/effects.cc at line 1497 [7.3382105]