-/*!
+/*!
* @brief モンスターをフロアに1体配置する処理
* @date 2020/06/13
* @author Hourier
*/
#include "monster-floor/one-monster-placer.h"
-#include "core/player-update-types.h"
#include "core/speed-table.h"
#include "dungeon/quest.h"
+#include "effect/attribute-types.h"
#include "effect/effect-characteristics.h"
#include "effect/effect-processor.h"
#include "flavor/flavor-describer.h"
#include "game-option/birth-options.h"
#include "game-option/cheat-types.h"
#include "grid/grid.h"
-#include "monster-attack/monster-attack-types.h"
+#include "monster-attack/monster-attack-table.h"
#include "monster-floor/monster-move.h"
#include "monster-floor/monster-summon.h"
#include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-kind-mask.h"
#include "monster-race/monster-race.h"
+#include "monster-race/race-brightness-mask.h"
#include "monster-race/race-flags1.h"
#include "monster-race/race-flags2.h"
#include "monster-race/race-flags3.h"
#include "monster-race/race-flags7.h"
#include "monster-race/race-indice-types.h"
+#include "monster-race/race-misc-flags.h"
#include "monster/monster-flag-types.h"
#include "monster/monster-info.h"
#include "monster/monster-list.h"
#include "monster/monster-util.h"
#include "object/warning.h"
#include "player/player-status.h"
-#include "spell/spell-types.h"
+#include "system/angband-system.h"
#include "system/floor-type-definition.h"
#include "system/grid-type-definition.h"
-#include "system/monster-race-definition.h"
+#include "system/monster-race-info.h"
#include "system/player-type-definition.h"
+#include "system/redrawing-flags-updater.h"
#include "util/bit-flags-calculator.h"
#include "view/display-messages.h"
#include "wizard/wizard-messages.h"
#include "world/world.h"
-static bool is_friendly_idx(player_type *player_ptr, MONSTER_IDX m_idx)
+static bool is_friendly_idx(PlayerType *player_ptr, MONSTER_IDX m_idx)
{
- return m_idx > 0 && is_friendly(&player_ptr->current_floor_ptr->m_list[(m_idx)]);
+ if (m_idx == 0) {
+ return false;
+ }
+
+ const auto &m_ref = player_ptr->current_floor_ptr->m_list[m_idx];
+ return m_ref.is_friendly();
}
/*!
* @return 対象にできるならtrueを返す
* @todo グローバル変数対策の上 monster_hook.cへ移す。
*/
-static bool monster_hook_tanuki(player_type *player_ptr, MONRACE_IDX r_idx)
+static bool monster_hook_tanuki(PlayerType *player_ptr, MonsterRaceId r_idx)
{
- monster_race *r_ptr = &r_info[r_idx];
- bool unselectable = any_bits(r_ptr->flags1, RF1_UNIQUE);
- unselectable |= any_bits(r_ptr->flags2, RF2_MULTIPLY);
- unselectable |= any_bits(r_ptr->flags7, RF7_FRIENDLY | RF7_CHAMELEON);
- unselectable |= any_bits(r_ptr->flags7, RF7_AQUATIC);
- if (unselectable)
+ const auto &monrace = monraces_info[r_idx];
+ bool unselectable = monrace.kind_flags.has(MonsterKindType::UNIQUE);
+ unselectable |= any_bits(monrace.flags2, RF2_MULTIPLY);
+ unselectable |= monrace.behavior_flags.has(MonsterBehaviorType::FRIENDLY);
+ unselectable |= monrace.feature_flags.has(MonsterFeatureType::AQUATIC);
+ unselectable |= any_bits(monrace.flags7, RF7_CHAMELEON);
+ unselectable |= monrace.is_explodable();
+ if (unselectable) {
return false;
+ }
- for (int i = 0; i < 4; i++)
- if (r_ptr->blow[i].method == RBM_EXPLODE)
- return false;
-
- return (*(get_monster_hook(player_ptr)))(player_ptr, r_idx);
+ auto hook_pf = get_monster_hook(player_ptr);
+ return (*hook_pf)(player_ptr, r_idx);
}
/*!
- * @param player_ptr ã\83\97ã\83¬ã\83¼ヤーへの参照ポインタ
+ * @param player_ptr ã\83\97ã\83¬ã\82¤ヤーへの参照ポインタ
* @brief モンスターの表層IDを設定する / Set initial racial appearance of a monster
* @param r_idx モンスター種族ID
* @return モンスター種族の表層ID
*/
-static MONRACE_IDX initial_r_appearance(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS generate_mode)
+static MonsterRaceId initial_r_appearance(PlayerType *player_ptr, MonsterRaceId r_idx, BIT_FLAGS generate_mode)
{
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
- if (is_chargeman(player_ptr) && any_bits(generate_mode, PM_JURAL) && none_bits(generate_mode, PM_MULTIPLY | PM_KAGE))
- return MON_ALIEN_JURAL;
+ auto *floor_ptr = player_ptr->current_floor_ptr;
+ if (is_chargeman(player_ptr) && any_bits(generate_mode, PM_JURAL) && none_bits(generate_mode, PM_MULTIPLY | PM_KAGE)) {
+ return MonsterRaceId::ALIEN_JURAL;
+ }
- if (none_bits(r_info[r_idx].flags7, RF7_TANUKI))
+ if (none_bits(monraces_info[r_idx].flags7, RF7_TANUKI)) {
return r_idx;
+ }
get_mon_num_prep(player_ptr, monster_hook_tanuki, nullptr);
int attempts = 1000;
- DEPTH min = MIN(floor_ptr->base_level - 5, 50);
+ DEPTH min = std::min(floor_ptr->base_level - 5, 50);
while (--attempts) {
- MONRACE_IDX ap_r_idx = get_mon_num(player_ptr, 0, floor_ptr->base_level + 10, 0);
- if (r_info[ap_r_idx].level >= min)
+ auto ap_r_idx = get_mon_num(player_ptr, 0, floor_ptr->base_level + 10, PM_NONE);
+ if (monraces_info[ap_r_idx].level >= min) {
return ap_r_idx;
+ }
}
return r_idx;
/*!
* @brief ユニークが生成可能か評価する
- * @param player_ptr ã\83\97ã\83¬ã\83¼ヤーへの参照ポインタ
+ * @param player_ptr ã\83\97ã\83¬ã\82¤ヤーへの参照ポインタ
* @param r_idx 生成モンスター種族
* @return ユニークの生成が不可能な条件ならFALSE、それ以外はTRUE
*/
-static bool check_unique_placeable(player_type *player_ptr, MONRACE_IDX r_idx)
+static bool check_unique_placeable(const FloorType &floor, MonsterRaceId r_idx, BIT_FLAGS mode)
{
- if (player_ptr->phase_out)
+ if (AngbandSystem::get_instance().is_phase_out()) {
return true;
+ }
- monster_race *r_ptr = &r_info[r_idx];
- if ((any_bits(r_ptr->flags1, RF1_UNIQUE) || any_bits(r_ptr->flags7, RF7_NAZGUL)) && (r_ptr->cur_num >= r_ptr->max_num)) {
- return false;
+ if (any_bits(mode, PM_CLONE)) {
+ return true;
}
- if (any_bits(r_ptr->flags7, RF7_UNIQUE2) && (r_ptr->cur_num >= 1)) {
+ auto *r_ptr = &monraces_info[r_idx];
+ auto is_unique = r_ptr->kind_flags.has(MonsterKindType::UNIQUE) || r_ptr->population_flags.has(MonsterPopulationType::NAZGUL);
+ is_unique &= r_ptr->cur_num >= r_ptr->max_num;
+ if (is_unique) {
return false;
}
- if (r_idx == MON_BANORLUPART) {
- if (r_info[MON_BANOR].cur_num > 0)
- return false;
- if (r_info[MON_LUPART].cur_num > 0)
- return false;
+ if (r_ptr->population_flags.has(MonsterPopulationType::ONLY_ONE) && (r_ptr->cur_num >= 1)) {
+ return false;
}
- if (any_bits(r_ptr->flags1, RF1_FORCE_DEPTH) && (player_ptr->current_floor_ptr->dun_level < r_ptr->level)
- && (!ironman_nightmare || any_bits(r_ptr->flags1, RF1_QUESTOR))) {
+ if (!MonraceList::get_instance().is_selectable(r_idx)) {
return false;
}
- return true;
+ const auto is_deep = r_ptr->misc_flags.has(MonsterMiscType::FORCE_DEPTH) && (floor.dun_level < r_ptr->level);
+ const auto is_questor = !ironman_nightmare || any_bits(r_ptr->flags1, RF1_QUESTOR);
+ return !is_deep || !is_questor;
}
/*!
* @brief クエスト内に生成可能か評価する
- * @param player_ptr プレーヤーへの参照ポインタ
+ * @param floor フロアへの参照
* @param r_idx 生成モンスター種族
* @return 生成が可能ならTRUE、不可能ならFALSE
*/
-static bool check_quest_placeable(player_type *player_ptr, MONRACE_IDX r_idx)
+static bool check_quest_placeable(const FloorType &floor, MonsterRaceId r_idx)
{
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
- if (quest_number(player_ptr, floor_ptr->dun_level) == 0)
+ if (!inside_quest(floor.get_quest_id())) {
return true;
+ }
- int hoge = quest_number(player_ptr, floor_ptr->dun_level);
- if ((quest[hoge].type != QUEST_TYPE_KILL_LEVEL) && (quest[hoge].type != QUEST_TYPE_RANDOM))
+ const auto &quest_list = QuestList::get_instance();
+ QuestId number = floor.get_quest_id();
+ const auto *q_ptr = &quest_list[number];
+ if ((q_ptr->type != QuestKindType::KILL_LEVEL) && (q_ptr->type != QuestKindType::RANDOM)) {
return true;
-
- if (r_idx != quest[hoge].r_idx)
+ }
+ if (r_idx != q_ptr->r_idx) {
return true;
-
+ }
int number_mon = 0;
- for (int i2 = 0; i2 < floor_ptr->width; ++i2)
- for (int j2 = 0; j2 < floor_ptr->height; j2++)
- if ((floor_ptr->grid_array[j2][i2].m_idx > 0) && (floor_ptr->m_list[floor_ptr->grid_array[j2][i2].m_idx].r_idx == quest[hoge].r_idx))
+ for (int i2 = 0; i2 < floor.width; ++i2) {
+ for (int j2 = 0; j2 < floor.height; j2++) {
+ auto quest_monster = (floor.grid_array[j2][i2].m_idx > 0);
+ quest_monster &= (floor.m_list[floor.grid_array[j2][i2].m_idx].r_idx == q_ptr->r_idx);
+ if (quest_monster) {
number_mon++;
+ }
+ }
+ }
- if (number_mon + quest[hoge].cur_num >= quest[hoge].max_num)
+ if (number_mon + q_ptr->cur_num >= q_ptr->max_num) {
return false;
-
+ }
return true;
}
/*!
* @brief 守りのルーン上にモンスターの配置を試みる
- * @param player_ptr ã\83\97ã\83¬ã\83¼ヤーへの参照ポインタ
+ * @param player_ptr ã\83\97ã\83¬ã\82¤ヤーへの参照ポインタ
* @param r_idx 生成モンスター種族
* @param y 生成位置y座標
* @param x 生成位置x座標
* @return 生成が可能ならTRUE、不可能ならFALSE
*/
-static bool check_procection_rune(player_type *player_ptr, MONRACE_IDX r_idx, POSITION y, POSITION x)
+static bool check_procection_rune(PlayerType *player_ptr, MonsterRaceId r_idx, POSITION y, POSITION x)
{
- grid_type *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
- if (!g_ptr->is_rune_protection())
+ auto *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
+ if (!g_ptr->is_rune_protection()) {
return true;
+ }
- monster_race *r_ptr = &r_info[r_idx];
- if (randint1(BREAK_RUNE_PROTECTION) >= (r_ptr->level + 20))
+ auto *r_ptr = &monraces_info[r_idx];
+ if (randint1(BREAK_RUNE_PROTECTION) >= (r_ptr->level + 20)) {
return false;
+ }
- if (any_bits(g_ptr->info, CAVE_MARK))
+ if (any_bits(g_ptr->info, CAVE_MARK)) {
msg_print(_("守りのルーンが壊れた！", "The rune of protection is broken!"));
+ }
reset_bits(g_ptr->info, CAVE_MARK);
reset_bits(g_ptr->info, CAVE_OBJECT);
return true;
}
-static void warn_unique_generation(player_type *player_ptr, MONRACE_IDX r_idx)
+static void warn_unique_generation(PlayerType *player_ptr, MonsterRaceId r_idx)
{
- if (!player_ptr->warning || !current_world_ptr->character_dungeon)
+ if (!player_ptr->warning || !w_ptr->character_dungeon) {
return;
+ }
- monster_race *r_ptr = &r_info[r_idx];
- if (none_bits(r_ptr->flags1, RF1_UNIQUE))
+ auto *r_ptr = &monraces_info[r_idx];
+ if (r_ptr->kind_flags.has_not(MonsterKindType::UNIQUE)) {
return;
+ }
- concptr color;
- object_type *o_ptr;
- GAME_TEXT o_name[MAX_NLEN];
- if (r_ptr->level > player_ptr->lev + 30)
+ std::string color;
+ if (r_ptr->level > player_ptr->lev + 30) {
color = _("黒く", "black");
- else if (r_ptr->level > player_ptr->lev + 15)
+ } else if (r_ptr->level > player_ptr->lev + 15) {
color = _("紫色に", "purple");
- else if (r_ptr->level > player_ptr->lev + 5)
+ } else if (r_ptr->level > player_ptr->lev + 5) {
color = _("ルビー色に", "deep red");
- else if (r_ptr->level > player_ptr->lev - 5)
+ } else if (r_ptr->level > player_ptr->lev - 5) {
color = _("赤く", "red");
- else if (r_ptr->level > player_ptr->lev - 15)
+ } else if (r_ptr->level > player_ptr->lev - 15) {
color = _("ピンク色に", "pink");
- else
+ } else {
color = _("白く", "white");
+ }
- o_ptr = choose_warning_item(player_ptr);
+ auto *o_ptr = choose_warning_item(player_ptr);
if (o_ptr != nullptr) {
- describe_flavor(player_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
- msg_format(_("%sは%s光った。", "%s glows %s."), o_name, color);
+ const auto item_name = describe_flavor(player_ptr, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ msg_format(_("%sは%s光った。", "%s glows %s."), item_name.data(), color.data());
} else {
- msg_format(_("%s光る物が頭に浮かんだ。", "A %s image forms in your mind."), color);
+ msg_format(_("%s光る物が頭に浮かんだ。", "A %s image forms in your mind."), color.data());
}
}
/*!
* @brief モンスターを一体生成する / Attempt to place a monster of the given race at the given location.
- * @param player_ptr ã\83\97ã\83¬ã\83¼ヤーへの参照ポインタ
+ * @param player_ptr ã\83\97ã\83¬ã\82¤ヤーへの参照ポインタ
* @param who 召喚を行ったモンスターID
* @param y 生成位置y座標
* @param x 生成位置x座標
* @param mode 生成オプション
* @return 成功したらtrue
*/
-bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode)
+bool place_monster_one(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MonsterRaceId r_idx, BIT_FLAGS mode)
{
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
- grid_type *g_ptr = &floor_ptr->grid_array[y][x];
- monster_race *r_ptr = &r_info[r_idx];
- concptr name = r_ptr->name.c_str();
+ auto &floor = *player_ptr->current_floor_ptr;
+ auto *g_ptr = &floor.grid_array[y][x];
+ auto *r_ptr = &monraces_info[r_idx];
+ concptr name = r_ptr->name.data();
- if (player_ptr->wild_mode || !in_bounds(floor_ptr, y, x) || (r_idx == 0) || r_ptr->name.empty())
+ if (player_ptr->wild_mode || !in_bounds(&floor, y, x) || !MonsterRace(r_idx).is_valid()) {
return false;
+ }
- if (none_bits(mode, PM_IGNORE_TERRAIN) && (pattern_tile(floor_ptr, y, x) || !monster_can_enter(player_ptr, y, x, r_ptr, 0)))
+ if (none_bits(mode, PM_IGNORE_TERRAIN) && (pattern_tile(&floor, y, x) || !monster_can_enter(player_ptr, y, x, r_ptr, 0))) {
return false;
+ }
- if (!check_unique_placeable(player_ptr, r_idx) || !check_quest_placeable(player_ptr, r_idx) || !check_procection_rune(player_ptr, r_idx, y, x))
+ if (!check_unique_placeable(floor, r_idx, mode) || !check_quest_placeable(floor, r_idx) || !check_procection_rune(player_ptr, r_idx, y, x)) {
return false;
+ }
msg_format_wizard(player_ptr, CHEAT_MONSTER, _("%s(Lv%d)を生成しました。", "%s(Lv%d) was generated."), name, r_ptr->level);
- if (any_bits(r_ptr->flags1, RF1_UNIQUE) || any_bits(r_ptr->flags7, RF7_NAZGUL) || (r_ptr->level < 10))
+ if (r_ptr->kind_flags.has(MonsterKindType::UNIQUE) || r_ptr->population_flags.has(MonsterPopulationType::NAZGUL) || (r_ptr->level < 10)) {
reset_bits(mode, PM_KAGE);
+ }
- g_ptr->m_idx = m_pop(floor_ptr);
+ g_ptr->m_idx = m_pop(&floor);
hack_m_idx_ii = g_ptr->m_idx;
- if (!g_ptr->m_idx)
+ if (!g_ptr->m_idx) {
return false;
+ }
- monster_type *m_ptr;
- m_ptr = &floor_ptr->m_list[g_ptr->m_idx];
+ MonsterEntity *m_ptr;
+ m_ptr = &floor.m_list[g_ptr->m_idx];
m_ptr->r_idx = r_idx;
m_ptr->ap_r_idx = initial_r_appearance(player_ptr, r_idx, mode);
m_ptr->mflag.clear();
m_ptr->mflag2.clear();
- if (any_bits(mode, PM_MULTIPLY) && (who > 0) && !is_original_ap(&floor_ptr->m_list[who])) {
- m_ptr->ap_r_idx = floor_ptr->m_list[who].ap_r_idx;
- if (floor_ptr->m_list[who].mflag2.has(MFLAG2::KAGE))
- m_ptr->mflag2.set(MFLAG2::KAGE);
+ if (any_bits(mode, PM_MULTIPLY) && (who > 0) && !floor.m_list[who].is_original_ap()) {
+ m_ptr->ap_r_idx = floor.m_list[who].ap_r_idx;
+ if (floor.m_list[who].mflag2.has(MonsterConstantFlagType::KAGE)) {
+ m_ptr->mflag2.set(MonsterConstantFlagType::KAGE);
+ }
}
- if ((who > 0) && none_bits(r_ptr->flags3, RF3_EVIL | RF3_GOOD))
- m_ptr->sub_align = floor_ptr->m_list[who].sub_align;
- else {
+ if ((who > 0) && r_ptr->kind_flags.has_none_of(alignment_mask)) {
+ m_ptr->sub_align = floor.m_list[who].sub_align;
+ } else {
m_ptr->sub_align = SUB_ALIGN_NEUTRAL;
- if (any_bits(r_ptr->flags3, RF3_EVIL))
+ if (r_ptr->kind_flags.has(MonsterKindType::EVIL)) {
set_bits(m_ptr->sub_align, SUB_ALIGN_EVIL);
- if (any_bits(r_ptr->flags3, RF3_GOOD))
+ }
+ if (r_ptr->kind_flags.has(MonsterKindType::GOOD)) {
set_bits(m_ptr->sub_align, SUB_ALIGN_GOOD);
+ }
}
m_ptr->fy = y;
m_ptr->fx = x;
- m_ptr->current_floor_ptr = floor_ptr;
+ m_ptr->current_floor_ptr = &floor;
- for (int cmi = 0; cmi < MAX_MTIMED; cmi++)
+ for (int cmi = 0; cmi < MAX_MTIMED; cmi++) {
m_ptr->mtimed[cmi] = 0;
+ }
m_ptr->cdis = 0;
reset_target(m_ptr);
- m_ptr->nickname = 0;
+ m_ptr->nickname.clear();
m_ptr->exp = 0;
- if (who > 0 && is_pet(&floor_ptr->m_list[who])) {
+ if (who > 0 && floor.m_list[who].is_pet()) {
set_bits(mode, PM_FORCE_PET);
m_ptr->parent_m_idx = who;
} else {
}
if (any_bits(r_ptr->flags7, RF7_CHAMELEON)) {
- choose_new_monster(player_ptr, g_ptr->m_idx, true, 0);
- r_ptr = &r_info[m_ptr->r_idx];
- m_ptr->mflag2.set(MFLAG2::CHAMELEON);
- if (any_bits(r_ptr->flags1, RF1_UNIQUE) && (who <= 0))
+ choose_new_monster(player_ptr, g_ptr->m_idx, true, MonsterRace::empty_id());
+ r_ptr = &m_ptr->get_monrace();
+ m_ptr->mflag2.set(MonsterConstantFlagType::CHAMELEON);
+ if (r_ptr->kind_flags.has(MonsterKindType::UNIQUE) && (who <= 0)) {
m_ptr->sub_align = SUB_ALIGN_NEUTRAL;
+ }
} else if (any_bits(mode, PM_KAGE) && none_bits(mode, PM_FORCE_PET)) {
- m_ptr->ap_r_idx = MON_KAGE;
- m_ptr->mflag2.set(MFLAG2::KAGE);
+ m_ptr->ap_r_idx = MonsterRaceId::KAGE;
+ m_ptr->mflag2.set(MonsterConstantFlagType::KAGE);
}
- if (any_bits(mode, PM_NO_PET))
- m_ptr->mflag2.set(MFLAG2::NOPET);
+ if (any_bits(mode, PM_CLONE)) {
+ m_ptr->mflag2.set(MonsterConstantFlagType::CLONED);
+ }
+
+ if (any_bits(mode, PM_NO_PET)) {
+ m_ptr->mflag2.set(MonsterConstantFlagType::NOPET);
+ }
m_ptr->ml = false;
if (any_bits(mode, PM_FORCE_PET)) {
set_pet(player_ptr, m_ptr);
- } else if (((who == 0) && any_bits(r_ptr->flags7, RF7_FRIENDLY)) || is_friendly_idx(player_ptr, who) || any_bits(mode, PM_FORCE_FRIENDLY)) {
- if (!monster_has_hostile_align(player_ptr, nullptr, 0, -1, r_ptr) && !player_ptr->current_floor_ptr->inside_arena)
+ } else if (((who == 0) && r_ptr->behavior_flags.has(MonsterBehaviorType::FRIENDLY)) || is_friendly_idx(player_ptr, who) || any_bits(mode, PM_FORCE_FRIENDLY)) {
+ if (!monster_has_hostile_align(player_ptr, nullptr, 0, -1, r_ptr) && !player_ptr->current_floor_ptr->inside_arena) {
set_friendly(m_ptr);
+ }
}
m_ptr->mtimed[MTIMED_CSLEEP] = 0;
}
if (ironman_nightmare) {
- uint32_t hp = m_ptr->max_maxhp * 2L;
-
- m_ptr->max_maxhp = (HIT_POINT)MIN(30000, hp);
+ auto hp = m_ptr->max_maxhp * 2;
+ m_ptr->max_maxhp = std::min(MONSTER_MAXHP, hp);
}
m_ptr->maxhp = m_ptr->max_maxhp;
- if (m_ptr->r_idx == MON_WOUNDED_BEAR)
- m_ptr->hp = m_ptr->maxhp / 2;
- else
+ if (r_ptr->cur_hp_per != 0) {
+ m_ptr->hp = m_ptr->maxhp * r_ptr->cur_hp_per / 100;
+ } else {
m_ptr->hp = m_ptr->maxhp;
+ }
m_ptr->dealt_damage = 0;
- m_ptr->mspeed = get_mspeed(floor_ptr, r_ptr);
+ m_ptr->mspeed = get_mspeed(&floor, r_ptr);
- if (any_bits(mode, PM_HASTE))
+ if (any_bits(mode, PM_HASTE)) {
(void)set_monster_fast(player_ptr, g_ptr->m_idx, 100);
+ }
if (!ironman_nightmare) {
m_ptr->energy_need = ENERGY_NEED() - (int16_t)randint0(100);
m_ptr->energy_need = ENERGY_NEED() - (int16_t)randint0(100) * 2;
}
- if (any_bits(r_ptr->flags1, RF1_PREVENT_SUDDEN_MAGIC) && !ironman_nightmare) {
- m_ptr->mflag.set(MFLAG::PREVENT_MAGIC);
+ if (r_ptr->behavior_flags.has(MonsterBehaviorType::PREVENT_SUDDEN_MAGIC) && !ironman_nightmare) {
+ m_ptr->mflag.set(MonsterTemporaryFlagType::PREVENT_MAGIC);
}
if (g_ptr->m_idx < hack_m_idx) {
- m_ptr->mflag.set(MFLAG::BORN);
+ m_ptr->mflag.set(MonsterTemporaryFlagType::BORN);
+ }
+
+ auto is_awake_lightning_monster = r_ptr->brightness_flags.has_any_of(self_ld_mask);
+ is_awake_lightning_monster |= r_ptr->brightness_flags.has_any_of(has_ld_mask) && !m_ptr->is_asleep();
+ if (is_awake_lightning_monster) {
+ RedrawingFlagsUpdater::get_instance().set_flag(StatusRecalculatingFlag::MONSTER_LITE);
}
- if (any_bits(r_ptr->flags7, RF7_SELF_LD_MASK))
- set_bits(player_ptr->update, PU_MON_LITE);
- else if (any_bits(r_ptr->flags7, RF7_HAS_LD_MASK) && !monster_csleep_remaining(m_ptr))
- set_bits(player_ptr->update, PU_MON_LITE);
update_monster(player_ptr, g_ptr->m_idx, true);
- real_r_ptr(m_ptr)->cur_num++;
+ m_ptr->get_real_monrace().cur_num++;
/*
* Memorize location of the unique monster in saved floors.
* A unique monster move from old saved floor.
*/
- if (current_world_ptr->character_dungeon && (any_bits(r_ptr->flags1, RF1_UNIQUE) || any_bits(r_ptr->flags7, RF7_NAZGUL)))
- real_r_ptr(m_ptr)->floor_id = player_ptr->floor_id;
+ if (w_ptr->character_dungeon && (r_ptr->kind_flags.has(MonsterKindType::UNIQUE) || r_ptr->population_flags.has(MonsterPopulationType::NAZGUL))) {
+ m_ptr->get_real_monrace().floor_id = player_ptr->floor_id;
+ }
- if (any_bits(r_ptr->flags2, RF2_MULTIPLY))
- floor_ptr->num_repro++;
+ if (any_bits(r_ptr->flags2, RF2_MULTIPLY)) {
+ floor.num_repro++;
+ }
warn_unique_generation(player_ptr, r_idx);
- if (!g_ptr->is_rune_explosion())
+ if (!g_ptr->is_rune_explosion()) {
return true;
+ }
if (randint1(BREAK_RUNE_EXPLOSION) > r_ptr->level) {
if (any_bits(g_ptr->info, CAVE_MARK)) {
msg_print(_("ルーンが爆発した！", "The rune explodes!"));
- project(player_ptr, 0, 2, y, x, 2 * (player_ptr->lev + damroll(7, 7)), GF_MANA,
+ project(player_ptr, 0, 2, y, x, 2 * (player_ptr->lev + damroll(7, 7)), AttributeType::MANA,
(PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI));
}
} else {
OSDN Git Service
