• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonbathyscaphephpgamewindowsguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

patch投げ用


Commit MetaInfo

Revision2a69c22444d8eaa4cce6acbc6cc5d15b194df2c4 (tree)
Zeit2016-03-29 04:35:42
AutorSHIRAKATA Kentaro <argrath@ub32...>
CommiterSHIRAKATA Kentaro

Log Message

change potion un-id desc

Ändern Zusammenfassung

Diff

--- a/src/objectsj.c
+++ b/src/objectsj.c
@@ -790,34 +790,34 @@ FOOD("
790790 OBJECT(OBJ(name, desc), \
791791 BITS(0, 1, 0, 0, mgc, 0, 0, 0, 0, 0, 0, P_NONE, GLASS), \
792792 power, POTION_CLASS, prob, 0, 20, cost, 0, 0, 0, 0, 10, color)
793-POTION("能力獲得の薬", "ルビー色の", 1, 0, 42, 300, CLR_RED),
794-POTION("能力回復の薬", "ピンク色の", 1, 0, 40, 100, CLR_BRIGHT_MAGENTA),
795-POTION("混乱の薬", "オレンジ色の", 1, CONFUSION, 42, 100, CLR_ORANGE),
796-POTION("盲目の薬", "黄色の", 1, BLINDED, 40, 150, CLR_YELLOW),
797-POTION("麻痺の薬", "エメラルド色の", 1, 0, 42, 300, CLR_BRIGHT_GREEN),
798-POTION("加速の薬", "暗緑色の", 1, FAST, 42, 200, CLR_GREEN),
799-POTION("浮遊の薬", "シアン色の", 1, LEVITATION, 42, 200, CLR_CYAN),
800-POTION("幻覚の薬", "水色の", 1, HALLUC, 40, 100, CLR_CYAN),
801-POTION("透明の薬", "明るい青色の", 1, INVIS, 40, 150, CLR_BRIGHT_BLUE),
802-POTION("可視の薬", "マゼンダ色の", 1, SEE_INVIS, 42, 50, CLR_MAGENTA),
803-POTION("回復の薬", "赤紫色の", 1, 0, 57, 100, CLR_MAGENTA),
804-POTION("超回復の薬", "暗褐色の", 1, 0, 47, 100, CLR_RED),
805-POTION("レベルアップの薬", "ミルク色の", 1, 0, 20, 300, CLR_WHITE),
806-POTION("啓蒙の薬", "渦を巻いている", 1, 0, 20, 200, CLR_BROWN),
807-POTION("怪物を探す薬", "泡だっている", 1, 0, 40, 150, CLR_WHITE),
808-POTION("物体を探す薬", "煙がでている", 1, 0, 42, 150, CLR_GRAY),
809-POTION("魔力の薬", "曇っている", 1, 0, 42, 150, CLR_WHITE),
810-POTION("睡眠の薬", "沸騰している", 1, 0, 42, 100, CLR_GRAY),
811-POTION("完全回復の薬", "黒い", 1, 0, 10, 200, CLR_BLACK),
812-POTION("変化の薬", "金色の", 1, 0, 10, 200, CLR_YELLOW),
813-POTION("酔っぱらいの薬", "茶色の", 0, 0, 42, 50, CLR_BROWN),
814-POTION("病気の薬", "発泡している", 0, 0, 42, 50, CLR_CYAN),
815-POTION("フルーツジュース", "陰気な色の", 0, 0, 42, 50, CLR_BLACK),
816-POTION("酸の薬", "白い", 0, 0, 10, 250, CLR_WHITE),
817-POTION("油", "濃黒の", 0, 0, 30, 250, CLR_BROWN),
793+POTION("能力獲得の薬", "ルビー色の薬", 1, 0, 42, 300, CLR_RED),
794+POTION("能力回復の薬", "ピンク色の薬", 1, 0, 40, 100, CLR_BRIGHT_MAGENTA),
795+POTION("混乱の薬", "オレンジ色の薬", 1, CONFUSION, 42, 100, CLR_ORANGE),
796+POTION("盲目の薬", "黄色の薬", 1, BLINDED, 40, 150, CLR_YELLOW),
797+POTION("麻痺の薬", "エメラルド色の薬", 1, 0, 42, 300, CLR_BRIGHT_GREEN),
798+POTION("加速の薬", "暗緑色の薬", 1, FAST, 42, 200, CLR_GREEN),
799+POTION("浮遊の薬", "シアン色の薬", 1, LEVITATION, 42, 200, CLR_CYAN),
800+POTION("幻覚の薬", "水色の薬", 1, HALLUC, 40, 100, CLR_CYAN),
801+POTION("透明の薬", "明るい青色の薬", 1, INVIS, 40, 150, CLR_BRIGHT_BLUE),
802+POTION("可視の薬", "マゼンダ色の薬", 1, SEE_INVIS, 42, 50, CLR_MAGENTA),
803+POTION("回復の薬", "赤紫色の薬", 1, 0, 57, 100, CLR_MAGENTA),
804+POTION("超回復の薬", "暗褐色の薬", 1, 0, 47, 100, CLR_RED),
805+POTION("レベルアップの薬", "ミルク色の薬", 1, 0, 20, 300, CLR_WHITE),
806+POTION("啓蒙の薬", "渦を巻いている薬", 1, 0, 20, 200, CLR_BROWN),
807+POTION("怪物を探す薬", "泡だっている薬", 1, 0, 40, 150, CLR_WHITE),
808+POTION("物体を探す薬", "煙がでている薬", 1, 0, 42, 150, CLR_GRAY),
809+POTION("魔力の薬", "曇っている薬", 1, 0, 42, 150, CLR_WHITE),
810+POTION("睡眠の薬", "沸騰している薬", 1, 0, 42, 100, CLR_GRAY),
811+POTION("完全回復の薬", "黒い薬", 1, 0, 10, 200, CLR_BLACK),
812+POTION("変化の薬", "金色の薬", 1, 0, 10, 200, CLR_YELLOW),
813+POTION("酔っぱらいの薬", "茶色の薬", 0, 0, 42, 50, CLR_BROWN),
814+POTION("病気の薬", "発泡している薬", 0, 0, 42, 50, CLR_CYAN),
815+POTION("フルーツジュース", "陰気な色の薬", 0, 0, 42, 50, CLR_BLACK),
816+POTION("酸の薬", "白い薬", 0, 0, 10, 250, CLR_WHITE),
817+POTION("油", "濃黒の薬", 0, 0, 30, 250, CLR_BROWN),
818818 /* fixed description
819819 */
820-POTION("水", "無色の", 0, 0, 92, 100, CLR_CYAN),
820+POTION("水", "無色の薬", 0, 0, 92, 100, CLR_CYAN),
821821 #undef POTION
822822
823823 /* scrolls ... */
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -240,8 +240,7 @@ register int otyp;
240240 #if 0 /*JP*/
241241 Sprintf(eos(buf), " (%s)", dn);
242242 #else
243- Sprintf(eos(buf), "(%s%s)", dn,
244- ocl->oc_class == POTION_CLASS ? "薬" : "");
243+ Sprintf(eos(buf), "(%s)", dn);
245244 #endif
246245 return buf;
247246 }
@@ -671,10 +670,9 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */
671670 }
672671 } else {
673672 Strcat(buf, dn);
674-/*JP
673+#if 0 /*JP*//*不確定名に「薬」は付いている*/
675674 Strcat(buf, " potion");
676-*/
677- Strcat(buf, "薬");
675+#endif
678676 }
679677 break;
680678 case SCROLL_CLASS: