fiddlerwoaroof/crawl - Change 7U7IZUR2C7UALYI4Y3SHBYGTHYVQM6JI4PXDFXUFL3T3L6JBSC6AC

Modify the command key help.

Apparently something about my attempt to juggle with several versions of command.cc went wrong since patch refuses to swallow my diff, so I'm simply replacing command.cc with the improved version that I know is correct since there haven't been any other changes to this file since my last commit. I also removed the 't' shortcut for targetting, as it was only really useful in the form of "tt" when throwing something.

And I tried to find out what's up with the @imp_taunt@ stuff but without success, sometimes it works, and sometimes it doesn't.

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

Created by j-p-e-g on March 9, 2008

7U7IZUR2C7UALYI4Y3SHBYGTHYVQM6JI4PXDFXUFL3T3L6JBSC6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/direct.cc at line 2269 [5.3697945]

B:BD[4.7627] → [4.7627:7688]

    case 'f': case 't': return CMD_TARGET_MAYBE_PREV_TARGET;

[4.7627]

[4.7688]

    case 'f': return CMD_TARGET_MAYBE_PREV_TARGET;

Replacement in crawl-ref/source/dat/database/speak.txt at line 11 [7.307]
B:BD[6.3780] → [6.3780:3797]
```
# docs directory
```
[6.3780]
[6.3797]
```
# docs directory.
```
Replacement in crawl-ref/source/dat/database/insult.txt at line 9 [2.15455]
B:BD[2.15752] → [2.15752:15764]
```
# directory
```
[2.15752]
[2.15764]
```
# directory.
```
Replacement in crawl-ref/source/command.cc at line 581 [5.4082507]
∅:D[8.799] → [9.3764:3833]
B:BD[9.3764] → [9.3764:3833]
```
    "<w>p</w> : fire at Previous target (also <w>t</w>, <w>f</w>)\n"
```
[8.799]
[10.1900]
```
    "<w>p</w> : fire at Previous target (also <w>f</w>)\n"
```
Replacement in crawl-ref/source/command.cc at line 587 [5.4082507]
B:BD[11.48500] → [11.48500:48539]
```
    "<w>F</w>: make target friendly\n"
```
[11.48500]
[11.48539]
```
    "<w>F</w>: toggle target friendly/neutral/hostile\n"
```

Replacement in crawl-ref/source/command.cc at line 595 [5.4082507]

B:BD[4.8868] → [4.8868:8919]

B:BD[4.8919] → [12.9633:9727]

    "<w>Ctrl-P</w> : cycle to previous missile.\n"
    "<w>Ctrl-N</w> : cycle to next missile.\n"
    "<w>i</w>      : choose from inventory.\n"

[4.8868]

[12.9727]

    "<w>(</w> : cycle to next suitable missile.\n"
    "<w>)</w> : cycle to previous suitable missile.\n"
    "<w>i</w> : choose from inventory.\n"

Insertion in crawl-ref/source/command.cc at line 1352 [5.4082507]
[13.3459]
[14.1096]
```
            "<w>V</w>: Version information\n"
```

Replacement in crawl-ref/source/command.cc at line 1489 [5.4082507]

B:BD[15.1189857] → [15.1189857:1190097]

B:BD[15.1190097] → [16.9652:9764]

∅:D[17.1259] → [15.1190221:1190320]

∅:D[16.9764] → [15.1190221:1190320]

B:BD[15.1190221] → [15.1190221:1190320]

            "To move in a direction or to attack, use\n"
            "the numpad (try Numlock both off and on)\n"
            "or vi keys:\n"
            "              <w>1 2 3      y k u\n"
            "               \\|/        \\|/\n"
            "              <w>4</w>-<w>5</w>-<w>6</w>"
                    "      <w>h</w>-<w>.</w>-<w>l</w>\n"
            "               /|\\        /|\\\n"
            "              <w>7 8 9      b j n\n",

[15.1189857]

