#include "spell-realm/spells-chaos.h"
-#include "core/player-redraw-types.h"
-#include "core/player-update-types.h"
#include "core/window-redrawer.h"
#include "dungeon/quest.h"
#include "effect/attribute-types.h"
#include "spell-kind/spells-launcher.h"
#include "system/floor-type-definition.h"
#include "system/grid-type-definition.h"
-#include "system/monster-type-definition.h"
+#include "system/monster-entity.h"
#include "system/player-type-definition.h"
+#include "system/redrawing-flags-updater.h"
+#include "system/terrain-type-definition.h"
#include "target/projection-path-calculator.h"
#include "util/bit-flags-calculator.h"
#include "view/display-messages.h"
for (int i = 0; i < 9; i++) {
auto *g_ptr = &floor_ptr->grid_array[player_ptr->y + ddy_ddd[i]][player_ptr->x + ddx_ddd[i]];
- if (!g_ptr->cave_has_flag(FloorFeatureType::PROJECT)) {
- if (!g_ptr->mimic || f_info[g_ptr->mimic].flags.has_not(FloorFeatureType::PROJECT) || !permanent_wall(&f_info[g_ptr->feat])) {
+ if (!g_ptr->cave_has_flag(TerrainCharacteristics::PROJECT)) {
+ if (!g_ptr->mimic || terrains_info[g_ptr->mimic].flags.has_not(TerrainCharacteristics::PROJECT) || !permanent_wall(&terrains_info[g_ptr->feat])) {
do_call = false;
break;
}
if (do_call) {
for (int i = 1; i < 10; i++) {
- if (i - 5)
+ if (i - 5) {
fire_ball(player_ptr, AttributeType::ROCKET, i, 175, 2);
+ }
}
for (int i = 1; i < 10; i++) {
- if (i - 5)
+ if (i - 5) {
fire_ball(player_ptr, AttributeType::MANA, i, 175, 3);
+ }
}
for (int i = 1; i < 10; i++) {
- if (i - 5)
+ if (i - 5) {
fire_ball(player_ptr, AttributeType::NUKE, i, 175, 4);
+ }
}
return;
}
- bool is_special_fllor = inside_quest(floor_ptr->quest_number) && quest_type::is_fixed(floor_ptr->quest_number);
- is_special_fllor |= floor_ptr->dun_level > 0;
+ bool is_special_fllor = inside_quest(floor_ptr->quest_number) && QuestType::is_fixed(floor_ptr->quest_number);
+ is_special_fllor |= floor_ptr->dun_level == 0;
if (is_special_fllor) {
msg_print(_("地面が揺れた。", "The ground trembles."));
return;
msg_print(_("大きな爆発音があった！", "There is a loud explosion!"));
if (one_in_(666)) {
- if (!vanish_dungeon(player_ptr))
+ if (!vanish_dungeon(player_ptr)) {
msg_print(_("ダンジョンは一瞬静まり返った。", "The dungeon becomes quiet for a moment."));
+ }
take_hit(player_ptr, DAMAGE_NOESCAPE, 100 + randint1(150), _("自殺的な虚無招来", "a suicidal Call the Void"));
return;
}
- if (destroy_area(player_ptr, player_ptr->y, player_ptr->x, 15 + player_ptr->lev + randint0(11), false))
+ if (destroy_area(player_ptr, player_ptr->y, player_ptr->x, 15 + player_ptr->lev + randint0(11), false)) {
msg_print(_("ダンジョンが崩壊した...", "The dungeon collapses..."));
- else
+ } else {
msg_print(_("ダンジョンは大きく揺れた。", "The dungeon trembles."));
+ }
take_hit(player_ptr, DAMAGE_NOESCAPE, 100 + randint1(150), _("自殺的な虚無招来", "a suicidal Call the Void"));
}
bool vanish_dungeon(PlayerType *player_ptr)
{
auto *floor_ptr = player_ptr->current_floor_ptr;
- bool is_special_floor = inside_quest(floor_ptr->quest_number) && quest_type::is_fixed(floor_ptr->quest_number);
+ bool is_special_floor = inside_quest(floor_ptr->quest_number) && QuestType::is_fixed(floor_ptr->quest_number);
is_special_floor |= (floor_ptr->dun_level == 0);
- if (is_special_floor)
+ if (is_special_floor) {
return false;
+ }
- GAME_TEXT m_name[MAX_NLEN];
for (POSITION y = 1; y < floor_ptr->height - 1; y++) {
for (POSITION x = 1; x < floor_ptr->width - 1; x++) {
auto *g_ptr = &floor_ptr->grid_array[y][x];
- auto *f_ptr = &f_info[g_ptr->feat];
+ auto *f_ptr = &terrains_info[g_ptr->feat];
g_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY);
auto *m_ptr = &floor_ptr->m_list[g_ptr->m_idx];
- if (g_ptr->m_idx && monster_csleep_remaining(m_ptr)) {
+ if (g_ptr->m_idx && m_ptr->is_asleep()) {
(void)set_monster_csleep(player_ptr, g_ptr->m_idx, 0);
if (m_ptr->ml) {
- monster_desc(player_ptr, m_name, m_ptr, 0);
- msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
+ const auto m_name = monster_desc(player_ptr, m_ptr, 0);
+ msg_format(_("%s^が目を覚ました。", "%s^ wakes up."), m_name.data());
}
}
- if (f_ptr->flags.has(FloorFeatureType::HURT_DISI))
- cave_alter_feat(player_ptr, y, x, FloorFeatureType::HURT_DISI);
+ if (f_ptr->flags.has(TerrainCharacteristics::HURT_DISI)) {
+ cave_alter_feat(player_ptr, y, x, TerrainCharacteristics::HURT_DISI);
+ }
}
}
for (POSITION x = 0; x < floor_ptr->width; x++) {
auto *g_ptr = &floor_ptr->grid_array[0][x];
- auto *f_ptr = &f_info[g_ptr->mimic];
+ auto *f_ptr = &terrains_info[g_ptr->mimic];
g_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY);
- if (g_ptr->mimic && f_ptr->flags.has(FloorFeatureType::HURT_DISI)) {
- g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, FloorFeatureType::HURT_DISI);
- if (f_info[g_ptr->mimic].flags.has_not(FloorFeatureType::REMEMBER))
+ if (g_ptr->mimic && f_ptr->flags.has(TerrainCharacteristics::HURT_DISI)) {
+ g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, TerrainCharacteristics::HURT_DISI);
+ if (terrains_info[g_ptr->mimic].flags.has_not(TerrainCharacteristics::REMEMBER)) {
g_ptr->info &= ~(CAVE_MARK);
+ }
}
g_ptr = &floor_ptr->grid_array[floor_ptr->height - 1][x];
- f_ptr = &f_info[g_ptr->mimic];
+ f_ptr = &terrains_info[g_ptr->mimic];
g_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY);
- if (g_ptr->mimic && f_ptr->flags.has(FloorFeatureType::HURT_DISI)) {
- g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, FloorFeatureType::HURT_DISI);
- if (f_info[g_ptr->mimic].flags.has_not(FloorFeatureType::REMEMBER))
+ if (g_ptr->mimic && f_ptr->flags.has(TerrainCharacteristics::HURT_DISI)) {
+ g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, TerrainCharacteristics::HURT_DISI);
+ if (terrains_info[g_ptr->mimic].flags.has_not(TerrainCharacteristics::REMEMBER)) {
g_ptr->info &= ~(CAVE_MARK);
+ }
}
}
/* Special boundary walls -- Left and right */
for (POSITION y = 1; y < (floor_ptr->height - 1); y++) {
auto *g_ptr = &floor_ptr->grid_array[y][0];
- auto *f_ptr = &f_info[g_ptr->mimic];
+ auto *f_ptr = &terrains_info[g_ptr->mimic];
g_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY);
- if (g_ptr->mimic && f_ptr->flags.has(FloorFeatureType::HURT_DISI)) {
- g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, FloorFeatureType::HURT_DISI);
- if (f_info[g_ptr->mimic].flags.has_not(FloorFeatureType::REMEMBER))
+ if (g_ptr->mimic && f_ptr->flags.has(TerrainCharacteristics::HURT_DISI)) {
+ g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, TerrainCharacteristics::HURT_DISI);
+ if (terrains_info[g_ptr->mimic].flags.has_not(TerrainCharacteristics::REMEMBER)) {
g_ptr->info &= ~(CAVE_MARK);
+ }
}
g_ptr = &floor_ptr->grid_array[y][floor_ptr->width - 1];
- f_ptr = &f_info[g_ptr->mimic];
+ f_ptr = &terrains_info[g_ptr->mimic];
g_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY);
- if (g_ptr->mimic && f_ptr->flags.has(FloorFeatureType::HURT_DISI)) {
- g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, FloorFeatureType::HURT_DISI);
- if (f_info[g_ptr->mimic].flags.has_not(FloorFeatureType::REMEMBER))
+ if (g_ptr->mimic && f_ptr->flags.has(TerrainCharacteristics::HURT_DISI)) {
+ g_ptr->mimic = feat_state(floor_ptr, g_ptr->mimic, TerrainCharacteristics::HURT_DISI);
+ if (terrains_info[g_ptr->mimic].flags.has_not(TerrainCharacteristics::REMEMBER)) {
g_ptr->info &= ~(CAVE_MARK);
+ }
}
}
- player_ptr->update |= (PU_UN_VIEW | PU_UN_LITE | PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
- player_ptr->redraw |= (PR_MAP);
+ auto &rfu = RedrawingFlagsUpdater::get_instance();
+ const auto flags_srf = {
+ StatusRedrawingFlag::UN_VIEW,
+ StatusRedrawingFlag::UN_LITE,
+ StatusRedrawingFlag::VIEW,
+ StatusRedrawingFlag::LITE,
+ StatusRedrawingFlag::FLOW,
+ StatusRedrawingFlag::MONSTER_LITE,
+ StatusRedrawingFlag::MONSTER_STATUSES,
+ };
+ rfu.set_flags(flags_srf);
+ rfu.set_flag(MainWindowRedrawingFlag::MAP);
player_ptr->window_flags |= (PW_OVERHEAD | PW_DUNGEON);
return true;
}
dy = (player_ptr->y > y) ? (player_ptr->y - y) : (y - player_ptr->y);
d = (dy > dx) ? (dy + (dx >> 1)) : (dx + (dy >> 1));
- if (d >= 9)
+ if (d >= 9) {
continue;
+ }
auto *floor_ptr = player_ptr->current_floor_ptr;
- if (!in_bounds(floor_ptr, y, x) || !projectable(player_ptr, player_ptr->y, player_ptr->x, y, x) || !cave_has_flag_bold(floor_ptr, y, x, FloorFeatureType::PROJECT))
+ if (!in_bounds(floor_ptr, y, x)) {
+ continue;
+ }
+
+ const auto is_projectable = projectable(player_ptr, player_ptr->y, player_ptr->x, y, x);
+ if (!is_projectable || !cave_has_flag_bold(floor_ptr, y, x, TerrainCharacteristics::PROJECT)) {
continue;
+ }
break;
}
- if (count > 20)
+ if (count > 20) {
continue;
+ }
project(player_ptr, 0, rad, y, x, dam, AttributeType::METEOR, PROJECT_KILL | PROJECT_JUMP | PROJECT_ITEM);
}
OSDN Git Service
