From de0c0a9beb2cca0a43e21971386491d783394f46 Mon Sep 17 00:00:00 2001 From: dis- Date: Thu, 6 Jun 2013 13:44:25 +0000 Subject: [PATCH] Add description of can_swim/can_fly/aquatic --- src/monster1.c | 154 +++++++++++---------------------------------------------- 1 file changed, 29 insertions(+), 125 deletions(-) diff --git a/src/monster1.c b/src/monster1.c index 8f6b543e4..3af39c644 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -1702,77 +1702,25 @@ if (flags6 & (RF6_S_UNIQUE)) {vp[vn] = " /* Collect special abilities. */ vn = 0; -#ifdef JP - if (flags7 & (RF7_HAS_LITE_1 | RF7_HAS_LITE_2)) { vp[vn] = "¥À¥ó¥¸¥ç¥ó¤ò¾È¤é¤¹"; color[vn++] = TERM_WHITE; } -#else - if (flags7 & (RF7_HAS_LITE_1 | RF7_HAS_LITE_2)) { vp[vn] = "illuminate the dungeon"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags7 & (RF7_HAS_DARK_1 | RF7_HAS_DARK_2)) { vp[vn] = "¥À¥ó¥¸¥ç¥ó¤ò°Å¤¯¤¹¤ë"; color[vn++] = TERM_L_DARK; } -#else - if (flags7 & (RF7_HAS_DARK_1 | RF7_HAS_DARK_2)) { vp[vn] = "darken the dungeon"; color[vn++] = TERM_L_DARK; } -#endif - -#ifdef JP - if (flags2 & RF2_OPEN_DOOR) { vp[vn] = "¥É¥¢¤ò³«¤±¤ë"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_OPEN_DOOR) { vp[vn] = "open doors"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_BASH_DOOR) { vp[vn] = "¥É¥¢¤òÂǤÁÇˤë"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_BASH_DOOR) { vp[vn] = "bash down doors"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_PASS_WALL) { vp[vn] = "Êɤò¤¹¤êÈ´¤±¤ë"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_PASS_WALL) { vp[vn] = "pass through walls"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_KILL_WALL) { vp[vn] = "Êɤò·¡¤ê¿Ê¤à"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_KILL_WALL) { vp[vn] = "bore through walls"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_MOVE_BODY) { vp[vn] = "¼å¤¤¥â¥ó¥¹¥¿¡¼¤ò²¡¤·¤Î¤±¤ë"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_MOVE_BODY) { vp[vn] = "push past weaker monsters"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_KILL_BODY) { vp[vn] = "¼å¤¤¥â¥ó¥¹¥¿¡¼¤òÅݤ¹"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_KILL_BODY) { vp[vn] = "destroy weaker monsters"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_TAKE_ITEM) { vp[vn] = "¥¢¥¤¥Æ¥à¤ò½¦¤¦"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_TAKE_ITEM) { vp[vn] = "pick up objects"; color[vn++] = TERM_WHITE; } -#endif - -#ifdef JP - if (flags2 & RF2_KILL_ITEM) { vp[vn] = "¥¢¥¤¥Æ¥à¤ò²õ¤¹"; color[vn++] = TERM_WHITE; } -#else - if (flags2 & RF2_KILL_ITEM) { vp[vn] = "destroy objects"; color[vn++] = TERM_WHITE; } -#endif + if (flags7 & (RF7_HAS_LITE_1 | RF7_HAS_LITE_2)) { vp[vn] = _("¥À¥ó¥¸¥ç¥ó¤ò¾È¤é¤¹", "illuminate the dungeon"); color[vn++] = TERM_WHITE; } + if (flags7 & (RF7_HAS_DARK_1 | RF7_HAS_DARK_2)) { vp[vn] = _("¥À¥ó¥¸¥ç¥ó¤ò°Å¤¯¤¹¤ë", "darken the dungeon"); color[vn++] = TERM_L_DARK; } + if (flags2 & RF2_OPEN_DOOR) { vp[vn] = _("¥É¥¢¤ò³«¤±¤ë", "open doors"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_BASH_DOOR) { vp[vn] = _("¥É¥¢¤òÂǤÁÇˤë", "bash down doors"); color[vn++] = TERM_WHITE; } + if (flags7 & RF7_CAN_FLY) { vp[vn] = _("¶õ¤òÈô¤Ö", "fly"); color[vn++] = TERM_WHITE; } + if (flags7 & RF7_CAN_SWIM) { vp[vn] = _("¿å¤òÅϤë", "swim"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_PASS_WALL) { vp[vn] = _("Êɤò¤¹¤êÈ´¤±¤ë", "pass through walls"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_KILL_WALL) { vp[vn] = _("Êɤò·¡¤ê¿Ê¤à", "bore through walls"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_MOVE_BODY) { vp[vn] = _("¼å¤¤¥â¥ó¥¹¥¿¡¼¤ò²¡¤·¤Î¤±¤ë", "push past weaker monsters"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_KILL_BODY) { vp[vn] = _("¼å¤¤¥â¥ó¥¹¥¿¡¼¤òÅݤ¹", "destroy weaker monsters"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_TAKE_ITEM) { vp[vn] = _("¥¢¥¤¥Æ¥à¤ò½¦¤¦", "pick up objects"); color[vn++] = TERM_WHITE; } + if (flags2 & RF2_KILL_ITEM) { vp[vn] = _("¥¢¥¤¥Æ¥à¤ò²õ¤¹", "destroy objects"); color[vn++] = TERM_WHITE; } /* Describe special abilities. */ if (vn) { /* Intro */ -#ifdef JP - hooked_roff(format("%^s¤Ï", wd_he[msex])); -#else - hooked_roff(format("%^s", wd_he[msex])); -#endif - + hooked_roff(format(_("%^s¤Ï", "%^s"), wd_he[msex])); /* Scan */ for (n = 0; n < vn; n++) @@ -1798,96 +1746,52 @@ if (flags6 & (RF6_S_UNIQUE)) {vp[vn] = " } /* End */ -#ifdef JP - hooked_roff("¤³¤È¤¬¤Ç¤­¤ë¡£"); -#else - hooked_roff(". "); -#endif + hooked_roff(_("¤³¤È¤¬¤Ç¤­¤ë¡£", ". ")); } - + + /* Aquatic */ + if (flags7 & RF7_AQUATIC) + { + hooked_roff(format(_("%^s¤Ï¿åÃæ¤ËÀ³¤ó¤Ç¤¤¤ë¡£", "%^s lives in water. "), wd_he[msex])); + } /* Describe special abilities. */ if (flags7 & (RF7_SELF_LITE_1 | RF7_SELF_LITE_2)) { -#ifdef JP - hooked_roff(format("%^s¤Ï¸÷¤Ã¤Æ¤¤¤ë¡£", wd_he[msex])); -#else - hooked_roff(format("%^s is shining. ", wd_he[msex])); -#endif - + hooked_roff(format(_("%^s¤Ï¸÷¤Ã¤Æ¤¤¤ë¡£", "%^s is shining. "), wd_he[msex])); } if (flags7 & (RF7_SELF_DARK_1 | RF7_SELF_DARK_2)) { -#ifdef JP - hook_c_roff(TERM_L_DARK, format("%^s¤Ï°Å¹õ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", wd_he[msex])); -#else - hook_c_roff(TERM_L_DARK, format("%^s is surrounded by darkness. ", wd_he[msex])); -#endif - + hook_c_roff(TERM_L_DARK, format(_("%^s¤Ï°Å¹õ¤ËÊñ¤Þ¤ì¤Æ¤¤¤ë¡£", "%^s is surrounded by darkness. "), wd_he[msex])); } if (flags2 & RF2_INVISIBLE) { -#ifdef JP - hooked_roff(format("%^s¤ÏÆ©ÌÀ¤ÇÌܤ˸«¤¨¤Ê¤¤¡£", wd_he[msex])); -#else - hooked_roff(format("%^s is invisible. ", wd_he[msex])); -#endif - + hooked_roff(format(_("%^s¤ÏÆ©ÌÀ¤ÇÌܤ˸«¤¨¤Ê¤¤¡£", "%^s is invisible. "), wd_he[msex])); } if (flags2 & RF2_COLD_BLOOD) { -#ifdef JP - hooked_roff(format("%^s¤ÏÎä·ìưʪ¤Ç¤¢¤ë¡£", wd_he[msex])); -#else - hooked_roff(format("%^s is cold blooded. ", wd_he[msex])); -#endif - + hooked_roff(format(_("%^s¤ÏÎä·ìưʪ¤Ç¤¢¤ë¡£", "%^s is cold blooded. "), wd_he[msex])); } if (flags2 & RF2_EMPTY_MIND) { -#ifdef JP - hooked_roff(format("%^s¤Ï¥Æ¥ì¥Ñ¥·¡¼¤Ç¤Ï´¶ÃΤǤ­¤Ê¤¤¡£", wd_he[msex])); -#else - hooked_roff(format("%^s is not detected by telepathy. ", wd_he[msex])); -#endif - + hooked_roff(format(_("%^s¤Ï¥Æ¥ì¥Ñ¥·¡¼¤Ç¤Ï´¶ÃΤǤ­¤Ê¤¤¡£", "%^s is not detected by telepathy. "), wd_he[msex])); } else if (flags2 & RF2_WEIRD_MIND) { -#ifdef JP - hooked_roff(format("%^s¤Ï¤Þ¤ì¤Ë¥Æ¥ì¥Ñ¥·¡¼¤Ç´¶ÃΤǤ­¤ë¡£", wd_he[msex])); -#else - hooked_roff(format("%^s is rarely detected by telepathy. ", wd_he[msex])); -#endif - + hooked_roff(format(_("%^s¤Ï¤Þ¤ì¤Ë¥Æ¥ì¥Ñ¥·¡¼¤Ç´¶ÃΤǤ­¤ë¡£", "%^s is rarely detected by telepathy. "), wd_he[msex])); } if (flags2 & RF2_MULTIPLY) { -#ifdef JP - hook_c_roff(TERM_L_UMBER, format("%^s¤ÏÇúȯŪ¤ËÁý¿£¤¹¤ë¡£", wd_he[msex])); -#else - hook_c_roff(TERM_L_UMBER, format("%^s breeds explosively. ", wd_he[msex])); -#endif - + hook_c_roff(TERM_L_UMBER, format(_("%^s¤ÏÇúȯŪ¤ËÁý¿£¤¹¤ë¡£", "%^s breeds explosively. "), wd_he[msex])); } if (flags2 & RF2_REGENERATE) { -#ifdef JP - hook_c_roff(TERM_L_WHITE, format("%^s¤ÏÁÇÁ᤯ÂÎÎϤò²óÉü¤¹¤ë¡£", wd_he[msex])); -#else - hook_c_roff(TERM_L_WHITE, format("%^s regenerates quickly. ", wd_he[msex])); -#endif - + hook_c_roff(TERM_L_WHITE, format(_("%^s¤ÏÁÇÁ᤯ÂÎÎϤò²óÉü¤¹¤ë¡£", "%^s regenerates quickly. "), wd_he[msex])); } if (flags7 & RF7_RIDING) { -#ifdef JP - hook_c_roff(TERM_SLATE, format("%^s¤Ë¾è¤ë¤³¤È¤¬¤Ç¤­¤ë¡£", wd_he[msex])); -#else - hook_c_roff(TERM_SLATE, format("%^s is suitable for riding. ", wd_he[msex])); -#endif - + hook_c_roff(TERM_SLATE, format(_("%^s¤Ë¾è¤ë¤³¤È¤¬¤Ç¤­¤ë¡£", "%^s is suitable for riding. "), wd_he[msex])); } -- 2.11.0