[Refactor] #40514 have_resist_fire() を calc_bonuses() から分離． / Separated have_resist_f...

diff --git a/src/player/player-race.c b/src/player/player-race.c
index 42e05cf..c8a1e45 100644 (file)
--- a/src/player/player-race.c
+++ b/src/player/player-race.c
@@ -133,15 +133,12 @@ void calc_race_status(player_type *creature_ptr)
         case MIMIC_DEMON:
             creature_ptr->resist_chaos = TRUE;
             creature_ptr->resist_neth = TRUE;
-            creature_ptr->resist_fire = TRUE;
             creature_ptr->oppose_fire = 1;
             creature_ptr->redraw |= PR_STATUS;
             break;
         case MIMIC_DEMON_LORD:
             creature_ptr->resist_chaos = TRUE;
             creature_ptr->resist_neth = TRUE;
-            creature_ptr->immune_fire = TRUE;
-            creature_ptr->resist_fire = TRUE;
             creature_ptr->resist_cold = TRUE;
             creature_ptr->resist_pois = TRUE;
             creature_ptr->resist_conf = TRUE;
@@ -205,16 +202,11 @@ void calc_race_status(player_type *creature_ptr)
             creature_ptr->resist_dark = TRUE;
             break;
         case RACE_DRACONIAN:
-            if (creature_ptr->lev > 4)
-                creature_ptr->resist_fire = TRUE;
             if (creature_ptr->lev > 9)
                 creature_ptr->resist_cold = TRUE;
             if (creature_ptr->lev > 34)
                 creature_ptr->resist_pois = TRUE;
             break;
-        case RACE_IMP:
-            creature_ptr->resist_fire = TRUE;
-            break;
         case RACE_GOLEM:
             creature_ptr->resist_pois = TRUE;
             break;
@@ -252,7 +244,6 @@ void calc_race_status(player_type *creature_ptr)
             creature_ptr->resist_sound = TRUE;
             break;
         case RACE_BALROG:
-            creature_ptr->resist_fire = TRUE;
             creature_ptr->resist_neth = TRUE;
             if (creature_ptr->lev > 44) {
                 creature_ptr->oppose_fire = 1;

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index f1ef5bb..4ea551b 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -1436,4 +1436,43 @@ void have_resist_elec(player_type *creature_ptr)
         creature_ptr->resist_elec = TRUE;
 }
 
+void have_resist_fire(player_type *creature_ptr)
+{
+    object_type *o_ptr;
+    BIT_FLAGS flgs[TR_FLAG_SIZE];
+    creature_ptr->resist_fire = FALSE;
+
+    if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
+        creature_ptr->resist_fire = TRUE;
+    }
+
+    if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_DRACONIAN && creature_ptr->lev > 4) {
+        creature_ptr->resist_fire = TRUE;
+    }
 
+       if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_IMP || creature_ptr->prace == RACE_BALROG)) {
+        creature_ptr->resist_fire = TRUE;
+    }
+
+    if (creature_ptr->special_defense & KAMAE_SEIRYU) {
+        creature_ptr->resist_fire = TRUE;
+    }
+
+    if (creature_ptr->ult_res || (creature_ptr->special_defense & KATA_MUSOU)) {
+        creature_ptr->resist_fire = TRUE;
+    }
+
+    for (int i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+        o_ptr = &creature_ptr->inventory_list[i];
+        if (!o_ptr->k_idx)
+            continue;
+
+        object_flags(creature_ptr, o_ptr, flgs);
+
+        if (have_flag(flgs, TR_RES_FIRE))
+            creature_ptr->resist_fire = TRUE;
+    }
+
+    if (creature_ptr->immune_fire)
+        creature_ptr->resist_fire = TRUE;
+}

diff --git a/src/player/player-status-flags.h b/src/player/player-status-flags.h
index 29fe21a..aa85db5 100644 (file)
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -51,5 +51,6 @@ void have_impact(player_type *creature_ptr);
 void have_extra_blow(player_type *creature_ptr);
 void have_resist_acid(player_type *creature_ptr);
 void have_resist_elec(player_type *creature_ptr);
+void have_resist_fire(player_type *creature_ptr);
 
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 085fcae..57d8609 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -560,7 +560,6 @@ static void delayed_visual_update(player_type *player_ptr)
  */
 static void clear_creature_bonuses(player_type *creature_ptr)
 {
-    creature_ptr->resist_fire = FALSE;
     creature_ptr->resist_cold = FALSE;
     creature_ptr->resist_pois = FALSE;
     creature_ptr->resist_conf = FALSE;
@@ -732,6 +731,7 @@ void calc_bonuses(player_type *creature_ptr)
     have_extra_blow(creature_ptr);
     have_resist_acid(creature_ptr);
     have_resist_elec(creature_ptr);
+    have_resist_fire(creature_ptr);
 
     calc_race_status(creature_ptr);
 
@@ -869,8 +869,6 @@ void calc_bonuses(player_type *creature_ptr)
     if (is_special_class && (empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM)))
         creature_ptr->two_handed_weapon = FALSE;
 
-    if (creature_ptr->immune_fire)
-        creature_ptr->resist_fire = TRUE;
     if (creature_ptr->immune_cold)
         creature_ptr->resist_cold = TRUE;
 
@@ -2077,7 +2075,6 @@ static void calc_num_blow(player_type *creature_ptr, int i)
         }
 
         if (creature_ptr->special_defense & KAMAE_SEIRYU) {
-            creature_ptr->resist_fire = TRUE;
             creature_ptr->resist_cold = TRUE;
             creature_ptr->resist_pois = TRUE;
         } else if (creature_ptr->special_defense & KAMAE_GENBU) {
@@ -4448,7 +4445,6 @@ void calc_timelimit_status(player_type *creature_ptr)
 {
     if (creature_ptr->ult_res || (creature_ptr->special_defense & KATA_MUSOU)) {
         creature_ptr->lite = TRUE;
-        creature_ptr->resist_fire = TRUE;
         creature_ptr->resist_cold = TRUE;
         creature_ptr->resist_pois = TRUE;
         creature_ptr->resist_conf = TRUE;
@@ -4524,8 +4520,6 @@ void calc_equipment_status(player_type *creature_ptr)
         if (have_flag(flgs, TR_IM_ELEC))
             creature_ptr->immune_elec = TRUE;
 
-        if (have_flag(flgs, TR_RES_FIRE))
-            creature_ptr->resist_fire = TRUE;
         if (have_flag(flgs, TR_RES_COLD))
             creature_ptr->resist_cold = TRUE;
         if (have_flag(flgs, TR_RES_POIS))