OSDN Git Service

update description of reflection
[hengband/hengband.git] / src / object1.c
index cfaf5dc..e117ece 100644 (file)
@@ -1,18 +1,18 @@
 /* File: object1.c */
 
-/* Purpose: Object code, part 1 */
-
 /*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
  *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies.  Other copyrights may also apply.
  */
 
+/* Purpose: Object code, part 1 */
+
 #include "angband.h"
 
-#ifdef MACINTOSH
+#if defined(MACINTOSH) || defined(MACH_O_CARBON)
 #ifdef verify
 #undef verify
 #endif
@@ -33,7 +33,7 @@
  */
 void reset_visuals(void)
 {
-       int i;
+       int i, j;
 
        /* Extract some info about terrain features */
        for (i = 0; i < max_f_idx; i++)
@@ -41,8 +41,11 @@ void reset_visuals(void)
                feature_type *f_ptr = &f_info[i];
 
                /* Assume we will use the underlying values */
-               f_ptr->x_attr = f_ptr->d_attr;
-               f_ptr->x_char = f_ptr->d_char;
+               for (j = 0; j < F_LIT_MAX; j++)
+               {
+                       f_ptr->x_attr[j] = f_ptr->d_attr[j];
+                       f_ptr->x_char[j] = f_ptr->d_char[j];
+               }
        }
 
        /* Extract default attr/char code for objects */
@@ -99,105 +102,104 @@ void reset_visuals(void)
 /*
  * Obtain the "flags" for an item
  */
-void object_flags(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
+void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
 {
        object_kind *k_ptr = &k_info[o_ptr->k_idx];
+       int i;
 
        /* Base object */
-       (*f1) = k_ptr->flags1;
-       (*f2) = k_ptr->flags2;
-       (*f3) = k_ptr->flags3;
+       for (i = 0; i < TR_FLAG_SIZE; i++)
+               flgs[i] = k_ptr->flags[i];
 
        /* Artifact */
-       if (o_ptr->name1)
+       if (object_is_fixed_artifact(o_ptr))
        {
                artifact_type *a_ptr = &a_info[o_ptr->name1];
 
-               (*f1) = a_ptr->flags1;
-               (*f2) = a_ptr->flags2;
-               (*f3) = a_ptr->flags3;
+               for (i = 0; i < TR_FLAG_SIZE; i++)
+                       flgs[i] = a_ptr->flags[i];
        }
 
        /* Ego-item */
-       if (o_ptr->name2)
+       if (object_is_ego(o_ptr))
        {
                ego_item_type *e_ptr = &e_info[o_ptr->name2];
 
-               (*f1) |= e_ptr->flags1;
-               (*f2) |= e_ptr->flags2;
-               (*f3) |= e_ptr->flags3;
+               for (i = 0; i < TR_FLAG_SIZE; i++)
+                       flgs[i] |= e_ptr->flags[i];
 
                if ((o_ptr->name2 == EGO_LITE_AURA_FIRE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
                {
-                       (*f3) &= ~(TR3_SH_FIRE);
+                       remove_flag(flgs, TR_SH_FIRE);
                }
                else if ((o_ptr->name2 == EGO_LITE_INFRA) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
                {
-                       (*f1) &= ~(TR1_INFRA);
+                       remove_flag(flgs, TR_INFRA);
                }
                else if ((o_ptr->name2 == EGO_LITE_EYE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
                {
-                       (*f2) &= ~(TR2_RES_BLIND);
-                       (*f3) &= ~(TR3_SEE_INVIS);
+                       remove_flag(flgs, TR_RES_BLIND);
+                       remove_flag(flgs, TR_SEE_INVIS);
                }
        }
 
        /* Random artifact ! */
-       if (o_ptr->art_flags1 || o_ptr->art_flags2 || o_ptr->art_flags3)
-       {
-               (*f1) |= o_ptr->art_flags1;
-               (*f2) |= o_ptr->art_flags2;
-               (*f3) |= o_ptr->art_flags3;
-       }
+       for (i = 0; i < TR_FLAG_SIZE; i++)
+               flgs[i] |= o_ptr->art_flags[i];
 
-       if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
+       if (object_is_smith(o_ptr))
        {
-               if (o_ptr->xtra3 < 33)
-               {
-                       (*f1) |= (0x00000001 << (o_ptr->xtra3-1));
-               }
-               else if (o_ptr->xtra3 < 65)
+               int add = o_ptr->xtra3 - 1;
+
+               if (add < TR_FLAG_MAX)
                {
-                       (*f2) |= (0x00000001 << (o_ptr->xtra3-33));
+                       add_flag(flgs, add);
                }
-               else if (o_ptr->xtra3 < 97)
+               else if (add == ESSENCE_TMP_RES_ACID)
                {
-                       (*f3) |= (0x00000001 << (o_ptr->xtra3-65));
+                       add_flag(flgs, TR_RES_ACID);
+                       add_flag(flgs, TR_ACTIVATE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID)
+               else if (add == ESSENCE_TMP_RES_ELEC)
                {
-                       (*f2) |= TR2_RES_ACID;
+                       add_flag(flgs, TR_RES_ELEC);
+                       add_flag(flgs, TR_ACTIVATE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_ELEC)
+               else if (add == ESSENCE_TMP_RES_FIRE)
                {
-                       (*f2) |= TR2_RES_ELEC;
+                       add_flag(flgs, TR_RES_FIRE);
+                       add_flag(flgs, TR_ACTIVATE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_FIRE)
+               else if (add == ESSENCE_TMP_RES_COLD)
                {
-                       (*f2) |= TR2_RES_FIRE;
+                       add_flag(flgs, TR_RES_COLD);
+                       add_flag(flgs, TR_ACTIVATE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_COLD)
+               else if (add == ESSENCE_SH_FIRE)
                {
-                       (*f2) |= TR2_RES_COLD;
+                       add_flag(flgs, TR_RES_FIRE);
+                       add_flag(flgs, TR_SH_FIRE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_SH_FIRE)
+               else if (add == ESSENCE_SH_ELEC)
                {
-                       (*f2) |= TR2_RES_FIRE;
-                       (*f3) |= TR3_SH_FIRE;
+                       add_flag(flgs, TR_RES_ELEC);
+                       add_flag(flgs, TR_SH_ELEC);
                }
-               else if (o_ptr->xtra3 == ESSENCE_SH_ELEC)
+               else if (add == ESSENCE_SH_COLD)
                {
-                       (*f2) |= TR2_RES_ELEC;
-                       (*f3) |= TR3_SH_ELEC;
+                       add_flag(flgs, TR_RES_COLD);
+                       add_flag(flgs, TR_SH_COLD);
                }
-               else if (o_ptr->xtra3 == ESSENCE_SH_COLD)
+               else if (add == ESSENCE_RESISTANCE)
                {
-                       (*f2) |= TR2_RES_COLD;
-                       (*f3) |= TR3_SH_COLD;
+                       add_flag(flgs, TR_RES_ACID);
+                       add_flag(flgs, TR_RES_ELEC);
+                       add_flag(flgs, TR_RES_FIRE);
+                       add_flag(flgs, TR_RES_COLD);
                }
-               else if (o_ptr->xtra3 == ESSENCE_RESISTANCE)
+               else if (add == TR_IMPACT)
                {
-                       (*f2) |= (TR2_RES_ACID | TR2_RES_ELEC | TR2_RES_FIRE | TR2_RES_COLD);;
+                       add_flag(flgs, TR_ACTIVATE);
                }
        }
 }
@@ -207,168 +209,245 @@ void object_flags(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
 /*
  * Obtain the "flags" for an item which are known to the player
  */
-void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
+void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
 {
        bool spoil = FALSE;
+       int i;
 
        object_kind *k_ptr = &k_info[o_ptr->k_idx];
 
        /* Clear */
-       (*f1) = (*f2) = (*f3) = 0L;
+       for (i = 0; i < TR_FLAG_SIZE; i++)
+               flgs[i] = 0;
 
-       if (!object_aware_p(o_ptr)) return;
+       if (!object_is_aware(o_ptr)) return;
 
        /* Base object */
-       (*f1) = k_ptr->flags1;
-       (*f2) = k_ptr->flags2;
-       (*f3) = k_ptr->flags3;
+       for (i = 0; i < TR_FLAG_SIZE; i++)
+               flgs[i] = k_ptr->flags[i];
 
        /* Must be identified */
-       if (!object_known_p(o_ptr)) return;
+       if (!object_is_known(o_ptr)) return;
 
        /* Ego-item (known basic flags) */
-       if (o_ptr->name2)
+       if (object_is_ego(o_ptr))
        {
                ego_item_type *e_ptr = &e_info[o_ptr->name2];
 
-               (*f1) |= e_ptr->flags1;
-               (*f2) |= e_ptr->flags2;
-               (*f3) |= e_ptr->flags3;
+               for (i = 0; i < TR_FLAG_SIZE; i++)
+                       flgs[i] |= e_ptr->flags[i];
 
                if ((o_ptr->name2 == EGO_LITE_AURA_FIRE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
                {
-                       (*f3) &= ~(TR3_SH_FIRE);
+                       remove_flag(flgs, TR_SH_FIRE);
                }
                else if ((o_ptr->name2 == EGO_LITE_INFRA) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
                {
-                       (*f1) &= ~(TR1_INFRA);
+                       remove_flag(flgs, TR_INFRA);
                }
                else if ((o_ptr->name2 == EGO_LITE_EYE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
                {
-                       (*f2) &= ~(TR2_RES_BLIND);
-                       (*f3) &= ~(TR3_SEE_INVIS);
+                       remove_flag(flgs, TR_RES_BLIND);
+                       remove_flag(flgs, TR_SEE_INVIS);
                }
        }
 
 
 #ifdef SPOIL_ARTIFACTS
        /* Full knowledge for some artifacts */
-       if (artifact_p(o_ptr) || o_ptr->art_name) spoil = TRUE;
+       if (object_is_artifact(o_ptr)) spoil = TRUE;
 #endif /* SPOIL_ARTIFACTS */
 
 #ifdef SPOIL_EGO_ITEMS
        /* Full knowledge for some ego-items */
-       if (ego_item_p(o_ptr)) spoil = TRUE;
+       if (object_is_ego(o_ptr)) spoil = TRUE;
 #endif /* SPOIL_EGO_ITEMS */
 
        /* Need full knowledge or spoilers */
        if (spoil || (o_ptr->ident & IDENT_MENTAL))
        {
                /* Artifact */
-               if (o_ptr->name1)
+               if (object_is_fixed_artifact(o_ptr))
                {
                        artifact_type *a_ptr = &a_info[o_ptr->name1];
 
-                       (*f1) = a_ptr->flags1;
-                       (*f2) = a_ptr->flags2;
-                       (*f3) = a_ptr->flags3;
+                       for (i = 0; i < TR_FLAG_SIZE; i++)
+                               flgs[i] = a_ptr->flags[i];
                }
 
                /* Random artifact ! */
-               if (o_ptr->art_flags1 || o_ptr->art_flags2 || o_ptr->art_flags3)
-               {
-                       (*f1) |= o_ptr->art_flags1;
-                       (*f2) |= o_ptr->art_flags2;
-                       (*f3) |= o_ptr->art_flags3;
-               }
+               for (i = 0; i < TR_FLAG_SIZE; i++)
+                       flgs[i] |= o_ptr->art_flags[i];
        }
 
-       if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
+       if (object_is_smith(o_ptr))
        {
-               if (o_ptr->xtra3 < 33)
-               {
-                       (*f1) |= (0x00000001 << (o_ptr->xtra3-1));
-               }
-               else if (o_ptr->xtra3 < 65)
-               {
-                       (*f2) |= (0x00000001 << (o_ptr->xtra3-33));
-               }
-               else if (o_ptr->xtra3 < 97)
+               int add = o_ptr->xtra3 - 1;
+
+               if (add < TR_FLAG_MAX)
                {
-                       (*f3) |= (0x00000001 << (o_ptr->xtra3-65));
+                       add_flag(flgs, add);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID)
+               else if (add == ESSENCE_TMP_RES_ACID)
                {
-                       (*f2) |= TR2_RES_ACID;
+                       add_flag(flgs, TR_RES_ACID);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_ELEC)
+               else if (add == ESSENCE_TMP_RES_ELEC)
                {
-                       (*f2) |= TR2_RES_ELEC;
+                       add_flag(flgs, TR_RES_ELEC);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_FIRE)
+               else if (add == ESSENCE_TMP_RES_FIRE)
                {
-                       (*f2) |= TR2_RES_FIRE;
+                       add_flag(flgs, TR_RES_FIRE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_TMP_RES_COLD)
+               else if (add == ESSENCE_TMP_RES_COLD)
                {
-                       (*f2) |= TR2_RES_COLD;
+                       add_flag(flgs, TR_RES_COLD);
                }
-               else if (o_ptr->xtra3 == ESSENCE_SH_FIRE)
+               else if (add == ESSENCE_SH_FIRE)
                {
-                       (*f2) |= TR2_RES_FIRE;
-                       (*f3) |= TR3_SH_FIRE;
+                       add_flag(flgs, TR_RES_FIRE);
+                       add_flag(flgs, TR_SH_FIRE);
                }
-               else if (o_ptr->xtra3 == ESSENCE_SH_ELEC)
+               else if (add == ESSENCE_SH_ELEC)
                {
-                       (*f2) |= TR2_RES_ELEC;
-                       (*f3) |= TR3_SH_ELEC;
+                       add_flag(flgs, TR_RES_ELEC);
+                       add_flag(flgs, TR_SH_ELEC);
                }
-               else if (o_ptr->xtra3 == ESSENCE_SH_COLD)
+               else if (add == ESSENCE_SH_COLD)
                {
-                       (*f2) |= TR2_RES_COLD;
-                       (*f3) |= TR3_SH_COLD;
+                       add_flag(flgs, TR_RES_COLD);
+                       add_flag(flgs, TR_SH_COLD);
                }
-               else if (o_ptr->xtra3 == ESSENCE_RESISTANCE)
+               else if (add == ESSENCE_RESISTANCE)
                {
-                       (*f2) |= (TR2_RES_ACID | TR2_RES_ELEC | TR2_RES_FIRE | TR2_RES_COLD);;
+                       add_flag(flgs, TR_RES_ACID);
+                       add_flag(flgs, TR_RES_ELEC);
+                       add_flag(flgs, TR_RES_FIRE);
+                       add_flag(flgs, TR_RES_COLD);
                }
        }
 }
 
 
-/*
- * Hack -- describe an item currently in a store's inventory
- * This allows an item to *look* like the player is "aware" of it
- */
-void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode)
+static cptr item_activation_dragon_breath(object_type *o_ptr)
 {
-       /* Save the "aware" flag */
-       bool hack_aware = object_aware_p(o_ptr);
-
-       /* Save the "known" flag */
-       bool hack_known = (o_ptr->ident & (IDENT_KNOWN)) ? TRUE : FALSE;
+       static char desc[256];
+       u32b flgs[4]; /* for resistance flags */
+       int i, n = 0;
 
+       object_flags(o_ptr, flgs);
+       strcpy(desc, _("", "breath "));
 
-       /* Set the "known" flag */
-       o_ptr->ident |= (IDENT_KNOWN);
-
-       /* Force "aware" for description */
-       k_info[o_ptr->k_idx].aware = TRUE;
-
-
-       /* Describe the object */
-       object_desc(buf, o_ptr, pref, mode);
-
+       for (i = 0; dragonbreath_info[i].flag != 0; i++)
+       {
+               if (have_flag(flgs, dragonbreath_info[i].flag))
+               {
+                       if (n > 0) strcat(desc, _("¡¢", ", "));
+                       strcat(desc, dragonbreath_info[i].name);
+                       n++;
+               }
+       }
 
-       /* Restore "aware" flag */
-       k_info[o_ptr->k_idx].aware = hack_aware;
+       strcat(desc, _("¤Î¥Ö¥ì¥¹(250)", ""));
 
-       /* Clear the known flag */
-       if (!hack_known) o_ptr->ident &= ~(IDENT_KNOWN);
+       return (desc);
 }
 
+static cptr item_activation_aux(object_type *o_ptr)
+{
+       static char activation_detail[256];
+       cptr desc;
+       char timeout[32];
+       int constant, dice;
+       const activation_type* const act_ptr = find_activation_info(o_ptr);
+
+       if (!act_ptr) return _("̤ÄêµÁ", "something undefined");
+
+       desc = act_ptr->desc;
+
+       /* Overwrite description if it is special */
+       switch (act_ptr->index) {
+       case ACT_BR_FIRE:
+               if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES))
+                       desc = _("²Ð±ê¤Î¥Ö¥ì¥¹ (200) ¤È²Ð¤Ø¤ÎÂÑÀ­", "breath of fire (200) and resist fire");
+               break;
+       case ACT_BR_COLD:
+               if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE))
+                       desc = _("Î䵤¤Î¥Ö¥ì¥¹ (200) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ­", "breath of cold (200) and resist cold");
+               break;
+       case ACT_BR_DRAGON:
+               desc = item_activation_dragon_breath(o_ptr);
+               break;
+       case ACT_AGGRAVATE:
+               if (o_ptr->name1 == ART_HYOUSIGI)
+                       desc = _("Çï»ÒÌÚ¤òÂǤÁ¤Ê¤é¤¹", "beat wooden clappers");
+               break;
+       case ACT_RESIST_ACID:
+               if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ACID)) || (o_ptr->name2 == EGO_BRAND_ACID))
+                       desc = _("¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë (100) ¤È»À¤Ø¤ÎÂÑÀ­", "ball of acid (100) and resist acid");
+               break;
+       case ACT_RESIST_FIRE:
+               if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) || (o_ptr->name2 == EGO_BRAND_FIRE))
+                       desc = _("¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (100) ¤È²Ð¤Ø¤ÎÂÑÀ­", "ball of fire (100) and resist fire");
+               break;
+       case ACT_RESIST_COLD:
+               if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) || (o_ptr->name2 == EGO_BRAND_COLD))
+                       desc = _("¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ­", "ball of cold (100) and resist cold");
+               break;
+       case ACT_RESIST_ELEC:
+               if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ELEC)) || (o_ptr->name2 == EGO_BRAND_ELEC))
+                       desc = _("¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) ¤ÈÅÅ·â¤Ø¤ÎÂÑÀ­", "ball of elec (100) and resist elec");
+               break;
+       case ACT_RESIST_POIS:
+               if (o_ptr->name2 == EGO_BRAND_POIS)
+                       desc = _("°­½­±À (100) ¤ÈÆǤؤÎÂÑÀ­", "ball of poison (100) and resist elec");
+               break;
+       }
+
+       /* Timeout description */
+       constant = act_ptr->timeout.constant;
+       dice = act_ptr->timeout.dice;
+       if (constant == 0 && dice == 0) {
+               /* We can activate it every turn */
+               strcpy(timeout, _("¤¤¤Ä¤Ç¤â", "every turn"));
+       } else if (constant < 0) {
+               /* Activations that have special timeout */
+               switch (act_ptr->index) {
+               case ACT_BR_FIRE:
+                       sprintf(timeout, _("%d ¥¿¡¼¥óËè", "every %d turns"),
+                               ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) ? 200 : 250);
+                       break;
+               case ACT_BR_COLD:
+                       sprintf(timeout, _("%d ¥¿¡¼¥óËè", "every %d turns"),
+                               ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) ? 200 : 250);
+                       break;
+               case ACT_TERROR:
+                       strcpy(timeout, _("3*(¥ì¥Ù¥ë+10) ¥¿¡¼¥óËè", "every 3 * (level+10) turns"));
+                       break;
+               case ACT_MURAMASA:
+                       strcpy(timeout, _("³ÎΨ50%¤Ç²õ¤ì¤ë", "(destroyed 50%)"));
+                       break;
+               default:
+                       strcpy(timeout, "undefined");
+                       break;
+               }
+       } else {
+               /* Normal timeout activations */
+               char constant_str[16], dice_str[16];
+               sprintf(constant_str, "%d", constant);
+               sprintf(dice_str, "d%d", dice);
+               sprintf(timeout, _("%s%s%s ¥¿¡¼¥óËè", "every %s%s%s turns"),
+                       (constant > 0) ? constant_str : "",
+                       (constant > 0 && dice > 0) ? "+" : "",
+                       (dice > 0) ? dice_str : "");
+       }
 
+       /* Build detail activate description */
+       sprintf(activation_detail, _("%s : %s", "%s %s"), desc, timeout);
 
+       return activation_detail;
+}
 
 /*
  * Determine the "Activation" (if any) for an artifact
@@ -376,2932 +455,1189 @@ void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode)
  */
 cptr item_activation(object_type *o_ptr)
 {
-       u32b f1, f2, f3;
+       u32b flgs[TR_FLAG_SIZE];
 
        /* Extract the flags */
-       object_flags(o_ptr, &f1, &f2, &f3);
+       object_flags(o_ptr, flgs);
 
        /* Require activation ability */
 #ifdef JP
-if (!(f3 & (TR3_ACTIVATE))) return ("¤Ê¤·");
+       if (!(have_flag(flgs, TR_ACTIVATE))) return ("¤Ê¤·");
 #else
-       if (!(f3 & (TR3_ACTIVATE))) return ("nothing");
+       if (!(have_flag(flgs, TR_ACTIVATE))) return ("nothing");
 #endif
 
+       /* Get an explain of an activation */
+       if (activation_index(o_ptr))
+       {
+               return item_activation_aux(o_ptr);
+       }
 
-
-       /*
-        * We need to deduce somehow that it is a random artifact -- one
-        * problem: It could be a random artifact which has NOT YET received
-        * a name. Thus we eliminate other possibilities instead of checking
-        * for art_name
-        */
-
-       if (!(o_ptr->name1) &&
-                !(o_ptr->name2) &&
-                !(o_ptr->xtra1) &&
-                 (o_ptr->xtra2))
+       /* Special items */
+       if (o_ptr->tval == TV_WHISTLE)
        {
-               switch (o_ptr->xtra2)
-               {
-                       case ACT_SUNLIGHT:
-                       {
 #ifdef JP
-return "ÂÀÍÛ¸÷Àþ : 10 ¥¿¡¼¥óËè";
+return "¥Ú¥Ã¥È¸Æ¤Ó´ó¤» : 100+d100¥¿¡¼¥óËè";
 #else
-                               return "beam of sunlight every 10 turns";
+               return "call pet every 100+d100 turns";
 #endif
+       }
 
-                       }
-                       case ACT_BO_MISS_1:
-                       {
+       if (o_ptr->tval == TV_CAPTURE)
+       {
 #ifdef JP
-return "¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë(2d6) : 2 ¥¿¡¼¥óËè";
+return "¥â¥ó¥¹¥¿¡¼¤òÊᤨ¤ë¡¢Ëô¤Ï²òÊü¤¹¤ë¡£";
 #else
-                               return "magic missile (2d6) every 2 turns";
+               return "captures or releases a monster.";
 #endif
+       }
 
-                       }
-                       case ACT_BA_POIS_1:
-                       {
+       /* Oops */
 #ifdef JP
-return "°­½­±À (12), È¾·Â 3 , 4+d4 ¥¿¡¼¥óËè";
+       return "²¿¤âµ¯¤­¤Ê¤¤";
 #else
-                               return "stinking cloud (12), rad. 3, every 4+d4 turns";
+       return "Nothing";
 #endif
+}
 
-                       }
-                       case ACT_BO_ELEC_1:
-                       {
+
+/*
+ * Describe a "fully identified" item
+ */
+bool screen_object(object_type *o_ptr, u32b mode)
+{
+       int                     i = 0, j, k;
+
+       u32b flgs[TR_FLAG_SIZE];
+
+       char temp[70 * 20];
+       cptr            info[128];
+       char o_name[MAX_NLEN];
+       int wid, hgt;
+
+       int trivial_info = 0;
+
+       /* Extract the flags */
+       object_flags(o_ptr, flgs);
+
+       /* Extract the description */
+       {
+               roff_to_buf(o_ptr->name1 ? (a_text + a_info[o_ptr->name1].text) :
+                           (k_text + k_info[o_ptr->k_idx].text),
+                           77 - 15, temp, sizeof(temp));
+               for (j = 0; temp[j]; j += 1 + strlen(&temp[j]))
+               { info[i] = &temp[j]; i++;}
+       }
+
+       if (object_is_equipment(o_ptr))
+       {
+               /* Descriptions of a basic equipment is just a flavor */
+               trivial_info = i;
+       }
+
+       /* Mega-Hack -- describe activation */
+       if (have_flag(flgs, TR_ACTIVATE))
+       {
 #ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È(4d8) : 5+d5 ¥¿¡¼¥óËè";
+info[i++] = "»ÏÆ°¤·¤¿¤È¤­¤Î¸ú²Ì...";
 #else
-                               return "lightning bolt (4d8) every 5+d5 turns";
+               info[i++] = "It can be activated for...";
 #endif
 
-                       }
-                       case ACT_BO_ACID_1:
-                       {
+               info[i++] = item_activation(o_ptr);
 #ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È(5d8) : 6+d6 ¥¿¡¼¥óËè";
+info[i++] = "...¤¿¤À¤·ÁõÈ÷¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£";
 #else
-                               return "acid bolt (5d8) every 6+d6 turns";
+               info[i++] = "...if it is being worn.";
 #endif
 
-                       }
-                       case ACT_BO_COLD_1:
-                       {
+       }
+
+       /* Figurines, a hack */
+       if (o_ptr->tval == TV_FIGURINE)
+       {
 #ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¥ë¥È(6d8) : 7+d7 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÅꤲ¤¿»þ¥Ú¥Ã¥È¤ËÊѲ½¤¹¤ë¡£";
 #else
-                               return "frost bolt (6d8) every 7+d7 turns";
+               info[i++] = "It will transform into a pet when thrown.";
 #endif
 
-                       }
-                       case ACT_BO_FIRE_1:
-                       {
+       }
+
+       /* Figurines, a hack */
+       if (o_ptr->name1 == ART_STONEMASK)
+       {
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È(9d8) : 8+d8 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤òÁõÈ÷¤·¤¿¼Ô¤ÏµÛ·ìµ´¤Ë¤Ê¤ë¡£";
 #else
-                               return "fire bolt (9d8) every 8+d8 turns";
+               info[i++] = "It makes you turn into a vampire permanently.";
 #endif
 
-                       }
-                       case ACT_BA_COLD_1:
-                       {
+       }
+
+       if ((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_DOKUBARI))
+       {
 #ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (48) : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÁê¼ê¤ò°ì·â¤ÇÅݤ¹¤³¤È¤¬¤¢¤ë¡£";
 #else
-                               return "ball of cold (48) every 400 turns";
+               info[i++] = "It will attempt to kill a monster instantly.";
 #endif
 
-                       }
-                       case ACT_BA_FIRE_1:
-                       {
+       }
+
+       if ((o_ptr->tval == TV_POLEARM) && (o_ptr->sval == SV_DEATH_SCYTHE))
+       {
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (72) : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼«Ê¬¼«¿È¤Ë¹¶·â¤¬Ê֤äƤ¯¤ë¤³¤È¤¬¤¢¤ë¡£";
 #else
-                               return "ball of fire (72) every 400 turns";
+               info[i++] = "It causes you to strike yourself sometimes.";
 #endif
 
-                       }
-                       case ACT_DRAIN_1:
-                       {
 #ifdef JP
-return "¥Ò¥Ã¥È¥Ý¥¤¥ó¥ÈµÛ¼ý (100) : 100+d100 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï̵Ũ¤Î¥Ð¥ê¥¢¤òÀÚ¤êÎö¤¯¡£";
 #else
-                               return "drain life (100) every 100+d100 turns";
+               info[i++] = "It always penetrates invulnerability barriers.";
 #endif
+       }
 
-                       }
-                       case ACT_BA_COLD_2:
-                       {
+       if (o_ptr->name2 == EGO_2WEAPON)
+       {
 #ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) : 300 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÆóÅáή¤Ç¤ÎÌ¿ÃæΨ¤ò¸þ¾å¤µ¤»¤ë¡£";
 #else
-                               return "ball of cold (100) every 300 turns";
+               info[i++] = "It affects your ability to hit when you are wielding two weapons.";
 #endif
 
-                       }
-                       case ACT_BA_ELEC_2:
-                       {
+       }
+
+       if (have_flag(flgs, TR_EASY_SPELL))
+       {
 #ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) : 500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò²¼¤²¤ë¡£";
 #else
-                               return "ball of lightning (100) every 500 turns";
+               info[i++] = "It affects your ability to cast spells.";
 #endif
+       }
 
-                       }
-                       case ACT_DRAIN_2:
-                       {
+       if (o_ptr->name2 == EGO_AMU_FOOL)
+       {
 #ifdef JP
-return "¥Ò¥Ã¥È¥Ý¥¤¥ó¥ÈµÛ¼ý(120) : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò¾å¤²¤ë¡£";
 #else
-                               return "drain life (120) every 400 turns";
+               info[i++] = "It interferes with casting spells.";
 #endif
+       }
 
-                       }
-                       case ACT_VAMPIRE_1:
-                       {
+       if (o_ptr->name2 == EGO_RING_THROW)
+       {
 #ifdef JP
-return "µÛ·ì¥É¥ì¥¤¥ó (3*50) : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ïʪ¤ò¶¯¤¯Åꤲ¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
 #else
-                               return "vampiric drain (3*50) every 400 turns";
+               info[i++] = "It provides great strength when you throw an item.";
 #endif
+       }
 
-                       }
-                       case ACT_BO_MISS_2:
-                       {
+       if (o_ptr->name2 == EGO_AMU_NAIVETY)
+       {
 #ifdef JP
-return "Ìð (150) : 90+d90 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏËâË¡Äñ¹³ÎϤò²¼¤²¤ë¡£";
 #else
-                               return "arrows (150) every 90+d90 turns";
+               info[i++] = "It decreases your magic resistance.";
 #endif
+       }
 
-                       }
-                       case ACT_BA_FIRE_2:
-                       {
+       if (o_ptr->tval == TV_STATUE)
+       {
+               monster_race *r_ptr = &r_info[o_ptr->pval];
+
+               if (o_ptr->pval == MON_BULLGATES)
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (120) : 225+d225 ¥¿¡¼¥óËè";
+                       info[i++] = "¤½¤ì¤ÏÉô²°¤Ë¾þ¤ë¤ÈÃѤº¤«¤·¤¤¡£";
 #else
-                               return "fire ball (120) every 225+d225 turns";
+                       info[i++] = "It is shameful.";
 #endif
-
-                       }
-                       case ACT_BA_COLD_3:
-                       {
+               else if ( r_ptr->flags2 & (RF2_ELDRITCH_HORROR))
 #ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (200) : 325+d325 ¥¿¡¼¥óËè";
+                       info[i++] = "¤½¤ì¤ÏÉô²°¤Ë¾þ¤ë¤È¶²¤¤¡£";
 #else
-                               return "ball of cold (200) every 325+d325 turns";
+               info[i++] = "It is fearful.";
 #endif
-
-                       }
-                       case ACT_BA_ELEC_3:
-                       {
+               else
 #ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (250) : 425+d425 ¥¿¡¼¥óËè";
+                       info[i++] = "¤½¤ì¤ÏÉô²°¤Ë¾þ¤ë¤È³Ú¤·¤¤¡£";
 #else
-                               return "ball of lightning (250) every 425+d425 turns";
+               info[i++] = "It is cheerful.";
 #endif
-
-                       }
-                       case ACT_WHIRLWIND:
-                       {
+       }
+       
+       /* Hack -- describe lite's */
+       if (o_ptr->tval == TV_LITE)
+       {
+               if (o_ptr->name2 == EGO_LITE_DARKNESS)
+               {
 #ifdef JP
-return "¥«¥Þ¥¤¥¿¥Á : 250 ¥¿¡¼¥óËè";
+                       info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
 #else
-                               return "whirlwind attack every 250 turns";
+                       info[i++] = "It provides no light.";
 #endif
 
-                       }
-                       case ACT_VAMPIRE_2:
+                       if (o_ptr->sval == SV_LITE_FEANOR)
                        {
 #ifdef JP
-return "µÛ·ì¥É¥ì¥¤¥ó (3*100) : 400 ¥¿¡¼¥óËè";
+                               info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-3)¡£";
 #else
-                               return "vampiric drain (3*100) every 400 turns";
+                               info[i++] = "It decreases radius of light source by 3.";
 #endif
-
                        }
-                       case ACT_CALL_CHAOS:
+                       else if (o_ptr->sval == SV_LITE_LANTERN)
                        {
 #ifdef JP
-return "call chaos : 350 ¥¿¡¼¥óËè"; /*nuke me*/
+                               info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
 #else
-                               return "call chaos every 350 turns";
+                               info[i++] = "It decreases radius of light source by 2.";
 #endif
-
                        }
-                       case ACT_ROCKET:
+                       else
                        {
 #ifdef JP
-return "¥í¥±¥Ã¥È (120+level) : 400 ¥¿¡¼¥óËè";
+                               info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
 #else
-                               return "launch rocket (120+level) every 400 turns";
+                               info[i++] = "It decreases radius of light source by 1.";
 #endif
-
                        }
-                       case ACT_DISP_EVIL:
-                       {
+               }
+               else if (object_is_fixed_artifact(o_ptr))
+               {
 #ifdef JP
-return "¼Ù°­Â໶ (level*5) : 300+d300 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "dispel evil (level*5) every 300+d300 turns";
+                       info[i++] = "It provides light (radius 3) forever.";
 #endif
 
-                       }
-                       case ACT_BA_MISS_3:
+               }
+               else if (o_ptr->name2 == EGO_LITE_SHINE)
+               {
+                       if (o_ptr->sval == SV_LITE_FEANOR)
                        {
 #ifdef JP
-return "¥¨¥ì¥á¥ó¥È¤Î¥Ö¥ì¥¹ (300) : 500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "elemental breath (300) every 500 turns";
+                               info[i++] = "It provides light (radius 3) forever.";
 #endif
 
                        }
-                       case ACT_DISP_GOOD:
+                       else if (o_ptr->sval == SV_LITE_LANTERN)
                        {
 #ifdef JP
-return "Á±ÎÉÂ໶ (level*5) : 300+d300 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "dispel good (level*5) every 300+d300 turns";
+                               info[i++] = "It provides light (radius 3) when fueled.";
 #endif
 
                        }
-                       case ACT_CONFUSE:
+                       else
                        {
 #ifdef JP
-return "¥Ñ¥Ë¥Ã¥¯¡¦¥â¥ó¥¹¥¿¡¼ : 15 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 2)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "confuse monster every 15 turns";
+                               info[i++] = "It provides light (radius 2) when fueled.";
 #endif
 
                        }
-                       case ACT_SLEEP:
+               }
+               else
+               {
+                       if (o_ptr->sval == SV_LITE_FEANOR)
                        {
 #ifdef JP
-return "¼þ°Ï¤Î¥â¥ó¥¹¥¿¡¼¤ò̲¤é¤»¤ë : 55 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 2)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "sleep nearby monsters every 55 turns";
+                               info[i++] = "It provides light (radius 2) forever.";
 #endif
 
                        }
-                       case ACT_QUAKE:
+                       else if (o_ptr->sval == SV_LITE_LANTERN)
                        {
 #ifdef JP
-return "ÃÏ¿Ì (Ⱦ·Â 10) : 50 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 2)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "earthquake (rad 10) every 50 turns";
+                               info[i++] = "It provides light (radius 2) when fueled.";
 #endif
 
                        }
-                       case ACT_TERROR:
+                       else
                        {
 #ifdef JP
-return "¶²¹² : 3 * (level+10) ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 1)¤ò¼ø¤±¤ë¡£";
 #else
-                               return "terror every 3 * (level+10) turns";
+                               info[i++] = "It provides light (radius 1) when fueled.";
 #endif
 
                        }
-                       case ACT_TELE_AWAY:
-                       {
+               }
+               if (o_ptr->name2 == EGO_LITE_LONG)
+               {
 #ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È¡¦¥¢¥¦¥§¥¤ : 150 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏŤ¤¥¿¡¼¥óÌÀ¤«¤ê¤ò¼ø¤±¤ë¡£";
 #else
-                               return "teleport away every 200 turns";
+                       info[i++] = "It provides light for much longer time.";
 #endif
+               }
+       }
 
-                       }
-                       case ACT_BANISH_EVIL:
-                       {
+
+       /* And then describe it fully */
+
+       if (have_flag(flgs, TR_RIDING))
+       {
+               if ((o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE)))
 #ifdef JP
-return "¼Ù°­¾ÃÌÇ : 250+d250 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤ÏÈó¾ï¤Ë»È¤¤¤ä¤¹¤¤¡£";
 #else
-                               return "banish evil every 250+d250 turns";
+                       info[i++] = "It is made for use while riding.";
 #endif
-
-                       }
-                       case ACT_GENOCIDE:
-                       {
+               else
+               {
 #ifdef JP
-return "Ëõ»¦ : 500 ¥¿¡¼¥óËè";
+                       info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
 #else
-                               return "genocide every 500 turns";
+                       info[i++] = "It is suitable for use while riding.";
 #endif
-
-                       }
-                       case ACT_MASS_GENO:
-                       {
+                       /* This information is not important enough */
+                       trivial_info++;
+               }
+       }
+       if (have_flag(flgs, TR_STR))
+       {
 #ifdef JP
-return "¼þÊÕËõ»¦ : 1000 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "mass genocide every 1000 turns";
+               info[i++] = "It affects your strength.";
 #endif
 
-                       }
-                       case ACT_CHARM_ANIMAL:
-                       {
+       }
+       if (have_flag(flgs, TR_INT))
+       {
 #ifdef JP
-return "ưʪ̥λ : 300 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "charm animal every 300 turns";
+               info[i++] = "It affects your intelligence.";
 #endif
 
-                       }
-                       case ACT_CHARM_UNDEAD:
-                       {
+       }
+       if (have_flag(flgs, TR_WIS))
+       {
 #ifdef JP
-return "ÉԻཾ° : 333 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¸­¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "enslave undead every 333 turns";
+               info[i++] = "It affects your wisdom.";
 #endif
 
-                       }
-                       case ACT_CHARM_OTHER:
-                       {
+       }
+       if (have_flag(flgs, TR_DEX))
+       {
 #ifdef JP
-return "¥â¥ó¥¹¥¿¡¼Ì¥Î» : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "charm monster every 400 turns";
+               info[i++] = "It affects your dexterity.";
 #endif
 
-                       }
-                       case ACT_CHARM_ANIMALS:
-                       {
+       }
+       if (have_flag(flgs, TR_CON))
+       {
 #ifdef JP
-return "ưʪͧÏ : 500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "animal friendship every 500 turns";
+               info[i++] = "It affects your constitution.";
 #endif
 
-                       }
-                       case ACT_CHARM_OTHERS:
-                       {
+       }
+       if (have_flag(flgs, TR_CHR))
+       {
 #ifdef JP
-return "¼þÊÕ̥λ : 750 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "mass charm every 750 turns";
+               info[i++] = "It affects your charisma.";
 #endif
 
-                       }
-                       case ACT_SUMMON_ANIMAL:
-                       {
+       }
+
+       if (have_flag(flgs, TR_MAGIC_MASTERY))
+       {
 #ifdef JP
-return "ưʪ¾¤´­ : 200+d300 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏËâË¡Æ»¶ñ»ÈÍÑǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "summon animal every 200+d300 turns";
+               info[i++] = "It affects your ability to use magic devices.";
 #endif
 
-                       }
-                       case ACT_SUMMON_PHANTOM:
-                       {
+       }
+       if (have_flag(flgs, TR_STEALTH))
+       {
 #ifdef JP
-return "»È¤¤Î´­ : 200+d200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "summon phantasmal servant every 200+d200 turns";
+               info[i++] = "It affects your stealth.";
 #endif
 
-                       }
-                       case ACT_SUMMON_ELEMENTAL:
-                       {
+       }
+       if (have_flag(flgs, TR_SEARCH))
+       {
 #ifdef JP
-return "¥¨¥ì¥á¥ó¥¿¥ë¾¤´­ : 750 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "summon elemental every 750 turns";
+               info[i++] = "It affects your searching.";
 #endif
 
-                       }
-                       case ACT_SUMMON_DEMON:
-                       {
+       }
+       if (have_flag(flgs, TR_INFRA))
+       {
 #ifdef JP
-return "°­Ë⾤´­ : 666+d333 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "summon demon every 666+d333 turns";
+               info[i++] = "It affects your infravision.";
 #endif
 
-                       }
-                       case ACT_SUMMON_UNDEAD:
-                       {
+       }
+       if (have_flag(flgs, TR_TUNNEL))
+       {
 #ifdef JP
-return "ÉԻྤ´­ : 666+d333 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "summon undead every 666+d333 turns";
+               info[i++] = "It affects your ability to tunnel.";
 #endif
 
-                       }
-                       case ACT_CURE_LW:
-                       {
+       }
+       if (have_flag(flgs, TR_SPEED))
+       {
 #ifdef JP
-return "ͦµ¤²óÉü & 30 hp ²óÉü : 10 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "remove fear & heal 30 hp every 10 turns";
+               info[i++] = "It affects your speed.";
 #endif
 
-                       }
-                       case ACT_CURE_MW:
-                       {
+       }
+       if (have_flag(flgs, TR_BLOWS))
+       {
 #ifdef JP
-return "4d8 hp & ½ý²óÉü : 3+d3 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "heal 4d8 & wounds every 3+d3 turns";
+               info[i++] = "It affects your attack speed.";
 #endif
 
-                       }
-                       case ACT_CURE_POISON:
-                       {
+       }
+
+       if (have_flag(flgs, TR_BRAND_ACID))
+       {
 #ifdef JP
-return "ͦµ¤²óÉü/ÆǾä· : 5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
 #else
-                               return "remove fear and cure poison every 5 turns";
+               info[i++] = "It does extra damage from acid.";
 #endif
 
-                       }
-                       case ACT_REST_LIFE:
-                       {
+       }
+       if (have_flag(flgs, TR_BRAND_ELEC))
+       {
 #ifdef JP
-return "·Ð¸³ÃÍÉü³è : 450 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
 #else
-                               return "restore life levels every 450 turns";
+               info[i++] = "It does extra damage from electricity.";
 #endif
 
-                       }
-                       case ACT_REST_ALL:
-                       {
+       }
+       if (have_flag(flgs, TR_BRAND_FIRE))
+       {
 #ifdef JP
-return "Á´¥¹¥Æ¡¼¥¿¥¹¤È·Ð¸³ÃͲóÉü : 750 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
 #else
-                               return "restore stats and life levels every 750 turns";
+               info[i++] = "It does extra damage from fire.";
 #endif
 
-                       }
-                       case ACT_CURE_700:
-                       {
+       }
+       if (have_flag(flgs, TR_BRAND_COLD))
+       {
 #ifdef JP
-return "700 hp ²óÉü : 250 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
 #else
-                               return "heal 700 hit points every 250 turns";
+               info[i++] = "It does extra damage from frost.";
 #endif
 
-                       }
-                       case ACT_CURE_1000:
-                       {
+       }
+
+       if (have_flag(flgs, TR_BRAND_POIS))
+       {
 #ifdef JP
-return "1000 hp ²óÉü : 888 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏŨ¤òÆǤ¹¤ë¡£";
 #else
-                               return "heal 1000 hit points every 888 turns";
+               info[i++] = "It poisons your foes.";
 #endif
 
-                       }
-                       case ACT_ESP:
-                       {
+       }
+
+       if (have_flag(flgs, TR_CHAOTIC))
+       {
 #ifdef JP
-return "°ì»þŪ¤Ê ESP (´ü´Ö 25+d30) : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹Åª¤Ê¸ú²Ì¤òµÚ¤Ü¤¹¡£";
 #else
-                               return "temporary ESP (dur 25+d30) every 200 turns";
+               info[i++] = "It produces chaotic effects.";
 #endif
 
-                       }
-                       case ACT_BERSERK:
-                       {
+       }
+
+       if (have_flag(flgs, TR_VAMPIRIC))
+       {
 #ifdef JP
-return "»Îµ¤¹âÍȤȽËÊ¡ (´ü´Ö 50+d50) : 100+d100 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏŨ¤«¤é¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤òµÛ¼ý¤¹¤ë¡£";
 #else
-                               return "heroism and blessed (dur 50+d50) every 100+d100 turns";
+               info[i++] = "It drains life from your foes.";
 #endif
 
-                       }
-                       case ACT_PROT_EVIL:
-                       {
+       }
+
+       if (have_flag(flgs, TR_IMPACT))
+       {
 #ifdef JP
-return "Âмٰ­·ë³¦ (´ü´Ö level*3 + d25) : 225+d225 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÃϿ̤òµ¯¤³¤¹¤³¤È¤¬¤Ç¤­¤ë¡£";
 #else
-                               return "protect evil (dur level*3 + d25) every 225+d225 turns";
+               info[i++] = "It can cause earthquakes.";
 #endif
 
-                       }
-                       case ACT_RESIST_ALL:
-                       {
+       }
+
+       if (have_flag(flgs, TR_VORPAL))
+       {
 #ifdef JP
-return "±êÎä»ÀÅÅÆǤؤÎÂÑÀ­ (´ü´Ö 40+d40) : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÈó¾ï¤ËÀÚ¤ìÌ£¤¬±Ô¤¯Å¨¤òÀÚÃǤ¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£";
 #else
-                               return "resist elements (dur 40+d40) every 200 turns";
+               info[i++] = "It is very sharp and can cut your foes.";
 #endif
 
-                       }
-                       case ACT_SPEED:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_DRAGON))
+       {
 #ifdef JP
-return "²Ã® (´ü´Ö 20+d20) : 250 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "speed (dur 20+d20) every 250 turns";
+               info[i++] = "It is a great bane of dragons.";
 #endif
 
-                       }
-                       case ACT_XTRA_SPEED:
-                       {
+       }
+       else if (have_flag(flgs, TR_SLAY_DRAGON))
+       {
 #ifdef JP
-return "²Ã® (´ü´Ö 75+d75) : 200+d200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "speed (dur 75+d75) every 200+d200 turns";
+               info[i++] = "It is especially deadly against dragons.";
 #endif
 
-                       }
-                       case ACT_WRAITH:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_ORC))
+       {
 #ifdef JP
-return "¥ì¥¤¥¹²½ (level/2 + d(level/2)) : 1000 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "wraith form (level/2 + d(level/2)) every 1000 turns";
+               info[i++] = "It is a great bane of orcs.";
 #endif
 
-                       }
-                       case ACT_INVULN:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_ORC))
+       {
 #ifdef JP
-return "̵Ũ (´ü´Ö 8+d8) : 1000 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "invulnerability (dur 8+d8) every 1000 turns";
+               info[i++] = "It is especially deadly against orcs.";
 #endif
 
-                       }
-                       case ACT_LIGHT:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_TROLL))
+       {
 #ifdef JP
-return "¼þÊÕ¾ÈÌÀ (¥À¥á¡¼¥¸ 2d15) : 10+d10 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "light area (dam 2d15) every 10+d10 turns";
+               info[i++] = "It is a great bane of trolls.";
 #endif
 
-                       }
-                       case ACT_MAP_LIGHT:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_TROLL))
+       {
 #ifdef JP
-return "¼þÊÕ¾ÈÌÀ (¥À¥á¡¼¥¸ 2d15) & ¼þÊեޥåנ: 50+d50 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "light (dam 2d15) & map area every 50+d50 turns";
+               info[i++] = "It is especially deadly against trolls.";
 #endif
 
-                       }
-                       case ACT_DETECT_ALL:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_GIANT))
+       {
 #ifdef JP
-return "Á´´¶ÃΠ: 55+d55 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ïµð¿Í¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "detection every 55+d55 turns";
+               info[i++] = "It is a great bane of giants.";
 #endif
-
-                       }
-                       case ACT_DETECT_XTRA:
-                       {
+       }
+       else if (have_flag(flgs, TR_SLAY_GIANT))
+       {
 #ifdef JP
-return "Á´´¶ÃΡ¢Ãµº÷¡¢*´ÕÄê* : 1000 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥¸¥ã¥¤¥¢¥ó¥È¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "detection, probing and identify true every 1000 turns";
+               info[i++] = "It is especially deadly against giants.";
 #endif
 
-                       }
-                       case ACT_ID_FULL:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_DEMON))
+       {
 #ifdef JP
-return "*´ÕÄê* : 750 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "identify true every 750 turns";
+               info[i++] = "It is a great bane of demons.";
 #endif
 
-                       }
-                       case ACT_ID_PLAIN:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_DEMON))
+       {
 #ifdef JP
-return "´ÕÄê : 10 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "identify spell every 10 turns";
+               info[i++] = "It strikes at demons with holy wrath.";
 #endif
 
-                       }
-                       case ACT_RUNE_EXPLO:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_UNDEAD))
+       {
 #ifdef JP
-return "Çúȯ¥ë¡¼¥ó : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "explosive rune every 200 turns";
+               info[i++] = "It is a great bane of undead.";
 #endif
 
-                       }
-                       case ACT_RUNE_PROT:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_UNDEAD))
+       {
 #ifdef JP
-return "¼é¤ê¤Î¥ë¡¼¥ó : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "rune of protection every 400 turns";
+               info[i++] = "It strikes at undead with holy wrath.";
 #endif
 
-                       }
-                       case ACT_SATIATE:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_EVIL))
+       {
 #ifdef JP
-return "¶õÊ¢½¼Â­ : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼Ù°­¤Ê¤ë¸ºß¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "satisfy hunger every 200 turns";
+               info[i++] = "It is a great bane of evil monsters.";
 #endif
 
-                       }
-                       case ACT_DEST_DOOR:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_EVIL))
+       {
 #ifdef JP
-return "¥É¥¢Ç˲õ : 10 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼Ù°­¤Ê¤ë¸ºß¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤǹ¶·â¤¹¤ë¡£";
 #else
-                               return "destroy doors every 10 turns";
+               info[i++] = "It fights against evil with holy fury.";
 #endif
 
-                       }
-                       case ACT_STONE_MUD:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_ANIMAL))
+       {
 #ifdef JP
-return "´äÀÐÍϲò : 5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "stone to mud every 5 turns";
+               info[i++] = "It is a great bane of natural creatures.";
 #endif
 
-                       }
-                       case ACT_RECHARGE:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_ANIMAL))
+       {
 #ifdef JP
-return "ºÆ½¼Å¶ : 70 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "recharging every 70 turns";
+               info[i++] = "It is especially deadly against natural creatures.";
 #endif
 
-                       }
-                       case ACT_ALCHEMY:
-                       {
+       }
+
+       if (have_flag(flgs, TR_KILL_HUMAN))
+       {
 #ifdef JP
-return "Ï£¶â½Ñ : 500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
 #else
-                               return "alchemy every 500 turns";
+               info[i++] = "It is a great bane of humans.";
 #endif
 
-                       }
-                       case ACT_DIM_DOOR:
-                       {
+       }
+       if (have_flag(flgs, TR_SLAY_HUMAN))
+       {
 #ifdef JP
-return "¼¡¸µ¤ÎÈâ : 100 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
 #else
-                               return "dimension door every 100 turns";
+               info[i++] = "It is especially deadly against humans.";
 #endif
 
-                       }
-                       case ACT_TELEPORT:
-                       {
+       }
+
+       if (have_flag(flgs, TR_FORCE_WEAPON))
+       {
 #ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È (range 100) : 45 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï»ÈÍѼԤÎËâÎϤò»È¤Ã¤Æ¹¶·â¤¹¤ë¡£";
 #else
-                               return "teleport (range 100) every 45 turns";
+               info[i++] = "It powerfully strikes at a monster using your mana.";
 #endif
 
-                       }
-                       case ACT_RECALL:
-                       {
+       }
+       if (have_flag(flgs, TR_DEC_MANA))
+       {
 #ifdef JP
-return "µ¢´Ô¤Î¾Û : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏËâÎϤξÃÈñ¤ò²¡¤µ¤¨¤ë¡£";
 #else
-                               return "word of recall every 200 turns";
+               info[i++] = "It decreases your mana consumption.";
 #endif
 
-                       }
-                       default:
-                       {
+       }
+       if (have_flag(flgs, TR_SUST_STR))
+       {
 #ifdef JP
-return "̤ÄêµÁ";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÏÓÎϤò°Ý»ý¤¹¤ë¡£";
 #else
-                               return "something undefined";
+               info[i++] = "It sustains your strength.";
 #endif
 
-                       }
-               }
        }
