From 8ff2ccfb9221c316d196b003552f241bf5e9bd50 Mon Sep 17 00:00:00 2001
From: Habu <habu1010+github@gmail.com>
Date: Sun, 16 Jun 2024 12:58:59 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20=E6=AD=BB=E4=BD=93=E3=81=A8?=
 =?utf8?q?=E9=AA=A8=E3=81=AE=E3=82=92=E8=A1=A8=E3=81=99ItemKindType?=
 =?utf8?q?=E3=81=AE=E5=88=97=E6=8C=99=E5=80=A4=E3=81=AE=E5=90=8D=E7=A7=B0?=
 =?utf8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

ソースコード上での紛らわしさを解消するため、ItemKindTypeの列挙値について
以下の改名を行う。

- SKELETON -> FLAVOR_SKELETON
- CORPSE -> MONSTER_REMAINS
---
 src/autopick/autopick-destroyer.cpp              |  4 ++--
 src/autopick/autopick-entry.cpp                  |  6 +++---
 src/autopick/autopick-matcher.cpp                |  8 ++++----
 src/birth/inventory-initializer.cpp              |  2 +-
 src/effect/effect-item.cpp                       |  2 +-
 src/flavor/named-item-describer.cpp              |  2 +-
 src/flavor/tval-description-switcher.cpp         |  4 ++--
 src/knowledge/item-group-table.cpp               |  4 ++--
 src/market/bounty.cpp                            |  6 +++---
 src/monster-attack/monster-eating.cpp            |  2 +-
 src/monster-floor/monster-death.cpp              |  2 +-
 src/monster-floor/monster-object.cpp             |  2 +-
 src/mspell/mspell-checker.cpp                    |  2 +-
 src/object-enchant/others/apply-magic-others.cpp |  2 +-
 src/object/object-broken.cpp                     |  4 ++--
 src/object/object-stack.cpp                      |  2 +-
 src/object/tval-types.h                          |  4 ++--
 src/spell/spells-object.cpp                      |  4 ++--
 src/system/baseitem-info.cpp                     | 12 ++++++------
 src/system/item-entity.cpp                       |  2 +-
 src/util/object-sort.cpp                         |  2 +-
 src/wizard/spoiler-table.cpp                     |  4 ++--
 src/wizard/tval-descriptions-table.cpp           |  4 ++--
 23 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/autopick/autopick-destroyer.cpp b/src/autopick/autopick-destroyer.cpp