[15.1190320]

            "To move in a direction or to attack, \n"
            "use the numpad (try Numlock off and \n"
            "on) or vi keys:\n"
            "                 <w>1 2 3      y k u\n"
            "                  \\|/        \\|/\n"
            "                 <w>4</w>-<w>5</w>-<w>6</w>"
                     "      <w>h</w>-<w>.</w>-<w>l</w>\n"
            "                  /|\\        /|\\\n"
            "                 <w>7 8 9      b j n\n",

Replacement in crawl-ref/source/command.cc at line 1503 [5.4082507]

B:BD[15.1190437] → [17.1260:1321]

            "<w>s</w> : rest one turn and search adjacent\n"

[15.1190437]

[17.1321]

            "<w>s</w> : wait a turn; searches adjacent\n"

Replacement in crawl-ref/source/command.cc at line 1505 [5.4082507]

B:BD[17.1394] → [18.1314:1439]

            "<w>5</w> : fully rest HP/MP and long search\n"
            "    (max 100 turns, also <w>Shift-numpad-5</w>)\n",

[17.1394]

[15.1190754]

            "<w>5</w> : rest and long search; stops when\n"
            "    HP or Magic full, something found \n"
            "    or 100 turns over (<w>Shift-numpad-5</w>)\n",

Replacement in crawl-ref/source/command.cc at line 1513 [5.4082507]

B:BD[17.1560] → [17.1560:1620]

B:BD[17.1620] → [18.1440:1554]

B:BD[18.1554] → [3.15425:15465]

            "<w>/ Dir.</w>, <w>Shift-Dir.</w>: long walk\n"
            "<w>* Dir.</w>, <w>Ctrl-Dir.</w> : untrap, open door,\n"
            "         attack without move\n"
            "<w>o</w> : auto-explore\n"

[17.1560]

[17.1736]

            "<w>o</w>      : auto-explore\n"

Insertion in crawl-ref/source/command.cc at line 1515 [5.4082507]
[17.1786]
[17.1831]
```
            "<w>Ctrl-F</w> : Find items\n"
```

Replacement in crawl-ref/source/command.cc at line 1517 [5.4082507]

B:BD[17.1876] → [18.1555:1617]

            "<w>Ctrl-F</w> : Find items\n"
            " \n",

[17.1876]

[15.1191235]

            "<w>/ Dir.</w>, <w>Shift-Dir.</w>: long walk\n"
            "<w>* Dir.</w>, <w>Ctrl-Dir.</w> : untrap, or else\n"
            "         attack without move\n",

Deletion in crawl-ref/source/command.cc at line 1524 [5.4082507]

B:BD[15.1191320] → [15.1191320:1191369]

B:BD[15.1191369] → [17.1921:1968]

B:BD[17.1968] → [19.342:402]

B:BD[15.1191418] → [15.1191418:1191459]

B:BD[15.1191459] → [12.9730:9779]

∅:D[12.9779] → [15.1191604:1191664]

B:BD[15.1191604] → [15.1191604:1191664]

B:BD[15.1191664] → [17.1969:2011]

∅:D[17.2011] → [15.1191664:1191807]

B:BD[15.1191664] → [15.1191664:1191807]

B:BD[15.1191807] → [17.2012:2074]

∅:D[17.2074] → [15.1191862:1191918]

B:BD[15.1191862] → [15.1191862:1191918]

B:BD[15.1191918] → [3.15466:15521]

∅:D[3.15521] → [15.1191973:1192099]

B:BD[15.1191973] → [15.1191973:1192099]

B:BD[15.1192099] → [20.1414:1475]

∅:D[20.1475] → [15.1192144:1192229]

B:BD[15.1192144] → [15.1192144:1192229]

B:BD[15.1192528] → [15.1192528:1192614]

B:BD[15.1192614] → [20.1476:1546]

∅:D[20.1546] → [15.1192837:1192907]

B:BD[15.1192837] → [15.1192837:1192907]

