#include "dungeon/dungeon-flag-types.h"
#include "monster-race/race-ability-flags.h"
+#include "monster-race/race-behavior-flags.h"
+#include "monster-race/race-drop-flags.h"
+#include "monster-race/race-flags-resistance.h"
+#include "monster-race/race-kind-flags.h"
+#include "monster-race/race-resistance-mask.h"
+#include "monster-race/race-visual-flags.h"
+#include "monster-race/race-wilderness-flags.h"
#include "system/angband.h"
#include "util/flag-group.h"
#define DUNGEON_FEAT_PROB_NUM 3
-#define DUNGEON_ANGBAND 1
-#define DUNGEON_GALGALS 2
-#define DUNGEON_ORC 3
-#define DUNGEON_MAZE 4
-#define DUNGEON_DRAGON 5
-#define DUNGEON_GRAVE 6
-#define DUNGEON_WOOD 7
-#define DUNGEON_VOLCANO 8
-#define DUNGEON_HELL 9
-#define DUNGEON_HEAVEN 10
-#define DUNGEON_OCEAN 11
-#define DUNGEON_CASTLE 12
-#define DUNGEON_CTH 13
+#define DUNGEON_ANGBAND 1
+#define DUNGEON_GALGALS 2
+#define DUNGEON_ORC 3
+#define DUNGEON_MAZE 4
+#define DUNGEON_DRAGON 5
+#define DUNGEON_GRAVE 6
+#define DUNGEON_WOOD 7
+#define DUNGEON_VOLCANO 8
+#define DUNGEON_HELL 9
+#define DUNGEON_HEAVEN 10
+#define DUNGEON_OCEAN 11
+#define DUNGEON_CASTLE 12
+#define DUNGEON_CTH 13
#define DUNGEON_MOUNTAIN 14
-#define DUNGEON_GOLD 15
+#define DUNGEON_GOLD 15
#define DUNGEON_NO_MAGIC 16
#define DUNGEON_NO_MELEE 17
#define DUNGEON_CHAMELEON 18
#define DUNGEON_DARKNESS 19
#define DUNGEON_MAX 19
-typedef struct feat_prob {
+enum class MonsterRaceId : int16_t;
+
+struct feat_prob {
FEAT_IDX feat{}; /* Feature tile */
PERCENTAGE percent{}; /* Chance of type */
-} feat_prob;
+};
/* A structure for the != dungeon types */
-typedef struct dungeon_type {
+struct dungeon_type {
+ DUNGEON_IDX idx{};
- std::string name; /* Name */
+ std::string name; /* Name */
std::string text; /* Description */
- POSITION dy{};
- POSITION dx{};
-
- feat_prob floor[DUNGEON_FEAT_PROB_NUM]{}; /* Floor probability */
- feat_prob fill[DUNGEON_FEAT_PROB_NUM]{}; /* Cave wall probability */
- FEAT_IDX outer_wall{}; /* Outer wall tile */
- FEAT_IDX inner_wall{}; /* Inner wall tile */
- FEAT_IDX stream1{}; /* stream tile */
- FEAT_IDX stream2{}; /* stream tile */
-
- DEPTH mindepth{}; /* Minimal depth */
- DEPTH maxdepth{}; /* Maximal depth */
- PLAYER_LEVEL min_plev{}; /* Minimal plev needed to enter -- it's an anti-cheating mesure */
- BIT_FLAGS16 pit{};
- BIT_FLAGS16 nest{};
- BIT_FLAGS8 mode{}; /* Mode of combinaison of the monster flags */
-
- int min_m_alloc_level{}; /* Minimal number of monsters per level */
- int max_m_alloc_chance{}; /* There is a 1/max_m_alloc_chance chance per round of creating a new monster */
-
- EnumClassFlagGroup<DF> flags{}; /* Dungeon Flags */
-
- BIT_FLAGS mflags1{}; /* The monster flags that are allowed */
- BIT_FLAGS mflags2{};
- BIT_FLAGS mflags3{};
- BIT_FLAGS mflags7{};
- BIT_FLAGS mflags8{};
- BIT_FLAGS mflags9{};
- BIT_FLAGS mflagsr{};
-
- EnumClassFlagGroup<RF_ABILITY> m_ability_flags;
-
- char r_char[5]{}; /* Monster race allowed */
- KIND_OBJECT_IDX final_object{}; /* The object you'll find at the bottom */
- ARTIFACT_IDX final_artifact{}; /* The artifact you'll find at the bottom */
- MONRACE_IDX final_guardian{}; /* The artifact's guardian. If an artifact is specified, then it's NEEDED */
-
- PROB special_div{}; /* % of monsters affected by the flags/races allowed, to add some variety */
- int tunnel_percent{};
- int obj_great{};
- int obj_good{};
-} dungeon_type;
-
-extern DEPTH *max_dlv;
+ POSITION dy{};
+ POSITION dx{};
+
+ feat_prob floor[DUNGEON_FEAT_PROB_NUM]{}; /* Floor probability */
+ feat_prob fill[DUNGEON_FEAT_PROB_NUM]{}; /* Cave wall probability */
+ FEAT_IDX outer_wall{}; /* Outer wall tile */
+ FEAT_IDX inner_wall{}; /* Inner wall tile */
+ FEAT_IDX stream1{}; /* stream tile */
+ FEAT_IDX stream2{}; /* stream tile */
+
+ DEPTH mindepth{}; /* Minimal depth */
+ DEPTH maxdepth{}; /* Maximal depth */
+ PLAYER_LEVEL min_plev{}; /* Minimal plev needed to enter -- it's an anti-cheating mesure */
+ BIT_FLAGS16 pit{};
+ BIT_FLAGS16 nest{};
+ BIT_FLAGS8 mode{}; /* Mode of combinaison of the monster flags */
+
+ int min_m_alloc_level{}; /* Minimal number of monsters per level */
+ int max_m_alloc_chance{}; /* There is a 1/max_m_alloc_chance chance per round of creating a new monster */
+
+ EnumClassFlagGroup<DungeonFeatureType> flags{}; /* Dungeon Flags */
+
+ BIT_FLAGS mflags1{}; /* The monster flags that are allowed */
+ BIT_FLAGS mflags2{};
+ BIT_FLAGS mflags3{};
+ BIT_FLAGS mflags7{};
+ BIT_FLAGS mflags8{};
+ BIT_FLAGS mflags9{};
+
+ EnumClassFlagGroup<MonsterAbilityType> mon_ability_flags;
+ EnumClassFlagGroup<MonsterBehaviorType> mon_behavior_flags;
+ EnumClassFlagGroup<MonsterVisualType> mon_visual_flags;
+ EnumClassFlagGroup<MonsterKindType> mon_kind_flags;
+ EnumClassFlagGroup<MonsterResistanceType> mon_resistance_flags;
+ EnumClassFlagGroup<MonsterDropType> mon_drop_flags;
+ EnumClassFlagGroup<MonsterWildernessType> mon_wilderness_flags;
+
+ char r_char[5]{}; /* Monster race allowed */
+ KIND_OBJECT_IDX final_object{}; /* The object you'll find at the bottom */
+ ARTIFACT_IDX final_artifact{}; /* The artifact you'll find at the bottom */
+ MonsterRaceId final_guardian{}; /* The artifact's guardian. If an artifact is specified, then it's NEEDED */
+
+ PROB special_div{}; /* % of monsters affected by the flags/races allowed, to add some variety */
+ int tunnel_percent{};
+ int obj_great{};
+ int obj_good{};
+};
+
+extern std::vector<DEPTH> max_dlv;
extern std::vector<dungeon_type> d_info;
-struct player_type;
+class PlayerType;
DUNGEON_IDX choose_dungeon(concptr note, POSITION y, POSITION x);
-bool is_in_dungeon(player_type *creature_ptr);
+bool is_in_dungeon(PlayerType *player_ptr);
OSDN Git Service
