Merge branch 'develop' into feature/Remove-Dependency-Player-Status

diff --cc Hengband/Hengband/Hengband.vcxproj
index 1a36746,e39ed22..fa3f121
--- 1/Hengband/Hengband/Hengband.vcxproj
--- 2/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@@ -418,16 -418,17 +418,17 @@@
      <ClCompile Include="..\..\src\player-info\resistance-info.cpp" />\r
      <ClCompile Include="..\..\src\player-info\self-info-util.cpp" />\r
      <ClCompile Include="..\..\src\player-info\weapon-effect-info.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-speed.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-status-base.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-stealth.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-speed.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-status-base.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-stealth.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-basic-statistics.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-strength.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-intelligence.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-wisdom.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-dexterity.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-constitution.cpp" />\r
 +    <ClCompile Include="..\..\src\player-ability\player-charisma.cpp" />\r
+     <ClCompile Include="..\..\src\player-status\player-infravision.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-basic-statistics.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-strength.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-intelligence.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-wisdom.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-dextarity.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-constitution.cpp" />\r
 -    <ClCompile Include="..\..\src\player-status\player-charisma.cpp" />\r
      <ClCompile Include="..\..\src\player\player-status-resist.cpp" />\r
      <ClCompile Include="..\..\src\room\vault-builder.cpp" />\r
      <ClCompile Include="..\..\src\specific-object\blade-turner.cpp" />\r
@@@ -1107,16 -1106,17 +1108,17 @@@
      <ClInclude Include="..\..\src\player-info\resistance-info.h" />\r
      <ClInclude Include="..\..\src\player-info\self-info-util.h" />\r
      <ClInclude Include="..\..\src\player-info\weapon-effect-info.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-speed.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-status-base.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-stealth.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-speed.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-status-base.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-stealth.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-basic-statistics.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-strength.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-intelligence.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-wisdom.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-dexterity.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-constitution.h" />\r
 +    <ClInclude Include="..\..\src\player-ability\player-charisma.h" />\r
+     <ClInclude Include="..\..\src\player-status\player-infravision.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-basic-statistics.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-strength.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-intelligence.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-wisdom.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-dextarity.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-constitution.h" />\r
 -    <ClInclude Include="..\..\src\player-status\player-charisma.h" />\r
      <ClInclude Include="..\..\src\player\player-status-resist.h" />\r
      <ClInclude Include="..\..\src\room\vault-builder.h" />\r
      <ClInclude Include="..\..\src\specific-object\blade-turner.h" />\r

diff --cc Hengband/Hengband/Hengband.vcxproj.filters
index b60f454,87ac887..888cf6c
--- 1/Hengband/Hengband/Hengband.vcxproj.filters
--- 2/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@@ -2168,35 -2174,38 +2168,38 @@@
      <ClCompile Include="..\..\src\wizard\wizard-player-modifier.cpp">\r
        <Filter>wizard</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-speed.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-speed.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-status-base.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-status-base.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-stealth.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-stealth.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-basic-statistics.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-basic-statistics.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-strength.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-strength.cpp">\r
 +      <Filter>player-ability</Filter>\r
 +    </ClCompile>\r
 +    <ClCompile Include="..\..\src\player-ability\player-intelligence.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-intelligence.cpp">\r
 -      <Filter>player-status</Filter>\r
+     <ClCompile Include="..\..\src\player-status\player-infravision.cpp">\r
+       <Filter>player-status</Filter>\r
+     </ClCompile>\r
 +    <ClCompile Include="..\..\src\player-ability\player-wisdom.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-wisdom.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-dexterity.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-dextarity.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-constitution.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-constitution.cpp">\r
 -      <Filter>player-status</Filter>\r
 -    </ClCompile>\r
 -    <ClCompile Include="..\..\src\player-status\player-charisma.cpp">\r
 -      <Filter>player-status</Filter>\r
 +    <ClCompile Include="..\..\src\player-ability\player-charisma.cpp">\r
 +      <Filter>player-ability</Filter>\r
      </ClCompile>\r
      <ClCompile Include="..\..\src\mind\mind-elementalist.cpp">\r
        <Filter>mind</Filter>\r
@@@ -4745,35 -4757,38 +4748,38 @@@
      <ClInclude Include="..\..\src\wizard\wizard-player-modifier.h">\r
        <Filter>wizard</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-speed.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-speed.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-status-base.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-status-base.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-stealth.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-stealth.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-infravision.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-basic-statistics.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-basic-statistics.h">\r
