From 786c389a6002ad177f57a0b0bdd61b3d110730ea Mon Sep 17 00:00:00 2001 From: nothere Date: Thu, 29 May 2003 23:14:50 +0000 Subject: [PATCH] =?utf8?q?=E5=B9=BB=E8=A6=9A=E6=99=82=E3=81=AE=E3=83=A2?= =?utf8?q?=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC=E5=90=8C=E5=A3=AB=E3=81=AE?= =?utf8?q?=E6=AE=B4=E3=82=8A=E5=90=88=E3=81=84=E3=81=A8,=20=E8=8B=B1?= =?utf8?q?=E8=AA=9E=E7=89=88=E3=81=AE=E5=B9=BB=E8=A6=9A=E6=99=82=E3=81=AE?= =?utf8?q?=E6=96=87=E7=AB=A0=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=8B?= =?utf8?q?=E3=81=A3=20=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 3 ++ src/melee1.c | 2 +- src/melee2.c | 12 +++--- src/tables.c | 133 +++++++++++++++++++++++++++++++++++++++------------------- 4 files changed, 100 insertions(+), 50 deletions(-) diff --git a/src/externs.h b/src/externs.h index c99d310cd..942374efd 100644 --- a/src/externs.h +++ b/src/externs.h @@ -109,6 +109,9 @@ extern kamae kata_shurui[MAX_KATA]; extern cptr exp_level_str[5]; extern byte conv_terrain2feat[MAX_WILDERNESS]; extern cptr silly_attacks[MAX_SILLY_ATTACK]; +#ifdef JP +extern cptr silly_attacks2[MAX_SILLY_ATTACK]; +#endif extern monster_power monster_powers[MAX_MONSPELLS]; extern cptr ident_info[]; extern mbe_info_type mbe_info[]; diff --git a/src/melee1.c b/src/melee1.c index 8d830703f..e8edfb531 100644 --- a/src/melee1.c +++ b/src/melee1.c @@ -685,7 +685,7 @@ bool make_attack_normal(int m_idx) msg_format("%^s%s", m_name, act); abbreviate = 1;/*£²²óÌܰʹߤϾÊά */ #else - msg_format("%^s %s", m_name, act); + msg_format("%^s %s%s", m_name, act, do_silly_attack ? " you." : ""); #endif } diff --git a/src/melee2.c b/src/melee2.c index 2a3406776..b2866d713 100644 --- a/src/melee2.c +++ b/src/melee2.c @@ -1836,17 +1836,19 @@ act = "%s /* Message */ if (act && see_either) { +#ifdef JP + if (do_silly_attack) act = silly_attacks2[randint0(MAX_SILLY_ATTACK)]; + strfmt(temp, act, t_name); + msg_format("%^s¤Ï%s", m_name, temp); +#else if (do_silly_attack) { act = silly_attacks[randint0(MAX_SILLY_ATTACK)]; + strfmt(temp, "%s %s.", act, t_name); } - strfmt(temp, act, t_name); -#ifdef JP - msg_format("%^s¤Ï%s", m_name, temp); -#else + else strfmt(temp, act, t_name); msg_format("%^s %s", m_name, temp); #endif - } /* Hack -- assume all attacks are obvious */ diff --git a/src/tables.c b/src/tables.c index 2554f0e0b..2704c8a22 100644 --- a/src/tables.c +++ b/src/tables.c @@ -7874,54 +7874,99 @@ byte conv_terrain2feat[MAX_WILDERNESS] = FEAT_MOUNTAIN }; +/* Weird melee attack types when hallucinating */ #ifdef JP cptr silly_attacks[MAX_SILLY_ATTACK] = { - "¤Ë¾®Êؤò¤«¤±¤é¤ì¤¿¡£", - "¤¬¤¢¤Ê¤¿¤Î²ó¤ê¤ò3²ó²ó¤Ã¤Æ¥ï¥ó¤È¸À¤Ã¤¿¡£", - "¤Ë¤·¤Ð¤­¤Þ¤ï¤µ¤ì¤¿¡£", - "¤Ë·¤¤ò¤Ê¤á¤µ¤»¤é¤ì¤¿¡£", - "¤Ë¥Ï¥Ê¥¯¥½¤òÈô¤Ð¤µ¤ì¤¿¡£", - "¤Ë¥¸¥ã¥ó·ý¤Ç¹¶·â¤µ¤ì¤¿¡£", - "¤¬¤¢¤Ê¤¿¤ÎËˤò»¥Â«¤Ç¤·¤Ð¤¤¤¿¡£", - "¤¬¤¢¤Ê¤¿¤ÎÁ°¤Ç¥Ý¡¼¥¸¥ó¥°¤ò¤·¤¿¡£", - "¤Ë¥¢¥«¥ó¥Ù¡¼¤µ¤ì¤¿¡£", - "¤Ë¡Ö¿À¤Î¹ñ¡×ȯ¸À¤Îű²ó¤òµá¤á¤é¤ì¤¿¡£", - "¤Ë¥á¥Ã¡û¡¼¥ë¤ò°û¤Þ¤µ¤ì¤¿¡£", - "¤Ë¤Ä¤Ã¤³¤ß¤òÆþ¤ì¤é¤ì¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤ÈÍ٤ä¿¡£", - "¤Ë´é¤Ë¤é¤¯½ñ¤­¤ò¤µ¤ì¤¿¡£", - "¤Ë¼Ú¶â¤ÎÊֺѤò¤»¤Þ¤é¤ì¤¿¡£", - "¤Ë¥¹¥«¡¼¥È¤ò¤á¤¯¤é¤ì¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤Î¼êÁê¤òÀê¤Ã¤¿¡£", - "¤«¤éÌòËþ¤ò¾å¤¬¤é¤ì¤¿¡£", - "¤«¤é°¦¤Î¹ðÇò¤ò¤µ¤ì¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤ò»þµë500±ß¤Ç¸Û¤Ã¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤Î100¤ÎÈëÌ©¤Ë¤Ä¤¤¤ÆÇ®¤¯¸ì¤Ã¤¿¡£", - "¤¬¥Ë¥ã¡¼¤ÈÌĤ¤¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤Ëµ¤¤ò¤Ä¤±¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤ò¥Ý¥ê¥´¥ó²½¤µ¤»¤¿¡£", - "¤Ë¾¯¤·¤«¤¸¤é¤ì¤¿¡£", - "¤Ï¥¢¥ë¥Æ¥Þ¤Î¼öʸ¤ò¾§¤¨¤¿¡ª", - "¤Ï¤¢¤Ê¤¿¤Î¥¹¥Ñ¥¤¥¯¤ò¥Ö¥í¥Ã¥¯¤·¤¿¡£", - "¤Ï¥¹¥é¥¤¥É°ÜÆ°¤·¤¿¡£", - "¤Ï¾ºÎ¶·ý¥³¥Þ¥ó¥É¤ÎÆþÎϤ˼ºÇÔ¤·¤¿¡£", - "¤Ï³È»¶ÇÈưˤ¤òȯ¼Í¤·¤¿¡£", - "¤Ï¥Ç¥¹¥é¡¼ÀïË¡¤ò¤·¤«¤±¤¿¡£", - "¤Ë¥é¥¤¥À¡¼¥­¥Ã¥¯¤Ç¹¶·â¤µ¤ì¤¿¡£", - "¤ËÆó½µ´Ö°ÊÆâ¤Ç¥Ó¥Ç¥ª¤ò¿Í¤Ë¸«¤»¤Ê¤¤¤È»à¤Ì¼ö¤¤¤ò¤«¤±¤é¤ì¤¿¡£", - "¤Ï¥Ñ¥ë¥×¥ó¥Æ¤ò¾§¤¨¤¿¡£", - "¤Ï¥¹¡¼¥Ñ¡¼¥¦¥ë¥È¥é¥®¥ã¥é¥¯¥Æ¥£¥«¥Þ¥°¥Ê¥à¤òÊü¤Ã¤¿¡£", - "¤Ë¤·¤ã¤¬¤ß¾®¥­¥Ã¥¯¤Ç¥Ï¥á¤é¤ì¤¿¡£", - "¤Ë¥¸¥§¥Ã¥È¥¹¥È¥ê¡¼¥à¥¢¥¿¥Ã¥¯¤ò¤«¤±¤é¤ì¤¿¡£", - "¤Ï¤¢¤Ê¤¿¤ËÒĸǤá¤ò¤«¤±¤Æ¡Ö1¡¢2¡¢3¡¢¥À¡¼¥Ã¡ª¡×¤È¶«¤ó¤À¡£", - "¤Ï¡Ö¤¤¤¯¤¸¤Ê¤·¡ª¤Ð¤«¤Ð¤«¤Ð¤«¡ª¡×¤È¤¤¤Ã¤Æ¶î¤±½Ð¤·¤¿¡£", - "¤¬¡Ö¤´¤é¤ó¡¢¥ë¡¼¥Ù¥ó¥¹¤Î³¨¤À¤è¡×¤È¸À¤Ã¤ÆÀŤ«¤ËÌܤòÊĤ¸¤¿¡£", - "¤Ï¸À¤Ã¤¿¡£¡ÖÊѶòÈÚÅÜ¡¢À仿¸ø³«Ã桪¡×¡£", + "¤Ë¾®Êؤò¤«¤±¤é¤ì¤¿¡£", + "¤¬¤¢¤Ê¤¿¤Î²ó¤ê¤ò3²ó²ó¤Ã¤Æ¥ï¥ó¤È¸À¤Ã¤¿¡£", + "¤Ë¤·¤Ð¤­¤Þ¤ï¤µ¤ì¤¿¡£", + "¤Ë·¤¤ò¤Ê¤á¤µ¤»¤é¤ì¤¿¡£", + "¤Ë¥Ï¥Ê¥¯¥½¤òÈô¤Ð¤µ¤ì¤¿¡£", + "¤Ë¥¸¥ã¥ó·ý¤Ç¹¶·â¤µ¤ì¤¿¡£", + "¤¬¤¢¤Ê¤¿¤ÎËˤò»¥Â«¤Ç¤·¤Ð¤¤¤¿¡£", + "¤¬¤¢¤Ê¤¿¤ÎÁ°¤Ç¥Ý¡¼¥¸¥ó¥°¤ò¤·¤¿¡£", + "¤Ë¥¢¥«¥ó¥Ù¡¼¤µ¤ì¤¿¡£", + "¤Ë¡Ö¿À¤Î¹ñ¡×ȯ¸À¤Îű²ó¤òµá¤á¤é¤ì¤¿¡£", + "¤Ë¥á¥Ã¡û¡¼¥ë¤ò°û¤Þ¤µ¤ì¤¿¡£", + "¤Ë¤Ä¤Ã¤³¤ß¤òÆþ¤ì¤é¤ì¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤ÈÍ٤ä¿¡£", + "¤Ë´é¤Ë¤é¤¯½ñ¤­¤ò¤µ¤ì¤¿¡£", + "¤Ë¼Ú¶â¤ÎÊֺѤò¤»¤Þ¤é¤ì¤¿¡£", + "¤Ë¥¹¥«¡¼¥È¤ò¤á¤¯¤é¤ì¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤Î¼êÁê¤òÀê¤Ã¤¿¡£", + "¤«¤éÌòËþ¤ò¾å¤¬¤é¤ì¤¿¡£", + "¤«¤é°¦¤Î¹ðÇò¤ò¤µ¤ì¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤ò»þµë500±ß¤Ç¸Û¤Ã¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤Î100¤ÎÈëÌ©¤Ë¤Ä¤¤¤ÆÇ®¤¯¸ì¤Ã¤¿¡£", + "¤¬¥Ë¥ã¡¼¤ÈÌĤ¤¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤Ëµ¤¤ò¤Ä¤±¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤ò¥Ý¥ê¥´¥ó²½¤µ¤»¤¿¡£", + "¤Ë¾¯¤·¤«¤¸¤é¤ì¤¿¡£", + "¤Ï¥¢¥ë¥Æ¥Þ¤Î¼öʸ¤ò¾§¤¨¤¿¡ª", + "¤Ï¤¢¤Ê¤¿¤Î¥¹¥Ñ¥¤¥¯¤ò¥Ö¥í¥Ã¥¯¤·¤¿¡£", + "¤Ï¥¹¥é¥¤¥É°ÜÆ°¤·¤¿¡£", + "¤Ï¾ºÎ¶·ý¥³¥Þ¥ó¥É¤ÎÆþÎϤ˼ºÇÔ¤·¤¿¡£", + "¤Ï³È»¶ÇÈưˤ¤òȯ¼Í¤·¤¿¡£", + "¤Ï¥Ç¥¹¥é¡¼ÀïË¡¤ò¤·¤«¤±¤¿¡£", + "¤Ë¥é¥¤¥À¡¼¥­¥Ã¥¯¤Ç¹¶·â¤µ¤ì¤¿¡£", + "¤ËÆó½µ´Ö°ÊÆâ¤Ç¥Ó¥Ç¥ª¤ò¿Í¤Ë¸«¤»¤Ê¤¤¤È»à¤Ì¼ö¤¤¤ò¤«¤±¤é¤ì¤¿¡£", + "¤Ï¥Ñ¥ë¥×¥ó¥Æ¤ò¾§¤¨¤¿¡£", + "¤Ï¥¹¡¼¥Ñ¡¼¥¦¥ë¥È¥é¥®¥ã¥é¥¯¥Æ¥£¥«¥Þ¥°¥Ê¥à¤òÊü¤Ã¤¿¡£", + "¤Ë¤·¤ã¤¬¤ß¾®¥­¥Ã¥¯¤Ç¥Ï¥á¤é¤ì¤¿¡£", + "¤Ë¥¸¥§¥Ã¥È¥¹¥È¥ê¡¼¥à¥¢¥¿¥Ã¥¯¤ò¤«¤±¤é¤ì¤¿¡£", + "¤Ï¤¢¤Ê¤¿¤ËÒĸǤá¤ò¤«¤±¤Æ¡Ö1¡¢2¡¢3¡¢¥À¡¼¥Ã¡ª¡×¤È¶«¤ó¤À¡£", + "¤Ï¡Ö¤¤¤¯¤¸¤Ê¤·¡ª¤Ð¤«¤Ð¤«¤Ð¤«¡ª¡×¤È¤¤¤Ã¤Æ¶î¤±½Ð¤·¤¿¡£", + "¤¬¡Ö¤´¤é¤ó¡¢¥ë¡¼¥Ù¥ó¥¹¤Î³¨¤À¤è¡×¤È¸À¤Ã¤ÆÀŤ«¤ËÌܤòÊĤ¸¤¿¡£", + "¤Ï¸À¤Ã¤¿¡£¡ÖÊѶòÈÚÅÜ¡¢À仿¸ø³«Ã桪¡×", }; -#else -/* Weird melee attack types when hallucinating */ +/* Note: %s for strfmt() */ +cptr silly_attacks2[MAX_SILLY_ATTACK] = +{ + "%s¤Ë¾®Êؤò¤«¤±¤¿¡£", + "%s¤Î²ó¤ê¤ò3²ó²ó¤Ã¤Æ¥ï¥ó¤È¸À¤Ã¤¿¡£", + "%s¤ò¤·¤Ð¤­¤Þ¤ï¤·¤¿¡£", + "%s¤Ë·¤¤ò¤Ê¤á¤µ¤»¤¿¡£", + "%s¤Ë¥Ï¥Ê¥¯¥½¤òÈô¤Ð¤·¤¿¡£", + "%s¤ò¥¸¥ã¥ó·ý¤Ç¹¶·â¤·¤¿¡£", + "%s¤ÎËˤò»¥Â«¤Ç¤·¤Ð¤¤¤¿¡£", + "%s¤ÎÁ°¤Ç¥Ý¡¼¥¸¥ó¥°¤ò¤·¤¿¡£", + "%s¤Ë¥¢¥«¥ó¥Ù¡¼¤·¤¿¡£", + "%s¤Ë¡Ö¿À¤Î¹ñ¡×ȯ¸À¤Îű²ó¤òµá¤á¤¿¡£", + "%s¤Ë¥á¥Ã¡û¡¼¥ë¤ò°û¤Þ¤»¤¿¡£", + "%s¤Ë¤Ä¤Ã¤³¤ß¤òÆþ¤ì¤¿¡£", + "%s¤ÈÍ٤ä¿¡£", + "%s¤Î´é¤Ë¤é¤¯½ñ¤­¤ò¤·¤¿¡£", + "%s¤Ë¼Ú¶â¤ÎÊֺѤò¤»¤Þ¤Ã¤¿¡£", + "%s¤Î¥¹¥«¡¼¥È¤ò¤á¤¯¤Ã¤¿¡£", + "%s¤Î¼êÁê¤òÀê¤Ã¤¿¡£", + "%s¤«¤éÌòËþ¤ò¾å¤¬¤Ã¤¿¡£", + "%s¤Ë°¦¤Î¹ðÇò¤ò¤·¤¿¡£", + "%s¤ò»þµë500±ß¤Ç¸Û¤Ã¤¿¡£", + "%s¤Î100¤ÎÈëÌ©¤Ë¤Ä¤¤¤ÆÇ®¤¯¸ì¤Ã¤¿¡£", + "¥Ë¥ã¡¼¤ÈÌĤ¤¤¿¡£", + "%s¤Ëµ¤¤ò¤Ä¤±¤¿¡£", + "%s¤ò¥Ý¥ê¥´¥ó²½¤µ¤»¤¿¡£", + "%s¤ò¾¯¤·¤«¤¸¤Ã¤¿¡£", + "¥¢¥ë¥Æ¥Þ¤Î¼öʸ¤ò¾§¤¨¤¿¡ª", + "%s¤Î¥¹¥Ñ¥¤¥¯¤ò¥Ö¥í¥Ã¥¯¤·¤¿¡£", + "¥¹¥é¥¤¥É°ÜÆ°¤·¤¿¡£", + "¾ºÎ¶·ý¥³¥Þ¥ó¥É¤ÎÆþÎϤ˼ºÇÔ¤·¤¿¡£", + "%s¤Ë³È»¶ÇÈưˤ¤òȯ¼Í¤·¤¿¡£", + "%s¤Ë¥Ç¥¹¥é¡¼ÀïË¡¤ò¤·¤«¤±¤¿¡£", + "%s¤ò¥é¥¤¥À¡¼¥­¥Ã¥¯¤Ç¹¶·â¤·¤¿¡£", + "%s¤ËÆó½µ´Ö°ÊÆâ¤Ç¥Ó¥Ç¥ª¤ò¿Í¤Ë¸«¤»¤Ê¤¤¤È»à¤Ì¼ö¤¤¤ò¤«¤±¤¿¡£", + "¥Ñ¥ë¥×¥ó¥Æ¤ò¾§¤¨¤¿¡£", + "%s¤Ë¥¹¡¼¥Ñ¡¼¥¦¥ë¥È¥é¥®¥ã¥é¥¯¥Æ¥£¥«¥Þ¥°¥Ê¥à¤òÊü¤Ã¤¿¡£", + "%s¤ò¤·¤ã¤¬¤ß¾®¥­¥Ã¥¯¤Ç¥Ï¥á¤¿¡£", + "%s¤Ë¥¸¥§¥Ã¥È¥¹¥È¥ê¡¼¥à¥¢¥¿¥Ã¥¯¤ò¤«¤±¤¿¡£", + "%s¤ËÒĸǤá¤ò¤«¤±¤Æ¡Ö1¡¢2¡¢3¡¢¥À¡¼¥Ã¡ª¡×¤È¶«¤ó¤À¡£", + "¡Ö¤¤¤¯¤¸¤Ê¤·¡ª¤Ð¤«¤Ð¤«¤Ð¤«¡ª¡×¤È¤¤¤Ã¤Æ¶î¤±½Ð¤·¤¿¡£", + "¡Ö¤´¤é¤ó¡¢¥ë¡¼¥Ù¥ó¥¹¤Î³¨¤À¤è¡×¤È¸À¤Ã¤ÆÀŤ«¤ËÌܤòÊĤ¸¤¿¡£", + "¸À¤Ã¤¿¡£¡ÖÊѶòÈÚÅÜ¡¢À仿¸ø³«Ã桪¡×", +}; +#else cptr silly_attacks[MAX_SILLY_ATTACK] = { "smothers", @@ -7957,7 +8002,7 @@ cptr silly_attacks[MAX_SILLY_ATTACK] = "falsifies", "disbelieves", "molests", - "pusupusu" + "pusupusu", }; #endif -- 2.11.0