Changeset 590

Timestamp:

09/29/07 16:23:35 (1 year ago)

Author:

takkaria

Message:

Have a go at making object descriptions more terse, as part of #399.

Files:

• trunk/src/obj-info.c (modified) (16 diffs)

trunk/src/obj-info.c

@@ -20 +20 @@
-#include "cmds.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-
-
-
-
-
-
-
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
@@ -176 +302 @@
-
-
+
-/*
- * Describe combat advantages.
@@ -201 +328 @@
-                if (!object_known_p(o_ptr)) return FALSE;
-
-p_text_out("It can be thrown at monsters with damaging effect.  
+text_out("It can be thrown at creatures with damaging effect.\n
-                return TRUE;
-        }
@@ -224 +351 @@
-                if (adj_str_hold[p_ptr->stat_ind[A_STR]] < o_ptr->weight / 10)
-                {
-
-
+
-                        blows = 1;
-                }
-        
-p_text_out("Using this weapon, in your current condition, you are able to score
+text_out("With this weapon, you would currently get
-            text_out_c(TERM_L_GREEN, format("%d ", blows));
-            if (blows > 1)
@@ -247 +373 @@
-                xtra_dam += (dam * 2);
-
-p_text_out("Fired from your current bow
+text_out("Fired from your current missile launcher
-                text_out_c(TERM_L_GREEN, format("%d", tdis * 10));
-                text_out(" feet away, inflicting an average damage of ");
@@ -274 +400 @@
-                text_out_c(TERM_L_GREEN, "%d", dam / 10);
-
-
+
+
+
+
+
-
-        /* Add breakage chance */
-        if (ammo)
-        {
-                text_out("It has a ");
-                text_out_c(TERM_L_GREEN, "%d%%", breakage_chance(o_ptr));
-
+\n
-        }
-
@@ -289 +418 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -563 +499 @@
-        if (!desc) return FALSE;
-
-p_
+
-
-        if (f3 & TR3_ACTIVATE)
@@ -614 +550 @@
-
-
-/*
- * Describe origin of an item
- */
-static bool describe_origin(const object_type *o_ptr)
-{
-        /* Abort now if undisplayable origin */
-        if (o_ptr->origin == ORIGIN_NONE ||
-            o_ptr->origin == ORIGIN_MIXED)
-                return FALSE;
-
-        if (o_ptr->number > 1)
-                p_text_out("They were ");
-        else
-                p_text_out("It was ");
-
-        /* Display the right thing */
-        switch (o_ptr->origin)
-        {
-                case ORIGIN_BIRTH:
-                        text_out("an inheritance from your family");
-                        break;
-
-                case ORIGIN_STORE:
-                        text_out("bought in a store");
-                        break;
-
-                case ORIGIN_FLOOR:
-                        text_out("lying on the floor");
-                        break;
-
-                case ORIGIN_DROP:
-                {
-                        const char *name = r_name + r_info[o_ptr->origin_xtra].name;
-                        bool unique = (r_info[o_ptr->origin_xtra].flags1 & RF1_UNIQUE) ? TRUE : FALSE;
-
-                        text_out("dropped by ");
-
-                        if (unique)
-                                text_out("%s", name);
-                        else
-                                text_out("%s%s", is_a_vowel(name[0]) ? "an " : "a ", name);
-
-                        break;
-                }
-
-                case ORIGIN_DROP_UNKNOWN:
-                        text_out("dropped by an unknown monster");
-                        break;
-
-                case ORIGIN_ACQUIRE:
-                        text_out("conjured forth by magic");
-                        break;
-
-                case ORIGIN_CHEAT:
-                        text_out("created by a debug option");
-                        break;
-
-                case ORIGIN_CHEST:
-                        text_out("found in a chest");
-                        break;
-        }
-
-        if (o_ptr->origin_depth)
-        {
-                text_out(" at a depth of %d feet (level %d)",
-                         o_ptr->origin_depth * 50, o_ptr->origin_depth);
-        }
-
-        text_out(".  ");
-        return TRUE;
-}
-
-
-/*
@@ -701 +565 @@
-                object_flags_known(o_ptr, &f1, &f2, &f3);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (describe_activation(o_ptr, f3, full)) something = TRUE;
-
-
-
+
+
-        return something;
-}
@@ -716 +592 @@
-
-/*
-
-
-
+
- */
-void object_info_header(const object_type *o_ptr)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Display the known artifact description */
@@ -741 +664 @@
-            object_known_p(o_ptr) && a_info[o_ptr->name1].text)
-        {
+                text_out(a_text + a_info[o_ptr->name1].text);
-                text_out("\n\n");
-                text_out(a_text + a_info[o_ptr->name1].text);
-        }
-
@@ -752 +675 @@
-                if (k_info[o_ptr->k_idx].text)
-                {
-                        text_out("\n\n");
-                        text_out(k_text + k_info[o_ptr->k_idx].text);
-                        did_desc = TRUE;
@@ -761 +683 @@
-                {
-                        if (did_desc) text_out("  ");
-                        else text_out("\n\n");
-
-                        text_out(e_text + e_info[o_ptr->name2].text);
+                        text_out("\n\n");
+                }
+                else if (did_desc)
+                {
+                        text_out("\n\n");
-                }
-        }
@@ -781 +706 @@
-                o_ptr->pval)
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                text_out_c(TERM_L_GREEN, "%d", o_ptr->pval / 2);
-                text_out(" turns under normal conditions.  ");
@@ -787 +745 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        return has_info;
-}
-
-bool object_info_full(const object_type *o_ptr)
-{
-        return object_info_out(o_ptr, TRUE);
-}
-
-bool object_info_store(const object_type *o_ptr)
-{
-        bool has_info = FALSE;
-
-        has_info = object_info_out(o_ptr, TRUE);
-
-        /* Describe boring bits */
-        if ((o_ptr->tval == TV_FOOD || o_ptr->tval == TV_POTION) &&
-                o_ptr->pval)
-        {
-                p_text_out("It provides nourishment for about ");
-                text_out_c(TERM_L_GREEN, "%d", o_ptr->pval / 2);
-                text_out(" turns under normal conditions.  ");
-                has_info = TRUE;
-        }
-
-        new_paragraph = TRUE;
-        if (describe_combat(o_ptr, TRUE)) has_info = TRUE;
-
-        return has_info;
-}