index c02765369..4b28c7518 100644
--- a/src/autopick/autopick-destroyer.cpp
+++ b/src/autopick/autopick-destroyer.cpp
@@ -52,7 +52,7 @@ static bool is_leave_special_item(PlayerType *player_ptr, ItemEntity *o_ptr)
         }
     }
     if (pc.equals(PlayerClassType::ARCHER)) {
-        if ((tval == ItemKindType::SKELETON) || (bi_key == BaseitemKey(ItemKindType::CORPSE, SV_SKELETON))) {
+        if ((tval == ItemKindType::FLAVOR_SKELETON) || (bi_key == BaseitemKey(ItemKindType::MONSTER_REMAINS, SV_SKELETON))) {
             return false;
         }
     }
@@ -105,7 +105,7 @@ static bool is_opt_confirm_destroy(PlayerType *player_ptr, ItemEntity *o_ptr)
     }
 
     if (leave_corpse) {
-        if (tval == ItemKindType::CORPSE) {
+        if (tval == ItemKindType::MONSTER_REMAINS) {
             return false;
         }
     }
diff --git a/src/autopick/autopick-entry.cpp b/src/autopick/autopick-entry.cpp
index 0265a9a47..e0dc22f6c 100644
--- a/src/autopick/autopick-entry.cpp
+++ b/src/autopick/autopick-entry.cpp
@@ -434,13 +434,13 @@ void autopick_entry_from_object(PlayerType *player_ptr, autopick_type *entry, co
 
     const auto &bi_key = o_ptr->bi_key;
     const auto tval = bi_key.tval();
-    if ((tval == ItemKindType::CORPSE) || (tval == ItemKindType::STATUE)) {
+    if ((tval == ItemKindType::MONSTER_REMAINS) || (tval == ItemKindType::STATUE)) {
         if (o_ptr->get_monrace().kind_flags.has(MonsterKindType::UNIQUE)) {
             entry->add(FLG_UNIQUE);
         }
     }
 
-    if (tval == ItemKindType::CORPSE) {
+    if (tval == ItemKindType::MONSTER_REMAINS) {
         if (o_ptr->get_monrace().symbol_char_is_any_of("pht")) {
             entry->add(FLG_HUMAN);
         }
@@ -488,7 +488,7 @@ void autopick_entry_from_object(PlayerType *player_ptr, autopick_type *entry, co
         entry->add(FLG_LIGHTS);
     } else if (o_ptr->is_junk()) {
         entry->add(FLG_JUNKS);
-    } else if (tval == ItemKindType::CORPSE) {
+    } else if (tval == ItemKindType::MONSTER_REMAINS) {
         entry->add(FLG_CORPSES);
     } else if (o_ptr->is_spell_book()) {
         entry->add(FLG_SPELLBOOKS);
diff --git a/src/autopick/autopick-matcher.cpp b/src/autopick/autopick-matcher.cpp
index d6d6fc040..c47e0932f 100644
--- a/src/autopick/autopick-matcher.cpp
+++ b/src/autopick/autopick-matcher.cpp
@@ -63,7 +63,7 @@ static bool check_item_features(PlayerType *player_ptr, const autopick_type &ent
 
     if (entry.has(FLG_JUNKS)) {
         switch (tval) {
-        case ItemKindType::SKELETON:
+        case ItemKindType::FLAVOR_SKELETON:
         case ItemKindType::BOTTLE:
         case ItemKindType::JUNK:
         case ItemKindType::STATUE:
@@ -74,7 +74,7 @@ static bool check_item_features(PlayerType *player_ptr, const autopick_type &ent
     }
 
     if (entry.has(FLG_CORPSES)) {
-        return (tval == ItemKindType::CORPSE) || (tval == ItemKindType::SKELETON);
+        return (tval == ItemKindType::MONSTER_REMAINS) || (tval == ItemKindType::FLAVOR_SKELETON);
     }
 
     if (entry.has(FLG_SPELLBOOKS)) {
@@ -297,14 +297,14 @@ bool is_autopick_match(PlayerType *player_ptr, const ItemEntity *o_ptr, const au
     const auto sval = *bi_key.sval();
     if (entry.has(FLG_UNIQUE) && o_ptr->has_monrace()) {
         const auto &monrace = o_ptr->get_monrace();
-        if (((tval != ItemKindType::CORPSE && tval != ItemKindType::STATUE) || monrace.kind_flags.has_not(MonsterKindType::UNIQUE))) {
+        if (((tval != ItemKindType::MONSTER_REMAINS && tval != ItemKindType::STATUE) || monrace.kind_flags.has_not(MonsterKindType::UNIQUE))) {
             return false;
         }
     }
 
     if (entry.has(FLG_HUMAN) && o_ptr->has_monrace()) {
         const auto &monrace = o_ptr->get_monrace();
-        if (tval != ItemKindType::CORPSE || !monrace.symbol_char_is_any_of("pht")) {
+        if (tval != ItemKindType::MONSTER_REMAINS || !monrace.symbol_char_is_any_of("pht")) {
             return false;
         }
     }
diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp
index 34763ffa1..dc376cbea 100644
--- a/src/birth/inventory-initializer.cpp
+++ b/src/birth/inventory-initializer.cpp
@@ -102,7 +102,7 @@ static void decide_initial_items(PlayerType *player_ptr)
         /* Demon can drain vitality from humanoid corpse */
         get_mon_num_prep(player_ptr, monster_hook_human, nullptr);
         for (int i = rand_range(3, 4); i > 0; i--) {
-            ItemEntity item({ ItemKindType::CORPSE, SV_CORPSE });
+            ItemEntity item({ ItemKindType::MONSTER_REMAINS, SV_CORPSE });
             item.pval = enum2i(get_mon_num(player_ptr, 0, 2, PM_NONE));
             if (item.pval) {
                 item.number = 1;
diff --git a/src/effect/effect-item.cpp b/src/effect/effect-item.cpp
index 5248c0306..cad2d58fa 100644
--- a/src/effect/effect-item.cpp
+++ b/src/effect/effect-item.cpp
@@ -224,7 +224,7 @@ bool affect_item(PlayerType *player_ptr, MONSTER_IDX src_idx, POSITION r, POSITI
             break;
         }
         case AttributeType::ANIM_DEAD: {
-            if (o_ptr->bi_key.tval() != ItemKindType::CORPSE) {
+            if (o_ptr->bi_key.tval() != ItemKindType::MONSTER_REMAINS) {
                 break;
             }
 
diff --git a/src/flavor/named-item-describer.cpp b/src/flavor/named-item-describer.cpp
index 131f61b0d..fd050f95d 100644
--- a/src/flavor/named-item-describer.cpp
+++ b/src/flavor/named-item-describer.cpp
@@ -249,7 +249,7 @@ static std::string describe_item_count_or_article_en(const ItemEntity &item, con
     }
 
     auto is_unique_item = opt.known && item.is_fixed_or_random_artifact();
-    is_unique_item |= (item.bi_key.tval() == ItemKindType::CORPSE) && item.get_monrace().kind_flags.has(MonsterKindType::UNIQUE);
+    is_unique_item |= (item.bi_key.tval() == ItemKindType::MONSTER_REMAINS) && item.get_monrace().kind_flags.has(MonsterKindType::UNIQUE);
     if (is_unique_item) {
         return "The ";
     }
diff --git a/src/flavor/tval-description-switcher.cpp b/src/flavor/tval-description-switcher.cpp
index 798faf8e7..7e3abef6e 100644
--- a/src/flavor/tval-description-switcher.cpp
+++ b/src/flavor/tval-description-switcher.cpp
@@ -359,7 +359,7 @@ std::pair<std::string, std::string> switch_tval_description(const ItemEntity &it
     switch (item.bi_key.tval()) {
     case ItemKindType::NONE:
         return { _("(なし)", "(Nothing)"), "" };
-    case ItemKindType::SKELETON:
+    case ItemKindType::FLAVOR_SKELETON:
     case ItemKindType::BOTTLE:
     case ItemKindType::JUNK:
     case ItemKindType::SPIKE:
@@ -372,7 +372,7 @@ std::pair<std::string, std::string> switch_tval_description(const ItemEntity &it
     case ItemKindType::FIGURINE:
     case ItemKindType::STATUE:
         return describe_statue(item);
-    case ItemKindType::CORPSE:
+    case ItemKindType::MONSTER_REMAINS:
         return describe_corpse(item);
     case ItemKindType::SHOT:
     case ItemKindType::BOLT:
diff --git a/src/knowledge/item-group-table.cpp b/src/knowledge/item-group-table.cpp
index dc9593a9f..8f44bcc46 100644
--- a/src/knowledge/item-group-table.cpp
+++ b/src/knowledge/item-group-table.cpp
@@ -44,8 +44,8 @@ const std::vector<ItemKindType> ITEM_KINDS_GROUP = {
     ItemKindType::STATUE,
     ItemKindType::JUNK,
     ItemKindType::BOTTLE,
-    ItemKindType::SKELETON,
-    ItemKindType::CORPSE,
+    ItemKindType::FLAVOR_SKELETON,
+    ItemKindType::MONSTER_REMAINS,
     ItemKindType::SWORD,
     ItemKindType::HAFTED,
     ItemKindType::POLEARM,
diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp
index 73456012c..c6f698a23 100644
--- a/src/market/bounty.cpp
+++ b/src/market/bounty.cpp
@@ -94,7 +94,7 @@ bool exchange_cash(PlayerType *player_ptr)
 
     for (INVENTORY_IDX i = 0; i < INVEN_PACK; i++) {
         const auto &item = player_ptr->inventory_list[i];
-        if (item.bi_key != BaseitemKey(ItemKindType::CORPSE, SV_SKELETON)) {
+        if (item.bi_key != BaseitemKey(ItemKindType::MONSTER_REMAINS, SV_SKELETON)) {
             continue;
         }
 
@@ -138,7 +138,7 @@ bool exchange_cash(PlayerType *player_ptr)
     for (INVENTORY_IDX i = 0; i < INVEN_PACK; i++) {
         const auto &item = player_ptr->inventory_list[i];
         const auto &monrace = w_ptr->get_today_bounty();
-        if ((item.bi_key != BaseitemKey(ItemKindType::CORPSE, SV_SKELETON)) || (item.get_monrace().name != monrace.name)) {
+        if ((item.bi_key != BaseitemKey(ItemKindType::MONSTER_REMAINS, SV_SKELETON)) || (item.get_monrace().name != monrace.name)) {
             continue;
         }
 
@@ -162,7 +162,7 @@ bool exchange_cash(PlayerType *player_ptr)
 
         for (INVENTORY_IDX i = INVEN_PACK - 1; i >= 0; i--) {
             auto &item = player_ptr->inventory_list[i];
-            if ((item.bi_key.tval() != ItemKindType::CORPSE) || (item.get_monrace().idx != monrace_id)) {
+            if ((item.bi_key.tval() != ItemKindType::MONSTER_REMAINS) || (item.get_monrace().idx != monrace_id)) {
                 continue;
             }
 
diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index c3a2aa539..21000a002 100644
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -176,7 +176,7 @@ void process_eat_food(PlayerType *player_ptr, MonsterAttackPlayer *monap_ptr)
         }
 
         const auto tval = monap_ptr->o_ptr->bi_key.tval();
-        if ((tval != ItemKindType::FOOD) && !((tval == ItemKindType::CORPSE) && (monap_ptr->o_ptr->bi_key.sval() != 0))) {
+        if ((tval != ItemKindType::FOOD) && !((tval == ItemKindType::MONSTER_REMAINS) && (monap_ptr->o_ptr->bi_key.sval() != 0))) {
             continue;
         }
 
diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index 50aad1216..ce23be2dd 100644
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -136,7 +136,7 @@ static void drop_corpse(PlayerType *player_ptr, MonsterDeath *md_ptr)
         }
     }
 
-    ItemEntity item({ ItemKindType::CORPSE, (corpse ? SV_CORPSE : SV_SKELETON) });
+    ItemEntity item({ ItemKindType::MONSTER_REMAINS, (corpse ? SV_CORPSE : SV_SKELETON) });
     ItemMagicApplier(player_ptr, &item, floor_ptr->object_level, AM_NO_FIXED_ART).execute();
     item.pval = enum2i(md_ptr->m_ptr->r_idx);
     (void)drop_near(player_ptr, &item, -1, md_ptr->md_y, md_ptr->md_x);
diff --git a/src/monster-floor/monster-object.cpp b/src/monster-floor/monster-object.cpp
index fc17ee8d8..99d5899b6 100644
--- a/src/monster-floor/monster-object.cpp
+++ b/src/monster-floor/monster-object.cpp
@@ -191,7 +191,7 @@ void update_object_by_monster_movement(PlayerType *player_ptr, turn_flags *turn_
 
         if (turn_flags_ptr->do_take) {
             const auto tval = o_ptr->bi_key.tval();
-            if (tval == ItemKindType::GOLD || (tval == ItemKindType::CORPSE) || (tval == ItemKindType::STATUE)) {
+            if (tval == ItemKindType::GOLD || (tval == ItemKindType::MONSTER_REMAINS) || (tval == ItemKindType::STATUE)) {
                 continue;
             }
         }
diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp
index 66c9ca115..905dd6980 100644
--- a/src/mspell/mspell-checker.cpp
+++ b/src/mspell/mspell-checker.cpp
@@ -117,7 +117,7 @@ bool raise_possible(PlayerType *player_ptr, MonsterEntity *m_ptr)
             g_ptr = &floor_ptr->grid_array[yy][xx];
             for (const auto this_o_idx : g_ptr->o_idx_list) {
                 const auto &item = floor_ptr->o_list[this_o_idx];
-                if (item.bi_key.tval() == ItemKindType::CORPSE) {
+                if (item.bi_key.tval() == ItemKindType::MONSTER_REMAINS) {
                     const auto &monrace = item.get_monrace();
                     if (!monster_has_hostile_align(player_ptr, m_ptr, 0, 0, &monrace)) {
                         return true;
diff --git a/src/object-enchant/others/apply-magic-others.cpp b/src/object-enchant/others/apply-magic-others.cpp
index 3cf5b5830..d658b187d 100644
--- a/src/object-enchant/others/apply-magic-others.cpp
+++ b/src/object-enchant/others/apply-magic-others.cpp
@@ -70,7 +70,7 @@ void OtherItemsEnchanter::apply_magic()
     case ItemKindType::FIGURINE:
         this->generate_figurine();
         break;
-    case ItemKindType::CORPSE:
+    case ItemKindType::MONSTER_REMAINS:
         this->generate_corpse();
         break;
     case ItemKindType::STATUE:
diff --git a/src/object/object-broken.cpp b/src/object/object-broken.cpp
index 8486b8e92..903df43dd 100644
--- a/src/object/object-broken.cpp
+++ b/src/object/object-broken.cpp
@@ -71,7 +71,7 @@ bool BreakerAcid::hates(ItemEntity *o_ptr) const
     case ItemKindType::STAFF:
     case ItemKindType::SCROLL:
     case ItemKindType::CHEST:
-    case ItemKindType::SKELETON:
+    case ItemKindType::FLAVOR_SKELETON:
     case ItemKindType::BOTTLE:
     case ItemKindType::JUNK:
         return true;
@@ -388,7 +388,7 @@ PERCENTAGE breakage_chance(PlayerType *player_ptr, ItemEntity *o_ptr, bool has_a
         /* Often break */
     case ItemKindType::LITE:
     case ItemKindType::SCROLL:
-    case ItemKindType::SKELETON:
+    case ItemKindType::FLAVOR_SKELETON:
         return 50;
 
         /* Sometimes break */
diff --git a/src/object/object-stack.cpp b/src/object/object-stack.cpp
index 72cc8ded4..0f0a3c4c0 100644
--- a/src/object/object-stack.cpp
+++ b/src/object/object-stack.cpp
@@ -101,7 +101,7 @@ int object_similar_part(const ItemEntity *o_ptr, const ItemEntity *j_ptr)
         break;
     }
     case ItemKindType::FIGURINE:
-    case ItemKindType::CORPSE:
+    case ItemKindType::MONSTER_REMAINS:
         if (o_ptr->pval != j_ptr->pval) {
             return 0;
         }
diff --git a/src/object/tval-types.h b/src/object/tval-types.h
index 4682ac97e..9d0d4368f 100644
--- a/src/object/tval-types.h
+++ b/src/object/tval-types.h
@@ -18,7 +18,7 @@
 
 enum class ItemKindType : short {
     NONE = 0,
-    SKELETON = 1, /* Skeletons ('s'), not specified */
+    FLAVOR_SKELETON = 1, /* Skeletons ('~'), not specified */
     BOTTLE = 2, /* Empty bottles ('!') */
     JUNK = 3, /* Sticks, Pottery, etc ('~') */
     WHISTLE = 4, /* Whistle ('~') */
@@ -26,7 +26,7 @@ enum class ItemKindType : short {
     CHEST = 7, /* Chests ('&') */
     FIGURINE = 8, /* Magical figurines */
     STATUE = 9, /* Statue, what a silly object... */
-    CORPSE = 10, /* Corpses and Skeletons, specific */
+    MONSTER_REMAINS = 10, /* Corpses and Skeletons of the specific monster */
     CAPTURE = 11, /* Monster ball */
     NO_AMMO = 15, /* Ammo for crimson */
     SHOT = 16, /* Ammo for slings */
diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp
index febb023f7..75f94a80e 100644
--- a/src/spell/spells-object.cpp
+++ b/src/spell/spells-object.cpp
@@ -82,8 +82,8 @@ static const std::array<AmuseDefinition, 13> amuse_info = { {
     { BaseitemKey{ ItemKindType::JUNK }, 3, AmusementFlagType::MULTIPLE },
     { BaseitemKey{ ItemKindType::SPIKE }, 10, AmusementFlagType::PILE },
     { BaseitemKey{ ItemKindType::STATUE }, 15, AmusementFlagType::NOTHING },
-    { BaseitemKey{ ItemKindType::CORPSE }, 15, AmusementFlagType::NO_UNIQUE },
-    { BaseitemKey{ ItemKindType::SKELETON }, 10, AmusementFlagType::NO_UNIQUE },
+    { BaseitemKey{ ItemKindType::MONSTER_REMAINS }, 15, AmusementFlagType::NO_UNIQUE },
+    { BaseitemKey{ ItemKindType::FLAVOR_SKELETON }, 10, AmusementFlagType::NO_UNIQUE },
     { BaseitemKey{ ItemKindType::FIGURINE }, 10, AmusementFlagType::NO_UNIQUE },
     { BaseitemKey{ ItemKindType::PARCHMENT }, 1, AmusementFlagType::NOTHING },
     { FixedArtifactId::TAIKOBO, 3, AmusementFlagType::NOTHING },
diff --git a/src/system/baseitem-info.cpp b/src/system/baseitem-info.cpp
index 3fbeb7f4e..0d286af3b 100644
--- a/src/system/baseitem-info.cpp
+++ b/src/system/baseitem-info.cpp
@@ -486,7 +486,7 @@ bool BaseitemKey::is_lite_requiring_fuel() const
 bool BaseitemKey::is_junk() const
 {
     switch (this->type_value) {
-    case ItemKindType::SKELETON:
+    case ItemKindType::FLAVOR_SKELETON:
     case ItemKindType::BOTTLE:
     case ItemKindType::JUNK:
     case ItemKindType::STATUE:
@@ -530,8 +530,8 @@ bool BaseitemKey::should_refuse_enchant() const
 
 bool BaseitemKey::is_convertible() const
 {
-    auto is_convertible = this->is(ItemKindType::JUNK) || this->is(ItemKindType::SKELETON);
-    is_convertible |= *this == BaseitemKey(ItemKindType::CORPSE, SV_SKELETON);
+    auto is_convertible = this->is(ItemKindType::JUNK) || this->is(ItemKindType::FLAVOR_SKELETON);
+    is_convertible |= *this == BaseitemKey(ItemKindType::MONSTER_REMAINS, SV_SKELETON);
     return is_convertible;
 }
 
@@ -559,7 +559,7 @@ bool BaseitemKey::is_readable() const
 
 bool BaseitemKey::is_corpse() const
 {
-    return *this == BaseitemKey(ItemKindType::CORPSE, SV_CORPSE);
+    return *this == BaseitemKey(ItemKindType::MONSTER_REMAINS, SV_CORPSE);
 }
 
 bool BaseitemKey::is_monster() const
@@ -567,7 +567,7 @@ bool BaseitemKey::is_monster() const
     switch (this->type_value) {
     case ItemKindType::FIGURINE:
     case ItemKindType::STATUE:
-    case ItemKindType::CORPSE:
+    case ItemKindType::MONSTER_REMAINS:
     case ItemKindType::CAPTURE:
         return true;
     default:
@@ -685,7 +685,7 @@ void BaseitemInfo::decide_easy_know()
     case ItemKindType::FLASK:
     case ItemKindType::JUNK:
     case ItemKindType::BOTTLE:
-    case ItemKindType::SKELETON:
+    case ItemKindType::FLAVOR_SKELETON:
     case ItemKindType::SPIKE:
     case ItemKindType::WHISTLE:
     case ItemKindType::FOOD:
diff --git a/src/system/item-entity.cpp b/src/system/item-entity.cpp
index 3bfcb5238..52dfb9209 100644
--- a/src/system/item-entity.cpp
+++ b/src/system/item-entity.cpp
@@ -779,7 +779,7 @@ bool ItemEntity::has_bias() const
 
 bool ItemEntity::is_bounty() const
 {
-    if (this->bi_key.tval() != ItemKindType::CORPSE) {
+    if (this->bi_key.tval() != ItemKindType::MONSTER_REMAINS) {
         return false;
     }
 
diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp
index c1aa3b288..4626c3b19 100644
--- a/src/util/object-sort.cpp
+++ b/src/util/object-sort.cpp
@@ -109,7 +109,7 @@ bool object_sort_comp(PlayerType *player_ptr, ItemEntity *o_ptr, int32_t o_value
     switch (o_tval) {
     case ItemKindType::FIGURINE:
     case ItemKindType::STATUE:
-    case ItemKindType::CORPSE:
+    case ItemKindType::MONSTER_REMAINS:
     case ItemKindType::CAPTURE: {
         const auto &monrace1 = o_ptr->get_monrace();
         const auto &monrace2 = j_ptr->get_monrace();
diff --git a/src/wizard/spoiler-table.cpp b/src/wizard/spoiler-table.cpp
index 7fcbbea43..047c5ff4f 100644
--- a/src/wizard/spoiler-table.cpp
+++ b/src/wizard/spoiler-table.cpp
@@ -40,9 +40,9 @@ const std::vector<grouper> group_item_list = {
 
     { { ItemKindType::FIGURINE }, _("人形", "Magical Figurines") },
     { { ItemKindType::STATUE }, _("像", "Statues") },
-    { { ItemKindType::CORPSE }, _("死体", "Corpses") },
+    { { ItemKindType::MONSTER_REMAINS }, _("死体", "Corpses") },
 
-    { { ItemKindType::SKELETON, ItemKindType::BOTTLE, ItemKindType::JUNK, ItemKindType::SPIKE, ItemKindType::FLASK, ItemKindType::PARCHMENT }, _("その他", "Misc") },
+    { { ItemKindType::FLAVOR_SKELETON, ItemKindType::BOTTLE, ItemKindType::JUNK, ItemKindType::SPIKE, ItemKindType::FLASK, ItemKindType::PARCHMENT }, _("その他", "Misc") },
 };
 
 /* The artifacts categorized by type */
diff --git a/src/wizard/tval-descriptions-table.cpp b/src/wizard/tval-descriptions-table.cpp
index 304dda269..6004a8401 100644
--- a/src/wizard/tval-descriptions-table.cpp
+++ b/src/wizard/tval-descriptions-table.cpp
@@ -51,9 +51,9 @@ const std::vector<tval_desc> tval_desc_list = {
     { ItemKindType::CARD, _("エクスプレスカード", "Express Card") },
     { ItemKindType::FIGURINE, _("人形", "Magical Figurine") },
     { ItemKindType::STATUE, _("像", "Statue") },
-    { ItemKindType::CORPSE, _("死体", "Corpse") },
+    { ItemKindType::MONSTER_REMAINS, _("死体", "Corpse") },
     { ItemKindType::FOOD, _("食料", "Food") },
     { ItemKindType::FLASK, _("油つぼ", "Flask") },
     { ItemKindType::JUNK, _("がらくた", "Junk") },
-    { ItemKindType::SKELETON, _("骨", "Skeleton") },
+    { ItemKindType::FLAVOR_SKELETON, _("骨", "Skeleton") },
 };
-- 
2.11.0