-
-       /* Some artifacts can be activated */
-       switch (o_ptr->name1)
+       if (have_flag(flgs, TR_SUST_INT))
        {
-               case ART_NARTHANC:
-               {
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È(9d8) : 8+d8 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÃÎǽ¤ò°Ý»ý¤¹¤ë¡£";
 #else
-                       return "fire bolt (9d8) every 8+d8 turns";
+               info[i++] = "It sustains your intelligence.";
 #endif
 
-               }
-               case ART_NIMTHANC:
-               {
+       }
+       if (have_flag(flgs, TR_SUST_WIS))
+       {
 #ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¥ë¥È(6d8) : 7+d7 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¸­¤µ¤ò°Ý»ý¤¹¤ë¡£";
 #else
-                       return "frost bolt (6d8) every 7+d7 turns";
+               info[i++] = "It sustains your wisdom.";
 #endif
 
-               }
-               case ART_DETHANC:
-               {
+       }
+       if (have_flag(flgs, TR_SUST_DEX))
+       {
 #ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È(4d8) : 5+d5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î´ïÍѤµ¤ò°Ý»ý¤¹¤ë¡£";
 #else
-                       return "lightning bolt (4d8) every 6+d6 turns";
+               info[i++] = "It sustains your dexterity.";
 #endif
 
-               }
-               case ART_RILIA:
-               {
+       }
+       if (have_flag(flgs, TR_SUST_CON))
+       {
 #ifdef JP
-return "°­½­±À(12) : 4+d4 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÂѵ×ÎϤò°Ý»ý¤¹¤ë¡£";
 #else
-                       return "stinking cloud (12) every 4+d4 turns";
+               info[i++] = "It sustains your constitution.";
 #endif
 
-               }
-               case ART_FIONA:
-               {
+       }
+       if (have_flag(flgs, TR_SUST_CHR))
+       {
 #ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë(48) : 5+d5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÌ¥ÎϤò°Ý»ý¤¹¤ë¡£";
 #else
-                       return "frost ball (48) every 5+d5 turns";
+               info[i++] = "It sustains your charisma.";
 #endif
 
-               }
-               case ART_FLORA:
-               {
+       }
+
+       if (have_flag(flgs, TR_IM_ACID))
+       {
 #ifdef JP
-return "¶²Éݽüµî/ÆǾä· : 5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï»À¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
 #else
-                       return "remove fear and cure poison every 5 turns";
+               info[i++] = "It provides immunity to acid.";
 #endif
 
-               }
-               case ART_RINGIL:
-               {
+       }
+       if (have_flag(flgs, TR_IM_ELEC))
+       {
 #ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë(100) : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÅÅ·â¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
 #else
-                       return "frost ball (100) every 200 turns";
+               info[i++] = "It provides immunity to electricity.";
 #endif
 
-               }
-               case ART_DAWN:
-               {
+       }
+       if (have_flag(flgs, TR_IM_FIRE))
+       {
 #ifdef JP
-return "¶Ç¤Î»ÕÃľ¤´­ : 500+d500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï²Ð¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
 #else
-                       return "summon the Legion of the Dawn every 500+d500 turns";
+               info[i++] = "It provides immunity to fire.";
 #endif
 
-               }
-               case ART_ANDURIL:
-               {
+       }
+       if (have_flag(flgs, TR_IM_COLD))
+       {
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë(72) : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï´¨¤µ¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
 #else
-                       return "fire ball (72) every 400 turns";
+               info[i++] = "It provides immunity to cold.";
 #endif
 
-               }
-               case ART_FIRESTAR:
-               {
+       }
+
+       if (have_flag(flgs, TR_THROW))
+       {
 #ifdef JP
-return "µðÂç¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë(72) : 100 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏŨ¤ËÅꤲ¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤­¤ë¡£";
 #else
-                       return "large fire ball (72) every 100 turns";
+               info[i++] = "It is perfectly balanced for throwing.";
 #endif
+       }
 
-               }
-               case ART_GOTHMOG:
-               {
+       if (have_flag(flgs, TR_FREE_ACT))
+       {
 #ifdef JP
-return "µðÂç¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë(120) : 15 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏËãáã¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
 #else
-                       return "large fire ball (120) every 15 turns";
+               info[i++] = "It provides immunity to paralysis.";
 #endif
 
-               }
-               case ART_FEANOR:
-               {
+       }
+       if (have_flag(flgs, TR_HOLD_LIFE))
+       {
 #ifdef JP
-return "¥¹¥Ô¡¼¥É(20+d20¥¿¡¼¥ó) : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÀ¸Ì¿Îϵۼý¤ËÂФ¹¤ëÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "haste self (20+d20 turns) every 200 turns";
+               info[i++] = "It provides resistance to life draining.";
 #endif
 
-               }
-               case ART_THEODEN:
-               {
+       }
+       if (have_flag(flgs, TR_RES_FEAR))
+       {
 #ifdef JP
-return "À¸Ì¿Îϵۼý(120) : 400 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¶²Éݤؤδ°Á´¤ÊÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "drain life (120) every 400 turns";
+               info[i++] = "It makes you completely fearless.";
 #endif
 
-               }
-               case ART_TURMIL:
-               {
+       }
+       if (have_flag(flgs, TR_RES_ACID))
+       {
 #ifdef JP
-return "À¸Ì¿Îϵۼý(90) : 70 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï»À¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "drain life (90) every 70 turns";
+               info[i++] = "It provides resistance to acid.";
 #endif
 
-               }
-               case ART_CASPANION:
-               {
+       }
+       if (have_flag(flgs, TR_RES_ELEC))
+       {
 #ifdef JP
-return "¥É¥¢/¥È¥é¥Ã¥×Ê´ºÕ : 10 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "door and trap destruction every 10 turns";
+               info[i++] = "It provides resistance to electricity.";
 #endif
 
-               }
-               case ART_AVAVIR:
-               case ART_MAGATAMA:
-               {
+       }
+       if (have_flag(flgs, TR_RES_FIRE))
+       {
 #ifdef JP
-return "µ¢´Ô¤Î¾Û : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï²Ð¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "word of recall every 200 turns";
+               info[i++] = "It provides resistance to fire.";
 #endif
 
-               }
-               case ART_TARATOL:
-               {
+       }
+       if (have_flag(flgs, TR_RES_COLD))
+       {
 #ifdef JP
-return "¥¹¥Ô¡¼¥É(20+d20¥¿¡¼¥ó) : 100+d100 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï´¨¤µ¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "haste self (20+d20 turns) every 100+d100 turns";
+               info[i++] = "It provides resistance to cold.";
 #endif
 
-               }
-               case ART_ERIRIL:
-               {
+       }
+       if (have_flag(flgs, TR_RES_POIS))
+       {
 #ifdef JP
-return "´ÕÄê : 10 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÆǤؤÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "identify every 10 turns";
+               info[i++] = "It provides resistance to poison.";
 #endif
 
-               }
-               case ART_GANDALF:
-               {
+       }
+
+       if (have_flag(flgs, TR_RES_LITE))
+       {
 #ifdef JP
-return "õº÷¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 1000 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÁ®¸÷¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "probing, detection and full id every 1000 turns";
+               info[i++] = "It provides resistance to light.";
 #endif
 
-               }
-               case ART_EONWE:
-               {
+       }
+       if (have_flag(flgs, TR_RES_DARK))
+       {
 #ifdef JP
-return "¼þÊÕËõ»¦ : 1000 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï°Å¹õ¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "mass genocide every 1000 turns";
+               info[i++] = "It provides resistance to dark.";
 #endif
 
-               }
-               case ART_LOTHARANG:
-               {
+       }
+
+       if (have_flag(flgs, TR_RES_BLIND))
+       {
 #ifdef JP
-return "½ý¤Î¼£Ìþ(4d7) : 3+d3 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÌÕÌܤؤÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "cure wounds (4d7) every 3+d3 turns";
+               info[i++] = "It provides resistance to blindness.";
 #endif
 
-               }
-               case ART_BRAND:
-               {
+       }
+       if (have_flag(flgs, TR_RES_CONF))
+       {
 #ifdef JP
-return "¿ÏÀè¤Î¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È : 999 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ïº®Íð¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "fire branding of bolts every 999 turns";
+               info[i++] = "It provides resistance to confusion.";
 #endif
 
-               }
-               case ART_CRIMSON:
-               {
+       }
+       if (have_flag(flgs, TR_RES_SOUND))
+       {
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡ª : 15 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¹ì²»¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "fire! every 15 turns";
+               info[i++] = "It provides resistance to sound.";
 #endif
 
-               }
-               case ART_KUSANAGI:
-               case ART_WEREWINDLE:
-               {
+       }
+       if (have_flag(flgs, TR_RES_SHARDS))
+       {
 #ifdef JP
-return "ƨÁö : 35 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÇËÊҤؤÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "a getaway every 35 turns";
+               info[i++] = "It provides resistance to shards.";
 #endif
 
-               }
-               case ART_KAMUI:
-               {
+       }
+
+       if (have_flag(flgs, TR_RES_NETHER))
+       {
 #ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È : 25 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÃϹö¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "a teleport every 25 turns";
+               info[i++] = "It provides resistance to nether.";
 #endif
 
-               }
-               case ART_RUNESPEAR:
-               {
+       }
+       if (have_flag(flgs, TR_RES_NEXUS))
+       {
 #ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï°ø²Ìº®Íð¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "lightning ball (100) every 200 turns";
+               info[i++] = "It provides resistance to nexus.";
 #endif
 
-               }
-               case ART_AEGLOS:
-               {
+       }
+       if (have_flag(flgs, TR_RES_CHAOS))
+       {
 #ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) : 200 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "Frost ball (100) every 200 turns";
+               info[i++] = "It provides resistance to chaos.";
 #endif
 
-               }
-               case ART_DESTINY:
-               {
+       }
+       if (have_flag(flgs, TR_RES_DISEN))
+       {
 #ifdef JP
-return "´äÀÐÍϲò : 5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÎô²½¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-                       return "stone to mud every 5 turns";
+               info[i++] = "It provides resistance to disenchantment.";
 #endif
 
-               }
-               case ART_NAIN:
-               {
+       }
+
+       if (have_flag(flgs, TR_LEVITATION))
+       {
 #ifdef JP
-return "´äÀÐÍϲò : 2 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÃè¤ËÉ⤯¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
 #else
-                       return "stone to mud every 2 turns";
+               info[i++] = "It allows you to levitate.";
 #endif
 
-               }
-               case ART_SOULKEEPER:
-               {
+       }
+       if (have_flag(flgs, TR_LITE))
+       {
+               if ((o_ptr->name2 == EGO_DARK) || (o_ptr->name1 == ART_NIGHT))
 #ifdef JP
-return "ÂÎÎϲóÉü(1000) : 888 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
 #else
-                       return "heal (1000) every 888 turns";
+                       info[i++] = "It decreases radius of your light source by 1.";
 #endif
-
-               }
-               case ART_LOHENGRIN:
-               {
+               else
 #ifdef JP
-return ("²óÉü (777)¡¢Ìþ¤·¡¢»Îµ¤¹âÍÈ : 300 ¥¿¡¼¥óËè");
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤ÎÌÀ¤«¤ê¤ò¼ø¤±¤ë(Ⱦ·Â¤Ë+1)¡£";
 #else
-                       return ("heal (777), curing and heroism every 300 turns");
+                       info[i++] = "It provides permanent light. (radius +1)";
 #endif
 
-               }
-               case ART_JULIAN:
-               {
+       }
+       if (have_flag(flgs, TR_SEE_INVIS))
+       {
 #ifdef JP
-return "Ëõ»¦ : 500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÆ©ÌÀ¤Ê¥â¥ó¥¹¥¿¡¼¤ò¸«¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
 #else
-                       return "genocide every 500 turns";
+               info[i++] = "It allows you to see invisible monsters.";
 #endif
 
-               }
-               case ART_LUTHIEN:
-               {
+       }
+       if (have_flag(flgs, TR_TELEPATHY))
+       {
 #ifdef JP
-return "·Ð¸³ÃÍÉü³è : 450 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ñ¥·¡¼Ç½ÎϤò¼ø¤±¤ë¡£";
 #else
-                       return "restore life levels every 450 turns";
+               info[i++] = "It gives telepathic powers.";
 #endif
 
-               }
-               case ART_ULMO:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_ANIMAL))
+       {
 #ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È¡¦¥¢¥¦¥§¥¤ : 150 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤ÎÀ¸Êª¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "teleport away every 150 turns";
+               info[i++] = "It senses natural creatures.";
 #endif
 
-               }
-               case ART_COLLUIN:
-               case ART_SEIRYU:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_UNDEAD))
+       {
 #ifdef JP
-return "Á´ÂÑÀ­(20+d20¥¿¡¼¥ó) : 111 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "resistance (20+d20 turns) every 111 turns";
+               info[i++] = "It senses undead.";
 #endif
 
-               }
-               case ART_HOLCOLLETH:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_DEMON))
+       {
 #ifdef JP
-return "¥¹¥ê¡¼¥×(II) : 55 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï°­Ëâ¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "Sleep II every 55 turns";
+               info[i++] = "It senses demons.";
 #endif
 
-               }
-               case ART_THINGOL:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_ORC))
+       {
 #ifdef JP
-return "ËâÎϽ¼Å¶ : 70 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "recharge item I every 70 turns";
+               info[i++] = "It senses orcs.";
 #endif
 
-               }
-               case ART_COLANNON:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_TROLL))
+       {
 #ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È : 45 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "teleport every 45 turns";
+               info[i++] = "It senses trolls.";
 #endif
 
-               }
-               case ART_TOTILA:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_GIANT))
+       {
 #ifdef JP
-return "¥Ñ¥Ë¥Ã¥¯¡¦¥â¥ó¥¹¥¿¡¼ : 15 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ïµð¿Í¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "confuse monster every 15 turns";
+               info[i++] = "It senses giants.";
 #endif
 
-               }
-               case ART_CAMMITHRIM:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_DRAGON))
+       {
 #ifdef JP
-return "¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë(2d6) : 2 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "magic missile (2d6) every 2 turns";
+               info[i++] = "It senses dragons.";
 #endif
 
-               }
-               case ART_PAURHACH:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_HUMAN))
+       {
 #ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È(9d8) : 8+d8 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "fire bolt (9d8) every 8+d8 turns";
+               info[i++] = "It senses humans.";
 #endif
 
-               }
-               case ART_PAURNIMMEN:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_EVIL))
+       {
 #ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¥ë¥È(6d8) : 7+d7 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¼Ù°­¤Ê¸ºß¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "frost bolt (6d8) every 7+d7 turns";
+               info[i++] = "It senses evil creatures.";
 #endif
 
-               }
-               case ART_PAURAEGEN:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_GOOD))
+       {
 #ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È(4d8) : 5+d5 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÁ±Îɤʸºß¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "lightning bolt (4d8) every 5+d5 turns";
+               info[i++] = "It senses good creatures.";
 #endif
 
-               }
-               case ART_PAURNEN:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_NONLIVING))
+       {
 #ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È(5d8) : 6+d6 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï³èÆ°¤¹¤ë̵À¸ÊªÂΤò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "acid bolt (5d8) every 6+d6 turns";
+               info[i++] = "It senses non-living creatures.";
 #endif
 
-               }
-               case ART_FINGOLFIN:
-               {
+       }
+       if (have_flag(flgs, TR_ESP_UNIQUE))
+       {
 #ifdef JP
-return "ËâË¡¤ÎÌð(150) : 90+d90 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÆÃÊ̤ʶ¯Å¨¤ò´¶ÃΤ¹¤ë¡£";
 #else
-                       return "a magical arrow (150) every 90+d90 turns";
+               info[i++] = "It senses unique monsters.";
 #endif
 
-               }
-               case ART_HOLHENNETH:
-               {
+       }
+       if (have_flag(flgs, TR_SLOW_DIGEST))
+       {
 #ifdef JP
-return "Á´´¶ÃΠ: 55+d55 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤òÃÙ¤¯¤¹¤ë¡£";
 #else
-                       return "detection every 55+d55 turns";
+               info[i++] = "It slows your metabolism.";
 #endif
 
-               }
-               case ART_AMBER:
-               {
+       }
+       if (have_flag(flgs, TR_REGEN))
+       {
 #ifdef JP
-return "ÂÎÎϲóÉü(500) : 500 ¥¿¡¼¥óËè";
+info[i++] = "¤½¤ì¤ÏÂÎÎϲóÉüÎϤò¶¯²½¤¹¤ë¡£";
 #else
-                       return "heal (700) every 250 turns";
-#endif
-
-               }
-               case ART_RAZORBACK:
-               {
-#ifdef JP
-return "¥¹¥¿¡¼¡¦¥Ü¡¼¥ë(150) : 1000 ¥¿¡¼¥óËè";
-#else
-                       return "star ball (150) every 1000 turns";
-#endif
-
-               }
-               case ART_BLADETURNER:
-               {
-#ifdef JP
-return "¥¨¥ì¥á¥ó¥È¤Î¥Ö¥ì¥¹ (300), »Îµ¤¹âÍÈ¡¢½ËÊ¡¡¢ÂÑÀ­";
-#else
-                       return "breathe elements (300), hero, bless, and resistance";
-#endif
-
-               }
-               case ART_GALADRIEL:
-               {
-#ifdef JP
-return "¥¤¥ë¥ß¥Í¡¼¥·¥ç¥ó : 10+d10 ¥¿¡¼¥óËè";
-#else
-                       return "illumination every 10+d10 turns";
-#endif
-
-               }
-               case ART_ELENDIL:
-               {
-#ifdef JP
-return "ËâË¡¤ÎÃϿޤȸ÷ : 50+d50 ¥¿¡¼¥óËè";
-#else
-                       return "magic mapping and light every 50+d50 turns";
-#endif
-
-               }
-               case ART_JUDGE:
-               {
-#ifdef JP
-return "ÂÎÎϤȰú¤­Âؤ¨¤ËÀéΤ´ã¤Èµ¢´Ô : 20+d20 ¥¿¡¼¥óËè";
-#else
-                       return "clairvoyance and recall, draining you every 20+d20 turns";
-#endif
-
-               }
-               case ART_INGWE:
-               case ART_YATA:
-               {
-#ifdef JP
-return "¼Ù°­Â໶(x5) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "dispel evil (x5) every 200+d200 turns";
-#endif
-
-               }
-               case ART_FUNDIN:
-               {
-#ifdef JP
-return "¼Ù°­Â໶(x5) : 100+d100 ¥¿¡¼¥óËè";
-#else
-                       return "dispel evil (x5) every 100+d100 turns";
-#endif
-
-               }
-               case ART_CARLAMMAS:
-               case ART_HERMIT:
-               {
-#ifdef JP
-return "Âмٰ­·ë³¦ : 225+d225 ¥¿¡¼¥óËè";
-#else
-                       return "protection from evil every 225+d225 turns";
-#endif
-
-               }
-               case ART_FRAKIR:
-               {
-#ifdef JP
-return "Ã⩹¶·â(100) : 100+d100 ¥¿¡¼¥óËè";
-#else
-                       return "a strangling attack (100) every 100+d100 turns";
-#endif
-
-               }
-               case ART_TULKAS:
-               {
-#ifdef JP
-return "¥¹¥Ô¡¼¥É(75+d75¥¿¡¼¥ó) : 100+d100 ¥¿¡¼¥óËè";
-#else
-                       return "haste self (75+d75 turns) every 150+d150 turns";
-#endif
-
-               }
-               case ART_NARYA:
-               {
-#ifdef JP
-return "µðÂç¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë(300) : 225+d225 ¥¿¡¼¥óËè";
-#else
-                       return "large fire ball (300) every 225+d225 turns";
-#endif
-
-               }
-               case ART_NENYA:
-               {
-#ifdef JP
-return "µðÂ祢¥¤¥¹¡¦¥Ü¡¼¥ë(400) : 325+d325 ¥¿¡¼¥óËè";
-#else
-                       return "large frost ball (400) every 325+d325 turns";
-#endif
-
-               }
-               case ART_VILYA:
-               case ART_GOURYU:
-               {
-#ifdef JP
-return "µðÂ祵¥ó¥À¡¼¡¦¥Ü¡¼¥ë(500) : 425+d425 ¥¿¡¼¥óËè";
-#else
-                       return "large lightning ball (500) every 425+d425 turns";
-#endif
-
-               }
-               case ART_POWER:
-               case ART_AHO:
-               {
-#ifdef JP
-return "¿®¤¸Æñ¤¤¤³¤È : 450+d450 ¥¿¡¼¥óËè";
-#else
-                       return "bizarre things every 450+d450 turns";
-#endif
-
-               }
-               case ART_DOR: case ART_TERROR: case ART_STONEMASK:
-               {
-#ifdef JP
-                       return "Á´Êý¸þ¤Ø¤Î¶²Éݤθ÷Àþ : 3*(¥ì¥Ù¥ë+10) ¥¿¡¼¥óËè";
-#else
-                       return "rays of fear in every direction every 3*(level+10) turns";
-#endif
-
-               }
-               case ART_PALANTIR:
-               {
-#ifdef JP
-return "¤³¤Î³¬¤Ë¤¤¤ë¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤òɽ¼¨ : 200¥¿¡¼¥óËè";
-#else
-                       return "list of the uniques on the level every 200 turns";
-#endif
-               }
-               case ART_STONE_LORE:
-               {
-#ifdef JP
-return "´í¸±¤òȼ¤¦´ÕÄê : ¤¤¤Ä¤Ç¤â";
-#else
-                       return "perilous identify every turn";
-#endif
-               }
-               case ART_FARAMIR:
-               {
-#ifdef JP
-return "³²Ãî¤Î¶î½ü : 55+d55¥¿¡¼¥óËè";
-#else
-                       return "dispel small life every 55+d55 turns";
-#endif
-               }
-               case ART_BOROMIR:
-               {
-#ifdef JP
-return "¥â¥ó¥¹¥¿¡¼¶²¹² : 40+d40¥¿¡¼¥óËè";
-#else
-                       return "frighten monsters every 40+d40 turns";
-#endif
-               }
-               case ART_HIMRING:
-               {
-#ifdef JP
-return "Âмٰ­·ë³¦ : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "protection from evil every 200 + d200 turns";
-#endif
-               }
-               case ART_ICANUS:
-               {
-#ifdef JP
-return "ËâÎϤÎÌð(120) : 120+d120 ¥¿¡¼¥óËè";
-#else
-                       return "a mana bolt (120) every 120+d120 turns";
-#endif
-               }
-               case ART_HURIN:
-               {
-#ifdef JP
-return "»Îµ¤¹âÍÈ, ¥¹¥Ô¡¼¥É(50+d50¥¿¡¼¥ó) : 100+d200 ¥¿¡¼¥óËè";
-#else
-                       return "hero and +10 to speed (50) every 100+200d turns";
-#endif
-               }
-               case ART_GIL_GALAD:
-               {
-#ifdef JP
-return "âÁ¤·¤¤¸÷ : 250 ¥¿¡¼¥óËè";
-#else
-                       return "blinding light every 250 turns";
-#endif
-               }
-               case ART_YENDOR:
-               {
-#ifdef JP
-return "ËâÎϽ¼Å¶ : 200 ¥¿¡¼¥óËè";
-#else
-                       return "Recharge item every 200 turns";
-#endif
-               }
-               case ART_MURAMASA:
-               {
-#ifdef JP
-return "ÏÓÎϤξ徺 : ³ÎΨ50%¤Ç²õ¤ì¤ë¡£";
-#else
-                       return "Increase STR (destroyed 50%)";
-#endif
-               }
-               case ART_FLY_STONE:
-               {
-#ifdef JP
-return "ËâÎϤÎÍò(400) : 250+d250¥¿¡¼¥óËè";
-#else
-                       return "a mana storm every 250+d250 turns";
-#endif
-               }
-               case ART_JONES:
-               {
-#ifdef JP
-return "ʪÂΤò°ú¤­´ó¤»¤ë(½ÅÎÌ25kg¤Þ¤Ç) : 25+d25¥¿¡¼¥óËè";
-#else
-                       return "a telekinesis (500 lb) every 25+d25 turns";
-#endif
-               }
-               case ART_ARRYU:
-               {
-#ifdef JP
-return "¥Ï¥¦¥ó¥É¾¤´­ : 300+d150¥¿¡¼¥óËè";
-#else
-                       return "summon hound every 300+d150 turns";
-#endif
-               }
-               case ART_GAEBOLG:
-               {
-#ifdef JP
-return "µðÂ祹¥¿¡¼¡¦¥Ü¡¼¥ë(200) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "large star ball (200) every 200+d200 turns";
-#endif
-
-               }
-               case ART_INROU:
-               {
-#ifdef JP
-return "Îã¤Î¥¢¥ì : 150+d150 ¥¿¡¼¥óËè";
-#else
-                       return "reveal your identity every 150+d150 turns";
-#endif
-
-               }
-               case ART_HYOUSIGI:
-               {
-#ifdef JP
-return "Çï»ÒÌÚ¤òÂǤÁ¤Ê¤é¤¹ : ¤¤¤Ä¤Ç¤â";
-#else
-                       return "beat wooden clappers every turn";
-#endif
-
-               }
-               case ART_MATOI:
-               case ART_AEGISFANG:
-               {
-#ifdef JP
-return "»Îµ¤¹âÍÈ : 30+d30¥¿¡¼¥óËè";
-#else
-                       return "heroism every 30+d30 turns";
-#endif
-
-               }
-
-               case ART_EARENDIL:
-               {
-#ifdef JP
-return "Ìþ¤· : 100¥¿¡¼¥óËè";
-#else
-                       return "curing every 100 turns";
-#endif
-
-               }
-
-               case ART_BOLISHOI:
-               {
-#ifdef JP
-return "ưʪ̥λ : 200¥¿¡¼¥óËè";
-#else
-                       return "charm animal every 200 turns";
-#endif
-
-               }
-               case ART_ARUNRUTH:
-               {
-#ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¥ë¥È(12d8) : 50 ¥¿¡¼¥óËè";
-#else
-                       return "frost bolt (12d8) every 50 turns";
-#endif
-
-               }
-               case ART_BLOOD:
-               {
-#ifdef JP
-return "°À­Êѹ¹ : 3333 ¥¿¡¼¥óËè";
-#else
-                       return "change zokusei every 3333 turns";
-#endif
-
-               }
-               case ART_NUMAHOKO:
-               {
-#ifdef JP
-return "¥¦¥©¡¼¥¿¡¼¡¦¥Ü¡¼¥ë(200) : 250 ¥¿¡¼¥óËè";
-#else
-                       return "water ball (200) every 250 turns";
-#endif
-
-               }
-               case ART_KESHO:
-               {
-#ifdef JP
-return "»Í¸ÔƧ¤ß : 100+d100¥¿¡¼¥óËè";
-#else
-                       return "shiko every 100+d100 turns";
-#endif
-
-               }
-               case ART_MOOK:
-               {
-#ifdef JP
-return "Î䵤¤ÎÂÑÀ­ : 40+d40¥¿¡¼¥óËè";
-#else
-                       return "resist cold every 40+d40 turns";
-#endif
-
-               }
-               case ART_JIZO:
-               {
-#ifdef JP
-return "Âý¤ÎÂç·²¾¤´­ : 300+d150¥¿¡¼¥óËè";
-#else
-                       return "summon octopus every 300+d150 turns";
-#endif
-               }
-               case ART_NIGHT:
-               {
-#ifdef JP
-return "°Å¹õ¤ÎÍò(250) : 150+d150 ¥¿¡¼¥óËè";
-#else
-                       return "darkness storm (250) every 150+d150 turns";
-#endif
-
-               }
-       }
-
-
-       if ((o_ptr->tval == TV_POLEARM) && (o_ptr->sval == SV_TSURIZAO))
-       {
-#ifdef JP
-return "Äà¤ê¤ò¤¹¤ë : ¤¤¤Ä¤Ç¤â";
-#else
-               return "fishing : every time";
-#endif
-
-       }
-
-       if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID))
-       {
-#ifdef JP
-return "»À¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist acid every 50+d50 turns";
-#endif
-       }
-
-       if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_ELEC))
-       {
-#ifdef JP
-return "ÅÅ·â¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist elec every 50+d50 turns";
-#endif
-       }
-
-       if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_FIRE))
-       {
-#ifdef JP
-return "²Ð¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist fire every 50+d50 turns";
-#endif
-       }
-
-       if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_COLD))
-       {
-#ifdef JP
-return "Î䵤¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist cold every 50+d50 turns";
-#endif
-       }
-
-       if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_EARTHQUAKE))
-       {
-#ifdef JP
-return "ÃÏ¿Ì : 100+d100 ¥¿¡¼¥óËè";
-#else
-               return "earthquake every 100+d100 turns";
-#endif
-       }
-
-       if (o_ptr->name2 == EGO_TRUMP)
-       {
-#ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È : 50+d50 ¥¿¡¼¥óËè";
-#else
-               return "teleport every 50+d50 turns";
-#endif
-
-       }
-
-       if (o_ptr->name2 == EGO_LITE_ILLUMINATION)
-       {
-#ifdef JP
-return "¥¤¥ë¥ß¥Í¡¼¥·¥ç¥ó : 10+d10 ¥¿¡¼¥óËè";
-#else
-                       return "illumination every 10+d10 turns";
-#endif
-       }
-
-       else if (o_ptr->name2 == EGO_EARTHQUAKES)
-       {
-#ifdef JP
-return "ÃÏ¿Ì : 100+d100 ¥¿¡¼¥óËè";
-#else
-               return "earthquake every 100+d100 turns";
-#endif
-
-       }
-
-       else if (o_ptr->name2 == EGO_JUMP)
-       {
-#ifdef JP
-return "¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È : 10+d10 ¥¿¡¼¥óËè";
-#else
-               return "blink every 10+d10 turns";
-#endif
-
-       }
-
-       if (o_ptr->tval == TV_RING)
-       {
-               if (o_ptr->name2)
-               {
-                       switch (o_ptr->name2)
-                       {
-                       case EGO_RING_HERO:
-#ifdef JP
-return "»Îµ¤¹âÍÈ : 100+d100¥¿¡¼¥óËè";
-#else
-                               return "heroism every 100+d100 turns";
-#endif
-                       case EGO_RING_MAGIC_MIS:
-#ifdef JP
-return "¥Þ¥¸¥Ã¥¯¡¦¥ß¥µ¥¤¥ë(2d6) : 2 ¥¿¡¼¥óËè";
-#else
-                       return "magic missile (2d6) every 2 turns";
-#endif
-                       case EGO_RING_FIRE_BOLT:
-#ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È(9d8) : 8+d8 ¥¿¡¼¥óËè";
-#else
-                       return "fire bolt (9d8) every 8+d8 turns";
-#endif
-                       case EGO_RING_COLD_BOLT:
-#ifdef JP
-return "¥¢¥¤¥¹¡¦¥Ü¥ë¥È(6d8) : 7+d7 ¥¿¡¼¥óËè";
-#else
-                               return "frost bolt (6d8) every 7+d7 turns";
-#endif
-                       case EGO_RING_ELEC_BOLT:
-#ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¥ë¥È(4d8) : 5+d5 ¥¿¡¼¥óËè";
-#else
-                               return "lightning bolt (4d8) every 5+d5 turns";
-#endif
-                       case EGO_RING_ACID_BOLT:
-#ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¥ë¥È(5d8) : 6+d6 ¥¿¡¼¥óËè";
-#else
-                               return "acid bolt (5d8) every 6+d6 turns";
-#endif
-                       case EGO_RING_MANA_BOLT:
-#ifdef JP
-return "ËâÎϤÎÌð(120) : 120+d120 ¥¿¡¼¥óËè";
-#else
-                       return "a mana bolt (120) every 120+d120 turns";
-#endif
-                       case EGO_RING_FIRE_BALL:
-#ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (100) : 80+d80 ¥¿¡¼¥óËè";
-#else
-                               return "fire ball (100) every 80+d80 turns";
-#endif
-                       case EGO_RING_COLD_BALL:
-#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) : 80+d80 ¥¿¡¼¥óËè";
-#else
-                               return "cold ball (100) every 80+d80 turns";
-#endif
-                       case EGO_RING_ELEC_BALL:
-#ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) : 80+d80 ¥¿¡¼¥óËè";
-#else
-                               return "elec ball (100) every 80+d80 turns";
-#endif
-                       case EGO_RING_ACID_BALL:
-#ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë (100) : 80+d80 ¥¿¡¼¥óËè";
-#else
-                               return "acid ball (100) every 80+d80 turns";
-#endif
-                       case EGO_RING_MANA_BALL:
-#ifdef JP
-return "ËâÎϤÎÍò (250) : 300 ¥¿¡¼¥óËè";
-#else
-                               return "mana storm (250) every 300 turns";
-#endif
-                       case EGO_RING_DRAGON_F:
-                               if (o_ptr->sval == SV_RING_FLAMES)
-#ifdef JP
-return "²Ð±ê¤Î¥Ö¥ì¥¹ (200) ¤È²Ð¤Ø¤ÎÂÑÀ­ : 200 ¥¿¡¼¥óËè";
-#else
-                                       return "breath of fire (200) and resist fire every 200 turns";
-#endif
-                               else
-#ifdef JP
-return "²Ð±ê¤Î¥Ö¥ì¥¹ (200) : 250 ¥¿¡¼¥óËè";
-#else
-                                       return "fire breath (200) every 250 turns";
-#endif
-                       case EGO_RING_DRAGON_C:
-                               if (o_ptr->sval == SV_RING_ICE)
-#ifdef JP
-return "Î䵤¤Î¥Ö¥ì¥¹ (200) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ­ : 200 ¥¿¡¼¥óËè";
-#else
-                                       return "breath of cold (200) and resist cold every 200 turns";
-#endif
-                               else
-#ifdef JP
-return "Î䵤¤Î¥Ö¥ì¥¹ (200) : 250 ¥¿¡¼¥óËè";
-#else
-                                       return "cold breath (200) every 250 turns";
-#endif
-                       case EGO_RING_M_DETECT:
-#ifdef JP
-return "Á´¥â¥ó¥¹¥¿¡¼´¶ÃΠ: 150 ¥¿¡¼¥óËè";
-#else
-                               return "detect all monsters every 150 turns";
-#endif
-                       case EGO_RING_D_SPEED:
-#ifdef JP
-return "¥¹¥Ô¡¼¥É(15+d30¥¿¡¼¥ó) : 100 ¥¿¡¼¥óËè";
-#else
-                               return "haste self (15+d30 turns) every 100 turns";
-#endif
-                       case EGO_RING_BERSERKER:
-#ifdef JP
-return "¶¸Àï»Î²½(25+d25¥¿¡¼¥ó) : 75+d75 ¥¿¡¼¥óËè";
-#else
-                               return "berserk (25+d25 turns) every 75+d75 turns";
-#endif
-                       case EGO_RING_TELE_AWAY:
-#ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È¡¦¥¢¥¦¥§¥¤ : 150 ¥¿¡¼¥óËè";
-#else
-                       return "teleport away every 150 turns";
-#endif
-                       case EGO_RING_TRUE:
-#ifdef JP
-return "»Îµ¤¹âÍÈ¡¢½ËÊ¡¡¢µæ¶Ë¤ÎÂÑÀ­ : 777 ¥¿¡¼¥óËè";
-#else
-                       return "hero, bless, and ultimate resistance every 777 turns";
-#endif
-                       }
-               }
-               switch (o_ptr->sval)
-               {
-                       case SV_RING_FLAMES:
-#ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (100) ¤È²Ð¤Ø¤ÎÂÑÀ­ : 50+d50 ¥¿¡¼¥óËè";
-#else
-                               return "ball of fire (100) and resist fire every 50+d50 turns";
-#endif
-
-                       case SV_RING_ICE:
-#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ­ : 50+d50 ¥¿¡¼¥óËè";
-#else
-                               return "ball of cold (100) and resist cold every 50+d50 turns";
-#endif
-
-                       case SV_RING_ACID:
-#ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë (100) ¤È»À¤Ø¤ÎÂÑÀ­ : 50+d50 ¥¿¡¼¥óËè";
-#else
-                               return "ball of acid (100) and resist acid every 50+d50 turns";
-#endif
-
-                       case SV_RING_ELEC:
-#ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) ¤ÈÅÅ·â¤Ø¤ÎÂÑÀ­ : 50+d50 ¥¿¡¼¥óËè";
-#else
-                               return "ball of elec (100) and resist elec every 50+d50 turns";
-#endif
-
-                       default:
-                               return NULL;
-               }
-       }
-
-       if (o_ptr->tval == TV_AMULET)
-       {
-               if (o_ptr->name2)
-               {
-                       switch (o_ptr->name2)
-                       {
-                       case EGO_AMU_IDENT:
-#ifdef JP
-return "´ÕÄê : 10 ¥¿¡¼¥óËè";
-#else
-                               return "identify every 10 turns";
-#endif
-                               break;
-                       case EGO_AMU_CHARM:
-#ifdef JP
-return "¥â¥ó¥¹¥¿¡¼Ì¥Î» : 200 ¥¿¡¼¥óËè";
-#else
-                               return "charm monster every 200 turns";
-#endif
-                               break;
-                       case EGO_AMU_JUMP:
-#ifdef JP
-return "¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È : 10+d10 ¥¿¡¼¥óËè";
-#else
-                               return "blink every 10+d10 turns";
-#endif
-                               break;
-                       case EGO_AMU_TELEPORT:
-#ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È : 50+d50 ¥¿¡¼¥óËè";
-#else
-                               return "teleport every 50+d50 turns";
-#endif
-                               break;
-                       case EGO_AMU_D_DOOR:
-#ifdef JP
-return "¼¡¸µ¤ÎÈâ : 200 ¥¿¡¼¥óËè";
-#else
-                               return "dimension door every 200 turns";
-#endif
-                               break;
-                       case EGO_AMU_RES_FIRE_:
-#ifdef JP
-return "²Ð±ê¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist fire every 50+d50 turns";
-#endif
-                               break;
-                       case EGO_AMU_RES_COLD_:
-#ifdef JP
-return "Î䵤¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist cold every 50+d50 turns";
-#endif
-                               break;
-                       case EGO_AMU_RES_ELEC_:
-#ifdef JP
-return "ÅÅ·â¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist elec every 50+d50 turns";
-#endif
-                               break;
-                       case EGO_AMU_RES_ACID_:
-#ifdef JP
-return "»À¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè";
-#else
-                               return "resist acid every 50+d50 turns";
-#endif
-                               break;
-                       case EGO_AMU_DETECTION:
-#ifdef JP
-return "Á´´¶ÃΠ: 55+d55¥¿¡¼¥óËè";
-#else
-                               return "detect all floor every 55+d55 turns";
-#endif
-                               break;
-                       }
-               }
-       }
-
-       if (o_ptr->tval == TV_WHISTLE)
-       {
-#ifdef JP
-return "¥Ú¥Ã¥È¸Æ¤Ó´ó¤» : 100+d100¥¿¡¼¥óËè";
-#else
-               return "call pet every 100+d100 turns";
-#endif
-       }
-
-       if (o_ptr->tval == TV_CAPTURE)
-       {
-#ifdef JP
-return "¥â¥ó¥¹¥¿¡¼¤òÊᤨ¤ë¡¢Ëô¤Ï²òÊü¤¹¤ë¡£";
-#else
-               return "captures or releases a monster.";
-#endif
-       }
-
-       /* Require dragon scale mail */
-#ifdef JP
-if (o_ptr->tval != TV_DRAG_ARMOR) return ("´ñ̯¤Ê¸÷");
-#else
-       if (o_ptr->tval != TV_DRAG_ARMOR) return ("a strange glow");
-#endif
-
-
-       /* Branch on the sub-type */
-       switch (o_ptr->sval)
-       {
-               case SV_DRAGON_BLUE:
-               {
-#ifdef JP
-return "°ðºÊ¤Î¥Ö¥ì¥¹(100) : 150+d150 ¥¿¡¼¥óËè";
-#else
-                       return "breathe lightning (100) every 150+d150 turns";
-#endif
-
-               }
-               case SV_DRAGON_WHITE:
-               {
-#ifdef JP
-return "Î䵤¤Î¥Ö¥ì¥¹(110) : 150+d150 ¥¿¡¼¥óËè";
-#else
-                       return "breathe frost (110) every 150+d150 turns";
-#endif
-
-               }
-               case SV_DRAGON_BLACK:
-               {
-#ifdef JP
-return "»À¤Î¥Ö¥ì¥¹(130) : 150+d150 ¥¿¡¼¥óËè";
-#else
-                       return "breathe acid (130) every 150+d150 turns";
-#endif
-
-               }
-               case SV_DRAGON_GREEN:
-               {
-#ifdef JP
-return "ÆǤΥ¬¥¹¤Î¥Ö¥ì¥¹(150) : 180+d180 ¥¿¡¼¥óËè";
-#else
-                       return "breathe poison gas (150) every 180+d180 turns";
-#endif
-
-               }
-               case SV_DRAGON_RED:
-               {
-#ifdef JP
-return "²Ð±ê¤Î¥Ö¥ì¥¹(200) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe fire (200) every 200+d200 turns";
-#endif
-
-               }
-               case SV_DRAGON_MULTIHUED:
-               {
-#ifdef JP
-return "Ëü¿§¤Î¥Ö¥ì¥¹(250) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe multi-hued (250) every 200+d200 turns";
-#endif
-
-               }
-               case SV_DRAGON_BRONZE:
-               {
-#ifdef JP
-return "º®Íð¤Î¥Ö¥ì¥¹(120) : 180+d180 ¥¿¡¼¥óËè";
-#else
-                       return "breathe confusion (120) every 180+d180 turns";
-#endif
-
-               }
-               case SV_DRAGON_GOLD:
-               {
-#ifdef JP
-return "¹ì²»¤Î¥Ö¥ì¥¹(130) : 180+d180 ¥¿¡¼¥óËè";
-#else
-                       return "breathe sound (130) every 180+d180 turns";
-#endif
-
-               }
-               case SV_DRAGON_CHAOS:
-               {
-#ifdef JP
-return "¥«¥ª¥¹/Îô²½¤Î¥Ö¥ì¥¹(220) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe chaos/disenchant (220) every 200+d200 turns";
-#endif
-
-               }
-               case SV_DRAGON_LAW:
-               {
-#ifdef JP
-return "¹ì²»/ÇËÊҤΥ֥쥹(230) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe sound/shards (230) every 200+d200 turns";
-#endif
-
-               }
-               case SV_DRAGON_BALANCE:
-               {
-#ifdef JP
-return "¥Ð¥é¥ó¥¹¤Î¥Ö¥ì¥¹ (250) 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe balance (250) every 200+d200 turns";
-#endif
-
-               }
-               case SV_DRAGON_SHINING:
-               {
-#ifdef JP
-return "Á®¸÷/°Å¹õ¤Î¥Ö¥ì¥¹(200) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe light/darkness (200) every 200+d200 turns";
-#endif
-
-               }
-               case SV_DRAGON_POWER:
-               {
-#ifdef JP
-return "¥¨¥ì¥á¥ó¥È¤Î¥Ö¥ì¥¹(300) : 200+d200 ¥¿¡¼¥óËè";
-#else
-                       return "breathe the elements (300) every 200+d200 turns";
-#endif
-
-               }
-       }
-
-       /* Oops */
-#ifdef JP
-return "¶õµ¤¤Î©";
-#else
-       return "breathe air";
-#endif
-
-}
-
-
-/*
- * Describe a "fully identified" item
- */
-bool identify_fully_aux(object_type *o_ptr)
-{
-       int                     i = 0, j, k;
-
-       u32b f1, f2, f3;
-
-       cptr            info[128];
-       u32b flag;
-       char o_name[MAX_NLEN];
-       int wid, hgt;
-
-       /* Extract the flags */
-       object_flags(o_ptr, &f1, &f2, &f3);
-
-       /* Extract the description */
-       {
-               char temp[70 * 20];
-
-               roff_to_buf(o_ptr->name1 ? (a_text + a_info[o_ptr->name1].text) :
-                           (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text),
-                           77 - 15, temp);
-               for (j = 0; temp[j]; j += 1 + strlen(&temp[j]))
-               { info[i] = &temp[j]; i++;}
-       }
-
-       /* Mega-Hack -- describe activation */
-       if (f3 & (TR3_ACTIVATE))
-       {
-#ifdef JP
-info[i++] = "»ÏÆ°¤·¤¿¤È¤­¤Î¸ú²Ì...";
-#else
-               info[i++] = "It can be activated for...";
-#endif
-
-               info[i++] = item_activation(o_ptr);
-#ifdef JP
-info[i++] = "...¤¿¤À¤·ÁõÈ÷¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£";
-#else
-               info[i++] = "...if it is being worn.";
-#endif
-
-       }
-
-       /* Figurines, a hack */
-       if (o_ptr->tval == TV_FIGURINE)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅꤲ¤¿»þ¥Ú¥Ã¥È¤ËÊѲ½¤¹¤ë¡£";
-#else
-               info[i++] = "It will transform into a pet when thrown.";
-#endif
-
-       }
-
-       /* Figurines, a hack */
-       if (o_ptr->name1 == ART_STONEMASK)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤òÁõÈ÷¤·¤¿¼Ô¤ÏµÛ·ìµ´¤Ë¤Ê¤ë¡£";
-#else
-               info[i++] = "It makes you turn into a vampire permanently.";
-#endif
-
-       }
-
-       if ((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_DOKUBARI))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÁê¼ê¤ò°ì·â¤ÇÅݤ¹¤³¤È¤¬¤¢¤ë¡£";
-#else
-               info[i++] = "It will attempts to kill a monster instantly.";
-#endif
-
-       }
-
-       if ((o_ptr->tval == TV_POLEARM) && (o_ptr->sval == SV_DEATH_SCYTHE))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¼«Ê¬¼«¿È¤Ë¹¶·â¤¬Ê֤äƤ¯¤ë¤³¤È¤¬¤¢¤ë¡£";
-#else
-               info[i++] = "It strikes yourself sometimes.";
-#endif
-
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï̵Ũ¤Î¥Ð¥ê¥¢¤òÀÚ¤êÎö¤¯¡£";
-#else
-               info[i++] = "It will always penetrates invulnerability barrier.";
-#endif
-       }
-
-       if (o_ptr->name2 == EGO_2WEAPON)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÆóÅáή¤Ç¤ÎÌ¿ÃæΨ¤ò¸þ¾å¤µ¤»¤ë¡£";
-#else
-               info[i++] = "It affects your ability to hit when you are wielding two weapons.";
-#endif
-
-       }
-
-       if (o_ptr->name2 == EGO_RING_WIZARD)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò²¼¤²¤ë¡£";
-#else
-               info[i++] = "It affects your ability to use magic devices.";
-#endif
-       }
-
-       if (o_ptr->name2 == EGO_AMU_FOOL)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò¾å¤²¤ë¡£";
-#else
-               info[i++] = "It prevents you from using magic items.";
-#endif
-       }
-
-       if (o_ptr->name2 == EGO_RING_THROW)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ïʪ¤ò¶¯¤¯Åꤲ¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
-#else
-               info[i++] = "It provides great strength when you throw an item.";
-#endif
-       }
-
-       if (o_ptr->name2 == EGO_AMU_NAIVETY)
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâË¡Äñ¹³ÎϤò²¼¤²¤ë¡£";
-#else
-               info[i++] = "It decreases your magic resistance.";
-#endif
-       }
-
-       if (o_ptr->tval == TV_STATUE)
-       {
-               monster_race *r_ptr = &r_info[o_ptr->pval];
-
-               if (o_ptr->pval == MON_BULLGATES)
-#ifdef JP
-                       info[i++] = "¤½¤ì¤ÏÉô²°¤Ë¾þ¤ë¤ÈÃѤº¤«¤·¤¤¡£";
-#else
-                       info[i++] = "It is shameful.";
-#endif
-               else if ( r_ptr->flags2 & (RF2_ELDRITCH_HORROR))
-#ifdef JP
-                       info[i++] = "¤½¤ì¤ÏÉô²°¤Ë¾þ¤ë¤È¶²¤¤¡£";
-#else
-               info[i++] = "It is fearful.";
-#endif
-               else
-#ifdef JP
-                       info[i++] = "¤½¤ì¤ÏÉô²°¤Ë¾þ¤ë¤È³Ú¤·¤¤¡£";
-#else
-               info[i++] = "It is cheerful.";
-#endif
-       }
-       
-       /* Hack -- describe lite's */
-       if (o_ptr->tval == TV_LITE)
-       {
-               if (o_ptr->name2 == EGO_LITE_DARKNESS)
-               {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
-#else
-                       info[i++] = "It provides no light..";
-#endif
-               }
-               else if (artifact_p(o_ptr))
-               {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
-#else
-                       info[i++] = "It provides light (radius 3) forever.";
-#endif
-
-               }
-               else if (o_ptr->name2 == EGO_LITE_SHINE)
-               {
-                       if (o_ptr->sval == SV_LITE_FEANOR)
-                       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
-#else
-                               info[i++] = "It provides light (radius 3) forever.";
-#endif
-
-                       }
-                       else if (o_ptr->sval == SV_LITE_LANTERN)
-                       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
-#else
-                               info[i++] = "It provides light (radius 3) when fueled.";
-#endif
-
-                       }
-                       else
-                       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 2)¤ò¼ø¤±¤ë¡£";
-#else
-                               info[i++] = "It provides light (radius 2) when fueled.";
-#endif
-
-                       }
-               }
-               else
-               {
-                       if (o_ptr->sval == SV_LITE_FEANOR)
-                       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 2)¤ò¼ø¤±¤ë¡£";
-#else
-                               info[i++] = "It provides light (radius 2) forever.";
-#endif
-
-                       }
-                       else if (o_ptr->sval == SV_LITE_LANTERN)
-                       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 2)¤ò¼ø¤±¤ë¡£";
-#else
-                               info[i++] = "It provides light (radius 2) when fueled.";
-#endif
-
-                       }
-                       else
-                       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â 1)¤ò¼ø¤±¤ë¡£";
-#else
-                               info[i++] = "It provides light (radius 1) when fueled.";
-#endif
-
-                       }
-               }
-               if (o_ptr->name2 == EGO_LITE_LONG)
-               {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏŤ¤¥¿¡¼¥óÌÀ¤«¤ê¤ò¼ø¤±¤ë¡£";
-#else
-                       info[i++] = "It provides light for much longer time.";
-#endif
-               }
-       }
-
-
-       /* And then describe it fully */
-
-       if (f2 & (TR2_RIDING))
-       {
-               if ((o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE)))
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤ÏÈó¾ï¤Ë»È¤¤¤ä¤¹¤¤¡£";
-#else
-                       info[i++] = "It is made for use while riding.";
-#endif
-               else
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
-#else
-                       info[i++] = "It is suitable for use while riding.";
-#endif
-
-       }
-       if (f1 & (TR1_STR))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your strength.";
-#endif
-
-       }
-       if (f1 & (TR1_INT))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your intelligence.";
-#endif
-
-       }
-       if (f1 & (TR1_WIS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¸­¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your wisdom.";
-#endif
-
-       }
-       if (f1 & (TR1_DEX))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your dexterity.";
-#endif
-
-       }
-       if (f1 & (TR1_CON))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your constitution.";
-#endif
-
-       }
-       if (f1 & (TR1_CHR))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your charisma.";
-#endif
-
-       }
-
-       if (f1 & (TR1_MAGIC_MASTERY))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâË¡Æ»¶ñ»ÈÍÑǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your ability to use magic devices.";
-#endif
-
-       }
-       if (f1 & (TR1_STEALTH))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your stealth.";
-#endif
-
-       }
-       if (f1 & (TR1_SEARCH))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your searching.";
-#endif
-
-       }
-       if (f1 & (TR1_INFRA))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your infravision.";
-#endif
-
-       }
-       if (f1 & (TR1_TUNNEL))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your ability to tunnel.";
-#endif
-
-       }
-       if (f1 & (TR1_SPEED))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your speed.";
-#endif
-
-       }
-       if (f1 & (TR1_BLOWS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
-#else
-               info[i++] = "It affects your attack speed.";
-#endif
-
-       }
-
-       if (f1 & (TR1_BRAND_ACID))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë";
-#else
-               info[i++] = "It does extra damage from acid.";
-#endif
-
-       }
-       if (f1 & (TR1_BRAND_ELEC))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë";
-#else
-               info[i++] = "It does extra damage from electricity.";
-#endif
-
-       }
-       if (f1 & (TR1_BRAND_FIRE))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë";
-#else
-               info[i++] = "It does extra damage from fire.";
-#endif
-
-       }
-       if (f1 & (TR1_BRAND_COLD))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë";
-#else
-               info[i++] = "It does extra damage from frost.";
-#endif
-
-       }
-
-       if (f1 & (TR1_BRAND_POIS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏŨ¤òÆǤ¹¤ë¡£";
-#else
-               info[i++] = "It poisons your foes.";
-#endif
-
-       }
-
-       if (f1 & (TR1_CHAOTIC))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹Åª¤Ê¸ú²Ì¤òµÚ¤Ü¤¹¡£";
-#else
-               info[i++] = "It produces chaotic effects.";
-#endif
-
-       }
-
-       if (f1 & (TR1_VAMPIRIC))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏŨ¤«¤é¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤òµÛ¼ý¤¹¤ë¡£";
-#else
-               info[i++] = "It drains life from your foes.";
-#endif
-
-       }
-
-       if (f1 & (TR1_IMPACT))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÃϿ̤òµ¯¤³¤¹¤³¤È¤¬¤Ç¤­¤ë¡£";
-#else
-               info[i++] = "It can cause earthquakes.";
-#endif
-
-       }
-
-       if (f1 & (TR1_VORPAL))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÈó¾ï¤ËÀÚ¤ìÌ£¤¬±Ô¤¯Å¨¤òÀÚÃǤ¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£";
-#else
-               info[i++] = "It is very sharp and can cut your foes.";
-#endif
-
-       }
-
-       if (f1 & (TR1_KILL_DRAGON))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
-#else
-               info[i++] = "It is a great bane of dragons.";
-#endif
-
-       }
-       else if (f1 & (TR1_SLAY_DRAGON))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It is especially deadly against dragons.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_ORC))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It is especially deadly against orcs.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_TROLL))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It is especially deadly against trolls.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_GIANT))
-       {
-               if (o_ptr->name1 == ART_HRUNTING)
-#ifdef JP
-info[i++] = "¤½¤ì¤Ïµð¿Í¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
-#else
-               info[i++] = "It is a great bane of giants.";
-#endif
-               else
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥¸¥ã¥¤¥¢¥ó¥È¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It is especially deadly against giants.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_DEMON))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It strikes at demons with holy wrath.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_UNDEAD))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It strikes at undead with holy wrath.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_EVIL))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¼Ù°­¤Ê¤ë¸ºß¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤǹ¶·â¤¹¤ë¡£";
-#else
-               info[i++] = "It fights against evil with holy fury.";
-#endif
-
-       }
-       if (f1 & (TR1_SLAY_ANIMAL))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It is especially deadly against natural creatures.";
-#endif
-
-       }
-       if (f3 & (TR3_SLAY_HUMAN))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
-#else
-               info[i++] = "It is especially deadly against humans.";
-#endif
-
-       }
-
-       if (f1 & (TR1_FORCE_WEAPON))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï»ÈÍѼԤÎËâÎϤò»È¤Ã¤Æ¹¶·â¤¹¤ë¡£";
-#else
-               info[i++] = "It powerfully strikes at a monster using your mana.";
-#endif
-
-       }
-       if (f3 & (TR3_DEC_MANA))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâÎϤξÃÈñ¤ò²¡¤µ¤¨¤ë¡£";
-#else
-               info[i++] = "It decreases your mana consumption.";
-#endif
-
-       }
-       if (f2 & (TR2_SUST_STR))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÏÓÎϤò°Ý»ý¤¹¤ë¡£";
-#else
-               info[i++] = "It sustains your strength.";
-#endif
-
-       }
-       if (f2 & (TR2_SUST_INT))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÃÎǽ¤ò°Ý»ý¤¹¤ë¡£";
-#else
-               info[i++] = "It sustains your intelligence.";
-#endif
-
-       }
-       if (f2 & (TR2_SUST_WIS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¸­¤µ¤ò°Ý»ý¤¹¤ë¡£";
-#else
-               info[i++] = "It sustains your wisdom.";
-#endif
-
-       }
-       if (f2 & (TR2_SUST_DEX))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î´ïÍѤµ¤ò°Ý»ý¤¹¤ë¡£";
-#else
-               info[i++] = "It sustains your dexterity.";
-#endif
-
-       }
-       if (f2 & (TR2_SUST_CON))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÂѵ×ÎϤò°Ý»ý¤¹¤ë¡£";
-#else
-               info[i++] = "It sustains your constitution.";
-#endif
-
-       }
-       if (f2 & (TR2_SUST_CHR))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÌ¥ÎϤò°Ý»ý¤¹¤ë¡£";
-#else
-               info[i++] = "It sustains your charisma.";
-#endif
-
-       }
-
-       if (f2 & (TR2_IM_ACID))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides immunity to acid.";
-#endif
-
-       }
-       if (f2 & (TR2_IM_ELEC))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides immunity to electricity.";
-#endif
-
-       }
-       if (f2 & (TR2_IM_FIRE))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï²Ð¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides immunity to fire.";
-#endif
-
-       }
-       if (f2 & (TR2_IM_COLD))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï´¨¤µ¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides immunity to cold.";
-#endif
-
-       }
-
-       if (f2 & (TR2_THROW))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏŨ¤ËÅꤲ¤ÆÂ礭¤Ê¥À¥á¡¼¥¸¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤­¤ë¡£";
-#else
-               info[i++] = "It is perfectly balanced for throwing.";
-#endif
-       }
-
-       if (f2 & (TR2_FREE_ACT))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËãáã¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides immunity to paralysis.";
-#endif
-
-       }
-       if (f2 & (TR2_HOLD_LIFE))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÀ¸Ì¿Îϵۼý¤ËÂФ¹¤ëÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to life draining.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_FEAR))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¶²Éݤؤδ°Á´¤ÊÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It makes you completely fearless.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_ACID))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to acid.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_ELEC))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to electricity.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_FIRE))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï²Ð¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to fire.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_COLD))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï´¨¤µ¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to cold.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_POIS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÆǤؤÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to poison.";
-#endif
-
-       }
-
-       if (f2 & (TR2_RES_LITE))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÁ®¸÷¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to light.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_DARK))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï°Å¹õ¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to dark.";
-#endif
-
-       }
-
-       if (f2 & (TR2_RES_BLIND))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌÕÌܤؤÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to blindness.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_CONF))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ïº®Íð¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to confusion.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_SOUND))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¹ì²»¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to sound.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_SHARDS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÇËÊҤؤÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to shards.";
-#endif
-
-       }
-
-       if (f2 & (TR2_RES_NETHER))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÃϹö¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to nether.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_NEXUS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï°ø²Ìº®Íð¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to nexus.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_CHAOS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to chaos.";
-#endif
-
-       }
-       if (f2 & (TR2_RES_DISEN))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÎô²½¤Ø¤ÎÂÑÀ­¤ò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It provides resistance to disenchantment.";
-#endif
-
-       }
-
-       if (f3 & (TR3_FEATHER))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÃè¤ËÉ⤯¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
-#else
-               info[i++] = "It allows you to levitate.";
-#endif
-
-       }
-       if (f3 & (TR3_LITE))
-       {
-               if ((o_ptr->name2 == EGO_DARK) || (o_ptr->name1 == ART_NIGHT))
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë¡£";
-#else
-                       info[i++] = "It decreases radius of your light source.";
-#endif
-               else
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤ÎÌÀ¤«¤ê¤ò¼ø¤±¤ë¡£";
-#else
-                       info[i++] = "It provides permanent light.";
-#endif
-
-       }
-       if (f3 & (TR3_SEE_INVIS))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÆ©ÌÀ¤Ê¥â¥ó¥¹¥¿¡¼¤ò¸«¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
-#else
-               info[i++] = "It allows you to see invisible monsters.";
-#endif
-
-       }
-       if (f3 & (TR3_TELEPATHY))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ñ¥·¡¼Ç½ÎϤò¼ø¤±¤ë¡£";
-#else
-               info[i++] = "It gives telepathic powers.";
-#endif
-
-       }
-       if (f3 & (TR3_SLOW_DIGEST))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤òÃÙ¤¯¤¹¤ë¡£";
-#else
-               info[i++] = "It slows your metabolism.";
-#endif
-
-       }
-       if (f3 & (TR3_REGEN))
-       {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂÎÎϲóÉüÎϤò¶¯²½¤¹¤ë¡£";
-#else
-               info[i++] = "It speeds your regenerative powers.";
+               info[i++] = "It speeds your regenerative powers.";
 #endif
 
        }
