X-Git-Url: http://git.osdn.net/view?p=jnethack%2Fsource.git;a=blobdiff_plain;f=src%2Ftrap.c;h=1b53a1d6dece86fe9be0e74fffe448f719b55831;hp=96102e15b326ea642f17c2a4c9d362bc65e6d068;hb=3be5d02819c7185d7cffb673ed4119a2e0303c7a;hpb=d96288103913b2d32206648426572e10048f189a

diff --git a/src/trap.c b/src/trap.c
index 96102e1..1b53a1d 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -192,7 +192,10 @@ int ef_flags;
         *const msg[] = { "burnt", "rusted", "rotten", "corroded" },
 */
         *const msg[] =  { "Å‚°‚½", "ŽK‚Ñ‚½", "•…‚Á‚½", "•…H‚µ‚½" },
+/*JP
         *const bythe[] = { "heat", "oxidation", "decay", "corrosion" };
+*/
+        *const bythe[] = { "”M", "Ž_‰»", "•…”s", "•…H" };
     boolean vulnerable = FALSE, is_primary = TRUE,
             check_grease = (ef_flags & EF_GREASE) ? TRUE : FALSE,
             print = (ef_flags & EF_VERBOSE) ? TRUE : FALSE,
@@ -1088,7 +1091,10 @@ boolean msg;
         if (!was_Lev && Levitation)
             float_up();
         if (!was_Fly && Flying)
+/*JP
             You("can fly.");
+*/
+            You("”ò‚ׂé‚悤‚É‚È‚Á‚½D");
     }
 }
 
