make "stagger" more consistent

diff --git a/japanese/jconj.c b/japanese/jconj.c
index 3d34bb5..c53064c 100644 (file)
--- a/japanese/jconj.c
+++ b/japanese/jconj.c
@@ -86,6 +86,7 @@ struct _jconj_tab {
     {"\94[\82ß\82é", J_MA, LOWER, NORMAL},
     {"\97\8e\82¿\82é", J_TA, UPPER, NORMAL},
     {"\97\8e\82·", J_SA, FIFTH, NORMAL},
+    {"\82¨\82Ì\82Ì\82­", J_KA, FIFTH, ION},
 /* \82© */
     {"\8f\91\82­", J_KA, FIFTH, ION},
     {"\82©\82¯\82é", J_KA, UPPER, NORMAL},
@@ -109,6 +110,7 @@ struct _jconj_tab {
     {"\8a\8a\82é", J_RA, FIFTH, HATSUON},
     {"\82·\82é", J_SA, SAHEN, NORMAL}, 
 /* \82½ */
+    {"\82½\82¶\82ë\82®", J_GA, FIFTH, ION},
     {"\8fo\82·", J_SA, FIFTH, NORMAL},
     {"\90H\82×\82é", J_HA, LOWER, NORMAL}, 
     {"\8eg\82¤", J_WA, FIFTH, HATSUON},
@@ -151,6 +153,7 @@ struct _jconj_tab {
     {"\8fÄ\82­", J_KA, FIFTH, ION},
     {"\8cÄ\82Ô", J_BA, FIFTH, SOKUON},
     {"\93Ç\82Þ", J_MA, FIFTH, SOKUON},
+    {"\82æ\82ë\82ß\82­", J_KA, FIFTH, ION},
 /* \82ç */
 /* \82í */
     {(void*)0, 0, 0, 0},

diff --git a/src/mhitm.c b/src/mhitm.c
index 6a9026c..087ade0 100644 (file)
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -969,7 +969,8 @@ register struct attack *mattk;
             pline("%s %s for a moment.", Monnam(mdef),
                   makeplural(stagger(pd, "stagger")));
 #else
-            pline("%s\82Í\82·\82±\82µ\82æ\82ë\82ß\82¢\82½\81D", Monnam(mdef));
+            pline("%s\82Í\82·\82±\82µ%s\81D", Monnam(mdef),
+                  jpast(stagger(pd, "\82æ\82ë\82ß\82­")));
 #endif
         mdef->mstun = 1;
         goto physical;
@@ -1832,7 +1833,8 @@ int mdead;
                     pline("%s %s...", Monnam(magr),
                           makeplural(stagger(magr->data, "stagger")));
 #else
-                    pline("%s\82Í\82­\82ç\82­\82ç\82µ\82½\81D\81D\81D", Monnam(magr));
+                    pline("%s\82Í%s\81D\81D\81D", Monnam(magr),
+                          jpast(stagger(magr->data, "\82æ\82ë\82ß\82­")));
 #endif
             }
             tmp = 0;

diff --git a/src/mhitu.c b/src/mhitu.c
index 81e0a9b..76c1ca6 100644 (file)
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -3566,7 +3566,8 @@ register struct attack *mattk;
                 pline("%s %s.", Monnam(mtmp),
                       makeplural(stagger(mtmp->data, "stagger")));
 #else
-                pline("%s\82Í\82­\82ç\82­\82ç\82µ\82½\81D", Monnam(mtmp));
+                pline("%s\82Í%s\81D", Monnam(mtmp),
+                      jpast(stagger(mtmp->data, "\82æ\82ë\82ß\82­")));
 #endif
             }
             tmp = 0;

diff --git a/src/mondata.c b/src/mondata.c
index f250089..8498643 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -1037,7 +1037,7 @@ static const char *levitate[4] = { "
 /*JP
 static const char *flys[4] = { "fly", "Fly", "flutter", "Flutter" };
 */
-static const char *flys[4] = { "\94ò\82Ô", "\94ò\82Ô", "\82Í\82½\82ß\82­", "\82Í\82½\82ß\82­" };
+static const char *flys[4] = { "\94ò\82Ô", "\94ò\82Ô", "\82¨\82Ì\82Ì\82­", "\82¨\82Ì\82Ì\82­" };
 /*JP
 static const char *flyl[4] = { "fly", "Fly", "stagger", "Stagger" };
 */
@@ -1049,11 +1049,11 @@ static const char *slither[4] = { "
 /*JP
 static const char *ooze[4] = { "ooze", "Ooze", "tremble", "Tremble" };
 */
-static const char *ooze[4] = { "\82É\82¶\82Ý\8fo\82é", "\82É\82¶\82Ý\8fo\82é", "\90k\82¦\82é", "\90k\82¦\82é" };
+static const char *ooze[4] = { "\82É\82¶\82Ý\8fo\82é", "\82É\82¶\82Ý\8fo\82é", "\90g\90k\82¢\82·\82é", "\90g\90k\82¢\82·\82é" };
 /*JP
 static const char *immobile[4] = { "wiggle", "Wiggle", "pulsate", "Pulsate" };
 */
-static const char *immobile[4] = { "\90k\82¦\82é", "\90k\82¦\82é", "\90k\82¦\82é", "\90k\82¦\82é" };
+static const char *immobile[4] = { "\93®\82­", "\93®\82­", "\90k\82¦\82é", "\90k\82¦\82é" };
 /*JP
 static const char *crawl[4] = { "crawl", "Crawl", "falter", "Falter" };
 */
@@ -1076,6 +1076,12 @@ const char *def;
                         : def);
 }
 
+/*JP:
+ * \81u\82æ\82ë\82ß\82­\81v\82ð\89ö\95¨\82Ì\8eí\97Þ\82É\82æ\82Á\82Ä\95Ï\82¦\82é\81B
+ * \8e©\95ª\82É\91Î\82µ\82Ä\8eg\82¤\8fê\8d\87\82É\82Í\8aù\82É\81u\82­\82ç\82­\82ç\82·\82é\81v\82ª\8eg\82í\82ê\82Ä\82¢\82é\82Ì\82Å\81A
+ * \95Ï\89»\82µ\82Ä\82¢\82Ä\82à\82»\82Ì\82Ü\82Ü\82É\82·\82é\81B
+ * \91\8a\8eè\82É\91Î\82µ\82Ä\8eg\82¤\8fê\8d\87\82Í\81u\82­\82ç\82­\82ç\82·\82é\81v\82Í\95s\8e©\91R\82È\82Ì\82Å\82±\82ê\82ð\8eg\82¤\81B
+ */
 const char *
 stagger(ptr, def)
 const struct permonst *ptr;

diff --git a/src/pickup.c b/src/pickup.c
index 2cc62d1..cd0080c 100644 (file)
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1661,7 +1661,7 @@ encumber_msg()
             You("%s under your heavy load.  Movement is very hard.",
                 stagger(youmonst.data, "stagger"));
 #else
-            You("\89×\95¨\82Ì\8fd\82Ý\82Å\82Ì\82½\82¤\82¿\82Ü\82í\82Á\82½\81D\93®\82­\82Ì\82ª\94ñ\8fí\82É\82«\82Â\82¢\81D");
+            You("\89×\95¨\82Ì\8fd\82Ý\82Å\82æ\82ë\82æ\82ë\82µ\82½\81D\93®\82­\82Ì\82ª\94ñ\8fí\82É\82«\82Â\82¢\81D");
 #endif
             break;
         default:
@@ -1699,7 +1699,7 @@ encumber_msg()
             You("%s under your load.  Movement is still very hard.",
                 stagger(youmonst.data, "stagger"));
 #else
-            You("\89×\95¨\82Ì\8fd\82Ý\82ª\82¸\82Á\82µ\82è\82Æ\8c¨\82É\82­\82é\81D\82Ü\82¾\93®\82­\82Ì\82ª\94ñ\8fí\82É\82«\82Â\82¢\81D");
+            You("\89×\95¨\82Ì\8fd\82Ý\82ª\82¸\82Á\82µ\82è\82Æ\82­\82é\81D\82Ü\82¾\93®\82­\82Ì\82ª\94ñ\8fí\82É\82«\82Â\82¢\81D");
 #endif
             break;
         }

diff --git a/src/potion.c b/src/potion.c
index 6b7c998..c646e57 100644 (file)
--- a/src/potion.c
+++ b/src/potion.c
@@ -115,7 +115,7 @@ boolean talk;
 /*JP
                 You("%s...", stagger(youmonst.data, "stagger"));
 */
-                You("%s\81D\81D\81D", stagger(youmonst.data, "\82­\82ç\82­\82ç\82µ\82½"));
+                You("\82­\82ç\82­\82ç\82µ\82½\81D\81D\81D");
         }
     }
     if ((!xtime && old) || (xtime && !old))

diff --git a/src/uhitm.c b/src/uhitm.c
index ff3d6d6..7a7f471 100644 (file)
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1199,8 +1199,8 @@ int thrown; /* HMON_xxx (0 => hand-to-hand, other => ranged) */
                 pline("%s %s from your powerful strike!", Monnam(mon),
                       makeplural(stagger(mon->data, "stagger")));
 #else
-                pline("%s\82Í\82 \82È\82½\82Ì\89ï\90S\82Ì\88ê\8c\82\82Å\82æ\82ë\82ß\82¢\82½\81I",
-                      Monnam(mon));
+                pline("%s\82Í\82 \82È\82½\82Ì\89ï\90S\82Ì\88ê\8c\82\82Å%s\81I", Monnam(mon),
+                      jpast(stagger(mon->data, "\82æ\82ë\82ß\82­")));
 #endif
             /* avoid migrating a dead monster */
             if (mon->mhp > tmp) {
@@ -1646,7 +1646,8 @@ register struct attack *mattk;
             pline("%s %s for a moment.", Monnam(mdef),
                   makeplural(stagger(pd, "stagger")));
 #else
-            pline("%s\82Í\88ê\8fu\82­\82ç\82­\82ç\82µ\82½\81D", Monnam(mdef));
+            pline("%s\82Í\88ê\8fu%s\81D", Monnam(mdef),
+                  jpast(stagger(pd, "\82æ\82ë\82ß\82­")));
 #endif
         mdef->mstun = 1;
         goto physical;