-       if (f3 & (TR3_WARNING))
+       if (have_flag(flgs, TR_WARNING))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤Ï´í¸±¤ËÂФ·¤Æ·Ù¹ð¤òȯ¤¹¤ë¡£";
@@ -3310,34 +1646,19 @@ info[i++] = "
 #endif
 
        }
-       if (f2 & (TR2_REFLECT))
+       if (have_flag(flgs, TR_REFLECT))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌð¤ä¥Ü¥ë¥È¤òÈ¿¼Í¤¹¤ë¡£";
-#else
-               info[i++] = "It reflects bolts and arrows.";
-#endif
-
+               info[i++] = _("¤½¤ì¤ÏÌð¤Î¼öʸ¤òÈ¿¼Í¤¹¤ë¡£", "It reflects bolt spells.");
        }
-       if (f3 & (TR3_SH_FIRE))
+       if (have_flag(flgs, TR_SH_FIRE))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï±ê¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
-#else
-               info[i++] = "It produces a fiery sheath.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï±ê¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£", "It produces a fiery sheath.");
        }
-       if (f3 & (TR3_SH_ELEC))
+       if (have_flag(flgs, TR_SH_ELEC))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅŵ¤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
-#else
-               info[i++] = "It produces an electric sheath.";
-#endif
-
+               info[i++] = _("¤½¤ì¤ÏÅŵ¤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£", "It produces an electric sheath.");
        }
