From 3f3131f2ad7a9f458b1829de030acee43a92b1d7 Mon Sep 17 00:00:00 2001 From: Hourier Date: Tue, 15 Dec 2020 22:02:23 +0900 Subject: [PATCH] [Refactor] #41052 Reshaped knowledge/ automatically --- src/knowledge/knowledge-autopick.c | 94 ++--- src/knowledge/knowledge-experiences.c | 257 +++++++------ src/knowledge/knowledge-features.c | 685 ++++++++++++++++------------------ src/knowledge/knowledge-mutations.c | 17 +- src/knowledge/knowledge-self.c | 2 +- src/knowledge/lighting-level-table.c | 9 +- src/knowledge/monster-group-table.c | 194 +--------- 7 files changed, 523 insertions(+), 735 deletions(-) diff --git a/src/knowledge/knowledge-autopick.c b/src/knowledge/knowledge-autopick.c index 6a9d46775..c41aa7b05 100644 --- a/src/knowledge/knowledge-autopick.c +++ b/src/knowledge/knowledge-autopick.c @@ -13,73 +13,61 @@ #include "io-dump/dump-util.h" #include "util/angband-files.h" - /*! - * @brief 自動拾い設定ファイルをロードするコマンドのメインルーチン / - * @param creature_ptr プレーヤーへの参照ポインタ - * @return なし - */ +/*! + * @brief 自動拾い設定ファイルをロードするコマンドのメインルーチン / + * @param creature_ptr プレーヤーへの参照ポインタ + * @return なし + */ void do_cmd_reload_autopick(player_type *creature_ptr) { - if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? "))) - return; + if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? "))) + return; - autopick_load_pref(creature_ptr, TRUE); + autopick_load_pref(creature_ptr, TRUE); } - /* * Check the status of "autopick" */ void do_cmd_knowledge_autopick(player_type *creature_ptr) { - FILE *fff = NULL; - GAME_TEXT file_name[FILE_NAME_SIZE]; - if (!open_temporary_file(&fff, file_name)) return; + FILE *fff = NULL; + GAME_TEXT file_name[FILE_NAME_SIZE]; + if (!open_temporary_file(&fff, file_name)) + return; - if (!max_autopick) - { - fprintf(fff, _("自動破壊/拾いには何も登録されていません。", "No preference for auto picker/destroyer.")); - } - else - { - fprintf(fff, _(" 自動拾い/破壊には現在 %d行登録されています。\n\n", - " There are %d registered lines for auto picker/destroyer.\n\n"), max_autopick); - } + if (!max_autopick) { + fprintf(fff, _("自動破壊/拾いには何も登録されていません。", "No preference for auto picker/destroyer.")); + } else { + fprintf(fff, _(" 自動拾い/破壊には現在 %d行登録されています。\n\n", " There are %d registered lines for auto picker/destroyer.\n\n"), max_autopick); + } - for (int k = 0; k < max_autopick; k++) - { - concptr tmp; - byte act = autopick_list[k].action; - if (act & DONT_AUTOPICK) - { - tmp = _("放置", "Leave"); - } - else if (act & DO_AUTODESTROY) - { - tmp = _("破壊", "Destroy"); - } - else if (act & DO_AUTOPICK) - { - tmp = _("拾う", "Pickup"); - } - else - { - tmp = _("確認", "Query"); - } + for (int k = 0; k < max_autopick; k++) { + concptr tmp; + byte act = autopick_list[k].action; + if (act & DONT_AUTOPICK) { + tmp = _("放置", "Leave"); + } else if (act & DO_AUTODESTROY) { + tmp = _("破壊", "Destroy"); + } else if (act & DO_AUTOPICK) { + tmp = _("拾う", "Pickup"); + } else { + tmp = _("確認", "Query"); + } - if (act & DO_DISPLAY) - fprintf(fff, "%11s", format("[%s]", tmp)); - else - fprintf(fff, "%11s", format("(%s)", tmp)); + if (act & DO_DISPLAY) + fprintf(fff, "%11s", format("[%s]", tmp)); + else + fprintf(fff, "%11s", format("(%s)", tmp)); - tmp = autopick_line_from_entry(&autopick_list[k]); - fprintf(fff, " %s", tmp); - string_free(tmp); - fprintf(fff, "\n"); - } + tmp = autopick_line_from_entry(&autopick_list[k]); + fprintf(fff, " %s", tmp); + string_free(tmp); + fprintf(fff, "\n"); + } - angband_fclose(fff); + angband_fclose(fff); - (void)show_file(creature_ptr, TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0); - fd_kill(file_name); + (void)show_file(creature_ptr, TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0); + fd_kill(file_name); } diff --git a/src/knowledge/knowledge-experiences.c b/src/knowledge/knowledge-experiences.c index 4ac5a3362..3ea7cabe0 100644 --- a/src/knowledge/knowledge-experiences.c +++ b/src/knowledge/knowledge-experiences.c @@ -10,12 +10,12 @@ #include "game-option/cheat-options.h" #include "io-dump/dump-util.h" #include "object/object-kind.h" -#include "sv-definition/sv-bow-types.h" #include "player/player-class.h" #include "player/player-skill.h" #include "realm/realm-names-table.h" #include "spell/spells-execution.h" #include "spell/technic-info-table.h" +#include "sv-definition/sv-bow-types.h" #include "util/angband-files.h" /* @@ -23,42 +23,44 @@ */ void do_cmd_knowledge_weapon_exp(player_type *creature_ptr) { - FILE *fff = NULL; - GAME_TEXT file_name[FILE_NAME_SIZE]; - if (!open_temporary_file(&fff, file_name)) return; - - for (int i = 0; i < 5; i++) - { - for (int num = 0; num < 64; num++) - { - SUB_EXP weapon_exp; - char tmp[30]; - for (KIND_OBJECT_IDX j = 0; j < max_k_idx; j++) - { - object_kind *k_ptr = &k_info[j]; - - if ((k_ptr->tval != TV_SWORD - i) || (k_ptr->sval != num)) continue; - if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON || k_ptr->sval == SV_HARP)) continue; - - weapon_exp = creature_ptr->weapon_exp[4 - i][num]; - strip_name(tmp, j); - fprintf(fff, "%-25s ", tmp); - if (weapon_exp >= s_info[creature_ptr->pclass].w_max[4 - i][num]) fprintf(fff, "!"); - else fprintf(fff, " "); - fprintf(fff, "%s", exp_level_str[weapon_exp_level(weapon_exp)]); - if (cheat_xtra) fprintf(fff, " %d", weapon_exp); - fprintf(fff, "\n"); - break; - } - } - } - - angband_fclose(fff); - (void)show_file(creature_ptr, TRUE, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0); - fd_kill(file_name); + FILE *fff = NULL; + GAME_TEXT file_name[FILE_NAME_SIZE]; + if (!open_temporary_file(&fff, file_name)) + return; + + for (int i = 0; i < 5; i++) { + for (int num = 0; num < 64; num++) { + SUB_EXP weapon_exp; + char tmp[30]; + for (KIND_OBJECT_IDX j = 0; j < max_k_idx; j++) { + object_kind *k_ptr = &k_info[j]; + + if ((k_ptr->tval != TV_SWORD - i) || (k_ptr->sval != num)) + continue; + if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON || k_ptr->sval == SV_HARP)) + continue; + + weapon_exp = creature_ptr->weapon_exp[4 - i][num]; + strip_name(tmp, j); + fprintf(fff, "%-25s ", tmp); + if (weapon_exp >= s_info[creature_ptr->pclass].w_max[4 - i][num]) + fprintf(fff, "!"); + else + fprintf(fff, " "); + fprintf(fff, "%s", exp_level_str[weapon_exp_level(weapon_exp)]); + if (cheat_xtra) + fprintf(fff, " %d", weapon_exp); + fprintf(fff, "\n"); + break; + } + } + } + + angband_fclose(fff); + (void)show_file(creature_ptr, TRUE, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0); + fd_kill(file_name); } - /*! * @brief 魔法の経験値を表示するコマンドのメインルーチン * Display spell-exp @@ -66,77 +68,74 @@ void do_cmd_knowledge_weapon_exp(player_type *creature_ptr) */ void do_cmd_knowledge_spell_exp(player_type *creature_ptr) { - FILE *fff = NULL; - GAME_TEXT file_name[FILE_NAME_SIZE]; - if (!open_temporary_file(&fff, file_name)) return; - - if (creature_ptr->realm1 != REALM_NONE) - { - fprintf(fff, _("%sの魔法書\n", "%s Spellbook\n"), realm_names[creature_ptr->realm1]); - for (SPELL_IDX i = 0; i < 32; i++) - { - const magic_type *s_ptr; - if (!is_magic(creature_ptr->realm1)) - { - s_ptr = &technic_info[creature_ptr->realm1 - MIN_TECHNIC][i]; - } - else - { - s_ptr = &mp_ptr->info[creature_ptr->realm1 - 1][i]; - } - - if (s_ptr->slevel >= 99) continue; - SUB_EXP spell_exp = creature_ptr->spell_exp[i]; - int exp_level = spell_exp_level(spell_exp); - fprintf(fff, "%-25s ", exe_spell(creature_ptr, creature_ptr->realm1, i, SPELL_NAME)); - if (creature_ptr->realm1 == REALM_HISSATSU) - fprintf(fff, "[--]"); - else - { - if (exp_level >= EXP_LEVEL_MASTER) fprintf(fff, "!"); - else fprintf(fff, " "); - fprintf(fff, "%s", exp_level_str[exp_level]); - } - - if (cheat_xtra) fprintf(fff, " %d", spell_exp); - fprintf(fff, "\n"); - } - } - - if (creature_ptr->realm2 != REALM_NONE) - { - fprintf(fff, _("%sの魔法書\n", "\n%s Spellbook\n"), realm_names[creature_ptr->realm2]); - for (SPELL_IDX i = 0; i < 32; i++) - { - const magic_type *s_ptr; - if (!is_magic(creature_ptr->realm1)) - { - s_ptr = &technic_info[creature_ptr->realm2 - MIN_TECHNIC][i]; - } - else - { - s_ptr = &mp_ptr->info[creature_ptr->realm2 - 1][i]; - } - - if (s_ptr->slevel >= 99) continue; - - SUB_EXP spell_exp = creature_ptr->spell_exp[i + 32]; - int exp_level = spell_exp_level(spell_exp); - fprintf(fff, "%-25s ", exe_spell(creature_ptr, creature_ptr->realm2, i, SPELL_NAME)); - if (exp_level >= EXP_LEVEL_EXPERT) fprintf(fff, "!"); - else fprintf(fff, " "); - fprintf(fff, "%s", exp_level_str[exp_level]); - if (cheat_xtra) fprintf(fff, " %d", spell_exp); - fprintf(fff, "\n"); - } - } - - angband_fclose(fff); - (void)show_file(creature_ptr, TRUE, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0); - fd_kill(file_name); + FILE *fff = NULL; + GAME_TEXT file_name[FILE_NAME_SIZE]; + if (!open_temporary_file(&fff, file_name)) + return; + + if (creature_ptr->realm1 != REALM_NONE) { + fprintf(fff, _("%sの魔法書\n", "%s Spellbook\n"), realm_names[creature_ptr->realm1]); + for (SPELL_IDX i = 0; i < 32; i++) { + const magic_type *s_ptr; + if (!is_magic(creature_ptr->realm1)) { + s_ptr = &technic_info[creature_ptr->realm1 - MIN_TECHNIC][i]; + } else { + s_ptr = &mp_ptr->info[creature_ptr->realm1 - 1][i]; + } + + if (s_ptr->slevel >= 99) + continue; + SUB_EXP spell_exp = creature_ptr->spell_exp[i]; + int exp_level = spell_exp_level(spell_exp); + fprintf(fff, "%-25s ", exe_spell(creature_ptr, creature_ptr->realm1, i, SPELL_NAME)); + if (creature_ptr->realm1 == REALM_HISSATSU) + fprintf(fff, "[--]"); + else { + if (exp_level >= EXP_LEVEL_MASTER) + fprintf(fff, "!"); + else + fprintf(fff, " "); + fprintf(fff, "%s", exp_level_str[exp_level]); + } + + if (cheat_xtra) + fprintf(fff, " %d", spell_exp); + fprintf(fff, "\n"); + } + } + + if (creature_ptr->realm2 != REALM_NONE) { + fprintf(fff, _("%sの魔法書\n", "\n%s Spellbook\n"), realm_names[creature_ptr->realm2]); + for (SPELL_IDX i = 0; i < 32; i++) { + const magic_type *s_ptr; + if (!is_magic(creature_ptr->realm1)) { + s_ptr = &technic_info[creature_ptr->realm2 - MIN_TECHNIC][i]; + } else { + s_ptr = &mp_ptr->info[creature_ptr->realm2 - 1][i]; + } + + if (s_ptr->slevel >= 99) + continue; + + SUB_EXP spell_exp = creature_ptr->spell_exp[i + 32]; + int exp_level = spell_exp_level(spell_exp); + fprintf(fff, "%-25s ", exe_spell(creature_ptr, creature_ptr->realm2, i, SPELL_NAME)); + if (exp_level >= EXP_LEVEL_EXPERT) + fprintf(fff, "!"); + else + fprintf(fff, " "); + fprintf(fff, "%s", exp_level_str[exp_level]); + if (cheat_xtra) + fprintf(fff, " %d", spell_exp); + fprintf(fff, "\n"); + } + } + + angband_fclose(fff); + (void)show_file(creature_ptr, TRUE, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0); + fd_kill(file_name); } - /*! * @brief スキル情報を表示するコマンドのメインルーチン / * Display skill-exp @@ -144,30 +143,28 @@ void do_cmd_knowledge_spell_exp(player_type *creature_ptr) */ void do_cmd_knowledge_skill_exp(player_type *creature_ptr) { - char skill_name[GINOU_TEMPMAX][20] = - { - _("マーシャルアーツ", "Martial Arts "), - _("二刀流 ", "Dual Wielding "), - _("乗馬 ", "Riding "), - _("盾 ", "Shield ") - }; - - FILE *fff = NULL; - char file_name[FILE_NAME_SIZE]; - if (!open_temporary_file(&fff, file_name)) return; - - for (int i = 0; i < GINOU_TEMPMAX; i++) - { - int skill_exp = creature_ptr->skill_exp[i]; - fprintf(fff, "%-20s ", skill_name[i]); - if (skill_exp >= s_info[creature_ptr->pclass].s_max[i]) fprintf(fff, "!"); - else fprintf(fff, " "); - fprintf(fff, "%s", exp_level_str[(i == GINOU_RIDING) ? riding_exp_level(skill_exp) : weapon_exp_level(skill_exp)]); - if (cheat_xtra) fprintf(fff, " %d", skill_exp); - fprintf(fff, "\n"); - } - - angband_fclose(fff); - (void)show_file(creature_ptr, TRUE, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0); - fd_kill(file_name); + char skill_name[GINOU_TEMPMAX][20] = { _("マーシャルアーツ", "Martial Arts "), _("二刀流 ", "Dual Wielding "), + _("乗馬 ", "Riding "), _("盾 ", "Shield ") }; + + FILE *fff = NULL; + char file_name[FILE_NAME_SIZE]; + if (!open_temporary_file(&fff, file_name)) + return; + + for (int i = 0; i < GINOU_TEMPMAX; i++) { + int skill_exp = creature_ptr->skill_exp[i]; + fprintf(fff, "%-20s ", skill_name[i]); + if (skill_exp >= s_info[creature_ptr->pclass].s_max[i]) + fprintf(fff, "!"); + else + fprintf(fff, " "); + fprintf(fff, "%s", exp_level_str[(i == GINOU_RIDING) ? riding_exp_level(skill_exp) : weapon_exp_level(skill_exp)]); + if (cheat_xtra) + fprintf(fff, " %d", skill_exp); + fprintf(fff, "\n"); + } + + angband_fclose(fff); + (void)show_file(creature_ptr, TRUE, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0); + fd_kill(file_name); } diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c index d6ef63085..7c5f6e881 100644 --- a/src/knowledge/knowledge-features.c +++ b/src/knowledge/knowledge-features.c @@ -18,385 +18,352 @@ #include "util/int-char-converter.h" #include "world/world.h" - /* - * Build a list of feature indexes in the given group. Return the number - * of features in the group. - * - * mode & 0x01 : check for non-empty group - */ +/* + * Build a list of feature indexes in the given group. Return the number + * of features in the group. + * + * mode & 0x01 : check for non-empty group + */ static FEAT_IDX collect_features(FEAT_IDX *feat_idx, BIT_FLAGS8 mode) { - FEAT_IDX feat_cnt = 0; - for (FEAT_IDX i = 0; i < max_f_idx; i++) - { - feature_type *f_ptr = &f_info[i]; - if (!f_ptr->name) continue; - if (f_ptr->mimic != i) continue; - - feat_idx[feat_cnt++] = i; - if (mode & 0x01) break; - } - - feat_idx[feat_cnt] = -1; - return feat_cnt; + FEAT_IDX feat_cnt = 0; + for (FEAT_IDX i = 0; i < max_f_idx; i++) { + feature_type *f_ptr = &f_info[i]; + if (!f_ptr->name) + continue; + if (f_ptr->mimic != i) + continue; + + feat_idx[feat_cnt++] = i; + if (mode & 0x01) + break; + } + + feat_idx[feat_cnt] = -1; + return feat_cnt; } - /* * Display the features in a group. */ -static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_idx, - FEAT_IDX feat_cur, FEAT_IDX feat_top, bool visual_only, int lighting_level) +static void display_feature_list(int col, int row, int per_page, FEAT_IDX *feat_idx, FEAT_IDX feat_cur, FEAT_IDX feat_top, bool visual_only, int lighting_level) { - int lit_col[F_LIT_MAX], i; - int f_idx_col = use_bigtile ? 62 : 64; - - lit_col[F_LIT_STANDARD] = use_bigtile ? (71 - F_LIT_MAX) : 71; - for (i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++) - lit_col[i] = lit_col[F_LIT_STANDARD] + 2 + (i - F_LIT_NS_BEGIN) * 2 + (use_bigtile ? i : 0); - - for (i = 0; i < per_page && (feat_idx[feat_top + i] >= 0); i++) - { - TERM_COLOR attr; - FEAT_IDX f_idx = feat_idx[feat_top + i]; - feature_type *f_ptr = &f_info[f_idx]; - int row_i = row + i; - attr = ((i + feat_top == feat_cur) ? TERM_L_BLUE : TERM_WHITE); - c_prt(attr, f_name + f_ptr->name, row_i, col); - if (per_page == 1) - { - c_prt(attr, format("(%s)", lighting_level_str[lighting_level]), row_i, col + 1 + strlen(f_name + f_ptr->name)); - c_prt(attr, format("%02x/%02x", f_ptr->x_attr[lighting_level], f_ptr->x_char[lighting_level]), row_i, f_idx_col - ((current_world_ptr->wizard || visual_only) ? 6 : 2)); - } - if (current_world_ptr->wizard || visual_only) - { - c_prt(attr, format("%d", f_idx), row_i, f_idx_col); - } - - term_queue_bigchar(lit_col[F_LIT_STANDARD], row_i, f_ptr->x_attr[F_LIT_STANDARD], f_ptr->x_char[F_LIT_STANDARD], 0, 0); - term_putch(lit_col[F_LIT_NS_BEGIN], row_i, TERM_SLATE, '('); - for (int j = F_LIT_NS_BEGIN + 1; j < F_LIT_MAX; j++) - { - term_putch(lit_col[j], row_i, TERM_SLATE, '/'); - } - - term_putch(lit_col[F_LIT_MAX - 1] + (use_bigtile ? 3 : 2), row_i, TERM_SLATE, ')'); - for (int j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++) - { - term_queue_bigchar(lit_col[j] + 1, row_i, f_ptr->x_attr[j], f_ptr->x_char[j], 0, 0); - } - } - - for (; i < per_page; i++) - { - term_erase(col, row + i, 255); - } + int lit_col[F_LIT_MAX], i; + int f_idx_col = use_bigtile ? 62 : 64; + + lit_col[F_LIT_STANDARD] = use_bigtile ? (71 - F_LIT_MAX) : 71; + for (i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++) + lit_col[i] = lit_col[F_LIT_STANDARD] + 2 + (i - F_LIT_NS_BEGIN) * 2 + (use_bigtile ? i : 0); + + for (i = 0; i < per_page && (feat_idx[feat_top + i] >= 0); i++) { + TERM_COLOR attr; + FEAT_IDX f_idx = feat_idx[feat_top + i]; + feature_type *f_ptr = &f_info[f_idx]; + int row_i = row + i; + attr = ((i + feat_top == feat_cur) ? TERM_L_BLUE : TERM_WHITE); + c_prt(attr, f_name + f_ptr->name, row_i, col); + if (per_page == 1) { + c_prt(attr, format("(%s)", lighting_level_str[lighting_level]), row_i, col + 1 + strlen(f_name + f_ptr->name)); + c_prt(attr, format("%02x/%02x", f_ptr->x_attr[lighting_level], f_ptr->x_char[lighting_level]), row_i, + f_idx_col - ((current_world_ptr->wizard || visual_only) ? 6 : 2)); + } + if (current_world_ptr->wizard || visual_only) { + c_prt(attr, format("%d", f_idx), row_i, f_idx_col); + } + + term_queue_bigchar(lit_col[F_LIT_STANDARD], row_i, f_ptr->x_attr[F_LIT_STANDARD], f_ptr->x_char[F_LIT_STANDARD], 0, 0); + term_putch(lit_col[F_LIT_NS_BEGIN], row_i, TERM_SLATE, '('); + for (int j = F_LIT_NS_BEGIN + 1; j < F_LIT_MAX; j++) { + term_putch(lit_col[j], row_i, TERM_SLATE, '/'); + } + + term_putch(lit_col[F_LIT_MAX - 1] + (use_bigtile ? 3 : 2), row_i, TERM_SLATE, ')'); + for (int j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++) { + term_queue_bigchar(lit_col[j] + 1, row_i, f_ptr->x_attr[j], f_ptr->x_char[j], 0, 0); + } + } + + for (; i < per_page; i++) { + term_erase(col, row + i, 255); + } } - /* * Interact with feature visuals. */ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f_idx, IDX *lighting_level) { - TERM_COLOR attr_old[F_LIT_MAX]; - (void)C_WIPE(attr_old, F_LIT_MAX, TERM_COLOR); - SYMBOL_CODE char_old[F_LIT_MAX]; - (void)C_WIPE(char_old, F_LIT_MAX, SYMBOL_CODE); - - TERM_LEN wid, hgt; - term_get_size(&wid, &hgt); - - FEAT_IDX *feat_idx; - C_MAKE(feat_idx, max_f_idx, FEAT_IDX); - - concptr feature_group_text[] = { "terrains", NULL }; - int len; - int max = 0; - int grp_cnt = 0; - int feat_cnt; - FEAT_IDX grp_idx[100]; - TERM_COLOR attr_top = 0; - bool visual_list = FALSE; - byte char_left = 0; - TERM_LEN browser_rows = hgt - 8; - if (direct_f_idx < 0) - { - for (FEAT_IDX i = 0; feature_group_text[i] != NULL; i++) - { - len = strlen(feature_group_text[i]); - if (len > max) max = len; - - if (collect_features(feat_idx, 0x01)) - { - grp_idx[grp_cnt++] = i; - } - } - - feat_cnt = 0; - } - else - { - feature_type *f_ptr = &f_info[direct_f_idx]; - - feat_idx[0] = direct_f_idx; - feat_cnt = 1; - feat_idx[1] = -1; - - (void)visual_mode_command('v', &visual_list, browser_rows - 1, wid - (max + 3), - &attr_top, &char_left, &f_ptr->x_attr[*lighting_level], &f_ptr->x_char[*lighting_level], need_redraw); - - for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) - { - attr_old[i] = f_ptr->x_attr[i]; - char_old[i] = f_ptr->x_char[i]; - } - } - - grp_idx[grp_cnt] = -1; - - FEAT_IDX old_grp_cur = -1; - FEAT_IDX grp_cur = 0; - FEAT_IDX grp_top = 0; - FEAT_IDX feat_cur = 0; - FEAT_IDX feat_top = 0; - TERM_LEN column = 0; - bool flag = FALSE; - bool redraw = TRUE; - TERM_COLOR *cur_attr_ptr; - SYMBOL_CODE *cur_char_ptr; - while (!flag) - { - char ch; - feature_type *f_ptr; - - if (redraw) - { - clear_from(0); - - prt(_("表示 - 地形", "Visuals - features"), 2, 0); - if (direct_f_idx < 0) prt(_("グループ", "Group"), 4, 0); - prt(_("名前", "Name"), 4, max + 3); - if (use_bigtile) - { - if (current_world_ptr->wizard || visual_only) prt("Idx", 4, 62); - prt(_("文字 ( l/ d)", "Sym ( l/ d)"), 4, 66); - } - else - { - if (current_world_ptr->wizard || visual_only) prt("Idx", 4, 64); - prt(_("文字 (l/d)", "Sym (l/d)"), 4, 68); - } - - for (FEAT_IDX i = 0; i < 78; i++) - { - term_putch(i, 5, TERM_WHITE, '='); - } - - if (direct_f_idx < 0) - { - for (FEAT_IDX i = 0; i < browser_rows; i++) - { - term_putch(max + 1, 6 + i, TERM_WHITE, '|'); - } - } - - redraw = FALSE; - } - - if (direct_f_idx < 0) - { - if (grp_cur < grp_top) grp_top = grp_cur; - if (grp_cur >= grp_top + browser_rows) grp_top = grp_cur - browser_rows + 1; - - display_group_list(0, 6, max, browser_rows, grp_idx, feature_group_text, grp_cur, grp_top); - if (old_grp_cur != grp_cur) - { - old_grp_cur = grp_cur; - feat_cnt = collect_features(feat_idx, 0x00); - } - - while (feat_cur < feat_top) - feat_top = MAX(0, feat_top - browser_rows / 2); - while (feat_cur >= feat_top + browser_rows) - feat_top = MIN(feat_cnt - browser_rows, feat_top + browser_rows / 2); - } - - if (!visual_list) - { - display_feature_list(max + 3, 6, browser_rows, feat_idx, feat_cur, feat_top, visual_only, F_LIT_STANDARD); - } - else - { - feat_top = feat_cur; - display_feature_list(max + 3, 6, 1, feat_idx, feat_cur, feat_top, visual_only, *lighting_level); - display_visual_list(max + 3, 7, browser_rows - 1, wid - (max + 3), attr_top, char_left); - } - - prt(format(_("<方向>%s, 'd'で標準光源効果%s, ESC", "%s, 'd' for default lighting%s, ESC"), - visual_list ? _(", ENTERで決定, 'a'で対象明度変更", ", ENTER to accept, 'a' for lighting level") : _(", 'v'でシンボル変更", ", 'v' for visuals"), - (attr_idx || char_idx) ? _(", 'c', 'p'でペースト", ", 'c', 'p' to paste") : _(", 'c'でコピー", ", 'c' to copy")), - hgt - 1, 0); - - f_ptr = &f_info[feat_idx[feat_cur]]; - cur_attr_ptr = &f_ptr->x_attr[*lighting_level]; - cur_char_ptr = &f_ptr->x_char[*lighting_level]; - - if (visual_list) - { - place_visual_list_cursor(max + 3, 7, *cur_attr_ptr, *cur_char_ptr, attr_top, char_left); - } - else if (!column) - { - term_gotoxy(0, 6 + (grp_cur - grp_top)); - } - else - { - term_gotoxy(max + 3, 6 + (feat_cur - feat_top)); - } - - ch = inkey(); - if (visual_list && ((ch == 'A') || (ch == 'a'))) - { - int prev_lighting_level = *lighting_level; - - if (ch == 'A') - { - if (*lighting_level <= 0) *lighting_level = F_LIT_MAX - 1; - else (*lighting_level)--; - } - else - { - if (*lighting_level >= F_LIT_MAX - 1) *lighting_level = 0; - else (*lighting_level)++; - } - - if (f_ptr->x_attr[prev_lighting_level] != f_ptr->x_attr[*lighting_level]) - attr_top = MAX(0, (f_ptr->x_attr[*lighting_level] & 0x7f) - 5); - - if (f_ptr->x_char[prev_lighting_level] != f_ptr->x_char[*lighting_level]) - char_left = MAX(0, f_ptr->x_char[*lighting_level] - 10); - - continue; - } - else if ((ch == 'D') || (ch == 'd')) - { - TERM_COLOR prev_x_attr = f_ptr->x_attr[*lighting_level]; - byte prev_x_char = f_ptr->x_char[*lighting_level]; - - apply_default_feat_lighting(f_ptr->x_attr, f_ptr->x_char); - - if (visual_list) - { - if (prev_x_attr != f_ptr->x_attr[*lighting_level]) - attr_top = MAX(0, (f_ptr->x_attr[*lighting_level] & 0x7f) - 5); - - if (prev_x_char != f_ptr->x_char[*lighting_level]) - char_left = MAX(0, f_ptr->x_char[*lighting_level] - 10); - } - else *need_redraw = TRUE; - - continue; - } - else if (visual_mode_command(ch, &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, cur_attr_ptr, cur_char_ptr, need_redraw)) - { - switch (ch) - { - case ESCAPE: - for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) - { - f_ptr->x_attr[i] = attr_old[i]; - f_ptr->x_char[i] = char_old[i]; - } - - /* Fall through */ - case '\n': - case '\r': - if (direct_f_idx >= 0) flag = TRUE; - else *lighting_level = F_LIT_STANDARD; - break; - case 'V': - case 'v': - for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) - { - attr_old[i] = f_ptr->x_attr[i]; - char_old[i] = f_ptr->x_char[i]; - } - *lighting_level = F_LIT_STANDARD; - break; - - case 'C': - case 'c': - if (!visual_list) - { - for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) - { - attr_idx_feat[i] = f_ptr->x_attr[i]; - char_idx_feat[i] = f_ptr->x_char[i]; - } - } - break; - - case 'P': - case 'p': - if (!visual_list) - { - for (FEAT_IDX i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++) - { - if (attr_idx_feat[i] || (!(char_idx_feat[i] & 0x80) && char_idx_feat[i])) f_ptr->x_attr[i] = attr_idx_feat[i]; - if (char_idx_feat[i]) f_ptr->x_char[i] = char_idx_feat[i]; - } - } - break; - } - continue; - } - - switch (ch) - { - case ESCAPE: - { - flag = TRUE; - break; - } - - default: - { - browser_cursor(ch, &column, &grp_cur, grp_cnt, &feat_cur, feat_cnt); - break; - } - } - } - - C_KILL(feat_idx, max_f_idx, FEAT_IDX); + TERM_COLOR attr_old[F_LIT_MAX]; + (void)C_WIPE(attr_old, F_LIT_MAX, TERM_COLOR); + SYMBOL_CODE char_old[F_LIT_MAX]; + (void)C_WIPE(char_old, F_LIT_MAX, SYMBOL_CODE); + + TERM_LEN wid, hgt; + term_get_size(&wid, &hgt); + + FEAT_IDX *feat_idx; + C_MAKE(feat_idx, max_f_idx, FEAT_IDX); + + concptr feature_group_text[] = { "terrains", NULL }; + int len; + int max = 0; + int grp_cnt = 0; + int feat_cnt; + FEAT_IDX grp_idx[100]; + TERM_COLOR attr_top = 0; + bool visual_list = FALSE; + byte char_left = 0; + TERM_LEN browser_rows = hgt - 8; + if (direct_f_idx < 0) { + for (FEAT_IDX i = 0; feature_group_text[i] != NULL; i++) { + len = strlen(feature_group_text[i]); + if (len > max) + max = len; + + if (collect_features(feat_idx, 0x01)) { + grp_idx[grp_cnt++] = i; + } + } + + feat_cnt = 0; + } else { + feature_type *f_ptr = &f_info[direct_f_idx]; + + feat_idx[0] = direct_f_idx; + feat_cnt = 1; + feat_idx[1] = -1; + + (void)visual_mode_command('v', &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, &f_ptr->x_attr[*lighting_level], + &f_ptr->x_char[*lighting_level], need_redraw); + + for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) { + attr_old[i] = f_ptr->x_attr[i]; + char_old[i] = f_ptr->x_char[i]; + } + } + + grp_idx[grp_cnt] = -1; + + FEAT_IDX old_grp_cur = -1; + FEAT_IDX grp_cur = 0; + FEAT_IDX grp_top = 0; + FEAT_IDX feat_cur = 0; + FEAT_IDX feat_top = 0; + TERM_LEN column = 0; + bool flag = FALSE; + bool redraw = TRUE; + TERM_COLOR *cur_attr_ptr; + SYMBOL_CODE *cur_char_ptr; + while (!flag) { + char ch; + feature_type *f_ptr; + + if (redraw) { + clear_from(0); + + prt(_("表示 - 地形", "Visuals - features"), 2, 0); + if (direct_f_idx < 0) + prt(_("グループ", "Group"), 4, 0); + prt(_("名前", "Name"), 4, max + 3); + if (use_bigtile) { + if (current_world_ptr->wizard || visual_only) + prt("Idx", 4, 62); + prt(_("文字 ( l/ d)", "Sym ( l/ d)"), 4, 66); + } else { + if (current_world_ptr->wizard || visual_only) + prt("Idx", 4, 64); + prt(_("文字 (l/d)", "Sym (l/d)"), 4, 68); + } + + for (FEAT_IDX i = 0; i < 78; i++) { + term_putch(i, 5, TERM_WHITE, '='); + } + + if (direct_f_idx < 0) { + for (FEAT_IDX i = 0; i < browser_rows; i++) { + term_putch(max + 1, 6 + i, TERM_WHITE, '|'); + } + } + + redraw = FALSE; + } + + if (direct_f_idx < 0) { + if (grp_cur < grp_top) + grp_top = grp_cur; + if (grp_cur >= grp_top + browser_rows) + grp_top = grp_cur - browser_rows + 1; + + display_group_list(0, 6, max, browser_rows, grp_idx, feature_group_text, grp_cur, grp_top); + if (old_grp_cur != grp_cur) { + old_grp_cur = grp_cur; + feat_cnt = collect_features(feat_idx, 0x00); + } + + while (feat_cur < feat_top) + feat_top = MAX(0, feat_top - browser_rows / 2); + while (feat_cur >= feat_top + browser_rows) + feat_top = MIN(feat_cnt - browser_rows, feat_top + browser_rows / 2); + } + + if (!visual_list) { + display_feature_list(max + 3, 6, browser_rows, feat_idx, feat_cur, feat_top, visual_only, F_LIT_STANDARD); + } else { + feat_top = feat_cur; + display_feature_list(max + 3, 6, 1, feat_idx, feat_cur, feat_top, visual_only, *lighting_level); + display_visual_list(max + 3, 7, browser_rows - 1, wid - (max + 3), attr_top, char_left); + } + + prt(format(_("<方向>%s, 'd'で標準光源効果%s, ESC", "%s, 'd' for default lighting%s, ESC"), + visual_list ? _(", ENTERで決定, 'a'で対象明度変更", ", ENTER to accept, 'a' for lighting level") + : _(", 'v'でシンボル変更", ", 'v' for visuals"), + (attr_idx || char_idx) ? _(", 'c', 'p'でペースト", ", 'c', 'p' to paste") : _(", 'c'でコピー", ", 'c' to copy")), + hgt - 1, 0); + + f_ptr = &f_info[feat_idx[feat_cur]]; + cur_attr_ptr = &f_ptr->x_attr[*lighting_level]; + cur_char_ptr = &f_ptr->x_char[*lighting_level]; + + if (visual_list) { + place_visual_list_cursor(max + 3, 7, *cur_attr_ptr, *cur_char_ptr, attr_top, char_left); + } else if (!column) { + term_gotoxy(0, 6 + (grp_cur - grp_top)); + } else { + term_gotoxy(max + 3, 6 + (feat_cur - feat_top)); + } + + ch = inkey(); + if (visual_list && ((ch == 'A') || (ch == 'a'))) { + int prev_lighting_level = *lighting_level; + + if (ch == 'A') { + if (*lighting_level <= 0) + *lighting_level = F_LIT_MAX - 1; + else + (*lighting_level)--; + } else { + if (*lighting_level >= F_LIT_MAX - 1) + *lighting_level = 0; + else + (*lighting_level)++; + } + + if (f_ptr->x_attr[prev_lighting_level] != f_ptr->x_attr[*lighting_level]) + attr_top = MAX(0, (f_ptr->x_attr[*lighting_level] & 0x7f) - 5); + + if (f_ptr->x_char[prev_lighting_level] != f_ptr->x_char[*lighting_level]) + char_left = MAX(0, f_ptr->x_char[*lighting_level] - 10); + + continue; + } else if ((ch == 'D') || (ch == 'd')) { + TERM_COLOR prev_x_attr = f_ptr->x_attr[*lighting_level]; + byte prev_x_char = f_ptr->x_char[*lighting_level]; + + apply_default_feat_lighting(f_ptr->x_attr, f_ptr->x_char); + + if (visual_list) { + if (prev_x_attr != f_ptr->x_attr[*lighting_level]) + attr_top = MAX(0, (f_ptr->x_attr[*lighting_level] & 0x7f) - 5); + + if (prev_x_char != f_ptr->x_char[*lighting_level]) + char_left = MAX(0, f_ptr->x_char[*lighting_level] - 10); + } else + *need_redraw = TRUE; + + continue; + } else if (visual_mode_command(ch, &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, cur_attr_ptr, cur_char_ptr, need_redraw)) { + switch (ch) { + case ESCAPE: + for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) { + f_ptr->x_attr[i] = attr_old[i]; + f_ptr->x_char[i] = char_old[i]; + } + + /* Fall through */ + case '\n': + case '\r': + if (direct_f_idx >= 0) + flag = TRUE; + else + *lighting_level = F_LIT_STANDARD; + break; + case 'V': + case 'v': + for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) { + attr_old[i] = f_ptr->x_attr[i]; + char_old[i] = f_ptr->x_char[i]; + } + *lighting_level = F_LIT_STANDARD; + break; + + case 'C': + case 'c': + if (!visual_list) { + for (FEAT_IDX i = 0; i < F_LIT_MAX; i++) { + attr_idx_feat[i] = f_ptr->x_attr[i]; + char_idx_feat[i] = f_ptr->x_char[i]; + } + } + break; + + case 'P': + case 'p': + if (!visual_list) { + for (FEAT_IDX i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++) { + if (attr_idx_feat[i] || (!(char_idx_feat[i] & 0x80) && char_idx_feat[i])) + f_ptr->x_attr[i] = attr_idx_feat[i]; + if (char_idx_feat[i]) + f_ptr->x_char[i] = char_idx_feat[i]; + } + } + break; + } + continue; + } + + switch (ch) { + case ESCAPE: { + flag = TRUE; + break; + } + + default: { + browser_cursor(ch, &column, &grp_cur, grp_cnt, &feat_cur, feat_cnt); + break; + } + } + } + + C_KILL(feat_idx, max_f_idx, FEAT_IDX); } - /* * Dungeon */ void do_cmd_knowledge_dungeon(player_type *creature_ptr) { - FILE *fff = NULL; - GAME_TEXT file_name[FILE_NAME_SIZE]; - if (!open_temporary_file(&fff, file_name)) return; - - for (int i = 1; i < current_world_ptr->max_d_idx; i++) - { - bool seiha = FALSE; - - if (!d_info[i].maxdepth) continue; - if (!max_dlv[i]) continue; - if (d_info[i].final_guardian) - { - if (!r_info[d_info[i].final_guardian].max_num) seiha = TRUE; - } - else if (max_dlv[i] == d_info[i].maxdepth) seiha = TRUE; - - fprintf(fff, _("%c%-12s : %3d 階\n", "%c%-16s : level %3d\n"), seiha ? '!' : ' ', d_name + d_info[i].name, (int)max_dlv[i]); - } - - angband_fclose(fff); - (void)show_file(creature_ptr, TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0); - fd_kill(file_name); + FILE *fff = NULL; + GAME_TEXT file_name[FILE_NAME_SIZE]; + if (!open_temporary_file(&fff, file_name)) + return; + + for (int i = 1; i < current_world_ptr->max_d_idx; i++) { + bool seiha = FALSE; + + if (!d_info[i].maxdepth) + continue; + if (!max_dlv[i]) + continue; + if (d_info[i].final_guardian) { + if (!r_info[d_info[i].final_guardian].max_num) + seiha = TRUE; + } else if (max_dlv[i] == d_info[i].maxdepth) + seiha = TRUE; + + fprintf(fff, _("%c%-12s : %3d 階\n", "%c%-16s : level %3d\n"), seiha ? '!' : ' ', d_name + d_info[i].name, (int)max_dlv[i]); + } + + angband_fclose(fff); + (void)show_file(creature_ptr, TRUE, file_name, _("今までに入ったダンジョン", "Dungeon"), 0, 0); + fd_kill(file_name); } diff --git a/src/knowledge/knowledge-mutations.c b/src/knowledge/knowledge-mutations.c index b577795de..9dce674cc 100644 --- a/src/knowledge/knowledge-mutations.c +++ b/src/knowledge/knowledge-mutations.c @@ -4,8 +4,8 @@ * @author Hourier */ -#include "core/show-file.h" #include "knowledge/knowledge-mutations.h" +#include "core/show-file.h" #include "io-dump/dump-util.h" #include "io/mutations-dump.h" #include "util/angband-files.h" @@ -16,13 +16,14 @@ */ void do_cmd_knowledge_mutations(player_type *creature_ptr) { - FILE *fff = NULL; - GAME_TEXT file_name[FILE_NAME_SIZE]; - if (!open_temporary_file(&fff, file_name)) return; + FILE *fff = NULL; + GAME_TEXT file_name[FILE_NAME_SIZE]; + if (!open_temporary_file(&fff, file_name)) + return; - dump_mutations(creature_ptr, fff); - angband_fclose(fff); + dump_mutations(creature_ptr, fff); + angband_fclose(fff); - show_file(creature_ptr, TRUE, file_name, _("突然変異", "Mutations"), 0, 0); - fd_kill(file_name); + show_file(creature_ptr, TRUE, file_name, _("突然変異", "Mutations"), 0, 0); + fd_kill(file_name); } diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c index 4545f4d52..93dfa774c 100644 --- a/src/knowledge/knowledge-self.c +++ b/src/knowledge/knowledge-self.c @@ -13,8 +13,8 @@ #include "io-dump/dump-util.h" #include "player-info/avatar.h" #include "player/player-class.h" -#include "player/race-info-table.h" #include "player/player-status-table.h" +#include "player/race-info-table.h" #include "store/store-util.h" #include "system/object-type-definition.h" #include "util/angband-files.h" diff --git a/src/knowledge/lighting-level-table.c b/src/knowledge/lighting-level-table.c index 1af07108b..7e14b45a8 100644 --- a/src/knowledge/lighting-level-table.c +++ b/src/knowledge/lighting-level-table.c @@ -3,9 +3,8 @@ /*! * @brief キャラクタ色の明暗表現 */ -concptr lighting_level_str[F_LIT_MAX] = -{ - _("標準色", "standard"), - _("明色", "brightly lit"), - _("暗色", "darkened"), +concptr lighting_level_str[F_LIT_MAX] = { + _("標準色", "standard"), + _("明色", "brightly lit"), + _("暗色", "darkened"), }; diff --git a/src/knowledge/monster-group-table.c b/src/knowledge/monster-group-table.c index 05e8201d8..00ddc9bff 100644 --- a/src/knowledge/monster-group-table.c +++ b/src/knowledge/monster-group-table.c @@ -10,191 +10,27 @@ * todo 元々t (町人)がいなかったが、問題ないのか？ * Description of each monster group. */ -concptr monster_group_text[] = -{ +concptr monster_group_text[] = { #ifdef JP - "ユニーク", - "乗馬可能なモンスター", - "賞金首", - "アンバーの王族", - "アリ", - "コウモリ", - "ムカデ", - "ドラゴン", - "目玉", - "ネコ", - "ゴーレム", - "標準人間型生物", - "ベトベト", - "ゼリー", - "コボルド", - "水棲生物", - "モルド", - "ナーガ", - "オーク", - "人間", - "四足獣", - "ネズミ", - "スケルトン", - "デーモン", - "ボルテックス", - "イモムシ/大群", - "イーク", - "ゾンビ/ミイラ", - "天使", - "鳥", - "犬", - "エレメンタル", - "トンボ", - "ゴースト", - "雑種", - "昆虫", - "ヘビ", - "キラー・ビートル", - "リッチ", - "多首の爬虫類", - "謎の生物", - "オーガ", - "巨大人間型生物", - "クイルスルグ", - "爬虫類/両生類", - "蜘蛛/サソリ/ダニ", - "トロル", - "バンパイア", - "ワイト/レイス/等", - "ゾーン/ザレン/等", - "イエティ", - "ハウンド", - "ミミック", - "壁/植物/気体", - "おばけキノコ", - "球体", - "プレイヤー", + "ユニーク", "乗馬可能なモンスター", "賞金首", "アンバーの王族", "アリ", "コウモリ", "ムカデ", "ドラゴン", "目玉", "ネコ", "ゴーレム", "標準人間型生物", + "ベトベト", "ゼリー", "コボルド", "水棲生物", "モルド", "ナーガ", "オーク", "人間", "四足獣", "ネズミ", "スケルトン", "デーモン", "ボルテックス", + "イモムシ/大群", "イーク", "ゾンビ/ミイラ", "天使", "鳥", "犬", "エレメンタル", "トンボ", "ゴースト", "雑種", "昆虫", "ヘビ", "キラー・ビートル", "リッチ", + "多首の爬虫類", "謎の生物", "オーガ", "巨大人間型生物", "クイルスルグ", "爬虫類/両生類", "蜘蛛/サソリ/ダニ", "トロル", "バンパイア", "ワイト/レイス/等", + "ゾーン/ザレン/等", "イエティ", "ハウンド", "ミミック", "壁/植物/気体", "おばけキノコ", "球体", "プレイヤー", #else - "Uniques", - "Ridable monsters", - "Wanted monsters", - "Amberite", - "Ant", - "Bat", - "Centipede", - "Dragon", - "Floating Eye", - "Feline", - "Golem", - "Hobbit/Elf/Dwarf", - "Icky Thing", - "Jelly", - "Kobold", - "Aquatic monster", - "Mold", - "Naga", - "Orc", - "Person/Human", - "Quadruped", - "Rodent", - "Skeleton", - "Demon", - "Vortex", - "Worm/Worm-Mass", - "Yeek", - "Zombie/Mummy", - "Angel", - "Bird", - "Canine", - "Elemental", - "Dragon Fly", - "Ghost", - "Hybrid", - "Insect", - "Snake", - "Killer Beetle", - "Lich", - "Multi-Headed Reptile", - "Mystery Living", - "Ogre", - "Giant Humanoid", - "Quylthulg", - "Reptile/Amphibian", - "Spider/Scorpion/Tick", - "Troll", - "Vampire", - "Wight/Wraith/etc", - "Xorn/Xaren/etc", - "Yeti", - "Zephyr Hound", - "Mimic", - "Wall/Plant/Gas", - "Mushroom patch", - "Ball", - "Player", + "Uniques", "Ridable monsters", "Wanted monsters", "Amberite", "Ant", "Bat", "Centipede", "Dragon", "Floating Eye", "Feline", "Golem", "Hobbit/Elf/Dwarf", + "Icky Thing", "Jelly", "Kobold", "Aquatic monster", "Mold", "Naga", "Orc", "Person/Human", "Quadruped", "Rodent", "Skeleton", "Demon", "Vortex", + "Worm/Worm-Mass", "Yeek", "Zombie/Mummy", "Angel", "Bird", "Canine", "Elemental", "Dragon Fly", "Ghost", "Hybrid", "Insect", "Snake", "Killer Beetle", + "Lich", "Multi-Headed Reptile", "Mystery Living", "Ogre", "Giant Humanoid", "Quylthulg", "Reptile/Amphibian", "Spider/Scorpion/Tick", "Troll", "Vampire", + "Wight/Wraith/etc", "Xorn/Xaren/etc", "Yeti", "Zephyr Hound", "Mimic", "Wall/Plant/Gas", "Mushroom patch", "Ball", "Player", #endif - NULL + NULL }; - /* * Symbols of monsters in each group. Note the "Uniques" group * is handled differently. */ -concptr monster_group_char[] = -{ - (char *)-1L, - (char *)-2L, - (char *)-3L, - (char *)-4L, - "a", - "b", - "c", - "dD", - "e", - "f", - "g", - "h", - "i", - "j", - "k", - "l", - "m", - "n", - "o", - "pt", - "q", - "r", - "s", - "uU", - "v", - "w", - "y", - "z", - "A", - "B", - "C", - "E", - "F", - "G", - "H", - "I", - "J", - "K", - "L", - "M", - "N", - "O", - "P", - "Q", - "R", - "S", - "T", - "V", - "W", - "X", - "Y", - "Z", - "!$&()+./=>?[\\]`{|~", - "#%", - ",", - "*", - "@", - NULL -}; +concptr monster_group_char[] = { (char *)-1L, (char *)-2L, (char *)-3L, (char *)-4L, "a", "b", "c", "dD", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", + "pt", "q", "r", "s", "uU", "v", "w", "y", "z", "A", "B", "C", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "V", "W", "X", + "Y", "Z", "!$&()+./=>?[\\]`{|~", "#%", ",", "*", "@", NULL }; -- 2.11.0