B:BD[15.1192907] → [17.2173:2188]

            "<h>Item Interaction (inventory):\n"
            "<w>i</w> : show Inventory list\n"
            "<w>]</w> : show inventory of equipped items\n"
            "<w>{</w> : inscribe item\n"
            "<w>f</w> : Fire or throw an item\n"
            "<w>e</w> : Eat food (but tries floor first)\n"
            "<w>q</w> : Quaff a potion\n"
            "<w>z</w> : Zap a wand\n"
            "<w>r</w> : Read a scroll or book\n"
            "<w>M</w> : Memorise a spell from a book\n"
            "<w>w</w> : Wield an item ( <w>-</w> for none)\n"
            "<w>'</w> : wield item a, or switch to b\n"
            "<w>v</w> : Evoke power of wielded item\n"
            "<w>W</w> : Wear armour\n"
            "<w>T</w> : Take off armour\n"
            "<w>P</w> : Put on jewellery\n"
            "<w>R</w> : Remove jewellery"
            "\n ",
            true, true, cmdhelp_textfilter);
    cols.add_formatted(
            0,
            "<h>In-game Toggles:\n"
            "<w>Ctrl-A</w> : toggle Autopickup\n"
            "<w>Ctrl-V</w> : toggle auto-prayer\n"
            "\n ",
            true, true, cmdhelp_textfilter);
    cols.add_formatted(
            0,

Replacement in crawl-ref/source/command.cc at line 1526 [5.4082507]

B:BD[17.2458] → [17.2458:2532]

            "<brown>(</brown> : missiles (<w>t</w>hrow or <w>f</w>ire)\n"

[17.2458]

[17.2532]

            "<brown>(</brown> : missiles (<w>f</w>ire, <w>(</w> to cycle ammo)\n"

Replacement in crawl-ref/source/command.cc at line 1528 [5.4082507]

B:BD[17.2606] → [21.252:336]

            "<brown>%</brown> : food and corpses (<w>e</w>at and <w>D</w>issect)\n"

[17.2606]

[17.2688]

            "<brown>%</brown> : corpses and food (<w>c</w>hop up and <w>e</w>at)\n"

Replacement in crawl-ref/source/command.cc at line 1533 [5.4082507]

B:BD[17.2946] → [17.2946:3202]

B:BD[17.3202] → [22.352:432]

            "<lightgrey>/</lightgrey> : wands (<w>z</w>ap)\n"            
            "<lightcyan>+</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>Z</w>ap)\n"   
            "<brown>\\</brown> : staves and rods (<w>w</w>ield and <w>E</w>voke)\n"
            "<lightgreen>}</lightgreen> : miscellaneous items (<w>E</w>voke)\n"

[17.2946]

[19.403]

            "<lightgrey>/</lightgrey> : wands (<w>Z</w>ap)\n"
            "<lightcyan>+</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>z</w>ap)\n"
            "<brown>\\</brown> : staves and rods (<w>w</w>ield and e<w>v</w>oke)\n"
            "<lightgreen>}</lightgreen> : miscellaneous items (e<w>v</w>oke)\n"

Replacement in crawl-ref/source/command.cc at line 1542 [5.4082507]

B:BD[15.1193314] → [17.3462:3498]

    cols.add_formatted(

[15.1193314]

[17.3498]

    cols.add_formatted(
            0,
            "<h>Other Gameplay Actions:\n"
            "<w>a</w> : use special Ability\n"
            "<w>p</w> : Pray\n"
            "<w>z</w> : cast a spell\n"
            "<w>t</w> : tell allies (<w>tt</w> to shout)\n"
            "<w>`</w> : re-do previous command\n"
            "<w>0</w> : repeat next command # of times\n",
            true, true, cmdhelp_textfilter);
    cols.add_formatted(

Replacement in crawl-ref/source/command.cc at line 1555 [5.4082507]

B:BD[17.3513] → [23.176:403]

B:BD[23.403] → [16.9765:9927]

            "<h>Stash Management Commands:\n"
            "<w>Ctrl-F</w> : Find (in stashes and shops)\n"
            "\n"
            "Searching in stashes allows regular\n"
            "expressions, and terms like 'altar'\n"
            "or 'artefact' or 'long blades'.\n"
            "\n"
            "For more help on searching, you can\n"
            "hit ? at the search prompt.\n",

[17.3513]

[17.3813]

            "<h>Non-Gameplay Commands / Info\n"
            "<w>Ctrl-P</w> : show Previous messages\n"
            "<w>Ctrl-R</w> : Redraw screen\n"
            "<w>Ctrl-C</w> : Clear main and level maps\n"
            "<w>!</w> : annotate the dungeon level\n"
            "<w>#</w> : dump character to file\n"
            "<w>:</w> : add note (use <w>?:</w> to read notes)\n"
            "<w>~</w> : add macro\n"
            "<w>=</w> : reassign inventory/spell letters\n"
            "<w>_</w> : read messages (online play only)"
            " \n",

Replacement in crawl-ref/source/command.cc at line 1574 [5.4082507]
B:BD[15.1193550] → [15.1193550:1193599]
```
            true, true, cmdhelp_textfilter, 45);
```
[15.1193550]
[15.1193599]
```
            true, true, cmdhelp_textfilter);
```

Replacement in crawl-ref/source/command.cc at line 1580 [5.4082507]

B:BD[15.1193740] → [15.1193740:1193787]

B:BD[15.1193787] → [24.4578:4681]

∅:D[17.3926] → [15.1193787:1193838]

∅:D[24.4681] → [15.1193787:1193838]

B:BD[15.1193787] → [15.1193787:1193838]

B:BD[15.1193838] → [3.15522:15573]

            "<w>[</w> : display worn armour\n"
            "<w>(</w> : cycle current ammunition\n"
            "<w>)</w> : display current weapons\n"
            "<w>\"</w> : display worn jewellery\n"
            "<w>E</w> : display experience info\n"

[15.1193740]

[15.1193889]

            "<w>m</w> : show skill screen\n"
            "<w>%</w> : show resistances\n"

Replacement in crawl-ref/source/command.cc at line 1585 [5.4082507]

B:BD[15.1194037] → [15.1194037:1194082]

B:BD[15.1194129] → [15.1194129:1194174]

B:BD[15.1194174] → [17.3927:3975]

            "<w>m</w> : show skill screen\n"
            "<w>%</w> : show resistances\n",
            true, true, cmdhelp_textfilter,45);

[15.1194037]

[17.3975]

            "<w>[</w> : display worn armour\n"
            "<w>)</w> : display current weapons\n"
            "<w>\"</w> : display worn jewellery\n"
            "<w>E</w> : display experience info\n",
            true, true, cmdhelp_textfilter);

Replacement in crawl-ref/source/command.cc at line 1594 [5.4082507]

B:BD[17.4071] → [17.4071:4123]

            "<w>o</w>/<w>c</w> : Open/Close door\n"

[17.4071]

[17.4123]

            "<w>O</w>/<w>C</w> : Open/Close door\n"

Replacement in crawl-ref/source/command.cc at line 1599 [5.4082507]

B:BD[17.4353] → [3.15574:15631]

∅:D[18.1738] → [17.4405:4453]

∅:D[24.4734] → [17.4405:4453]

∅:D[3.15631] → [17.4405:4453]

B:BD[17.4405] → [17.4405:4453]

            "<w>Ctrl-O</w>   : show dungeon Overview\n",
            true, true, cmdhelp_textfilter,45);