-       if (f3 & (TR3_SH_COLD))
+       if (have_flag(flgs, TR_SH_COLD))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤ÏÎ䵤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
@@ -3346,7 +1667,7 @@ info[i++] = "
 #endif
 
        }
-       if (f3 & (TR3_NO_MAGIC))
+       if (have_flag(flgs, TR_NO_MAGIC))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤ÏÈ¿ËâË¡¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
@@ -3355,7 +1676,7 @@ info[i++] = "
 #endif
 
        }
-       if (f3 & (TR3_NO_TELE))
+       if (have_flag(flgs, TR_NO_TELE))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤹¤ë¡£";
@@ -3364,7 +1685,7 @@ info[i++] = "
 #endif
 
        }
-       if (f3 & (TR3_XTRA_MIGHT))
+       if (have_flag(flgs, TR_XTRA_MIGHT))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤò¤è¤ê¶¯ÎϤËȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£";
@@ -3373,7 +1694,7 @@ info[i++] = "
 #endif
 
        }
-       if (f3 & (TR3_XTRA_SHOTS))
+       if (have_flag(flgs, TR_XTRA_SHOTS))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤòÈó¾ï¤ËÁ᤯ȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£";
@@ -3383,7 +1704,7 @@ info[i++] = "
 
        }
 
-       if (f3 & TR3_BLESSED)
+       if (have_flag(flgs, TR_BLESSED))
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤Ï¿À¤Ë½ËÊ¡¤µ¤ì¤Æ¤¤¤ë¡£";
@@ -3393,7 +1714,7 @@ info[i++] = "
 
        }
 
