From 4f0fb2f2e64055187686e3b0f72346b2a35aeb1d Mon Sep 17 00:00:00 2001 From: henkma Date: Tue, 19 Aug 2003 15:28:50 +0000 Subject: [PATCH] =?utf8?q?=E3=82=AC=E3=83=B3=E3=83=80=E3=83=AB=E3=83=95?= =?utf8?q?=E3=81=AE=E6=9D=96,=20=E5=B8=AF=E9=AD=94=E5=8A=9B=E3=83=9A?= =?utf8?q?=E3=83=B3=E3=83=80=E3=83=B3=E3=83=88=E3=81=AE=E7=99=BA=E5=8B=95?= =?utf8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd6.c | 41 +++++++++++++++++++++++++++++++++++++---- src/object1.c | 8 ++++---- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/cmd6.c b/src/cmd6.c index f85c2230f..7cd731c2d 100644 --- a/src/cmd6.c +++ b/src/cmd6.c @@ -5104,7 +5104,7 @@ msg_print(" detect_all(DETECT_RAD_DEFAULT); probing(); identify_fully(FALSE); - o_ptr->timeout = 1000; + o_ptr->timeout = 100; break; } @@ -5766,9 +5766,42 @@ msg_print(" #else msg_print("Your pendant glows pale..."); #endif - if (!get_aim_dir(&dir)) return; - fire_ball(GF_MANA, dir, 200, 4); - o_ptr->timeout = randint0(150) + 150; + if (p_ptr->pclass == CLASS_MAGIC_EATER) + { + int i; + for (i = 0; i < EATER_EXT*2; i++) + { + p_ptr->magic_num1[i] += (p_ptr->magic_num2[i] < 10) ? EATER_CHARGE * 3 : p_ptr->magic_num2[i]*EATER_CHARGE/3; + if (p_ptr->magic_num1[i] > p_ptr->magic_num2[i]*EATER_CHARGE) p_ptr->magic_num1[i] = p_ptr->magic_num2[i]*EATER_CHARGE; + } + for (; i < EATER_EXT*3; i++) + { + int k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2); + p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE*3 : p_ptr->magic_num2[i]*EATER_ROD_CHARGE/3)*k_info[k_idx].pval; + if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0; + } +#ifdef JP + msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£"); +#else + msg_print("Your feel your head clear."); +#endif + p_ptr->window |= (PW_PLAYER); + } + else if (p_ptr->csp < p_ptr->msp) + { + p_ptr->csp = p_ptr->msp; + p_ptr->csp_frac = 0; +#ifdef JP + msg_print("Ƭ¤¬¥Ï¥Ã¥­¥ê¤È¤·¤¿¡£"); +#else + msg_print("Your feel your head clear."); +#endif + + p_ptr->redraw |= (PR_MANA); + p_ptr->window |= (PW_PLAYER); + p_ptr->window |= (PW_SPELL); + } + o_ptr->timeout = 777; break; } } diff --git a/src/object1.c b/src/object1.c index 254814906..2ab40a423 100644 --- a/src/object1.c +++ b/src/object1.c @@ -1242,9 +1242,9 @@ return " case ART_GANDALF: { #ifdef JP -return "õº÷¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 1000 ¥¿¡¼¥óËè"; +return "Ä´ºº¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 100 ¥¿¡¼¥óËè"; #else - return "probing, detection and full id every 1000 turns"; + return "probing, detection and full id every 100 turns"; #endif } @@ -1877,9 +1877,9 @@ return "* case ART_CHARMED: { #ifdef JP -return "ËâÎϤÎÍò(200) : 150+d150 ¥¿¡¼¥óËè"; +return "ËâÎÏÉü³è: 777 ¥¿¡¼¥óËè"; #else - return "mana storm (200) every 150+d150 turns"; + return "Restore Mana every 777 turns"; #endif } -- 2.11.0