@@ -1564,8 +1570,13 @@ unsigned trflags;
 */
                 You("—ׂ̗Ž‚µŒŠ‚Ɉړ®‚µ‚½D");
             } else if (adj_pit) {
+#if 0 /*JP:T*/
                 You("stumble over debris%s.",
                     !rn2(5) ? " between the pits" : "");
+#else
+                You("‚Í%s‚ª‚ç‚­‚½‚ł‚܂¢‚½D",
+                    !rn2(5) ? "—Ž‚µŒŠ‚Ì" : "");
+#endif
             } else {
 #if 0 /*JP*/
                 Strcpy(verbbuf,
@@ -1912,14 +1923,18 @@ unsigned trflags;
 
         seetrap(trap);
         if (viasitting)
+#if 0 /*JP*/
             Strcpy(verbbuf, "trigger"); /* follows "You sit down." */
+#else
+            Strcpy(verbbuf, "‚ðˆø‚«‹N‚±‚µ‚½"); /* follows "You sit down." */
+#endif
         else if (u.usteed)
 #if 0 /*JP*/
             Sprintf(verbbuf, "lead %s onto",
                     x_monnam(u.usteed, steed_article, (char *) 0,
                              SUPPRESS_SADDLE, FALSE));
 #else
-            Sprintf(verbbuf, "%s‚Æ‚Æ‚à‚É”ò‚эž‚ñ‚¾",
+            Sprintf(verbbuf, "‚É%s‚Æ‚Æ‚à‚É”ò‚эž‚ñ‚¾",
                     x_monnam(u.usteed, steed_article, (char *) 0,
                              SUPPRESS_SADDLE, FALSE));
 #endif
@@ -1929,14 +1944,14 @@ unsigned trflags;
                     Levitation ? (const char *) "float"
                                : locomotion(youmonst.data, "step"));
 #else
-            Sprintf(verbbuf,"%s",
+            Sprintf(verbbuf,"‚É%s",
                     jpast(Levitation ? (const char *)"•‚‚«‚È‚ª‚ç”ò‚Ñ‚±‚Þ"
                           : locomotion(youmonst.data, "“¥‚ݍž‚Þ")));
 #endif
 /*JP
         You("%s a polymorph trap!", verbbuf);
 */
-        You("•Ï‰»‚Ì㩂É%sI", verbbuf);
+        You("•Ï‰»‚Ìã©%sI", verbbuf);
         if (Antimagic || Unchanging) {
             shieldeff(u.ux, u.uy);
 /*JP
@@ -3639,11 +3654,20 @@ float_up()
             (void) buried_ball(&cc);
             /* being chained to the floor blocks levitation from floating
                above that floor but not from enhancing carrying capacity */
+#if 0 /*JP*/
             You("feel lighter, but your %s is still chained to the %s.",
                 body_part(LEG),
                 IS_ROOM(levl[cc.x][cc.y].typ) ? "floor" : "ground");
+#else
+            You("‚·‚±‚µŒy‚­‚È‚Á‚½‚ªC‚ ‚È‚½‚Ì%s‚Í‚Ü‚¾%s‚ɂ‚Ȃª‚Á‚Ä‚¢‚éD",
+                body_part(LEG),
+                IS_ROOM(levl[cc.x][cc.y].typ) ? "°" : "’n–Ê");
+#endif
         } else if (u.utraptype == WEB) {
+/*JP
             You("float up slightly, but you are still stuck in the web.");
+*/
+            You("‚·‚±‚µ•‚‚«ã‚ª‚Á‚½‚ªC‚Ü‚¾‚­‚à‚Ì‘ƒ‚ɂ‚©‚Ü‚Á‚Ä‚¢‚éD");
         } else { /* bear trap */
 /*JP
             You("float up slightly, but your %s is still stuck.",
@@ -3754,12 +3778,21 @@ long hmask, emask; /* might cancel timeout */
 
         float_vs_flight();
         if (trapped && u.utrap) /* u.utrap => paranoia */
+#if 0 /*JP*/
             You("are no longer trying to float up from the %s.",
                 (u.utraptype == TT_BEARTRAP) ? "trap's jaws"
                   : (u.utraptype == TT_WEB) ? "web"
                       : (u.utraptype == TT_BURIEDBALL) ? "chain"
                           : (u.utraptype == TT_LAVA) ? "lava"
                               : "ground"); /* TT_INFLOOR */
+#else
+            You("‚à‚Í‚â%s‚©‚ç•‚‚«ã‚ª‚낤‚Æ‚µ‚È‚­‚È‚Á‚½D",
+                (u.utraptype == TT_BEARTRAP) ? "㩂̎•"
+                  : (u.utraptype == TT_WEB) ? "‚­‚à‚Ì‘ƒ"
+                      : (u.utraptype == TT_BURIEDBALL) ? "½"
+                          : (u.utraptype == TT_LAVA) ? "—nŠâ"
+                              : "’n–Ê"); /* TT_INFLOOR */
+#endif
         (void) encumber_msg(); /* carrying capacity might have changed */
         return 0;
     }
@@ -4138,7 +4171,10 @@ domagictrap()
             context.botl = TRUE;
         } else {
             /* magic vibrations still hit you */
+/*JP
             You_feel("rankled.");
+*/
+            You_feel("‚¢‚ç‚¢‚炵‚½D");
             incr_itimeout(&HDeaf, rn1(5, 15));
             context.botl = TRUE;
         }
@@ -5947,14 +5983,23 @@ boolean *noticed; /* set to true iff hero notices the effect; */
         which = "";
         switch (u.utraptype) {
         case TT_LAVA:
+/*JP
             trapdescr = "molten lava";
+*/
+            trapdescr = "‚Ç‚ë‚Ç‚ë‚Ì—nŠâ";
             break;
         case TT_INFLOOR:
             /* solidified lava, so not "floor" even if within a room */
+/*JP
             trapdescr = "ground";
+*/
+            trapdescr = "’n–Ê";
             break;
         case TT_BURIEDBALL:
+/*JP
             trapdescr = "your anchor";
+*/
+            trapdescr = "‚­‚³‚Ñ";
             break;
         case TT_BEARTRAP:
         case TT_PIT:
@@ -5964,7 +6009,10 @@ boolean *noticed; /* set to true iff hero notices the effect; */
         default:
             /* lint suppression in case 't' is unexpectedly Null
                or u.utraptype has new value we don't know about yet */
+/*JP
             trapdescr = "trap";
+*/
+            trapdescr = "ã©";
             break;
         }
     } else {
@@ -6677,7 +6725,7 @@ unconscious()
                               || !strncmp(nomovemsg, "You regain con", 14)
                               || !strncmp(nomovemsg, "You are consci", 14))));
 #else
-/*JP 3.6.0 ‚ł̏oŒ»ˆÊ’u/‰ñ”
+/*JP 3.6.2 ‚ł̏oŒ»ˆÊ’u/‰ñ”
  "You awake"      : potion.c(1)
   "You regain con": eat.c(1)
   "You are consci": eat.c(1)