-       if (cursed_p(o_ptr))
+       if (object_is_cursed(o_ptr))
        {
                if (o_ptr->curse_flags & TRC_PERMA_CURSE)
                {
@@ -3421,215 +1742,186 @@ info[i++] = "
                        info[i++] = "It is cursed.";
 #endif
 
+                       /*
+                        * It's a trivial infomation since there is
+                        * fake inscription {cursed}
+                        */
+                       trivial_info++;
                }
        }
 
-       if ((f3 & TR3_TY_CURSE) || (o_ptr->curse_flags & TRC_TY_CURSE))
+       if ((have_flag(flgs, TR_TY_CURSE)) || (o_ptr->curse_flags & TRC_TY_CURSE))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂÀ¸Å¤Î²Ò¡¹¤·¤¤±åÇ°¤¬½É¤Ã¤Æ¤¤¤ë¡£";
-#else
-               info[i++] = "It carries an ancient foul curse.";
-#endif
-
+               info[i++] = _("¤½¤ì¤ÏÂÀ¸Å¤Î²Ò¡¹¤·¤¤±åÇ°¤¬½É¤Ã¤Æ¤¤¤ë¡£", "It carries an ancient foul curse.");
        }
-       if ((f3 & TR3_AGGRAVATE) || (o_ptr->curse_flags & TRC_AGGRAVATE))
+       if ((have_flag(flgs, TR_AGGRAVATE)) || (o_ptr->curse_flags & TRC_AGGRAVATE))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏÉÕ¶á¤Î¥â¥ó¥¹¥¿¡¼¤òÅܤ餻¤ë¡£";
-#else
-               info[i++] = "It aggravates nearby creatures.";
-#endif
-
+               info[i++] = _("¤½¤ì¤ÏÉÕ¶á¤Î¥â¥ó¥¹¥¿¡¼¤òÅܤ餻¤ë¡£", "It aggravates nearby creatures.");
        }
-       if ((f3 & (TR3_DRAIN_EXP)) || (o_ptr->curse_flags & TRC_DRAIN_EXP))
+       if ((have_flag(flgs, TR_DRAIN_EXP)) || (o_ptr->curse_flags & TRC_DRAIN_EXP))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï·Ð¸³ÃͤòµÛ¤¤¼è¤ë¡£";
-#else
-               info[i++] = "It drains experience.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï·Ð¸³ÃͤòµÛ¤¤¼è¤ë¡£", "It drains experience.");
        }
        if (o_ptr->curse_flags & TRC_SLOW_REGEN)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï²óÉüÎϤò¼å¤á¤ë¡£";
-#else
-               info[i++] = "It slows your regenerative powers.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï²óÉüÎϤò¼å¤á¤ë¡£", "It slows your regenerative powers.");
        }
-       if (o_ptr->curse_flags & TRC_ADD_L_CURSE)
+       if ((o_ptr->curse_flags & TRC_ADD_L_CURSE) || have_flag(flgs, TR_ADD_L_CURSE))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¼å¤¤¼ö¤¤¤òÁý¤ä¤¹¡£";
-#else
-               info[i++] = "It adds weak curses.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¼å¤¤¼ö¤¤¤òÁý¤ä¤¹¡£","It adds weak curses.");
        }
-       if (o_ptr->curse_flags & TRC_ADD_H_CURSE)
+       if ((o_ptr->curse_flags & TRC_ADD_H_CURSE) || have_flag(flgs, TR_ADD_H_CURSE))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¶¯ÎϤʼö¤¤¤òÁý¤ä¤¹¡£";
-#else
-               info[i++] = "It adds heavy curses.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¶¯ÎϤʼö¤¤¤òÁý¤ä¤¹¡£","It adds heavy curses.");
        }
        if (o_ptr->curse_flags & TRC_CALL_ANIMAL)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ïưʪ¤ò¸Æ¤Ó´ó¤»¤ë¡£";
-#else
-               info[i++] = "It attracts animals.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ïưʪ¤ò¸Æ¤Ó´ó¤»¤ë¡£", "It attracts animals.");
        }
        if (o_ptr->curse_flags & TRC_CALL_DEMON)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï°­Ëâ¤ò¸Æ¤Ó´ó¤»¤ë¡£";
-#else
-               info[i++] = "It attracts demons.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï°­Ëâ¤ò¸Æ¤Ó´ó¤»¤ë¡£", "It attracts demons.");
        }
        if (o_ptr->curse_flags & TRC_CALL_DRAGON)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ò¸Æ¤Ó´ó¤»¤ë¡£";
-#else
-               info[i++] = "It attracts dragons.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¥É¥é¥´¥ó¤ò¸Æ¤Ó´ó¤»¤ë¡£", "It attracts dragons.");
        }
        if (o_ptr->curse_flags & TRC_COWARDICE)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¶²ÉÝ´¶¤ò°ú¤­µ¯¤³¤¹¡£";
-#else
-               info[i++] = "It makes you subject to cowardice.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¶²ÉÝ´¶¤ò°ú¤­µ¯¤³¤¹¡£", "It makes you subject to cowardice.");
        }
-       if ((f3 & (TR3_TELEPORT)) || (o_ptr->curse_flags & TRC_TELEPORT))
+       if ((have_flag(flgs, TR_TELEPORT)) || (o_ptr->curse_flags & TRC_TELEPORT))
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥é¥ó¥À¥à¤Ê¥Æ¥ì¥Ý¡¼¥È¤ò°ú¤­µ¯¤³¤¹¡£";
-#else
-               info[i++] = "It induces random teleportation.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¥é¥ó¥À¥à¤Ê¥Æ¥ì¥Ý¡¼¥È¤ò°ú¤­µ¯¤³¤¹¡£", "It induces random teleportation.");
        }
        if (o_ptr->curse_flags & TRC_LOW_MELEE)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¹¶·â¤ò³°¤·¤ä¤¹¤¤¡£";
-#else
-               info[i++] = "It causes you miss blows.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¹¶·â¤ò³°¤·¤ä¤¹¤¤¡£", "It causes you to miss blows.");
        }
        if (o_ptr->curse_flags & TRC_LOW_AC)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤Ï¹¶·â¤ò¼õ¤±¤ä¤¹¤¤¡£";
-#else
-               info[i++] = "It helps your enemys' blows.";
-#endif
-
+               info[i++] = _("¤½¤ì¤Ï¹¶·â¤ò¼õ¤±¤ä¤¹¤¤¡£", "It helps your enemies' blows.");
        }
        if (o_ptr->curse_flags & TRC_LOW_MAGIC)
        {
-#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâË¡¤ò¾§¤¨¤Ë¤¯¤¯¤¹¤ë¡£";
-#else
-               info[i++] = "It encumbers you while spellcasting.";
-#endif
-
+               info[i++] = _("¤½¤ì¤ÏËâË¡¤ò¾§¤¨¤Ë¤¯¤¯¤¹¤ë¡£", "It encumbers you while spellcasting.");
        }
        if (o_ptr->curse_flags & TRC_FAST_DIGEST)
        {
+               info[i++] = _("¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤ò®¤¯¤¹¤ë¡£", "It speeds your metabolism.");
+       }
+       if ((have_flag(flgs, TR_DRAIN_HP)) || (o_ptr->curse_flags & TRC_DRAIN_HP))
+       {
+               info[i++] = _("¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÂÎÎϤòµÛ¤¤¼è¤ë¡£", "It drains you.");
+       }
+       if ((have_flag(flgs, TR_DRAIN_MANA)) || (o_ptr->curse_flags & TRC_DRAIN_MANA))
+       {
+               info[i++] = _("¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎËâÎϤòµÛ¤¤¼è¤ë¡£", "It drains your mana.");
+       }
+
+       /* Describe about this kind of object instead of THIS fake object */
+       if (mode & SCROBJ_FAKE_OBJECT)
+       {
+               switch (o_ptr->tval)
+               {
+               case TV_RING:
+                       switch (o_ptr->sval)
+                       {
+                       case SV_RING_LORDLY:
 #ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤ò®¤¯¤¹¤ë¡£";
+                               info[i++] = "¤½¤ì¤Ï´ö¤Ä¤«¤Î¥é¥ó¥À¥à¤ÊÂÑÀ­¤ò¼ø¤±¤ë¡£";
 #else
-               info[i++] = "It speeds your metabolism.";
+                               info[i++] = "It provides some random resistances.";
 #endif
-
-       }
-       if (o_ptr->curse_flags & TRC_DRAIN_HP)
-       {
+                               break;
+                       case SV_RING_WARNING:
 #ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÂÎÎϤòµÛ¤¤¼è¤ë¡£";
+                               info[i++] = "¤½¤ì¤Ï¤Ò¤È¤Ä¤ÎÄãµé¤ÊESP¤ò¼ø¤±¤ë»ö¤¬¤¢¤ë¡£";
 #else
-               info[i++] = "It drains you.";
+                               info[i++] = "It may provide a low rank ESP.";
 #endif
+                               break;
+                       }
+                       break;
 
-       }
-       if (o_ptr->curse_flags & TRC_DRAIN_MANA)
-       {
+               case TV_AMULET:
+                       switch (o_ptr->sval)
+                       {
+                       case SV_AMULET_RESISTANCE:
 #ifdef JP
-info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎËâÎϤòµÛ¤¤¼è¤ë¡£";
+                               info[i++] = "¤½¤ì¤ÏÆǤؤÎÂÑÀ­¤ò¼ø¤±¤ë»ö¤¬¤¢¤ë¡£";
 #else
-               info[i++] = "It drains your mana.";
+                               info[i++] = "It may provides resistance to poison.";
 #endif
-
-       }
-
-       /* XTRA HACK ARTDESC */
-       flag = TR3_IGNORE_ACID | TR3_IGNORE_ELEC | TR3_IGNORE_FIRE | TR3_IGNORE_COLD ;
-       if ((f3 & flag) == flag)
-       {
 #ifdef JP
-         info[i++] = "¤½¤ì¤Ï»À¡¦Åŷ⡦²Ð±ê¡¦Î䵤¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+                               info[i++] = "¤½¤ì¤Ï¥é¥ó¥À¥à¤ÊÂÑÀ­¤ò¼ø¤±¤ë»ö¤¬¤¢¤ë¡£";
 #else
-         info[i++] = "It cannot be harmed by the elements.";
+                               info[i++] = "It may provide a random resistances.";
 #endif
-       } else {
-       if (f3 & (TR3_IGNORE_ACID))
-       {
+                               break;
+                       case SV_AMULET_THE_MAGI:
 #ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+                               info[i++] = "¤½¤ì¤ÏºÇÂç¤Ç£³¤Ä¤Þ¤Ç¤ÎÄãµé¤ÊESP¤ò¼ø¤±¤ë¡£";
 #else
-               info[i++] = "It cannot be harmed by acid.";
+                               info[i++] = "It provides up to three low rank ESPs.";
 #endif
-
+                               break;
+                       }
+                       break;
+               }
        }
-       if (f3 & (TR3_IGNORE_ELEC))
+
+       if (have_flag(flgs, TR_IGNORE_ACID) &&
+           have_flag(flgs, TR_IGNORE_ELEC) &&
+           have_flag(flgs, TR_IGNORE_FIRE) &&
+           have_flag(flgs, TR_IGNORE_COLD))
        {
 #ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+               info[i++] = "¤½¤ì¤Ï»À¡¦Åŷ⡦²Ð±ê¡¦Î䵤¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
 #else
-               info[i++] = "It cannot be harmed by electricity.";
+               info[i++] = "It cannot be harmed by the elements.";
 #endif
-
        }
-       if (f3 & (TR3_IGNORE_FIRE))
+       else
        {
+               if (have_flag(flgs, TR_IGNORE_ACID))
+               {
 #ifdef JP
-info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+                       info[i++] = "¤½¤ì¤Ï»À¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
 #else
-               info[i++] = "It cannot be harmed by fire.";
+                       info[i++] = "It cannot be harmed by acid.";
 #endif
-
-       }
-       if (f3 & (TR3_IGNORE_COLD))
-       {
+               }
+               if (have_flag(flgs, TR_IGNORE_ELEC))
+               {
 #ifdef JP
-info[i++] = "¤½¤ì¤ÏÎ䵤¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+                       info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
 #else
-               info[i++] = "It cannot be harmed by cold.";
+                       info[i++] = "It cannot be harmed by electricity.";
 #endif
-
+               }
+               if (have_flag(flgs, TR_IGNORE_FIRE))
+               {
+#ifdef JP
+                       info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+#else
+                       info[i++] = "It cannot be harmed by fire.";
+#endif
+               }
+               if (have_flag(flgs, TR_IGNORE_COLD))
+               {
+#ifdef JP
+                       info[i++] = "¤½¤ì¤ÏÎ䵤¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+#else
+                       info[i++] = "It cannot be harmed by cold.";
+#endif
+               }
        }
 
-       /* XTRA HACK ARTDESC */
-       }
+       if (mode & SCROBJ_FORCE_DETAIL) trivial_info = 0;
 
-       /* No special effects */
-       if (!i) return (FALSE);
+       /* No relevant informations */
+       if (i <= trivial_info) return (FALSE);
 
        /* Save the screen */
        screen_save();
@@ -3638,8 +1930,12 @@ info[i++] = "
        Term_get_size(&wid, &hgt);
 
        /* Display Item name */
-       object_desc(o_name, o_ptr, TRUE, 3);
-       prt(format("%s", o_name), 0, 0);
+       if (!(mode & SCROBJ_FAKE_OBJECT))
+               object_desc(o_name, o_ptr, 0);
+       else
+               object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
+
+       prt(o_name, 0, 0);
 
        /* Erase the screen */
        for (k = 1; k < hgt; k++) prt("", k, 13);
@@ -3650,8 +1946,8 @@ info[i++] = "
                monster_race *r_ptr = &r_info[o_ptr->pval];
                int namelen = strlen(r_name + r_ptr->name);
                prt(format("%s: '", r_name + r_ptr->name), 1, 15);
-               c_prt(r_ptr->d_attr, format("%c", r_ptr->d_char), 1, 18+namelen);
-               prt("'", 1, 19+namelen);
+               Term_queue_bigchar(18 + namelen, 1, r_ptr->x_attr, r_ptr->x_char, 0, 0);
+               prt("'", 1, (use_bigtile ? 20 : 19) + namelen);
        }
        else
 #ifdef JP
@@ -3733,6 +2029,16 @@ s16b label_to_inven(int c)
 }
 
 
+/* See cmd5.c */
+extern bool select_ring_slot;
+
+
+static bool is_ring_slot(int i)
+{
+       return (i == INVEN_RIGHT) || (i == INVEN_LEFT);
+}
+
+
 /*
  * Convert a label into the index of a item in the "equip"
  * Return "-1" if the label does not indicate a real item
@@ -3747,6 +2053,8 @@ s16b label_to_equip(int c)
        /* Verify the index */
        if ((i < INVEN_RARM) || (i >= INVEN_TOTAL)) return (-1);
 
+       if (select_ring_slot) return is_ring_slot(i) ? i : -1;
+
        /* Empty slots can never be chosen */
        if (!inventory[i].k_idx) return (-1);
 
@@ -3853,131 +2161,86 @@ cptr mention_use(int i)
        switch (i)
        {
 #ifdef JP
-case INVEN_RARM: p = p_ptr->ryoute ? " Î¾¼ê" : (left_hander ? " º¸¼ê" : " ±¦¼ê"); break;
+               case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "±¿ÈÂÃæ" : ((p_ptr->ryoute && p_ptr->migite) ? " Î¾¼ê" : (left_hander ? " º¸¼ê" : " ±¦¼ê")); break;
 #else
-               case INVEN_RARM: p = "Wielding"; break;
+               case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "Just lifting" : (p_ptr->migite ? "Wielding" : "On arm"); break;
 #endif
 
 #ifdef JP
-case INVEN_LARM:   p = (left_hander ? " ±¦¼ê" : " º¸¼ê"); break;
+               case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "±¿ÈÂÃæ" : ((p_ptr->ryoute && p_ptr->hidarite) ? " Î¾¼ê" : (left_hander ? " ±¦¼ê" : " º¸¼ê")); break;
 #else
-               case INVEN_LARM:   p = "On arm"; break;
+               case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "Just lifting" : (p_ptr->hidarite ? "Wielding" : "On arm"); break;
 #endif
 
 #ifdef JP
-case INVEN_BOW:   p = "¼Í·âÍÑ"; break;
+               case INVEN_BOW:   p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "±¿ÈÂÃæ" : "¼Í·âÍÑ"; break;
 #else
-               case INVEN_BOW:   p = "Shooting"; break;
+               case INVEN_BOW:   p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "Just holding" : "Shooting"; break;
 #endif
 
 #ifdef JP
-case INVEN_LEFT:  p = (left_hander ? "±¦¼ê»Ø" : "º¸¼ê»Ø"); break;
+               case INVEN_RIGHT: p = (left_hander ? "º¸¼ê»Ø" : "±¦¼ê»Ø"); break;
 #else
-               case INVEN_LEFT:  p = "On left hand"; break;
+               case INVEN_RIGHT: p = (left_hander ? "On left hand" : "On right hand"); break;
 #endif
 
 #ifdef JP
-case INVEN_RIGHT: p = (left_hander ? "º¸¼ê»Ø" : "±¦¼ê»Ø"); break;
+               case INVEN_LEFT:  p = (left_hander ? "±¦¼ê»Ø" : "º¸¼ê»Ø"); break;
 #else
-               case INVEN_RIGHT: p = "On right hand"; break;
+               case INVEN_LEFT:  p = (left_hander ? "On right hand" : "On left hand"); break;
 #endif
 
 #ifdef JP
-case INVEN_NECK:  p = "  ¼ó"; break;
+               case INVEN_NECK:  p = "  ¼ó"; break;
 #else
                case INVEN_NECK:  p = "Around neck"; break;
 #endif
 
 #ifdef JP
-case INVEN_LITE:  p = " ¸÷¸»"; break;
+               case INVEN_LITE:  p = " ¸÷¸»"; break;
 #else
                case INVEN_LITE:  p = "Light source"; break;
 #endif
 
 #ifdef JP
-case INVEN_BODY:  p = "  ÂÎ"; break;
+               case INVEN_BODY:  p = "  ÂÎ"; break;
 #else
                case INVEN_BODY:  p = "On body"; break;
 #endif
 
 #ifdef JP
-case INVEN_OUTER: p = "ÂΤξå"; break;
+               case INVEN_OUTER: p = "ÂΤξå"; break;
 #else
                case INVEN_OUTER: p = "About body"; break;
 #endif
 
 #ifdef JP
-case INVEN_HEAD:  p = "  Ƭ"; break;
+               case INVEN_HEAD:  p = "  Ƭ"; break;
 #else
                case INVEN_HEAD:  p = "On head"; break;
 #endif
 
 #ifdef JP
-case INVEN_HANDS: p = "  ¼ê"; break;
+               case INVEN_HANDS: p = "  ¼ê"; break;
 #else
                case INVEN_HANDS: p = "On hands"; break;
 #endif
 
 #ifdef JP
-case INVEN_FEET:  p = "  ­"; break;
+               case INVEN_FEET:  p = "  ­"; break;
 #else
                case INVEN_FEET:  p = "On feet"; break;
 #endif
 
 #ifdef JP
-default:          p = "¥¶¥Ã¥¯"; break;
+               default:          p = "¥¶¥Ã¥¯"; break;
 #else
                default:          p = "In pack"; break;
 #endif
-
-       }
-
-       /* Hack -- Heavy weapon */
-       if (i == INVEN_RARM)
-       {
-               if (p_ptr->heavy_wield[0])
-               {
-#ifdef JP
-p = "±¿ÈÂÃæ";
-#else
-                       p = "Just lifting";
-#endif
-
-               }
-       }
-
-       /* Hack -- Heavy weapon */
-       if (i == INVEN_LARM)
-       {
-               if (p_ptr->heavy_wield[1])
-               {
-#ifdef JP
-p = "±¿ÈÂÃæ";
-#else
-                       p = "Just lifting";
-#endif
-
-               }
-       }
-
-       /* Hack -- Heavy bow */
-       if (i == INVEN_BOW)
-       {
-               object_type *o_ptr;
-               o_ptr = &inventory[i];
-               if (adj_str_hold[p_ptr->stat_ind[A_STR]] < o_ptr->weight / 10)
-               {
-#ifdef JP
-p = "±¿ÈÂÃæ";
-#else
-                       p = "Just holding";
-#endif
-
-               }
        }
 
        /* Return the result */
