fiddlerwoaroof/crawl - Change ABLV37FMURRJPEZV2VRKOUYAKEMLI7E6RA4PDAII2EJ5L7WBHKZQC

Bug/FR 1947001: For damaging cards add "You draw card xy" to the prompt,

            so you can reread it while targetting, and add a
            targetting subcommand &quot;show prompt&quot; that&#x27;ll do just that.
            (Though you can already do that by looking at the help.)

Fix plain coloured items highlighted in grey in prompts, and add two new colouring prefixes: evil_item (/draining, necromancy books, etc.) and evil_eating (cannibalism, intelligent being) that only apply for the good gods.

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

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

ABLV37FMURRJPEZV2VRKOUYAKEMLI7E6RA4PDAII2EJ5L7WBHKZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2743 [5.804403]

B:BD[4.933] → [4.933:1007]

        const int next = mitm[i].link;  // in case we can't get it later.

[4.933]

[4.1007]

        const int next = mitm[i].link;  // In case we can't get it later.

Replacement in crawl-ref/source/religion.cc at line 2747 [5.804403]

∅:D[6.5160] → [7.221:282]

B:BD[7.221] → [7.221:282]

            || item_is_stationary(mitm[i])) // held in a net

[6.5160]

[4.1103]

            || item_is_stationary(mitm[i])) // Held in a net?

Replacement in crawl-ref/source/menu.cc at line 1173 [10.261322]

