summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-27 22:17:31 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-27 22:42:14 +0300
commit4e3cc7022e40d5506ca30ec9f06ef32e19d0da4c (patch)
tree774b3f5f631afbe4aafe245b780fc8ca9c0ab0d3
parent6d72b3a19ae68d5eedd425a0f58c4226dfde7001 (diff)
downloadmanaplus-4e3cc7022e40d5506ca30ec9f06ef32e19d0da4c.tar.gz
manaplus-4e3cc7022e40d5506ca30ec9f06ef32e19d0da4c.tar.bz2
manaplus-4e3cc7022e40d5506ca30ec9f06ef32e19d0da4c.tar.xz
manaplus-4e3cc7022e40d5506ca30ec9f06ef32e19d0da4c.zip
Add new chat commands:
/targetattack - target and attack monster /talk - talk with selected npc /stopattack - stop attacking /untarget - unselect target but not stop attack /targetmonster - target monster /targetnpc - target npc /targetplayer - target player /targetclosestmonster - target to closest monster /pickup - pickup item from ground /hidewindows - hide all windows /sit - do sit or stand /screenshot - create screenshot /changetrade - disable/enable trade /quit - open quit dialog /help - open help window /status - open status window /inventory - open inventory window /equipment - open equipment window /skill - open skills window /minimap - open minimap window /openchat - open chat window /openshortcut - open openshortcuts window /setup - open setup window /debug - open debug window /social - open social window /emotes - open emotes window /openoutfit - open outfits window /shop - open shop window /opendrop - open drops window /kills - open kills window /spells - open spells window /botchecker - open bot checker window /online - open online window /didyouknow - open did you know window /quests - open quests window /prevsocialtab - switch to previous social tab /nextsocialtab - switch to next social tab /chat - show/hide chat input field /chatscrollup - scroll chat up /chatscrolldown - scroll chat down /turnup - change direction to up /turndown - change direction to down /turnleft - change direction to left /turnright - change direction to right /itenplz - call #itenplz like magic /audio - enable/disable audio /rightclick - emulate right click /sit2 - do sit even if client think what you already sitting /showkeyboard - open onscreen keyboard /showwindows - show popup menu for all windows /shortcutprevtab - switch to previous shortcut tab /shortcutnexttab - switch to next shortcut tab /commandsprevtab - switch to previous commands tab /commandsnexttab - switch to next commands tab /trade - start trade with selected player /about - open about help page /updater - open updater window
-rw-r--r--src/input/inputactionmap.h120
1 files changed, 60 insertions, 60 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 81afc5348..80819bed0 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -102,7 +102,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOFOLLOW
| InputCondition::VALIDSPEED,
- "",
+ "targetattack",
false},
{"keyMoveToTarget",
InputType::KEYBOARD, SDLK_v,
@@ -157,7 +157,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::talk,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "talk",
false},
{"keyTarget",
InputType::KEYBOARD, SDLK_LSHIFT,
@@ -166,7 +166,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::stopAttack,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "stopattack",
false},
{"keyUnTarget",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -175,7 +175,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::untarget,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "untarget",
false},
{"keyTargetMonster",
InputType::KEYBOARD, SDLK_a,
@@ -185,7 +185,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET
| InputCondition::VALIDSPEED,
- "",
+ "targetmonster",
false},
{"keyTargetNPC",
InputType::KEYBOARD, SDLK_n,
@@ -194,7 +194,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::targetNPC,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "targetnpc",
false},
{"keyTargetPlayer",
InputType::KEYBOARD, SDLK_q,
@@ -203,7 +203,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::targetPlayer,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "targetplayer",
false},
{"keyPickup",
InputType::KEYBOARD, SDLK_z,
@@ -212,7 +212,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::pickup,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "pickup",
false},
{"keyChangePickupType",
InputType::KEYBOARD, SDLK_o,
@@ -231,7 +231,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::hideWindows,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "hidewindows",
false},
{"keyBeingSit",
InputType::KEYBOARD, SDLK_s,
@@ -240,7 +240,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::sit,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "sit",
false},
{"keyScreenshot",
InputType::KEYBOARD, SDLK_p,
@@ -249,7 +249,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::screenshot,
InputAction::NO_VALUE, 50,
InputCondition::NOTARGET | InputCondition::NOINPUT,
- "",
+ "screenshot",
false},
{"keyTrade",
InputType::KEYBOARD, SDLK_r,
@@ -258,7 +258,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::changeTrade,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "changetrade",
false},
{"keyPathfind",
InputType::KEYBOARD, SDLK_f,
@@ -291,7 +291,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::quit,
InputAction::NO_VALUE, 50,
InputCondition::DEFAULT,
- "",
+ "quit",
false},
{"keyShortcutsKey",
InputType::KEYBOARD, SDLK_MENU,
@@ -489,7 +489,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::helpWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::SHORTCUT0,
- "help",
+ "help|openhelp",
false},
{"keyWindowStatus",
InputType::KEYBOARD, SDLK_F2,
@@ -498,7 +498,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::statusWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "status|openstatus",
false},
{"keyWindowInventory",
InputType::KEYBOARD, SDLK_F3,
@@ -507,7 +507,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::inventoryWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "inventory|openinventory",
false},
{"keyWindowEquipment",
InputType::KEYBOARD, SDLK_F4,
@@ -516,7 +516,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::equipmentWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "equipment|openequipment",
false},
{"keyWindowSkill",
InputType::KEYBOARD, SDLK_F5,
@@ -525,7 +525,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::skillDialogShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "skill|skills|openskills",
false},
{"keyWindowMinimap",
InputType::KEYBOARD, SDLK_F6,
@@ -534,7 +534,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::minimapWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "minimap|openminimap",
false},
{"keyWindowChat",
InputType::KEYBOARD, SDLK_F7,
@@ -543,7 +543,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::chatWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "openchat",
false},
{"keyWindowShortcut",
InputType::KEYBOARD, SDLK_F8,
@@ -552,7 +552,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::shortcutWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "openshortcut|openshortcuts",
false},
{"keyWindowSetup",
InputType::KEYBOARD, SDLK_F9,
@@ -562,7 +562,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::NOTARGET | InputCondition::NOINPUT
| InputCondition::ENABLED,
- "",
+ "setup|opensetup",
false},
{"keyWindowDebug",
InputType::KEYBOARD, SDLK_F10,
@@ -571,7 +571,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::debugWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "debug|opendebug",
false},
{"keyWindowSocial",
InputType::KEYBOARD, SDLK_F11,
@@ -580,7 +580,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::socialWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "social|opensocial",
false},
{"keyWindowEmoteBar",
InputType::KEYBOARD, SDLK_F12,
@@ -589,7 +589,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::emoteShortcutWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "emotes|openemotes",
false},
{"keyWindowOutfit",
InputType::KEYBOARD, SDLK_BACKQUOTE,
@@ -598,7 +598,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::outfitWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "openoutfit|openoutfits",
false},
{"keyWindowShop",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -607,7 +607,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::shopWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "shop|openshop",
false},
{"keyWindowDrop",
InputType::KEYBOARD, SDLK_w,
@@ -616,7 +616,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::dropShortcutWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "opendrop",
false},
{"keyWindowKills",
InputType::KEYBOARD, SDLK_e,
@@ -625,7 +625,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::killStatsWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "kills|openkills",
false},
{"keyWindowSpells",
InputType::KEYBOARD, SDLK_j,
@@ -634,7 +634,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::spellShortcutWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "spells|openspells",
false},
{"keyWindowBotChecker",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -643,7 +643,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::botcheckerWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "botchecker|openbotchecker",
false},
{"keyWindowOnline",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -652,7 +652,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::whoIsOnlineWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "online|openonline",
false},
{"keyWindowDidYouKnow",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -661,7 +661,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::didYouKnowWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::SHORTCUT0,
- "",
+ "didyouknow|opendidyouknow",
false},
{"keyWindowQuests",
InputType::KEYBOARD, SDLK_LEFTBRACKET,
@@ -670,7 +670,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::questsWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "quests|openquests",
false},
{"keySocialPrevTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -679,7 +679,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::prevSocialTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "prevsocialtab",
false},
{"keySocialNextTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -688,7 +688,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::nextSocialTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "nextsocialtab",
false},
{"keySmilie",
InputType::KEYBOARD, SDLK_LALT,
@@ -2030,7 +2030,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::NOAWAY
| InputCondition::NOMODAL | InputCondition::INGAME,
- "",
+ "chat",
false},
{"keyChatScrollUp",
InputType::KEYBOARD, SDLK_PAGEUP,
@@ -2039,7 +2039,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::scrollChatUp,
InputAction::NO_VALUE, 50,
InputCondition::DEFAULT | InputCondition::INGAME,
- "",
+ "chatscrollup",
false},
{"keyChatScrollDown",
InputType::KEYBOARD, SDLK_PAGEDOWN,
@@ -2048,7 +2048,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::scrollChatDown,
InputAction::NO_VALUE, 50,
InputCondition::DEFAULT | InputCondition::INGAME,
- "",
+ "chatscrolldown",
false},
{"keyChatPrevTab",
InputType::KEYBOARD, SDLK_KP7,
@@ -2057,7 +2057,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::prevChatTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "prevTab",
+ "prevtab",
false},
{"keyChatNextTab",
InputType::KEYBOARD, SDLK_KP9,
@@ -2066,7 +2066,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::nextChatTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "nextTab",
+ "nexttab",
false},
{"keyChatCloseTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2075,7 +2075,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::closeChatTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "close",
false},
{"keyChatPrevHistory",
InputType::KEYBOARD, SDLK_KP7,
@@ -2128,7 +2128,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::directUp,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "directup|turnup",
false},
{"keyDirectDown",
InputType::KEYBOARD, SDLK_SEMICOLON,
@@ -2137,7 +2137,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::directDown,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "directdown|turndown",
false},
{"keyDirectLeft",
InputType::KEYBOARD, SDLK_k,
@@ -2146,7 +2146,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::directLeft,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "directleft|turnleft",
false},
{"keyDirectRight",
InputType::KEYBOARD, SDLK_QUOTE,
@@ -2155,7 +2155,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::directRight,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "directright|turnright",
false},
{"keyCrazyMoves",
InputType::KEYBOARD, SDLK_SLASH,
@@ -2219,7 +2219,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::itenplz,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "itenplz",
false},
{"keyMagicAttack",
InputType::KEYBOARD, SDLK_b,
@@ -2316,7 +2316,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::changeAudio,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "audio",
false},
{"keyAway",
InputType::KEYBOARD, SDLK_KP2,
@@ -2335,7 +2335,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::NOAWAY
| InputCondition::NOMODAL | InputCondition::INGAME,
- "",
+ "rightclick",
false},
{"keyCameraMode",
InputType::KEYBOARD, SDLK_KP_PLUS,
@@ -2520,7 +2520,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::stopSit,
InputAction::NO_VALUE, 50,
InputCondition::DEFAULT | InputCondition::INGAME,
- "",
+ "sit2",
false},
{"keyShowKeyboard",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2529,7 +2529,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::showKeyboard,
InputAction::NO_VALUE, 50,
InputCondition::DEFAULT,
- "",
+ "showkeyboard",
false},
{"keyShowWindows",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2538,7 +2538,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::showWindows,
InputAction::NO_VALUE, 50,
InputCondition::DEFAULT,
- "",
+ "showwindows",
false},
{"keyChatMod",
InputType::KEYBOARD, SDLK_LSHIFT,
@@ -2664,7 +2664,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::prevShortcutsTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "shortcutprevtab",
false},
{"keyShortcutsNextTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2673,7 +2673,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::nextShortcutsTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "shortcutnexttab",
false},
{"keyCommandsPrevTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2682,7 +2682,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::prevCommandsTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "commandsprevtab",
false},
{"keyCommandsNextTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2691,7 +2691,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::nextCommandsTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "commandsnexttab",
false},
{"keyOpenTrade",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2700,7 +2700,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::openTrade,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET,
- "",
+ "trade",
false},
{"keyGUIF1",
@@ -2818,7 +2818,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::aboutWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::SHORTCUT0,
- "",
+ "about",
false},
{"keyWindowUpdater",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2827,7 +2827,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::updaterWindowShow,
InputAction::NO_VALUE, 50,
InputCondition::GAME,
- "",
+ "updater",
false},
{"keyTargetClosestMonster",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2837,7 +2837,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::NOTARGET
| InputCondition::VALIDSPEED,
- "",
+ "targetclosestmonster",
false},
{"keyChatCloseAllTabs",
InputType::UNKNOWN, InputAction::NO_VALUE,