-       return (p);
+       return p;
 }
 
 
@@ -3992,118 +2255,82 @@ cptr describe_use(int i)
        switch (i)
        {
 #ifdef JP
-case INVEN_RARM: p = p_ptr->ryoute ? " Î¾¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : (left_hander ? " º¸¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : " ±¦¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë"); break;
+               case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "±¿ÈÂÃæ¤Î" : ((p_ptr->ryoute && p_ptr->migite) ? "ξ¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : (left_hander ? "º¸¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : "±¦¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë")); break;
 #else
-               case INVEN_RARM: p = "attacking monsters with"; break;
+               case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "just lifting" : (p_ptr->migite ? "attacking monsters with" : "wearing on your arm"); break;
 #endif
 
 #ifdef JP
-case INVEN_LARM:   p = (left_hander ? " ±¦¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : " º¸¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë"); break;
+               case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "±¿ÈÂÃæ¤Î" : ((p_ptr->ryoute && p_ptr->hidarite) ? "ξ¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : (left_hander ? "±¦¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë" : "º¸¼ê¤ËÁõÈ÷¤·¤Æ¤¤¤ë")); break;
 #else
-               case INVEN_LARM:   p = "wearing on your arm"; break;
+               case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "just lifting" : (p_ptr->hidarite ? "attacking monsters with" : "wearing on your arm"); break;
 #endif
 
 #ifdef JP
-case INVEN_BOW:   p = "¼Í·âÍѤËÁõÈ÷¤·¤Æ¤¤¤ë"; break;
+               case INVEN_BOW:   p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "»ý¤Ä¤À¤±¤ÇÀº°ìÇÕ¤Î" : "¼Í·âÍѤËÁõÈ÷¤·¤Æ¤¤¤ë"; break;
 #else
-               case INVEN_BOW:   p = "shooting missiles with"; break;
+               case INVEN_BOW:   p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "just holding" : "shooting missiles with"; break;
 #endif
 
 #ifdef JP
-case INVEN_LEFT:  p = (left_hander ? "±¦¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë" : "º¸¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë"); break;
+               case INVEN_RIGHT: p = (left_hander ? "º¸¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë" : "±¦¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë"); break;
 #else
-               case INVEN_LEFT:  p = "wearing on your left hand"; break;
+               case INVEN_RIGHT: p = (left_hander ? "wearing on your left hand" : "wearing on your right hand"); break;
 #endif
 
 #ifdef JP
-case INVEN_RIGHT: p = (left_hander ? "º¸¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë" : "±¦¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë"); break;
+               case INVEN_LEFT:  p = (left_hander ? "±¦¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë" : "º¸¼ê¤Î»Ø¤Ë¤Ï¤á¤Æ¤¤¤ë"); break;
 #else
-               case INVEN_RIGHT: p = "wearing on your right hand"; break;
+               case INVEN_LEFT:  p = (left_hander ? "wearing on your right hand" : "wearing on your left hand"); break;
 #endif
 
 #ifdef JP
-case INVEN_NECK:  p = "¼ó¤Ë¤«¤±¤Æ¤¤¤ë"; break;
+               case INVEN_NECK:  p = "¼ó¤Ë¤«¤±¤Æ¤¤¤ë"; break;
 #else
                case INVEN_NECK:  p = "wearing around your neck"; break;
 #endif
 
 #ifdef JP
-case INVEN_LITE:  p = "¸÷¸»¤Ë¤·¤Æ¤¤¤ë"; break;
+               case INVEN_LITE:  p = "¸÷¸»¤Ë¤·¤Æ¤¤¤ë"; break;
 #else
                case INVEN_LITE:  p = "using to light the way"; break;
 #endif
 
 #ifdef JP
-case INVEN_BODY:  p = "ÂΤËÃå¤Æ¤¤¤ë"; break;
+               case INVEN_BODY:  p = "ÂΤËÃå¤Æ¤¤¤ë"; break;
 #else
                case INVEN_BODY:  p = "wearing on your body"; break;
 #endif
 
 #ifdef JP
-case INVEN_OUTER: p = "¿È¤Ë¤Þ¤È¤Ã¤Æ¤¤¤ë"; break;
+               case INVEN_OUTER: p = "¿È¤Ë¤Þ¤È¤Ã¤Æ¤¤¤ë"; break;
 #else
                case INVEN_OUTER: p = "wearing on your back"; break;
 #endif
 
 #ifdef JP
-case INVEN_HEAD:  p = "Ƭ¤Ë¤«¤Ö¤Ã¤Æ¤¤¤ë"; break;
+               case INVEN_HEAD:  p = "Ƭ¤Ë¤«¤Ö¤Ã¤Æ¤¤¤ë"; break;
 #else
                case INVEN_HEAD:  p = "wearing on your head"; break;
 #endif
 
 #ifdef JP
-case INVEN_HANDS: p = "¼ê¤Ë¤Ä¤±¤Æ¤¤¤ë"; break;
+               case INVEN_HANDS: p = "¼ê¤Ë¤Ä¤±¤Æ¤¤¤ë"; break;
 #else
                case INVEN_HANDS: p = "wearing on your hands"; break;
 #endif
 
 #ifdef JP
-case INVEN_FEET:  p = "­¤Ë¤Ï¤¤¤Æ¤¤¤ë"; break;
-#else
-               case INVEN_FEET:  p = "wearing on your feet"; break;
-#endif
-
-#ifdef JP
-default:          p = "¥¶¥Ã¥¯¤ËÆþ¤Ã¤Æ¤¤¤ë"; break;
-#else
-               default:          p = "carrying in your pack"; break;
-#endif
-
-       }
-
-       /* Hack -- Heavy weapon */
-       if (i == INVEN_RARM)
-       {
-               object_type *o_ptr;
-               int hold = adj_str_hold[p_ptr->stat_ind[A_STR]];
-
-               if (p_ptr->ryoute) hold *= 2;
-               o_ptr = &inventory[i];
-               if (hold < o_ptr->weight / 10)
-               {
-#ifdef JP
-p = "±¿ÈÂÃæ¤Î";
-#else
-                       p = "just lifting";
-#endif
-
-               }
-       }
-
-       /* Hack -- Heavy bow */
-       if (i == INVEN_BOW)
-       {
-               object_type *o_ptr;
-               o_ptr = &inventory[i];
-               if (adj_str_hold[p_ptr->stat_ind[A_STR]] < o_ptr->weight / 10)
-               {
-#ifdef JP
-p = "»ý¤Ä¤À¤±¤ÇÀº°ìÇÕ¤Î";
+               case INVEN_FEET:  p = "­¤Ë¤Ï¤¤¤Æ¤¤¤ë"; break;
 #else
-                       p = "just holding";
+               case INVEN_FEET:  p = "wearing on your feet"; break;
 #endif
 
-               }
+#ifdef JP
+               default:          p = "¥¶¥Ã¥¯¤ËÆþ¤Ã¤Æ¤¤¤ë"; break;
+#else
+               default:          p = "carrying in your pack"; break;
+#endif
        }
 
        /* Return the result */
@@ -4141,7 +2368,13 @@ bool item_tester_okay(object_type *o_ptr)
        if (!o_ptr->k_idx) return (FALSE);
 
        /* Hack -- ignore "gold" */
-       if (o_ptr->tval == TV_GOLD) return (FALSE);
+       if (o_ptr->tval == TV_GOLD)
+       {
+               /* See xtra2.c */
+               extern bool show_gold_on_floor;
+
+               if (!show_gold_on_floor) return (FALSE);
+       }
 
        /* Check the tval */
        if (item_tester_tval)
@@ -4177,7 +2410,10 @@ void display_inven(void)
        byte            attr = TERM_WHITE;
        char            tmp_val[80];
        char            o_name[MAX_NLEN];
+       int             wid, hgt;
 
+       /* Get size */
+       Term_get_size(&wid, &hgt);
 
        /* Find the "final" slot */
        for (i = 0; i < INVEN_PACK; i++)
@@ -4214,7 +2450,7 @@ void display_inven(void)
                Term_putstr(0, i, 3, TERM_WHITE, tmp_val);
 
                /* Obtain an item description */
-               object_desc(o_name, o_ptr, TRUE, 3);
+               object_desc(o_name, o_ptr, 0);
 
                /* Obtain the length of the description */
                n = strlen(o_name);
@@ -4235,7 +2471,7 @@ void display_inven(void)
                Term_erase(3+n, i, 255);
 
                /* Display the weight if needed */
-               if (show_weights && o_ptr->weight)
+               if (show_weights)
                {
                        int wgt = o_ptr->weight * o_ptr->number;
 #ifdef JP
@@ -4244,120 +2480,388 @@ void display_inven(void)
                        sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
 #endif
 
-                       Term_putstr(71, i, -1, TERM_WHITE, tmp_val);
+                       prt(tmp_val, i, wid - 9);
+               }
+       }
+
+       /* Erase the rest of the window */
+       for (i = z; i < hgt; i++)
+       {
+               /* Erase the line */
+               Term_erase(0, i, 255);
+       }
+}
+
+
+
+/*
+ * Choice window "shadow" of the "show_equip()" function
+ */
+void display_equip(void)
+{
+       register        int i, n;
+       object_type     *o_ptr;
+       byte            attr = TERM_WHITE;
+       char            tmp_val[80];
+       char            o_name[MAX_NLEN];
+       int             wid, hgt;
+
+       /* Get size */
+       Term_get_size(&wid, &hgt);
+
+       /* Display the equipment */
+       for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
+       {
+               /* Examine the item */
+               o_ptr = &inventory[i];
+
+               /* Start with an empty "index" */
+               tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
+
+               /* Is this item "acceptable"? */
+               if (select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr))
+               {
+                       /* Prepare an "index" */
+                       tmp_val[0] = index_to_label(i);
+
+                       /* Bracket the "index" --(-- */
+                       tmp_val[1] = ')';
+               }
+
+               /* Display the index (or blank space) */
+               Term_putstr(0, i - INVEN_RARM, 3, TERM_WHITE, tmp_val);
+
+               /* Obtain an item description */
+               if ((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute)
+               {
+#ifdef JP
+                       strcpy(o_name, "(Éð´ï¤òξ¼ê»ý¤Á)");
+#else
+                       strcpy(o_name, "(wielding with two-hands)");
+#endif
+                       attr = TERM_WHITE;
+               }
+               else
+               {
+                       object_desc(o_name, o_ptr, 0);
+                       attr = tval_to_attr[o_ptr->tval % 128];
+               }
+
+               /* Obtain the length of the description */
+               n = strlen(o_name);
+
+               /* Grey out charging items */
+               if (o_ptr->timeout)
+               {
+                       attr = TERM_L_DARK;
+               }
+
+               /* Display the entry itself */
+               Term_putstr(3, i - INVEN_RARM, n, attr, o_name);
+
+               /* Erase the rest of the line */
+               Term_erase(3+n, i - INVEN_RARM, 255);
+
+               /* Display the weight (if needed) */
+               if (show_weights)
+               {
+                       int wgt = o_ptr->weight * o_ptr->number;
+#ifdef JP
+                       sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt));
+#else
+                       sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
+#endif
+
+                       prt(tmp_val, i - INVEN_RARM, wid - (show_labels ? 28 : 9));
+               }
+
+               /* Display the slot description (if needed) */
+               if (show_labels)
+               {
+                       Term_putstr(wid - 20, i - INVEN_RARM, -1, TERM_WHITE, " <-- ");
+                       prt(mention_use(i), i - INVEN_RARM, wid - 15);
+               }
+       }
+
+       /* Erase the rest of the window */
+       for (i = INVEN_TOTAL - INVEN_RARM; i < hgt; i++)
+       {
+               /* Clear that line */
+               Term_erase(0, i, 255);
+       }
+}
+
+
+/*
+ * Find the "first" inventory object with the given "tag".
+ *
+ * A "tag" is a numeral "n" appearing as "@n" anywhere in the
+ * inscription of an object.  Alphabetical characters don't work as a
+ * tag in this form.
+ *
+ * Also, the tag "@xn" will work as well, where "n" is a any tag-char,
+ * and "x" is the "current" command_cmd code.
+ */
+static bool get_tag(int *cp, char tag, int mode)
+{
+       int i, start, end;
+       cptr s;
+
+       /* Extract index from mode */
+       switch (mode)
+       {
+       case USE_EQUIP:
+               start = INVEN_RARM;
+               end = INVEN_TOTAL - 1;
+               break;
+
+       case USE_INVEN:
+               start = 0;
+               end = INVEN_PACK - 1;
+               break;
+
+       default:
+               return FALSE;
+       }
+
+       /**** Find a tag in the form of {@x#} (allow alphabet tag) ***/
+
+       /* Check every inventory object */
+       for (i = start; i <= end; i++)
+       {
+               object_type *o_ptr = &inventory[i];
+
+               /* Skip non-objects */
+               if (!o_ptr->k_idx) continue;
+
+               /* Skip empty inscriptions */
+               if (!o_ptr->inscription) continue;
+
+               /* Skip non-choice */
+               if (!item_tester_okay(o_ptr)) continue;
+
+               /* Find a '@' */
+               s = my_strchr(quark_str(o_ptr->inscription), '@');
+
+               /* Process all tags */
+               while (s)
+               {
+                       /* Check the special tags */
+                       if ((s[1] == command_cmd) && (s[2] == tag))
+                       {
+                               /* Save the actual inventory ID */
+                               *cp = i;
+
+                               /* Success */
+                               return (TRUE);
+                       }
+
+                       /* Find another '@' */
+                       s = my_strchr(s + 1, '@');
+               }
+       }
+
+
+       /**** Find a tag in the form of {@#} (allows only numerals)  ***/
+
+       /* Don't allow {@#} with '#' being alphabet */
+       if (tag < '0' || '9' < tag)
+       {
+               /* No such tag */
+               return FALSE;
+       }
+
+       /* Check every object */
+       for (i = start; i <= end; i++)
+       {
+               object_type *o_ptr = &inventory[i];
+
+               /* Skip non-objects */
+               if (!o_ptr->k_idx) continue;
+
+               /* Skip empty inscriptions */
+               if (!o_ptr->inscription) continue;
+
+               /* Skip non-choice */
+               if (!item_tester_okay(o_ptr)) continue;
+
+               /* Find a '@' */
+               s = my_strchr(quark_str(o_ptr->inscription), '@');
+
+               /* Process all tags */
+               while (s)
+               {
+                       /* Check the normal tags */
+                       if (s[1] == tag)
+                       {
+                               /* Save the actual inventory ID */
+                               *cp = i;
+
+                               /* Success */
+                               return (TRUE);
+                       }
+
+                       /* Find another '@' */
+                       s = my_strchr(s + 1, '@');
+               }
+       }
+
+       /* No such tag */
+       return (FALSE);
+}
+
+
+/*
+ * Find the "first" floor object with the given "tag".
+ *
+ * A "tag" is a numeral "n" appearing as "@n" anywhere in the
+ * inscription of an object.  Alphabetical characters don't work as a
+ * tag in this form.
+ *
+ * Also, the tag "@xn" will work as well, where "n" is a any tag-char,
+ * and "x" is the "current" command_cmd code.
+ */
+static bool get_tag_floor(int *cp, char tag, int floor_list[], int floor_num)
+{
+       int i;
+       cptr s;
+
+       /**** Find a tag in the form of {@x#} (allow alphabet tag) ***/
+
+       /* Check every object in the grid */
+       for (i = 0; i < floor_num && i < 23; i++)
+       {
+               object_type *o_ptr = &o_list[floor_list[i]];
+
+               /* Skip empty inscriptions */
+               if (!o_ptr->inscription) continue;
+
+               /* Find a '@' */
+               s = my_strchr(quark_str(o_ptr->inscription), '@');
+
+               /* Process all tags */
+               while (s)
+               {
+                       /* Check the special tags */
+                       if ((s[1] == command_cmd) && (s[2] == tag))
+                       {
+                               /* Save the actual floor object ID */
+                               *cp = i;
+
+                               /* Success */
+                               return (TRUE);
+                       }
+
+                       /* Find another '@' */
+                       s = my_strchr(s + 1, '@');
+               }
+       }
+
+
+       /**** Find a tag in the form of {@#} (allows only numerals)  ***/
+
+       /* Don't allow {@#} with '#' being alphabet */
+       if (tag < '0' || '9' < tag)
+       {
+               /* No such tag */
+               return FALSE;
+       }
+
+       /* Check every object in the grid */
+       for (i = 0; i < floor_num && i < 23; i++)
+       {
+               object_type *o_ptr = &o_list[floor_list[i]];
+
+               /* Skip empty inscriptions */
+               if (!o_ptr->inscription) continue;
+
+               /* Find a '@' */
+               s = my_strchr(quark_str(o_ptr->inscription), '@');
+
+               /* Process all tags */
+               while (s)
+               {
+                       /* Check the normal tags */
+                       if (s[1] == tag)
+                       {
+                               /* Save the floor object ID */
+                               *cp = i;
+
+                               /* Success */
+                               return (TRUE);
+                       }
+
+                       /* Find another '@' */
+                       s = my_strchr(s + 1, '@');
                }
        }
 
-       /* Erase the rest of the window */
-       for (i = z; i < Term->hgt; i++)
-       {
-               /* Erase the line */
-               Term_erase(0, i, 255);
-       }
+       /* No such tag */
+       return (FALSE);
 }
 
 
-
 /*
- * Choice window "shadow" of the "show_equip()" function
+ * Move around label characters with correspond tags
  */
-void display_equip(void)
+static void prepare_label_string(char *label, int mode)
 {
-       register        int i, n;
-       object_type     *o_ptr;
-       byte            attr = TERM_WHITE;
-       char            tmp_val[80];
-       char            o_name[MAX_NLEN];
+       cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+       int  offset = (mode == USE_EQUIP) ? INVEN_RARM : 0;
+       int  i;
 
+       /* Prepare normal labels */
+       strcpy(label, alphabet_chars);
 
-       /* Display the equipment */
-       for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
+       /* Move each label */
+       for (i = 0; i < 52; i++)
        {
-               /* Examine the item */
-               o_ptr = &inventory[i];
-
-               /* Start with an empty "index" */
-               tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
+               int index;
+               char c = alphabet_chars[i];
 
-               /* Is this item "acceptable"? */
-               if (item_tester_okay(o_ptr))
+               /* Find a tag with this label */
+               if (get_tag(&index, c, mode))
                {
-                       /* Prepare an "index" */
-                       tmp_val[0] = index_to_label(i);
-
-                       /* Bracket the "index" --(-- */
-                       tmp_val[1] = ')';
-               }
-
-               /* Display the index (or blank space) */
-               Term_putstr(0, i - INVEN_RARM, 3, TERM_WHITE, tmp_val);
+                       /* Delete the overwritten label */
+                       if (label[i] == c) label[i] = ' ';
 
-               /* Obtain an item description */
-               if ((i == INVEN_LARM) && p_ptr->ryoute)
-               {
-#ifdef JP
-                       strcpy(o_name, "(Éð´ï¤òξ¼ê»ý¤Á)");
-#else
-                       strcpy(o_name, "(wielding with two-hands)");
-#endif
-                       attr = 1;
+                       /* Move the label to the place of corresponding tag */
+                       label[index - offset] = c;
                }
-               else
-               {
-                       object_desc(o_name, o_ptr, TRUE, 3);
-                       attr = tval_to_attr[o_ptr->tval % 128];
-               }
-
-               /* Obtain the length of the description */
-               n = strlen(o_name);
+       }
+}
 
-               /* Grey out charging items */
-               if (o_ptr->timeout)
-               {
-                       attr = TERM_L_DARK;
-               }
 
-               /* Display the entry itself */
-               Term_putstr(3, i - INVEN_RARM, n, attr, o_name);
+/*
+ * Move around label characters with correspond tags (floor version)
+ */
+static void prepare_label_string_floor(char *label, int floor_list[], int floor_num)
+{
+       cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+       int  i;
 
-               /* Erase the rest of the line */
-               Term_erase(3+n, i - INVEN_RARM, 255);
+       /* Prepare normal labels */
+       strcpy(label, alphabet_chars);
 
-               /* Display the slot description (if needed) */
-               if (show_labels)
-               {
-                       Term_putstr(61, i - INVEN_RARM, -1, TERM_WHITE, "<--");
-                       Term_putstr(65, i - INVEN_RARM, -1, TERM_WHITE, mention_use(i));
-               }
+       /* Move each label */
+       for (i = 0; i < 52; i++)
+       {
+               int index;
+               char c = alphabet_chars[i];
 
-               /* Display the weight (if needed) */
-               if (show_weights && o_ptr->weight)
+               /* Find a tag with this label */
+               if (get_tag_floor(&index, c, floor_list, floor_num))
                {
-                       int wgt = o_ptr->weight * o_ptr->number;
-                       int col = (show_labels ? 52 : 71);
-#ifdef JP
-                       sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt));
-#else
-                       sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
-#endif
+                       /* Delete the overwritten label */
+                       if (label[i] == c) label[i] = ' ';
 
-                       Term_putstr(col, i - INVEN_RARM, -1, TERM_WHITE, tmp_val);
+                       /* Move the label to the place of corresponding tag */
+                       label[index] = c;
                }
        }
-
-       /* Erase the rest of the window */
-       for (i = INVEN_TOTAL - INVEN_RARM; i < Term->hgt; i++)
-       {
-               /* Clear that line */
-               Term_erase(0, i, 255);
-       }
 }
 
 
-
-
-
-
 /*
  * Display the inventory.
  *
@@ -4366,7 +2870,7 @@ void display_equip(void)
 int show_inven(int target_item)
 {
        int             i, j, k, l, z = 0;
-       int             col, cur_col, len, lim;
+       int             col, cur_col, len;
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
        char            tmp_val[80];
@@ -4375,10 +2879,7 @@ int show_inven(int target_item)
        char            out_desc[23][MAX_NLEN];
        int             target_item_label = 0;
        int             wid, hgt;
-       char inven_spellbook_label[24];
-
-       /* See cmd5.c */
-       extern bool select_spellbook;
+       char            inven_label[52 + 1];
 
        /* Starting column */
        col = command_gap;
@@ -4389,18 +2890,6 @@ int show_inven(int target_item)
        /* Default "max-length" */
        len = wid - col - 1;
 
-       /* Maximum space allowed for descriptions */
-       lim = wid - 4;
-
-       /* Require space for weight (if needed) */
-       if (show_weights) lim -= 9;
-
-       /* Require space for icon */
-       if (show_item_graph)
-       {
-               lim -= 2;
-               if (use_bigtile) lim--;
-       }
 
        /* Find the "final" slot */
        for (i = 0; i < INVEN_PACK; i++)
@@ -4414,20 +2903,7 @@ int show_inven(int target_item)
                z = i + 1;
        }
 
-       if (select_spellbook)
-       {
-               int index;
-
-               strcpy(inven_spellbook_label, "abcdefghijklmnopqrstuvw");
-               for (i = 0; i < INVEN_PACK; i++)
-               {
-                       if (get_tag(&index, (char)('a' + i)))
-                       {
-                               inven_spellbook_label[i] = ' ';
-                               inven_spellbook_label[index] = (char)('a' + i);
-                       }
-               }
-       }
+       prepare_label_string(inven_label, USE_INVEN);
 
        /* Display the inventory */
        for (k = 0, i = 0; i < z; i++)
@@ -4438,10 +2914,7 @@ int show_inven(int target_item)
                if (!item_tester_okay(o_ptr)) continue;
 
                /* Describe the object */
-               object_desc(o_name, o_ptr, TRUE, 3);
-
-               /* Hack -- enforce max length */
-               o_name[lim] = '\0';
+               object_desc(o_name, o_ptr, 0);
 
                /* Save the object index, color, and description */
                out_index[k] = i;
@@ -4503,9 +2976,10 @@ int show_inven(int target_item)
                        }
                        else strcpy(tmp_val, "  ");
                }
-               else if (i <= INVEN_PACK && select_spellbook)
+               else if (i <= INVEN_PACK)
                {
-                       sprintf(tmp_val, "%c)", inven_spellbook_label[i]);
+                       /* Prepare an index --(-- */
+                       sprintf(tmp_val, "%c)", inven_label[i]);
                }
                else
                {
@@ -4528,13 +3002,9 @@ int show_inven(int target_item)
                        if (a & 0x80) a |= 0x40;
 #endif
 
-                       Term_draw(cur_col, j + 1, a, c);
-                       if (use_bigtile)
-                       {
-                               cur_col++;
-                               if (a & 0x80)
-                                       Term_draw(cur_col, j + 1, 255, -1);
-                       }
+                       Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0);
+                       if (use_bigtile) cur_col++;
+
                        cur_col += 2;
                }
 
@@ -4552,7 +3022,7 @@ int show_inven(int target_item)
                        (void)sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
 #endif
 
-                       put_str(tmp_val, j + 1, wid - 9);
+                       prt(tmp_val, j + 1, wid - 9);
                }
        }
 
