Commit: 2a69c22444d8eaa4cce6acbc6cc5d15b194df2c4 - source (git)

patch投げ用

Commit MetaInfo

• Revision: 2a69c22444d8eaa4cce6acbc6cc5d15b194df2c4 (tree)
• Time: 2016-03-29 04:35:42
• Author: SHIRAKATA Kentaro <argrath@ub32...>
• Commiter: SHIRAKATA Kentaro

Log Message

change potion un-id desc

Change Summary

• modified: src/objectsj.c
• modified: src/objnam.c

Incremental Difference

--- 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("能力獲得の薬",     "ルビー色の",  1, 0, 42, 300, CLR_RED),
-POTION("能力回復の薬",     "ピンク色の",  1, 0, 40, 100, CLR_BRIGHT_MAGENTA),
-POTION("混乱の薬",       "オレンジ色の",  1, CONFUSION, 42, 100, CLR_ORANGE),
-POTION("盲目の薬",             "黄色の",  1, BLINDED, 40, 150, CLR_YELLOW),
-POTION("麻痺の薬",     "エメラルド色の",  1, 0, 42, 300, CLR_BRIGHT_GREEN),
-POTION("加速の薬",           "暗緑色の",  1, FAST, 42, 200, CLR_GREEN),
-POTION("浮遊の薬",         "シアン色の",  1, LEVITATION, 42, 200, CLR_CYAN),
-POTION("幻覚の薬",             "水色の",  1, HALLUC, 40, 100, CLR_CYAN),
-POTION("透明の薬",       "明るい青色の",  1, INVIS, 40, 150, CLR_BRIGHT_BLUE),
-POTION("可視の薬",       "マゼンダ色の",  1, SEE_INVIS, 42, 50, CLR_MAGENTA),
-POTION("回復の薬",           "赤紫色の",  1, 0, 57, 100, CLR_MAGENTA),
-POTION("超回復の薬",         "暗褐色の",  1, 0, 47, 100, CLR_RED),
-POTION("レベルアップの薬", "ミルク色の",  1, 0, 20, 300, CLR_WHITE),
-POTION("啓蒙の薬",     "渦を巻いている",  1, 0, 20, 200, CLR_BROWN),
-POTION("怪物を探す薬",   "泡だっている",  1, 0, 40, 150, CLR_WHITE),
-POTION("物体を探す薬",   "煙がでている",  1, 0, 42, 150, CLR_GRAY),
-POTION("魔力の薬",         "曇っている",  1, 0, 42, 150, CLR_WHITE),
-POTION("睡眠の薬",       "沸騰している",  1, 0, 42, 100, CLR_GRAY),
-POTION("完全回復の薬",           "黒い",  1, 0, 10, 200, CLR_BLACK),
-POTION("変化の薬",             "金色の",  1, 0, 10, 200, CLR_YELLOW),
-POTION("酔っぱらいの薬",       "茶色の",  0, 0, 42,  50, CLR_BROWN),
-POTION("病気の薬",       "発泡している",  0, 0, 42,  50, CLR_CYAN),
-POTION("フルーツジュース", "陰気な色の",  0, 0, 42,  50, CLR_BLACK),
-POTION("酸の薬",                 "白い",  0, 0, 10, 250, CLR_WHITE),
-POTION("油",                   "濃黒の",  0, 0, 30, 250, CLR_BROWN),
+POTION("能力獲得の薬",     "ルビー色の薬",  1, 0, 42, 300, CLR_RED),
+POTION("能力回復の薬",     "ピンク色の薬",  1, 0, 40, 100, CLR_BRIGHT_MAGENTA),
+POTION("混乱の薬",       "オレンジ色の薬",  1, CONFUSION, 42, 100, CLR_ORANGE),
+POTION("盲目の薬",             "黄色の薬",  1, BLINDED, 40, 150, CLR_YELLOW),
+POTION("麻痺の薬",     "エメラルド色の薬",  1, 0, 42, 300, CLR_BRIGHT_GREEN),
+POTION("加速の薬",           "暗緑色の薬",  1, FAST, 42, 200, CLR_GREEN),
+POTION("浮遊の薬",         "シアン色の薬",  1, LEVITATION, 42, 200, CLR_CYAN),
+POTION("幻覚の薬",             "水色の薬",  1, HALLUC, 40, 100, CLR_CYAN),
+POTION("透明の薬",       "明るい青色の薬",  1, INVIS, 40, 150, CLR_BRIGHT_BLUE),
+POTION("可視の薬",       "マゼンダ色の薬",  1, SEE_INVIS, 42, 50, CLR_MAGENTA),
+POTION("回復の薬",           "赤紫色の薬",  1, 0, 57, 100, CLR_MAGENTA),
+POTION("超回復の薬",         "暗褐色の薬",  1, 0, 47, 100, CLR_RED),
+POTION("レベルアップの薬", "ミルク色の薬",  1, 0, 20, 300, CLR_WHITE),
+POTION("啓蒙の薬",     "渦を巻いている薬",  1, 0, 20, 200, CLR_BROWN),
+POTION("怪物を探す薬",   "泡だっている薬",  1, 0, 40, 150, CLR_WHITE),
+POTION("物体を探す薬",   "煙がでている薬",  1, 0, 42, 150, CLR_GRAY),
+POTION("魔力の薬",         "曇っている薬",  1, 0, 42, 150, CLR_WHITE),
+POTION("睡眠の薬",       "沸騰している薬",  1, 0, 42, 100, CLR_GRAY),
+POTION("完全回復の薬",           "黒い薬",  1, 0, 10, 200, CLR_BLACK),
+POTION("変化の薬",             "金色の薬",  1, 0, 10, 200, CLR_YELLOW),
+POTION("酔っぱらいの薬",       "茶色の薬",  0, 0, 42,  50, CLR_BROWN),
+POTION("病気の薬",       "発泡している薬",  0, 0, 42,  50, CLR_CYAN),
+POTION("フルーツジュース", "陰気な色の薬",  0, 0, 42,  50, CLR_BLACK),
+POTION("酸の薬",                 "白い薬",  0, 0, 10, 250, CLR_WHITE),
+POTION("油",                   "濃黒の薬",  0, 0, 30, 250, CLR_BROWN),
 /* fixed description
  */
-POTION("水",                   "無色の",  0, 0, 92, 100, CLR_CYAN),
+POTION("水",                   "無色の薬",  0, 0, 92, 100, CLR_CYAN),
 #undef POTION
 
 /* scrolls ... */

--- 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 ? "薬" : "");
+        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*//*不確定名に「薬」は付いている*/
             Strcat(buf, " potion");
-*/
-            Strcat(buf, "薬");
+#endif
         }
         break;
     case SCROLL_CLASS: