patch src/

[jnethack/source.git] / src / dogmove.c

diff --git a/src/dogmove.c b/src/dogmove.c
index 36e6c4a..9aa611d 100644 (file)
--- a/src/dogmove.c
+++ b/src/dogmove.c
@@ -2,6 +2,11 @@
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
+/* JNetHack Copyright */
+/* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000  */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2016            */
+/* JNetHack may be freely redistributed.  See license for details. */
+
 #include "hack.h"
 
 #include "mfndpos.h"
@@ -268,13 +273,26 @@ boolean devour;
            pet eats visible food. */
         if (sawpet || (seeobj && canspotmon(mtmp))) {
             if (tunnels(mtmp->data))
+/*JP
                 pline("%s digs in.", noit_Monnam(mtmp));
+*/
+                pline("%s\82Í\8c@\82Á\82Ä\82¢\82é\81D", noit_Monnam(mtmp));
             else
+#if 0 /*JP*/
                 pline("%s %s %s.", noit_Monnam(mtmp),
                       devour ? "devours" : "eats", distant_name(obj, doname));
+#else
+                pline("%s\82Í%s\82ð%s\82¢\82é\81D", noit_Monnam(mtmp),
+                      distant_name(obj, doname), devour ? "\88ù\82Ý\8d\9e\82ñ\82Å" : "\90H\82×\82Ä");
+#endif
         } else if (seeobj)
+#if 0 /*JP*/
             pline("It %s %s.", devour ? "devours" : "eats",
                   distant_name(obj, doname));
+#else
+            pline("\82»\82ê\82Í%s\82ð%s\82¢\82é\81D", distant_name(obj, doname),
+                  devour ? "\88ù\82Ý\8d\9e\82ñ\82Å" : "\90H\82×\82Ä");
+#endif
     }
     if (obj->unpaid) {
         Strcpy(objnambuf, xname(obj));
@@ -296,8 +314,13 @@ boolean devour;
         obj->oerodeproof = 0;
         mtmp->mstun = 1;
         if (canseemon(mtmp) && flags.verbose) {
+#if 0 /*JP:T*/
             pline("%s spits %s out in disgust!", Monnam(mtmp),
                   distant_name(obj, doname));
+#else
+            pline("%s\82Í%s\82ð\83y\83b\82Æ\93f\82«\8fo\82µ\82½\81I", Monnam(mtmp),
+                  distant_name(obj,doname));
+#endif
         }
     } else if (obj == uball) {
         unpunish();
@@ -365,21 +388,38 @@ register struct edog *edog;
             if (mtmp->mhp < 1)
                 goto dog_died;
             if (cansee(mtmp->mx, mtmp->my))
+/*JP
                 pline("%s is confused from hunger.", Monnam(mtmp));
+*/
+                pline("%s\82Í\8bó\95 \82Ì\82½\82ß\8d¬\97\90\82µ\82Ä\82¢\82é\81D", Monnam(mtmp));
             else if (couldsee(mtmp->mx, mtmp->my))
                 beg(mtmp);
             else
+/*JP
                 You_feel("worried about %s.", y_monnam(mtmp));
+*/
+                You("%s\82ª\90S\94z\82É\82È\82Á\82½\81D", y_monnam(mtmp));
             stop_occupation();
         } else if (monstermoves > edog->hungrytime + 750 || mtmp->mhp < 1) {
         dog_died:
             if (mtmp->mleashed && mtmp != u.usteed)
+/*JP
                 Your("leash goes slack.");
+*/
+                Your("\95R\82Í\82½\82é\82ñ\82¾\81D");
             else if (cansee(mtmp->mx, mtmp->my))
+/*JP
                 pline("%s starves.", Monnam(mtmp));
+*/
+                pline("%s\82Í\8bQ\82¦\82Å\8e\80\82ñ\82¾\81D", Monnam(mtmp));
             else
+#if 0 /*JP*/
                 You_feel("%s for a moment.",
                          Hallucination ? "bummed" : "sad");
+#else
+                You("%s\8bC\95ª\82É\82¨\82»\82í\82ê\82½\81D",
+                    Hallucination ? "\82ª\82Á\82©\82è\82µ\82½" : "\94ß\82µ\82¢");
+#endif
             mondied(mtmp);
             return  TRUE;
         }
@@ -440,8 +480,13 @@ int udist;
                         if (carryamt != obj->quan)
                             otmp = splitobj(obj, carryamt);
                         if (cansee(omx, omy) && flags.verbose)
+#if 0 /*JP:T*/
                             pline("%s picks up %s.", Monnam(mtmp),
                                   distant_name(otmp, doname));
+#else
+                            pline("%s\82Í%s\82ð\8fE\82Á\82½\81D", Monnam(mtmp),
+                                  distant_name(obj, doname));
+#endif
                         obj_extract_self(otmp);
                         newsym(omx, omy);
                         (void) mpickobj(mtmp, otmp);
@@ -701,7 +746,10 @@ register int after; /* this is extra fast monster movement */
     if (!Conflict && !mtmp->mconf
         && mtmp == u.ustuck && !sticks(youmonst.data)) {
         unstuck(mtmp); /* swallowed case handled above */
+/*JP
         You("get released!");
+*/
+        You("\93®\82¯\82é\82æ\82¤\82É\82È\82Á\82½\81I");
     }
 #endif
     if (!nohands(mtmp->data) && !verysmall(mtmp->data)) {
@@ -876,8 +924,13 @@ newdogpos:
 
         if (info[chi] & ALLOW_U) {
             if (mtmp->mleashed) { /* play it safe */
+#if 0 /*JP:T*/
                 pline("%s breaks loose of %s leash!", Monnam(mtmp),
                       mhis(mtmp));
+#else
+                pline("%s\82Í\8e©\95ª\82É\82Â\82¢\82Ä\82¢\82é\95R\82ð\82Í\82¸\82µ\82½\81I",
+                      Monnam(mtmp));
+#endif
                 m_unleash(mtmp, FALSE);
             }
             (void) mattacku(mtmp);
@@ -907,7 +960,10 @@ newdogpos:
         remove_monster(omx, omy);
         place_monster(mtmp, nix, niy);
         if (cursemsg[chi] && (wasseen || canseemon(mtmp)))
+/*JP
             pline("%s moves only reluctantly.", noit_Monnam(mtmp));
+*/
+            pline("%s\82Í\82¢\82â\82¢\82â\93®\82¢\82½\81D", Monnam(mtmp));
         for (j = MTSZ - 1; j > 0; j--)
             mtmp->mtrack[j] = mtmp->mtrack[j - 1];
         mtmp->mtrack[0].x = omx;