@@ -4573,7 +3043,7 @@ int show_inven(int target_item)
 int show_equip(int target_item)
 {
        int             i, j, k, l;
-       int             col, cur_col, len, lim;
+       int             col, cur_col, len;
        object_type     *o_ptr;
        char            tmp_val[80];
        char            o_name[MAX_NLEN];
@@ -4582,7 +3052,7 @@ int show_equip(int target_item)
        char            out_desc[23][MAX_NLEN];
        int             target_item_label = 0;
        int             wid, hgt;
-
+       char            equip_label[52 + 1];
 
        /* Starting column */
        col = command_gap;
@@ -4593,26 +3063,6 @@ int show_equip(int target_item)
        /* Maximal length */
        len = wid - col - 1;
 
-       /* Maximum space allowed for descriptions */
-       lim = wid - 4;
-
-       /* Require space for labels (if needed) */
-#ifdef JP
-        if (show_labels) lim -= (7 + 2);
-#else
-       if (show_labels) lim -= (14 + 2);
-#endif
-
-
-       /* Require space for weight (if needed) */
-#ifdef JP
-        if (show_weights) lim -= 10;
-#else
-       if (show_weights) lim -= 9;
-#endif
-
-
-       if (show_item_graph) lim -= 2;
 
        /* Scan the equipment list */
        for (k = 0, i = INVEN_RARM; i < INVEN_TOTAL; i++)
@@ -4620,22 +3070,21 @@ int show_equip(int target_item)
                o_ptr = &inventory[i];
 
                /* Is this item acceptable? */
-               if (!item_tester_okay(o_ptr) && (!((i == INVEN_LARM) && p_ptr->ryoute) || item_tester_no_ryoute)) continue;
+               if (!(select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr)) &&
+                   (!((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute) ||
+                    item_tester_no_ryoute)) continue;
 
                /* Description */
-               object_desc(o_name, o_ptr, TRUE, 3);
-
-               /* Truncate the description */
-               o_name[lim] = 0;
+               object_desc(o_name, o_ptr, 0);
 
-               if ((i == INVEN_LARM) && p_ptr->ryoute)
+               if ((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute)
                {
 #ifdef JP
                        (void)strcpy(out_desc[k],"(Éð´ï¤òξ¼ê»ý¤Á)");
 #else
                        (void)strcpy(out_desc[k],"(wielding with two-hands)");
 #endif
-                       out_color[k] = 1;
+                       out_color[k] = TERM_WHITE;
                }
                else
                {
@@ -4652,7 +3101,7 @@ int show_equip(int target_item)
 
                /* Extract the maximal length (see below) */
 #ifdef JP
-                l = strlen(out_desc[k]) + (2 + 1);
+               l = strlen(out_desc[k]) + (2 + 1);
 #else
                l = strlen(out_desc[k]) + (2 + 3);
 #endif
@@ -4660,7 +3109,7 @@ int show_equip(int target_item)
 
                /* Increase length for labels (if needed) */
 #ifdef JP
-                if (show_labels) l += (7 + 2);
+               if (show_labels) l += (7 + 2);
 #else
                if (show_labels) l += (14 + 2);
 #endif
@@ -4680,11 +3129,12 @@ int show_equip(int target_item)
 
        /* Hack -- Find a column to start in */
 #ifdef JP
-        col = (len > wid - 6) ? 0 : (wid - len - 1);
+       col = (len > wid - 6) ? 0 : (wid - len - 1);
 #else
        col = (len > wid - 4) ? 0 : (wid - len - 1);
 #endif
 
+       prepare_label_string(equip_label, USE_EQUIP);
 
        /* Output each entry */
        for (j = 0; j < k; j++)
@@ -4711,9 +3161,16 @@ int show_equip(int target_item)
                        }
                        else strcpy(tmp_val, "  ");
                }
-               else
+               else if (i >= INVEN_RARM)
+               {
+                       /* Prepare an index --(-- */
+                       sprintf(tmp_val, "%c)", equip_label[i - INVEN_RARM]);
+               }
+               else /* Paranoia */
+               {
                        /* Prepare an index --(-- */
                        sprintf(tmp_val, "%c)", index_to_label(i));
+               }
 
                /* Clear the line with the (possibly indented) index */
                put_str(tmp_val, j+1, col);
@@ -4730,13 +3187,9 @@ int show_equip(int target_item)
                        if (a & 0x80) a |= 0x40;
 #endif
 
-                       Term_draw(cur_col, j + 1, a, c);
-                       if (use_bigtile)
-                       {
-                               cur_col++;
-                               if (a & 0x80)
-                                       Term_draw(cur_col, j + 1, 255, -1);
-                       }
+                       Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0);
+                       if (use_bigtile) cur_col++;
+
                        cur_col += 2;
                }
 
@@ -4772,12 +3225,12 @@ int show_equip(int target_item)
                {
                        int wgt = o_ptr->weight * o_ptr->number;
 #ifdef JP
-                        (void)sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt) );
+                       (void)sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt) , lbtokg2(wgt) );
 #else
                        (void)sprintf(tmp_val, "%3d.%d lb", wgt / 10, wgt % 10);
 #endif
 
-                       put_str(tmp_val, j+1, wid - 9);
+                       prt(tmp_val, j + 1, wid - 9);
                }
        }
 
@@ -4857,7 +3310,7 @@ static bool verify(cptr prompt, int item)
        }
 
        /* Describe */
-       object_desc(o_name, o_ptr, TRUE, 3);
+       object_desc(o_name, o_ptr, 0);
 
        /* Prompt */
 #ifdef JP
@@ -4883,6 +3336,8 @@ static bool get_item_allow(int item)
 
        object_type *o_ptr;
 
+       if (!command_cmd) return TRUE; /* command_cmd is no longer effective */
+
        /* Inventory */
        if (item >= 0)
        {
@@ -4899,7 +3354,7 @@ static bool get_item_allow(int item)
        if (!o_ptr->inscription) return (TRUE);
 
        /* Find a '!' */
-       s = strchr(quark_str(o_ptr->inscription), '!');
+       s = my_strchr(quark_str(o_ptr->inscription), '!');
 
        /* Process preventions */
        while (s)
@@ -4917,7 +3372,7 @@ if (!verify("
                }
 
                /* Find another '!' */
-               s = strchr(s + 1, '!');
+               s = my_strchr(s + 1, '!');
        }
 
        /* Allow it */
@@ -4934,6 +3389,8 @@ static bool get_item_okay(int i)
        /* Illegal items */
        if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE);
 
+       if (select_ring_slot) return is_ring_slot(i);
+
        /* Verify the item */
        if (!item_tester_okay(&inventory[i])) return (FALSE);
 
@@ -4944,94 +3401,6 @@ static bool get_item_okay(int i)
 
 
 /*
- * Find the "first" inventory object with the given "tag".
- *
- * A "tag" is a char "n" appearing as "@n" anywhere in the
- * inscription of an object.
- *
- * Also, the tag "@xn" will work as well, where "n" is a tag-char,
- * and "x" is the "current" command_cmd code.
- */
-int get_tag(int *cp, char tag)
-{
-       int i;
-       cptr s;
-
-       /* Check every object */
-       for (i = 0; i < INVEN_TOTAL; ++i)
-       {
-               object_type *o_ptr = &inventory[i];
-
-               /* Skip non-objects */
-               if (!o_ptr->k_idx) continue;
-
-               /* Skip empty inscriptions */
-               if (!o_ptr->inscription) continue;
-
-               /* Skip non-choice */
-               if (!item_tester_okay(o_ptr)) continue;
-
-               /* Find a '@' */
-               s = strchr(quark_str(o_ptr->inscription), '@');
-
-               /* Process all tags */
-               while (s)
-               {
-                       /* Check the special tags */
-                       if ((s[1] == command_cmd) && (s[2] == tag))
-                       {
-                               /* Save the actual inventory ID */
-                               *cp = i;
-
-                               /* Success */
-                               return (TRUE);
-                       }
-
-                       /* Find another '@' */
-                       s = strchr(s + 1, '@');
-               }
-       }
-
-       /* Check every object */
-       for (i = 0; i < INVEN_TOTAL; ++i)
-       {
-               object_type *o_ptr = &inventory[i];
-
-               /* Skip non-objects */
-               if (!o_ptr->k_idx) continue;
-
-               /* Skip empty inscriptions */
-               if (!o_ptr->inscription) continue;
-
-               /* Skip non-choice */
-               if (!item_tester_okay(o_ptr)) continue;
-
-               /* Find a '@' */
-               s = strchr(quark_str(o_ptr->inscription), '@');
-
-               /* Process all tags */
-               while (s)
-               {
-                       /* Check the normal tags */
-                       if (s[1] == tag && !((s[2] >= '0' && s[2] <= '9') || (s[2] >= 'a' && s[2] <= 'z') || (s[2] >= 'A' && s[2] <= 'Z')))
-               {
-                               /* Save the actual inventory ID */
-                               *cp = i;
-
-                               /* Success */
-                               return (TRUE);
-                       }
-
-                       /* Find another '@' */
-                       s = strchr(s + 1, '@');
-               }
-       }
-
-       /* No such tag */
-       return (FALSE);
-}
-
-/*
  * Determine whether get_item() can get some item or not
  * assuming mode = (USE_EQUIP | USE_INVEN | USE_FLOOR).
  */
@@ -5043,7 +3412,7 @@ bool can_get_item(void)
                if (item_tester_okay(&inventory[j]))
                        return TRUE;
 
-       floor_num = scan_floor(floor_list, py, px, 0x01);
+       floor_num = scan_floor(floor_list, py, px, 0x03);
        if (floor_num)
                return TRUE;
 
@@ -5104,7 +3473,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
 {
        s16b this_o_idx, next_o_idx = 0;
 
-       char n1, n2, which = ' ';
+       char which = ' ';
 
        int j, k, i1, i2, e1, e2;
 
@@ -5124,31 +3493,46 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        char out_val[160];
 
        /* See cmd5.c */
-       extern bool select_spellbook;
        extern bool select_the_force;
 
        int menu_line = (use_menu ? 1 : 0);
        int max_inven = 0;
        int max_equip = 0;
 
+#ifdef ALLOW_REPEAT
+
+       static char prev_tag = '\0';
+       char cur_tag = '\0';
+
+#endif /* ALLOW_REPEAT */
+
 #ifdef ALLOW_EASY_FLOOR /* TNB */
 
        if (easy_floor || use_menu) return get_item_floor(cp, pmt, str, mode);
 
 #endif /* ALLOW_EASY_FLOOR -- TNB */
 
+       /* Extract args */
+       if (mode & USE_EQUIP) equip = TRUE;
+       if (mode & USE_INVEN) inven = TRUE;
+       if (mode & USE_FLOOR) floor = TRUE;
+
 #ifdef ALLOW_REPEAT
 
        /* Get the item index */
        if (repeat_pull(cp))
        {
-               if (*cp == 1111) { /* the_force */
-                   item_tester_tval = 0;
-                   item_tester_hook = NULL;
-                   return (TRUE);
-               } else
+               /* the_force */
+               if (select_the_force && (*cp == INVEN_FORCE))
+               {
+                       item_tester_tval = 0;
+                       item_tester_hook = NULL;
+                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+                       return (TRUE);
+               }
+
                /* Floor item? */
-               if (*cp < 0)
+               else if (floor && (*cp < 0))
                {
                        object_type *o_ptr;
 
@@ -5161,38 +3545,58 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                        /* Validate the item */
                        if (item_tester_okay(o_ptr))
                        {
-                               /* Forget the item_tester_tval restriction */
+                               /* Forget restrictions */
                                item_tester_tval = 0;
-
-                               /* Forget the item_tester_hook restriction */
                                item_tester_hook = NULL;
+                               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
 
                                /* Success */
-                               return (TRUE);
+                               return TRUE;
                        }
                }
 
-               /* Verify the item */
-               else if (get_item_okay(*cp))
+               else if ((inven && (*cp >= 0) && (*cp < INVEN_PACK)) ||
+                        (equip && (*cp >= INVEN_RARM) && (*cp < INVEN_TOTAL)))
                {
-                       /* Forget the item_tester_tval restriction */
-                       item_tester_tval = 0;
+                       if (prev_tag && command_cmd)
+                       {
+                               /* Look up the tag and validate the item */
+                               if (!get_tag(&k, prev_tag, (*cp >= INVEN_RARM) ? USE_EQUIP : USE_INVEN)) /* Reject */;
+                               else if ((k < INVEN_RARM) ? !inven : !equip) /* Reject */;
+                               else if (!get_item_okay(k)) /* Reject */;
+                               else
+                               {
+                                       /* Accept that choice */
+                                       (*cp) = k;
 
-                       /* Forget the item_tester_hook restriction */
-                       item_tester_hook = NULL;
+                                       /* Forget restrictions */
+                                       item_tester_tval = 0;
+                                       item_tester_hook = NULL;
+                                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
 
-                       /* Success */
-                       return (TRUE);
+                                       /* Success */
+                                       return TRUE;
+                               }
+
+                               prev_tag = '\0'; /* prev_tag is no longer effective */
+                       }
+
+                       /* Verify the item */
+                       else if (get_item_okay(*cp))
+                       {
+                               /* Forget restrictions */
+                               item_tester_tval = 0;
+                               item_tester_hook = NULL;
+                               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
+                               /* Success */
+                               return TRUE;
+                       }
                }
        }
 
 #endif /* ALLOW_REPEAT */
 
-       /* Extract args */
-       if (mode & (USE_EQUIP)) equip = TRUE;
-       if (mode & (USE_INVEN)) inven = TRUE;
-       if (mode & (USE_FLOOR)) floor = TRUE;
-
 
        /* Paranoia XXX XXX XXX */
        msg_print(NULL);
@@ -5231,7 +3635,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        else if (use_menu)
        {
                for (j = INVEN_RARM; j < INVEN_TOTAL; j++)
-                       if (item_tester_okay(&inventory[j])) max_equip++;
+                       if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j])) max_equip++;
                if (p_ptr->ryoute && !item_tester_no_ryoute) max_equip++;
        }
 
@@ -5239,6 +3643,14 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        while ((e1 <= e2) && (!get_item_okay(e1))) e1++;
        while ((e1 <= e2) && (!get_item_okay(e2))) e2--;
 
+       if (equip && p_ptr->ryoute && !item_tester_no_ryoute)
+       {
+               if (p_ptr->migite)
+               {
+                       if (e2 < INVEN_LARM) e2 = INVEN_LARM;
+               }
+               else if (p_ptr->hidarite) e1 = INVEN_RARM;
+       }
 
 
        /* Restrict floor usage */
@@ -5256,7 +3668,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                        next_o_idx = o_ptr->next_o_idx;
 
                        /* Accept the item on the floor if legal */
-                       if (item_tester_okay(o_ptr)) allow_floor = TRUE;
+                       if (item_tester_okay(o_ptr) && (o_ptr->marked & OM_FOUND)) allow_floor = TRUE;
                }
        }
 
@@ -5273,7 +3685,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                done = TRUE;
 
                if (select_the_force) {
-                   *cp = 1111;
+                   *cp = INVEN_FORCE;
                    item = TRUE;
                }
        }
@@ -5283,7 +3695,6 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        {
                /* Hack -- Start on equipment if requested */
                if (command_see && command_wrk && equip)
-
                {
                        command_wrk = TRUE;
                }
@@ -5308,10 +3719,10 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        }
 
 
-        /*
-         * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
-         */
-        if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
+       /*
+        * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
+        */
+       if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
 
        /* Hack -- start out in "display" mode */
        if (command_see)
@@ -5327,49 +3738,43 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                int get_item_label = 0;
 
                /* Show choices */
-               if (show_choices)
+               int ni = 0;
+               int ne = 0;
+
+               /* Scan windows */
+               for (j = 0; j < 8; j++)
                {
-                       int ni = 0;
-                       int ne = 0;
+                       /* Unused */
+                       if (!angband_term[j]) continue;
 
-                       /* Scan windows */
-                       for (j = 0; j < 8; j++)
-                       {
-                               /* Unused */
-                               if (!angband_term[j]) continue;
+                       /* Count windows displaying inven */
+                       if (window_flag[j] & (PW_INVEN)) ni++;
 
-                               /* Count windows displaying inven */
-                               if (window_flag[j] & (PW_INVEN)) ni++;
+                       /* Count windows displaying equip */
+                       if (window_flag[j] & (PW_EQUIP)) ne++;
+               }
 
-                               /* Count windows displaying equip */
-                               if (window_flag[j] & (PW_EQUIP)) ne++;
-                       }
+               /* Toggle if needed */
+               if ((command_wrk && ni && !ne) ||
+                   (!command_wrk && !ni && ne))
+               {
+                       /* Toggle */
+                       toggle_inven_equip();
 
-                       /* Toggle if needed */
-                       if ((command_wrk && ni && !ne) ||
-                           (!command_wrk && !ni && ne))
-                       {
-                               /* Toggle */
-                               toggle_inven_equip();
+                       /* Track toggles */
+                       toggle = !toggle;
+               }
 
-                               /* Track toggles */
-                               toggle = !toggle;
-                       }
+               /* Update */
+               p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
-                       /* Update */
-                       p_ptr->window |= (PW_INVEN | PW_EQUIP);
+               /* Redraw windows */
+               window_stuff();
 
-                       /* Redraw windows */
-                       window_stuff();
-               }
 
                /* Inventory screen */
                if (!command_wrk)
                {
-                       /* Extract the legal requests */
-                       n1 = I2A(i1);
-                       n2 = I2A(i2);
-
                        /* Redraw if needed */
                        if (command_see) get_item_label = show_inven(menu_line);
                }
@@ -5377,10 +3782,6 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                /* Equipment screen */
                else
                {
-                       /* Extract the legal requests */
-                       n1 = I2A(e1 - INVEN_RARM);
-                       n2 = I2A(e2 - INVEN_RARM);
-
                        /* Redraw if needed */
                        if (command_see) get_item_label = show_equip(menu_line);
                }
