-#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-detection.h"
#include "core/window-redrawer.h"
#include "dungeon/dungeon-flag-types.h"
#include "floor/cave.h"
#include "floor/floor-save-util.h"
#include "floor/geometry.h"
-#include "grid/feature.h"
#include "grid/grid.h"
#include "grid/trap.h"
#include "monster-race/monster-race-hook.h"
#include "system/dungeon-info.h"
#include "system/floor-type-definition.h"
#include "system/grid-type-definition.h"
-#include "system/monster-race-definition.h"
-#include "system/object-type-definition.h"
+#include "system/item-entity.h"
+#include "system/monster-race-info.h"
#include "system/player-type-definition.h"
+#include "system/redrawing-flags-updater.h"
+#include "system/terrain-type-definition.h"
#include "util/string-processor.h"
#include "view/display-messages.h"
*/
static bool detect_feat_flag(PlayerType *player_ptr, POSITION range, TerrainCharacteristics flag, bool known)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- grid_type *g_ptr;
bool detect = false;
- for (POSITION y = 1; y < player_ptr->current_floor_ptr->height - 1; y++) {
- for (POSITION x = 1; x <= player_ptr->current_floor_ptr->width - 1; x++) {
+ for (POSITION y = 1; y < floor.height - 1; y++) {
+ for (POSITION x = 1; x <= floor.width - 1; x++) {
int dist = distance(player_ptr->y, player_ptr->x, y, x);
if (dist > range) {
continue;
}
- g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x];
+
+ auto *g_ptr = &floor.grid_array[y][x];
if (flag == TerrainCharacteristics::TRAP) {
/* Mark as detected */
if (dist <= range && known) {
*/
bool detect_objects_gold(PlayerType *player_ptr, POSITION range)
{
+ auto &floor = *player_ptr->current_floor_ptr;
POSITION range2 = range;
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range2 /= 3;
}
/* Scan objects */
bool detect = false;
POSITION y, x;
- for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
- auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+ for (OBJECT_IDX i = 1; i < floor.o_max; i++) {
+ auto *o_ptr = &floor.o_list[i];
if (!o_ptr->is_valid()) {
continue;
continue;
}
- if (o_ptr->tval == ItemKindType::GOLD) {
- o_ptr->marked |= OM_FOUND;
+ if (o_ptr->bi_key.tval() == ItemKindType::GOLD) {
+ o_ptr->marked.set(OmType::FOUND);
lite_spot(player_ptr, y, x);
detect = true;
}
*/
bool detect_objects_normal(PlayerType *player_ptr, POSITION range)
{
+ auto &floor = *player_ptr->current_floor_ptr;
POSITION range2 = range;
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range2 /= 3;
}
bool detect = false;
- for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
- auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
+ for (OBJECT_IDX i = 1; i < floor.o_max; i++) {
+ auto *o_ptr = &floor.o_list[i];
if (!o_ptr->is_valid()) {
continue;
continue;
}
- if (o_ptr->tval != ItemKindType::GOLD) {
- o_ptr->marked |= OM_FOUND;
+ if (o_ptr->bi_key.tval() != ItemKindType::GOLD) {
+ o_ptr->marked.set(OmType::FOUND);
lite_spot(player_ptr, y, x);
detect = true;
}
detect = false;
}
if (detect) {
+ RedrawingFlagsUpdater::get_instance().set_flag(SubWindowRedrawingFlag::FOUND_ITEMS);
msg_print(_("アイテムの存在を感じとった！", "You sense the presence of objects!"));
}
return detect;
}
+static bool is_object_magically(const ItemKindType tval)
+{
+ switch (tval) {
+ case ItemKindType::WHISTLE:
+ case ItemKindType::AMULET:
+ case ItemKindType::RING:
+ case ItemKindType::STAFF:
+ case ItemKindType::WAND:
+ case ItemKindType::ROD:
+ case ItemKindType::SCROLL:
+ case ItemKindType::POTION:
+ return true;
+ default:
+ return false;
+ }
+}
+
/*!
- * @brief 魔法効果のあるのアイテムオブジェクトを感知する / Detect all "magic" objects on the current panel.
+ * @brief 魔法効果のあるのアイテムオブジェクトを感知する
* @param player_ptr プレイヤーへの参照ポインタ
* @param range 効果範囲
- * @return 効力があった場合TRUEを返す
- * @details
- * <pre>
- * This will light up all spaces with "magic" items, including artifacts,
- * ego-items, potions, scrolls, books, rods, wands, staffs, amulets, rings,
- * and "enchanted" items of the "good" variety.
- *
- * It can probably be argued that this function is now too powerful.
- * </pre>
+ * @return 1つ以上感知したか否か
*/
bool detect_objects_magic(PlayerType *player_ptr, POSITION range)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- ItemKindType tv;
- bool detect = false;
- for (OBJECT_IDX i = 1; i < player_ptr->current_floor_ptr->o_max; i++) {
- auto *o_ptr = &player_ptr->current_floor_ptr->o_list[i];
-
- if (!o_ptr->is_valid()) {
+ auto detect = false;
+ for (OBJECT_IDX i = 1; i < floor.o_max; i++) {
+ auto *o_ptr = &floor.o_list[i];
+ if (!o_ptr->is_valid() || o_ptr->is_held_by_monster()) {
continue;
}
- if (o_ptr->is_held_by_monster()) {
- continue;
- }
-
- POSITION y = o_ptr->iy;
- POSITION x = o_ptr->ix;
+ auto y = o_ptr->iy;
+ auto x = o_ptr->ix;
if (distance(player_ptr->y, player_ptr->x, y, x) > range) {
continue;
}
- tv = o_ptr->tval;
- if (o_ptr->is_artifact() || o_ptr->is_ego() || (tv == ItemKindType::WHISTLE) || (tv == ItemKindType::AMULET) || (tv == ItemKindType::RING) || (tv == ItemKindType::STAFF) || (tv == ItemKindType::WAND) || (tv == ItemKindType::ROD) || (tv == ItemKindType::SCROLL) || (tv == ItemKindType::POTION) || (tv == ItemKindType::LIFE_BOOK) || (tv == ItemKindType::SORCERY_BOOK) || (tv == ItemKindType::NATURE_BOOK) || (tv == ItemKindType::CHAOS_BOOK) || (tv == ItemKindType::DEATH_BOOK) || (tv == ItemKindType::TRUMP_BOOK) || (tv == ItemKindType::ARCANE_BOOK) || (tv == ItemKindType::CRAFT_BOOK) || (tv == ItemKindType::DEMON_BOOK) || (tv == ItemKindType::CRUSADE_BOOK) || (tv == ItemKindType::MUSIC_BOOK) || (tv == ItemKindType::HISSATSU_BOOK) || (tv == ItemKindType::HEX_BOOK) || ((o_ptr->to_a > 0) || (o_ptr->to_h + o_ptr->to_d > 0))) {
- o_ptr->marked |= OM_FOUND;
+ auto has_bonus = o_ptr->to_a > 0;
+ has_bonus |= o_ptr->to_h + o_ptr->to_d > 0;
+ if (o_ptr->is_fixed_or_random_artifact() || o_ptr->is_ego() || is_object_magically(o_ptr->bi_key.tval()) || o_ptr->is_spell_book() || has_bonus) {
+ o_ptr->marked.set(OmType::FOUND);
lite_spot(player_ptr, y, x);
detect = true;
}
}
if (detect) {
+ RedrawingFlagsUpdater::get_instance().set_flag(SubWindowRedrawingFlag::FOUND_ITEMS);
msg_print(_("魔法のアイテムの存在を感じとった！", "You sense the presence of magic objects!"));
}
*/
bool detect_monsters_normal(PlayerType *player_ptr, POSITION range)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
bool flag = false;
- for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
- auto *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
+ for (MONSTER_IDX i = 1; i < floor.m_max; i++) {
+ auto *m_ptr = &floor.m_list[i];
auto *r_ptr = &monraces_info[m_ptr->r_idx];
if (!m_ptr->is_valid()) {
continue;
*/
bool detect_monsters_invis(PlayerType *player_ptr, POSITION range)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- bool flag = false;
- for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
- auto *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
+ auto &rfu = RedrawingFlagsUpdater::get_instance();
+ auto flag = false;
+ for (MONSTER_IDX i = 1; i < floor.m_max; i++) {
+ auto *m_ptr = &floor.m_list[i];
auto *r_ptr = &monraces_info[m_ptr->r_idx];
if (!m_ptr->is_valid()) {
if (r_ptr->flags2 & RF2_INVISIBLE) {
if (player_ptr->monster_race_idx == m_ptr->r_idx) {
- player_ptr->window_flags |= (PW_MONSTER);
+ rfu.set_flag(SubWindowRedrawingFlag::MONSTER_LORE);
}
m_ptr->mflag2.set({ MonsterConstantFlagType::MARK, MonsterConstantFlagType::SHOW });
*/
bool detect_monsters_evil(PlayerType *player_ptr, POSITION range)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- bool flag = false;
- for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
- auto *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
+ auto &rfu = RedrawingFlagsUpdater::get_instance();
+ auto flag = false;
+ for (MONSTER_IDX i = 1; i < floor.m_max; i++) {
+ auto *m_ptr = &floor.m_list[i];
auto *r_ptr = &monraces_info[m_ptr->r_idx];
if (!m_ptr->is_valid()) {
continue;
if (m_ptr->is_original_ap()) {
r_ptr->r_kind_flags.set(MonsterKindType::EVIL);
if (player_ptr->monster_race_idx == m_ptr->r_idx) {
- player_ptr->window_flags |= (PW_MONSTER);
+ rfu.set_flag(SubWindowRedrawingFlag::MONSTER_LORE);
}
}
*/
bool detect_monsters_nonliving(PlayerType *player_ptr, POSITION range)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- bool flag = false;
- for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
- auto *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
+ auto &rfu = RedrawingFlagsUpdater::get_instance();
+ auto flag = false;
+ for (MONSTER_IDX i = 1; i < floor.m_max; i++) {
+ auto *m_ptr = &floor.m_list[i];
if (!m_ptr->is_valid()) {
continue;
}
continue;
}
- if (!monster_living(m_ptr->r_idx)) {
+ if (!m_ptr->has_living_flag()) {
if (player_ptr->monster_race_idx == m_ptr->r_idx) {
- player_ptr->window_flags |= (PW_MONSTER);
+ rfu.set_flag(SubWindowRedrawingFlag::MONSTER_LORE);
}
m_ptr->mflag2.set({ MonsterConstantFlagType::MARK, MonsterConstantFlagType::SHOW });
*/
bool detect_monsters_mind(PlayerType *player_ptr, POSITION range)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- bool flag = false;
- for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
- auto *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
+ auto &rfu = RedrawingFlagsUpdater::get_instance();
+ auto flag = false;
+ for (MONSTER_IDX i = 1; i < floor.m_max; i++) {
+ auto *m_ptr = &floor.m_list[i];
auto *r_ptr = &monraces_info[m_ptr->r_idx];
if (!m_ptr->is_valid()) {
continue;
if (!(r_ptr->flags2 & RF2_EMPTY_MIND)) {
if (player_ptr->monster_race_idx == m_ptr->r_idx) {
- player_ptr->window_flags |= (PW_MONSTER);
+ rfu.set_flag(SubWindowRedrawingFlag::MONSTER_LORE);
}
m_ptr->mflag2.set({ MonsterConstantFlagType::MARK, MonsterConstantFlagType::SHOW });
*/
bool detect_monsters_string(PlayerType *player_ptr, POSITION range, concptr Match)
{
- if (dungeons_info[player_ptr->dungeon_idx].flags.has(DungeonFeatureType::DARKNESS)) {
+ auto &floor = *player_ptr->current_floor_ptr;
+ if (floor.get_dungeon_definition().flags.has(DungeonFeatureType::DARKNESS)) {
range /= 3;
}
- bool flag = false;
- for (MONSTER_IDX i = 1; i < player_ptr->current_floor_ptr->m_max; i++) {
- auto *m_ptr = &player_ptr->current_floor_ptr->m_list[i];
+ auto &rfu = RedrawingFlagsUpdater::get_instance();
+ auto flag = false;
+ for (MONSTER_IDX i = 1; i < floor.m_max; i++) {
+ auto *m_ptr = &floor.m_list[i];
auto *r_ptr = &monraces_info[m_ptr->r_idx];
if (!m_ptr->is_valid()) {
continue;
if (angband_strchr(Match, r_ptr->d_char)) {
if (player_ptr->monster_race_idx == m_ptr->r_idx) {
- player_ptr->window_flags |= (PW_MONSTER);
+ rfu.set_flag(SubWindowRedrawingFlag::MONSTER_LORE);
}
m_ptr->mflag2.set({ MonsterConstantFlagType::MARK, MonsterConstantFlagType::SHOW });
OSDN Git Service
