From dec189269def30b25f031f82d66e65a91dd9a1c1 Mon Sep 17 00:00:00 2001 From: Slimebreath6078 Date: Sun, 28 Jan 2024 19:20:05 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20RIDING=20=E3=82=92=E6=96=B0?= =?utf8?q?=E5=AE=9A=E7=BE=A9=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-action/cmd-pet.cpp | 2 +- src/cmd-io/cmd-lore.cpp | 2 +- src/knowledge/knowledge-monsters.cpp | 2 +- src/monster/monster-list.cpp | 2 +- src/monster/monster-processor.cpp | 2 +- src/pet/pet-util.cpp | 2 +- src/view/display-lore-status.cpp | 2 +- src/wizard/wizard-spoiler.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp index be4f18bdd..79a035032 100644 --- a/src/cmd-action/cmd-pet.cpp +++ b/src/cmd-action/cmd-pet.cpp @@ -247,7 +247,7 @@ bool do_cmd_riding(PlayerType *player_ptr, bool force) msg_print(_("そのモンスターはペットではありません。", "That monster is not a pet.")); return false; } - if (!(m_ptr->get_monrace().flags7 & RF7_RIDING)) { + if (m_ptr->get_monrace().misc_flags.has_not(MonsterMiscType::RIDING)) { msg_print(_("そのモンスターには乗れなさそうだ。", "This monster doesn't seem suitable for riding.")); return false; } diff --git a/src/cmd-io/cmd-lore.cpp b/src/cmd-io/cmd-lore.cpp index 4f5e46c84..3d5ac7c74 100644 --- a/src/cmd-io/cmd-lore.cpp +++ b/src/cmd-io/cmd-lore.cpp @@ -103,7 +103,7 @@ void do_cmd_query_symbol(PlayerType *player_ptr) continue; } - if (ride && !(monrace.flags7 & (RF7_RIDING))) { + if (ride && monrace.misc_flags.has_not(MonsterMiscType::RIDING)) { continue; } diff --git a/src/knowledge/knowledge-monsters.cpp b/src/knowledge/knowledge-monsters.cpp index bcde013de..9aea32085 100644 --- a/src/knowledge/knowledge-monsters.cpp +++ b/src/knowledge/knowledge-monsters.cpp @@ -69,7 +69,7 @@ static std::vector collect_monsters(PlayerType *player_ptr, IDX g continue; } } else if (grp_riding) { - if (none_bits(monrace.flags7, RF7_RIDING)) { + if (monrace.misc_flags.has_not(MonsterMiscType::RIDING)) { continue; } } else if (grp_wanted) { diff --git a/src/monster/monster-list.cpp b/src/monster/monster-list.cpp index b4c3c6eb1..3078ed886 100644 --- a/src/monster/monster-list.cpp +++ b/src/monster/monster-list.cpp @@ -380,7 +380,7 @@ void choose_new_monster(PlayerType *player_ptr, MONSTER_IDX m_idx, bool born, Mo if (m_idx == player_ptr->riding) { msg_format(_("突然%sが変身した。", "Suddenly, %s transforms!"), old_m_name.data()); - if (!(r_ptr->flags7 & RF7_RIDING)) { + if (r_ptr->misc_flags.has_not(MonsterMiscType::RIDING)) { if (process_fall_off_horse(player_ptr, 0, true)) { const auto m_name = monster_desc(player_ptr, m_ptr, 0); msg_print(_("地面に落とされた。", format("You have fallen from %s.", m_name.data()))); diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp index a89c47985..83c6afe5e 100644 --- a/src/monster/monster-processor.cpp +++ b/src/monster/monster-processor.cpp @@ -253,7 +253,7 @@ void decide_drop_from_monster(PlayerType *player_ptr, MONSTER_IDX m_idx, bool is { auto *m_ptr = &player_ptr->current_floor_ptr->m_list[m_idx]; auto *r_ptr = &m_ptr->get_monrace(); - if (!is_riding_mon || ((r_ptr->flags7 & RF7_RIDING) != 0)) { + if (!is_riding_mon || r_ptr->misc_flags.has(MonsterMiscType::RIDING)) { return; } diff --git a/src/pet/pet-util.cpp b/src/pet/pet-util.cpp index 7cfab81c4..8e331cce1 100644 --- a/src/pet/pet-util.cpp +++ b/src/pet/pet-util.cpp @@ -95,7 +95,7 @@ PERCENTAGE calculate_upkeep(PlayerType *player_ptr) if (player_ptr->riding == m_idx) { total_friend_levels += (r_ptr->level + 5) * 2; - } else if (!has_a_unique && any_bits(m_ptr->get_monrace().flags7, RF7_RIDING)) { + } else if (!has_a_unique && m_ptr->get_monrace().misc_flags.has(MonsterMiscType::RIDING)) { total_friend_levels += (r_ptr->level + 5) * 7 / 2; } else { total_friend_levels += (r_ptr->level + 5) * 10; diff --git a/src/view/display-lore-status.cpp b/src/view/display-lore-status.cpp index effaa841d..390e5587f 100644 --- a/src/view/display-lore-status.cpp +++ b/src/view/display-lore-status.cpp @@ -160,7 +160,7 @@ void display_monster_constitutions(lore_type *lore_ptr) hook_c_roff(TERM_L_WHITE, format(_("%s^は素早く体力を回復する。", "%s^ regenerates quickly. "), Who::who(lore_ptr->msex))); } - if (lore_ptr->flags7 & RF7_RIDING) { + if (lore_ptr->misc_flags.has(MonsterMiscType::RIDING)) { hook_c_roff(TERM_SLATE, format(_("%s^に乗ることができる。", "%s^ is suitable for riding. "), Who::who(lore_ptr->msex))); } } diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp index 11c81aa25..2af7ae1c0 100644 --- a/src/wizard/wizard-spoiler.cpp +++ b/src/wizard/wizard-spoiler.cpp @@ -131,7 +131,7 @@ static SpoilerOutputResultType spoil_mon_evol() static SpoilerOutputResultType spoil_categorized_mon_desc() { - auto status = spoil_mon_desc("mon-desc-ridable.txt", [](const MonsterRaceInfo *r_ptr) { return any_bits(r_ptr->flags7, RF7_RIDING); }); + auto status = spoil_mon_desc("mon-desc-ridable.txt", [](const MonsterRaceInfo *r_ptr) { return r_ptr->misc_flags.has(MonsterMiscType::RIDING); }); if (status == SpoilerOutputResultType::SUCCESSFUL) { status = spoil_mon_desc("mon-desc-wildonly.txt", [](const MonsterRaceInfo *r_ptr) { return r_ptr->wilderness_flags.has(MonsterWildernessType::WILD_ONLY); }); } -- 2.11.0