あやしい影等でモンスターの外見が違っている状態でモンスターが耐性など

[hengbandforosx/hengbandosx.git] / src / mspells2.c

diff --git a/src/mspells2.c b/src/mspells2.c
index f641b51..ff7219d 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -2111,9 +2111,12 @@ bool monst_spell_monst(int m_idx)
                        /* No obvious effect */
                        if (see_both)
                        {
-                               /* Memorize a flag */
-                               if (tr_ptr->flagsr & RFR_RES_ALL) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                               if (tr_ptr->flags3 & RF3_NO_CONF) tr_ptr->r_flags3 |= (RF3_NO_CONF);
+                               if (is_original_ap(t_ptr))
+                               {
+                                       /* Memorize a flag */
+                                       if (tr_ptr->flagsr & RFR_RES_ALL) tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                                       if (tr_ptr->flags3 & RF3_NO_CONF) tr_ptr->r_flags3 |= (RF3_NO_CONF);
+                               }
 
 #ifdef JP
                                msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
@@ -2170,9 +2173,12 @@ bool monst_spell_monst(int m_idx)
                        /* No obvious effect */
                        if (see_both)
                        {
-                               /* Memorize a flag */
-                               if (tr_ptr->flagsr & RFR_RES_ALL) tr_ptr->r_flagsr |= (RFR_RES_ALL);
-                               if (tr_ptr->flags3 & RF3_NO_CONF) tr_ptr->r_flags3 |= (RF3_NO_CONF);
+                               if (is_original_ap(t_ptr))
+                               {
+                                       /* Memorize a flag */
+                                       if (tr_ptr->flagsr & RFR_RES_ALL) tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                                       if (tr_ptr->flags3 & RF3_NO_CONF) tr_ptr->r_flags3 |= (RF3_NO_CONF);
+                               }
 
 #ifdef JP
                                msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
@@ -2235,7 +2241,7 @@ bool monst_spell_monst(int m_idx)
                        /* Memorize a flag */
                        if (tr_ptr->flagsr & RFR_RES_ALL)
                        {
-                               tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
                        }
 #ifdef JP
                        if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
@@ -2279,7 +2285,7 @@ bool monst_spell_monst(int m_idx)
                        /* Memorize a flag */
                        if (tr_ptr->flagsr & RFR_RES_ALL)
                        {
-                               tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
                        }
 #ifdef JP
                        if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
@@ -2323,7 +2329,7 @@ bool monst_spell_monst(int m_idx)
                        /* Memorize a flag */
                        if (tr_ptr->flagsr & RFR_RES_ALL)
                        {
-                               tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
                        }
 #ifdef JP
                        if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
@@ -2367,7 +2373,7 @@ bool monst_spell_monst(int m_idx)
                        /* Memorize a flag */
                        if (tr_ptr->flagsr & RFR_RES_ALL)
                        {
-                               tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
                        }
 #ifdef JP
                        if (see_both) msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
@@ -2997,7 +3003,7 @@ bool monst_spell_monst(int m_idx)
                        /* Memorize a flag */
                        if (tr_ptr->flagsr & RFR_RES_ALL)
                        {
-                               tr_ptr->r_flagsr |= (RFR_RES_ALL);
+                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= (RFR_RES_ALL);
                        }
 #ifdef JP
                        if (see_both) msg_format("¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡ª", t_name);
@@ -3293,7 +3299,7 @@ bool monst_spell_monst(int m_idx)
                                {
                                        if (see_t)
                                        {
-                                               tr_ptr->r_flagsr |= RFR_RES_TELE;
+                                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
 #ifdef JP
                                                msg_format("%^s¤Ë¤Ï¸ú²Ì¤¬¤Ê¤«¤Ã¤¿¡£", t_name);
 #else
@@ -3308,7 +3314,7 @@ bool monst_spell_monst(int m_idx)
                                {
                                        if (see_t)
                                        {
-                                               tr_ptr->r_flagsr |= RFR_RES_TELE;
+                                               if (is_original_ap(t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE;
 #ifdef JP
                                                msg_format("%^s¤ÏÂÑÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡ª", t_name);
 #else
@@ -4109,7 +4115,7 @@ bool monst_spell_monst(int m_idx)
        }
 
        /* Remember what the monster did, if we saw it */
-       if (see_m)
+       if (see_m && is_original_ap(m_ptr))
        {
                /* Inate spell */
                if (thrown_spell < 32*4)
@@ -4136,7 +4142,7 @@ bool monst_spell_monst(int m_idx)
        /* Always take note of monsters that kill you */
        if (p_ptr->is_dead && (r_ptr->r_deaths < MAX_SHORT) && !p_ptr->inside_arena)
        {
-               r_ptr->r_deaths++;
+               r_ptr->r_deaths++; /* Ignore appearance difference */
        }
 
        /* A spell was cast */