From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Mon, 23 Jun 2003 11:04:47 +0000 (+0000)
Subject: RES_ALL持ちに対して聖なるオーラと闘気オーラを無効にした.
X-Git-Tag: v2.1.2~1344
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d00d657aae72232a5561679f76f74695749d4da;p=hengbandforosx%2Fhengbandosx.git

RES_ALL持ちに対して聖なるオーラと闘気オーラを無効にした.
---

diff --git a/src/melee1.c b/src/melee1.c
index 238449ea5..b52c4a8ac 100644
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1983,52 +1983,67 @@ msg_format("%s
 				{
 					if (r_ptr->flags3 & RF3_EVIL)
 					{
-						int dam = damroll(2, 6);
+						if (!(r_ptr->flagsr & RFR_RES_ALL))
+						{
+							int dam = damroll(2, 6);
 
-						/* Modify the damage */
-						dam = mon_damage_mod(m_ptr, dam, FALSE);
+							/* Modify the damage */
+							dam = mon_damage_mod(m_ptr, dam, FALSE);
 
 #ifdef JP
-						msg_format("%^s¤ÏÀ»¤Ê¤ë¥ª¡¼¥é¤Ç½ý¤Ä¤¤¤¿¡ª", m_name);
-						if (mon_take_hit(m_idx, dam, &fear,
-						    "¤ÏÅݤ줿¡£"))
+							msg_format("%^s¤ÏÀ»¤Ê¤ë¥ª¡¼¥é¤Ç½ý¤Ä¤¤¤¿¡ª", m_name);
+							if (mon_take_hit(m_idx, dam, &fear,
+							    "¤ÏÅݤ줿¡£"))
 #else
-						msg_format("%^s is injured by holy power!", m_name);
+							msg_format("%^s is injured by holy power!", m_name);
 
-						if (mon_take_hit(m_idx, dam, &fear,
-						    " is destroyed."))
+							if (mon_take_hit(m_idx, dam, &fear,
+							    " is destroyed."))
 #endif
-
+							{
+								blinked = FALSE;
+								alive = FALSE;
+							}
+							if (m_ptr->ml)
+								r_ptr->r_flags3 |= RF3_EVIL;
+						}
+						else
 						{
-							blinked = FALSE;
-							alive = FALSE;
+							if (m_ptr->ml)
+								r_ptr->r_flagsr |= RFR_RES_ALL;
 						}
-						if (m_ptr->ml)
-							r_ptr->r_flags3 |= RF3_EVIL;
 					}
 				}
 
 				if (p_ptr->tim_sh_touki && alive && !p_ptr->is_dead)
 				{
-					int dam = damroll(2, 6);
+					if (!(r_ptr->flagsr & RFR_RES_ALL))
+					{
+						int dam = damroll(2, 6);
 
-					/* Modify the damage */
-					dam = mon_damage_mod(m_ptr, dam, FALSE);
+						/* Modify the damage */
+						dam = mon_damage_mod(m_ptr, dam, FALSE);
 
 #ifdef JP
-					msg_format("%^s¤¬±Ô¤¤Æ®µ¤¤Î¥ª¡¼¥é¤Ç½ý¤Ä¤¤¤¿¡ª", m_name);
-					if (mon_take_hit(m_idx, dam, &fear,
-					    "¤ÏÅݤ줿¡£"))
+						msg_format("%^s¤¬±Ô¤¤Æ®µ¤¤Î¥ª¡¼¥é¤Ç½ý¤Ä¤¤¤¿¡ª", m_name);
+						if (mon_take_hit(m_idx, dam, &fear,
+						    "¤ÏÅݤ줿¡£"))
 #else
-					msg_format("%^s is injured by the Force", m_name);
+						msg_format("%^s is injured by the Force", m_name);
 
-					if (mon_take_hit(m_idx, dam, &fear,
-					    " is destroyed."))
+						if (mon_take_hit(m_idx, dam, &fear,
+						    " is destroyed."))
 #endif
 
+						{
+							blinked = FALSE;
+							alive = FALSE;
+						}
+					}
+					else
 					{
-						blinked = FALSE;
-						alive = FALSE;
+						if (m_ptr->ml)
+							r_ptr->r_flagsr |= RFR_RES_ALL;
 					}
 				}
 			}