B:BD[8.1100] → [9.2930:3054]

        if ( (cm.tag.empty() || cm.tag == "any" || cm.tag == tag
              || cm.tag == "inventory" && tag == "pickup")

[8.1100]

[9.3054]

        if ((cm.tag.empty() || cm.tag == "any" || cm.tag == tag
             || cm.tag == "inventory" && tag == "pickup")

Insertion in crawl-ref/source/itemname.cc at line 43 [5.2667494]
[5.2668179]
[5.2668179]
```
#include "religion.h"
```

Insertion in crawl-ref/source/itemname.cc at line 2196 [5.2667494]

[11.4503]


    if (is_good_god(you.religion) && is_evil_item(item))
        prefixes.push_back("evil_item");

Insertion in crawl-ref/source/itemname.cc at line 2211 [5.2667494]

[12.3863]

[13.7458]

        if ((item.base_type == OBJ_CORPSES || item.sub_type == FOOD_CHUNK)
            && (is_good_god(you.religion) && is_player_same_species(item.plus)
                || you.religion == GOD_ZIN
                   && mons_intel(item.plus) >= I_NORMAL))
        {
            prefixes.push_back("evil_eating");
        }

Replacement in crawl-ref/source/itemname.cc at line 2269 [5.2667494]
B:BD[3.5364] → [3.5364:5390]
```
    if (col != LIGHTGRAY)
```
[3.5364]
[3.5390]
```
    if (col != -1)
```
Insertion in crawl-ref/source/enum.h at line 590 [5.3287960]
[14.907783]
[14.907783]
```
    CMD_TARGET_SHOW_PROMPT,
```
Replacement in crawl-ref/source/directn.cc at line 487 [5.3697945]
B:BD[15.190] → [15.190:219]
```
    // Find a default target
```
[15.190]
[16.11059]
```
    // Find a default target.
```

Replacement in crawl-ref/source/directn.cc at line 490 [5.3697945]

B:BD[15.320] → [17.504:572]

        skip_iter = true;   // skip first iteration...XXX mega-hack

[15.320]

[16.11114]

        skip_iter = true;   // Skip first iteration...XXX mega-hack

Replacement in crawl-ref/source/directn.cc at line 537 [5.3697945]
B:BD[15.657] → [15.657:682]
```
        if ( skip_iter )
```
[15.657]
[17.1052]
```
        if (skip_iter)
```
Replacement in crawl-ref/source/directn.cc at line 539 [5.3697945]
B:BD[17.1062] → [17.1062:1098]
```
            if ( found_autotarget )
```
[17.1062]
[17.1098]
```
            if (found_autotarget)
```

Replacement in crawl-ref/source/directn.cc at line 542 [5.3697945]

B:BD[17.1157] → [17.1157:1235]

                key_command = CMD_TARGET_CYCLE_FORWARD; // find closest enemy

[17.1157]

[17.1235]

                key_command = CMD_TARGET_CYCLE_FORWARD; // Find closest target.

Replacement in crawl-ref/source/directn.cc at line 553 [5.3697945]

B:BD[18.5933758] → [18.5933758:5933826]

B:BD[18.5933826] → [19.7610:7717]

        // if a mouse command, update location to mouse position...
        if ( key_command == CMD_TARGET_MOUSE_MOVE
             || key_command == CMD_TARGET_MOUSE_SELECT )

[18.5933758]

[18.5933933]

        // If a mouse command, update location to mouse position.
        if (key_command == CMD_TARGET_MOUSE_MOVE
            || key_command == CMD_TARGET_MOUSE_SELECT)

Insertion in crawl-ref/source/directn.cc at line 587 [5.3697945]
[20.1425]
[5.3701050]

Replacement in crawl-ref/source/directn.cc at line 589 [5.3697945]

B:BD[5.3701051] → [21.426:485]

        if ( key_command == CMD_TARGET_MAYBE_PREV_TARGET )

[5.3701051]

[21.485]

        if (key_command == CMD_TARGET_MAYBE_PREV_TARGET)

Replacement in crawl-ref/source/directn.cc at line 591 [5.3697945]

B:BD[21.495] → [21.495:561]

            if ( moves.tx == you.x_pos && moves.ty == you.y_pos )

[21.495]

[21.561]

            if (moves.tx == you.x_pos && moves.ty == you.y_pos)

Replacement in crawl-ref/source/directn.cc at line 606 [5.3697945]
B:BD[22.6138] → [22.6138:6169]
```
        switch ( key_command )
```
[22.6138]
[5.3701692]
```
        switch (key_command)
```

Replacement in crawl-ref/source/directn.cc at line 635 [5.3697945]

B:BD[22.7079] → [22.7079:7161]

                moves.dx = Compass[i].x;
                moves.dy = Compass[i].y;

[22.7079]

[22.7161]

                moves.dx       = Compass[i].x;
                moves.dy       = Compass[i].y;

Replacement in crawl-ref/source/directn.cc at line 638 [5.3697945]

B:BD[22.7231] → [22.7231:7367]

                moves.tx = you.x_pos + moves.dx;
                moves.ty = you.y_pos + moves.dy;
                moves.isValid = true;

[22.7231]

[22.7367]

                moves.tx       = you.x_pos + moves.dx;
                moves.ty       = you.y_pos + moves.dy;
                moves.isValid  = true;

Replacement in crawl-ref/source/directn.cc at line 642 [5.3697945]
B:BD[22.7407] → [2.303:338]
```
                show_beam = false;
```
[22.7407]
[2.338]
```
                show_beam      = false;
```
Replacement in crawl-ref/source/directn.cc at line 644 [5.3697945]
∅:D[2.378] → [22.7407:7441]
B:BD[22.7407] → [22.7407:7441]
```
                loop_done = true;
```
[2.378]
[22.7441]
```
                loop_done      = true;
```

Insertion in crawl-ref/source/directn.cc at line 663 [5.3697945]

[22.7728]

[23.307]

        case CMD_TARGET_SHOW_PROMPT:
            mprf(MSGCH_PROMPT, "%s (%s)", prompt? prompt : "Aim",
                 target_mode_help_text(restricts));
            break;

Replacement in crawl-ref/source/directn.cc at line 743 [5.3697945]

B:BD[22.8286] → [22.8286:8341]

            // we have a valid previous target (maybe)

[22.8286]

[22.8341]

            // We have a valid previous target (maybe).

Replacement in crawl-ref/source/directn.cc at line 755 [5.3697945]

B:BD[22.8723] → [22.8723:8824]

                    // We have all the information we need
                    moves.isValid = true;

[22.8723]

[22.8824]

                    // We have all the information we need.
                    moves.isValid  = true;

Replacement in crawl-ref/source/directn.cc at line 758 [5.3697945]

B:BD[22.8867] → [22.8867:8957]

B:BD[22.8957] → [24.2603:2644]

                    moves.tx = montarget->x;
                    moves.ty = montarget->y;
                    if ( !just_looking )

[22.8867]

[25.696]

                    moves.tx       = montarget->x;
                    moves.ty       = montarget->y;
                    if (!just_looking)

Replacement in crawl-ref/source/directn.cc at line 787 [5.3697945]
B:BD[22.9179] → [22.9179:9209]
```
            loop_done = true;
```
[22.9179]
[26.21622]
```
            loop_done      = true;
```
Replacement in crawl-ref/source/directn.cc at line 791 [5.3697945]
∅:D[19.7792] → [24.2806:2863]
∅:D[26.21674] → [24.2806:2863]
B:BD[22.9209] → [24.2806:2863]
```
            // maybe we should except just_looking here?
```
[19.7792]
[22.9209]
```
            // Maybe we should except just_looking here?
```
Replacement in crawl-ref/source/directn.cc at line 794 [5.3697945]
∅:D[26.21676] → [22.9253:9291]
B:BD[22.9253] → [22.9253:9291]
```
            if ( mid != NON_MONSTER )
```
[26.21676]
[22.9291]
```
            if (mid != NON_MONSTER)
```
Deletion in crawl-ref/source/directn.cc at line 831 [5.3697945]
B:BD[27.7225] → [27.7225:7226]
Replacement in crawl-ref/source/directn.cc at line 937 [5.3697945]
∅:D[19.7877] → [22.11472:11505]
B:BD[22.11472] → [22.11472:11505]
```
        if ( loop_done == true )
```
[19.7877]
[5.3703818]
```
        if (loop_done == true)
```
Replacement in crawl-ref/source/directn.cc at line 942 [5.3697945]
∅:D[28.1015] → [24.2866:2910]
B:BD[5.3703828] → [24.2866:2910]
```
            if ( just_looking ) // easy out
```
[28.1015]
[24.2910]
```
            if (just_looking) // easy out
```

Replacement in crawl-ref/source/directn.cc at line 963 [5.3697945]

B:BD[22.11706] → [22.11706:11780]

            // Ask for confirmation if we're quitting for some odd reason

[22.11706]

[29.7374]

            // Ask for confirmation if we're quitting for some odd reason.

Replacement in crawl-ref/source/directn.cc at line 968 [5.3697945]

B:BD[28.1604] → [28.1604:1672]

                // (moves-internal finalizations can be done later)

[28.1604]

[30.3326]

                // (moves-internal finalizations can be done later).

Insertion in crawl-ref/source/directn.cc at line 2501 [5.3697945]
[27.9530]
[31.6995]
```
    case CONTROL('P'): return CMD_TARGET_SHOW_PROMPT;
```
Replacement in crawl-ref/source/decks.cc at line 1586 [5.3987460]
∅:D[32.1022] → [33.20158:20178]
B:BD[33.20158] → [33.20158:20178]
```
    switch ( card )
```
[32.1022]
[33.20178]
```
    switch (card)
```
Insertion in crawl-ref/source/decks.cc at line 1615 [5.3987460]
[34.2389]
[35.59897]
```
            mprf("You have drawn %s.", card_name(card));
```
Replacement in crawl-ref/source/decks.cc at line 1617 [5.3987460]
∅:D[35.59929] → [34.2420:2445]
B:BD[34.2420] → [34.2420:2445]
```
            return true;
```
[35.59929]
[34.2445]
```
            return (true);
```

Replacement in crawl-ref/source/decks.cc at line 1627 [5.3987460]

B:BD[5.3999151] → [36.16200:16278]

    if (spell_direction(target, beam) && player_tracer(ztype, power/4, beam))

[5.3999151]

[33.20624]

    snprintf(info, INFO_SIZE, "You have drawn %s.  Aim where? ",
                              card_name(card));
    if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY, true, info)
        && player_tracer(ztype, power/4, beam))
    {

Insertion in crawl-ref/source/decks.cc at line 1634 [5.3987460]
[33.20672]
[37.1368]
```
    }
```
Replacement in crawl-ref/source/decks.cc at line 1638 [5.3987460]
B:BD[37.1398] → [37.1398:1413]
```
    return rc;
```
[37.1398]
[33.20672]
```
    return (rc);
```

Replacement in crawl-ref/source/decks.cc at line 2722 [5.3987460]

∅:D[35.62484] → [38.61561:61670]

B:BD[38.61561] → [38.61561:61670]

        msg::stream << "You have drawn " << card_name( which_card )
                    << '.' << std::endl;

[35.62484]

[35.62485]

        // These card types will usually give this message in the targetting
        // prompt, and the cases where they don't are handled specially.
        if (which_card != CARD_VITRIOL && which_card != CARD_FLAME
            && which_card != CARD_FROST && which_card != CARD_HAMMER
            && which_card != CARD_SPARK && which_card != CARD_PAIN
            && which_card != CARD_VENOM)
        {
           mprf("You have drawn %s.", card_name(which_card));
        }

Insertion in crawl-ref/source/decks.cc at line 2793 [5.3987460]

[32.1551]

        {
            mprf("You have drawn %s.", card_name(which_card));

Insertion in crawl-ref/source/decks.cc at line 2796 [5.3987460]
[32.1630]
[32.1630]
```
        }
```
Replacement in crawl-ref/source/decks.cc at line 2820 [5.3987460]
B:BD[33.30029] → [33.30029:30068]
```
        // yes, high power is bad here
```
[33.30029]
[33.30068]
```
        // Yes, high power is bad here.
```
Insertion in crawl-ref/source/command.cc at line 647 [5.4082507]
[39.565]
[40.3490]
```
    "<w>Ctrl-P</w> : repeat prompt\n"
```
Insertion in crawl-ref/settings/food_colouring.txt at line 11 [41.12654]
[41.13947]
[12.11766]
```
inv = magenta:.*evil_item.*
inv = magenta:.*evil_eating.*
```

Bug/FR 1947001: For damaging cards add "You draw card xy" to the prompt,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 2743 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 2747 [5.804403]

Replacement in crawl-ref/source/menu.cc at line 1173 [10.261322]

Insertion in crawl-ref/source/itemname.cc at line 43 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 2196 [5.2667494]

Insertion in crawl-ref/source/itemname.cc at line 2211 [5.2667494]

Replacement in crawl-ref/source/itemname.cc at line 2269 [5.2667494]

Insertion in crawl-ref/source/enum.h at line 590 [5.3287960]

Replacement in crawl-ref/source/directn.cc at line 487 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 490 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 537 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 539 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 542 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 553 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 587 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 589 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 591 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 606 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 635 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 638 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 642 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 644 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 663 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 743 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 755 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 758 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 787 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 791 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 794 [5.3697945]

Deletion in crawl-ref/source/directn.cc at line 831 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 937 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 942 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 963 [5.3697945]

Replacement in crawl-ref/source/directn.cc at line 968 [5.3697945]

Insertion in crawl-ref/source/directn.cc at line 2501 [5.3697945]

Replacement in crawl-ref/source/decks.cc at line 1586 [5.3987460]

Insertion in crawl-ref/source/decks.cc at line 1615 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1617 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1627 [5.3987460]

Insertion in crawl-ref/source/decks.cc at line 1634 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 1638 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 2722 [5.3987460]

Insertion in crawl-ref/source/decks.cc at line 2793 [5.3987460]

Insertion in crawl-ref/source/decks.cc at line 2796 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 2820 [5.3987460]

Insertion in crawl-ref/source/command.cc at line 647 [5.4082507]

Insertion in crawl-ref/settings/food_colouring.txt at line 11 [41.12654]