Add new option -- show_ammo_detail / show_ammo_no_crit

[hengband/hengband.git] / src / obj_kind.c

diff --git a/src/obj_kind.c b/src/obj_kind.c
index 6312614..3beb7e3 100644 (file)
--- a/src/obj_kind.c
+++ b/src/obj_kind.c
@@ -20,7 +20,7 @@ bool object_is_shoukinkubi(object_type *o_ptr)
        if (vanilla_town) return FALSE;
 
        /* Today's wanted */
-       if (p_ptr->today_mon > 0 && o_ptr->pval == p_ptr->today_mon) return TRUE;
+       if (p_ptr->today_mon > 0 && (streq(r_name + r_info[o_ptr->pval].name, r_name + r_info[today_mon].name))) return TRUE;
 
        /* Tsuchinoko */
        if (o_ptr->pval == MON_TSUCHINOKO) return TRUE;
@@ -307,6 +307,17 @@ bool object_is_artifact(object_type *o_ptr)
 
 
 /*
+ * Check if an object is random artifact
+ */
+bool object_is_random_artifact(object_type *o_ptr)
+{
+       if (object_is_artifact(o_ptr) && !object_is_fixed_artifact(o_ptr)) return TRUE;
+
+       return FALSE;
+}
+
+
+/*
  * Check if an object is neither artifact, ego, nor 'smith' object
  */
 bool object_is_nameless(object_type *o_ptr)
@@ -317,3 +328,13 @@ bool object_is_nameless(object_type *o_ptr)
        return FALSE;
 }
 
+
+/*
+ * Check if an object is melee weapon and allows wielding with two-hands
+ */
+bool object_allow_two_hands_wielding(object_type *o_ptr)
+{
+       if (object_is_melee_weapon(o_ptr) && ((o_ptr->weight > 99) || (o_ptr->tval == TV_POLEARM))) return TRUE;
+
+       return FALSE;
+}