@@ -5390,23 +3791,21 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                {
                        /* Begin the prompt */
 #ifdef JP
-sprintf(out_val, "»ý¤Áʪ:");
+                       sprintf(out_val, "»ý¤Áʪ:");
 #else
                        sprintf(out_val, "Inven:");
 #endif
 
-
                        /* Some legal items */
                        if ((i1 <= i2) && !use_menu)
                        {
                                /* Build the prompt */
 #ifdef JP
-sprintf(tmp_val, "%c-%c,",
+                               sprintf(tmp_val, "%c-%c,'(',')',",
 #else
-                               sprintf(tmp_val, " %c-%c,",
+                               sprintf(tmp_val, " %c-%c,'(',')',",
 #endif
-
-                                       index_to_label(i1), index_to_label(i2));
+                                       index_to_label(i1), index_to_label(i2));
 
                                /* Append */
                                strcat(out_val, tmp_val);
@@ -5414,23 +3813,17 @@ sprintf(tmp_val, "%c-%c,",
 
                        /* Indicate ability to "view" */
 #ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+                       if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
 #else
                        if (!command_see && !use_menu) strcat(out_val, " * to see,");
 #endif
 
-
                        /* Append */
 #ifdef JP
-if (equip) strcat(out_val, format(" %s ÁõÈ÷ÉÊ,", use_menu ? "'4'or'6'" : "'/'"));
-else if (select_the_force)
-       strcat(out_val, " 'w'Îýµ¤½Ñ,");
+                       if (equip) strcat(out_val, format(" %s ÁõÈ÷ÉÊ,", use_menu ? "'4'or'6'" : "'/'"));
 #else
-if (equip) strcat(out_val, format(" %s for Equip,", use_menu ? "4 or 6" : "/"));
-else if (select_the_force)
-       strcat(out_val, " w for the Force,");
+                       if (equip) strcat(out_val, format(" %s for Equip,", use_menu ? "4 or 6" : "/"));
 #endif
-
                }
 
                /* Viewing equipment */
@@ -5438,23 +3831,21 @@ else if (select_the_force)
                {
                        /* Begin the prompt */
 #ifdef JP
-sprintf(out_val, "ÁõÈ÷ÉÊ:");
+                       sprintf(out_val, "ÁõÈ÷ÉÊ:");
 #else
                        sprintf(out_val, "Equip:");
 #endif
 
-
                        /* Some legal items */
                        if ((e1 <= e2) && !use_menu)
                        {
                                /* Build the prompt */
 #ifdef JP
-sprintf(tmp_val, "%c-%c,",
+                               sprintf(tmp_val, "%c-%c,'(',')',",
 #else
-                               sprintf(tmp_val, " %c-%c,",
+                               sprintf(tmp_val, " %c-%c,'(',')',",
 #endif
-
-                                       index_to_label(e1), index_to_label(e2));
+                                       index_to_label(e1), index_to_label(e2));
 
                                /* Append */
                                strcat(out_val, tmp_val);
@@ -5462,29 +3853,28 @@ sprintf(tmp_val, "%c-%c,",
 
                        /* Indicate ability to "view" */
 #ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+                       if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
 #else
                        if (!command_see) strcat(out_val, " * to see,");
 #endif
 
-
                        /* Append */
 #ifdef JP
-if (inven) strcat(out_val, format(" %s »ý¤Áʪ,", use_menu ? "'4'or'6'" : "'/'"));
+                       if (inven) strcat(out_val, format(" %s »ý¤Áʪ,", use_menu ? "'4'or'6'" : "'/'"));
 #else
-if (inven) strcat(out_val, format(" %s for Inven,", use_menu ? "4 or 6" : "'/'"));
+                       if (inven) strcat(out_val, format(" %s for Inven,", use_menu ? "4 or 6" : "'/'"));
 #endif
-
                }
 
                /* Indicate legality of the "floor" item */
 #ifdef JP
-if (allow_floor) strcat(out_val, " '-'¾²¾å,");
+               if (allow_floor) strcat(out_val, " '-'¾²¾å,");
+               if (select_the_force) strcat(out_val, " 'w'Îýµ¤½Ñ,");
 #else
                if (allow_floor) strcat(out_val, " - for floor,");
+               if (select_the_force) strcat(out_val, " w for the Force,");
 #endif
 
-
                /* Finish the prompt */
                strcat(out_val, " ESC");
 
@@ -5494,7 +3884,6 @@ if (allow_floor) strcat(out_val, " '-'
                /* Show the prompt */
                prt(tmp_val, 0, 0);
 
-
                /* Get a key */
                which = inkey();
 
@@ -5595,10 +3984,10 @@ if (allow_floor) strcat(out_val, " '-'
                                done = TRUE;
                                break;
                        }
-                       case 'w':
+                       case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
@@ -5725,7 +4114,7 @@ if (other_query_flag && !verify("
                        case '7': case '8': case '9':
                        {
                                /* Look up the tag */
-                               if (!get_tag(&k, which))
+                               if (!get_tag(&k, which, command_wrk ? USE_EQUIP : USE_INVEN))
                                {
                                        bell();
                                        break;
@@ -5756,13 +4145,15 @@ if (other_query_flag && !verify("
                                (*cp) = k;
                                item = TRUE;
                                done = TRUE;
+#ifdef ALLOW_REPEAT
+                               cur_tag = which;
+#endif /* ALLOW_REPEAT */
                                break;
                        }
 
 #if 0
                        case '\n':
                        case '\r':
-#endif
                        {
                                /* Choose "default" inventory item */
                                if (!command_wrk)
@@ -5796,49 +4187,54 @@ if (other_query_flag && !verify("
                                done = TRUE;
                                break;
                        }
+#endif
 
-                       case 'w':
+                       case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
                                }
+
+                               /* Fall through */
                        }
 
                        default:
                        {
                                int ver;
+                               bool not_found = FALSE;
 
-                               if(select_spellbook){
-                                    bool not_found = FALSE;
-                                    /* Look up the tag */
-                                    if (!get_tag(&k, which))
-                                    {
+                               /* Look up the alphabetical tag */
+                               if (!get_tag(&k, which, command_wrk ? USE_EQUIP : USE_INVEN))
+                               {
                                        not_found = TRUE;
-                                    }
+                               }
 
-                                    /* Hack -- Validate the item */
-                                    if ((k < INVEN_RARM) ? !inven : !equip)
-                                    {
+                               /* Hack -- Validate the item */
+                               else if ((k < INVEN_RARM) ? !inven : !equip)
+                               {
                                        not_found = TRUE;
-                                    }
+                               }
 
-                                    /* Validate the item */
-                                    if (!get_item_okay(k))
-                                    {
+                               /* Validate the item */
+                               else if (!get_item_okay(k))
+                               {
                                        not_found = TRUE;
-                                    }
+                               }
 
-                                    if( !not_found ){
-                                        /* Accept that choice */
-                                        (*cp) = k;
-                                        item = TRUE;
-                                        done = TRUE;
-                                        break;
-                                    }
-                               }                               
+                               if (!not_found)
+                               {
+                                       /* Accept that choice */
+                                       (*cp) = k;
+                                       item = TRUE;
+                                       done = TRUE;
+#ifdef ALLOW_REPEAT
+                                       cur_tag = which;
+#endif /* ALLOW_REPEAT */
+                                       break;
+                               }
 
                                /* Extract "query" setting */
                                ver = isupper(which);
@@ -5847,13 +4243,17 @@ if (other_query_flag && !verify("
                                /* Convert letter to inventory index */
                                if (!command_wrk)
                                {
-                                       k = label_to_inven(which);
+                                       if (which == '(') k = i1;
+                                       else if (which == ')') k = i2;
+                                       else k = label_to_inven(which);
                                }
 
                                /* Convert letter to equipment index */
                                else
                                {
-                                       k = label_to_equip(which);
+                                       if (which == '(') k = e1;
+                                       else if (which == ')') k = e2;
+                                       else k = label_to_equip(which);
                                }
 
                                /* Validate the item */
@@ -5913,18 +4313,15 @@ if (ver && !verify("
        item_tester_hook = NULL;
 
 
-       /* Clean up */
-       if (show_choices)
-       {
-               /* Toggle again if needed */
-               if (toggle) toggle_inven_equip();
+       /* Clean up  'show choices' */
+       /* Toggle again if needed */
+       if (toggle) toggle_inven_equip();
 
-               /* Update */
-               p_ptr->window |= (PW_INVEN | PW_EQUIP);
+       /* Update */
+       p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
-               /* Window stuff */
-               window_stuff();
-       }
+       /* Window stuff */
+       window_stuff();
 
 
        /* Clear the prompt line */
@@ -5933,10 +4330,16 @@ if (ver && !verify("
        /* Warning if needed */
        if (oops && str) msg_print(str);
 
+       if (item)
+       {
 #ifdef ALLOW_REPEAT
-       if (item) repeat_push(*cp);
+               repeat_push(*cp);
+               if (command_cmd) prev_tag = cur_tag;
 #endif /* ALLOW_REPEAT */
 
+               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+       }
+
        /* Result */
        return (item);
 }
@@ -5978,7 +4381,7 @@ int scan_floor(int *items, int y, int x, int mode)
                if ((mode & 0x01) && !item_tester_okay(o_ptr)) continue;
 
                /* Marked */
-               if ((mode & 0x02) && !o_ptr->marked) continue;
+               if ((mode & 0x02) && !(o_ptr->marked & OM_FOUND)) continue;
 
                /* Accept this item */
                /* XXX Hack -- Enforce limit */
@@ -5995,13 +4398,14 @@ int scan_floor(int *items, int y, int x, int mode)
        return num;
 }
 
+
 /*
  * Display a list of the items on the floor at the given location.
  */
 int show_floor(int target_item, int y, int x, int *min_width)
 {
        int i, j, k, l;
-       int col, len, lim;
+       int col, len;
 
        object_type *o_ptr;
 
@@ -6016,6 +4420,9 @@ int show_floor(int target_item, int y, int x, int *min_width)
 
        int floor_list[23], floor_num;
        int wid, hgt;
+       char floor_label[52 + 1];
+
+       bool dont_need_to_show_weights = TRUE;
 
        /* Get size */
        Term_get_size(&wid, &hgt);
@@ -6023,25 +4430,17 @@ int show_floor(int target_item, int y, int x, int *min_width)
        /* Default length */
        len = MAX((*min_width), 20);
 
-       /* Maximum space allowed for descriptions */
-       lim = wid - 4;
-
-       /* Require space for weight (if needed) */
-       if (show_weights) lim -= 9;
 
        /* Scan for objects in the grid, using item_tester_okay() */
-       floor_num = scan_floor(floor_list, y, x, 0x01);
+       floor_num = scan_floor(floor_list, y, x, 0x03);
 
-       /* Display the inventory */
+       /* Display the floor objects */
        for (k = 0, i = 0; i < floor_num && i < 23; i++)
        {
                o_ptr = &o_list[floor_list[i]];
 
                /* Describe the object */
-               object_desc(o_name, o_ptr, TRUE, 3);
-
-               /* Hack -- enforce max length */
-               o_name[lim] = '\0';
+               object_desc(o_name, o_ptr, 0);
 
                /* Save the index */
                out_index[k] = i;
@@ -6058,6 +4457,8 @@ int show_floor(int target_item, int y, int x, int *min_width)
                /* Be sure to account for the weight */
                if (show_weights) l += 9;
 
+               if (o_ptr->tval != TV_GOLD) dont_need_to_show_weights = FALSE;
+
                /* Maintain the maximum length */
                if (l > len) len = l;
 
@@ -6065,12 +4466,16 @@ int show_floor(int target_item, int y, int x, int *min_width)
                k++;
        }
 
+       if (show_weights && dont_need_to_show_weights) len -= 9;
+
        /* Save width */
        *min_width = len;
 
        /* Find the column to start in */
        col = (len > wid - 4) ? 0 : (wid - len - 1);
 
+       prepare_label_string_floor(floor_label, floor_list, floor_num);
+
        /* Output each entry */
        for (j = 0; j < k; j++)
        {
@@ -6097,8 +4502,10 @@ int show_floor(int target_item, int y, int x, int *min_width)
                        else strcpy(tmp_val, "   ");
                }
                else
+               {
                        /* Prepare an index --(-- */
-                       sprintf(tmp_val, "%c)", index_to_label(j));
+                       sprintf(tmp_val, "%c)", floor_label[j]);
+               }
 
                /* Clear the line with the (possibly indented) index */
                put_str(tmp_val, j + 1, col);
@@ -6107,7 +4514,7 @@ int show_floor(int target_item, int y, int x, int *min_width)
                c_put_str(out_color[j], out_desc[j], j + 1, col + 3);
 
                /* Display the weight if needed */
-               if (show_weights)
+               if (show_weights && (o_ptr->tval != TV_GOLD))
                {
                        int wgt = o_ptr->weight * o_ptr->number;
 #ifdef JP
@@ -6116,7 +4523,7 @@ int show_floor(int target_item, int y, int x, int *min_width)
                        sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
 #endif
 
-                       put_str(tmp_val, j + 1, wid - 9);
+                       prt(tmp_val, j + 1, wid - 9);
                }
        }
 
@@ -6140,9 +4547,10 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 
        bool oops = FALSE;
 
-       bool equip = FALSE;
-       bool inven = FALSE;
-       bool floor = FALSE;
+       /* Extract args */
+       bool equip = (mode & USE_EQUIP) ? TRUE : FALSE;
+       bool inven = (mode & USE_INVEN) ? TRUE : FALSE;
+       bool floor = (mode & USE_FLOOR) ? TRUE : FALSE;
 
        bool allow_equip = FALSE;
        bool allow_inven = FALSE;
@@ -6156,7 +4564,6 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        int floor_num, floor_list[23], floor_top = 0;
        int min_width = 0;
 
-       extern bool select_spellbook;
        extern bool select_the_force;
 
        int menu_line = (use_menu ? 1 : 0);
@@ -6165,60 +4572,102 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 
 #ifdef ALLOW_REPEAT
 
+       static char prev_tag = '\0';
+       char cur_tag = '\0';
+
        /* Get the item index */
        if (repeat_pull(cp))
        {
-               if (*cp == 1111) { /* the_force */
-                   item_tester_tval = 0;
-                   item_tester_hook = NULL;
-                   return (TRUE);
-               } else
+               /* the_force */
+               if (select_the_force && (*cp == INVEN_FORCE))
+               {
+                       item_tester_tval = 0;
+                       item_tester_hook = NULL;
+                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+                       return (TRUE);
+               }
+
                /* Floor item? */
-               if (*cp < 0)
+               else if (floor && (*cp < 0))
                {
-                       object_type *o_ptr;
+                       if (prev_tag && command_cmd)
+                       {
+                               /* Scan all objects in the grid */
+                               floor_num = scan_floor(floor_list, py, px, 0x03);
 
-                       /* Special index */
-                       k = 0 - (*cp);
+                               /* Look up the tag */
+                               if (get_tag_floor(&k, prev_tag, floor_list, floor_num))
+                               {
+                                       /* Accept that choice */
+                                       (*cp) = 0 - floor_list[k];
 
-                       /* Acquire object */
-                       o_ptr = &o_list[k];
+                                       /* Forget restrictions */
+                                       item_tester_tval = 0;
+                                       item_tester_hook = NULL;
+                                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
+                                       /* Success */
+                                       return TRUE;
+                               }
+
+                               prev_tag = '\0'; /* prev_tag is no longer effective */
+                       }
 
                        /* Validate the item */
-                       if (item_tester_okay(o_ptr))
+                       else if (item_tester_okay(&o_list[0 - (*cp)]))
                        {
-                               /* Forget the item_tester_tval restriction */
+                               /* Forget restrictions */
                                item_tester_tval = 0;
-
-                               /* Forget the item_tester_hook restriction */
                                item_tester_hook = NULL;
+                               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
 
                                /* Success */
-                               return (TRUE);
+                               return TRUE;
                        }
                }
 
-               /* Verify the item */
-               else if (get_item_okay(*cp))
+               else if ((inven && (*cp >= 0) && (*cp < INVEN_PACK)) ||
+                        (equip && (*cp >= INVEN_RARM) && (*cp < INVEN_TOTAL)))
                {
-                       /* Forget the item_tester_tval restriction */
-                       item_tester_tval = 0;
+                       if (prev_tag && command_cmd)
+                       {
+                               /* Look up the tag and validate the item */
+                               if (!get_tag(&k, prev_tag, (*cp >= INVEN_RARM) ? USE_EQUIP : USE_INVEN)) /* Reject */;
+                               else if ((k < INVEN_RARM) ? !inven : !equip) /* Reject */;
+                               else if (!get_item_okay(k)) /* Reject */;
+                               else
+                               {
+                                       /* Accept that choice */
+                                       (*cp) = k;
 
-                       /* Forget the item_tester_hook restriction */
-                       item_tester_hook = NULL;
+                                       /* Forget restrictions */
+                                       item_tester_tval = 0;
+                                       item_tester_hook = NULL;
+                                       command_cmd = 0; /* Hack -- command_cmd is no longer effective */
 
-                       /* Success */
-                       return (TRUE);
+                                       /* Success */
+                                       return TRUE;
+                               }
+
+                               prev_tag = '\0'; /* prev_tag is no longer effective */
+                       }
+
+                       /* Verify the item */
+                       else if (get_item_okay(*cp))
+                       {
+                               /* Forget restrictions */
+                               item_tester_tval = 0;
+                               item_tester_hook = NULL;
+                               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
+                               /* Success */
+                               return TRUE;
+                       }
                }
        }
 
 #endif /* ALLOW_REPEAT */
 
-       /* Extract args */
-       if (mode & (USE_EQUIP)) equip = TRUE;
-       if (mode & (USE_INVEN)) inven = TRUE;
-       if (mode & (USE_FLOOR)) floor = TRUE;
-
 
        /* Paranoia XXX XXX XXX */
        msg_print(NULL);
@@ -6257,7 +4706,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        else if (use_menu)
        {
                for (j = INVEN_RARM; j < INVEN_TOTAL; j++)
-                       if (item_tester_okay(&inventory[j])) max_equip++;
+                       if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j])) max_equip++;
                if (p_ptr->ryoute && !item_tester_no_ryoute) max_equip++;
        }
 
@@ -6265,6 +4714,15 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        while ((e1 <= e2) && (!get_item_okay(e1))) e1++;
        while ((e1 <= e2) && (!get_item_okay(e2))) e2--;
 
+       if (equip && p_ptr->ryoute && !item_tester_no_ryoute)
+       {
+               if (p_ptr->migite)
+               {
+                       if (e2 < INVEN_LARM) e2 = INVEN_LARM;
+               }
+               else if (p_ptr->hidarite) e1 = INVEN_RARM;
+       }
+
 
        /* Count "okay" floor items */
        floor_num = 0;
@@ -6273,7 +4731,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        if (floor)
        {
                /* Scan all objects in the grid */
-               floor_num = scan_floor(floor_list, py, px, 0x01);
+               floor_num = scan_floor(floor_list, py, px, 0x03);
        }
 
        /* Accept inventory */
@@ -6298,7 +4756,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                done = TRUE;
 
                if (select_the_force) {
-                   *cp = 1111;
+                   *cp = INVEN_FORCE;
                    item = TRUE;
                }
        }
@@ -6332,10 +4790,10 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                }
        }
 
-        /*
-         * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
-         */
-        if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
+       /*
+        * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
+        */
+       if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
 
        /* Hack -- start out in "display" mode */
        if (command_see)
@@ -6350,41 +4808,38 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                int get_item_label = 0;
 
                /* Show choices */
-               if (show_choices)
-               {
-                       int ni = 0;
-                       int ne = 0;
+               int ni = 0;
+               int ne = 0;
 
-                       /* Scan windows */
-                       for (j = 0; j < 8; j++)
-                       {
-                               /* Unused */
-                               if (!angband_term[j]) continue;
+               /* Scan windows */
+               for (j = 0; j < 8; j++)
+               {
+                       /* Unused */
+                       if (!angband_term[j]) continue;
 
-                               /* Count windows displaying inven */
-                               if (window_flag[j] & (PW_INVEN)) ni++;
+                       /* Count windows displaying inven */
+                       if (window_flag[j] & (PW_INVEN)) ni++;
 
-                               /* Count windows displaying equip */
-                               if (window_flag[j] & (PW_EQUIP)) ne++;
-                       }
+                       /* Count windows displaying equip */
+                       if (window_flag[j] & (PW_EQUIP)) ne++;
+               }
 
-                       /* Toggle if needed */
-                       if ((command_wrk == (USE_EQUIP) && ni && !ne) ||
-                               (command_wrk == (USE_INVEN) && !ni && ne))
-                       {
-                               /* Toggle */
-                               toggle_inven_equip();
+               /* Toggle if needed */
+               if ((command_wrk == (USE_EQUIP) && ni && !ne) ||
+                   (command_wrk == (USE_INVEN) && !ni && ne))
+               {
+                       /* Toggle */
+                       toggle_inven_equip();
 
-                               /* Track toggles */
-                               toggle = !toggle;
-                       }
+                       /* Track toggles */
+                       toggle = !toggle;
+               }
 
-                       /* Update */
-                       p_ptr->window |= (PW_INVEN | PW_EQUIP);
+               /* Update */
+               p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
-                       /* Redraw windows */
-                       window_stuff();
-               }
+               /* Redraw windows */
+               window_stuff();
 
                /* Inventory screen */
                if (command_wrk == (USE_INVEN))
@@ -6427,7 +4882,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                {
                        /* Begin the prompt */
 #ifdef JP
-sprintf(out_val, "»ý¤Áʪ:");
+                       sprintf(out_val, "»ý¤Áʪ:");
 #else
                        sprintf(out_val, "Inven:");
 #endif
@@ -6436,12 +4891,11 @@ sprintf(out_val, "
                        {
                                /* Build the prompt */
 #ifdef JP
-sprintf(tmp_val, "%c-%c,",
+                               sprintf(tmp_val, "%c-%c,'(',')',",
 #else
-                               sprintf(tmp_val, " %c-%c,",
+                               sprintf(tmp_val, " %c-%c,'(',')',",
 #endif
-
-                                       index_to_label(i1), index_to_label(i2));
+                                       index_to_label(i1), index_to_label(i2));
 
                                /* Append */
                                strcat(out_val, tmp_val);
@@ -6449,38 +4903,30 @@ sprintf(tmp_val, "%c-%c,",
 
                        /* Indicate ability to "view" */
 #ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+                       if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
 #else
                        if (!command_see && !use_menu) strcat(out_val, " * to see,");
 #endif
 
-
                        /* Append */
-#ifdef JP
                        if (allow_equip)
                        {
+#ifdef JP
                                if (!use_menu)
                                        strcat(out_val, " '/' ÁõÈ÷ÉÊ,");
                                else if (allow_floor)
                                        strcat(out_val, " '6' ÁõÈ÷ÉÊ,");
                                else
                                        strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
-                       }
-                       else if (select_the_force)
-                               strcat(out_val, " 'w'Îýµ¤½Ñ,");
 #else
-                       if (allow_equip)
-                       {
                                if (!use_menu)
                                        strcat(out_val, " / for Equip,");
                                else if (allow_floor)
                                        strcat(out_val, " 6 for Equip,");
                                else
                                        strcat(out_val, " 4 or 6 for Equip,");
-                       }
-                       else if (select_the_force)
-                               strcat(out_val, " w for the Force,");
 #endif
+                       }
 
                        /* Append */
                        if (allow_floor)
@@ -6501,7 +4947,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                                        strcat(out_val, " 4 or 6 for floor,");
 #endif
                        }
-
                }
 
                /* Viewing equipment */
@@ -6509,22 +4954,20 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                {
                        /* Begin the prompt */
 #ifdef JP
-sprintf(out_val, "ÁõÈ÷ÉÊ:");
+                       sprintf(out_val, "ÁõÈ÷ÉÊ:");
 #else
                        sprintf(out_val, "Equip:");
 #endif
 
-
                        if (!use_menu)
                        {
                                /* Build the prompt */
 #ifdef JP
-sprintf(tmp_val, "%c-%c,",
+                               sprintf(tmp_val, "%c-%c,'(',')',",
 #else
-                               sprintf(tmp_val, " %c-%c,",
+                               sprintf(tmp_val, " %c-%c,'(',')',",
 #endif
-
-                                       index_to_label(e1), index_to_label(e2));
+                                       index_to_label(e1), index_to_label(e2));
 
                                /* Append */
                                strcat(out_val, tmp_val);
@@ -6532,12 +4975,11 @@ sprintf(tmp_val, "%c-%c,",
 
                        /* Indicate ability to "view" */
 #ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+                       if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
 #else
                        if (!command_see && !use_menu) strcat(out_val, " * to see,");
 #endif
 
-
                        /* Append */
                        if (allow_inven)
                        {
@@ -6549,7 +4991,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                                else
                                        strcat(out_val, " '4'or'6' »ý¤Áʪ,");
 #else
-
                                if (!use_menu)
                                        strcat(out_val, " / for Inven,");
                                else if (allow_floor)
@@ -6590,29 +5031,26 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        sprintf(out_val, "Floor:");
 #endif
 
-
                        if (!use_menu)
                        {
                                /* Build the prompt */
 #ifdef JP
-sprintf(tmp_val, "%c-%c,", n1, n2);
+                               sprintf(tmp_val, "%c-%c,'(',')',", n1, n2);
 #else
-                               sprintf(tmp_val, " %c-%c,", n1, n2);
+                               sprintf(tmp_val, " %c-%c,'(',')',", n1, n2);
 #endif
 
-
                                /* Append */
                                strcat(out_val, tmp_val);
                        }
 
                        /* Indicate ability to "view" */
 #ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+                       if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
 #else
                        if (!command_see && !use_menu) strcat(out_val, " * to see,");
 #endif
 
-
                        if (use_menu)
                        {
                                if (allow_inven && allow_equip)
@@ -6622,7 +5060,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
 #else
                                        strcat(out_val, " 4 for Equip, 6 for Inven,");
 #endif
-
                                }
                                else if (allow_inven)
                                {
@@ -6631,7 +5068,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
 #else
                                        strcat(out_val, " 4 or 6 for Inven,");
 #endif
-
                                }
                                else if (allow_equip)
                                {
@@ -6640,7 +5076,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
 #else
                                        strcat(out_val, " 4 or 6 for Equip,");
 #endif
-
                                }
                        }
                        /* Append */
@@ -6651,7 +5086,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
 #else
                                strcat(out_val, " / for Inven,");
 #endif
-
                        }
                        else if (allow_equip)
                        {
@@ -6660,7 +5094,6 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
 #else
                                strcat(out_val, " / for Equip,");
 #endif
-
                        }
 
                        /* Append */
@@ -6674,6 +5107,13 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        }
                }
 
+               /* Append */
+#ifdef JP
+               if (select_the_force) strcat(out_val, " 'w'Îýµ¤½Ñ,");
+#else
+               if (select_the_force) strcat(out_val, " w for the Force,");
+#endif
+
                /* Finish the prompt */
                strcat(out_val, " ESC");
 
@@ -6875,10 +5315,10 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                                done = TRUE;
                                break;
                        }
-                       case 'w':
+                       case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
@@ -6930,28 +5370,28 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        {
                                int i, o_idx;
                                cave_type *c_ptr = &cave[py][px];
+
                                if (command_wrk != (USE_FLOOR)) break;
 
                                /* Get the object being moved. */
-                               o_idx = c_ptr->o_idx;
+                               o_idx = c_ptr->o_idx;
+
                                /* Only rotate a pile of two or more objects. */
                                if (!(o_idx && o_list[o_idx].next_o_idx)) break;
 
                                /* Remove the first object from the list. */
                                excise_object_idx(o_idx);
-       
+
                                /* Find end of the list. */
                                i = c_ptr->o_idx;
                                while (o_list[i].next_o_idx)
                                        i = o_list[i].next_o_idx;
-       
+
                                /* Add after the last object. */
                                o_list[i].next_o_idx = o_idx;
-       
+
                                /* Re-scan floor list */ 
-                               floor_num = scan_floor(floor_list, py, px, 0x01);
+                               floor_num = scan_floor(floor_list, py, px, 0x03);
 
                                /* Hack -- Fix screen */
                                if (command_see)
@@ -7075,25 +5515,42 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        case '4': case '5': case '6':
                        case '7': case '8': case '9':
                        {
-                               /* Look up the tag */
-                               if (!get_tag(&k, which))
+                               if (command_wrk != USE_FLOOR)
                                {
-                                       bell();
-                                       break;
-                               }
+                                       /* Look up the tag */
+                                       if (!get_tag(&k, which, command_wrk))
+                                       {
+                                               bell();
+                                               break;
+                                       }
 
-                               /* Hack -- Validate the item */
-                               if ((k < INVEN_RARM) ? !inven : !equip)
-                               {
-                                       bell();
-                                       break;
-                               }
+                                       /* Hack -- Validate the item */
+                                       if ((k < INVEN_RARM) ? !inven : !equip)
+                                       {
+                                               bell();
+                                               break;
+                                       }
 
-                               /* Validate the item */
-                               if (!get_item_okay(k))
+                                       /* Validate the item */
+                                       if (!get_item_okay(k))
+                                       {
+                                               bell();
+                                               break;
+                                       }
+                               }
+                               else
                                {
-                                       bell();
-                                       break;
+                                       /* Look up the alphabetical tag */
+                                       if (get_tag_floor(&k, which, floor_list, floor_num))
+                                       {
+                                               /* Special index */
+                                               k = 0 - floor_list[k];
+                                       }
+                                       else
+                                       {
+                                               bell();
+                                               break;
+                                       }
                                }
 
                                /* Allow player to "refuse" certain actions */
@@ -7107,6 +5564,9 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                                (*cp) = k;
                                item = TRUE;
                                done = TRUE;
+#ifdef ALLOW_REPEAT
+                               cur_tag = which;
+#endif /* ALLOW_REPEAT */
                                break;
                        }
 
@@ -7171,48 +5631,74 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        }
 #endif
 
-                       case 'w':
+                       case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
                                }
+
+                               /* Fall through */
                        }
 
                        default:
                        {
                                int ver;
 
-                               if(select_spellbook){
-                                    bool not_found = FALSE;
-                                    /* Look up the tag */
-                                    if (!get_tag(&k, which))
-                                    {
-                                       not_found = TRUE;
-                                    }
+                               if (command_wrk != USE_FLOOR)
+                               {
+                                       bool not_found = FALSE;
 
-                                    /* Hack -- Validate the item */
-                                    if ((k < INVEN_RARM) ? !inven : !equip)
-                                    {
-                                       not_found = TRUE;
-                                    }
+                                       /* Look up the alphabetical tag */
+                                       if (!get_tag(&k, which, command_wrk))
+                                       {
+                                               not_found = TRUE;
+                                       }
 
-                                    /* Validate the item */
-                                    if (!get_item_okay(k))
-                                    {
-                                       not_found = TRUE;
-                                    }
+                                       /* Hack -- Validate the item */
+                                       else if ((k < INVEN_RARM) ? !inven : !equip)
+                                       {
+                                               not_found = TRUE;
+                                       }
+
+                                       /* Validate the item */
+                                       else if (!get_item_okay(k))
+                                       {
+                                               not_found = TRUE;
+                                       }
+
+                                       if (!not_found)
+                                       {
+                                               /* Accept that choice */
+                                               (*cp) = k;
+                                               item = TRUE;
+                                               done = TRUE;
+#ifdef ALLOW_REPEAT
+                                               cur_tag = which;
+#endif /* ALLOW_REPEAT */
+                                               break;
+                                       }
+                               }
+                               else
+                               {
+                                       /* Look up the alphabetical tag */
+                                       if (get_tag_floor(&k, which, floor_list, floor_num))
+                                       {
+                                               /* Special index */
+                                               k = 0 - floor_list[k];
 
-                                    if( !not_found ){
-                                        /* Accept that choice */
-                                        (*cp) = k;
-                                        item = TRUE;
-                                        done = TRUE;
-                                        break;
-                                    }
-                               }                               
+                                               /* Accept that choice */
+                                               (*cp) = k;
+                                               item = TRUE;
+                                               done = TRUE;
+#ifdef ALLOW_REPEAT
+                                               cur_tag = which;
+#endif /* ALLOW_REPEAT */
+                                               break;
+                                       }
+                               }
 
                                /* Extract "query" setting */
                                ver = isupper(which);
@@ -7221,19 +5707,25 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                                /* Convert letter to inventory index */
                                if (command_wrk == (USE_INVEN))
                                {
-                                       k = label_to_inven(which);
+                                       if (which == '(') k = i1;
+                                       else if (which == ')') k = i2;
+                                       else k = label_to_inven(which);
                                }
 
                                /* Convert letter to equipment index */
                                else if (command_wrk == (USE_EQUIP))
                                {
-                                       k = label_to_equip(which);
+                                       if (which == '(') k = e1;
+                                       else if (which == ')') k = e2;
+                                       else k = label_to_equip(which);
                                }
 
                                /* Convert letter to floor index */
                                else if (command_wrk == USE_FLOOR)
                                {
-                                       k = islower(which) ? A2I(which) : -1;
+                                       if (which == '(') k = 0;
+                                       else if (which == ')') k = floor_num - 1;
+                                       else k = islower(which) ? A2I(which) : -1;
                                        if (k < 0 || k >= floor_num || k >= 23)
                                        {
                                                bell();
@@ -7298,18 +5790,15 @@ if (ver && !verify("
        item_tester_hook = NULL;
 
 
-       /* Clean up */
-       if (show_choices)
-       {
-               /* Toggle again if needed */
-               if (toggle) toggle_inven_equip();
+       /* Clean up  'show choices' */
+       /* Toggle again if needed */
+       if (toggle) toggle_inven_equip();
 
-               /* Update */
-               p_ptr->window |= (PW_INVEN | PW_EQUIP);
+       /* Update */
+       p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
-               /* Window stuff */
-               window_stuff();
-       }
+       /* Window stuff */
+       window_stuff();
 
 
        /* Clear the prompt line */
@@ -7318,10 +5807,16 @@ if (ver && !verify("
        /* Warning if needed */
        if (oops && str) msg_print(str);
 
+       if (item)
+       {
 #ifdef ALLOW_REPEAT
-       if (item) repeat_push(*cp);
+               repeat_push(*cp);
+               if (command_cmd) prev_tag = cur_tag;
 #endif /* ALLOW_REPEAT */
 
+               command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+       }
+
        /* Result */
        return (item);
 }
@@ -7331,8 +5826,6 @@ static bool py_pickup_floor_aux(void)
 {
        s16b this_o_idx;
 
-       object_type *o_ptr;
-
        cptr q, s;
 
        int item;
@@ -7358,9 +5851,6 @@ static bool py_pickup_floor_aux(void)
                return (FALSE);
        }
 
-       /* Access the object */
-       o_ptr = &o_list[this_o_idx];
-
        /* Pick up the object */
        py_pickup_aux(this_o_idx);
 
@@ -7375,14 +5865,14 @@ static bool py_pickup_floor_aux(void)
  *
  * This is called by py_pickup() when easy_floor is TRUE.
  */
-void py_pickup_floor(int pickup)
+void py_pickup_floor(bool pickup)
 {
        s16b this_o_idx, next_o_idx = 0;
 
        char o_name[MAX_NLEN];
        object_type *o_ptr;
 
-       int floor_num = 0, floor_list[23], floor_o_idx = 0;
+       int floor_num = 0, floor_o_idx = 0;
 
        int can_pickup = 0;
 
@@ -7395,7 +5885,7 @@ void py_pickup_floor(int pickup)
                o_ptr = &o_list[this_o_idx];
 
                /* Describe the object */
-               object_desc(o_name, o_ptr, TRUE, 3);
+               object_desc(o_name, o_ptr, 0);
 
                /* Access the next object */
                next_o_idx = o_ptr->next_o_idx;
@@ -7408,8 +5898,8 @@ void py_pickup_floor(int pickup)
                {
                        /* Message */
 #ifdef JP
-                msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
-                           (long)o_ptr->pval, o_name);
+               msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
+                          (long)o_ptr->pval, o_name);
 #else
                        msg_format("You have found %ld gold pieces worth of %s.",
                                (long) o_ptr->pval, o_name);
@@ -7431,6 +5921,13 @@ void py_pickup_floor(int pickup)
                        /* Check the next object */
                        continue;
                }
+               else if (o_ptr->marked & OM_NOMSG)
+               {
+                       /* If 0 or 1 non-NOMSG items are in the pile, the NOMSG ones are
+                        * ignored. Otherwise, they are included in the prompt. */
+                       o_ptr->marked &= ~(OM_NOMSG);
+                       continue;
+               }
 
                /* Count non-gold objects that can be picked up. */
                if (inven_carry_okay(o_ptr))
@@ -7438,10 +5935,6 @@ void py_pickup_floor(int pickup)
                        can_pickup++;
                }
 
-               /* Remember this object index */
-               if (floor_num < 23)
-                       floor_list[floor_num] = this_o_idx;
-
                /* Count non-gold objects */
                floor_num++;
 
@@ -7474,11 +5967,11 @@ void py_pickup_floor(int pickup)
 #endif /* ALLOW_EASY_SENSE */
 
                        /* Describe the object */
-                       object_desc(o_name, o_ptr, TRUE, 3);
+                       object_desc(o_name, o_ptr, 0);
 
                        /* Message */
 #ifdef JP
-                                msg_format("%s¤¬¤¢¤ë¡£", o_name);
+                               msg_format("%s¤¬¤¢¤ë¡£", o_name);
 #else
                        msg_format("You see %s.", o_name);
 #endif
@@ -7522,11 +6015,11 @@ void py_pickup_floor(int pickup)
 #endif /* ALLOW_EASY_SENSE */
 
                        /* Describe the object */
-                       object_desc(o_name, o_ptr, TRUE, 3);
+                       object_desc(o_name, o_ptr, 0);
 
                        /* Message */
 #ifdef JP
-                                msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
+                               msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
 #else
                        msg_format("You have no room for %s.", o_name);
 #endif
@@ -7538,7 +6031,7 @@ void py_pickup_floor(int pickup)
                {
                        /* Message */
 #ifdef JP
-                        msg_format("¥¶¥Ã¥¯¤Ë¤Ï¾²¤Ë¤¢¤ë¤É¤Î¥¢¥¤¥Æ¥à¤âÆþ¤é¤Ê¤¤¡£", o_name);
+                       msg_format("¥¶¥Ã¥¯¤Ë¤Ï¾²¤Ë¤¢¤ë¤É¤Î¥¢¥¤¥Æ¥à¤âÆþ¤é¤Ê¤¤¡£", o_name);
 #else
                        msg_print("You have no room for any of the objects on the floor.");
 #endif
@@ -7572,7 +6065,7 @@ void py_pickup_floor(int pickup)
 #endif /* ALLOW_EASY_SENSE */
 
                        /* Describe the object */
-                       object_desc(o_name, o_ptr, TRUE, 3);
+                       object_desc(o_name, o_ptr, 0);
 
                        /* Build a prompt */
 #ifdef JP