[17.4353]

[15.1194223]

            "<w>Ctrl-O</w> : show dungeon Overview\n"
            "<w>Ctrl-A</w> : toggle auto-pickup\n",
            true, true, cmdhelp_textfilter);
    cols.add_formatted(
            1,
            "<h>Item Interaction (inventory):\n"
            "<w>i</w> : show Inventory list\n"
            "<w>]</w> : show inventory of equipped items\n"
            "<w>{</w> : inscribe item\n"
            "<w>f</w> : Fire or throw an item\n"
            "<w>(</w> : cycle current ammunition\n"
            "<w>e</w> : Eat food (but tries floor first)\n"
            "<w>q</w> : Quaff a potion\n"
            "<w>Z</w> : Zap a wand\n"
            "<w>r</w> : Read a scroll or book\n"
            "<w>M</w> : Memorise a spell from a book\n"
            "<w>w</w> : Wield an item ( <w>-</w> for none)\n"
            "<w>'</w> : wield item a, or switch to b\n"
            "<w>v</w> : evoke power of wielded item\n"
            "<w>W</w>/<w>T</w> : Wear or Take off armour\n"
            "<w>P</w>/<w>R</w> : Put on or Remove jewellery\n",
            true, true, cmdhelp_textfilter);

Replacement in crawl-ref/source/command.cc at line 1630 [5.4082507]
B:BD[15.1194513] → [3.15632:15677]
```
            "<w>c</w> : chop up a corpse \n"
```
[15.1194513]
[17.4454]
```
            "<w>c</w> : Chop up a corpse \n"
```

