[Feature] モンスターの元RF2以外の地形関連特性フラグが調査で満たされるように変更

具体的にはAQUATIC、CAN_SWIM、CAN_FLYの3つ

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 8f5b363..f4d9022 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -275,7 +275,6 @@
     <ClCompile Include="..\..\src\load\player-class-specific-data-loader.cpp" />\r
     <ClCompile Include="..\..\src\main-win\main-win-exception.cpp" />\r
     <ClCompile Include="..\..\src\monster-race\race-brightness-mask.cpp" />\r
-    <ClCompile Include="..\..\src\monster-race\race-feature-mask.cpp" />\r
     <ClCompile Include="..\..\src\monster-race\race-sex-const.cpp" />\r
     <ClCompile Include="..\..\src\monster\monster-pain-describer.cpp" />\r
     <ClCompile Include="..\..\src\net\curl-easy-session.cpp" />\r
@@ -989,7 +988,6 @@
     <ClInclude Include="..\..\src\monster-race\race-brightness-mask.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-drop-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-feature-flags.h" />\r
-    <ClInclude Include="..\..\src\monster-race\race-feature-mask.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-kind-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-population-flags.h" />\r
     <ClInclude Include="..\..\src\monster-race\race-resistance-mask.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index fb42be2..eda5dd4 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2421,9 +2421,6 @@
     <ClCompile Include="..\..\src\mspell\mspell-attack\mspell-particularity.cpp">\r
       <Filter>mspell\mspell-attack</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\monster-race\race-feature-mask.cpp">\r
-      <Filter>monster-race</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\timed-effect\player-acceleration.cpp">\r
       <Filter>timed-effect</Filter>\r
     </ClCompile>\r
@@ -5328,9 +5325,6 @@
     <ClInclude Include="..\..\src\monster-race\race-feature-flags.h">\r
       <Filter>monster-race</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\monster-race\race-feature-mask.h">\r
-      <Filter>monster-race</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\timed-effect\player-acceleration.h">\r
       <Filter>timed-effect</Filter>\r
     </ClInclude>\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 77b3661..35671a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -518,7 +518,6 @@ hengband_SOURCES = \
        monster-race/race-brightness-mask.h monster-race/race-brightness-mask.cpp \
        monster-race/race-drop-flags.h \
        monster-race/race-feature-flags.h \
-       monster-race/race-feature-mask.cpp monster-race/race-feature-mask.h \
        monster-race/race-flags-resistance.h \
        monster-race/race-flags1.h monster-race/race-flags2.h \
        monster-race/race-flags3.h \

diff --git a/src/lore/lore-store.cpp b/src/lore/lore-store.cpp
index e480ab9..fed7283 100644 (file)
--- a/src/lore/lore-store.cpp
+++ b/src/lore/lore-store.cpp
@@ -7,7 +7,6 @@
 #include "lore/lore-store.h"
 #include "core/window-redrawer.h"
 #include "monster-race/monster-race.h"
-#include "monster-race/race-feature-mask.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-info.h"
 #include "system/floor-type-definition.h"
@@ -95,7 +94,7 @@ int lore_do_probe(PlayerType *player_ptr, MonsterRaceId r_idx)
     n += count_lore_mflag_group(r_ptr->ability_flags, r_ptr->r_ability_flags);
     n += count_lore_mflag_group(r_ptr->behavior_flags, r_ptr->r_behavior_flags);
     n += count_lore_mflag_group(r_ptr->drop_flags, r_ptr->r_drop_flags);
-    n += count_lore_mflag_group(r_ptr->feature_flags & feature_lore_flags2, r_ptr->r_feature_flags);
+    n += count_lore_mflag_group(r_ptr->feature_flags, r_ptr->r_feature_flags);
 
     r_ptr->r_flags1 = r_ptr->flags1;
     r_ptr->r_flags2 = r_ptr->flags2;
@@ -104,7 +103,7 @@ int lore_do_probe(PlayerType *player_ptr, MonsterRaceId r_idx)
     r_ptr->r_ability_flags = r_ptr->ability_flags;
     r_ptr->r_behavior_flags = r_ptr->behavior_flags;
     r_ptr->r_drop_flags = r_ptr->drop_flags;
-    r_ptr->r_feature_flags.set(r_ptr->feature_flags & feature_lore_flags2);
+    r_ptr->r_feature_flags = r_ptr->feature_flags;
 
     if (!r_ptr->r_can_evolve) {
         n++;

diff --git a/src/monster-race/race-feature-mask.cpp b/src/monster-race/race-feature-mask.cpp
deleted file mode 100644 (file)
index 8e77998..0000000
--- a/src/monster-race/race-feature-mask.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "monster-race/race-feature-mask.h"
-
-const EnumClassFlagGroup<MonsterFeatureType> feature_lore_flags2 = {
-    MonsterFeatureType::PASS_WALL,
-    MonsterFeatureType::KILL_WALL
-};

diff --git a/src/monster-race/race-feature-mask.h b/src/monster-race/race-feature-mask.h
deleted file mode 100644 (file)
index 9f328cd..0000000
--- a/src/monster-race/race-feature-mask.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "monster-race/race-feature-flags.h"
-#include "util/flag-group.h"
-
-extern const EnumClassFlagGroup<MonsterFeatureType> feature_lore_flags2;