Merge pull request #2437 from Slimebreath6078/feature/Refactor_mflag_wilderness

モンスターのフラグをまとめる（荒野）

diff --cc Hengband/Hengband/Hengband.vcxproj
Simple merge

diff --cc Hengband/Hengband/Hengband.vcxproj.filters
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/dungeon/dungeon.h
Simple merge

diff --cc src/info-reader/dungeon-reader.cpp
Simple merge

diff --cc src/info-reader/race-info-tokens-table.cpp
Simple merge

diff --cc src/info-reader/race-info-tokens-table.h
index 5abfee9,bf8b267..466a3c7
--- 1/src/info-reader/race-info-tokens-table.h
--- 2/src/info-reader/race-info-tokens-table.h
+++ b/src/info-reader/race-info-tokens-table.h
@@@ -12,8 -12,10 +12,9 @@@
  #include "monster-race/race-flags3.h"
  #include "monster-race/race-flags7.h"
  #include "monster-race/race-flags8.h"
 -#include "monster-race/race-flags9.h"
  #include "monster-race/race-kind-flags.h"
  #include "monster-race/race-visual-flags.h"
+ #include "monster-race/race-wilderness-flags.h"
  #include "system/angband.h"
  
  #include <string_view>

diff --cc src/info-reader/race-reader.cpp
Simple merge

diff --cc src/monster/monster-util.cpp
Simple merge

diff --cc src/system/monster-race-definition.h
Simple merge