#include "floor/fixed-map-generator.h"
#include "artifact/fixed-art-generator.h"
+#include "artifact/fixed-art-types.h"
#include "dungeon/quest.h"
#include "floor/floor-object.h"
#include "floor/floor-town.h"
#include "monster-race/race-flags7.h"
#include "monster/monster-util.h"
#include "monster/smart-learn-types.h"
-#include "object-enchant/apply-magic.h"
#include "object-enchant/item-apply-magic.h"
+#include "object-enchant/item-magic-applier.h"
#include "object-enchant/object-ego.h"
#include "object-enchant/trg-types.h"
#include "object/object-info.h"
* @param x 配置先X座標
* @return エラーコード
*/
-static void drop_here(floor_type *floor_ptr, object_type *j_ptr, POSITION y, POSITION x)
+static void drop_here(floor_type *floor_ptr, ObjectType *j_ptr, POSITION y, POSITION x)
{
OBJECT_IDX o_idx = o_pop(floor_ptr);
- object_type *o_ptr;
+ ObjectType *o_ptr;
o_ptr = &floor_ptr->o_list[o_idx];
o_ptr->copy_from(j_ptr);
o_ptr->iy = y;
o_ptr->ix = x;
o_ptr->held_m_idx = 0;
- grid_type *g_ptr = &floor_ptr->grid_array[y][x];
+ auto *g_ptr = &floor_ptr->grid_array[y][x];
g_ptr->o_idx_list.add(floor_ptr, o_idx);
}
-static void generate_artifact(player_type *player_ptr, qtwg_type *qtwg_ptr, const ARTIFACT_IDX artifact_index)
+static void generate_artifact(PlayerType *player_ptr, qtwg_type *qtwg_ptr, const FixedArtifactId artifact_index)
{
- if (artifact_index == 0)
+ if (artifact_index == FixedArtifactId::NONE) {
return;
+ }
- if ((a_info[artifact_index].cur_num == 0) && create_named_art(player_ptr, artifact_index, *qtwg_ptr->y, *qtwg_ptr->x)) {
- a_info[artifact_index].cur_num = 1;
+ const auto int_artifact_index = enum2i(artifact_index);
+ if (!a_info[int_artifact_index].is_generated && create_named_art(player_ptr, artifact_index, *qtwg_ptr->y, *qtwg_ptr->x)) {
+ a_info[int_artifact_index].is_generated = true;
return;
}
- KIND_OBJECT_IDX k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
- object_type forge;
- object_type *q_ptr = &forge;
+ KIND_OBJECT_IDX k_idx = lookup_kind(ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT);
+ ObjectType forge;
+ auto *q_ptr = &forge;
q_ptr->prep(k_idx);
drop_here(player_ptr->current_floor_ptr, q_ptr, *qtwg_ptr->y, *qtwg_ptr->x);
}
-static void parse_qtw_D(player_type *player_ptr, qtwg_type *qtwg_ptr, char *s)
+static void parse_qtw_D(PlayerType *player_ptr, qtwg_type *qtwg_ptr, char *s)
{
*qtwg_ptr->x = qtwg_ptr->xmin;
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
+ auto *floor_ptr = player_ptr->current_floor_ptr;
int len = strlen(s);
for (int i = 0; ((*qtwg_ptr->x < qtwg_ptr->xmax) && (i < len)); (*qtwg_ptr->x)++, s++, i++) {
- grid_type *g_ptr = &floor_ptr->grid_array[*qtwg_ptr->y][*qtwg_ptr->x];
+ auto *g_ptr = &floor_ptr->grid_array[*qtwg_ptr->y][*qtwg_ptr->x];
int idx = s[0];
OBJECT_IDX object_index = letter[idx].object;
MONSTER_IDX monster_index = letter[idx].monster;
int random = letter[idx].random;
- ARTIFACT_IDX artifact_index = letter[idx].artifact;
g_ptr->feat = conv_dungeon_feat(floor_ptr, letter[idx].feature);
- if (init_flags & INIT_ONLY_FEATURES)
+ if (init_flags & INIT_ONLY_FEATURES) {
continue;
+ }
g_ptr->info = letter[idx].cave_info;
if (random & RANDOM_MONSTER) {
clone = true;
}
- old_cur_num = r_info[monster_index].cur_num;
- old_max_num = r_info[monster_index].max_num;
+ const auto r_idx = i2enum<MonsterRaceId>(monster_index);
+ auto &r_ref = r_info[r_idx];
+
+ old_cur_num = r_ref.cur_num;
+ old_max_num = r_ref.max_num;
- if (r_info[monster_index].flags1 & RF1_UNIQUE) {
- r_info[monster_index].cur_num = 0;
- r_info[monster_index].max_num = 1;
- } else if (r_info[monster_index].flags7 & RF7_NAZGUL) {
- if (r_info[monster_index].cur_num == r_info[monster_index].max_num) {
- r_info[monster_index].max_num++;
+ if (r_ref.kind_flags.has(MonsterKindType::UNIQUE)) {
+ r_ref.cur_num = 0;
+ r_ref.max_num = 1;
+ } else if (r_ref.population_flags.has(MonsterPopulationType::NAZGUL)) {
+ if (r_ref.cur_num == r_ref.max_num) {
+ r_ref.max_num++;
}
}
- place_monster_aux(player_ptr, 0, *qtwg_ptr->y, *qtwg_ptr->x, monster_index, (PM_ALLOW_SLEEP | PM_NO_KAGE));
+ place_monster_aux(player_ptr, 0, *qtwg_ptr->y, *qtwg_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_NO_KAGE));
if (clone) {
- floor_ptr->m_list[hack_m_idx_ii].mflag2.set(MFLAG2::CLONED);
- r_info[monster_index].cur_num = old_cur_num;
- r_info[monster_index].max_num = old_max_num;
+ floor_ptr->m_list[hack_m_idx_ii].mflag2.set(MonsterConstantFlagType::CLONED);
+ r_ref.cur_num = old_cur_num;
+ r_ref.max_num = old_max_num;
}
}
floor_ptr->object_level = floor_ptr->base_level;
} else if (random & RANDOM_OBJECT) {
floor_ptr->object_level = floor_ptr->base_level + object_index;
- if (randint0(100) < 75)
+ if (randint0(100) < 75) {
place_object(player_ptr, *qtwg_ptr->y, *qtwg_ptr->x, 0L);
- else if (randint0(100) < 80)
+ } else if (randint0(100) < 80) {
place_object(player_ptr, *qtwg_ptr->y, *qtwg_ptr->x, AM_GOOD);
- else
+ } else {
place_object(player_ptr, *qtwg_ptr->y, *qtwg_ptr->x, AM_GOOD | AM_GREAT);
+ }
floor_ptr->object_level = floor_ptr->base_level;
} else if (random & RANDOM_TRAP) {
g_ptr->mimic = g_ptr->feat;
g_ptr->feat = conv_dungeon_feat(floor_ptr, letter[idx].trap);
} else if (object_index) {
- object_type tmp_object;
- object_type *o_ptr = &tmp_object;
+ ObjectType tmp_object;
+ auto *o_ptr = &tmp_object;
o_ptr->prep(object_index);
- if (o_ptr->tval == TV_GOLD) {
+ if (o_ptr->tval == ItemKindType::GOLD) {
coin_type = object_index - OBJ_GOLD_LIST;
make_gold(player_ptr, o_ptr);
coin_type = 0;
}
- apply_magic_to_object(player_ptr, o_ptr, floor_ptr->base_level, AM_NO_FIXED_ART | AM_GOOD);
+ ItemMagicApplier(player_ptr, o_ptr, floor_ptr->base_level, AM_NO_FIXED_ART | AM_GOOD).execute();
drop_here(floor_ptr, o_ptr, *qtwg_ptr->y, *qtwg_ptr->x);
}
- generate_artifact(player_ptr, qtwg_ptr, artifact_index);
+ generate_artifact(player_ptr, qtwg_ptr, letter[idx].artifact);
g_ptr->special = letter[idx].special;
}
}
static bool parse_qtw_QQ(quest_type *q_ptr, char **zz, int num)
{
- if (zz[1][0] != 'Q')
+ if (zz[1][0] != 'Q') {
return false;
+ }
- if ((init_flags & INIT_ASSIGN) == 0)
+ if ((init_flags & INIT_ASSIGN) == 0) {
return true;
+ }
monster_race *r_ptr;
- artifact_type *a_ptr;
+ ArtifactType *a_ptr;
- if (num < 9)
+ if (num < 9) {
return true;
+ }
- q_ptr->type = static_cast<int16_t>(atoi(zz[2]));
+ q_ptr->type = i2enum<QuestKindType>(atoi(zz[2]));
q_ptr->num_mon = (MONSTER_NUMBER)atoi(zz[3]);
q_ptr->cur_num = (MONSTER_NUMBER)atoi(zz[4]);
q_ptr->max_num = (MONSTER_NUMBER)atoi(zz[5]);
q_ptr->level = (DEPTH)atoi(zz[6]);
- q_ptr->r_idx = (MONRACE_IDX)atoi(zz[7]);
- q_ptr->k_idx = (KIND_OBJECT_IDX)atoi(zz[8]);
+ q_ptr->r_idx = i2enum<MonsterRaceId>(atoi(zz[7]));
+ q_ptr->reward_artifact_idx = i2enum<FixedArtifactId>(atoi(zz[8]));
q_ptr->dungeon = (DUNGEON_IDX)atoi(zz[9]);
- if (num > 10)
+ if (num > 10) {
q_ptr->flags = atoi(zz[10]);
+ }
r_ptr = &r_info[q_ptr->r_idx];
- if (r_ptr->flags1 & RF1_UNIQUE)
+ if (r_ptr->kind_flags.has(MonsterKindType::UNIQUE)) {
r_ptr->flags1 |= RF1_QUESTOR;
+ }
- a_ptr = &a_info[q_ptr->k_idx];
- a_ptr->gen_flags.set(TRG::QUESTITEM);
+ a_ptr = &a_info[enum2i(q_ptr->reward_artifact_idx)];
+ a_ptr->gen_flags.set(ItemGenerationTraitType::QUESTITEM);
return true;
}
*/
static bool parse_qtw_QR(quest_type *q_ptr, char **zz, int num)
{
- if (zz[1][0] != 'R')
+ if (zz[1][0] != 'R') {
return false;
+ }
- if ((init_flags & INIT_ASSIGN) == 0)
+ if ((init_flags & INIT_ASSIGN) == 0) {
return true;
+ }
int count = 0;
- ARTIFACT_IDX idx, reward_idx = 0;
- for (idx = 2; idx < num; idx++) {
- ARTIFACT_IDX a_idx = (ARTIFACT_IDX)atoi(zz[idx]);
- if (a_idx < 1)
+ FixedArtifactId reward_idx = FixedArtifactId::NONE;
+ for (auto idx = 2; idx < num; idx++) {
+ const auto a_idx = i2enum<FixedArtifactId>(atoi(zz[idx]));
+ if (a_idx == FixedArtifactId::NONE) {
continue;
- if (a_info[a_idx].cur_num > 0)
+ }
+
+ if (a_info[enum2i(a_idx)].is_generated) {
continue;
+ }
+
count++;
- if (one_in_(count))
+ if (one_in_(count)) {
reward_idx = a_idx;
+ }
}
- if (reward_idx) {
- q_ptr->k_idx = (KIND_OBJECT_IDX)reward_idx;
- a_info[reward_idx].gen_flags.set(TRG::QUESTITEM);
+ if (reward_idx != FixedArtifactId::NONE) {
+ q_ptr->reward_artifact_idx = reward_idx;
+ a_info[enum2i(reward_idx)].gen_flags.set(ItemGenerationTraitType::QUESTITEM);
} else {
- q_ptr->type = QUEST_TYPE_KILL_ALL;
+ q_ptr->type = QuestKindType::KILL_ALL;
}
return true;
*/
static int parse_qtw_Q(qtwg_type *qtwg_ptr, char **zz)
{
- if (qtwg_ptr->buf[0] != 'Q')
+ if (qtwg_ptr->buf[0] != 'Q') {
return PARSE_CONTINUE;
+ }
#ifdef JP
- if (qtwg_ptr->buf[2] == '$')
+ if (qtwg_ptr->buf[2] == '$') {
return PARSE_ERROR_NONE;
+ }
#else
- if (qtwg_ptr->buf[2] != '$')
+ if (qtwg_ptr->buf[2] != '$') {
return PARSE_ERROR_NONE;
+ }
#endif
int num = tokenize(qtwg_ptr->buf + _(2, 3), 33, zz, 0);
- if (num < 3)
+ if (num < 3) {
return PARSE_ERROR_TOO_FEW_ARGUMENTS;
+ }
- quest_type *q_ptr;
- q_ptr = &(quest[atoi(zz[0])]);
- if (parse_qtw_QQ(q_ptr, zz, num))
+ auto &quest_list = QuestList::get_instance();
+ auto *q_ptr = &(quest_list[i2enum<QuestId>(atoi(zz[0]))]);
+ if (parse_qtw_QQ(q_ptr, zz, num)) {
return PARSE_ERROR_NONE;
+ }
- if (parse_qtw_QR(q_ptr, zz, num))
+ if (parse_qtw_QR(q_ptr, zz, num)) {
return PARSE_ERROR_NONE;
+ }
if (zz[1][0] == 'N') {
if (init_flags & (INIT_ASSIGN | INIT_SHOW_TEXT | INIT_NAME_ONLY)) {
return PARSE_ERROR_GENERIC;
}
-static bool parse_qtw_P(player_type *player_ptr, qtwg_type *qtwg_ptr, char **zz)
+static bool parse_qtw_P(PlayerType *player_ptr, qtwg_type *qtwg_ptr, char **zz)
{
- if (qtwg_ptr->buf[0] != 'P')
+ if (qtwg_ptr->buf[0] != 'P') {
return false;
+ }
- if ((init_flags & INIT_CREATE_DUNGEON) == 0)
+ if ((init_flags & INIT_CREATE_DUNGEON) == 0) {
return true;
+ }
- if (tokenize(qtwg_ptr->buf + 2, 2, zz, 0) != 2)
+ if (tokenize(qtwg_ptr->buf + 2, 2, zz, 0) != 2) {
return true;
+ }
int panels_y = (*qtwg_ptr->y / SCREEN_HGT);
- if (*qtwg_ptr->y % SCREEN_HGT)
+ if (*qtwg_ptr->y % SCREEN_HGT) {
panels_y++;
+ }
- floor_type *floor_ptr = player_ptr->current_floor_ptr;
+ auto *floor_ptr = player_ptr->current_floor_ptr;
floor_ptr->height = panels_y * SCREEN_HGT;
int panels_x = (*qtwg_ptr->x / SCREEN_WID);
- if (*qtwg_ptr->x % SCREEN_WID)
+ if (*qtwg_ptr->x % SCREEN_WID) {
panels_x++;
+ }
floor_ptr->width = panels_x * SCREEN_WID;
panel_row_min = floor_ptr->height;
panel_col_min = floor_ptr->width;
- if (floor_ptr->inside_quest) {
+ if (inside_quest(floor_ptr->quest_number)) {
POSITION py = atoi(zz[0]);
POSITION px = atoi(zz[1]);
player_ptr->y = py;
static bool parse_qtw_M(qtwg_type *qtwg_ptr, char **zz)
{
- if (qtwg_ptr->buf[0] != 'M')
+ if (qtwg_ptr->buf[0] != 'M') {
return false;
+ }
- if ((tokenize(qtwg_ptr->buf + 2, 2, zz, 0) == 2) == 0)
+ if ((tokenize(qtwg_ptr->buf + 2, 2, zz, 0) == 2) == 0) {
return true;
+ }
if (zz[0][0] == 'T') {
max_towns = static_cast<int16_t>(atoi(zz[1]));
- } else if (zz[0][0] == 'Q') {
- max_q_idx = (QUEST_IDX)atoi(zz[1]);
- } else if (zz[0][0] == 'R') {
- max_r_idx = (MONRACE_IDX)atoi(zz[1]);
- } else if (zz[0][0] == 'K') {
- max_k_idx = (KIND_OBJECT_IDX)atoi(zz[1]);
- } else if (zz[0][0] == 'V') {
- max_v_idx = static_cast<int16_t>(atoi(zz[1]));
- } else if (zz[0][0] == 'F') {
- max_f_idx = (FEAT_IDX)atoi(zz[1]);
- } else if (zz[0][0] == 'A') {
- max_a_idx = (ARTIFACT_IDX)atoi(zz[1]);
- } else if (zz[0][0] == 'E') {
- max_e_idx = (EGO_IDX)atoi(zz[1]);
- } else if (zz[0][0] == 'D') {
- w_ptr->max_d_idx = (DUNGEON_IDX)atoi(zz[1]);
} else if (zz[0][0] == 'O') {
w_ptr->max_o_idx = (OBJECT_IDX)atoi(zz[1]);
} else if (zz[0][0] == 'M') {
w_ptr->max_m_idx = (MONSTER_IDX)atoi(zz[1]);
} else if (zz[0][0] == 'W') {
- if (zz[0][1] == 'X')
+ if (zz[0][1] == 'X') {
w_ptr->max_wild_x = (POSITION)atoi(zz[1]);
+ }
- if (zz[0][1] == 'Y')
+ if (zz[0][1] == 'Y') {
w_ptr->max_wild_y = (POSITION)atoi(zz[1]);
+ }
}
return true;
* @return エラーコード
* @todo クエスト情報のみを読み込む手段と実際にフロアデータまで読み込む処理は分離したい
*/
-parse_error_type generate_fixed_map_floor(player_type *player_ptr, qtwg_type *qtwg_ptr, process_dungeon_file_pf parse_fixed_map)
+parse_error_type generate_fixed_map_floor(PlayerType *player_ptr, qtwg_type *qtwg_ptr, process_dungeon_file_pf parse_fixed_map)
{
char *zz[33];
- if (!qtwg_ptr->buf[0])
+ if (!qtwg_ptr->buf[0]) {
return PARSE_ERROR_NONE;
+ }
- if (iswspace(qtwg_ptr->buf[0]))
+ if (iswspace(qtwg_ptr->buf[0])) {
return PARSE_ERROR_NONE;
+ }
- if (qtwg_ptr->buf[0] == '#')
+ if (qtwg_ptr->buf[0] == '#') {
return PARSE_ERROR_NONE;
+ }
- if (qtwg_ptr->buf[1] != ':')
+ if (qtwg_ptr->buf[1] != ':') {
return PARSE_ERROR_GENERIC;
+ }
- if (qtwg_ptr->buf[0] == '%')
+ if (qtwg_ptr->buf[0] == '%') {
return (*parse_fixed_map)(player_ptr, qtwg_ptr->buf + 2, qtwg_ptr->ymin, qtwg_ptr->xmin, qtwg_ptr->ymax, qtwg_ptr->xmax);
+ }
/* Process "F:<letter>:<terrain>:<cave_info>:<monster>:<object>:<ego>:<artifact>:<trap>:<special>" -- info for dungeon grid */
- if (qtwg_ptr->buf[0] == 'F')
+ if (qtwg_ptr->buf[0] == 'F') {
return parse_line_feature(player_ptr->current_floor_ptr, qtwg_ptr->buf);
+ }
if (qtwg_ptr->buf[0] == 'D') {
char *s = qtwg_ptr->buf + 2;
- if (init_flags & INIT_ONLY_BUILDINGS)
+ if (init_flags & INIT_ONLY_BUILDINGS) {
return PARSE_ERROR_NONE;
+ }
parse_qtw_D(player_ptr, qtwg_ptr, s);
(*qtwg_ptr->y)++;
}
parse_error_type parse_result_Q = i2enum<parse_error_type>(parse_qtw_Q(qtwg_ptr, zz));
- if (parse_result_Q != PARSE_CONTINUE)
+ if (parse_result_Q != PARSE_CONTINUE) {
return parse_result_Q;
+ }
- if (qtwg_ptr->buf[0] == 'W')
+ if (qtwg_ptr->buf[0] == 'W') {
return parse_line_wilderness(player_ptr, qtwg_ptr->buf, qtwg_ptr->xmin, qtwg_ptr->xmax, qtwg_ptr->y, qtwg_ptr->x);
+ }
- if (parse_qtw_P(player_ptr, qtwg_ptr, zz))
+ if (parse_qtw_P(player_ptr, qtwg_ptr, zz)) {
return PARSE_ERROR_NONE;
+ }
- if (qtwg_ptr->buf[0] == 'B')
+ if (qtwg_ptr->buf[0] == 'B') {
return parse_line_building(qtwg_ptr->buf);
+ }
- if (parse_qtw_M(qtwg_ptr, zz))
+ if (parse_qtw_M(qtwg_ptr, zz)) {
return PARSE_ERROR_NONE;
+ }
return PARSE_ERROR_GENERIC;
}
OSDN Git Service