++    <ClInclude Include="..\..\src\player-status\player-infravision.h">\r
+       <Filter>player-status</Filter>\r
+     </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-strength.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-strength.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-intelligence.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-intelligence.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-wisdom.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-wisdom.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-dextarity.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-dexterity.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-constitution.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-constitution.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
 -    <ClInclude Include="..\..\src\player-status\player-charisma.h">\r
 -      <Filter>player-status</Filter>\r
 +    <ClInclude Include="..\..\src\player-ability\player-charisma.h">\r
 +      <Filter>player-ability</Filter>\r
      </ClInclude>\r
      <ClInclude Include="..\..\src\util\flag-group.h">\r
        <Filter>util</Filter>\r

diff --cc src/Makefile.am
index 7c8be2e,5e2802e..d8fc685
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -657,8 -668,6 +657,9 @@@ hengband_SOURCES = 
        player-info/self-info-util.cpp player-info/self-info-util.h \
        player-info/weapon-effect-info.cpp player-info/weapon-effect-info.h \
        \
 +      player-status/player-hand-types.h \
++      player-status/player-infravision.cpp player-status/player-infravision.h \
 +      \
        racial/class-racial-switcher.cpp racial/class-racial-switcher.h \
        racial/mutation-racial-selector.cpp racial/mutation-racial-selector.h \
        racial/race-racial-command-setter.cpp racial/race-racial-command-setter.h \

diff --cc src/player-ability/player-status-base.h
index 80b662d,80b662d..36bf9be
--- 1/src/player-ability/player-status-base.h
--- 2/src/player-status/player-status-base.h
+++ b/src/player-ability/player-status-base.h
@@@ -36,5 -36,5 +36,3 @@@ protected
      virtual BIT_FLAGS equipments_flags(tr_type check_flag);
      virtual BIT_FLAGS equipments_bad_flags(tr_type check_flag);
  };
--
--

diff --cc src/player-status/player-infravision.h
index 0000000,5bc2344..8ef8ed2
mode 000000,100644..100644
--- /dev/null
--- 2/src/player-status/player-infravision.h
+++ b/src/player-status/player-infravision.h
@@@ -1,0 -1,14 +1,14 @@@
 -#include "player-status/player-status-base.h"
+ #pragma once
++#include "player-ability/player-status-base.h"
+ 
+ class PlayerInfravision : public PlayerStatusBase {
+ public:
+     using PlayerStatusBase::PlayerStatusBase;
+     PlayerInfravision() = delete;
+ 
+ protected:
+     void set_locals() override;
+     s16b race_value() override;
+     s16b time_effect_value() override;
+     s16b mutation_value() override;
+ };

diff --cc src/player/player-status-flags.cpp
index b6cba6e,f3c34ad..22bf724
--- 1/src/player/player-status-flags.cpp
--- 2/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@@ -13,12 -13,11 +13,13 @@@
  #include "object-hook/hook-checker.h"
  #include "object-hook/hook-weapon.h"
  #include "object/object-flags.h"
 -#include "player-status/player-basic-statistics.h"
 +#include "player-ability/player-basic-statistics.h"
 +#include "player-ability/player-speed.h"
 +#include "player-ability/player-stealth.h"
 +#include "player-status/player-hand-types.h"
+ #include "player-status/player-infravision.h"
 -#include "player-status/player-speed.h"
 -#include "player-status/player-stealth.h"
  #include "player/attack-defense-types.h"
 +#include "player/digestion-processor.h"
  #include "player/mimic-info-table.h"
  #include "player/player-class.h"
  #include "player/player-race-types.h"

diff --cc src/player/player-status.cpp
index 42fd274,6b5e068..30af94f
--- 1/src/player/player-status.cpp
--- 2/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@@ -60,11 -60,11 +60,12 @@@
  #include "object/object-mark-types.h"
  #include "perception/object-perception.h"
  #include "pet/pet-util.h"
 +#include "player-ability/player-basic-statistics.h"
 +#include "player-ability/player-speed.h"
 +#include "player-ability/player-stealth.h"
  #include "player-info/avatar.h"
 -#include "player-status/player-basic-statistics.h"
 +#include "player-status/player-hand-types.h"
+ #include "player-status/player-infravision.h"
 -#include "player-status/player-speed.h"
 -#include "player-status/player-stealth.h"
  #include "player/attack-defense-types.h"
  #include "player/digestion-processor.h"
  #include "player/mimic-info-table.h"
@@@ -108,11 -108,8 +109,10 @@@
  #include "view/display-messages.h"
  #include "world/world.h"
  
 +static const int extra_magic_glove_reduce_mana = 1;
 +
  static bool is_martial_arts_mode(player_type *creature_ptr);
  
- static ACTION_SKILL_POWER calc_intra_vision(player_type *creature_ptr);
  static ACTION_SKILL_POWER calc_disarming(player_type *creature_ptr);
  static ACTION_SKILL_POWER calc_device_ability(player_type *creature_ptr);
  static ACTION_SKILL_POWER calc_saving_throw(player_type *creature_ptr);