X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd.c;h=6bc3389152f81ecc09187e23f272d67b98a85136;hb=4755b4af1da1775cf009f0a8751d6ccd8807cf82;hp=cd986d36d20184a94a2fb2eebce3eb998bc6f0c4;hpb=13241875dc8ea2ee63b23ce26c8c183d279762e0;p=jnethack%2Fsource.git diff --git a/src/cmd.c b/src/cmd.c index cd986d3..6bc3389 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -5,7 +5,7 @@ /* JNetHack Copyright */ /* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000 */ -/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2019 */ +/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2022 */ /* JNetHack may be freely redistributed. See license for details. */ #include "hack.h" @@ -2561,7 +2561,7 @@ int final; /*JP enl_msg(Your_wallet, "is ", "was ", "empty", ""); */ - enl_msg(Your_wallet, "‚Å‚ ‚é", "‚Å‚¾‚Á‚½", "‚Í‹ó", ""); + enl_msg(Your_wallet, "‚Å‚ ‚é", "‚¾‚Á‚½", "‚Í‹ó", ""); } else { #if 0 /*JP:T*/ Sprintf(buf, "%ld %s", umoney, currency(umoney)); @@ -2623,7 +2623,7 @@ int final; /*JP Sprintf(buf, "%s Characteristics:", !final ? "Current" : "Final"); */ - Sprintf(buf, "%s‘®«F", !final ? "Œ»Ý‚Ì" : "ÅI"); + Sprintf(buf, "%s“Á«F", !final ? "Œ»Ý‚Ì" : "ÅI"); enlght_out(buf); /* bottom line order */ @@ -3550,9 +3550,9 @@ int final; enl_msg(You_, "could be", "could have been", " clairvoyant", buf); #else /*JP:uc‚É‚æ‚Á‚āv*/ - if (!strncmp(buf, "‚É‚æ‚Á‚Ä", 8)) + if (!STRNCMP2(buf, "‚É‚æ‚Á‚Ä")) /*JP:uc‚ª‚È‚¯‚ê‚΁v‚ɏ‘‚«Š·‚¦‚é*/ - strcpy(eos(buf) - 8, "‚ª‚È‚¯‚ê‚Î"); + strcpy(eos(buf) - strlen("‚É‚æ‚Á‚Ä"), "‚ª‚È‚¯‚ê‚Î"); you_have("ç—¢Šá”\—Í", buf); #endif } @@ -4653,20 +4653,40 @@ struct ext_func_tab extcmdlist[] = { { M('A'), "annotate", "Œ»Ý‚ÌŠK‚É–¼‘O‚ð‚‚¯‚é", #endif donamelevel, IFBURIED | AUTOCOMPLETE }, +#if 0 /*JP*/ { 'a', "apply", "apply (use) a tool (pick-axe, key, lamp...)", +#else + { 'a', "apply", "“¹‹ï‚ðŽg‚¤D(‚‚é‚Í‚µ, Œ®, ƒ‰ƒ“ƒvc)", +#endif doapply }, { C('x'), "attributes", "show your attributes", doattributes, IFBURIED }, +#if 0 /*JP:T*/ { '@', "autopickup", "toggle the pickup option on/off", +#else + { '@', "autopickup", "Ž©“®E‚¢ƒIƒvƒVƒ‡ƒ“‚ðØ‚è‘Ö‚¦‚é", +#endif dotogglepickup, IFBURIED }, +#if 0 /*JP:T*/ { 'C', "call", "call (name) something", docallcmd, IFBURIED }, +#else + { 'C', "call", "–¼‘O‚ð‚‚¯‚é", docallcmd, IFBURIED }, +#endif +#if 0 /*JP:T*/ { 'Z', "cast", "zap (cast) a spell", docast, IFBURIED }, +#else + { 'Z', "cast", "Žô•¶‚ð¥‚¦‚é", docast, IFBURIED }, +#endif #if 0 /*JP:T*/ { M('c'), "chat", "talk to someone", dotalk, IFBURIED | AUTOCOMPLETE }, #else { M('c'), "chat", "’N‚©‚Ƙb‚·", dotalk, IFBURIED | AUTOCOMPLETE }, #endif +#if 0 /*JP:T*/ { 'c', "close", "close a door", doclose }, +#else + { 'c', "close", "ƒhƒA‚ð•Â‚ß‚é", doclose }, +#endif #if 0 /*JP:T*/ { M('C'), "conduct", "list voluntary challenges you have maintained", #else @@ -5214,11 +5234,17 @@ dokeylist(VOID_ARGS) datawin = create_nhwindow(NHW_TEXT); putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, " Full Current Key Bindings List"); +*/ + putstr(datawin, 0, " Œ»Ý‚ÌŠ®‘S‚ȃL[Š„‚è“–‚Ĉꗗ"); /* directional keys */ putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Directional keys:"); +*/ + putstr(datawin, 0, "•ûŒüƒL[:"); show_direction_keys(datawin, '.', FALSE); /* '.'==self in direction grid */ keys_used[(uchar) Cmd.move_NW] = keys_used[(uchar) Cmd.move_N] @@ -5245,16 +5271,31 @@ dokeylist(VOID_ARGS) = keys_used[(uchar) C(Cmd.move_S)] = keys_used[(uchar) C(Cmd.move_SE)] = TRUE; putstr(datawin, 0, ""); +#if 0 /*JP:T*/ putstr(datawin, 0, "Shift- will move in specified direction until you hit"); putstr(datawin, 0, " a wall or run into something."); +#else + putstr(datawin, 0, + "Shift-<•ûŒü> ‚́A•Ç‚ɂԂ‚©‚é‚©‰½‚©‚ª‚ ‚é‚Ü‚ÅŽw’肳‚ꂽ•ûŒü‚É"); + putstr(datawin, 0, " ˆÚ“®‚·‚éD"); +#endif +#if 0 /*JP:T*/ putstr(datawin, 0, "Ctrl- will run in specified direction until something"); putstr(datawin, 0, " very interesting is seen."); +#else + putstr(datawin, 0, + "Ctrl-<•ûŒü> ‚́A‰½‚©‹»–¡[‚¢‚à‚Ì‚ªŒ©‚¦‚é‚Ü‚ÅŽw’肳‚ꂽ•ûŒü‚É"); + putstr(datawin, 0, " ˆÚ“®‚·‚éD"); +#endif } putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Miscellaneous keys:"); +*/ + putstr(datawin, 0, "—lX‚ȃL[:"); for (i = 0; misc_keys[i].desc; i++) { key = Cmd.spkeys[misc_keys[i].nhkf]; if (key && ((misc_keys[i].numpad && iflags.num_pad) @@ -5274,21 +5315,30 @@ dokeylist(VOID_ARGS) if (dokeylist_putcmds(datawin, TRUE, GENERALCMD, WIZMODECMD, keys_used)) { putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "General commands:"); +*/ + putstr(datawin, 0, "ˆê”ʃRƒ}ƒ“ƒh:"); (void) dokeylist_putcmds(datawin, FALSE, GENERALCMD, WIZMODECMD, keys_used); } if (dokeylist_putcmds(datawin, TRUE, 0, WIZMODECMD, keys_used)) { putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Game commands:"); +*/ + putstr(datawin, 0, "ƒQ[ƒ€ƒRƒ}ƒ“ƒh:"); (void) dokeylist_putcmds(datawin, FALSE, 0, WIZMODECMD, keys_used); } if (wizard && dokeylist_putcmds(datawin, TRUE, WIZMODECMD, 0, keys_used)) { putstr(datawin, 0, ""); +/*JP putstr(datawin, 0, "Wizard-mode commands:"); +*/ + putstr(datawin, 0, "ƒEƒBƒU[ƒhƒ‚[ƒhƒRƒ}ƒ“ƒh:"); (void) dokeylist_putcmds(datawin, FALSE, WIZMODECMD, 0, keys_used); } @@ -6643,13 +6693,25 @@ const char *msg; * general message if it's on. */ dothat = "do that"; +#if 0 /*JP*/ how = " at"; /* for " at yourself"; not used for up/down */ +#else + how = ""; +#endif switch (spkey) { case NHKF_NOPICKUP: +#if 0 /*JP*/ dothat = "move"; +#else + dothat = "ˆÚ“®‚·‚é"; +#endif break; case NHKF_RUSH: +#if 0 /*JP*/ dothat = "rush"; +#else + dothat = "“ːi‚·‚é"; +#endif break; case NHKF_RUN2: if (!Cmd.num_pad) @@ -6657,14 +6719,22 @@ const char *msg; /*FALLTHRU*/ case NHKF_RUN: case NHKF_RUN_NOPICKUP: +#if 0 /*JP*/ dothat = "run"; +#else + dothat = "‘–‚é"; +#endif break; case NHKF_FIGHT2: if (!Cmd.num_pad) break; /*FALLTHRU*/ case NHKF_FIGHT: +#if 0 /*JP*/ dothat = "fight"; +#else + dothat = "í‚¤"; +#endif how = ""; /* avoid "fight at yourself" */ break; default: @@ -6678,13 +6748,21 @@ const char *msg; if (prefixhandling && (sym == Cmd.spkeys[NHKF_GETDIR_SELF] || (Cmd.num_pad && sym == Cmd.spkeys[NHKF_GETDIR_SELF2]))) { +/*JP Sprintf(buf, "You can't %s%s yourself.", dothat, how); +*/ + Sprintf(buf, "Ž©•ªŽ©g‚É%s%s‚±‚Æ‚Í‚Å‚«‚È‚¢D", dothat, how); /* for movement prefix followed by up or down */ } else if (prefixhandling && (sym == '<' || sym == '>')) { +#if 0 /*JP*/ Sprintf(buf, "You can't %s %s.", dothat, /* was "upwards" and "downwards", but they're considered to be variants of canonical "upward" and "downward" */ (sym == '<') ? "upward" : "downward"); +#else + Sprintf(buf, "%s%s‚±‚Æ‚Í‚Å‚«‚È‚¢D", + (sym == '<') ? "ã•ûŒü‚É" : "‰º•ûŒü‚É", dothat); +#endif } /* if '!cmdassist', display via pline() and we're done (note: asking @@ -6692,8 +6770,13 @@ const char *msg; if (!viawindow) { if (prefixhandling) { if (!*buf) +#if 0 /*JP*/ Sprintf(buf, "Invalid direction for '%s' prefix.", visctrl(Cmd.spkeys[spkey])); +#else + Sprintf(buf, "'%s'Ú“ªŽ«‚É‚Í•s³‚È•ûŒüD", + visctrl(Cmd.spkeys[spkey])); +#endif pline("%s", buf); return TRUE; } @@ -6754,13 +6837,24 @@ const char *msg; given but we include up and down for 'm'+invalid_direction; self is excluded as a viable direction for every prefix */ putstr(win, 0, ""); +/*JP putstr(win, 0, " < up"); +*/ + putstr(win, 0, " < ã"); +/*JP putstr(win, 0, " > down"); +*/ + putstr(win, 0, " > ‰º"); if (!prefixhandling) { int selfi = Cmd.num_pad ? NHKF_GETDIR_SELF2 : NHKF_GETDIR_SELF; +#if 0 /*JP:T*/ Sprintf(buf, " %4s direct at yourself", visctrl(Cmd.spkeys[selfi])); +#else + Sprintf(buf, " %4s Ž©•ª‚ÉŒü‚¯‚é", + visctrl(Cmd.spkeys[selfi])); +#endif putstr(win, 0, buf); } }