Changeset 1463

Timestamp:

07/03/09 22:03:25 (8 months ago)

Author:

takkaria

Message:

Add some more object knowledge accessor functions. (Eddie Grove)

Location:

trunk/src/object

Files:

• identify.c (modified) (2 diffs)
• obj-desc.c (modified) (1 diff)
• obj-info.c (modified) (4 diffs)
• object.h (modified) (1 diff)

trunk/src/object/identify.c

@@ -23 +23 @@
 /** Time last item was wielded */
 s32b object_last_wield;
+
+
+/**
+ * Whether an object counts as "known" due to EASY_KNOW status
+ */
+/* XXX Eddie should have a different name */
+static bool easy_know(const object_type *o_ptr)
+{
+        object_kind *k_ptr = &k_info[o_ptr->k_idx];
+
+        /* XXX Eddie should I really access k_ptr->aware directly? */
+        if (k_ptr->aware && k_ptr->flags[2] & TR2_EASY_KNOW)
+                return TRUE;
+        else
+                return FALSE;
+}
 
 
@@ -126 +142 @@
 }
 
+
+bool object_activation_is_visible(const object_type *o_ptr)
+{
+        if (!obj_can_wear(o_ptr))
+        {
+                /* XXX Eddie need function _if_charges ? or maybe the activation code should use something else */
+                switch(o_ptr->tval)
+                {
+                        case TV_WAND:
+                        case TV_STAFF:
+                        case TV_ROD:
+                                break;
+                        default:
+                                return FALSE;
+                }
+
+                if (object_aware_p(o_ptr))
+                        return TRUE;
+                /* This would work now, but could fail if we add artifact rods
+                else
+                        return FALSE;
+                */
+        }
+
+        u32b f[OBJ_FLAG_N];
+        object_flags(o_ptr, f);
+
+        if ((f[2] & TR2_ACTIVATE) && (easy_know(o_ptr) || o_ptr->known_flags[2] & TR2_ACTIVATE))
+                return TRUE;
+        else
+                return FALSE;
+}
+
+bool object_effect_is_known(const object_type *o_ptr)
+{
+        if (easy_know(o_ptr) || o_ptr->ident & IDENT_EFFECT)
+                return TRUE;
+        else
+                return FALSE;
+}
+
+bool object_ego_is_visible(const object_type *o_ptr)
+{
+        if ((o_ptr->tval == TV_LITE) && (ego_item_p(o_ptr)))
+                return TRUE;
+        if (((o_ptr->ident & IDENT_KNOWN) && ego_item_p(o_ptr)) || /* XXX Eddie this should go, but necessary to use savefiles with IDENT_KNOWN before IDENT_EGO was added */
+                        ((o_ptr->ident & IDENT_STORE) && ego_item_p(o_ptr)))
+                return TRUE;
+        else
+                return FALSE;
+}
 
 bool object_attack_plusses_are_visible(const object_type *o_ptr)

trunk/src/object/obj-desc.c

@@ -398 +398 @@
                 strnfcat(buf, max, &end, " %s", a_name + a_info[o_ptr->name1].name);
 
-        else if (known && o_ptr->name2)
+        else if ((spoil && o_ptr->name2) || object_ego_is_visible(o_ptr))
                 strnfcat(buf, max, &end, " %s", e_name + e_info[o_ptr->name2].name);
 

trunk/src/object/obj-info.c

@@ -831 +831 @@
  * Describe an object's activation, if any.
  */
-static bool describe_activation(const object_type *o_ptr, u32b f3, bool full,
+static bool describe_effect(const object_type *o_ptr, u32b f3, bool full,
                 bool only_artifacts, bool subjective)
 {
@@ -837 +837 @@
         const char *desc;
 
-        int effect, base, dice, sides;
+        int effect = 0, base, dice, sides;
 
         if (o_ptr->name1)
         {
                 const artifact_type *a_ptr = &a_info[o_ptr->name1];
-                if (!object_known_p(o_ptr) && !full) return FALSE;
-
-                effect = a_ptr->effect;
-                base = a_ptr->time_base;
-                dice = a_ptr->time_dice;
-                sides = a_ptr->time_sides;
+                if (!object_activation_is_visible(o_ptr) && !full) return FALSE;
+
+                if (object_effect_is_known(o_ptr) || full)
+                {
+                        effect = a_ptr->effect;
+                        base = a_ptr->time_base;
+                        dice = a_ptr->time_dice;
+                        sides = a_ptr->time_sides;
+                }
+                else
+                {
+                        text_out("It can be activated.\n");
+                        return TRUE;
+                }
         }
         else
         {
-                if (!object_aware_p(o_ptr) && !full) return FALSE;
-
-                effect = k_ptr->effect;
-                base = k_ptr->time_base;
-                dice = k_ptr->time_dice;
-                sides = k_ptr->time_sides;
+                if (object_effect_is_known(o_ptr) || full)
+                {
+                        effect = k_ptr->effect;
+                        base = k_ptr->time_base;
+                        dice = k_ptr->time_dice;
+                        sides = k_ptr->time_sides;
+                }
+                else if (object_activation_is_visible(o_ptr))
+                {
+                        text_out("It can be activated.\n");
+                        return TRUE;
+                }
         }
 
@@ -1022 +1036 @@
 
                 /* Display an additional ego-item description */
-                if (o_ptr->name2 && object_known_p(o_ptr) && e_info[o_ptr->name2].text)
+                if (object_ego_is_visible(o_ptr) && e_info[o_ptr->name2].text)
                 {
                         if (did_desc) text_out("  ");
@@ -1070 +1084 @@
         if (something) text_out("\n");
         
-        if (describe_activation(o_ptr, f[2], full, terse, subjective))
+        if (describe_effect(o_ptr, f[2], full, terse, subjective))
         {
                 something = TRUE;

trunk/src/object/object.h

@@ -56 +56 @@
 extern s32b object_last_wield;
 
+bool object_activation_is_visible(const object_type *o_ptr);
+bool object_effect_is_known(const object_type *o_ptr);
+bool object_ego_is_visible(const object_type *o_ptr);
 bool object_attack_plusses_are_visible(const object_type *o_ptr);
 bool object_defence_plusses_are_visible(const object_type *o_ptr);
+
 void object_known(object_type *o_ptr);
 void object_aware(object_type *o_ptr);