patch src/

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

diff --git a/src/mondata.c b/src/mondata.c
index 9fb2491..f437297 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.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"
 
 /*      These routines provide basic data for any type of monster. */
@@ -1015,13 +1020,34 @@ struct monst *mtmp;
         return mtmp->data;
 }
 
+/*JP
 static const char *levitate[4] = { "float", "Float", "wobble", "Wobble" };
+*/
+static const char *levitate[4] = { "\95\82\82­", "\95\82\82­", "\82æ\82ë\82ß\82­", "\82æ\82ë\82ß\82­" };
+/*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­" };
+/*JP
 static const char *flyl[4] = { "fly", "Fly", "stagger", "Stagger" };
+*/
+static const char *flyl[4] = { "\94ò\82Ô", "\94ò\82Ô", "\82æ\82ë\82ß\82­", "\82æ\82ë\82ß\82­" };
+/*JP
 static const char *slither[4] = { "slither", "Slither", "falter", "Falter" };
+*/
+static const char *slither[4] = { "\8a\8a\82é", "\8a\8a\82é", "\82½\82¶\82ë\82®", "\82½\82¶\82ë\82®" };
+/*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é" };
+/*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é" };
+/*JP
 static const char *crawl[4] = { "crawl", "Crawl", "falter", "Falter" };
+*/
+static const char *crawl[4] = { "\82Í\82¢\82¸\82é", "\82Í\82¢\82¸\82é", "\82½\82¶\82ë\82®", "\82½\82¶\82ë\82®" };
 
 const char *
 locomotion(ptr, def)
@@ -1056,6 +1082,28 @@ const char *def;
                       : nolimbs(ptr) ? crawl[capitalize]
                         : def);
 }
+#if 1 /*JP*/
+static const char *levitate2 = "\95\82\82«\8fo\82½";
+static const char *fly2 = "\94ò\82Ñ\8fo\82½";
+static const char *slither2 = "\8a\8a\82è\8fo\82½";
+static const char *ooze2 = "\82É\82¶\82Ý\8fo\82½";
+static const char *crawl2 = "\82Í\82¢\82¸\82è\8fo\82½";
+
+const char *
+jumpedthrough(ptr, def)
+const struct permonst *ptr;
+const char *def;
+{
+        return (
+            is_floater(ptr) ? levitate2 :
+            is_flyer(ptr)   ? fly2 :
+            slithy(ptr)     ? slither2 :
+            amorphous(ptr)  ? ooze2 :
+            nolimbs(ptr)    ? crawl2 :
+            def
+            );
+}
+#endif
 
 /* return phrase describing the effect of fire attack on a type of monster */
 const char *
@@ -1070,16 +1118,25 @@ struct attack *mattk;
     case PM_FIRE_VORTEX:
     case PM_FIRE_ELEMENTAL:
     case PM_SALAMANDER:
+/*JP
         what = "already on fire";
+*/
+        what = "\82·\82Å\82É\89\8a\82É\82Â\82Â\82Ü\82ê\82Ä\82¢\82é";
         break;
     case PM_WATER_ELEMENTAL:
     case PM_FOG_CLOUD:
     case PM_STEAM_VORTEX:
+/*JP
         what = "boiling";
+*/
+        what = "\95¦\93«\82µ\82½";
         break;
     case PM_ICE_VORTEX:
     case PM_GLASS_GOLEM:
+/*JP
         what = "melting";
+*/
+        what = "\97n\82¯\82½";
         break;
     case PM_STONE_GOLEM:
     case PM_CLAY_GOLEM:
@@ -1088,10 +1145,16 @@ struct attack *mattk;
     case PM_EARTH_ELEMENTAL:
     case PM_DUST_VORTEX:
     case PM_ENERGY_VORTEX:
+/*JP
         what = "heating up";
+*/
+        what = "\94M\82­\82È\82Á\82½";
         break;
     default:
+/*JP
         what = (mattk->aatyp == AT_HUGS) ? "being roasted" : "on fire";
+*/
+        what = (mattk->aatyp == AT_HUGS) ? "\8aÛ\8fÄ\82¯\82É\82È\82Á\82½" : "\89Î\82¾\82é\82Ü\82É\82È\82Á\82½";
         break;
     }
     return what;