Merge remote-tracking branch 'remotes/origin/For2.2.2-Fix-Hourier' into For2.2.2...

diff --cc src/mutation/mutation-calculator.c
index 0000000,296f844..a6cab76
mode 000000,100644..100644
--- /dev/null
--- 2/src/mutation/mutation-calculator.c
+++ b/src/mutation/mutation-calculator.c
@@@ -1,0 -1,87 +1,80 @@@
 -    if (creature_ptr->muta3 & MUT3_ELEC_TOUC)
 -        creature_ptr->sh_elec = TRUE;
 -
+ /*!
+  * @brief 突然変異の各種計算 / Calculations for mutation
+  * @date 2014/01/11
+  * @author
+  * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
+  *
+  * This software may be copied and distributed for educational, research,
+  * and not for profit purposes provided that this copyright and statement
+  * are included in all such copies.  Other copyrights may also apply
+  * 2014 Deskull rearranged comment for Doxygen
+  * 2020 Hourier rearranged for dividing processes.
+  */
+ 
+ #include "mutation/mutation-calculator.h"
+ #include "mutation/mutation-flag-types.h"
+ 
+  /*!
+  * @brief 現在プレイヤー得ている突然変異の数を返す。
+  * @return 現在得ている突然変異の数
+  */
+ static int count_mutations(player_type *creature_ptr)
+ {
+     return count_bits(creature_ptr->muta1) + count_bits(creature_ptr->muta2) + count_bits(creature_ptr->muta3);
+ }
+ 
+ /*!
+  * @brief 突然変異による自然回復ペナルティをパーセント値で返す /
+  * Return the modifier to the regeneration rate (in percent)
+  * @return ペナルティ修正(%)
+  * @details
+  * Beastman get 10 "free" mutations and only 5% decrease per additional mutation.
+  * Max 90% decrease in regeneration speed.
+  */
+ int calc_mutant_regenerate_mod(player_type *creature_ptr)
+ {
+     int regen;
+     int mod = 10;
+     int count = count_mutations(creature_ptr);
+     if (creature_ptr->pseikaku == PERSONALITY_LUCKY)
+         count--;
+ 
+     if (creature_ptr->prace == RACE_BEASTMAN) {
+         count -= 10;
+         mod = 5;
+     }
+ 
+     if (count <= 0)
+         return 100;
+ 
+     regen = 100 - count * mod;
+     if (regen < 10)
+         regen = 10;
+ 
+     return (regen);
+ }
+ 
+ void set_mutation_flags(player_type *creature_ptr)
+ {
+     if (creature_ptr->muta3 == 0)
+         return;
+ 
+     if (creature_ptr->muta3 & MUT3_FLESH_ROT)
+         creature_ptr->regenerate = FALSE;
+ 
 -        creature_ptr->sh_fire = TRUE;
+     if (creature_ptr->muta3 & MUT3_FIRE_BODY) {
 -    if (creature_ptr->muta3 & MUT3_ESP)
 -        creature_ptr->telepathy = TRUE;
 -
+         creature_ptr->lite = TRUE;
+     }
+ 
+     if (creature_ptr->muta3 & MUT3_WINGS)
+         creature_ptr->levitation = TRUE;
+ 
+     if (creature_ptr->muta3 & MUT3_FEARLESS)
+         creature_ptr->resist_fear = TRUE;
+ 
+     if (creature_ptr->muta3 & MUT3_REGEN)
+         creature_ptr->regenerate = TRUE;
+ 
+     if (creature_ptr->muta3 & MUT3_MOTION)
+         creature_ptr->free_act = TRUE;
+ }

diff --cc src/player/player-status.c
Simple merge