[Refactor] #2824 BaseitemKey::is_ammo() を定義した

diff --git a/src/artifact/random-art-pval-investor.cpp b/src/artifact/random-art-pval-investor.cpp
index 1e80cdc..46be401 100644 (file)
--- a/src/artifact/random-art-pval-investor.cpp
+++ b/src/artifact/random-art-pval-investor.cpp
@@ -156,7 +156,7 @@ void random_plus(ItemEntity *o_ptr)
         return;
     }
 
-    int this_type = o_ptr->is_weapon_ammo() ? 23 : 19;
+    const auto this_type = o_ptr->is_weapon_ammo() ? 23 : 19;
     switch (randint1(this_type)) {
     case 1:
     case 2:

diff --git a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
index 551a8b5..5a0aae8 100644 (file)
--- a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
+++ b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
@@ -32,7 +32,7 @@ void AbstractWeaponEnchanter::give_killing_bonus()
     auto tohit2 = static_cast<short>(m_bonus(10, this->level));
     auto todam2 = static_cast<short>(m_bonus(10, this->level));
 
-    if ((this->o_ptr->tval == ItemKindType::BOLT) || (this->o_ptr->tval == ItemKindType::ARROW) || (this->o_ptr->tval == ItemKindType::SHOT)) {
+    if (this->o_ptr->is_ammo()) {
         tohit2 = (tohit2 + 1) / 2;
         todam2 = (todam2 + 1) / 2;
     }

diff --git a/src/object/tval-types.h b/src/object/tval-types.h
index 3ee1240..630421b 100644 (file)
--- a/src/object/tval-types.h
+++ b/src/object/tval-types.h
@@ -76,8 +76,6 @@ enum class ItemKindType : short {
 
 #define TV_EQUIP_BEGIN ItemKindType::SHOT
 #define TV_EQUIP_END ItemKindType::CARD
-#define TV_MISSILE_BEGIN ItemKindType::SHOT
-#define TV_MISSILE_END ItemKindType::BOLT
 #define TV_WEARABLE_BEGIN ItemKindType::BOW
 #define TV_WEARABLE_END ItemKindType::CARD
 #define TV_WEAPON_BEGIN ItemKindType::BOW

diff --git a/src/smith/object-smith.cpp b/src/smith/object-smith.cpp
index 0d216c7..9f30255 100644 (file)
--- a/src/smith/object-smith.cpp
+++ b/src/smith/object-smith.cpp
@@ -167,7 +167,7 @@ int Smith::get_essence_consumption(SmithEffectType effect, const ItemEntity *o_p
         return consumption;
     }
 
-    if ((o_ptr->tval >= ItemKindType::SHOT) && (o_ptr->tval <= ItemKindType::BOLT)) {
+    if (o_ptr->is_ammo()) {
         consumption = (consumption + 9) / 10;
     }
 

diff --git a/src/system/baseitem-info.cpp b/src/system/baseitem-info.cpp
index f622295..1dda277 100644 (file)
--- a/src/system/baseitem-info.cpp
+++ b/src/system/baseitem-info.cpp
@@ -126,6 +126,18 @@ bool BaseitemKey::is_melee_weapon() const
     }
 }
 
+bool BaseitemKey::is_ammo() const
+{
+    switch (this->type_value) {
+    case ItemKindType::SHOT:
+    case ItemKindType::ARROW:
+    case ItemKindType::BOLT:
+        return true;
+    default:
+        return false;
+    }
+}
+
 BaseitemInfo::BaseitemInfo()
     : bi_key(ItemKindType::NONE)
 {

diff --git a/src/system/baseitem-info.h b/src/system/baseitem-info.h
index 84ccc85..ff4404f 100644 (file)
--- a/src/system/baseitem-info.h
+++ b/src/system/baseitem-info.h
@@ -41,6 +41,7 @@ public:
     bool is_spell_book() const;
     bool is_high_level_book() const;
     bool is_melee_weapon() const;
+    bool is_ammo() const;
 
 private:
     ItemKindType type_value;

diff --git a/src/system/item-entity.cpp b/src/system/item-entity.cpp
index 9dac478..2dce046 100644 (file)
--- a/src/system/item-entity.cpp
+++ b/src/system/item-entity.cpp
@@ -117,13 +117,12 @@ bool ItemEntity::is_weapon() const
 }
 
 /*!
- * @brief アイテムが武器や矢弾として使用できるかを返す / Check if an object is weapon (including bows and ammo)
- * Rare weapons/aromors including Blade of Chaos, Dragon armors, etc.
+ * @brief アイテムが武器や矢弾として使用できるかを返す
  * @return 武器や矢弾として使えるならばtrueを返す
  */
 bool ItemEntity::is_weapon_ammo() const
 {
-    return (TV_MISSILE_BEGIN <= this->tval) && (this->tval <= TV_WEAPON_END);
+    return this->is_weapon() || this->is_ammo();
 }
 
 /*!
@@ -302,7 +301,7 @@ bool ItemEntity::allow_two_hands_wielding() const
  */
 bool ItemEntity::is_ammo() const
 {
-    return (TV_MISSILE_BEGIN <= this->tval) && (this->tval <= TV_MISSILE_END);
+    return BaseitemKey(this->tval).is_ammo();
 }
 
 /*!