[Refactor] #40514 is_oppose_pois() に忍者の常時二重耐性判定を反映． / Ninja's constant double resista...

diff --git a/src/player/player-status.c b/src/player/player-status.c
index f532eb1..095b4d2 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -417,16 +417,6 @@ void calc_bonuses(player_type *creature_ptr)
         }
     }
 
-    switch (creature_ptr->pclass) {
-
-    case CLASS_NINJA:
-        if (creature_ptr->lev > 44) {
-            creature_ptr->oppose_pois = 1;
-            creature_ptr->redraw |= PR_STATUS;
-        }
-        break;
-    }
-
     if (creature_ptr->special_defense & KAMAE_MASK) {
         if (!(empty_hands_status & EMPTY_HAND_RARM)) {
             set_action(creature_ptr, ACTION_NONE);

diff --git a/src/status/element-resistance.c b/src/status/element-resistance.c
index a7921cb..5e747ae 100644 (file)
--- a/src/status/element-resistance.c
+++ b/src/status/element-resistance.c
@@ -234,5 +234,6 @@ bool is_oppose_cold(player_type *creature_ptr)
 
 bool is_oppose_pois(player_type *creature_ptr)
 {
-    return creature_ptr->oppose_pois || music_singing(creature_ptr, MUSIC_RESIST) || (creature_ptr->special_defense & KATA_MUSOU);
+    return creature_ptr->oppose_pois || music_singing(creature_ptr, MUSIC_RESIST) || (creature_ptr->special_defense & KATA_MUSOU ||
+        (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 44) );
 }