change potion un-id desc

diff --git a/src/objectsj.c b/src/objectsj.c
index 760427f..0446ec2 100644 (file)
--- a/src/objectsj.c
+++ b/src/objectsj.c
@@ -790,34 +790,34 @@ FOOD("
     OBJECT(OBJ(name, desc),                                             \
            BITS(0, 1, 0, 0, mgc, 0, 0, 0, 0, 0, 0, P_NONE, GLASS),      \
            power, POTION_CLASS, prob, 0, 20, cost, 0, 0, 0, 0, 10, color)
-POTION("\94\\97Í\8al\93¾\82Ì\96ò",     "\83\8b\83r\81[\90F\82Ì",  1, 0, 42, 300, CLR_RED),
-POTION("\94\\97Í\89ñ\95\9c\82Ì\96ò",     "\83s\83\93\83N\90F\82Ì",  1, 0, 40, 100, CLR_BRIGHT_MAGENTA),
-POTION("\8d¬\97\90\82Ì\96ò",       "\83I\83\8c\83\93\83W\90F\82Ì",  1, CONFUSION, 42, 100, CLR_ORANGE),
-POTION("\96Ó\96Ú\82Ì\96ò",             "\89©\90F\82Ì",  1, BLINDED, 40, 150, CLR_YELLOW),
-POTION("\96\83á\83\82Ì\96ò",     "\83G\83\81\83\89\83\8b\83h\90F\82Ì",  1, 0, 42, 300, CLR_BRIGHT_GREEN),
-POTION("\89Á\91¬\82Ì\96ò",           "\88Ã\97Î\90F\82Ì",  1, FAST, 42, 200, CLR_GREEN),
-POTION("\95\82\97V\82Ì\96ò",         "\83V\83A\83\93\90F\82Ì",  1, LEVITATION, 42, 200, CLR_CYAN),
-POTION("\8c¶\8ao\82Ì\96ò",             "\90\85\90F\82Ì",  1, HALLUC, 40, 100, CLR_CYAN),
-POTION("\93§\96¾\82Ì\96ò",       "\96¾\82é\82¢\90Â\90F\82Ì",  1, INVIS, 40, 150, CLR_BRIGHT_BLUE),
-POTION("\89Â\8e\8b\82Ì\96ò",       "\83}\83[\83\93\83_\90F\82Ì",  1, SEE_INVIS, 42, 50, CLR_MAGENTA),
-POTION("\89ñ\95\9c\82Ì\96ò",           "\90Ô\8e\87\90F\82Ì",  1, 0, 57, 100, CLR_MAGENTA),
-POTION("\92´\89ñ\95\9c\82Ì\96ò",         "\88Ã\8a\8c\90F\82Ì",  1, 0, 47, 100, CLR_RED),
-POTION("\83\8c\83x\83\8b\83A\83b\83v\82Ì\96ò", "\83~\83\8b\83N\90F\82Ì",  1, 0, 20, 300, CLR_WHITE),
-POTION("\8c[\96Ö\82Ì\96ò",     "\89Q\82ð\8aª\82¢\82Ä\82¢\82é",  1, 0, 20, 200, CLR_BROWN),
-POTION("\89ö\95¨\82ð\92T\82·\96ò",   "\96A\82¾\82Á\82Ä\82¢\82é",  1, 0, 40, 150, CLR_WHITE),
-POTION("\95¨\91Ì\82ð\92T\82·\96ò",   "\89\8c\82ª\82Å\82Ä\82¢\82é",  1, 0, 42, 150, CLR_GRAY),
-POTION("\96\82\97Í\82Ì\96ò",         "\93Ü\82Á\82Ä\82¢\82é",  1, 0, 42, 150, CLR_WHITE),
-POTION("\90\87\96°\82Ì\96ò",       "\95¦\93«\82µ\82Ä\82¢\82é",  1, 0, 42, 100, CLR_GRAY),
-POTION("\8a®\91S\89ñ\95\9c\82Ì\96ò",           "\8d\95\82¢",  1, 0, 10, 200, CLR_BLACK),
-POTION("\95Ï\89»\82Ì\96ò",             "\8bà\90F\82Ì",  1, 0, 10, 200, CLR_YELLOW),
-POTION("\90\8c\82Á\82Ï\82ç\82¢\82Ì\96ò",       "\92\83\90F\82Ì",  0, 0, 42,  50, CLR_BROWN),
-POTION("\95a\8bC\82Ì\96ò",       "\94­\96A\82µ\82Ä\82¢\82é",  0, 0, 42,  50, CLR_CYAN),
-POTION("\83t\83\8b\81[\83c\83W\83\85\81[\83X", "\89A\8bC\82È\90F\82Ì",  0, 0, 42,  50, CLR_BLACK),
-POTION("\8e_\82Ì\96ò",                 "\94\92\82¢",  0, 0, 10, 250, CLR_WHITE),
-POTION("\96û",                   "\94Z\8d\95\82Ì",  0, 0, 30, 250, CLR_BROWN),
+POTION("\94\\97Í\8al\93¾\82Ì\96ò",     "\83\8b\83r\81[\90F\82Ì\96ò",  1, 0, 42, 300, CLR_RED),
+POTION("\94\\97Í\89ñ\95\9c\82Ì\96ò",     "\83s\83\93\83N\90F\82Ì\96ò",  1, 0, 40, 100, CLR_BRIGHT_MAGENTA),
+POTION("\8d¬\97\90\82Ì\96ò",       "\83I\83\8c\83\93\83W\90F\82Ì\96ò",  1, CONFUSION, 42, 100, CLR_ORANGE),
+POTION("\96Ó\96Ú\82Ì\96ò",             "\89©\90F\82Ì\96ò",  1, BLINDED, 40, 150, CLR_YELLOW),
+POTION("\96\83á\83\82Ì\96ò",     "\83G\83\81\83\89\83\8b\83h\90F\82Ì\96ò",  1, 0, 42, 300, CLR_BRIGHT_GREEN),
+POTION("\89Á\91¬\82Ì\96ò",           "\88Ã\97Î\90F\82Ì\96ò",  1, FAST, 42, 200, CLR_GREEN),
+POTION("\95\82\97V\82Ì\96ò",         "\83V\83A\83\93\90F\82Ì\96ò",  1, LEVITATION, 42, 200, CLR_CYAN),
+POTION("\8c¶\8ao\82Ì\96ò",             "\90\85\90F\82Ì\96ò",  1, HALLUC, 40, 100, CLR_CYAN),
+POTION("\93§\96¾\82Ì\96ò",       "\96¾\82é\82¢\90Â\90F\82Ì\96ò",  1, INVIS, 40, 150, CLR_BRIGHT_BLUE),
+POTION("\89Â\8e\8b\82Ì\96ò",       "\83}\83[\83\93\83_\90F\82Ì\96ò",  1, SEE_INVIS, 42, 50, CLR_MAGENTA),
+POTION("\89ñ\95\9c\82Ì\96ò",           "\90Ô\8e\87\90F\82Ì\96ò",  1, 0, 57, 100, CLR_MAGENTA),
+POTION("\92´\89ñ\95\9c\82Ì\96ò",         "\88Ã\8a\8c\90F\82Ì\96ò",  1, 0, 47, 100, CLR_RED),
+POTION("\83\8c\83x\83\8b\83A\83b\83v\82Ì\96ò", "\83~\83\8b\83N\90F\82Ì\96ò",  1, 0, 20, 300, CLR_WHITE),
+POTION("\8c[\96Ö\82Ì\96ò",     "\89Q\82ð\8aª\82¢\82Ä\82¢\82é\96ò",  1, 0, 20, 200, CLR_BROWN),
+POTION("\89ö\95¨\82ð\92T\82·\96ò",   "\96A\82¾\82Á\82Ä\82¢\82é\96ò",  1, 0, 40, 150, CLR_WHITE),
+POTION("\95¨\91Ì\82ð\92T\82·\96ò",   "\89\8c\82ª\82Å\82Ä\82¢\82é\96ò",  1, 0, 42, 150, CLR_GRAY),
+POTION("\96\82\97Í\82Ì\96ò",         "\93Ü\82Á\82Ä\82¢\82é\96ò",  1, 0, 42, 150, CLR_WHITE),
+POTION("\90\87\96°\82Ì\96ò",       "\95¦\93«\82µ\82Ä\82¢\82é\96ò",  1, 0, 42, 100, CLR_GRAY),
+POTION("\8a®\91S\89ñ\95\9c\82Ì\96ò",           "\8d\95\82¢\96ò",  1, 0, 10, 200, CLR_BLACK),
+POTION("\95Ï\89»\82Ì\96ò",             "\8bà\90F\82Ì\96ò",  1, 0, 10, 200, CLR_YELLOW),
+POTION("\90\8c\82Á\82Ï\82ç\82¢\82Ì\96ò",       "\92\83\90F\82Ì\96ò",  0, 0, 42,  50, CLR_BROWN),
+POTION("\95a\8bC\82Ì\96ò",       "\94­\96A\82µ\82Ä\82¢\82é\96ò",  0, 0, 42,  50, CLR_CYAN),
+POTION("\83t\83\8b\81[\83c\83W\83\85\81[\83X", "\89A\8bC\82È\90F\82Ì\96ò",  0, 0, 42,  50, CLR_BLACK),
+POTION("\8e_\82Ì\96ò",                 "\94\92\82¢\96ò",  0, 0, 10, 250, CLR_WHITE),
+POTION("\96û",                   "\94Z\8d\95\82Ì\96ò",  0, 0, 30, 250, CLR_BROWN),
 /* fixed description
  */
-POTION("\90\85",                   "\96³\90F\82Ì",  0, 0, 92, 100, CLR_CYAN),
+POTION("\90\85",                   "\96³\90F\82Ì\96ò",  0, 0, 92, 100, CLR_CYAN),
 #undef POTION
 
 /* scrolls ... */

diff --git a/src/objnam.c b/src/objnam.c
index bd32b66..bea03b8 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -240,8 +240,7 @@ register int otyp;
 #if 0 /*JP*/
         Sprintf(eos(buf), " (%s)", dn);
 #else
-        Sprintf(eos(buf), "(%s%s)", dn,
-            ocl->oc_class == POTION_CLASS ? "\96ò" : "");
+        Sprintf(eos(buf), "(%s)", dn);
 #endif
     return buf;
 }
@@ -671,10 +670,9 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
             }
         } else {
             Strcat(buf, dn);
-/*JP
+#if 0 /*JP*//*\95s\8am\92è\96¼\82É\81u\96ò\81v\82Í\95t\82¢\82Ä\82¢\82é*/
             Strcat(buf, " potion");
-*/
-            Strcat(buf, "\96ò");
+#endif
         }
         break;
     case SCROLL_CLASS: