[Refactor] #2683 Rebamed k_idx to bi_id (Kind index to Baseitem ID)

diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp
index 28d98d8..497d7da 100644 (file)
--- a/src/action/mutation-execution.cpp
+++ b/src/action/mutation-execution.cpp
@@ -154,7 +154,7 @@ bool exe_mutation_power(PlayerType *player_ptr, PlayerMutationType power)
     case PlayerMutationType::DET_CURSE:
         for (int i = 0; i < INVEN_TOTAL; i++) {
             auto *o_ptr = &player_ptr->inventory_list[i];
-            if ((o_ptr->k_idx == 0) || !o_ptr->is_cursed()) {
+            if ((o_ptr->bi_id == 0) || !o_ptr->is_cursed()) {
                 continue;
             }
 

diff --git a/src/action/weapon-shield.cpp b/src/action/weapon-shield.cpp
index 2294f40..705fb35 100644 (file)
--- a/src/action/weapon-shield.cpp
+++ b/src/action/weapon-shield.cpp
@@ -57,7 +57,7 @@ void verify_equip_slot(PlayerType *player_ptr, INVENTORY_IDX item)
     }
 
     o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND];
-    if (o_ptr->k_idx) {
+    if (o_ptr->bi_id) {
         describe_flavor(player_ptr, o_name, o_ptr, 0);
     }
 

diff --git a/src/artifact/artifact-info.cpp b/src/artifact/artifact-info.cpp
index 8e0fc0a..26ca30d 100644 (file)
--- a/src/artifact/artifact-info.cpp
+++ b/src/artifact/artifact-info.cpp
@@ -39,8 +39,8 @@ RandomArtActType activation_index(const ItemEntity *o_ptr)
         return egos_info[o_ptr->ego_idx].act_idx;
     }
 
