From 9ecad169dac73a1842d8f68088c8b0763dd5e9db Mon Sep 17 00:00:00 2001 From: nothere Date: Wed, 26 Nov 2003 16:43:50 +0000 Subject: [PATCH] =?utf8?q?=E5=9C=B0=E5=BD=A2=E3=82=92=E5=8F=A9=E3=81=8D?= =?utf8?q?=E9=96=8B=E3=81=91=E3=82=8B=E9=9A=9B=E3=81=AB,=20OPEN=E3=81=A7?= =?utf8?q?=E5=9C=B0=E5=BD=A2=E3=81=8C=E5=A4=89=E3=82=8F=E3=82=89=E3=81=AA?= =?utf8?q?=E3=81=84=E5=9C=B0=E5=BD=A2=E3=81=A0=E3=81=A3=E3=81=9F=E5=A0=B4?= =?utf8?q?=E5=90=88=E3=81=9D=E3=81=AE=E5=9C=B0=E5=BD=A2=E3=81=AB=20?= =?utf8?q?=E3=82=81=E3=82=8A=E8=BE=BC=E3=82=80=E3=83=90=E3=82=B0=E3=81=8C?= =?utf8?q?=E3=81=82=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3.?= =?utf8?q?=20=E3=81=BE=E3=81=9F,=20=E3=81=8F=E3=81=95=E3=81=B3=E3=81=AE?= =?utf8?q?=E6=89=93=E3=81=9F=E3=82=8C=E3=81=9F=E3=83=89=E3=82=A2=E3=81=ABK?= =?utf8?q?:OPEN=E3=81=8C=E3=81=AA=20=E3=81=8F=E3=81=93=E3=81=AE=E3=83=90?= =?utf8?q?=E3=82=B0=E3=81=8C=E5=87=BA=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?utf8?q?=E3=81=A7=E4=BD=B5=E3=81=9B=E3=81=A6=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/edit/f_info.txt | 8 ++++++++ src/cmd2.c | 6 +++--- src/melee2.c | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt index 7963022df..adc18b317 100644 --- a/lib/edit/f_info.txt +++ b/lib/edit/f_info.txt @@ -523,6 +523,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_1 F:POWER_0 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -537,6 +538,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_2 F:POWER_1 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -551,6 +553,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_3 F:POWER_2 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -565,6 +568,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_4 F:POWER_3 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -579,6 +583,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_5 F:POWER_4 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -593,6 +598,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_6 F:POWER_5 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -607,6 +613,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_7 F:POWER_6 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | @@ -621,6 +628,7 @@ G:+:U M:CLOSED_DOOR W:10 K:DESTROYED:FLOOR +K:OPEN:OPEN_DOOR K:BASH:BROKEN_DOOR K:SPIKE:JAMMED_DOOR_7 F:POWER_7 | NOTICE | REMEMBER | BASH | SPIKE | TUNNEL | DOOR | HURT_ROCK | diff --git a/src/cmd2.c b/src/cmd2.c index 7e379942a..9b876bcb6 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -2278,14 +2278,14 @@ static bool do_cmd_bash_aux(int y, int x, int dir) { /* Message */ #ifdef JP - msg_print("¥É¥¢¤ò²õ¤·¤¿¡ª"); + msg_format("%s¤ò²õ¤·¤¿¡ª", f_name + f_ptr->name); #else - msg_print("The door crashes open!"); + msg_format("The %s crashes open!", f_name + f_ptr->name); #endif /* Break down the door */ - if (randint0(100) < 50) + if ((randint0(100) < 50) || (feat_state(c_ptr->feat, FF_OPEN) == c_ptr->feat)) { cave_alter_feat(y, x, FF_BASH); } diff --git a/src/melee2.c b/src/melee2.c index c8feb7a17..d938cd14d 100644 --- a/src/melee2.c +++ b/src/melee2.c @@ -3018,7 +3018,7 @@ msg_format("%^s%s", m_name, monmessage); if (did_open_door || did_bash_door) { /* Break down the door */ - if (did_bash_door && (randint0(100) < 50)) + if (did_bash_door && ((randint0(100) < 50) || (feat_state(c_ptr->feat, FF_OPEN) == c_ptr->feat))) { cave_alter_feat(ny, nx, FF_BASH); } -- 2.11.0