Deletion in crawl-ref/source/command.cc at line 1632 [5.4082507]

B:BD[17.4837] → [17.4837:5084]

B:BD[17.5084] → [3.15678:15729]

∅:D[3.15729] → [25.23130:23238]

B:BD[19.580] → [25.23130:23238]

∅:D[25.23238] → [19.580:599]

B:BD[19.580] → [19.580:599]

            true, true, cmdhelp_textfilter);
    cols.add_formatted(
            1,
            "<h>Other Gameplay Actions:\n"
            "<w>a</w> : use special Ability\n"
            "<w>p</w> : Pray\n"
            "<w>Z</w> : cast a spell\n"
            "<w>t</w> : shout or command allies\n"
            "<w>`</w> : re-do previous command\n"
            "<w>0</w> : repeat next command # of times\n"
            " \n",

Replacement in crawl-ref/source/command.cc at line 1636 [5.4082507]

B:BD[15.1195006] → [15.1195006:1195268]

B:BD[15.1195268] → [3.15730:15784]

∅:D[3.15784] → [15.1195268:1195318]

∅:D[26.23531] → [15.1195268:1195318]

B:BD[15.1195268] → [15.1195268:1195318]

B:BD[15.1195318] → [18.1739:1805]

∅:D[21.440] → [17.5137:5174]

∅:D[18.1805] → [17.5137:5174]

B:BD[15.1195367] → [17.5137:5174]

B:BD[17.5174] → [18.1806:1864]

∅:D[18.1864] → [17.5275:5294]

B:BD[17.5275] → [17.5275:5294]

            "<h>Non-Gameplay Commands / Info\n"
            "<w>V</w> : display Version information\n"
            "<w>Ctrl-P</w> : show Previous messages\n"
            "<w>Ctrl-R</w> : Redraw screen\n"
            "<w>Ctrl-C</w> : Clear main and level maps\n"
            "<w>!</w> : annotate the dungeon level\n"
            "<w>#</w> : dump character to file\n"
            "<w>:</w> : add note (use <w>?:</w> to read notes)\n"
            "<w>~</w> : add macro\n"
            "<w>=</w> : reassign inventory/spell letters"
            " \n",

[15.1195006]

[15.1195504]

            "<h>Additional help:\n"
            "Many commands have context sensitive \n"
            "help, among them <w>X</w>, <w>x</w>, <w>f</w> (or any \n"
            "form of targeting), <w>Ctrl-F</w> and <w>Ctrl-G</w>."
            "\n",

Deletion in crawl-ref/source/command.cc at line 1643 [5.4082507]

B:BD[17.6241] → [17.6241:6277]

∅:D[17.6277] → [15.1196530:1196601]

B:BD[15.1196530] → [15.1196530:1196601]

B:BD[15.1196601] → [17.6278:6776]

B:BD[17.6776] → [22.433:488]

B:BD[22.488] → [20.1591:1636]

∅:D[20.1636] → [17.6885:7020]

B:BD[17.6885] → [17.6885:7020]

∅:D[17.7020] → [15.1197095:1197141]

B:BD[15.1197095] → [15.1197095:1197141]

B:BD[15.1197141] → [17.7021:7091]

∅:D[19.618] → [23.453:748]

B:BD[17.7091] → [23.453:748]

∅:D[23.748] → [17.7412:7457]

B:BD[17.7412] → [17.7412:7457]

    cols.add_formatted(            
            1,
            "<h>Shortcuts in Lists (like multidrop):\n"
            "<w>)</w> : selects hand weapons\n"
            "<w>(</w> : selects missiles\n"
            "<w>[</w> : selects armour\n"
            "<w>%</w> : selects food, <w>&</w> : selects carrion\n"
            "<w>?</w> : selects scrolls\n"
            "<w>!</w> : selects potions\n"
            "<w>=</w> : selects rings\n"
            "<w>\"</w> : selects amulets\n"
            "<w>/</w> : selects wands\n"
            "<w>+</w> : selects books\n"
            "<w>\\</w> : selects staves\n"
            "<w>}</w> : selects miscellaneous items\n"
            "<w>.</w> : selects next item\n"
            "<w>,</w> : global selection\n"
            "<w>-</w> : global deselection\n"
            "<w>*</w> : invert selection\n",
            true, true, cmdhelp_textfilter);
    cols.add_formatted(            
            1, 
            " \n"
            "Crawl usually considers every item it\n"
            "sees as a stash. When using a value\n"
            "different from <green>stash_tracking = all</green>, you\n"
            "can use <w>Ctrl-S</w> to manually declare\n"
            "stashes, and <w>Ctrl-E</w> to erase them.\n",
            true, true, cmdhelp_textfilter);

Replacement in crawl-ref/source/command.cc at line 1671 [5.4082507]

B:BD[27.6132] → [3.15785:15839]

        "<brown>(</brown> : missiles (<w>f</w>ire)\n"

[27.6132]

[27.6202]

        "<brown>(</brown> : missiles (<w>f</w>ire, <w>(</w> to cycle ammo)\n"

Replacement in crawl-ref/source/command.cc at line 1673 [5.4082507]

B:BD[27.6272] → [3.15840:15917]

        "<brown>%</brown> : food and corpses (<w>c</w>hop and <w>e</w>at)\n"

[27.6272]

[27.6352]

        "<brown>%</brown> : corpses and food (<w>c</w>hop up and <w>e</w>at)\n"

Replacement in crawl-ref/source/command.cc at line 1678 [5.4082507]

B:BD[27.6594] → [27.6594:6650]

        "<darkgrey>/</darkgrey> : wands (<w>z</w>ap)\n"

[27.6594]

[27.6650]

        "<darkgrey>/</darkgrey> : wands (<w>Z</w>ap)\n"

Replacement in crawl-ref/source/command.cc at line 1683 [5.4082507]
B:BD[27.6779] → [27.6779:6803]
```
        "<w>Z</w>ap)\n"
```
[27.6779]
[27.6803]
```
        "<w>z</w>ap)\n"
```

Replacement in crawl-ref/source/command.cc at line 1698 [5.4082507]

B:BD[28.86834] → [28.86834:86901]

            "<w>Z</w> to cast spells (<w>Z?</w> lists spells).\n",

[28.86773]

[29.68085]

            "<w>z</w> to cast spells (<w>z?</w> lists spells).\n",

Deletion in crawl-ref/source/command.cc at line 1718 [5.4082507]
∅:D[3.16076] → [28.87661:87678]
B:BD[28.87661] → [28.87661:87678]
```
            "\n"
```