-    if (!o_ptr->is_random_artifact() && baseitems_info[o_ptr->k_idx].flags.has(TR_ACTIVATE)) {
-        return baseitems_info[o_ptr->k_idx].act_idx;
+    if (!o_ptr->is_random_artifact() && baseitems_info[o_ptr->bi_id].flags.has(TR_ACTIVATE)) {
+        return baseitems_info[o_ptr->bi_id].act_idx;
     }
 
     return o_ptr->activation_id;

diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp
index 4641ce4..2bd83e7 100644 (file)
--- a/src/artifact/random-art-generator.cpp
+++ b/src/artifact/random-art-generator.cpp
@@ -43,8 +43,8 @@
 
 static bool weakening_artifact(ItemEntity *o_ptr)
 {
-    const auto k_idx = lookup_baseitem_id({ o_ptr->tval, o_ptr->sval });
-    auto *k_ptr = &baseitems_info[k_idx];
+    const auto bi_id = lookup_baseitem_id({ o_ptr->tval, o_ptr->sval });
+    auto *k_ptr = &baseitems_info[bi_id];
     auto flgs = object_flags(o_ptr);
 
     if (flgs.has(TR_KILL_EVIL)) {
@@ -435,7 +435,7 @@ bool become_random_artifact(PlayerType *player_ptr, ItemEntity *o_ptr, bool a_sc
     o_ptr->artifact_bias = 0;
     o_ptr->fixed_artifact_idx = FixedArtifactId::NONE;
     o_ptr->ego_idx = EgoType::NONE;
-    o_ptr->art_flags |= baseitems_info[o_ptr->k_idx].flags;
+    o_ptr->art_flags |= baseitems_info[o_ptr->bi_id].flags;
 
     bool has_pval = o_ptr->pval != 0;
     decide_warrior_bias(player_ptr, o_ptr, a_scroll);

diff --git a/src/autopick/autopick-entry.cpp b/src/autopick/autopick-entry.cpp
index b823af1..2753e6d 100644 (file)
--- a/src/autopick/autopick-entry.cpp
+++ b/src/autopick/autopick-entry.cpp
@@ -412,7 +412,7 @@ void autopick_entry_from_object(PlayerType *player_ptr, autopick_type *entry, It
     }
 
     if (o_ptr->is_melee_weapon()) {
-        auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[o_ptr->bi_id];
 
         if ((o_ptr->dd != k_ptr->dd) || (o_ptr->ds != k_ptr->ds)) {
             ADD_FLG(FLG_BOOSTED);

diff --git a/src/autopick/autopick-finder.cpp b/src/autopick/autopick-finder.cpp
index 14b6f3c..b088d63 100644 (file)
--- a/src/autopick/autopick-finder.cpp
+++ b/src/autopick/autopick-finder.cpp
@@ -78,7 +78,7 @@ bool get_object_for_search(PlayerType *player_ptr, ItemEntity **o_handle, concpt
  */
 bool get_destroyed_object_for_search(PlayerType *player_ptr, ItemEntity **o_handle, concptr *search_strp)
 {
-    if (!autopick_last_destroyed_object.k_idx) {
+    if (!autopick_last_destroyed_object.bi_id) {
         return false;
     }
 

diff --git a/src/autopick/autopick-matcher.cpp b/src/autopick/autopick-matcher.cpp
index eacf676..16081b9 100644 (file)
--- a/src/autopick/autopick-matcher.cpp
+++ b/src/autopick/autopick-matcher.cpp
@@ -53,7 +53,7 @@ bool is_autopick_match(PlayerType *player_ptr, ItemEntity *o_ptr, autopick_type
     }
 
     if (IS_FLG(FLG_BOOSTED)) {
-        auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[o_ptr->bi_id];
         if (!o_ptr->is_melee_weapon()) {
             return false;
         }

diff --git a/src/autopick/autopick.cpp b/src/autopick/autopick.cpp
index 0734787..0a42e32 100644 (file)
--- a/src/autopick/autopick.cpp
+++ b/src/autopick/autopick.cpp
@@ -42,7 +42,7 @@ static void autopick_delayed_alter_aux(PlayerType *player_ptr, INVENTORY_IDX ite
     ItemEntity *o_ptr;
     o_ptr = ref_item(player_ptr, item);
 
-    if (o_ptr->k_idx == 0 || !(o_ptr->marked & OM_AUTODESTROY)) {
+    if (o_ptr->bi_id == 0 || !(o_ptr->marked & OM_AUTODESTROY)) {
         return;
     }
 

diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp
index 3ff43f5..67a2680 100644 (file)
--- a/src/birth/inventory-initializer.cpp
+++ b/src/birth/inventory-initializer.cpp
@@ -43,7 +43,7 @@ void wield_all(PlayerType *player_ptr)
     for (INVENTORY_IDX item = INVEN_PACK - 1; item >= 0; item--) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[item];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -54,7 +54,7 @@ void wield_all(PlayerType *player_ptr)
         if (slot == INVEN_LITE) {
             continue;
         }
-        if (player_ptr->inventory_list[slot].k_idx) {
+        if (player_ptr->inventory_list[slot].bi_id) {
             continue;
         }
 

diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index ba03f66..71300a7 100644 (file)
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -331,7 +331,7 @@ static bool get_spike(PlayerType *player_ptr, INVENTORY_IDX *ip)
 {
     for (INVENTORY_IDX i = 0; i < INVEN_PACK; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index f76719c..8277a94 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -630,7 +630,7 @@ void do_cmd_browse(PlayerType *player_ptr)
     use_realm = tval2realm(o_ptr->tval);
 
     /* Track the object kind */
-    object_kind_track(player_ptr, o_ptr->k_idx);
+    object_kind_track(player_ptr, o_ptr->bi_id);
     handle_stuff(player_ptr);
 
     /* Extract spells */
@@ -801,7 +801,7 @@ void do_cmd_study(PlayerType *player_ptr)
     }
 
     /* Track the object kind */
-    object_kind_track(player_ptr, o_ptr->k_idx);
+    object_kind_track(player_ptr, o_ptr->bi_id);
     handle_stuff(player_ptr);
 
     /* Mage -- Learn a selected spell */
@@ -1036,7 +1036,7 @@ bool do_cmd_cast(PlayerType *player_ptr)
     }
 
     /* Track the object kind */
-    object_kind_track(player_ptr, o_ptr->k_idx);
+    object_kind_track(player_ptr, o_ptr->bi_id);
     handle_stuff(player_ptr);
 
     if (is_every_magic) {

diff --git a/src/cmd-io/cmd-autopick.cpp b/src/cmd-io/cmd-autopick.cpp
index 493ab28..723469f 100644 (file)
--- a/src/cmd-io/cmd-autopick.cpp
+++ b/src/cmd-io/cmd-autopick.cpp
@@ -140,7 +140,7 @@ void do_cmd_edit_autopick(PlayerType *player_ptr)
 
     update_playtime();
     init_autopick();
-    if (autopick_last_destroyed_object.k_idx) {
+    if (autopick_last_destroyed_object.bi_id) {
         autopick_entry_from_object(player_ptr, entry, &autopick_last_destroyed_object);
         tb->last_destroyed = autopick_line_from_entry_kill(entry);
     }

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index e5b5935..4b2241f 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -238,7 +238,7 @@ void exe_eat_food(PlayerType *player_ptr, INVENTORY_IDX item)
     PlayerEnergy(player_ptr).set_player_turn_energy(100);
 
     /* Object level */
-    int lev = baseitems_info[o_ptr->k_idx].level;
+    int lev = baseitems_info[o_ptr->bi_id].level;
 
     /* Identity not known yet */
     int ident = exe_eat_food_type_object(player_ptr, o_ptr);

diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index b739275..60015e2 100644 (file)
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -164,7 +164,7 @@ void do_cmd_wield(PlayerType *player_ptr)
             }
         } else if (has_melee_weapon(player_ptr, INVEN_SUB_HAND)) {
             slot = INVEN_MAIN_HAND;
-        } else if (o_ptr_mh->k_idx && o_ptr_sh->k_idx &&
+        } else if (o_ptr_mh->bi_id && o_ptr_sh->bi_id &&
                    ((o_ptr->tval == ItemKindType::CAPTURE) || (!o_ptr_mh->is_melee_weapon() && !o_ptr_sh->is_melee_weapon()))) {
             q = _("どちらの手に装備しますか?", "Equip which hand? ");
             s = _("おっと。", "Oops.");
@@ -182,11 +182,11 @@ void do_cmd_wield(PlayerType *player_ptr)
             if (!get_check(_("二刀流で戦いますか？", "Dual wielding? "))) {
                 slot = INVEN_MAIN_HAND;
             }
-        } else if (!o_ptr_mh->k_idx && has_melee_weapon(player_ptr, INVEN_SUB_HAND)) {
+        } else if (!o_ptr_mh->bi_id && has_melee_weapon(player_ptr, INVEN_SUB_HAND)) {
             if (!get_check(_("二刀流で戦いますか？", "Dual wielding? "))) {
                 slot = INVEN_SUB_HAND;
             }
-        } else if (o_ptr_mh->k_idx && o_ptr_sh->k_idx) {
+        } else if (o_ptr_mh->bi_id && o_ptr_sh->bi_id) {
             q = _("どちらの手に装備しますか?", "Equip which hand? ");
             s = _("おっと。", "Oops.");
             if (!choose_object(player_ptr, &slot, q, s, (USE_EQUIP), FuncItemTester(&ItemEntity::is_wieldable_in_etheir_hand))) {
@@ -200,7 +200,7 @@ void do_cmd_wield(PlayerType *player_ptr)
 
         break;
     case ItemKindType::RING:
-        if (player_ptr->inventory_list[INVEN_SUB_RING].k_idx && player_ptr->inventory_list[INVEN_MAIN_RING].k_idx) {
+        if (player_ptr->inventory_list[INVEN_SUB_RING].bi_id && player_ptr->inventory_list[INVEN_MAIN_RING].bi_id) {
             q = _("どちらの指輪と取り替えますか?", "Replace which ring? ");
         } else {
             q = _("どちらの手に装備しますか?", "Equip which hand? ");
@@ -288,7 +288,7 @@ void do_cmd_wield(PlayerType *player_ptr)
     }
 
     o_ptr = &player_ptr->inventory_list[slot];
-    if (o_ptr->k_idx) {
+    if (o_ptr->bi_id) {
         (void)inven_takeoff(player_ptr, slot, 255);
     }
 

diff --git a/src/cmd-item/cmd-magiceat.cpp b/src/cmd-item/cmd-magiceat.cpp
index 8ab3f20..3142b94 100644 (file)
--- a/src/cmd-item/cmd-magiceat.cpp
+++ b/src/cmd-item/cmd-magiceat.cpp
@@ -259,7 +259,7 @@ static std::optional<BaseitemKey> select_magic_eater(PlayerType *player_ptr, boo
             byte y, x = 0;
             OBJECT_SUBTYPE_VALUE ctr;
             PERCENTAGE chance;
-            short k_idx;
+            short bi_id;
             char dummy[80];
             POSITION x1, y1;
             DEPTH level;
@@ -291,7 +291,7 @@ static std::optional<BaseitemKey> select_magic_eater(PlayerType *player_ptr, boo
                     continue;
                 }
 
-                k_idx = lookup_baseitem_id({ tval, ctr });
+                bi_id = lookup_baseitem_id({ tval, ctr });
 
                 if (use_menu) {
                     if (ctr == (menu_line - 1)) {
@@ -312,7 +312,7 @@ static std::optional<BaseitemKey> select_magic_eater(PlayerType *player_ptr, boo
                 }
                 x1 = ((ctr < ITEM_GROUP_SIZE / 2) ? x : x + 40);
                 y1 = ((ctr < ITEM_GROUP_SIZE / 2) ? y + ctr : y + ctr - ITEM_GROUP_SIZE / 2);
-                level = (tval == ItemKindType::ROD ? baseitems_info[k_idx].level * 5 / 6 - 5 : baseitems_info[k_idx].level);
+                level = (tval == ItemKindType::ROD ? baseitems_info[bi_id].level * 5 / 6 - 5 : baseitems_info[bi_id].level);
                 chance = level * 4 / 5 + 20;
                 chance -= 3 * (adj_mag_stat[player_ptr->stat_index[mp_ptr->spell_stat]] - 1);
                 level /= 2;
@@ -331,18 +331,18 @@ static std::optional<BaseitemKey> select_magic_eater(PlayerType *player_ptr, boo
 
                 col = TERM_WHITE;
 
-                if (k_idx) {
+                if (bi_id) {
                     if (tval == ItemKindType::ROD) {
                         strcat(dummy,
-                            format(_(" %-22.22s 充填:%2d/%2d%3d%%", " %-22.22s   (%2d/%2d) %3d%%"), baseitems_info[k_idx].name.data(),
-                                item.charge ? (item.charge - 1) / (EATER_ROD_CHARGE * baseitems_info[k_idx].pval) + 1 : 0,
+                            format(_(" %-22.22s 充填:%2d/%2d%3d%%", " %-22.22s   (%2d/%2d) %3d%%"), baseitems_info[bi_id].name.data(),
+                                item.charge ? (item.charge - 1) / (EATER_ROD_CHARGE * baseitems_info[bi_id].pval) + 1 : 0,
                                 item.count, chance));
-                        if (item.charge > baseitems_info[k_idx].pval * (item.count - 1) * EATER_ROD_CHARGE) {
+                        if (item.charge > baseitems_info[bi_id].pval * (item.count - 1) * EATER_ROD_CHARGE) {
                             col = TERM_RED;
                         }
                     } else {
                         strcat(dummy,
-                            format(" %-22.22s    %2d/%2d %3d%%", baseitems_info[k_idx].name.data(), (int16_t)(item.charge / EATER_CHARGE),
+                            format(" %-22.22s    %2d/%2d %3d%%", baseitems_info[bi_id].name.data(), (int16_t)(item.charge / EATER_CHARGE),
                                 item.count, chance));
                         if (item.charge < EATER_CHARGE) {
                             col = TERM_RED;
@@ -557,8 +557,8 @@ bool do_cmd_magic_eater(PlayerType *player_ptr, bool only_browse, bool powerful)
     }
     auto &baseitem = result.value();
 
-    auto k_idx = lookup_baseitem_id(baseitem);
-    auto level = (baseitem.tval() == ItemKindType::ROD ? baseitems_info[k_idx].level * 5 / 6 - 5 : baseitems_info[k_idx].level);
+    auto bi_id = lookup_baseitem_id(baseitem);
+    auto level = (baseitem.tval() == ItemKindType::ROD ? baseitems_info[bi_id].level * 5 / 6 - 5 : baseitems_info[bi_id].level);
     auto chance = level * 4 / 5 + 20;
     chance -= 3 * (adj_mag_stat[player_ptr->stat_index[mp_ptr->spell_stat]] - 1);
     level /= 2;
@@ -658,7 +658,7 @@ bool do_cmd_magic_eater(PlayerType *player_ptr, bool only_browse, bool powerful)
 
     energy.set_player_turn_energy(100);
     if (tval == ItemKindType::ROD) {
-        item.charge += baseitems_info[k_idx].pval * EATER_ROD_CHARGE;
+        item.charge += baseitems_info[bi_id].pval * EATER_ROD_CHARGE;
     } else {
         item.charge -= EATER_CHARGE;
     }

diff --git a/src/combat/aura-counterattack.cpp b/src/combat/aura-counterattack.cpp
index ee0f5b1..5a6771f 100644 (file)
--- a/src/combat/aura-counterattack.cpp
+++ b/src/combat/aura-counterattack.cpp
@@ -210,13 +210,13 @@ static void aura_shadow_by_monster_attack(PlayerType *player_ptr, MonsterAttackP
         return;
     }
 
-    if (o_armed_ptr->k_idx) {
+    if (o_armed_ptr->bi_id) {
         int basedam = ((o_armed_ptr->dd + player_ptr->to_dd[0]) * (o_armed_ptr->ds + player_ptr->to_ds[0] + 1));
         dam = basedam / 2 + o_armed_ptr->to_d + player_ptr->to_d[0];
     }
 
     o_armed_ptr = &player_ptr->inventory_list[INVEN_BODY];
-    if ((o_armed_ptr->k_idx) && o_armed_ptr->is_cursed()) {
+    if ((o_armed_ptr->bi_id) && o_armed_ptr->is_cursed()) {
         dam *= 2;
     }
 
@@ -243,7 +243,7 @@ static void aura_shadow_by_monster_attack(PlayerType *player_ptr, MonsterAttackP
     /* Some cursed armours gives an extra effect */
     for (int j = 0; j < TABLE_SIZE; j++) {
         o_armed_ptr = &player_ptr->inventory_list[table[j].slot];
-        if ((o_armed_ptr->k_idx) && o_armed_ptr->is_cursed() && o_armed_ptr->is_armour()) {
+        if ((o_armed_ptr->bi_id) && o_armed_ptr->is_cursed() && o_armed_ptr->is_armour()) {
             project(player_ptr, 0, 0, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx, (player_ptr->lev * 2), table[j].type, flg);
         }
     }

diff --git a/src/core/object-compressor.cpp b/src/core/object-compressor.cpp
index d27ee69..1e78620 100644 (file)
--- a/src/core/object-compressor.cpp
+++ b/src/core/object-compressor.cpp
@@ -67,7 +67,7 @@ void compact_objects(PlayerType *player_ptr, int size)
         for (OBJECT_IDX i = 1; i < floor_ptr->o_max; i++) {
             o_ptr = &floor_ptr->o_list[i];
 
-            if (!o_ptr->is_valid() || (baseitems_info[o_ptr->k_idx].level > cur_lev)) {
+            if (!o_ptr->is_valid() || (baseitems_info[o_ptr->bi_id].level > cur_lev)) {
                 continue;
             }
 
@@ -106,7 +106,7 @@ void compact_objects(PlayerType *player_ptr, int size)
 
     for (OBJECT_IDX i = floor_ptr->o_max - 1; i >= 1; i--) {
         o_ptr = &floor_ptr->o_list[i];
-        if (o_ptr->k_idx) {
+        if (o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/core/stuff-handler.cpp b/src/core/stuff-handler.cpp
index 15ceb13..6330d7f 100644 (file)
--- a/src/core/stuff-handler.cpp
+++ b/src/core/stuff-handler.cpp
@@ -34,9 +34,9 @@ void monster_race_track(PlayerType *player_ptr, MonsterRaceId r_idx)
 /*
  * Track the given object kind
  */
-void object_kind_track(PlayerType *player_ptr, short k_idx)
+void object_kind_track(PlayerType *player_ptr, short bi_id)
 {
-    player_ptr->baseitem_info_idx = k_idx;
+    player_ptr->baseitem_info_idx = bi_id;
     player_ptr->window_flags |= (PW_OBJECT);
 }
 

diff --git a/src/core/stuff-handler.h b/src/core/stuff-handler.h
index 4714200..09d1312 100644 (file)
--- a/src/core/stuff-handler.h
+++ b/src/core/stuff-handler.h
@@ -6,7 +6,7 @@ enum class MonsterRaceId : int16_t;
 class PlayerType;
 void handle_stuff(PlayerType *player_ptr);
 void monster_race_track(PlayerType *player_ptr, MonsterRaceId r_idx);
-void object_kind_track(PlayerType *player_ptr, short k_idx);
+void object_kind_track(PlayerType *player_ptr, short bi_id);
 void health_track(PlayerType *player_ptr, MONSTER_IDX m_idx);
 
 bool update_player(PlayerType *player_ptr);

diff --git a/src/effect/effect-item.cpp b/src/effect/effect-item.cpp
index 1f727c8..534f113 100644 (file)
--- a/src/effect/effect-item.cpp
+++ b/src/effect/effect-item.cpp
@@ -276,11 +276,11 @@ bool affect_item(PlayerType *player_ptr, MONSTER_IDX who, POSITION r, POSITION y
             msg_format(_("%sは%s", "The %s%s"), o_name, note_kill);
         }
 
-        short k_idx = o_ptr->k_idx;
+        short bi_id = o_ptr->bi_id;
         bool is_potion = o_ptr->is_potion();
         delete_object_idx(player_ptr, this_o_idx);
         if (is_potion) {
-            (void)potion_smash_effect(player_ptr, who, y, x, k_idx);
+            (void)potion_smash_effect(player_ptr, who, y, x, bi_id);
 
             // 薬の破壊効果によりリストの次のアイテムが破壊された可能性があるのでリストの最初から処理をやり直す
             // 処理済みのアイテムは processed_list に登録されており、スキップされる

diff --git a/src/flavor/flavor-describer.cpp b/src/flavor/flavor-describer.cpp
index e871f58..c8a5c99 100644 (file)
--- a/src/flavor/flavor-describer.cpp
+++ b/src/flavor/flavor-describer.cpp
@@ -536,7 +536,7 @@ void describe_flavor(PlayerType *player_ptr, char *buf, ItemEntity *o_ptr, BIT_F
     flavor_type tmp_flavor;
     flavor_type *flavor_ptr = initialize_flavor_type(&tmp_flavor, buf, o_ptr, mode);
     describe_named_item(player_ptr, flavor_ptr);
-    if (flavor_ptr->mode & OD_NAME_ONLY || o_ptr->k_idx == 0) {
+    if (flavor_ptr->mode & OD_NAME_ONLY || o_ptr->bi_id == 0) {
         angband_strcpy(flavor_ptr->buf, flavor_ptr->tmp_val, MAX_NLEN);
         return;
     }
@@ -547,7 +547,7 @@ void describe_flavor(PlayerType *player_ptr, char *buf, ItemEntity *o_ptr, BIT_F
     describe_named_item_tval(flavor_ptr);
     if (!(mode & OD_DEBUG)) {
         flavor_ptr->bow_ptr = &player_ptr->inventory_list[INVEN_BOW];
-        if ((flavor_ptr->bow_ptr->k_idx != 0) && (flavor_ptr->o_ptr->tval == bow_tval_ammo(flavor_ptr->bow_ptr))) {
+        if ((flavor_ptr->bow_ptr->bi_id != 0) && (flavor_ptr->o_ptr->tval == bow_tval_ammo(flavor_ptr->bow_ptr))) {
             describe_bow_power(player_ptr, flavor_ptr);
         } else if (PlayerClass(player_ptr).equals(PlayerClassType::NINJA) && (flavor_ptr->o_ptr->tval == ItemKindType::SPIKE)) {
             describe_spike_power(player_ptr, flavor_ptr);

diff --git a/src/flavor/flavor-util.cpp b/src/flavor/flavor-util.cpp
index 002a397..28e604a 100644 (file)
--- a/src/flavor/flavor-util.cpp
+++ b/src/flavor/flavor-util.cpp
@@ -18,7 +18,7 @@ flavor_type *initialize_flavor_type(flavor_type *flavor_ptr, char *buf, ItemEnti
     flavor_ptr->buf = buf;
     flavor_ptr->o_ptr = o_ptr;
     flavor_ptr->mode = mode;
-    flavor_ptr->kindname = baseitems_info[o_ptr->k_idx].name.data();
+    flavor_ptr->kindname = baseitems_info[o_ptr->bi_id].name.data();
     flavor_ptr->basenm = flavor_ptr->kindname;
     flavor_ptr->modstr = "";
     flavor_ptr->aware = false;
@@ -32,7 +32,7 @@ flavor_type *initialize_flavor_type(flavor_type *flavor_ptr, char *buf, ItemEnti
     flavor_ptr->b2 = ']';
     flavor_ptr->c1 = '{';
     flavor_ptr->c2 = '}';
-    flavor_ptr->k_ptr = &baseitems_info[o_ptr->k_idx];
+    flavor_ptr->k_ptr = &baseitems_info[o_ptr->bi_id];
     flavor_ptr->flavor_k_ptr = &baseitems_info[flavor_ptr->k_ptr->flavor];
     return flavor_ptr;
 }
@@ -194,7 +194,7 @@ char *get_ability_abbreviation(char *short_flavor, ItemEntity *o_ptr, bool kanji
     char *prev_ptr = short_flavor;
     auto flgs = object_flags(o_ptr);
     if (!all) {
-        auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[o_ptr->bi_id];
         flgs.reset(k_ptr->flags);
 
         if (o_ptr->is_fixed_artifact()) {

diff --git a/src/flavor/object-flavor.cpp b/src/flavor/object-flavor.cpp
index 6c24a5f..beff92d 100644 (file)
--- a/src/flavor/object-flavor.cpp
+++ b/src/flavor/object-flavor.cpp
@@ -251,11 +251,11 @@ void flavor_init(void)
 /*!
  * @brief nameバッファ内からベースアイテム名を返す / Strip an "object name" into a buffer
  * @param buf ベースアイテム格納先の参照ポインタ
- * @param k_idx ベースアイテムID
+ * @param bi_id ベースアイテムID
  */
-std::string strip_name(short k_idx)
+std::string strip_name(short bi_id)
 {
-    auto k_ptr = &baseitems_info[k_idx];
+    auto k_ptr = &baseitems_info[bi_id];
     auto tok = str_split(k_ptr->name, ' ');
     std::stringstream name;
     for (const auto &s : tok) {

diff --git a/src/flavor/object-flavor.h b/src/flavor/object-flavor.h
index 01e4468..8dc032c 100644 (file)
--- a/src/flavor/object-flavor.h
+++ b/src/flavor/object-flavor.h
@@ -7,4 +7,4 @@ void get_table_name(char *out_string);
 void get_table_sindarin_aux(char *out_string);
 void get_table_sindarin(char *out_string);
 void flavor_init(void);
-std::string strip_name(short k_idx);
+std::string strip_name(short bi_id);

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index a4a045d..571d57e 100644 (file)
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -87,10 +87,10 @@ static void generate_artifact(PlayerType *player_ptr, qtwg_type *qtwg_ptr, const
         return;
     }
 
-    const auto k_idx = lookup_baseitem_id({ ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT });
+    const auto bi_id = lookup_baseitem_id({ ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT });
     ItemEntity forge;
     auto *q_ptr = &forge;
-    q_ptr->prep(k_idx);
+    q_ptr->prep(bi_id);
     drop_here(player_ptr->current_floor_ptr, q_ptr, *qtwg_ptr->y, *qtwg_ptr->x);
 }
 

diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index d8a4f7c..14563f6 100644 (file)
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -155,7 +155,7 @@ static byte get_dungeon_feeling(PlayerType *player_ptr)
 
     for (MONSTER_IDX i = 1; i < floor_ptr->o_max; i++) {
         auto *o_ptr = &floor_ptr->o_list[i];
-        auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[o_ptr->bi_id];
         int delta = 0;
         if (!o_ptr->is_valid() || (o_ptr->is_known() && ((o_ptr->marked & OM_TOUCHED) != 0)) || ((o_ptr->ident & IDENT_SENSE) != 0)) {
             continue;

diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp
index a5524d1..a23a9cc 100644 (file)
--- a/src/floor/floor-object.cpp
+++ b/src/floor/floor-object.cpp
@@ -132,17 +132,17 @@ bool make_object(PlayerType *player_ptr, ItemEntity *j_ptr, BIT_FLAGS mode, std:
             get_obj_index_prep();
         }
 
-        auto k_idx = get_obj_index(player_ptr, base, mode);
+        auto bi_id = get_obj_index(player_ptr, base, mode);
         if (get_obj_index_hook) {
             get_obj_index_hook = nullptr;
             get_obj_index_prep();
         }
 
-        if (k_idx == 0) {
+        if (bi_id == 0) {
             return false;
         }
 
-        j_ptr->prep(k_idx);
+        j_ptr->prep(bi_id);
     }
 
     ItemMagicApplier(player_ptr, j_ptr, floor_ptr->object_level, mode).execute();
@@ -246,7 +246,7 @@ void floor_item_increase(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER
 void floor_item_optimize(PlayerType *player_ptr, INVENTORY_IDX item)
 {
     auto *o_ptr = &player_ptr->current_floor_ptr->o_list[item];
-    if (!o_ptr->k_idx) {
+    if (!o_ptr->bi_id) {
         return;
     }
     if (o_ptr->number) {

diff --git a/src/hpmp/hp-mp-regenerator.cpp b/src/hpmp/hp-mp-regenerator.cpp
index bceef98..1b39218 100644 (file)
--- a/src/hpmp/hp-mp-regenerator.cpp
+++ b/src/hpmp/hp-mp-regenerator.cpp
@@ -214,7 +214,7 @@ void regenerate_captured_monsters(PlayerType *player_ptr)
     for (int i = 0; i < INVEN_TOTAL; i++) {
         MonsterRaceInfo *r_ptr;
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         if (o_ptr->tval != ItemKindType::CAPTURE) {

diff --git a/src/inventory/inventory-curse.cpp b/src/inventory/inventory-curse.cpp
index 04c109c..86cb18a 100644 (file)
--- a/src/inventory/inventory-curse.cpp
+++ b/src/inventory/inventory-curse.cpp
@@ -181,7 +181,7 @@ static void curse_teleport(PlayerType *player_ptr)
     int i_keep = 0, count = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/inventory/inventory-damage.cpp b/src/inventory/inventory-damage.cpp
index bcd4dea..0143a35 100644 (file)
--- a/src/inventory/inventory-damage.cpp
+++ b/src/inventory/inventory-damage.cpp
@@ -39,7 +39,7 @@ void inventory_damage(PlayerType *player_ptr, const ObjectBreaker &breaker, int
     /* Scan through the slots backwards */
     for (i = 0; i < INVEN_PACK; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -89,7 +89,7 @@ void inventory_damage(PlayerType *player_ptr, const ObjectBreaker &breaker, int
 
         /* Potions smash open */
         if (o_ptr->is_potion()) {
-            (void)potion_smash_effect(player_ptr, 0, player_ptr->y, player_ptr->x, o_ptr->k_idx);
+            (void)potion_smash_effect(player_ptr, 0, player_ptr->y, player_ptr->x, o_ptr->bi_id);
         }
 
         /* Reduce the charges of rods/wands */

diff --git a/src/inventory/inventory-object.cpp b/src/inventory/inventory-object.cpp
index da4939e..22a16e3 100644 (file)
--- a/src/inventory/inventory-object.cpp
+++ b/src/inventory/inventory-object.cpp
@@ -81,7 +81,7 @@ void inven_item_increase(PlayerType *player_ptr, INVENTORY_IDX item, ITEM_NUMBER
 void inven_item_optimize(PlayerType *player_ptr, INVENTORY_IDX item)
 {
     auto *o_ptr = &player_ptr->inventory_list[item];
-    if (!o_ptr->k_idx) {
+    if (!o_ptr->bi_id) {
         return;
     }
     if (o_ptr->number) {
@@ -169,13 +169,13 @@ void combine_pack(PlayerType *player_ptr)
         for (int i = INVEN_PACK; i > 0; i--) {
             ItemEntity *o_ptr;
             o_ptr = &player_ptr->inventory_list[i];
-            if (!o_ptr->k_idx) {
+            if (!o_ptr->bi_id) {
                 continue;
             }
             for (int j = 0; j < i; j++) {
                 ItemEntity *j_ptr;
                 j_ptr = &player_ptr->inventory_list[j];
-                if (!j_ptr->k_idx) {
+                if (!j_ptr->bi_id) {
                     continue;
                 }
 
@@ -249,7 +249,7 @@ void reorder_pack(PlayerType *player_ptr)
         }
 
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -308,7 +308,7 @@ int16_t store_item_to_inventory(PlayerType *player_ptr, ItemEntity *o_ptr)
     ItemEntity *j_ptr;
     for (j = 0; j < INVEN_PACK; j++) {
         j_ptr = &player_ptr->inventory_list[j];
-        if (!j_ptr->k_idx) {
+        if (!j_ptr->bi_id) {
             continue;
         }
 
@@ -328,7 +328,7 @@ int16_t store_item_to_inventory(PlayerType *player_ptr, ItemEntity *o_ptr)
 
     for (j = 0; j <= INVEN_PACK; j++) {
         j_ptr = &player_ptr->inventory_list[j];
-        if (!j_ptr->k_idx) {
+        if (!j_ptr->bi_id) {
             break;
         }
     }
@@ -378,7 +378,7 @@ bool check_store_item_to_inventory(PlayerType *player_ptr, const ItemEntity *o_p
 
     for (int j = 0; j < INVEN_PACK; j++) {
         auto *j_ptr = &player_ptr->inventory_list[j];
-        if (!j_ptr->k_idx) {
+        if (!j_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/inventory/inventory-util.cpp b/src/inventory/inventory-util.cpp
index 91f5486..141bec2 100644 (file)
--- a/src/inventory/inventory-util.cpp
+++ b/src/inventory/inventory-util.cpp
@@ -124,7 +124,7 @@ bool get_tag(PlayerType *player_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode,
 
     for (COMMAND_CODE i = start; i <= end; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if ((o_ptr->k_idx == 0) || (o_ptr->inscription == 0)) {
+        if ((o_ptr->bi_id == 0) || (o_ptr->inscription == 0)) {
             continue;
         }
 
@@ -149,7 +149,7 @@ bool get_tag(PlayerType *player_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode,
 
     for (COMMAND_CODE i = start; i <= end; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if ((o_ptr->k_idx == 0) || (o_ptr->inscription == 0)) {
+        if ((o_ptr->bi_id == 0) || (o_ptr->inscription == 0)) {
             continue;
         }
 
@@ -247,7 +247,7 @@ INVENTORY_IDX label_to_equipment(PlayerType *player_ptr, int c)
         return is_ring_slot(i) ? i : -1;
     }
 
-    if (!player_ptr->inventory_list[i].k_idx) {
+    if (!player_ptr->inventory_list[i].bi_id) {
         return -1;
     }
 
@@ -266,7 +266,7 @@ INVENTORY_IDX label_to_inventory(PlayerType *player_ptr, int c)
 {
     INVENTORY_IDX i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1);
 
-    if ((i < 0) || (i > INVEN_PACK) || (player_ptr->inventory_list[i].k_idx == 0)) {
+    if ((i < 0) || (i > INVEN_PACK) || (player_ptr->inventory_list[i].bi_id == 0)) {
         return -1;
     }
 

diff --git a/src/inventory/pack-overflow.cpp b/src/inventory/pack-overflow.cpp
index 2a4c6aa..eb22735 100644 (file)
--- a/src/inventory/pack-overflow.cpp
+++ b/src/inventory/pack-overflow.cpp
@@ -16,14 +16,14 @@
  */
 void pack_overflow(PlayerType *player_ptr)
 {
-    if (player_ptr->inventory_list[INVEN_PACK].k_idx == 0) {
+    if (player_ptr->inventory_list[INVEN_PACK].bi_id == 0) {
         return;
     }
 
     GAME_TEXT o_name[MAX_NLEN];
     ItemEntity *o_ptr;
     update_creature(player_ptr);
-    if (!player_ptr->inventory_list[INVEN_PACK].k_idx) {
+    if (!player_ptr->inventory_list[INVEN_PACK].bi_id) {
         return;
     }
 

diff --git a/src/inventory/recharge-processor.cpp b/src/inventory/recharge-processor.cpp
index c63c8a1..b564b22 100644 (file)
--- a/src/inventory/recharge-processor.cpp
+++ b/src/inventory/recharge-processor.cpp
@@ -59,7 +59,7 @@ void recharge_magic_items(PlayerType *player_ptr)
 
     for (changed = false, i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -84,8 +84,8 @@ void recharge_magic_items(PlayerType *player_ptr)
      */
     for (changed = false, i = 0; i < INVEN_PACK; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        auto *k_ptr = &baseitems_info[o_ptr->k_idx];
-        if (!o_ptr->k_idx) {
+        auto *k_ptr = &baseitems_info[o_ptr->bi_id];
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index 8b1de39..8c9c4ca 100644 (file)
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -514,7 +514,7 @@ static void dump_aux_equipment_inventory(PlayerType *player_ptr, FILE *fff)
     fprintf(fff, _("  [キャラクタの持ち物]\n\n", "  [Character Inventory]\n\n"));
 
     for (int i = 0; i < INVEN_PACK; i++) {
-        if (!player_ptr->inventory_list[i].k_idx) {
+        if (!player_ptr->inventory_list[i].bi_id) {
             break;
         }
         describe_flavor(player_ptr, o_name, &player_ptr->inventory_list[i], 0);

diff --git a/src/io-dump/special-class-dump.cpp b/src/io-dump/special-class-dump.cpp
index f3b583b..446b01d 100644 (file)
--- a/src/io-dump/special-class-dump.cpp
+++ b/src/io-dump/special-class-dump.cpp
@@ -66,13 +66,13 @@ static void dump_magic_eater(PlayerType *player_ptr, FILE *fff)
                 continue;
             }
 
-            auto k_idx = lookup_baseitem_id({ tval, i });
-            if (!k_idx) {
+            auto bi_id = lookup_baseitem_id({ tval, i });
+            if (!bi_id) {
                 continue;
             }
 
             char buf[128];
-            snprintf(buf, sizeof(buf), "%23s (%2d)", baseitems_info[k_idx].name.data(), item.count);
+            snprintf(buf, sizeof(buf), "%23s (%2d)", baseitems_info[bi_id].name.data(), item.count);
             desc_list.emplace_back(buf);
         }
 

diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp
index e1ed2cc..7859312 100644 (file)
--- a/src/io/input-key-requester.cpp
+++ b/src/io/input-key-requester.cpp
@@ -320,7 +320,7 @@ void InputKeyRequestor::sweep_confirmation_equipments()
     auto caret_command = this->get_caret_command();
     for (auto i = enum2i(INVEN_MAIN_HAND); i < INVEN_TOTAL; i++) {
         auto &o_ref = this->player_ptr->inventory_list[i];
-        if ((o_ref.k_idx == 0) || (o_ref.inscription == 0)) {
+        if ((o_ref.bi_id == 0) || (o_ref.inscription == 0)) {
             continue;
         }
 

diff --git a/src/knowledge/knowledge-inventory.cpp b/src/knowledge/knowledge-inventory.cpp
index ab78c4f..5339c4c 100644 (file)
--- a/src/knowledge/knowledge-inventory.cpp
+++ b/src/knowledge/knowledge-inventory.cpp
@@ -78,7 +78,7 @@ static bool determine_spcial_item_type(ItemEntity *o_ptr, ItemKindType tval)
  */
 static bool check_item_knowledge(ItemEntity *o_ptr, ItemKindType tval)
 {
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         return false;
     }
     if (o_ptr->tval != tval) {

diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp
index 8eb101d..0b50939 100644 (file)
--- a/src/knowledge/knowledge-items.cpp
+++ b/src/knowledge/knowledge-items.cpp
@@ -81,7 +81,7 @@ void do_cmd_knowledge_artifacts(PlayerType *player_ptr)
 
     for (auto i = 0; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         if (!o_ptr->is_fixed_artifact()) {
@@ -185,8 +185,8 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
     for (i = 0; i < per_page && (object_idx[object_top + i] >= 0); i++) {
         TERM_COLOR a;
         BaseitemInfo *flavor_k_ptr;
-        short k_idx = object_idx[object_top + i];
-        auto *k_ptr = &baseitems_info[k_idx];
+        short bi_id = object_idx[object_top + i];
+        auto *k_ptr = &baseitems_info[bi_id];
         TERM_COLOR attr = ((k_ptr->aware || visual_only) ? TERM_WHITE : TERM_SLATE);
         byte cursor = ((k_ptr->aware || visual_only) ? TERM_L_BLUE : TERM_BLUE);
         if (!visual_only && k_ptr->flavor) {
@@ -197,14 +197,14 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 
         attr = ((i + object_top == object_cur) ? cursor : attr);
         const auto is_flavor_only = (k_ptr->flavor != 0) && (visual_only || !k_ptr->aware);
-        const auto o_name = is_flavor_only ? flavor_k_ptr->flavor_name : strip_name(k_idx);
+        const auto o_name = is_flavor_only ? flavor_k_ptr->flavor_name : strip_name(bi_id);
         c_prt(attr, o_name.data(), row + i, col);
         if (per_page == 1) {
             c_prt(attr, format("%02x/%02x", flavor_k_ptr->x_attr, flavor_k_ptr->x_char), row + i, (w_ptr->wizard || visual_only) ? 64 : 68);
         }
 
         if (w_ptr->wizard || visual_only) {
-            c_prt(attr, format("%d", k_idx), row + i, 70);
+            c_prt(attr, format("%d", bi_id), row + i, 70);
         }
 
         a = flavor_k_ptr->x_attr;
@@ -221,13 +221,13 @@ static void display_object_list(int col, int row, int per_page, IDX object_idx[]
 /*
  * Describe fake object
  */
-static void desc_obj_fake(PlayerType *player_ptr, short k_idx)
+static void desc_obj_fake(PlayerType *player_ptr, short bi_id)
 {
     ItemEntity *o_ptr;
     ItemEntity ObjectType_body;
     o_ptr = &ObjectType_body;
     o_ptr->wipe();
-    o_ptr->prep(k_idx);
+    o_ptr->prep(bi_id);
 
     o_ptr->ident |= IDENT_KNOWN;
     handle_stuff(player_ptr);

diff --git a/src/knowledge/knowledge-quests.cpp b/src/knowledge/knowledge-quests.cpp
index a80c444..819fc8c 100644 (file)
--- a/src/knowledge/knowledge-quests.cpp
+++ b/src/knowledge/knowledge-quests.cpp
@@ -104,8 +104,8 @@ static void do_cmd_knowledge_quests_current(PlayerType *player_ptr, FILE *fff)
                     if (q_ref.reward_artifact_idx != FixedArtifactId::NONE) {
                         const auto &a_ref = artifacts_info.at(q_ref.reward_artifact_idx);
                         ItemEntity item;
-                        auto k_idx = lookup_baseitem_id(a_ref.bi_key);
-                        item.prep(k_idx);
+                        auto bi_id = lookup_baseitem_id(a_ref.bi_key);
+                        item.prep(bi_id);
                         item.fixed_artifact_idx = q_ref.reward_artifact_idx;
                         item.ident = IDENT_STORE;
                         describe_flavor(player_ptr, name, &item, OD_NAME_ONLY);

diff --git a/src/load/inventory-loader.cpp b/src/load/inventory-loader.cpp
index a1bc4b1..3f7880c 100644 (file)
--- a/src/load/inventory-loader.cpp
+++ b/src/load/inventory-loader.cpp
@@ -38,7 +38,7 @@ static errr rd_inventory(PlayerType *player_ptr)
 
         ItemEntity item;
         item_loader->rd_item(&item);
-        if (!item.k_idx) {
+        if (!item.bi_id) {
             return 53;
         }
 

diff --git a/src/load/old/item-loader-savefile50.cpp b/src/load/old/item-loader-savefile50.cpp
index 5a32739..7038e28 100644 (file)
--- a/src/load/old/item-loader-savefile50.cpp
+++ b/src/load/old/item-loader-savefile50.cpp
@@ -31,10 +31,10 @@ void ItemLoader50::rd_item(ItemEntity *o_ptr)
     }
 
     auto flags = rd_u32b();
-    o_ptr->k_idx = rd_s16b();
+    o_ptr->bi_id = rd_s16b();
     o_ptr->iy = rd_byte();
     o_ptr->ix = rd_byte();
-    auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[o_ptr->bi_id];
     o_ptr->tval = k_ptr->bi_key.tval();
     o_ptr->sval = k_ptr->bi_key.sval().value();
     o_ptr->pval = any_bits(flags, SaveDataItemFlagType::PVAL) ? rd_s16b() : 0;

diff --git a/src/load/old/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 6364c1d..73a5568 100644 (file)
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -66,7 +66,7 @@ const int QUEST_ROYAL_CRYPT = 28; // 王家の墓.
  */
 void rd_item_old(ItemEntity *o_ptr)
 {
-    o_ptr->k_idx = rd_s16b();
+    o_ptr->bi_id = rd_s16b();
 
     o_ptr->iy = rd_byte();
     o_ptr->ix = rd_byte();
@@ -324,12 +324,12 @@ void rd_item_old(ItemEntity *o_ptr)
         strip_bytes(tmp32s);
     }
 
-    if ((o_ptr->k_idx >= 445) && (o_ptr->k_idx <= 479)) {
+    if ((o_ptr->bi_id >= 445) && (o_ptr->bi_id <= 479)) {
         return;
     }
 
     if (h_older_than(0, 4, 10) && (o_ptr->ego_idx == EgoType::TWILIGHT)) {
-        o_ptr->k_idx = lookup_baseitem_id({ ItemKindType::SOFT_ARMOR, SV_TWILIGHT_ROBE });
+        o_ptr->bi_id = lookup_baseitem_id({ ItemKindType::SOFT_ARMOR, SV_TWILIGHT_ROBE });
     }
 
     if (h_older_than(0, 4, 9)) {

diff --git a/src/market/building-craft-fix.cpp b/src/market/building-craft-fix.cpp
index b834e07..356cfa3 100644 (file)
--- a/src/market/building-craft-fix.cpp
+++ b/src/market/building-craft-fix.cpp
@@ -203,13 +203,13 @@ static PRICE repair_broken_weapon_aux(PlayerType *player_ptr, PRICE bcost)
         }
     }
 
-    auto dd_bonus = o_ptr->dd - baseitems_info[o_ptr->k_idx].dd;
-    auto ds_bonus = o_ptr->ds - baseitems_info[o_ptr->k_idx].ds;
-    dd_bonus += mo_ptr->dd - baseitems_info[mo_ptr->k_idx].dd;
-    ds_bonus += mo_ptr->ds - baseitems_info[mo_ptr->k_idx].ds;
+    auto dd_bonus = o_ptr->dd - baseitems_info[o_ptr->bi_id].dd;
+    auto ds_bonus = o_ptr->ds - baseitems_info[o_ptr->bi_id].ds;
+    dd_bonus += mo_ptr->dd - baseitems_info[mo_ptr->bi_id].dd;
+    ds_bonus += mo_ptr->ds - baseitems_info[mo_ptr->bi_id].ds;
 
     const auto &k_ref = baseitems_info[bi_id];
-    o_ptr->k_idx = bi_id;
+    o_ptr->bi_id = bi_id;
     o_ptr->weight = k_ref.weight;
     o_ptr->tval = k_ref.bi_key.tval();
     o_ptr->sval = k_ref.bi_key.sval().value();

diff --git a/src/market/building-initializer.cpp b/src/market/building-initializer.cpp
index 0bc016e..1e8cc16 100644 (file)
--- a/src/market/building-initializer.cpp
+++ b/src/market/building-initializer.cpp
@@ -35,13 +35,13 @@ void init_towns(void)
             }
 
             for (const auto &baseitem : store_regular_sale_table.at(sst)) {
-                auto k_idx = lookup_baseitem_id(baseitem);
-                store_ptr->regular.push_back(k_idx);
+                auto bi_id = lookup_baseitem_id(baseitem);
+                store_ptr->regular.push_back(bi_id);
             }
 
             for (const auto &baseitem : store_sale_table.at(sst)) {
-                auto k_idx = lookup_baseitem_id(baseitem);
-                store_ptr->table.push_back(k_idx);
+                auto bi_id = lookup_baseitem_id(baseitem);
+                store_ptr->table.push_back(bi_id);
             }
         }
     }

diff --git a/src/market/building-recharger.cpp b/src/market/building-recharger.cpp
index 9ac1949..7aaab78 100644 (file)
--- a/src/market/building-recharger.cpp
+++ b/src/market/building-recharger.cpp
@@ -48,7 +48,7 @@ void building_recharge(PlayerType *player_ptr)
     }
 
     BaseitemInfo *k_ptr;
-    k_ptr = &baseitems_info[o_ptr->k_idx];
+    k_ptr = &baseitems_info[o_ptr->bi_id];
 
     /*
      * We don't want to give the player free info about
@@ -75,7 +75,7 @@ void building_recharge(PlayerType *player_ptr)
         return;
     }
 
-    DEPTH lev = baseitems_info[o_ptr->k_idx].level;
+    DEPTH lev = baseitems_info[o_ptr->bi_id].level;
     PRICE price;
     if (o_ptr->tval == ItemKindType::ROD) {
         if (o_ptr->timeout > 0) {
@@ -86,10 +86,10 @@ void building_recharge(PlayerType *player_ptr)
             return;
         }
     } else if (o_ptr->tval == ItemKindType::STAFF) {
-        price = (baseitems_info[o_ptr->k_idx].cost / 10) * o_ptr->number;
+        price = (baseitems_info[o_ptr->bi_id].cost / 10) * o_ptr->number;
         price = std::max(10, price);
     } else {
-        price = (baseitems_info[o_ptr->k_idx].cost / 10);
+        price = (baseitems_info[o_ptr->bi_id].cost / 10);
         price = std::max(10, price);
     }
 
@@ -195,9 +195,9 @@ void building_recharge_all(PlayerType *player_ptr)
             total_cost += 50;
         }
 
-        DEPTH lev = baseitems_info[o_ptr->k_idx].level;
+        DEPTH lev = baseitems_info[o_ptr->bi_id].level;
         BaseitemInfo *k_ptr;
-        k_ptr = &baseitems_info[o_ptr->k_idx];
+        k_ptr = &baseitems_info[o_ptr->bi_id];
 
         switch (o_ptr->tval) {
         case ItemKindType::ROD:
@@ -205,13 +205,13 @@ void building_recharge_all(PlayerType *player_ptr)
             break;
 
         case ItemKindType::STAFF:
-            price = (baseitems_info[o_ptr->k_idx].cost / 10) * o_ptr->number;
+            price = (baseitems_info[o_ptr->bi_id].cost / 10) * o_ptr->number;
             price = std::max(10, price);
             price = (k_ptr->pval - o_ptr->pval) * price;
             break;
 
         case ItemKindType::WAND:
-            price = (baseitems_info[o_ptr->k_idx].cost / 10);
+            price = (baseitems_info[o_ptr->bi_id].cost / 10);
             price = std::max(10, price);
             price = (o_ptr->number * k_ptr->pval - o_ptr->pval) * price;
             break;
@@ -245,7 +245,7 @@ void building_recharge_all(PlayerType *player_ptr)
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
         BaseitemInfo *k_ptr;
-        k_ptr = &baseitems_info[o_ptr->k_idx];
+        k_ptr = &baseitems_info[o_ptr->bi_id];
 
         if ((o_ptr->tval < ItemKindType::STAFF) || (o_ptr->tval > ItemKindType::ROD)) {
             continue;

diff --git a/src/mind/mind-mage.cpp b/src/mind/mind-mage.cpp
index 5e341e4..f9f6fb3 100644 (file)
--- a/src/mind/mind-mage.cpp
+++ b/src/mind/mind-mage.cpp
@@ -42,8 +42,8 @@ bool eat_magic(PlayerType *player_ptr, int power)
     }
 
     BaseitemInfo *k_ptr;
-    k_ptr = &baseitems_info[o_ptr->k_idx];
-    DEPTH lev = baseitems_info[o_ptr->k_idx].level;
+    k_ptr = &baseitems_info[o_ptr->bi_id];
+    DEPTH lev = baseitems_info[o_ptr->bi_id].level;
 
     int recharge_strength = 0;
     bool is_eating_successful = true;

diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp
index 67b4fc6..70d485d 100644 (file)
--- a/src/monster-attack/monster-attack-switcher.cpp
+++ b/src/monster-attack/monster-attack-switcher.cpp
@@ -110,7 +110,7 @@ static void calc_blow_un_power(PlayerType *player_ptr, MonsterAttackPlayer *mona
     for (int i = 0; i < max_draining_item; i++) {
         INVENTORY_IDX i_idx = (INVENTORY_IDX)randint0(INVEN_PACK);
         monap_ptr->o_ptr = &player_ptr->inventory_list[i_idx];
-        if (monap_ptr->o_ptr->k_idx == 0) {
+        if (monap_ptr->o_ptr->bi_id == 0) {
             continue;
         }
 

diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index 80d32a3..3250d36 100644 (file)
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -143,7 +143,7 @@ void process_eat_item(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr)
         OBJECT_IDX o_idx;
         INVENTORY_IDX i_idx = (INVENTORY_IDX)randint0(INVEN_PACK);
         monap_ptr->o_ptr = &player_ptr->inventory_list[i_idx];
-        if (!monap_ptr->o_ptr->k_idx) {
+        if (!monap_ptr->o_ptr->bi_id) {
             continue;
         }
 
@@ -173,7 +173,7 @@ void process_eat_food(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr)
     for (int i = 0; i < 10; i++) {
         INVENTORY_IDX i_idx = (INVENTORY_IDX)randint0(INVEN_PACK);
         monap_ptr->o_ptr = &player_ptr->inventory_list[i_idx];
-        if (!monap_ptr->o_ptr->k_idx) {
+        if (!monap_ptr->o_ptr->bi_id) {
             continue;
         }
 
@@ -228,7 +228,7 @@ bool process_un_power(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr)
     }
 
     bool is_magic_mastery = has_magic_mastery(player_ptr) != 0;
-    BaseitemInfo *kind_ptr = &baseitems_info[monap_ptr->o_ptr->k_idx];
+    BaseitemInfo *kind_ptr = &baseitems_info[monap_ptr->o_ptr->bi_id];
     PARAMETER_VALUE pval = kind_ptr->pval;
     DEPTH level = monap_ptr->rlev;
     auto drain = is_magic_mastery ? std::min<short>(pval, pval * level / 400 + pval * randint1(level) / 400) : pval;

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index c8dbd92..49e0b80 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -200,15 +200,15 @@ static short drop_dungeon_final_artifact(PlayerType *player_ptr, monster_death_t
 {
     const auto &dungeon = dungeons_info[player_ptr->dungeon_idx];
     const auto has_reward = dungeon.final_object > 0;
-    const auto k_idx = has_reward ? dungeon.final_object : lookup_baseitem_id({ ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT });
+    const auto bi_id = has_reward ? dungeon.final_object : lookup_baseitem_id({ ItemKindType::SCROLL, SV_SCROLL_ACQUIREMENT });
     if (dungeon.final_artifact == FixedArtifactId::NONE) {
-        return k_idx;
+        return bi_id;
     }
 
     const auto a_idx = dungeon.final_artifact;
     auto &a_ref = artifacts_info.at(a_idx);
     if (a_ref.is_generated) {
-        return k_idx;
+        return bi_id;
     }
 
     if (create_named_art(player_ptr, a_idx, md_ptr->md_y, md_ptr->md_x)) {
@@ -217,7 +217,7 @@ static short drop_dungeon_final_artifact(PlayerType *player_ptr, monster_death_t
         }
     }
 
-    return dungeon.final_object ? k_idx : 0;
+    return dungeon.final_object ? bi_id : 0;
 }
 
 static void drop_artifacts(PlayerType *player_ptr, monster_death_type *md_ptr)
@@ -231,11 +231,11 @@ static void drop_artifacts(PlayerType *player_ptr, monster_death_type *md_ptr)
         return;
     }
 
-    short k_idx = drop_dungeon_final_artifact(player_ptr, md_ptr);
-    if (k_idx != 0) {
+    short bi_id = drop_dungeon_final_artifact(player_ptr, md_ptr);
+    if (bi_id != 0) {
         ItemEntity forge;
         auto *q_ptr = &forge;
-        q_ptr->prep(k_idx);
+        q_ptr->prep(bi_id);
         ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | AM_GOOD).execute();
         (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
     }

diff --git a/src/monster-floor/special-death-switcher.cpp b/src/monster-floor/special-death-switcher.cpp
index 713b5be..e348598 100644 (file)
--- a/src/monster-floor/special-death-switcher.cpp
+++ b/src/monster-floor/special-death-switcher.cpp
@@ -359,7 +359,7 @@ static bool make_equipment(PlayerType *player_ptr, ItemEntity *q_ptr, const BIT_
  * 最初のアイテム生成でいきなり☆が生成された場合を除き、中途半端な☆ (例：呪われている)は生成しない.
  * このルーチンで★は生成されないので、★生成フラグのキャンセルも不要
  */
-static void on_dead_random_artifact(PlayerType *player_ptr, monster_death_type *md_ptr, bool (*object_hook_pf)(short k_idx))
+static void on_dead_random_artifact(PlayerType *player_ptr, monster_death_type *md_ptr, bool (*object_hook_pf)(short bi_id))
 {
     ItemEntity forge;
     auto *q_ptr = &forge;
@@ -408,7 +408,7 @@ static void on_dead_manimani(PlayerType *player_ptr, monster_death_type *md_ptr)
     msg_print(_("どこからか声が聞こえる…「ハロー！　そして…グッドバイ！」", "Heard a voice from somewhere... 'Hello! And... good bye!'"));
 }
 
-static void drop_specific_item_on_dead(PlayerType *player_ptr, monster_death_type *md_ptr, bool (*object_hook_pf)(short k_idx))
+static void drop_specific_item_on_dead(PlayerType *player_ptr, monster_death_type *md_ptr, bool (*object_hook_pf)(short bi_id))
 {
     ItemEntity forge;
     auto *q_ptr = &forge;

diff --git a/src/object-activation/activation-util.cpp b/src/object-activation/activation-util.cpp
index 81e4d68..13067e4 100644 (file)
--- a/src/object-activation/activation-util.cpp
+++ b/src/object-activation/activation-util.cpp
@@ -7,6 +7,6 @@
 ae_type *initialize_ae_type(PlayerType *player_ptr, ae_type *ae_ptr, const INVENTORY_IDX item)
 {
     ae_ptr->o_ptr = ref_item(player_ptr, item);
-    ae_ptr->lev = baseitems_info[ae_ptr->o_ptr->k_idx].level;
+    ae_ptr->lev = baseitems_info[ae_ptr->o_ptr->bi_id].level;
     return ae_ptr;
 }

diff --git a/src/object-enchant/item-magic-applier.cpp b/src/object-enchant/item-magic-applier.cpp
index 570117d..84a56c0 100644 (file)
--- a/src/object-enchant/item-magic-applier.cpp
+++ b/src/object-enchant/item-magic-applier.cpp
@@ -197,12 +197,12 @@ bool ItemMagicApplier::set_fixed_artifact_generation_info()
  */
 void ItemMagicApplier::apply_cursed()
 {
-    if (this->o_ptr->k_idx == 0) {
+    if (this->o_ptr->bi_id == 0) {
         return;
     }
 
-    const auto *k_ptr = &baseitems_info[this->o_ptr->k_idx];
-    if (!baseitems_info[this->o_ptr->k_idx].cost) {
+    const auto *k_ptr = &baseitems_info[this->o_ptr->bi_id];
+    if (!baseitems_info[this->o_ptr->bi_id].cost) {
         set_bits(this->o_ptr->ident, IDENT_BROKEN);
     }
 

diff --git a/src/object-enchant/object-boost.cpp b/src/object-enchant/object-boost.cpp
index a07a032..e1165e9 100644 (file)
--- a/src/object-enchant/object-boost.cpp
+++ b/src/object-enchant/object-boost.cpp
@@ -598,7 +598,7 @@ void one_lordly_high_resistance(ItemEntity *o_ptr)
  */
 void make_weight_ligten(ItemEntity *o_ptr)
 {
-    o_ptr->weight = (2 * baseitems_info[o_ptr->k_idx].weight / 3);
+    o_ptr->weight = (2 * baseitems_info[o_ptr->bi_id].weight / 3);
 }
 
 /*!
@@ -607,7 +607,7 @@ void make_weight_ligten(ItemEntity *o_ptr)
  */
 void make_weight_heavy(ItemEntity *o_ptr)
 {
-    o_ptr->weight = (4 * baseitems_info[o_ptr->k_idx].weight / 3);
+    o_ptr->weight = (4 * baseitems_info[o_ptr->bi_id].weight / 3);
 }
 
 /*!

diff --git a/src/object-enchant/object-curse.cpp b/src/object-enchant/object-curse.cpp
index fef9997..370097c 100644 (file)
--- a/src/object-enchant/object-curse.cpp
+++ b/src/object-enchant/object-curse.cpp
@@ -71,7 +71,7 @@ void curse_equipment(PlayerType *player_ptr, PERCENTAGE chance, PERCENTAGE heavy
     }
 
     auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND + randint0(12)];
-    if (!o_ptr->k_idx) {
+    if (!o_ptr->bi_id) {
         return;
     }
     auto oflgs = object_flags(o_ptr);

diff --git a/src/object-enchant/others/apply-magic-amulet.cpp b/src/object-enchant/others/apply-magic-amulet.cpp
index 294a732..c415cee 100644 (file)
--- a/src/object-enchant/others/apply-magic-amulet.cpp
+++ b/src/object-enchant/others/apply-magic-amulet.cpp
@@ -152,7 +152,7 @@ void AmuletEnchanter::sval_enchant()
 void AmuletEnchanter::give_ego_index()
 {
     while (!this->o_ptr->is_ego()) {
-        auto *k_ptr = &baseitems_info[this->o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[this->o_ptr->bi_id];
         switch (randint1(21)) {
         case 1:
         case 2:
@@ -341,7 +341,7 @@ void AmuletEnchanter::give_cursed()
     }
 
     while (!this->o_ptr->is_ego()) {
-        auto *k_ptr = &baseitems_info[this->o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[this->o_ptr->bi_id];
         switch (randint1(5)) {
         case 1:
             if (k_ptr->flags.has(TR_DRAIN_EXP)) {

diff --git a/src/object-enchant/others/apply-magic-others.cpp b/src/object-enchant/others/apply-magic-others.cpp
index e09e1c9..abd7c4b 100644 (file)
--- a/src/object-enchant/others/apply-magic-others.cpp
+++ b/src/object-enchant/others/apply-magic-others.cpp
@@ -59,7 +59,7 @@ void OtherItemsEnchanter::apply_magic()
         this->enchant_wand_staff();
         break;
     case ItemKindType::ROD:
-        this->o_ptr->pval = baseitems_info[this->o_ptr->k_idx].pval;
+        this->o_ptr->pval = baseitems_info[this->o_ptr->bi_id].pval;
         break;
     case ItemKindType::CAPTURE:
         this->o_ptr->pval = 0;
@@ -90,7 +90,7 @@ void OtherItemsEnchanter::apply_magic()
  */
 void OtherItemsEnchanter::enchant_wand_staff()
 {
-    auto *k_ptr = &baseitems_info[this->o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[this->o_ptr->bi_id];
     this->o_ptr->pval = k_ptr->pval / 2 + randint1((k_ptr->pval + 1) / 2);
 }
 
@@ -193,7 +193,7 @@ void OtherItemsEnchanter::generate_statue()
  */
 void OtherItemsEnchanter::generate_chest()
 {
-    auto obj_level = baseitems_info[this->o_ptr->k_idx].level;
+    auto obj_level = baseitems_info[this->o_ptr->bi_id].level;
     if (obj_level <= 0) {
         return;
     }

diff --git a/src/object-enchant/others/apply-magic-ring.cpp b/src/object-enchant/others/apply-magic-ring.cpp
index 7fd7f4a..778fe9d 100644 (file)
--- a/src/object-enchant/others/apply-magic-ring.cpp
+++ b/src/object-enchant/others/apply-magic-ring.cpp
@@ -228,7 +228,7 @@ void RingEnchanter::give_ego_index()
 {
     while (!this->o_ptr->is_ego()) {
         int tmp = m_bonus(10, this->level);
-        auto *k_ptr = &baseitems_info[this->o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[this->o_ptr->bi_id];
         switch (randint1(28)) {
         case 1:
         case 2:
@@ -501,7 +501,7 @@ void RingEnchanter::give_cursed()
     }
 
     while (!this->o_ptr->is_ego()) {
-        auto *k_ptr = &baseitems_info[this->o_ptr->k_idx];
+        auto *k_ptr = &baseitems_info[this->o_ptr->bi_id];
         switch (randint1(5)) {
         case 1:
             if (k_ptr->flags.has(TR_DRAIN_EXP)) {

diff --git a/src/object-enchant/protector/apply-magic-soft-armor.cpp b/src/object-enchant/protector/apply-magic-soft-armor.cpp
index 5547f1f..fe97ed9 100644 (file)
--- a/src/object-enchant/protector/apply-magic-soft-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-soft-armor.cpp
@@ -87,7 +87,7 @@ void SoftArmorEnchanter::give_high_ego_index()
         return;
     }
 
-    this->o_ptr->k_idx = lookup_baseitem_id({ ItemKindType::SOFT_ARMOR, SV_TWILIGHT_ROBE });
+    this->o_ptr->bi_id = lookup_baseitem_id({ ItemKindType::SOFT_ARMOR, SV_TWILIGHT_ROBE });
     this->o_ptr->sval = SV_TWILIGHT_ROBE;
     this->o_ptr->ac = 0;
     this->o_ptr->to_a = 0;

diff --git a/src/object-use/quaff/quaff-execution.cpp b/src/object-use/quaff/quaff-execution.cpp
index b7d218c..6757fa0 100644 (file)
--- a/src/object-use/quaff/quaff-execution.cpp
+++ b/src/object-use/quaff/quaff-execution.cpp
@@ -58,7 +58,7 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
     auto ident = QuaffEffects(this->player_ptr).influence(o_ref);
     if (PlayerRace(this->player_ptr).equals(PlayerRaceType::SKELETON)) {
         msg_print(_("液体の一部はあなたのアゴを素通りして落ちた！", "Some of the fluid falls through your jaws!"));
-        (void)potion_smash_effect(this->player_ptr, 0, this->player_ptr->y, this->player_ptr->x, o_ref.k_idx);
+        (void)potion_smash_effect(this->player_ptr, 0, this->player_ptr->y, this->player_ptr->x, o_ref.bi_id);
     }
 
     this->player_ptr->update |= PU_COMBINE | PU_REORDER;
@@ -66,7 +66,7 @@ void ObjectQuaffEntity::execute(INVENTORY_IDX item)
     object_tried(&o_ref);
     if (ident && !o_ref.is_aware()) {
         object_aware(this->player_ptr, &o_ref);
-        gain_exp(this->player_ptr, (baseitems_info[o_ref.k_idx].level + (this->player_ptr->lev >> 1)) / this->player_ptr->lev);
+        gain_exp(this->player_ptr, (baseitems_info[o_ref.bi_id].level + (this->player_ptr->lev >> 1)) / this->player_ptr->lev);
     }
 
     this->player_ptr->window_flags |= (PW_INVEN | PW_EQUIP | PW_PLAYER);

diff --git a/src/object-use/read/read-execution.cpp b/src/object-use/read/read-execution.cpp
index 80144e2..4daff9c 100644 (file)
--- a/src/object-use/read/read-execution.cpp
+++ b/src/object-use/read/read-execution.cpp
@@ -108,6 +108,6 @@ void ObjectReadEntity::gain_exp_from_item_use(ItemEntity *o_ptr, bool is_identif
     }
 
     object_aware(this->player_ptr, o_ptr);
-    auto lev = baseitems_info[o_ptr->k_idx].level;
+    auto lev = baseitems_info[o_ptr->bi_id].level;
     gain_exp(this->player_ptr, (lev + (this->player_ptr->lev >> 1)) / this->player_ptr->lev);
 }

diff --git a/src/object-use/throw-execution.cpp b/src/object-use/throw-execution.cpp
index 1c89f99..968619e 100644 (file)
--- a/src/object-use/throw-execution.cpp
+++ b/src/object-use/throw-execution.cpp
@@ -251,7 +251,7 @@ void ObjectThrowEntity::display_potion_throw()
     }
 
     msg_format(_("%sは砕け散った！", "The %s shatters!"), this->o_name);
-    if (!potion_smash_effect(this->player_ptr, 0, this->y, this->x, this->q_ptr->k_idx)) {
+    if (!potion_smash_effect(this->player_ptr, 0, this->y, this->x, this->q_ptr->bi_id)) {
         this->do_drop = false;
         return;
     }

diff --git a/src/object-use/use-execution.cpp b/src/object-use/use-execution.cpp
index 99d4c1d..d904255 100644 (file)
--- a/src/object-use/use-execution.cpp
+++ b/src/object-use/use-execution.cpp
@@ -59,7 +59,7 @@ void ObjectUseEntity::execute()
         return;
     }
 
-    auto lev = baseitems_info[o_ptr->k_idx].level;
+    auto lev = baseitems_info[o_ptr->bi_id].level;
     if (lev > 50) {
         lev = 50 + (lev - 50) / 2;
     }

diff --git a/src/object-use/zaprod-execution.cpp b/src/object-use/zaprod-execution.cpp
index 4217fff..be79441 100644 (file)
--- a/src/object-use/zaprod-execution.cpp
+++ b/src/object-use/zaprod-execution.cpp
@@ -64,7 +64,7 @@ void ObjectZapRodEntity::execute(INVENTORY_IDX item)
         return;
     }
 
-    auto lev = baseitems_info[o_ptr->k_idx].level;
+    auto lev = baseitems_info[o_ptr->bi_id].level;
     auto chance = this->player_ptr->skill_dev;
     if (this->player_ptr->effects()->confusion()->is_confused()) {
         chance = chance / 2;
@@ -104,7 +104,7 @@ void ObjectZapRodEntity::execute(INVENTORY_IDX item)
         return;
     }
 
-    auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[o_ptr->bi_id];
     if ((o_ptr->number == 1) && (o_ptr->timeout)) {
         if (flush_failure) {
             flush();

diff --git a/src/object-use/zapwand-execution.cpp b/src/object-use/zapwand-execution.cpp
index 491d81c..7342cd9 100644 (file)
--- a/src/object-use/zapwand-execution.cpp
+++ b/src/object-use/zapwand-execution.cpp
@@ -62,7 +62,7 @@ void ObjectZapWandEntity::execute(INVENTORY_IDX item)
         return;
     }
 
-    auto lev = baseitems_info[o_ptr->k_idx].level;
+    auto lev = baseitems_info[o_ptr->bi_id].level;
     if (lev > 50) {
         lev = 50 + (lev - 50) / 2;
     }

diff --git a/src/object/item-tester-hooker.cpp b/src/object/item-tester-hooker.cpp
index ccc978c..189257a 100644 (file)
--- a/src/object/item-tester-hooker.cpp
+++ b/src/object/item-tester-hooker.cpp
@@ -68,11 +68,11 @@ FuncItemTester::FuncItemTester(std::function<bool(PlayerType *, const ItemEntity
  * Check an item against the item tester info
  * @param o_ptr 判定を行いたいオブジェクト構造体参照ポインタ
  * @return アイテムが条件を満たしているならtrueを返す
- * @details 最初にk_idxが無効でないか等の共通の判定を行った後に子クラスで実装される okay_impl 関数の結果を返す
+ * @details 最初にbi_idが無効でないか等の共通の判定を行った後に子クラスで実装される okay_impl 関数の結果を返す
  */
 bool ItemTester::okay(const ItemEntity *o_ptr) const
 {
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         return false;
     }
 

diff --git a/src/object/object-broken.cpp b/src/object/object-broken.cpp
index 836fd71..fa64f58 100644 (file)
--- a/src/object/object-broken.cpp
+++ b/src/object/object-broken.cpp
@@ -228,7 +228,7 @@ bool ObjectBreaker::can_destroy(ItemEntity *o_ptr) const
  * @param who 薬破損の主体ID(プレイヤー所持アイテムが壊れた場合0、床上のアイテムの場合モンスターID)
  * @param y 破壊時のY座標
  * @param x 破壊時のX座標
- * @param k_idx 破損した薬のアイテムID
+ * @param bi_id 破損した薬のアイテムID
  * @return 薬を浴びたモンスターが起こるならばTRUEを返す
  * @details
  * <pre>
@@ -249,13 +249,13 @@ bool ObjectBreaker::can_destroy(ItemEntity *o_ptr) const
  *    o_ptr --- pointer to the potion object.
  * </pre>
  */
-bool potion_smash_effect(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, short k_idx)
+bool potion_smash_effect(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, short bi_id)
 {
     int radius = 2;
     AttributeType dt = AttributeType::NONE;
     int dam = 0;
     bool angry = false;
-    const auto &k_ref = baseitems_info[k_idx];
+    const auto &k_ref = baseitems_info[bi_id];
     switch (k_ref.bi_key.sval().value()) {
     case SV_POTION_SALT_WATER:
     case SV_POTION_SLIME_MOLD:

diff --git a/src/object/object-broken.h b/src/object/object-broken.h
index 9708d66..543e38f 100644 (file)
--- a/src/object/object-broken.h
+++ b/src/object/object-broken.h
@@ -6,7 +6,7 @@
 class ItemEntity;
 class PlayerType;
 
-bool potion_smash_effect(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, short k_idx);
+bool potion_smash_effect(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, short bi_id);
 PERCENTAGE breakage_chance(PlayerType *player_ptr, ItemEntity *o_ptr, bool has_archer_bonus, SPELL_IDX snipe_type);
 
 class ObjectBreaker {

diff --git a/src/object/object-flags.cpp b/src/object/object-flags.cpp
index 155ae21..f6a5c17 100644 (file)
--- a/src/object/object-flags.cpp
+++ b/src/object/object-flags.cpp
@@ -49,7 +49,7 @@ static void object_flags_lite(const ItemEntity *o_ptr, TrFlags &flgs)
  */
 TrFlags object_flags(const ItemEntity *o_ptr)
 {
-    auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[o_ptr->bi_id];
 
     /* Base object */
     auto flgs = k_ptr->flags;
@@ -83,7 +83,7 @@ TrFlags object_flags(const ItemEntity *o_ptr)
 TrFlags object_flags_known(const ItemEntity *o_ptr)
 {
     bool spoil = false;
-    auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[o_ptr->bi_id];
     TrFlags flgs{};
 
     if (!o_ptr->is_aware()) {

diff --git a/src/object/object-info.cpp b/src/object/object-info.cpp
index ffcc34c..6419382 100644 (file)
--- a/src/object/object-info.cpp
+++ b/src/object/object-info.cpp
@@ -223,10 +223,10 @@ int16_t wield_slot(PlayerType *player_ptr, const ItemEntity *o_ptr)
     case ItemKindType::HAFTED:
     case ItemKindType::POLEARM:
     case ItemKindType::SWORD: {
-        if (!player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx) {
+        if (!player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id) {
             return INVEN_MAIN_HAND;
         }
-        if (player_ptr->inventory_list[INVEN_SUB_HAND].k_idx) {
+        if (player_ptr->inventory_list[INVEN_SUB_HAND].bi_id) {
             return INVEN_MAIN_HAND;
         }
         return INVEN_SUB_HAND;
@@ -234,10 +234,10 @@ int16_t wield_slot(PlayerType *player_ptr, const ItemEntity *o_ptr)
     case ItemKindType::CAPTURE:
     case ItemKindType::CARD:
     case ItemKindType::SHIELD: {
-        if (!player_ptr->inventory_list[INVEN_SUB_HAND].k_idx) {
+        if (!player_ptr->inventory_list[INVEN_SUB_HAND].bi_id) {
             return INVEN_SUB_HAND;
         }
-        if (player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx) {
+        if (player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id) {
             return INVEN_SUB_HAND;
         }
         return INVEN_MAIN_HAND;
@@ -246,7 +246,7 @@ int16_t wield_slot(PlayerType *player_ptr, const ItemEntity *o_ptr)
         return INVEN_BOW;
     }
     case ItemKindType::RING: {
-        if (!player_ptr->inventory_list[INVEN_MAIN_RING].k_idx) {
+        if (!player_ptr->inventory_list[INVEN_MAIN_RING].bi_id) {
             return INVEN_MAIN_RING;
         }
 

diff --git a/src/object/object-stack.cpp b/src/object/object-stack.cpp
index faf41b5..2a8d3af 100644 (file)
--- a/src/object/object-stack.cpp
+++ b/src/object/object-stack.cpp
@@ -82,7 +82,7 @@ int object_similar_part(const ItemEntity *o_ptr, const ItemEntity *j_ptr)
 {
     const int max_stack_size = 99;
     int max_num = max_stack_size;
-    if (o_ptr->k_idx != j_ptr->k_idx) {
+    if (o_ptr->bi_id != j_ptr->bi_id) {
         return 0;
     }
 
@@ -133,7 +133,7 @@ int object_similar_part(const ItemEntity *o_ptr, const ItemEntity *j_ptr)
         break;
     }
     case ItemKindType::ROD: {
-        max_num = std::min(max_num, MAX_SHORT / baseitems_info[o_ptr->k_idx].pval);
+        max_num = std::min(max_num, MAX_SHORT / baseitems_info[o_ptr->bi_id].pval);
         break;
     }
     case ItemKindType::GLOVES:

diff --git a/src/object/object-value-calc.cpp b/src/object/object-value-calc.cpp
index 997244d..34040a5 100644 (file)
--- a/src/object/object-value-calc.cpp
+++ b/src/object/object-value-calc.cpp
@@ -21,7 +21,7 @@
 PRICE flag_cost(const ItemEntity *o_ptr, int plusses)
 {
     PRICE total = 0;
-    auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[o_ptr->bi_id];
     auto flgs = object_flags(o_ptr);
 
     /*

diff --git a/src/object/object-value.cpp b/src/object/object-value.cpp
index ff6cc54..9442470 100644 (file)
--- a/src/object/object-value.cpp
+++ b/src/object/object-value.cpp
@@ -37,13 +37,13 @@
  */
 PRICE object_value_real(const ItemEntity *o_ptr)
 {
-    auto *k_ptr = &baseitems_info[o_ptr->k_idx];
+    auto *k_ptr = &baseitems_info[o_ptr->bi_id];
 
-    if (!baseitems_info[o_ptr->k_idx].cost) {
+    if (!baseitems_info[o_ptr->bi_id].cost) {
         return 0;
     }
 
-    PRICE value = baseitems_info[o_ptr->k_idx].cost;
+    PRICE value = baseitems_info[o_ptr->bi_id].cost;
     auto flgs = object_flags(o_ptr);
     if (o_ptr->is_fixed_artifact()) {
         const auto &a_ref = artifacts_info.at(o_ptr->fixed_artifact_idx);

diff --git a/src/perception/identification.cpp b/src/perception/identification.cpp
index 7d3f4fc..2ed09b7 100644 (file)
--- a/src/perception/identification.cpp
+++ b/src/perception/identification.cpp
@@ -44,7 +44,7 @@ bool screen_object(PlayerType *player_ptr, ItemEntity *o_ptr, BIT_FLAGS mode)
     int trivial_info = 0;
     auto flgs = object_flags(o_ptr);
 
-    const auto item_text = o_ptr->is_fixed_artifact() ? artifacts_info.at(o_ptr->fixed_artifact_idx).text.data() : baseitems_info[o_ptr->k_idx].text.data();
+    const auto item_text = o_ptr->is_fixed_artifact() ? artifacts_info.at(o_ptr->fixed_artifact_idx).text.data() : baseitems_info[o_ptr->bi_id].text.data();
     shape_buffer(item_text, 77 - 15, temp, sizeof(temp));
 
     int i = 0;

diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp
index f51d528..d0054a7 100644 (file)
--- a/src/perception/object-perception.cpp
+++ b/src/perception/object-perception.cpp
@@ -46,7 +46,7 @@ void object_aware(PlayerType *player_ptr, const ItemEntity *o_ptr)
 {
     const bool is_already_awared = o_ptr->is_aware();
 
-    baseitems_info[o_ptr->k_idx].aware = true;
+    baseitems_info[o_ptr->bi_id].aware = true;
 
     // 以下、playrecordに記録しない場合はreturnする
     if (!record_ident) {
@@ -58,7 +58,7 @@ void object_aware(PlayerType *player_ptr, const ItemEntity *o_ptr)
     }
 
     // アーティファクト専用ベースアイテムは記録しない
-    if (baseitems_info[o_ptr->k_idx].gen_flags.has(ItemGenerationTraitType::INSTA_ART)) {
+    if (baseitems_info[o_ptr->bi_id].gen_flags.has(ItemGenerationTraitType::INSTA_ART)) {
         return;
     }
 
@@ -88,5 +88,5 @@ void object_aware(PlayerType *player_ptr, const ItemEntity *o_ptr)
  */
 void object_tried(const ItemEntity *o_ptr)
 {
-    baseitems_info[o_ptr->k_idx].tried = true;
+    baseitems_info[o_ptr->bi_id].tried = true;
 }

diff --git a/src/perception/simple-perception.cpp b/src/perception/simple-perception.cpp
index e4e5ee5..19b7043 100644 (file)
--- a/src/perception/simple-perception.cpp
+++ b/src/perception/simple-perception.cpp
@@ -276,7 +276,7 @@ void sense_inventory1(PlayerType *player_ptr)
 
         o_ptr = &player_ptr->inventory_list[i];
 
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -405,7 +405,7 @@ void sense_inventory2(PlayerType *player_ptr)
     for (INVENTORY_IDX i = 0; i < INVEN_TOTAL; i++) {
         bool okay = false;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/player-attack/player-attack.cpp b/src/player-attack/player-attack.cpp
index 0cebcc2..79146dd 100644 (file)
--- a/src/player-attack/player-attack.cpp
+++ b/src/player-attack/player-attack.cpp
@@ -149,7 +149,7 @@ static void get_attack_exp(PlayerType *player_ptr, player_attack_type *pa_ptr)
 {
     auto *r_ptr = &monraces_info[pa_ptr->m_ptr->r_idx];
     auto *o_ptr = &player_ptr->inventory_list[enum2i(INVEN_MAIN_HAND) + pa_ptr->hand];
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         get_bare_knuckle_exp(player_ptr, pa_ptr);
         return;
     }
@@ -373,7 +373,7 @@ static void calc_attack_damage(PlayerType *player_ptr, player_attack_type *pa_pt
         return;
     }
 
-    if (o_ptr->k_idx) {
+    if (o_ptr->bi_id) {
         process_weapon_attack(player_ptr, pa_ptr, do_quake, vorpal_cut, vorpal_chance);
     }
 }

diff --git a/src/player-base/player-class.cpp b/src/player-base/player-class.cpp
index 39f673b..38adc1b 100644 (file)
--- a/src/player-base/player-class.cpp
+++ b/src/player-base/player-class.cpp
@@ -100,7 +100,7 @@ TrFlags PlayerClass::tr_flags() const
         if (heavy_armor(this->player_ptr)) {
             flags.set(TR_SPEED);
         } else {
-            if ((!this->player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(this->player_ptr)) && (!this->player_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(this->player_ptr))) {
+            if ((!this->player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id || can_attack_with_main_hand(this->player_ptr)) && (!this->player_ptr->inventory_list[INVEN_SUB_HAND].bi_id || can_attack_with_sub_hand(this->player_ptr))) {
                 flags.set(TR_SPEED);
             }
             if (plev > 24 && !this->player_ptr->is_icky_wield[0] && !this->player_ptr->is_icky_wield[1]) {

diff --git a/src/player-info/base-status-info.cpp b/src/player-info/base-status-info.cpp
index 24a19dc..cad3b32 100644 (file)
--- a/src/player-info/base-status-info.cpp
+++ b/src/player-info/base-status-info.cpp
@@ -11,7 +11,7 @@ void set_equipment_influence(PlayerType *player_ptr, self_info_type *self_ptr)
 {
     for (int k = INVEN_MAIN_HAND; k < INVEN_TOTAL; k++) {
         auto *o_ptr = &player_ptr->inventory_list[k];
-        if (o_ptr->k_idx == 0) {
+        if (o_ptr->bi_id == 0) {
             continue;
         }
 

diff --git a/src/player-info/equipment-info.cpp b/src/player-info/equipment-info.cpp
index 5a07090..5c610eb 100644 (file)
--- a/src/player-info/equipment-info.cpp
+++ b/src/player-info/equipment-info.cpp
@@ -17,7 +17,7 @@
 bool has_melee_weapon(PlayerType *player_ptr, int slot)
 {
     const auto o_ptr = &player_ptr->inventory_list[slot];
-    return o_ptr->k_idx && o_ptr->is_melee_weapon();
+    return o_ptr->bi_id && o_ptr->is_melee_weapon();
 }
 
 /*!
@@ -28,10 +28,10 @@ bool has_melee_weapon(PlayerType *player_ptr, int slot)
 BIT_FLAGS16 empty_hands(PlayerType *player_ptr, bool riding_control)
 {
     BIT_FLAGS16 status = EMPTY_HAND_NONE;
-    if (!player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx) {
+    if (!player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id) {
         status |= EMPTY_HAND_MAIN;
     }
-    if (!player_ptr->inventory_list[INVEN_SUB_HAND].k_idx) {
+    if (!player_ptr->inventory_list[INVEN_SUB_HAND].bi_id) {
         status |= EMPTY_HAND_SUB;
     }
 

diff --git a/src/player-info/weapon-effect-info.cpp b/src/player-info/weapon-effect-info.cpp
index e817c81..ce66b3e 100644 (file)
--- a/src/player-info/weapon-effect-info.cpp
+++ b/src/player-info/weapon-effect-info.cpp
@@ -125,7 +125,7 @@ static void set_slay_info(self_info_type *self_ptr)
 void set_weapon_effect_info(PlayerType *player_ptr, self_info_type *self_ptr)
 {
     auto *o_ptr = &player_ptr->inventory_list[INVEN_MAIN_HAND];
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         return;
     }
 

diff --git a/src/player-status/player-speed.cpp b/src/player-status/player-speed.cpp
index 934e337..8d4d238 100644 (file)
--- a/src/player-status/player-speed.cpp
+++ b/src/player-status/player-speed.cpp
@@ -74,7 +74,7 @@ int16_t PlayerSpeed::class_bonus()
     if (pc.equals(PlayerClassType::NINJA)) {
         if (heavy_armor(this->player_ptr)) {
             bonus -= (this->player_ptr->lev) / 10;
-        } else if ((!this->player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(this->player_ptr)) && (!this->player_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(this->player_ptr))) {
+        } else if ((!this->player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id || can_attack_with_main_hand(this->player_ptr)) && (!this->player_ptr->inventory_list[INVEN_SUB_HAND].bi_id || can_attack_with_sub_hand(this->player_ptr))) {
             bonus += 3;
             if (!(PlayerRace(this->player_ptr).equals(PlayerRaceType::KLACKON) || PlayerRace(this->player_ptr).equals(PlayerRaceType::SPRITE) || (this->player_ptr->ppersonality == PERSONALITY_MUNCHKIN))) {
                 bonus += (this->player_ptr->lev) / 10;

diff --git a/src/player-status/player-status-base.cpp b/src/player-status/player-status-base.cpp
index e98acfc..46f3a38 100644 (file)
--- a/src/player-status/player-status-base.cpp
+++ b/src/player-status/player-status-base.cpp
@@ -213,7 +213,7 @@ BIT_FLAGS PlayerStatusBase::equipments_flags(tr_type check_flag)
     BIT_FLAGS flags = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -236,7 +236,7 @@ BIT_FLAGS PlayerStatusBase::equipments_bad_flags(tr_type check_flag)
     BIT_FLAGS flags = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -262,7 +262,7 @@ int16_t PlayerStatusBase::equipments_bonus()
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
         auto o_flags = object_flags(o_ptr);
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/player-status/player-stealth.cpp b/src/player-status/player-stealth.cpp
index 20ce460..e9a1308 100644 (file)
--- a/src/player-status/player-stealth.cpp
+++ b/src/player-status/player-stealth.cpp
@@ -74,7 +74,7 @@ int16_t PlayerStealth::class_bonus()
     int16_t bonus = 0;
     if (heavy_armor(this->player_ptr)) {
         bonus -= (this->player_ptr->lev) / 10;
-    } else if ((!this->player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(this->player_ptr)) && (!this->player_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(this->player_ptr))) {
+    } else if ((!this->player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id || can_attack_with_main_hand(this->player_ptr)) && (!this->player_ptr->inventory_list[INVEN_SUB_HAND].bi_id || can_attack_with_sub_hand(this->player_ptr))) {
         bonus += (this->player_ptr->lev) / 10;
     }
 

diff --git a/src/player/patron.cpp b/src/player/patron.cpp
index 0e92408..8d8ffb1 100644 (file)
--- a/src/player/patron.cpp
+++ b/src/player/patron.cpp
@@ -412,7 +412,7 @@ void Patron::gain_level_reward(PlayerType *player_ptr_, int chosen_reward)
 
         case REW_CURSE_AR:
 
-            if (!this->player_ptr->inventory_list[INVEN_BODY].k_idx) {
+            if (!this->player_ptr->inventory_list[INVEN_BODY].bi_id) {
                 break;
             }
             msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.data());
@@ -454,7 +454,7 @@ void Patron::gain_level_reward(PlayerType *player_ptr_, int chosen_reward)
                     (void)curse_weapon_object(player_ptr, false, &this->player_ptr->inventory_list[slot]);
                     reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                 } else {
-                    if (!this->player_ptr->inventory_list[INVEN_BODY].k_idx) {
+                    if (!this->player_ptr->inventory_list[INVEN_BODY].bi_id) {
                         break;
                     }
                     describe_flavor(player_ptr, o_name, &this->player_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);

diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp
index 2554fbd..8ba8230 100644 (file)
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -113,7 +113,7 @@ static bool acid_minus_ac(PlayerType *player_ptr)
         break;
     }
 
-    if ((o_ptr == nullptr) || (o_ptr->k_idx == 0) || !o_ptr->is_armour()) {
+    if ((o_ptr == nullptr) || (o_ptr->bi_id == 0) || !o_ptr->is_armour()) {
         return false;
     }
 

diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp
index f9c05cf..571a0dd 100644 (file)
--- a/src/player/player-status-flags.cpp
+++ b/src/player/player-status-flags.cpp
@@ -125,7 +125,7 @@ BIT_FLAGS check_equipment_flags(PlayerType *player_ptr, tr_type tr_flag)
     BIT_FLAGS result = 0L;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -797,7 +797,7 @@ BIT_FLAGS has_warning(PlayerType *player_ptr)
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -1067,7 +1067,7 @@ void update_curses(PlayerType *player_ptr)
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         auto flgs = object_flags(o_ptr);
@@ -1179,7 +1179,7 @@ void update_extra_blows(PlayerType *player_ptr)
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -1482,7 +1482,7 @@ BIT_FLAGS has_vuln_curse(PlayerType *player_ptr)
     BIT_FLAGS result = 0L;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -1507,7 +1507,7 @@ BIT_FLAGS has_heavy_vuln_curse(PlayerType *player_ptr)
     BIT_FLAGS result = 0L;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 91382e8..5268738 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -212,7 +212,7 @@ WEIGHT calc_inventory_weight(PlayerType *player_ptr)
     ItemEntity *o_ptr;
     for (int i = 0; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         weight += o_ptr->weight * o_ptr->number;
@@ -333,7 +333,7 @@ static void update_bonuses(PlayerType *player_ptr)
 
     update_ability_scores(player_ptr);
     o_ptr = &player_ptr->inventory_list[INVEN_BOW];
-    if (o_ptr->k_idx) {
+    if (o_ptr->bi_id) {
         player_ptr->tval_ammo = bow_tval_ammo(o_ptr);
         player_ptr->num_fire = calc_num_fire(player_ptr, o_ptr);
     }
@@ -822,7 +822,7 @@ static void update_max_mana(PlayerType *player_ptr)
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[INVEN_ARMS];
         auto flgs = object_flags(o_ptr);
-        if (o_ptr->k_idx && flgs.has_not(TR_FREE_ACT) && flgs.has_not(TR_DEC_MANA) && flgs.has_not(TR_EASY_SPELL) && !((flgs.has(TR_MAGIC_MASTERY)) && (o_ptr->pval > 0)) && !((flgs.has(TR_DEX)) && (o_ptr->pval > 0))) {
+        if (o_ptr->bi_id && flgs.has_not(TR_FREE_ACT) && flgs.has_not(TR_DEC_MANA) && flgs.has_not(TR_EASY_SPELL) && !((flgs.has(TR_MAGIC_MASTERY)) && (o_ptr->pval > 0)) && !((flgs.has(TR_DEX)) && (o_ptr->pval > 0))) {
             player_ptr->cumber_glove = true;
             msp = (3 * msp) / 4;
         }
@@ -1017,7 +1017,7 @@ int16_t calc_num_fire(PlayerType *player_ptr, ItemEntity *o_ptr)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *q_ptr;
         q_ptr = &player_ptr->inventory_list[i];
-        if (!q_ptr->k_idx) {
+        if (!q_ptr->bi_id) {
             continue;
         }
 
@@ -1037,7 +1037,7 @@ int16_t calc_num_fire(PlayerType *player_ptr, ItemEntity *o_ptr)
     }
 
     int num = 0;
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         return (int16_t)num;
     }
 
@@ -1139,7 +1139,7 @@ static ACTION_SKILL_POWER calc_device_ability(PlayerType *player_ptr)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         auto flgs = object_flags(o_ptr);
@@ -1268,7 +1268,7 @@ static ACTION_SKILL_POWER calc_search(PlayerType *player_ptr)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         auto flgs = object_flags(o_ptr);
@@ -1319,7 +1319,7 @@ static ACTION_SKILL_POWER calc_search_freq(PlayerType *player_ptr)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         auto flgs = object_flags(o_ptr);
@@ -1441,7 +1441,7 @@ static ACTION_SKILL_POWER calc_skill_dig(PlayerType *player_ptr)
 
     pow = 0;
 
-    if (PlayerRace(player_ptr).equals(PlayerRaceType::ENT) && !player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx) {
+    if (PlayerRace(player_ptr).equals(PlayerRaceType::ENT) && !player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id) {
         pow += player_ptr->lev * 10;
     }
 
@@ -1457,7 +1457,7 @@ static ACTION_SKILL_POWER calc_skill_dig(PlayerType *player_ptr)
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         auto flgs = object_flags(o_ptr);
@@ -1509,7 +1509,7 @@ static int16_t calc_num_blow(PlayerType *player_ptr, int i)
     auto flgs = object_flags(o_ptr);
     PlayerClass pc(player_ptr);
     if (has_melee_weapon(player_ptr, INVEN_MAIN_HAND + i)) {
-        if (o_ptr->k_idx && !player_ptr->heavy_wield[i]) {
+        if (o_ptr->bi_id && !player_ptr->heavy_wield[i]) {
             int str_index, dex_index;
             int num = 0, wgt = 0, mul = 0, div = 0;
 
@@ -1681,7 +1681,7 @@ static int16_t calc_to_magic_chance(PlayerType *player_ptr)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -1706,7 +1706,7 @@ static ARMOUR_CLASS calc_base_ac(PlayerType *player_ptr)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         ac += o_ptr->ac;
@@ -1757,7 +1757,7 @@ static ARMOUR_CLASS calc_to_ac(PlayerType *player_ptr, bool is_real_value)
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
         auto flags = object_flags(o_ptr);
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         if (is_real_value || o_ptr->is_known()) {
@@ -1811,22 +1811,22 @@ static ARMOUR_CLASS calc_to_ac(PlayerType *player_ptr, bool is_real_value)
     }
 
     if (pc.is_martial_arts_pro() && !heavy_armor(player_ptr)) {
-        if (!(player_ptr->inventory_list[INVEN_BODY].k_idx)) {
+        if (!(player_ptr->inventory_list[INVEN_BODY].bi_id)) {
             ac += (player_ptr->lev * 3) / 2;
         }
-        if (!(player_ptr->inventory_list[INVEN_OUTER].k_idx) && (player_ptr->lev > 15)) {
+        if (!(player_ptr->inventory_list[INVEN_OUTER].bi_id) && (player_ptr->lev > 15)) {
             ac += ((player_ptr->lev - 13) / 3);
         }
-        if (!(player_ptr->inventory_list[INVEN_SUB_HAND].k_idx) && (player_ptr->lev > 10)) {
+        if (!(player_ptr->inventory_list[INVEN_SUB_HAND].bi_id) && (player_ptr->lev > 10)) {
             ac += ((player_ptr->lev - 8) / 3);
         }
-        if (!(player_ptr->inventory_list[INVEN_HEAD].k_idx) && (player_ptr->lev > 4)) {
+        if (!(player_ptr->inventory_list[INVEN_HEAD].bi_id) && (player_ptr->lev > 4)) {
             ac += (player_ptr->lev - 2) / 3;
         }
-        if (!(player_ptr->inventory_list[INVEN_ARMS].k_idx)) {
+        if (!(player_ptr->inventory_list[INVEN_ARMS].bi_id)) {
             ac += (player_ptr->lev / 2);
         }
-        if (!(player_ptr->inventory_list[INVEN_FEET].k_idx)) {
+        if (!(player_ptr->inventory_list[INVEN_FEET].bi_id)) {
             ac += (player_ptr->lev / 3);
         }
     }
@@ -1838,7 +1838,7 @@ static ARMOUR_CLASS calc_to_ac(PlayerType *player_ptr, bool is_real_value)
 
         for (int i = INVEN_MAIN_HAND; i <= INVEN_FEET; i++) {
             auto *o_ptr = &player_ptr->inventory_list[i];
-            if (!o_ptr->k_idx) {
+            if (!o_ptr->bi_id) {
                 continue;
             }
             if (!o_ptr->is_armour()) {
@@ -1884,7 +1884,7 @@ static ARMOUR_CLASS calc_to_ac(PlayerType *player_ptr, bool is_real_value)
     }
 
     if (pc.equals(PlayerClassType::NINJA)) {
-        if ((!player_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(player_ptr)) && (!player_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(player_ptr))) {
+        if ((!player_ptr->inventory_list[INVEN_MAIN_HAND].bi_id || can_attack_with_main_hand(player_ptr)) && (!player_ptr->inventory_list[INVEN_SUB_HAND].bi_id || can_attack_with_sub_hand(player_ptr))) {
             ac += player_ptr->lev / 2 + 5;
         }
     }
@@ -1997,7 +1997,7 @@ void put_equipment_warning(PlayerType *player_ptr)
     if (player_ptr->old_heavy_shoot != heavy_shoot) {
         if (heavy_shoot) {
             msg_print(_("こんな重い弓を装備しているのは大変だ。", "You have trouble wielding such a heavy bow."));
-        } else if (player_ptr->inventory_list[INVEN_BOW].k_idx) {
+        } else if (player_ptr->inventory_list[INVEN_BOW].bi_id) {
             msg_print(_("この弓なら装備していても辛くない。", "You have no trouble wielding your bow."));
         } else {
             msg_print(_("重い弓を装備からはずして体が楽になった。", "You feel relieved to put down your heavy bow."));
@@ -2143,7 +2143,7 @@ static short calc_to_damage(PlayerType *player_ptr, INVENTORY_IDX slot, bool is_
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         int bonus_to_d = 0;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i)) || (i == INVEN_SUB_HAND && has_melee_weapon(player_ptr, i)) || i == INVEN_BOW) {
+        if (!o_ptr->bi_id || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i)) || (i == INVEN_SUB_HAND && has_melee_weapon(player_ptr, i)) || i == INVEN_BOW) {
             continue;
         }
 
@@ -2376,7 +2376,7 @@ static short calc_to_hit(PlayerType *player_ptr, INVENTORY_IDX slot, bool is_rea
         auto *o_ptr = &player_ptr->inventory_list[i];
 
         /* Ignore empty hands, handed weapons, bows and capture balls */
-        if (!o_ptr->k_idx || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i)) || (i == INVEN_SUB_HAND && has_melee_weapon(player_ptr, i)) || i == INVEN_BOW) {
+        if (!o_ptr->bi_id || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i)) || (i == INVEN_SUB_HAND && has_melee_weapon(player_ptr, i)) || i == INVEN_BOW) {
             continue;
         }
 
@@ -2469,7 +2469,7 @@ static int16_t calc_to_hit_bow(PlayerType *player_ptr, bool is_real_value)
     {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[INVEN_BOW];
-        if (o_ptr->k_idx) {
+        if (o_ptr->bi_id) {
             if (o_ptr->curse_flags.has(CurseTraitType::LOW_MELEE)) {
                 if (o_ptr->curse_flags.has(CurseTraitType::HEAVY_CURSE)) {
                     pow -= 15;
@@ -2500,8 +2500,8 @@ static int16_t calc_to_hit_bow(PlayerType *player_ptr, bool is_real_value)
         pow += 2 * (calc_bow_weight_limit(player_ptr) - o_ptr->weight / 10);
     }
 
-    if (o_ptr->k_idx) {
-        if (o_ptr->k_idx && !is_heavy_shoot(player_ptr, &player_ptr->inventory_list[INVEN_BOW])) {
+    if (o_ptr->bi_id) {
+        if (o_ptr->bi_id && !is_heavy_shoot(player_ptr, &player_ptr->inventory_list[INVEN_BOW])) {
             if (PlayerClass(player_ptr).equals(PlayerClassType::SNIPER) && (player_ptr->tval_ammo == ItemKindType::BOLT)) {
                 pow += (10 + (player_ptr->lev / 5));
             }
@@ -2512,7 +2512,7 @@ static int16_t calc_to_hit_bow(PlayerType *player_ptr, bool is_real_value)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         int bonus_to_h;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i)) || (i == INVEN_SUB_HAND && has_melee_weapon(player_ptr, i)) || i == INVEN_BOW) {
+        if (!o_ptr->bi_id || o_ptr->tval == ItemKindType::CAPTURE || (i == INVEN_MAIN_HAND && has_melee_weapon(player_ptr, i)) || (i == INVEN_SUB_HAND && has_melee_weapon(player_ptr, i)) || i == INVEN_BOW) {
             continue;
         }
 
@@ -2542,7 +2542,7 @@ static int16_t calc_to_damage_misc(PlayerType *player_ptr)
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -2573,7 +2573,7 @@ static int16_t calc_to_hit_misc(PlayerType *player_ptr)
 
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -2743,7 +2743,7 @@ bool player_has_no_spellbooks(PlayerType *player_ptr)
     ItemEntity *o_ptr;
     for (int i = 0; i < INVEN_PACK; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (o_ptr->k_idx && check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)) {
+        if (o_ptr->bi_id && check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)) {
             return false;
         }
     }
@@ -2751,7 +2751,7 @@ bool player_has_no_spellbooks(PlayerType *player_ptr)
     auto *floor_ptr = player_ptr->current_floor_ptr;
     for (const auto this_o_idx : floor_ptr->grid_array[player_ptr->y][player_ptr->x].o_idx_list) {
         o_ptr = &floor_ptr->o_list[this_o_idx];
-        if (o_ptr->k_idx && any_bits(o_ptr->marked, OM_FOUND) && check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)) {
+        if (o_ptr->bi_id && any_bits(o_ptr->marked, OM_FOUND) && check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)) {
             return false;
         }
     }

diff --git a/src/player/process-death.cpp b/src/player/process-death.cpp
index f20bf96..1200e2e 100644 (file)
--- a/src/player/process-death.cpp
+++ b/src/player/process-death.cpp
@@ -258,7 +258,7 @@ static void inventory_aware(PlayerType *player_ptr)
     ItemEntity *o_ptr;
     for (int i = 0; i < INVEN_TOTAL; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -279,7 +279,7 @@ static void home_aware(PlayerType *player_ptr)
         store_ptr = &town_info[i].store[enum2i(StoreSaleType::HOME)];
         for (int j = 0; j < store_ptr->stock_num; j++) {
             o_ptr = &store_ptr->stock[j];
-            if (!o_ptr->k_idx) {
+            if (!o_ptr->bi_id) {
                 continue;
             }
 

diff --git a/src/player/race-resistances.cpp b/src/player/race-resistances.cpp
index 505f2a5..3187920 100644 (file)
--- a/src/player/race-resistances.cpp
+++ b/src/player/race-resistances.cpp
@@ -83,7 +83,7 @@ void known_obj_immunity(PlayerType *player_ptr, TrFlags &flags)
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         ItemEntity *o_ptr;
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp
index 20f0c6c..f4b5c76 100644 (file)
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -69,12 +69,12 @@ void calc_android_exp(PlayerType *player_ptr)
         ItemEntity forge;
         auto *q_ptr = &forge;
         uint32_t value, exp;
-        DEPTH level = std::max(baseitems_info[o_ptr->k_idx].level - 8, 1);
+        DEPTH level = std::max(baseitems_info[o_ptr->bi_id].level - 8, 1);
 
         if ((i == INVEN_MAIN_RING) || (i == INVEN_SUB_RING) || (i == INVEN_NECK) || (i == INVEN_LITE)) {
             continue;
         }
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp
index 68fe778..77e791e 100644 (file)
--- a/src/realm/realm-hex.cpp
+++ b/src/realm/realm-hex.cpp
@@ -628,7 +628,7 @@ concptr do_hex_spell(PlayerType *player_ptr, spell_hex_type spell, SpellProcessT
         if (cast) {
             auto *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
 
-            if (!o_ptr->k_idx) {
+            if (!o_ptr->bi_id) {
                 msg_print(_("クロークを身につけていない！", "You are not wearing a cloak."));
                 return nullptr;
             } else if (!o_ptr->is_cursed()) {
@@ -641,7 +641,7 @@ concptr do_hex_spell(PlayerType *player_ptr, spell_hex_type spell, SpellProcessT
         if (continuation) {
             auto *o_ptr = &player_ptr->inventory_list[INVEN_OUTER];
 
-            if ((!o_ptr->k_idx) || (!o_ptr->is_cursed())) {
+            if ((!o_ptr->bi_id) || (!o_ptr->is_cursed())) {
                 exe_spell(player_ptr, REALM_HEX, spell, SpellProcessType::STOP);
                 SpellHex spell_hex(player_ptr);
                 spell_hex.reset_casting_flag(spell);

diff --git a/src/save/item-writer.cpp b/src/save/item-writer.cpp
index 8402fcc..06b79af 100644 (file)
--- a/src/save/item-writer.cpp
+++ b/src/save/item-writer.cpp
@@ -243,7 +243,7 @@ void wr_item(ItemEntity *o_ptr)
     BIT_FLAGS flags = 0x00000000;
     write_item_flags(o_ptr, &flags);
 
-    wr_s16b(o_ptr->k_idx);
+    wr_s16b(o_ptr->bi_id);
     wr_byte((byte)o_ptr->iy);
     wr_byte((byte)o_ptr->ix);
     if (any_bits(flags, SaveDataItemFlagType::PVAL)) {
@@ -270,12 +270,12 @@ void wr_item(ItemEntity *o_ptr)
 
 /*!
  * @brief セーブデータにアイテムの鑑定情報を書き込む / Write an "perception" record
- * @param k_idx ベースアイテムのID
+ * @param bi_id ベースアイテムのID
  */
-void wr_perception(short k_idx)
+void wr_perception(short bi_id)
 {
     byte tmp8u = 0;
-    auto *k_ptr = &baseitems_info[k_idx];
+    auto *k_ptr = &baseitems_info[bi_id];
     if (k_ptr->aware) {
         tmp8u |= 0x01;
     }

diff --git a/src/save/item-writer.h b/src/save/item-writer.h
index 72477b6..9ea38d5 100644 (file)
--- a/src/save/item-writer.h
+++ b/src/save/item-writer.h
@@ -2,4 +2,4 @@
 
 class ItemEntity;
 void wr_item(ItemEntity *o_ptr);
-void wr_perception(short k_idx);
+void wr_perception(short bi_id);

diff --git a/src/save/save.cpp b/src/save/save.cpp
index 9d5bf37..38ab523 100644 (file)
--- a/src/save/save.cpp
+++ b/src/save/save.cpp
@@ -119,8 +119,8 @@ static bool wr_savefile_new(PlayerType *player_ptr, SaveType type)
 
     tmp16u = static_cast<uint16_t>(baseitems_info.size());
     wr_u16b(tmp16u);
-    for (short k_idx = 0; k_idx < tmp16u; k_idx++) {
-        wr_perception(k_idx);
+    for (short bi_id = 0; bi_id < tmp16u; bi_id++) {
+        wr_perception(bi_id);
     }
 
     tmp16u = max_towns;
@@ -205,7 +205,7 @@ static bool wr_savefile_new(PlayerType *player_ptr, SaveType type)
 
     for (int i = 0; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/smith/object-smith.cpp b/src/smith/object-smith.cpp
index 3fdae9e..0d216c7 100644 (file)
--- a/src/smith/object-smith.cpp
+++ b/src/smith/object-smith.cpp
@@ -351,7 +351,7 @@ Smith::DrainEssenceResult Smith::drain_essence(ItemEntity *o_ptr)
 
     // アイテムをエッセンス抽出後の状態にする
     const ItemEntity old_o = *o_ptr;
-    o_ptr->prep(o_ptr->k_idx);
+    o_ptr->prep(o_ptr->bi_id);
 
     o_ptr->iy = old_o.iy;
     o_ptr->ix = old_o.ix;

diff --git a/src/specific-object/chest.cpp b/src/specific-object/chest.cpp
index af74d37..722314f 100644 (file)
--- a/src/specific-object/chest.cpp
+++ b/src/specific-object/chest.cpp
@@ -275,7 +275,7 @@ void Chest::chest_trap(POSITION y, POSITION x, OBJECT_IDX o_idx)
     }
 
     /* Dispel player. */
-    if ((trap.has(ChestTrapType::RUNES_OF_EVIL)) && o_ptr->k_idx) {
+    if ((trap.has(ChestTrapType::RUNES_OF_EVIL)) && o_ptr->bi_id) {
         msg_print(_("恐ろしい声が響いた:  「暗闇が汝をつつまん！」", "Hideous voices bid:  'Let the darkness have thee!'"));
         for (auto count = 4 + randint0(3); count > 0; count--) {
             if (randint1(100 + o_ptr->pval * 2) <= this->player_ptr->skill_sav) {
@@ -329,7 +329,7 @@ void Chest::chest_trap(POSITION y, POSITION x, OBJECT_IDX o_idx)
     }
 
     /* Explode */
-    if ((trap.has(ChestTrapType::EXPLODE)) && o_ptr->k_idx) {
+    if ((trap.has(ChestTrapType::EXPLODE)) && o_ptr->bi_id) {
         msg_print(_("突然、箱が爆発した！", "There is a sudden explosion!"));
         msg_print(_("箱の中の物はすべて粉々に砕け散った！", "Everything inside the chest is destroyed!"));
         o_ptr->pval = 0;
@@ -337,7 +337,7 @@ void Chest::chest_trap(POSITION y, POSITION x, OBJECT_IDX o_idx)
         take_hit(this->player_ptr, DAMAGE_ATTACK, damroll(5, 8), _("爆発する箱", "an exploding chest"));
     }
     /* Scatter contents. */
-    if ((trap.has(ChestTrapType::SCATTER)) && o_ptr->k_idx) {
+    if ((trap.has(ChestTrapType::SCATTER)) && o_ptr->bi_id) {
         msg_print(_("宝箱の中身はダンジョンじゅうに散乱した！", "The contents of the chest scatter all over the dungeon!"));
         this->chest_death(true, y, x, o_idx);
         o_ptr->pval = 0;

diff --git a/src/specific-object/torch.cpp b/src/specific-object/torch.cpp
index e83c0e3..e702591 100644 (file)
--- a/src/specific-object/torch.cpp
+++ b/src/specific-object/torch.cpp
@@ -94,7 +94,7 @@ void update_lite_radius(PlayerType *player_ptr)
         o_ptr = &player_ptr->inventory_list[i];
         auto flgs = object_flags(o_ptr);
 
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/spell-kind/magic-item-recharger.cpp b/src/spell-kind/magic-item-recharger.cpp
index 3374ad3..fb5c005 100644 (file)
--- a/src/spell-kind/magic-item-recharger.cpp
+++ b/src/spell-kind/magic-item-recharger.cpp
@@ -60,8 +60,8 @@ bool recharge(PlayerType *player_ptr, int power)
     }
 
     BaseitemInfo *k_ptr;
-    k_ptr = &baseitems_info[o_ptr->k_idx];
-    DEPTH lev = baseitems_info[o_ptr->k_idx].level;
+    k_ptr = &baseitems_info[o_ptr->bi_id];
+    DEPTH lev = baseitems_info[o_ptr->bi_id].level;
 
     TIME_EFFECT recharge_amount;
     int recharge_strength;

diff --git a/src/spell-kind/spells-curse-removal.cpp b/src/spell-kind/spells-curse-removal.cpp
index cf8d614..0df187d 100644 (file)
--- a/src/spell-kind/spells-curse-removal.cpp
+++ b/src/spell-kind/spells-curse-removal.cpp
@@ -21,7 +21,7 @@ static int exe_curse_removal(PlayerType *player_ptr, int all)
     int cnt = 0;
     for (int i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         if (!o_ptr->is_cursed()) {

diff --git a/src/spell-kind/spells-enchant.cpp b/src/spell-kind/spells-enchant.cpp
index 5346431..4cb1829 100644 (file)
--- a/src/spell-kind/spells-enchant.cpp
+++ b/src/spell-kind/spells-enchant.cpp
@@ -144,7 +144,7 @@ bool mundane_spell(PlayerType *player_ptr, bool only_equip)
     byte marked = o_ptr->marked;
     uint16_t inscription = o_ptr->inscription;
 
-    o_ptr->prep(o_ptr->k_idx);
+    o_ptr->prep(o_ptr->bi_id);
 
     o_ptr->iy = iy;
     o_ptr->ix = ix;

diff --git a/src/spell-kind/spells-equipment.cpp b/src/spell-kind/spells-equipment.cpp
index af73b45..4d0304c 100644 (file)
--- a/src/spell-kind/spells-equipment.cpp
+++ b/src/spell-kind/spells-equipment.cpp
@@ -52,7 +52,7 @@ bool apply_disenchant(PlayerType *player_ptr, BIT_FLAGS mode)
 
     ItemEntity *o_ptr;
     o_ptr = &player_ptr->inventory_list[t];
-    if (!o_ptr->k_idx) {
+    if (!o_ptr->bi_id) {
         return false;
     }
 

diff --git a/src/spell-kind/spells-perception.cpp b/src/spell-kind/spells-perception.cpp
index 1297cb9..0c5f22c 100644 (file)
--- a/src/spell-kind/spells-perception.cpp
+++ b/src/spell-kind/spells-perception.cpp
@@ -39,7 +39,7 @@ void identify_pack(PlayerType *player_ptr)
 {
     for (INVENTORY_IDX i = 0; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 

diff --git a/src/spell-kind/spells-teleport.cpp b/src/spell-kind/spells-teleport.cpp
index efb4213..6059d0c 100644 (file)
--- a/src/spell-kind/spells-teleport.cpp
+++ b/src/spell-kind/spells-teleport.cpp
@@ -559,7 +559,7 @@ void teleport_away_followable(PlayerType *player_ptr, MONSTER_IDX m_idx)
 
         for (i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
             o_ptr = &player_ptr->inventory_list[i];
-            if (o_ptr->k_idx && !o_ptr->is_cursed()) {
+            if (o_ptr->bi_id && !o_ptr->is_cursed()) {
                 auto flgs = object_flags(o_ptr);
                 if (flgs.has(TR_TELEPORT)) {
                     follow = true;

diff --git a/src/spell-realm/spells-craft.cpp b/src/spell-realm/spells-craft.cpp
index 7fe8f4b..6926ddb 100644 (file)
--- a/src/spell-realm/spells-craft.cpp
+++ b/src/spell-realm/spells-craft.cpp
@@ -281,7 +281,7 @@ bool pulish_shield(PlayerType *player_ptr)
     GAME_TEXT o_name[MAX_NLEN];
     describe_flavor(player_ptr, o_name, o_ptr, OD_OMIT_PREFIX | OD_NAME_ONLY);
 
-    bool is_pulish_successful = o_ptr->k_idx && !o_ptr->is_artifact() && !o_ptr->is_ego();
+    bool is_pulish_successful = o_ptr->bi_id && !o_ptr->is_artifact() && !o_ptr->is_ego();
     is_pulish_successful &= !o_ptr->is_cursed();
     is_pulish_successful &= (o_ptr->sval != SV_MIRROR_SHIELD);
     if (is_pulish_successful) {

diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp
index 57b5143..dbfb838 100644 (file)
--- a/src/spell/spells-object.cpp
+++ b/src/spell/spells-object.cpp
@@ -94,7 +94,7 @@ static const std::array<AmuseDefinition, 13> amuse_info = { {
     { { ItemKindType::SCROLL, SV_SCROLL_AMUSEMENT }, 10, AmusementFlagType::NOTHING },
 } };
 
-static std::optional<FixedArtifactId> sweep_amusement_artifact(const bool insta_art, const short k_idx)
+static std::optional<FixedArtifactId> sweep_amusement_artifact(const bool insta_art, const short bi_id)
 {
     for (const auto &[a_idx, a_ref] : artifacts_info) {
         if (a_idx == FixedArtifactId::NONE) {
@@ -105,7 +105,7 @@ static std::optional<FixedArtifactId> sweep_amusement_artifact(const bool insta_
             continue;
         }
 
-        if (a_ref.bi_key != baseitems_info[k_idx].bi_key) {
+        if (a_ref.bi_key != baseitems_info[bi_id].bi_key) {
             continue;
         }
 
@@ -135,24 +135,24 @@ void generate_amusement(PlayerType *player_ptr, int num, bool known)
     while (num > 0) {
         auto am_ptr = pt.pick_one_at_random();
 
-        const auto k_idx = lookup_baseitem_id(am_ptr->key);
-        if (k_idx == 0) {
+        const auto bi_id = lookup_baseitem_id(am_ptr->key);
+        if (bi_id == 0) {
             continue;
         }
 
-        const auto insta_art = baseitems_info[k_idx].gen_flags.has(ItemGenerationTraitType::INSTA_ART);
+        const auto insta_art = baseitems_info[bi_id].gen_flags.has(ItemGenerationTraitType::INSTA_ART);
         const auto flag = am_ptr->flag;
         const auto fixed_art = flag == AmusementFlagType::FIXED_ART;
         std::optional<FixedArtifactId> opt_a_idx(std::nullopt);
         if (insta_art || fixed_art) {
-            opt_a_idx = sweep_amusement_artifact(insta_art, k_idx);
+            opt_a_idx = sweep_amusement_artifact(insta_art, bi_id);
             if (!opt_a_idx.has_value()) {
                 continue;
             }
         }
 
         ItemEntity item;
-        item.prep(k_idx);
+        item.prep(bi_id);
         if (opt_a_idx.has_value()) {
             item.fixed_artifact_idx = opt_a_idx.value();
         }
@@ -230,7 +230,7 @@ bool curse_armor(PlayerType *player_ptr)
     ItemEntity *o_ptr;
     o_ptr = &player_ptr->inventory_list[INVEN_BODY];
 
-    if (!o_ptr->k_idx) {
+    if (!o_ptr->bi_id) {
         return false;
     }
 
@@ -285,7 +285,7 @@ bool curse_armor(PlayerType *player_ptr)
  */
 bool curse_weapon_object(PlayerType *player_ptr, bool force, ItemEntity *o_ptr)
 {
-    if (!o_ptr->k_idx) {
+    if (!o_ptr->bi_id) {
         return false;
     }
 
@@ -606,7 +606,7 @@ void brand_weapon(PlayerType *player_ptr, int brand_type)
     auto special_weapon = (o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_POISON_NEEDLE);
     special_weapon |= (o_ptr->tval == ItemKindType::POLEARM) && (o_ptr->sval == SV_DEATH_SCYTHE);
     special_weapon |= (o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_DIAMOND_EDGE);
-    const auto is_normal_item = o_ptr->k_idx && !o_ptr->is_artifact() && !o_ptr->is_ego() && !o_ptr->is_cursed() && !special_weapon;
+    const auto is_normal_item = o_ptr->bi_id && !o_ptr->is_artifact() && !o_ptr->is_ego() && !o_ptr->is_cursed() && !special_weapon;
     if (!is_normal_item) {
         if (flush_failure) {
             flush();

diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index 80f72cd..ce074f1 100644 (file)
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -477,8 +477,8 @@ bool restore_mana(PlayerType *player_ptr, bool magic_eater)
 
         auto sval = 0;
         for (auto &item : magic_eater_data->get_item_group(ItemKindType::ROD)) {
-            const auto k_idx = lookup_baseitem_id({ ItemKindType::ROD, sval });
-            item.charge -= ((item.count < 10) ? EATER_ROD_CHARGE * 3 : item.count * EATER_ROD_CHARGE / 3) * baseitems_info[k_idx].pval;
+            const auto bi_id = lookup_baseitem_id({ ItemKindType::ROD, sval });
+            item.charge -= ((item.count < 10) ? EATER_ROD_CHARGE * 3 : item.count * EATER_ROD_CHARGE / 3) * baseitems_info[bi_id].pval;
             item.charge = std::max(item.charge, 0);
             ++sval;
         }

diff --git a/src/status/base-status.cpp b/src/status/base-status.cpp
index b12fcae..a97300a 100644 (file)
--- a/src/status/base-status.cpp
+++ b/src/status/base-status.cpp
@@ -293,7 +293,7 @@ bool lose_all_info(PlayerType *player_ptr)
     chg_virtue(player_ptr, V_ENLIGHTEN, -5);
     for (int i = 0; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if ((o_ptr->k_idx == 0) || o_ptr->is_fully_known()) {
+        if ((o_ptr->bi_id == 0) || o_ptr->is_fully_known()) {
             continue;
         }
 

diff --git a/src/store/black-market.cpp b/src/store/black-market.cpp
index a55eae5..e7e3999 100644 (file)
--- a/src/store/black-market.cpp
+++ b/src/store/black-market.cpp
@@ -42,7 +42,7 @@ bool black_market_crap(PlayerType *player_ptr, ItemEntity *o_ptr)
 
         for (int j = 0; j < town_info[player_ptr->town_num].store[enum2i(sst)].stock_num; j++) {
             auto *j_ptr = &town_info[player_ptr->town_num].store[enum2i(sst)].stock[j];
-            if (o_ptr->k_idx == j_ptr->k_idx) {
+            if (o_ptr->bi_id == j_ptr->bi_id) {
                 return true;
             }
         }

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 2b8687e..94d4412 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -154,7 +154,7 @@ void do_cmd_store(PlayerType *player_ptr)
         bool need_redraw_store_inv = any_bits(player_ptr->update, PU_BONUS);
         w_ptr->character_icky_depth = 1;
         handle_stuff(player_ptr);
-        if (player_ptr->inventory_list[INVEN_PACK].k_idx) {
+        if (player_ptr->inventory_list[INVEN_PACK].bi_id) {
             INVENTORY_IDX item = INVEN_PACK;
             auto *o_ptr = &player_ptr->inventory_list[item];
             if (store_num != StoreSaleType::HOME) {

diff --git a/src/store/home.cpp b/src/store/home.cpp
index f02d80a..79d9bce 100644 (file)
--- a/src/store/home.cpp
+++ b/src/store/home.cpp
@@ -109,7 +109,7 @@ static void sweep_reorder_store_item(ItemEntity *o_ptr, const int i, bool *combi
     for (int j = 0; j < i; j++) {
         ItemEntity *j_ptr;
         j_ptr = &st_ptr->stock[j];
-        if (!j_ptr->k_idx) {
+        if (!j_ptr->bi_id) {
             continue;
         }
 
@@ -143,7 +143,7 @@ static void exe_reorder_store_item(PlayerType *player_ptr, bool *flag)
     for (int i = 0; i < st_ptr->stock_num; i++) {
         ItemEntity *o_ptr;
         o_ptr = &st_ptr->stock[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -196,7 +196,7 @@ bool combine_and_reorder_home(PlayerType *player_ptr, const StoreSaleType store_
         for (int i = st_ptr->stock_num - 1; i > 0; i--) {
             ItemEntity *o_ptr;
             o_ptr = &st_ptr->stock[i];
-            if (!o_ptr->k_idx) {
+            if (!o_ptr->bi_id) {
                 continue;
             }
 

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index e352f8e..471afc6 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -111,9 +111,9 @@ void display_rumor(PlayerType *player_ptr, bool ex)
     if (category == "ARTIFACT") {
         const auto &artifact_name = tokens[1];
         const auto &[a_idx, a_ptr] = get_artifact_definition(artifact_name);
-        const auto k_idx = lookup_baseitem_id(a_ptr->bi_key);
+        const auto bi_id = lookup_baseitem_id(a_ptr->bi_key);
         ItemEntity item;
-        item.prep(k_idx);
+        item.prep(bi_id);
         item.fixed_artifact_idx = a_idx;
         item.ident = IDENT_STORE;
         describe_flavor(player_ptr, fullname, &item, OD_NAME_ONLY);

diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index f9ff11f..81cf6f3 100644 (file)
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -49,7 +49,7 @@ void store_item_optimize(INVENTORY_IDX item)
 {
     ItemEntity *o_ptr;
     o_ptr = &st_ptr->stock[item];
-    if ((o_ptr->k_idx == 0) || (o_ptr->number != 0)) {
+    if ((o_ptr->bi_id == 0) || (o_ptr->number != 0)) {
         return;
     }
 
@@ -104,7 +104,7 @@ std::vector<PARAMETER_VALUE> store_same_magic_device_pvals(ItemEntity *j_ptr)
         if (o_ptr == j_ptr) {
             continue;
         }
-        if (o_ptr->k_idx != j_ptr->k_idx) {
+        if (o_ptr->bi_id != j_ptr->bi_id) {
             continue;
         }
         if (o_ptr->tval != ItemKindType::STAFF && o_ptr->tval != ItemKindType::WAND) {
@@ -132,7 +132,7 @@ bool store_object_similar(ItemEntity *o_ptr, ItemEntity *j_ptr)
         return false;
     }
 
-    if (o_ptr->k_idx != j_ptr->k_idx) {
+    if (o_ptr->bi_id != j_ptr->bi_id) {
         return false;
     }
 
@@ -212,7 +212,7 @@ bool store_object_similar(ItemEntity *o_ptr, ItemEntity *j_ptr)
  */
 static void store_object_absorb(ItemEntity *o_ptr, ItemEntity *j_ptr)
 {
-    int max_num = (o_ptr->tval == ItemKindType::ROD) ? std::min(99, MAX_SHORT / baseitems_info[o_ptr->k_idx].pval) : 99;
+    int max_num = (o_ptr->tval == ItemKindType::ROD) ? std::min(99, MAX_SHORT / baseitems_info[o_ptr->bi_id].pval) : 99;
     int total = o_ptr->number + j_ptr->number;
     int diff = (total > max_num) ? total - max_num : 0;
     o_ptr->number = (total > max_num) ? max_num : total;

diff --git a/src/store/store.cpp b/src/store/store.cpp
index ed4450b..effdbd6 100644 (file)
--- a/src/store/store.cpp
+++ b/src/store/store.cpp
@@ -324,26 +324,26 @@ static void store_create(PlayerType *player_ptr, short fix_k_idx, StoreSaleType
     const owner_type *ow_ptr = &owners.at(store_num)[st_ptr->owner];
 
     for (int tries = 0; tries < 4; tries++) {
-        short k_idx;
+        short bi_id;
         DEPTH level;
         if (store_num == StoreSaleType::BLACK) {
             level = 25 + randint0(25);
-            k_idx = get_obj_index(player_ptr, level, 0x00000000);
-            if (k_idx == 0) {
+            bi_id = get_obj_index(player_ptr, level, 0x00000000);
+            if (bi_id == 0) {
                 continue;
             }
         } else if (fix_k_idx > 0) {
-            k_idx = fix_k_idx;
+            bi_id = fix_k_idx;
             level = rand_range(1, ow_ptr->level);
         } else {
-            k_idx = st_ptr->table[randint0(st_ptr->table.size())];
+            bi_id = st_ptr->table[randint0(st_ptr->table.size())];
             level = rand_range(1, ow_ptr->level);
         }
 
         ItemEntity forge;
         ItemEntity *q_ptr;
         q_ptr = &forge;
-        q_ptr->prep(k_idx);
+        q_ptr->prep(bi_id);
         ItemMagicApplier(player_ptr, q_ptr, level, AM_NO_FIXED_ART).execute();
         if (!store_will_buy(player_ptr, q_ptr, store_num)) {
             continue;

diff --git a/src/system/h-type.h b/src/system/h-type.h
index 12781a6..a173e2b 100644 (file)
--- a/src/system/h-type.h
+++ b/src/system/h-type.h
@@ -79,8 +79,7 @@ typedef int16_t IDX; /*!< ゲーム中のID型を定義 */
 typedef int16_t FEAT_IDX; /*!< ゲーム中の地形ID型を定義 */
 typedef int16_t FLOOR_IDX; /*!< ゲーム中のフロアID型を定義 */
 
-// typedef int16_t MonsterRaceId; /*!< @todo MonsterRaceIdに差し替えて消滅させる ゲーム中のモンスター種族ID型を定義 */
-typedef int16_t MONSTER_IDX; /*!< @todo MonsterRaceIdに差し替えて消滅させる ゲーム中のモンスター個体ID型を定義 */
+typedef int16_t MONSTER_IDX; /*!< ゲーム中のモンスター個体ID型を定義 */
 typedef int16_t DUNGEON_IDX; /*!< ゲーム中のダンジョンID型を定義 */
 typedef int16_t EGO_IDX; /*!< アイテムエゴのID型を定義 */
 typedef int16_t QUEST_IDX; /*!< ゲーム中のクエストID型を定義 */
@@ -100,7 +99,7 @@ typedef char GAME_TEXT; /*!< ゲーム中のテキスト型定義 */
  * @var typedef int32_t MANA_POINT
  * @brief MPとその増減量の型定義
  * @details
- * MANA_POINTã\81¯ã\83\97ã\83¬ã\82¤ã\83¤ã\83¼ã\81®MPã\81®å\90\84å\9c°とその増減量の型である。
+ * MANA_POINTã\81¯ã\83\97ã\83¬ã\82¤ã\83¤ã\83¼ã\81®MPã\81®å\90\84å\80¤とその増減量の型である。
  */
 typedef int32_t MANA_POINT; /*!< ゲーム中のMP型を定義 */
 

diff --git a/src/system/item-entity.cpp b/src/system/item-entity.cpp
index 1d581fc..ec54143 100644 (file)
--- a/src/system/item-entity.cpp
+++ b/src/system/item-entity.cpp
@@ -58,17 +58,16 @@ void ItemEntity::copy_from(const ItemEntity *j_ptr)
 
 /*!
  * @brief オブジェクト構造体にベースアイテムを作成する
- * Prepare an object based on an object kind.
  * @param player_ptr プレイヤーへの参照ポインタ
- * @param k_idx 新たに作成したいベースアイテム情報のID
+ * @param bi_id 新たに作成したいベースアイテム情報のID
  */
-void ItemEntity::prep(short ko_idx)
+void ItemEntity::prep(short new_bi_id)
 {
-    auto *k_ptr = &baseitems_info[ko_idx];
+    auto *k_ptr = &baseitems_info[new_bi_id];
     auto old_stack_idx = this->stack_idx;
     wipe();
     this->stack_idx = old_stack_idx;
-    this->k_idx = ko_idx;
+    this->bi_id = new_bi_id;
     this->tval = k_ptr->bi_key.tval();
     this->sval = k_ptr->bi_key.sval().value();
     this->pval = k_ptr->pval;
@@ -84,7 +83,7 @@ void ItemEntity::prep(short ko_idx)
     if (k_ptr->act_idx > RandomArtActType::NONE) {
         this->activation_id = k_ptr->act_idx;
     }
-    if (baseitems_info[this->k_idx].cost <= 0) {
+    if (baseitems_info[this->bi_id].cost <= 0) {
         this->ident |= (IDENT_BROKEN);
     }
 
@@ -424,7 +423,7 @@ bool ItemEntity::is_nameless() const
 
 bool ItemEntity::is_valid() const
 {
-    return this->k_idx != 0;
+    return this->bi_id != 0;
 }
 
 bool ItemEntity::is_broken() const
@@ -449,7 +448,7 @@ bool ItemEntity::is_held_by_monster() const
  */
 bool ItemEntity::is_known() const
 {
-    return any_bits(this->ident, IDENT_KNOWN) || (baseitems_info[this->k_idx].easy_know && baseitems_info[this->k_idx].aware);
+    return any_bits(this->ident, IDENT_KNOWN) || (baseitems_info[this->bi_id].easy_know && baseitems_info[this->bi_id].aware);
 }
 
 bool ItemEntity::is_fully_known() const
@@ -463,7 +462,7 @@ bool ItemEntity::is_fully_known() const
  */
 bool ItemEntity::is_aware() const
 {
-    return baseitems_info[this->k_idx].aware;
+    return baseitems_info[this->bi_id].aware;
 }
 
 /*
@@ -471,7 +470,7 @@ bool ItemEntity::is_aware() const
  */
 bool ItemEntity::is_tried() const
 {
-    return baseitems_info[this->k_idx].tried;
+    return baseitems_info[this->bi_id].tried;
 }
 
 /*!
@@ -480,7 +479,7 @@ bool ItemEntity::is_tried() const
  */
 bool ItemEntity::is_potion() const
 {
-    return baseitems_info[this->k_idx].bi_key.tval() == ItemKindType::POTION;
+    return baseitems_info[this->bi_id].bi_key.tval() == ItemKindType::POTION;
 }
 
 /*!
@@ -697,13 +696,13 @@ bool ItemEntity::can_pile(const ItemEntity *j_ptr) const
  */
 TERM_COLOR ItemEntity::get_color() const
 {
-    const auto &baseitem = baseitems_info[this->k_idx];
+    const auto &baseitem = baseitems_info[this->bi_id];
     const auto flavor = baseitem.flavor;
     if (flavor != 0) {
         return baseitems_info[flavor].x_attr;
     }
 
-    auto has_attr = this->k_idx == 0;
+    auto has_attr = this->bi_id == 0;
     has_attr |= (this->tval != ItemKindType::CORPSE) || (this->sval != SV_CORPSE);
     has_attr |= baseitem.x_attr != TERM_DARK;
     if (has_attr) {
@@ -721,7 +720,7 @@ TERM_COLOR ItemEntity::get_color() const
  */
 char ItemEntity::get_symbol() const
 {
-    const auto &baseitem = baseitems_info[this->k_idx];
+    const auto &baseitem = baseitems_info[this->bi_id];
     const auto flavor = baseitem.flavor;
     return flavor ? baseitems_info[flavor].x_char : baseitem.x_char;
 }
@@ -762,7 +761,7 @@ int ItemEntity::get_price() const
 int ItemEntity::get_baseitem_price() const
 {
     if (this->is_aware()) {
-        return baseitems_info[this->k_idx].cost;
+        return baseitems_info[this->bi_id].cost;
     }
 
     switch (this->tval) {

diff --git a/src/system/item-entity.h b/src/system/item-entity.h
index 55d4538..c351aaf 100644 (file)
--- a/src/system/item-entity.h
+++ b/src/system/item-entity.h
@@ -23,7 +23,7 @@ enum class RandomArtActType : short;
 class ItemEntity {
 public:
     ItemEntity();
-    short k_idx{}; /*!< Kind index (zero if "dead") */
+    short bi_id{}; /*!< ベースアイテムID (0は、不具合調査用の無効アイテム または 何も装備していない箇所のアイテム であることを示す) */
     POSITION iy{}; /*!< Y-position on map, or zero */
     POSITION ix{}; /*!< X-position on map, or zero */
     IDX stack_idx{}; /*!< このアイテムを含むアイテムリスト内の位置(降順) */
@@ -70,7 +70,7 @@ public:
 
     void wipe();
     void copy_from(const ItemEntity *j_ptr);
-    void prep(short ko_idx);
+    void prep(short new_bi_id);
     bool is_weapon() const;
     bool is_weapon_ammo() const;
     bool is_weapon_armour_ammo() const;

diff --git a/src/system/system-variables.cpp b/src/system/system-variables.cpp
index 87c8895..2ed0cee 100644 (file)
--- a/src/system/system-variables.cpp
+++ b/src/system/system-variables.cpp
@@ -29,6 +29,6 @@ init_flags_type init_flags; //!< @todo このグローバル変数何とかし
 /*!
  * Function hook to restrict "get_obj_index_prep()" function
  */
-bool (*get_obj_index_hook)(short k_idx);
+bool (*get_obj_index_hook)(short bi_id);
 
 OBJECT_SUBTYPE_VALUE coin_type;

diff --git a/src/system/system-variables.h b/src/system/system-variables.h
index fe2a9b7..bb0399b 100644 (file)
--- a/src/system/system-variables.h
+++ b/src/system/system-variables.h
@@ -28,4 +28,4 @@ extern concptr ANGBAND_KEYBOARD;
 extern concptr ANGBAND_GRAF;
 
 extern OBJECT_SUBTYPE_VALUE coin_type;
-extern bool (*get_obj_index_hook)(short k_idx);
+extern bool (*get_obj_index_hook)(short bi_id);

diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp
index 183ab5f..8cca5cd 100644 (file)
--- a/src/util/object-sort.cpp
+++ b/src/util/object-sort.cpp
@@ -25,7 +25,7 @@
 bool object_sort_comp(PlayerType *player_ptr, ItemEntity *o_ptr, int32_t o_value, ItemEntity *j_ptr)
 {
     int o_type, j_type;
-    if (!j_ptr->k_idx) {
+    if (!j_ptr->bi_id) {
         return true;
     }
 

diff --git a/src/view/display-inventory.cpp b/src/view/display-inventory.cpp
index b2a1a5a..8f1c074 100644 (file)
--- a/src/view/display-inventory.cpp
+++ b/src/view/display-inventory.cpp
@@ -43,7 +43,7 @@ COMMAND_CODE show_inventory(PlayerType *player_ptr, int target_item, BIT_FLAGS m
     int len = wid - col - 1;
     for (i = 0; i < INVEN_PACK; i++) {
         o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
@@ -153,7 +153,7 @@ void display_inventory(PlayerType *player_ptr, const ItemTester &item_tester)
 
     for (i = 0; i < INVEN_PACK; i++) {
         auto o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
         z = i + 1;

diff --git a/src/view/display-player-middle.cpp b/src/view/display-player-middle.cpp
index aeba027..9e99c7b 100644 (file)
--- a/src/view/display-player-middle.cpp
+++ b/src/view/display-player-middle.cpp
@@ -125,7 +125,7 @@ static void display_hit_damage(PlayerType *player_ptr)
 static void display_shoot_magnification(PlayerType *player_ptr)
 {
     int tmul = 0;
-    if (player_ptr->inventory_list[INVEN_BOW].k_idx) {
+    if (player_ptr->inventory_list[INVEN_BOW].bi_id) {
         tmul = bow_tmul(player_ptr->inventory_list[INVEN_BOW].sval);
         if (player_ptr->xtra_might) {
             tmul++;

diff --git a/src/view/display-player.cpp b/src/view/display-player.cpp
index 4242931..1cb2a7b 100644 (file)
--- a/src/view/display-player.cpp
+++ b/src/view/display-player.cpp
@@ -361,7 +361,7 @@ void display_player_equippy(PlayerType *player_ptr, TERM_LEN y, TERM_LEN x, BIT_
         const auto &o_ref = player_ptr->inventory_list[i];
         auto a = o_ref.get_color();
         auto c = o_ref.get_symbol();
-        if (!equippy_chars || (o_ref.k_idx == 0)) {
+        if (!equippy_chars || (o_ref.bi_id == 0)) {
             c = ' ';
             a = TERM_DARK;
         }

diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index c6f6f4e..40c2c89 100644 (file)
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -72,11 +72,11 @@ void inven_item_describe(PlayerType *player_ptr, INVENTORY_IDX item)
  * @brief 現在アクティブになっているウィンドウにオブジェクトの詳細を表示する /
  * Hack -- display an object kind in the current window
  * @param player_ptr プレイヤーへの参照ポインタ
- * @param k_idx ベースアイテムの参照ID
+ * @param bi_id ベースアイテムの参照ID
  * @details
  * Include list of usable spells for readible books
  */
-void display_koff(PlayerType *player_ptr, short k_idx)
+void display_koff(PlayerType *player_ptr, short bi_id)
 {
     ItemEntity forge;
     ItemEntity *q_ptr;
@@ -87,12 +87,12 @@ void display_koff(PlayerType *player_ptr, short k_idx)
         term_erase(0, y, 255);
     }
 
-    if (!k_idx) {
+    if (!bi_id) {
         return;
     }
     q_ptr = &forge;
 
-    q_ptr->prep(k_idx);
+    q_ptr->prep(bi_id);
     describe_flavor(player_ptr, o_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
 
     term_putstr(0, 0, -1, TERM_WHITE, o_name);

diff --git a/src/view/object-describer.h b/src/view/object-describer.h
index 852d6e1..6c7087c 100644 (file)
--- a/src/view/object-describer.h
+++ b/src/view/object-describer.h
@@ -5,4 +5,4 @@
 class PlayerType;
 void inven_item_charges(PlayerType *player_ptr, INVENTORY_IDX item);
 void inven_item_describe(PlayerType *player_ptr, INVENTORY_IDX item);
-void display_koff(PlayerType *player_ptr, short k_idx);
+void display_koff(PlayerType *player_ptr, short bi_id);

diff --git a/src/view/status-first-page.cpp b/src/view/status-first-page.cpp
index c723a74..269f878 100644 (file)
--- a/src/view/status-first-page.cpp
+++ b/src/view/status-first-page.cpp
@@ -41,7 +41,7 @@ static TERM_COLOR likert_color = TERM_WHITE;
  */
 static void calc_shot_params(PlayerType *player_ptr, ItemEntity *o_ptr, int *shots, int *shot_frac)
 {
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         return;
     }
 
@@ -121,7 +121,7 @@ static bool calc_weapon_damage_limit(PlayerType *player_ptr, int hand, int *dama
  */
 static bool calc_weapon_one_hand(ItemEntity *o_ptr, int hand, int *damage, int *basedam)
 {
-    if (o_ptr->k_idx == 0) {
+    if (o_ptr->bi_id == 0) {
         return false;
     }
 

diff --git a/src/wizard/cmd-wizard.cpp b/src/wizard/cmd-wizard.cpp
index 2badd80..f2603a6 100644 (file)
--- a/src/wizard/cmd-wizard.cpp
+++ b/src/wizard/cmd-wizard.cpp
@@ -242,7 +242,7 @@ bool exe_cmd_debug(PlayerType *player_ptr, char cmd)
         break;
     case 'X':
         for (INVENTORY_IDX i = INVEN_TOTAL - 1; i >= 0; i--) {
-            if (player_ptr->inventory_list[i].k_idx) {
+            if (player_ptr->inventory_list[i].bi_id) {
                 drop_from_inventory(player_ptr, i, 999);
             }
         }

diff --git a/src/wizard/items-spoiler.cpp b/src/wizard/items-spoiler.cpp
index bf805f6..ea06756 100644 (file)
--- a/src/wizard/items-spoiler.cpp
+++ b/src/wizard/items-spoiler.cpp
@@ -37,7 +37,7 @@ static void kind_info(PlayerType *player_ptr, char *buf, char *dam, char *wgt, c
     q_ptr->to_a = 0;
     q_ptr->to_h = 0;
     q_ptr->to_d = 0;
-    *lev = baseitems_info[q_ptr->k_idx].level;
+    *lev = baseitems_info[q_ptr->bi_id].level;
     *val = q_ptr->get_price();
     if (!buf || !dam || !chance || !wgt) {
         return;
@@ -75,8 +75,8 @@ static void kind_info(PlayerType *player_ptr, char *buf, char *dam, char *wgt, c
     strcpy(chance, "");
     for (int i = 0; i < 4; i++) {
         char chance_aux[20] = "";
-        if (baseitems_info[q_ptr->k_idx].chance[i] > 0) {
-            sprintf(chance_aux, "%s%3dF:%+4d", (i != 0 ? "/" : ""), (int)baseitems_info[q_ptr->k_idx].locale[i], 100 / baseitems_info[q_ptr->k_idx].chance[i]);
+        if (baseitems_info[q_ptr->bi_id].chance[i] > 0) {
+            sprintf(chance_aux, "%s%3dF:%+4d", (i != 0 ? "/" : ""), (int)baseitems_info[q_ptr->bi_id].locale[i], 100 / baseitems_info[q_ptr->bi_id].chance[i]);
             strcat(chance, chance_aux);
         }
     }
@@ -127,14 +127,14 @@ SpoilerOutputResultType spoil_obj_desc(concptr fname)
         });
 
         fprintf(spoiler_file, "\n\n%s\n\n", name);
-        for (const auto &k_idx : whats) {
+        for (const auto &bi_id : whats) {
             DEPTH e;
             PRICE v;
             char wgt[80];
             char chance[80];
             char dam[80];
             PlayerType dummy;
-            kind_info(&dummy, buf, dam, wgt, chance, &e, &v, k_idx);
+            kind_info(&dummy, buf, dam, wgt, chance, &e, &v, bi_id);
             fprintf(spoiler_file, "  %-35s%8s%7s%5d %-40s%9ld\n", buf, dam, wgt, static_cast<int>(e), chance, static_cast<long>(v));
         }
     }

diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index 7593e29..723b980 100644 (file)
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -221,11 +221,11 @@ void wiz_identify_full_inventory(PlayerType *player_ptr)
 {
     for (int i = 0; i < INVEN_TOTAL; i++) {
         auto *o_ptr = &player_ptr->inventory_list[i];
-        if (!o_ptr->k_idx) {
+        if (!o_ptr->bi_id) {
             continue;
         }
 
-        auto k_ptr = &baseitems_info[o_ptr->k_idx];
+        auto k_ptr = &baseitems_info[o_ptr->bi_id];
         k_ptr->aware = true; //!< @note 記録には残さないためTRUEを立てるのみ
         set_bits(o_ptr->ident, IDENT_KNOWN | IDENT_FULL_KNOWN);
         set_bits(o_ptr->marked, OM_TOUCHED);
@@ -344,7 +344,7 @@ static void wiz_display_item(PlayerType *player_ptr, ItemEntity *o_ptr)
     prt(buf, 2, j);
 
     auto line = 4;
-    prt(format("kind = %-5d  level = %-4d  tval = %-5d  sval = %-5d", o_ptr->k_idx, baseitems_info[o_ptr->k_idx].level, o_ptr->tval, o_ptr->sval), line, j);
+    prt(format("kind = %-5d  level = %-4d  tval = %-5d  sval = %-5d", o_ptr->bi_id, baseitems_info[o_ptr->bi_id].level, o_ptr->tval, o_ptr->sval), line, j);
     prt(format("number = %-3d  wgt = %-6d  ac = %-5d    damage = %dd%d", o_ptr->number, o_ptr->weight, o_ptr->ac, o_ptr->dd, o_ptr->ds), ++line, j);
     prt(format("pval = %-5d  toac = %-5d  tohit = %-4d  todam = %-4d", o_ptr->pval, o_ptr->to_a, o_ptr->to_h, o_ptr->to_d), ++line, j);
     prt(format("fixed_artifact_idx = %-4d  ego_idx = %-4d  cost = %ld", o_ptr->fixed_artifact_idx, o_ptr->ego_idx, object_value_real(o_ptr)), ++line, j);
@@ -532,32 +532,32 @@ static void wiz_reroll_item(PlayerType *player_ptr, ItemEntity *o_ptr)
         switch (tolower(ch)) {
         /* Apply bad magic, but first clear object */
         case 'w':
-            q_ptr->prep(o_ptr->k_idx);
+            q_ptr->prep(o_ptr->bi_id);
             ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT | AM_CURSED).execute();
             break;
         /* Apply bad magic, but first clear object */
         case 'c':
-            q_ptr->prep(o_ptr->k_idx);
+            q_ptr->prep(o_ptr->bi_id);
             ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_CURSED).execute();
             break;
         /* Apply normal magic, but first clear object */
         case 'n':
-            q_ptr->prep(o_ptr->k_idx);
+            q_ptr->prep(o_ptr->bi_id);
             ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART).execute();
             break;
         /* Apply good magic, but first clear object */
         case 'g':
-            q_ptr->prep(o_ptr->k_idx);
+            q_ptr->prep(o_ptr->bi_id);
             ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD).execute();
             break;
         /* Apply great magic, but first clear object */
         case 'e':
-            q_ptr->prep(o_ptr->k_idx);
+            q_ptr->prep(o_ptr->bi_id);
             ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT).execute();
             break;
         /* Apply special magic, but first clear object */
         case 's':
-            q_ptr->prep(o_ptr->k_idx);
+            q_ptr->prep(o_ptr->bi_id);
             ItemMagicApplier(player_ptr, q_ptr, player_ptr->current_floor_ptr->dun_level, AM_GOOD | AM_GREAT | AM_SPECIAL).execute();
             if (!q_ptr->is_artifact()) {
                 become_random_artifact(player_ptr, q_ptr, false);
@@ -904,8 +904,8 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
         }
 
         if (allow_ego && k_ids.size() == 1) {
-            short k_idx = k_ids.back();
-            o_ptr->prep(k_idx);
+            short bi_id = k_ids.back();
+            o_ptr->prep(bi_id);
 
             for (const auto &[e_idx, e_ref] : egos_info) {
                 if (e_ref.idx == EgoType::NONE || e_ref.name.empty()) {
@@ -1031,8 +1031,8 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
     }
 
     if (k_ids.size() == 1) {
-        const auto k_idx = k_ids.back();
-        const auto &k_ref = baseitems_info[k_idx];
+        const auto bi_id = k_ids.back();
+        const auto &k_ref = baseitems_info[bi_id];
         auto a_idx = FixedArtifactId::NONE;
         if (k_ref.gen_flags.has(ItemGenerationTraitType::INSTA_ART)) {
             for (const auto &[a_idx_loop, a_ref_loop] : artifacts_info) {
@@ -1059,7 +1059,7 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
         if (wish_randart) {
             if (must || ok_art) {
                 do {
-                    o_ptr->prep(k_idx);
+                    o_ptr->prep(bi_id);
                     ItemMagicApplier(player_ptr, o_ptr, k_ref.level, AM_SPECIAL | AM_NO_FIXED_ART).execute();
                 } while (!o_ptr->art_name || o_ptr->is_ego() || o_ptr->is_cursed());
 
@@ -1076,14 +1076,14 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
         if (allow_ego && (wish_ego || e_ids.size() > 0)) {
             if (must || ok_ego) {
                 if (e_ids.size() > 0) {
-                    o_ptr->prep(k_idx);
+                    o_ptr->prep(bi_id);
                     o_ptr->ego_idx = e_ids[0];
                     apply_ego(o_ptr, player_ptr->current_floor_ptr->base_level);
                 } else {
                     int max_roll = 1000;
                     int i = 0;
                     for (i = 0; i < max_roll; i++) {
-                        o_ptr->prep(k_idx);
+                        o_ptr->prep(bi_id);
                         ItemMagicApplier(player_ptr, o_ptr, k_ref.level, AM_GREAT | AM_NO_FIXED_ART).execute();
                         if (o_ptr->art_name) {
                             continue;
@@ -1118,7 +1118,7 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
             res = WishResultType::EGO;
         } else {
             for (int i = 0; i < 100; i++) {
-                o_ptr->prep(k_idx);
+                o_ptr->prep(bi_id);
                 ItemMagicApplier(player_ptr, o_ptr, 0, AM_NO_FIXED_ART).execute();
                 if (!o_ptr->is_cursed()) {
                     break;

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index b00c2d7..d710513 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -200,7 +200,7 @@ static short wiz_select_sval(const ItemKindType tval, concptr tval_description)
  * @return ベースアイテムID
  * @details
  * by RAK, heavily modified by -Bernd-
- * This function returns the k_idx of an object type, or zero if failed
+ * This function returns the bi_id of an object type, or zero if failed
  * List up to 50 choices in three columns
  */
 static short wiz_create_itemtype()

diff --git a/src/world/world-object.cpp b/src/world/world-object.cpp
index 873d71f..c5c67ae 100644 (file)
--- a/src/world/world-object.cpp
+++ b/src/world/world-object.cpp
@@ -34,7 +34,7 @@ OBJECT_IDX o_pop(FloorType *floor_ptr)
     for (OBJECT_IDX i = 1; i < floor_ptr->o_max; i++) {
         ItemEntity *o_ptr;
         o_ptr = &floor_ptr->o_list[i];
-        if (o_ptr->k_idx) {
+        if (o_ptr->bi_id) {
             continue;
         }
         floor_ptr->o_cnt++;