#include "monster-floor/monster-death.h"
#include "artifact/fixed-art-generator.h"
+#include "artifact/fixed-art-types.h"
#include "cmd-building/cmd-building.h"
#include "core/player-redraw-types.h"
#include "core/player-update-types.h"
#include "effect/effect-processor.h"
#include "floor/floor-object.h"
#include "game-option/birth-options.h"
-#include "game-option/game-play-options.h"
#include "game-option/play-record-options.h"
#include "io/write-diary.h"
#include "lore/lore-store.h"
#include "monster-race/race-flags1.h"
#include "monster-race/race-flags2.h"
#include "monster-race/race-flags7.h"
-#include "monster-race/race-flags9.h"
#include "monster-race/race-indice-types.h"
#include "monster/monster-describer.h"
#include "monster/monster-description-types.h"
#include "monster/monster-flag-types.h"
#include "monster/monster-info.h"
#include "monster/monster-list.h"
-#include "object-enchant/apply-magic.h"
#include "object-enchant/item-apply-magic.h"
+#include "object-enchant/item-magic-applier.h"
#include "object/object-kind-hook.h"
#include "pet/pet-fall-off.h"
#include "player/patron.h"
#include "system/monster-type-definition.h"
#include "system/player-type-definition.h"
#include "system/system-variables.h"
+#include "timed-effect/player-hallucination.h"
+#include "timed-effect/timed-effects.h"
#include "util/bit-flags-calculator.h"
#include "view/display-messages.h"
#include "world/world.h"
-static void write_pet_death(player_type *player_ptr, monster_death_type *md_ptr)
+static void write_pet_death(PlayerType *player_ptr, monster_death_type *md_ptr)
{
md_ptr->md_y = md_ptr->m_ptr->fy;
md_ptr->md_x = md_ptr->m_ptr->fx;
}
}
-static void on_dead_explosion(player_type *player_ptr, monster_death_type *md_ptr)
+static void on_dead_explosion(PlayerType *player_ptr, monster_death_type *md_ptr)
{
for (int i = 0; i < 4; i++) {
- if (md_ptr->r_ptr->blow[i].method != RBM_EXPLODE)
+ if (md_ptr->r_ptr->blow[i].method != RaceBlowMethodType::EXPLODE) {
continue;
+ }
BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
- EFFECT_ID typ = mbe_info[enum2i(md_ptr->r_ptr->blow[i].effect)].explode_type;
+ AttributeType typ = mbe_info[enum2i(md_ptr->r_ptr->blow[i].effect)].explode_type;
DICE_NUMBER d_dice = md_ptr->r_ptr->blow[i].d_dice;
DICE_SID d_side = md_ptr->r_ptr->blow[i].d_side;
- HIT_POINT damage = damroll(d_dice, d_side);
+ int damage = damroll(d_dice, d_side);
(void)project(player_ptr, md_ptr->m_idx, 3, md_ptr->md_y, md_ptr->md_x, damage, typ, flg);
break;
}
}
-static void on_defeat_arena_monster(player_type *player_ptr, monster_death_type *md_ptr)
+static void on_defeat_arena_monster(PlayerType *player_ptr, monster_death_type *md_ptr)
{
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
- if (!floor_ptr->inside_arena || is_pet(md_ptr->m_ptr))
+ auto *floor_ptr = player_ptr->current_floor_ptr;
+ if (!floor_ptr->inside_arena || is_pet(md_ptr->m_ptr)) {
return;
+ }
player_ptr->exit_bldg = true;
- if (player_ptr->arena_number > MAX_ARENA_MONS)
+ if (player_ptr->arena_number > MAX_ARENA_MONS) {
msg_print(_("素晴らしい！君こそ真の勝利者だ。", "You are a Genuine Champion!"));
- else
+ } else {
msg_print(_("勝利！チャンピオンへの道を進んでいる。", "Victorious! You're on your way to becoming Champion."));
+ }
if (arena_info[player_ptr->arena_number].tval > ItemKindType::NONE) {
- object_type forge;
- object_type *q_ptr = &forge;
+ ObjectType forge;
+ auto *q_ptr = &forge;
q_ptr->prep(lookup_kind(arena_info[player_ptr->arena_number].tval, arena_info[player_ptr->arena_number].sval));
- apply_magic_to_object(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART);
+ ItemMagicApplier(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART).execute();
(void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
}
- if (player_ptr->arena_number > MAX_ARENA_MONS)
+ if (player_ptr->arena_number > MAX_ARENA_MONS) {
player_ptr->arena_number++;
+ }
player_ptr->arena_number++;
- if (!record_arena)
+ if (!record_arena) {
return;
+ }
GAME_TEXT m_name[MAX_NLEN];
monster_desc(player_ptr, m_name, md_ptr->m_ptr, MD_WRONGDOER_NAME);
exe_write_diary(player_ptr, DIARY_ARENA, player_ptr->arena_number, m_name);
}
-static void drop_corpse(player_type *player_ptr, monster_death_type *md_ptr)
+static void drop_corpse(PlayerType *player_ptr, monster_death_type *md_ptr)
{
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
- bool is_drop_corpse = one_in_(md_ptr->r_ptr->flags1 & RF1_UNIQUE ? 1 : 4);
- is_drop_corpse &= (md_ptr->r_ptr->flags9 & (RF9_DROP_CORPSE | RF9_DROP_SKELETON)) != 0;
- is_drop_corpse &= !(floor_ptr->inside_arena || player_ptr->phase_out || md_ptr->cloned
- || ((md_ptr->m_ptr->r_idx == w_ptr->today_mon) && is_pet(md_ptr->m_ptr)));
- if (!is_drop_corpse)
+ auto *floor_ptr = player_ptr->current_floor_ptr;
+ bool is_drop_corpse = one_in_(md_ptr->r_ptr->kind_flags.has(MonsterKindType::UNIQUE) ? 1 : 4);
+ is_drop_corpse &= md_ptr->r_ptr->drop_flags.has_any_of({ MonsterDropType::DROP_CORPSE, MonsterDropType::DROP_SKELETON });
+ is_drop_corpse &= !(floor_ptr->inside_arena || player_ptr->phase_out || md_ptr->cloned || ((md_ptr->m_ptr->r_idx == w_ptr->today_mon) && is_pet(md_ptr->m_ptr)));
+ if (!is_drop_corpse) {
return;
+ }
bool corpse = false;
- if (!(md_ptr->r_ptr->flags9 & RF9_DROP_SKELETON))
+ if (md_ptr->r_ptr->drop_flags.has_not(MonsterDropType::DROP_SKELETON)) {
corpse = true;
- else if ((md_ptr->r_ptr->flags9 & RF9_DROP_CORPSE) && (md_ptr->r_ptr->flags1 & RF1_UNIQUE))
+ } else if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_CORPSE) && md_ptr->r_ptr->kind_flags.has(MonsterKindType::UNIQUE)) {
corpse = true;
- else if (md_ptr->r_ptr->flags9 & RF9_DROP_CORPSE) {
+ } else if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_CORPSE)) {
if ((0 - ((md_ptr->m_ptr->maxhp) / 4)) > md_ptr->m_ptr->hp) {
- if (one_in_(5))
+ if (one_in_(5)) {
corpse = true;
+ }
} else {
- if (!one_in_(5))
+ if (!one_in_(5)) {
corpse = true;
+ }
}
}
- object_type forge;
- object_type *q_ptr = &forge;
+ ObjectType forge;
+ auto *q_ptr = &forge;
q_ptr->prep(lookup_kind(ItemKindType::CORPSE, (corpse ? SV_CORPSE : SV_SKELETON)));
- apply_magic_to_object(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART);
- q_ptr->pval = md_ptr->m_ptr->r_idx;
+ ItemMagicApplier(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART).execute();
+ q_ptr->pval = enum2i(md_ptr->m_ptr->r_idx);
(void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
}
* @brief アーティファクトのドロップ判定処理
* @param player_ptr プレイヤーへの参照ポインタ
* @param md_ptr モンスター死亡構造体への参照ポインタ
- * @return 何かドロップするなら1以上、何もドロップしないなら0
+ * @return 何かドロップするならドロップしたアーティファクトのID、何もドロップしないなら0
*/
-static ARTIFACT_IDX drop_artifact_index(player_type *player_ptr, monster_death_type *md_ptr)
+static void drop_artifact_from_unique(PlayerType *player_ptr, monster_death_type *md_ptr)
{
- ARTIFACT_IDX a_idx = 0;
- PERCENTAGE chance = 0;
- for (int i = 0; i < 4; i++) {
- if (!md_ptr->r_ptr->artifact_id[i])
- break;
-
- a_idx = md_ptr->r_ptr->artifact_id[i];
- chance = md_ptr->r_ptr->artifact_percent[i];
- if (allow_debug_options) {
- // continue process.
- // @todo ここより下の処理は関数分割で何とかしたい.
- // 処理を送るだけのif文は気持ち悪い.
- } else if (randint0(100) >= chance) {
+ for (const auto &[a_idx, chance] : md_ptr->r_ptr->drop_artifacts) {
+ if (!w_ptr->wizard && (randint0(100) >= chance)) {
continue;
}
- artifact_type *a_ptr = &a_info[a_idx];
- if (a_ptr->cur_num == 1)
- continue;
+ if (drop_single_artifact(player_ptr, md_ptr, a_idx)) {
+ return;
+ }
+ }
+}
- if (create_named_art(player_ptr, a_idx, md_ptr->md_y, md_ptr->md_x)) {
- a_ptr->cur_num = 1;
- if (w_ptr->character_dungeon)
- a_ptr->floor_id = player_ptr->floor_id;
+/*!
+ * @brief 特定アーティファクトのドロップ処理
+ * @param player_ptr プレイヤーへの参照ポインタ
+ * @param md_ptr モンスター死亡構造体への参照ポインタ
+ * @param a_ix ドロップを試みるアーティファクトID
+ * @return ドロップするならtrue
+ */
+bool drop_single_artifact(PlayerType *player_ptr, monster_death_type *md_ptr, FixedArtifactId a_idx)
+{
+ auto &a_ref = a_info.at(a_idx);
+ if (a_ref.is_generated) {
+ return false;
+ }
- break;
- }
+ if (!create_named_art(player_ptr, a_idx, md_ptr->md_y, md_ptr->md_x)) {
+ return false;
+ }
- if (!preserve_mode) {
- a_ptr->cur_num = 1;
- break;
- }
+ if (w_ptr->character_dungeon) {
+ a_ref.floor_id = player_ptr->floor_id;
}
- return a_idx;
+ return true;
}
-static KIND_OBJECT_IDX drop_dungeon_final_artifact(player_type *player_ptr, monster_death_type *md_ptr, ARTIFACT_IDX a_idx)
+static KIND_OBJECT_IDX drop_dungeon_final_artifact(PlayerType *player_ptr, monster_death_type *md_ptr)
{
- auto k_idx = d_info[player_ptr->dungeon_idx].final_object != 0 ? d_info[player_ptr->dungeon_idx].final_object : lookup_kind(ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT);
- if (d_info[player_ptr->dungeon_idx].final_artifact == 0)
+ const auto &dungeon = d_info[player_ptr->dungeon_idx];
+ auto k_idx = dungeon.final_object != 0 ? dungeon.final_object : lookup_kind(ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT);
+ if (dungeon.final_artifact == FixedArtifactId::NONE) {
return k_idx;
+ }
- a_idx = d_info[player_ptr->dungeon_idx].final_artifact;
- artifact_type *a_ptr = &a_info[a_idx];
- if (a_ptr->cur_num == 1)
+ const auto a_idx = dungeon.final_artifact;
+ auto &a_ref = a_info.at(a_idx);
+ if (a_ref.is_generated) {
return k_idx;
+ }
+
if (create_named_art(player_ptr, a_idx, md_ptr->md_y, md_ptr->md_x)) {
- a_ptr->cur_num = 1;
- if (w_ptr->character_dungeon)
- a_ptr->floor_id = player_ptr->floor_id;
- } else if (!preserve_mode) {
- a_ptr->cur_num = 1;
+ if (w_ptr->character_dungeon) {
+ a_ref.floor_id = player_ptr->floor_id;
+ }
}
- return d_info[player_ptr->dungeon_idx].final_object ? k_idx : 0;
+ return dungeon.final_object ? k_idx : 0;
}
-static void drop_artifact(player_type *player_ptr, monster_death_type *md_ptr)
+static void drop_artifacts(PlayerType *player_ptr, monster_death_type *md_ptr)
{
- if (!md_ptr->drop_chosen_item)
+ if (!md_ptr->drop_chosen_item) {
return;
+ }
- ARTIFACT_IDX a_idx = drop_artifact_index(player_ptr, md_ptr);
- if (((md_ptr->r_ptr->flags7 & RF7_GUARDIAN) == 0) || (d_info[player_ptr->dungeon_idx].final_guardian != md_ptr->m_ptr->r_idx))
+ drop_artifact_from_unique(player_ptr, md_ptr);
+ if (((md_ptr->r_ptr->flags7 & RF7_GUARDIAN) == 0) || (d_info[player_ptr->dungeon_idx].final_guardian != md_ptr->m_ptr->r_idx)) {
return;
+ }
- KIND_OBJECT_IDX k_idx = drop_dungeon_final_artifact(player_ptr, md_ptr, a_idx);
+ KIND_OBJECT_IDX k_idx = drop_dungeon_final_artifact(player_ptr, md_ptr);
if (k_idx != 0) {
- object_type forge;
- object_type *q_ptr = &forge;
+ ObjectType forge;
+ auto *q_ptr = &forge;
q_ptr->prep(k_idx);
- apply_magic_to_object(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | AM_GOOD);
+ ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | AM_GOOD).execute();
(void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
}
static void decide_drop_quality(monster_death_type *md_ptr)
{
md_ptr->mo_mode = 0L;
- if (md_ptr->r_ptr->flags1 & RF1_DROP_GOOD)
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_GOOD)) {
md_ptr->mo_mode |= AM_GOOD;
+ }
- if (md_ptr->r_ptr->flags1 & RF1_DROP_GREAT)
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_GREAT)) {
md_ptr->mo_mode |= (AM_GOOD | AM_GREAT);
+ }
}
-static int decide_drop_numbers(player_type *player_ptr, monster_death_type *md_ptr, const bool drop_item)
+static int decide_drop_numbers(PlayerType *player_ptr, monster_death_type *md_ptr, const bool drop_item)
{
int drop_numbers = 0;
- if ((md_ptr->r_ptr->flags1 & RF1_DROP_60) && (randint0(100) < 60))
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_60) && (randint0(100) < 60)) {
drop_numbers++;
+ }
- if ((md_ptr->r_ptr->flags1 & RF1_DROP_90) && (randint0(100) < 90))
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_90) && (randint0(100) < 90)) {
drop_numbers++;
+ }
- if (md_ptr->r_ptr->flags1 & RF1_DROP_1D2)
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_1D2)) {
drop_numbers += damroll(1, 2);
+ }
- if (md_ptr->r_ptr->flags1 & RF1_DROP_2D2)
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_2D2)) {
drop_numbers += damroll(2, 2);
+ }
- if (md_ptr->r_ptr->flags1 & RF1_DROP_3D2)
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_3D2)) {
drop_numbers += damroll(3, 2);
+ }
- if (md_ptr->r_ptr->flags1 & RF1_DROP_4D2)
+ if (md_ptr->r_ptr->drop_flags.has(MonsterDropType::DROP_4D2)) {
drop_numbers += damroll(4, 2);
+ }
- if (md_ptr->cloned && !(md_ptr->r_ptr->flags1 & RF1_UNIQUE))
+ if (md_ptr->cloned && md_ptr->r_ptr->kind_flags.has_not(MonsterKindType::UNIQUE)) {
drop_numbers = 0;
+ }
- if (is_pet(md_ptr->m_ptr) || player_ptr->phase_out || player_ptr->current_floor_ptr->inside_arena)
+ if (is_pet(md_ptr->m_ptr) || player_ptr->phase_out || player_ptr->current_floor_ptr->inside_arena) {
drop_numbers = 0;
+ }
- if (!drop_item && (md_ptr->r_ptr->d_char != '$'))
+ if (!drop_item && (md_ptr->r_ptr->d_char != '$')) {
drop_numbers = 0;
+ }
- if ((md_ptr->r_ptr->flags2 & (RF2_MULTIPLY)) && (md_ptr->r_ptr->r_akills > 1024))
+ if ((md_ptr->r_ptr->flags2 & (RF2_MULTIPLY)) && (md_ptr->r_ptr->r_akills > 1024)) {
drop_numbers = 0;
+ }
return drop_numbers;
}
-static void drop_items_golds(player_type *player_ptr, monster_death_type *md_ptr, int drop_numbers)
+static void drop_items_golds(PlayerType *player_ptr, monster_death_type *md_ptr, int drop_numbers)
{
int dump_item = 0;
int dump_gold = 0;
for (int i = 0; i < drop_numbers; i++) {
- object_type forge;
- object_type *q_ptr = &forge;
+ ObjectType forge;
+ auto *q_ptr = &forge;
q_ptr->wipe();
if (md_ptr->do_gold && (!md_ptr->do_item || (randint0(100) < 50))) {
- if (!make_gold(player_ptr, q_ptr))
+ if (!make_gold(player_ptr, q_ptr)) {
continue;
+ }
dump_gold++;
} else {
- if (!make_object(player_ptr, q_ptr, md_ptr->mo_mode))
+ if (!make_object(player_ptr, q_ptr, md_ptr->mo_mode)) {
continue;
+ }
dump_item++;
}
(void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
}
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
+ auto *floor_ptr = player_ptr->current_floor_ptr;
floor_ptr->object_level = floor_ptr->base_level;
coin_type = 0;
- bool visible = (md_ptr->m_ptr->ml && !player_ptr->hallucinated) || ((md_ptr->r_ptr->flags1 & RF1_UNIQUE) != 0);
- if (visible && (dump_item || dump_gold))
+ bool visible = (md_ptr->m_ptr->ml && !player_ptr->effects()->hallucination()->is_hallucinated()) || (md_ptr->r_ptr->kind_flags.has(MonsterKindType::UNIQUE));
+ if (visible && (dump_item || dump_gold)) {
lore_treasure(player_ptr, md_ptr->m_idx, dump_item, dump_gold);
+ }
}
/*!
* @brief 最終ボス(混沌のサーペント)を倒したときの処理
* @param player_ptr プレイヤー情報への参照ポインタ
*/
-static void on_defeat_last_boss(player_type *player_ptr)
+static void on_defeat_last_boss(PlayerType *player_ptr)
{
w_ptr->total_winner = true;
add_winner_class(player_ptr->pclass);
* Handle the "death" of a monster.
* @param m_idx 死亡したモンスターのID
* @param drop_item TRUEならばモンスターのドロップ処理を行う
- * @return 撃破されたモンスターの述語
+ * @param type ラストアタックの属性 (単一属性)
+ */
+void monster_death(PlayerType *player_ptr, MONSTER_IDX m_idx, bool drop_item, AttributeType type)
+{
+ AttributeFlags flags;
+ flags.clear();
+ flags.set(type);
+ monster_death(player_ptr, m_idx, drop_item, flags);
+}
+
+/*!
+ * @brief モンスターが死亡した時の処理 /
+ * Handle the "death" of a monster.
+ * @param m_idx 死亡したモンスターのID
+ * @param drop_item TRUEならばモンスターのドロップ処理を行う
+ * @param attribute_flags ラストアタックの属性 (複数属性)
* @details
* <pre>
* Disperse treasures centered at the monster location based on the
* it drops all of its objects, which may disappear in crowded rooms.
* </pre>
*/
-void monster_death(player_type *player_ptr, MONSTER_IDX m_idx, bool drop_item)
+void monster_death(PlayerType *player_ptr, MONSTER_IDX m_idx, bool drop_item, AttributeFlags attribute_flags)
{
monster_death_type tmp_md;
monster_death_type *md_ptr = initialize_monster_death_type(player_ptr, &tmp_md, m_idx, drop_item);
- if (w_ptr->timewalk_m_idx && w_ptr->timewalk_m_idx == m_idx)
+ if (w_ptr->timewalk_m_idx && w_ptr->timewalk_m_idx == m_idx) {
w_ptr->timewalk_m_idx = 0;
+ }
// プレイヤーしかユニークを倒せないのでここで時間を記録
- if (any_bits(md_ptr->r_ptr->flags1, RF1_UNIQUE) && md_ptr->m_ptr->mflag2.has_not(MFLAG2::CLONED)) {
+ if (md_ptr->r_ptr->kind_flags.has(MonsterKindType::UNIQUE) && md_ptr->m_ptr->mflag2.has_not(MonsterConstantFlagType::CLONED)) {
update_playtime();
md_ptr->r_ptr->defeat_time = w_ptr->play_time;
md_ptr->r_ptr->defeat_level = player_ptr->lev;
}
- if (md_ptr->r_ptr->flags7 & (RF7_LITE_MASK | RF7_DARK_MASK))
+ if (md_ptr->r_ptr->flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) {
player_ptr->update |= PU_MON_LITE;
+ }
write_pet_death(player_ptr, md_ptr);
on_dead_explosion(player_ptr, md_ptr);
- if (md_ptr->m_ptr->mflag2.has(MFLAG2::CHAMELEON)) {
- choose_new_monster(player_ptr, m_idx, true, MON_CHAMELEON);
+ if (md_ptr->m_ptr->mflag2.has(MonsterConstantFlagType::CHAMELEON)) {
+ choose_new_monster(player_ptr, m_idx, true, MonsterRaceId::CHAMELEON);
md_ptr->r_ptr = &r_info[md_ptr->m_ptr->r_idx];
}
QuestCompletionChecker(player_ptr, md_ptr->m_ptr).complete();
on_defeat_arena_monster(player_ptr, md_ptr);
- if (m_idx == player_ptr->riding && process_fall_off_horse(player_ptr, -1, false))
+ if (m_idx == player_ptr->riding && process_fall_off_horse(player_ptr, -1, false)) {
msg_print(_("地面に落とされた。", "You have fallen from the pet you were riding."));
+ }
drop_corpse(player_ptr, md_ptr);
monster_drop_carried_objects(player_ptr, md_ptr->m_ptr);
decide_drop_quality(md_ptr);
- switch_special_death(player_ptr, md_ptr);
- drop_artifact(player_ptr, md_ptr);
+ switch_special_death(player_ptr, md_ptr, attribute_flags);
+ drop_artifacts(player_ptr, md_ptr);
int drop_numbers = decide_drop_numbers(player_ptr, md_ptr, drop_item);
coin_type = md_ptr->force_coin;
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
+ auto *floor_ptr = player_ptr->current_floor_ptr;
floor_ptr->object_level = (floor_ptr->dun_level + md_ptr->r_ptr->level) / 2;
drop_items_golds(player_ptr, md_ptr, drop_numbers);
- if (((md_ptr->r_ptr->flags1 & RF1_QUESTOR) == 0) || player_ptr->phase_out || (md_ptr->m_ptr->r_idx != MON_SERPENT) || md_ptr->cloned)
+ if (((md_ptr->r_ptr->flags1 & RF1_QUESTOR) == 0) || player_ptr->phase_out || (md_ptr->m_ptr->r_idx != MonsterRaceId::SERPENT) || md_ptr->cloned) {
return;
+ }
on_defeat_last_boss(player_ptr);
}
* @param r_ptr 撃破されたモンスターの種族情報を持つ構造体の参照ポインタ
* @return 撃破されたモンスターの述語
*/
-concptr extract_note_dies(MONRACE_IDX r_idx)
+concptr extract_note_dies(MonsterRaceId r_idx)
{
- monster_race *r_ptr = &r_info[r_idx];
- if (monster_living(r_idx))
+ auto *r_ptr = &r_info[r_idx];
+ if (monster_living(r_idx)) {
return _("は死んだ。", " dies.");
+ }
- for (int i = 0; i < 4; i++)
- if (r_ptr->blow[i].method == RBM_EXPLODE)
+ for (int i = 0; i < 4; i++) {
+ if (r_ptr->blow[i].method == RaceBlowMethodType::EXPLODE) {
return _("は爆発して粉々になった。", " explodes into tiny shreds.");
+ }
+ }
return _("を倒した。", " is destroyed.");
}
OSDN Git Service
