/* 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
/*
* 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)
{
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 */
{
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 (item_tester_hook_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);
}
}
}
/*
* 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;
/* 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;
{
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);
}
}
{
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 (item_tester_hook_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);
}
}
}
*/
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
case ART_AMBER:
{
#ifdef JP
-return "ÂÎÎϲóÉü(500) : 500 ¥¿¡¼¥óËè";
+return "ÂÎÎϲóÉü(700) : 250 ¥¿¡¼¥óËè";
#else
return "heal (700) every 250 turns";
#endif
#endif
}
case ART_NIGHT:
+ case ART_HELL:
{
#ifdef JP
return "°Å¹õ¤ÎÍò(250) : 150+d150 ¥¿¡¼¥óËè";
#endif
}
+ case ART_SACRED_KNIGHTS:
+ {
+#ifdef JP
+return "*²ò¼ö*¤ÈÄ´ºº: ¤¤¤Ä¤Ç¤â";
+#else
+ return "Dispel Curse and Probing every turn";
+#endif
+
+ }
+ case ART_CHARMED:
+ {
+#ifdef JP
+return "ËâÎϤÎÍò(200) : 150+d150 ¥¿¡¼¥óËè";
+#else
+ return "mana storm (200) every 150+d150 turns";
+#endif
+
+ }
}
}
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID))
+ if (item_tester_hook_smith(o_ptr))
{
+ switch (o_ptr->xtra3 - 1)
+ {
+ case ESSENCE_TMP_RES_ACID:
#ifdef JP
-return "»À¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "»À¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist acid every 50+d50 turns";
+ return "resist acid every 50+d50 turns";
#endif
- }
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_ELEC))
- {
+ case ESSENCE_TMP_RES_ELEC:
#ifdef JP
-return "ÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "ÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist elec every 50+d50 turns";
+ return "resist elec every 50+d50 turns";
#endif
- }
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_FIRE))
- {
+ case ESSENCE_TMP_RES_FIRE:
#ifdef JP
-return "²Ð¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "²Ð¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist fire every 50+d50 turns";
+ return "resist fire every 50+d50 turns";
#endif
- }
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_COLD))
- {
+ case ESSENCE_TMP_RES_COLD:
#ifdef JP
-return "Î䵤¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "Î䵤¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
- return "resist cold every 50+d50 turns";
+ return "resist cold every 50+d50 turns";
#endif
- }
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_EARTHQUAKE))
- {
+ case TR_IMPACT:
#ifdef JP
-return "ÃÏ¿Ì : 100+d100 ¥¿¡¼¥óËè";
+ return "ÃÏ¿Ì : 100+d100 ¥¿¡¼¥óËè";
#else
- return "earthquake every 100+d100 turns";
+ return "earthquake every 100+d100 turns";
#endif
+ }
}
if (o_ptr->name2 == EGO_TRUMP)
{
case EGO_AMU_IDENT:
#ifdef JP
-return "´ÕÄê : 10 ¥¿¡¼¥óËè";
+ return "´ÕÄê : 10 ¥¿¡¼¥óËè";
#else
return "identify every 10 turns";
#endif
- break;
case EGO_AMU_CHARM:
#ifdef JP
-return "¥â¥ó¥¹¥¿¡¼Ì¥Î» : 200 ¥¿¡¼¥óËè";
+ return "¥â¥ó¥¹¥¿¡¼Ì¥Î» : 200 ¥¿¡¼¥óËè";
#else
return "charm monster every 200 turns";
#endif
- break;
case EGO_AMU_JUMP:
#ifdef JP
-return "¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È : 10+d10 ¥¿¡¼¥óËè";
+ return "¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È : 10+d10 ¥¿¡¼¥óËè";
#else
return "blink every 10+d10 turns";
#endif
- break;
case EGO_AMU_TELEPORT:
#ifdef JP
-return "¥Æ¥ì¥Ý¡¼¥È : 50+d50 ¥¿¡¼¥óËè";
+ return "¥Æ¥ì¥Ý¡¼¥È : 50+d50 ¥¿¡¼¥óËè";
#else
return "teleport every 50+d50 turns";
#endif
- break;
case EGO_AMU_D_DOOR:
#ifdef JP
-return "¼¡¸µ¤ÎÈâ : 200 ¥¿¡¼¥óËè";
+ return "¼¡¸µ¤ÎÈâ : 200 ¥¿¡¼¥óËè";
#else
return "dimension door every 200 turns";
#endif
- break;
case EGO_AMU_RES_FIRE_:
#ifdef JP
-return "²Ð±ê¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "²Ð±ê¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
return "resist fire every 50+d50 turns";
#endif
- break;
case EGO_AMU_RES_COLD_:
#ifdef JP
-return "Î䵤¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "Î䵤¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
return "resist cold every 50+d50 turns";
#endif
- break;
case EGO_AMU_RES_ELEC_:
#ifdef JP
-return "ÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "ÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
return "resist elec every 50+d50 turns";
#endif
- break;
case EGO_AMU_RES_ACID_:
#ifdef JP
-return "»À¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
+ return "»À¤Ø¤ÎÂÑÀ : 50+d50¥¿¡¼¥óËè";
#else
return "resist acid every 50+d50 turns";
#endif
- break;
case EGO_AMU_DETECTION:
#ifdef JP
-return "Á´´¶ÃÎ : 55+d55¥¿¡¼¥óËè";
+ return "Á´´¶ÃÎ : 55+d55¥¿¡¼¥óËè";
#else
return "detect all floor every 55+d55 turns";
#endif
- break;
}
}
}
/*
* Describe a "fully identified" item
*/
-bool identify_fully_aux(object_type *o_ptr)
+bool screen_object(object_type *o_ptr, bool real)
{
int i = 0, j, k;
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
cptr info[128];
- u32b flag;
char o_name[MAX_NLEN];
int wid, hgt;
/* Extract the flags */
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
/* 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);
+ (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text),
+ 77 - 15, temp, sizeof(temp));
for (j = 0; temp[j]; j += 1 + strlen(&temp[j]))
{ info[i] = &temp[j]; i++;}
}
/* Mega-Hack -- describe activation */
- if (f3 & (TR3_ACTIVATE))
+ if (have_flag(flgs, TR_ACTIVATE))
{
#ifdef JP
info[i++] = "»ÏÆ°¤·¤¿¤È¤¤Î¸ú²Ì...";
#ifdef JP
info[i++] = "¤½¤ì¤ÏÁê¼ê¤ò°ì·â¤ÇÅݤ¹¤³¤È¤¬¤¢¤ë¡£";
#else
- info[i++] = "It will attempts to kill a monster instantly.";
+ info[i++] = "It will attempt to kill a monster instantly.";
#endif
}
#ifdef JP
info[i++] = "¤½¤ì¤Ï¼«Ê¬¼«¿È¤Ë¹¶·â¤¬Ê֤äƤ¯¤ë¤³¤È¤¬¤¢¤ë¡£";
#else
- info[i++] = "It strikes yourself sometimes.";
+ info[i++] = "It causes you to strike yourself sometimes.";
#endif
#ifdef JP
info[i++] = "¤½¤ì¤Ï̵Ũ¤Î¥Ð¥ê¥¢¤òÀÚ¤êÎö¤¯¡£";
#else
- info[i++] = "It will always penetrates invulnerability barrier.";
+ info[i++] = "It always penetrates invulnerability barriers.";
#endif
}
}
- if (o_ptr->name2 == EGO_RING_WIZARD)
+ if (have_flag(flgs, TR_EASY_SPELL))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò²¼¤²¤ë¡£";
#else
- info[i++] = "It affects your ability to use magic devices.";
+ info[i++] = "It affects your ability to cast spells.";
#endif
}
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò¾å¤²¤ë¡£";
#else
- info[i++] = "It prevents you from using magic items.";
+ info[i++] = "It interferes with casting spells.";
#endif
}
if (o_ptr->name2 == EGO_LITE_DARKNESS)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
+ info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
+#else
+ info[i++] = "It provides no light.";
+#endif
+
+ if (o_ptr->sval == SV_LITE_FEANOR ||
+ o_ptr->sval == SV_LITE_LANTERN)
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
+#else
+ info[i++] = "It decreases radius of light source by 2.";
+#endif
+ }
+ else
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
#else
- info[i++] = "It provides no light..";
+ info[i++] = "It decreases radius of light source by 1.";
#endif
+ }
}
else if (artifact_p(o_ptr))
{
/* And then describe it fully */
- if (f2 & (TR2_RIDING))
+ 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
#endif
}
- if (f1 & (TR1_STR))
+ if (have_flag(flgs, TR_STR))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_INT))
+ if (have_flag(flgs, TR_INT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_WIS))
+ if (have_flag(flgs, TR_WIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¸¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_DEX))
+ if (have_flag(flgs, TR_DEX))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_CON))
+ if (have_flag(flgs, TR_CON))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_CHR))
+ if (have_flag(flgs, TR_CHR))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
}
- if (f1 & (TR1_MAGIC_MASTERY))
+ if (have_flag(flgs, TR_MAGIC_MASTERY))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡Æ»¶ñ»ÈÍÑǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_STEALTH))
+ if (have_flag(flgs, TR_STEALTH))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_SEARCH))
+ if (have_flag(flgs, TR_SEARCH))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_INFRA))
+ if (have_flag(flgs, TR_INFRA))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_TUNNEL))
+ if (have_flag(flgs, TR_TUNNEL))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_SPEED))
+ if (have_flag(flgs, TR_SPEED))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_BLOWS))
+ if (have_flag(flgs, TR_BLOWS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
}
- if (f1 & (TR1_BRAND_ACID))
+ if (have_flag(flgs, TR_BRAND_ACID))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
#endif
}
- if (f1 & (TR1_BRAND_ELEC))
+ if (have_flag(flgs, TR_BRAND_ELEC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
#endif
}
- if (f1 & (TR1_BRAND_FIRE))
+ if (have_flag(flgs, TR_BRAND_FIRE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
#endif
}
- if (f1 & (TR1_BRAND_COLD))
+ if (have_flag(flgs, TR_BRAND_COLD))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
}
- if (f1 & (TR1_BRAND_POIS))
+ if (have_flag(flgs, TR_BRAND_POIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏŨ¤òÆǤ¹¤ë¡£";
}
- if (f1 & (TR1_CHAOTIC))
+ if (have_flag(flgs, TR_CHAOTIC))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹Åª¤Ê¸ú²Ì¤òµÚ¤Ü¤¹¡£";
}
- if (f1 & (TR1_VAMPIRIC))
+ if (have_flag(flgs, TR_VAMPIRIC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏŨ¤«¤é¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤òµÛ¼ý¤¹¤ë¡£";
}
- if (f1 & (TR1_IMPACT))
+ if (have_flag(flgs, TR_IMPACT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃϿ̤òµ¯¤³¤¹¤³¤È¤¬¤Ç¤¤ë¡£";
}
- if (f1 & (TR1_VORPAL))
+ if (have_flag(flgs, TR_VORPAL))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÈó¾ï¤ËÀÚ¤ìÌ£¤¬±Ô¤¯Å¨¤òÀÚÃǤ¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
}
- if (f1 & (TR1_KILL_DRAGON))
+ if (have_flag(flgs, TR_KILL_DRAGON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
#endif
}
- else if (f1 & (TR1_SLAY_DRAGON))
+ else if (have_flag(flgs, TR_SLAY_DRAGON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_ORC))
+
+ if (have_flag(flgs, TR_KILL_ORC))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of orcs.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_ORC))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_TROLL))
+
+ if (have_flag(flgs, TR_KILL_TROLL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of trolls.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_TROLL))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_GIANT))
+
+ if (have_flag(flgs, TR_KILL_GIANT))
{
- if (o_ptr->name1 == ART_HRUNTING)
#ifdef JP
info[i++] = "¤½¤ì¤Ïµð¿Í¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
#else
info[i++] = "It is a great bane of giants.";
#endif
- else
+ }
+ else if (have_flag(flgs, TR_SLAY_GIANT))
+ {
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥¸¥ã¥¤¥¢¥ó¥È¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#else
#endif
}
- if (f1 & (TR1_SLAY_DEMON))
+
+ if (have_flag(flgs, TR_KILL_DEMON))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of demons.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_DEMON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_UNDEAD))
+
+ if (have_flag(flgs, TR_KILL_UNDEAD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of undead.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_UNDEAD))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_EVIL))
+
+ if (have_flag(flgs, TR_KILL_EVIL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼Ù°¤Ê¤ë¸ºß¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of evil monsters.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_EVIL))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¼Ù°¤Ê¤ë¸ºß¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤǹ¶·â¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_ANIMAL))
+
+ if (have_flag(flgs, TR_KILL_ANIMAL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of natural creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_ANIMAL))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_SLAY_HUMAN))
+
+ if (have_flag(flgs, TR_KILL_HUMAN))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of humans.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_HUMAN))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
}
- if (f1 & (TR1_FORCE_WEAPON))
+ if (have_flag(flgs, TR_FORCE_WEAPON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï»ÈÍѼԤÎËâÎϤò»È¤Ã¤Æ¹¶·â¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_DEC_MANA))
+ if (have_flag(flgs, TR_DEC_MANA))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâÎϤξÃÈñ¤ò²¡¤µ¤¨¤ë¡£";
#endif
}
- if (f2 & (TR2_SUST_STR))
+ if (have_flag(flgs, TR_SUST_STR))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÏÓÎϤò°Ý»ý¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_SUST_INT))
+ if (have_flag(flgs, TR_SUST_INT))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÃÎǽ¤ò°Ý»ý¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_SUST_WIS))
+ if (have_flag(flgs, TR_SUST_WIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¸¤µ¤ò°Ý»ý¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_SUST_DEX))
+ if (have_flag(flgs, TR_SUST_DEX))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î´ïÍѤµ¤ò°Ý»ý¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_SUST_CON))
+ if (have_flag(flgs, TR_SUST_CON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÂѵ×ÎϤò°Ý»ý¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_SUST_CHR))
+ if (have_flag(flgs, TR_SUST_CHR))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÌ¥ÎϤò°Ý»ý¤¹¤ë¡£";
}
- if (f2 & (TR2_IM_ACID))
+ if (have_flag(flgs, TR_IM_ACID))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï»À¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_IM_ELEC))
+ if (have_flag(flgs, TR_IM_ELEC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÅÅ·â¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_IM_FIRE))
+ if (have_flag(flgs, TR_IM_FIRE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï²Ð¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_IM_COLD))
+ if (have_flag(flgs, TR_IM_COLD))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï´¨¤µ¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
}
- if (f2 & (TR2_THROW))
+ if (have_flag(flgs, TR_THROW))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏŨ¤ËÅꤲ¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
#endif
}
- if (f2 & (TR2_FREE_ACT))
+ if (have_flag(flgs, TR_FREE_ACT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏËãáã¤ËÂФ¹¤ë´°Á´¤ÊÌȱ֤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_HOLD_LIFE))
+ if (have_flag(flgs, TR_HOLD_LIFE))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÀ¸Ì¿Îϵۼý¤ËÂФ¹¤ëÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_FEAR))
+ if (have_flag(flgs, TR_RES_FEAR))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¶²Éݤؤδ°Á´¤ÊÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_ACID))
+ if (have_flag(flgs, TR_RES_ACID))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï»À¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_ELEC))
+ if (have_flag(flgs, TR_RES_ELEC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_FIRE))
+ if (have_flag(flgs, TR_RES_FIRE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï²Ð¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_COLD))
+ if (have_flag(flgs, TR_RES_COLD))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï´¨¤µ¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_POIS))
+ if (have_flag(flgs, TR_RES_POIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÆǤؤÎÂÑÀ¤ò¼ø¤±¤ë¡£";
}
- if (f2 & (TR2_RES_LITE))
+ if (have_flag(flgs, TR_RES_LITE))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÁ®¸÷¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_DARK))
+ if (have_flag(flgs, TR_RES_DARK))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï°Å¹õ¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
}
- if (f2 & (TR2_RES_BLIND))
+ if (have_flag(flgs, TR_RES_BLIND))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌÕÌܤؤÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_CONF))
+ if (have_flag(flgs, TR_RES_CONF))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ïº®Íð¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_SOUND))
+ if (have_flag(flgs, TR_RES_SOUND))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¹ì²»¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_SHARDS))
+ if (have_flag(flgs, TR_RES_SHARDS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÇËÊҤؤÎÂÑÀ¤ò¼ø¤±¤ë¡£";
}
- if (f2 & (TR2_RES_NETHER))
+ if (have_flag(flgs, TR_RES_NETHER))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃϹö¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_NEXUS))
+ if (have_flag(flgs, TR_RES_NEXUS))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï°ø²Ìº®Íð¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_CHAOS))
+ if (have_flag(flgs, TR_RES_CHAOS))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
#endif
}
- if (f2 & (TR2_RES_DISEN))
+ if (have_flag(flgs, TR_RES_DISEN))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÎô²½¤Ø¤ÎÂÑÀ¤ò¼ø¤±¤ë¡£";
}
- if (f3 & (TR3_FEATHER))
+ if (have_flag(flgs, TR_FEATHER))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃè¤ËÉ⤯¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_LITE))
+ if (have_flag(flgs, TR_LITE))
{
if ((o_ptr->name2 == EGO_DARK) || (o_ptr->name1 == ART_NIGHT))
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë¡£";
+info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
#else
- info[i++] = "It decreases radius of your light source.";
+ info[i++] = "It decreases radius of your light source by 1.";
#endif
else
#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤ÎÌÀ¤«¤ê¤ò¼ø¤±¤ë¡£";
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤ÎÌÀ¤«¤ê¤ò¼ø¤±¤ë(Ⱦ·Â¤Ë+1)¡£";
#else
- info[i++] = "It provides permanent light.";
+ info[i++] = "It provides permanent light. (radius +1)";
#endif
}
- if (f3 & (TR3_SEE_INVIS))
+ if (have_flag(flgs, TR_SEE_INVIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÆ©ÌÀ¤Ê¥â¥ó¥¹¥¿¡¼¤ò¸«¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_TELEPATHY))
+ if (have_flag(flgs, TR_TELEPATHY))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ñ¥·¡¼Ç½ÎϤò¼ø¤±¤ë¡£";
#endif
}
- if (f3 & (TR3_SLOW_DIGEST))
+ if (have_flag(flgs, TR_ESP_ANIMAL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤ÎÀ¸Êª¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses natural creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_UNDEAD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses undead.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_DEMON))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï°Ëâ¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses demons.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_ORC))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses orcs.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_TROLL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses trolls.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_GIANT))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ïµð¿Í¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses giants.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_DRAGON))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses dragons.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_HUMAN))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses humans.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_EVIL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼Ù°¤Ê¸ºß¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses evil creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_GOOD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÁ±Îɤʸºß¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses good creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_NONLIVING))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï³èÆ°¤¹¤ë̵À¸ÊªÂΤò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses non-living creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_UNIQUE))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÆÃÊ̤ʶ¯Å¨¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses unique monsters.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLOW_DIGEST))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤òÃÙ¤¯¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_REGEN))
+ if (have_flag(flgs, TR_REGEN))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÂÎÎϲóÉüÎϤò¶¯²½¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_WARNING))
+ if (have_flag(flgs, TR_WARNING))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï´í¸±¤ËÂФ·¤Æ·Ù¹ð¤òȯ¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_REFLECT))
+ if (have_flag(flgs, TR_REFLECT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌð¤ä¥Ü¥ë¥È¤òÈ¿¼Í¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_SH_FIRE))
+ if (have_flag(flgs, TR_SH_FIRE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï±ê¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
#endif
}
- if (f3 & (TR3_SH_ELEC))
+ if (have_flag(flgs, TR_SH_ELEC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÅŵ¤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
#endif
}
- if (f3 & (TR3_SH_COLD))
+ if (have_flag(flgs, TR_SH_COLD))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÎ䵤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
#endif
}
- if (f3 & (TR3_NO_MAGIC))
+ if (have_flag(flgs, TR_NO_MAGIC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÈ¿ËâË¡¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
#endif
}
- if (f3 & (TR3_NO_TELE))
+ if (have_flag(flgs, TR_NO_TELE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤹¤ë¡£";
#endif
}
- if (f3 & (TR3_XTRA_MIGHT))
+ if (have_flag(flgs, TR_XTRA_MIGHT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤò¤è¤ê¶¯ÎϤËȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
#endif
}
- if (f3 & (TR3_XTRA_SHOTS))
+ if (have_flag(flgs, TR_XTRA_SHOTS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤòÈó¾ï¤ËÁ᤯ȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
}
- if (f3 & TR3_BLESSED)
+ if (have_flag(flgs, TR_BLESSED))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¿À¤Ë½ËÊ¡¤µ¤ì¤Æ¤¤¤ë¡£";
}
}
- 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++] = "¤½¤ì¤ÏÂÀ¸Å¤Î²Ò¡¹¤·¤¤±åÇ°¤¬½É¤Ã¤Æ¤¤¤ë¡£";
#endif
}
- 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++] = "¤½¤ì¤ÏÉÕ¶á¤Î¥â¥ó¥¹¥¿¡¼¤òÅܤ餻¤ë¡£";
#endif
}
- 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++] = "¤½¤ì¤Ï·Ð¸³ÃͤòµÛ¤¤¼è¤ë¡£";
#endif
}
- 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++] = "¤½¤ì¤Ï¥é¥ó¥À¥à¤Ê¥Æ¥ì¥Ý¡¼¥È¤ò°ú¤µ¯¤³¤¹¡£";
#ifdef JP
info[i++] = "¤½¤ì¤Ï¹¶·â¤ò³°¤·¤ä¤¹¤¤¡£";
#else
- info[i++] = "It causes you miss blows.";
+ info[i++] = "It causes you to miss blows.";
#endif
}
#ifdef JP
info[i++] = "¤½¤ì¤Ï¹¶·â¤ò¼õ¤±¤ä¤¹¤¤¡£";
#else
- info[i++] = "It helps your enemys' blows.";
+ info[i++] = "It helps your enemies' blows.";
#endif
}
}
- /* XTRA HACK ARTDESC */
- flag = TR3_IGNORE_ACID | TR3_IGNORE_ELEC | TR3_IGNORE_FIRE | TR3_IGNORE_COLD ;
- if ((f3 & flag) == flag)
+ /* Describe about this kind of object instead of THIS fake object */
+ if (!real)
{
+ 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 cannot be harmed by the elements.";
+ info[i++] = "It provides some random resistances.";
#endif
- } else {
- if (f3 & (TR3_IGNORE_ACID))
- {
+ break;
+ case SV_RING_WARNING:
#ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+ info[i++] = "¤½¤ì¤Ï¤Ò¤È¤Ä¤ÎÄãµé¤ÊESP¤ò¼ø¤±¤ë»ö¤¬¤¢¤ë¡£";
#else
- info[i++] = "It cannot be harmed by acid.";
+ info[i++] = "It may provide a low rank ESP.";
#endif
+ break;
+ }
+ break;
- }
- if (f3 & (TR3_IGNORE_ELEC))
- {
+ case TV_AMULET:
+ switch (o_ptr->sval)
+ {
+ case SV_AMULET_RESISTANCE:
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+ info[i++] = "¤½¤ì¤ÏÆǤؤÎÂÑÀ¤ò¼ø¤±¤ë»ö¤¬¤¢¤ë¡£";
#else
- info[i++] = "It cannot be harmed by electricity.";
+ info[i++] = "It may provides resistance to poison.";
#endif
-
+#ifdef JP
+ info[i++] = "¤½¤ì¤Ï¥é¥ó¥À¥à¤ÊÂÑÀ¤ò¼ø¤±¤ë»ö¤¬¤¢¤ë¡£";
+#else
+ info[i++] = "It may provide a random resistances.";
+#endif
+ break;
+ case SV_AMULET_THE_MAGI:
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏºÇÂç¤Ç£³¤Ä¤Þ¤Ç¤ÎÄãµé¤ÊESP¤ò¼ø¤±¤ë¡£";
+#else
+ info[i++] = "It provides up to three low rank ESPs.";
+#endif
+ break;
+ }
+ break;
+ }
}
- if (f3 & (TR3_IGNORE_FIRE))
+
+ 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 fire.";
+ info[i++] = "It cannot be harmed by the elements.";
#endif
-
}
- if (f3 & (TR3_IGNORE_COLD))
+ else
{
+ if (have_flag(flgs, TR_IGNORE_ACID))
+ {
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÎ䵤¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+ info[i++] = "¤½¤ì¤Ï»À¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
#else
- info[i++] = "It cannot be harmed by cold.";
+ info[i++] = "It cannot be harmed by acid.";
#endif
-
- }
-
- /* XTRA HACK ARTDESC */
+ }
+ if (have_flag(flgs, TR_IGNORE_ELEC))
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
+#else
+ 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
+ }
}
/* No special effects */
Term_get_size(&wid, &hgt);
/* Display Item name */
- object_desc(o_name, o_ptr, TRUE, 3);
- prt(format("%s", o_name), 0, 0);
+ if (real)
+ object_desc(o_name, o_ptr, TRUE, 3);
+ else
+ object_desc_store(o_name, o_ptr, TRUE, 0);
+
+ prt(o_name, 0, 0);
/* Erase the screen */
for (k = 1; k < hgt; k++) prt("", k, 13);
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++)
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 < Term->hgt; i++)
+ for (i = z; i < hgt; i++)
{
/* Erase the line */
Term_erase(0, i, 255);
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++)
/* Erase the rest of the line */
Term_erase(3+n, i - INVEN_RARM, 255);
- /* 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));
- }
-
- /* Display the weight (if needed) */
- if (show_weights && o_ptr->weight)
+ /* Display the weight (if needed) */
+ if (show_weights && o_ptr->weight)
{
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
- Term_putstr(col, i - INVEN_RARM, -1, TERM_WHITE, tmp_val);
+ 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 < Term->hgt; i++)
+ 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 = 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, '@');
+ }
+ }
+
+
+ /**** 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 = 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 = 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 = 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 = 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 = 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 = strchr(s + 1, '@');
+ }
+ }
+
+ /* No such tag */
+ return (FALSE);
+}
+
+
+/*
+ * Move around label characters with correspond tags
+ */
+static void prepare_label_string(char *label, int mode)
+{
+ cptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ int offset = (mode == USE_EQUIP) ? INVEN_RARM : 0;
+ int i;
+
+ /* Prepare normal labels */
+ strcpy(label, alphabet_chars);
+
+ /* Move each label */
+ for (i = 0; i < 52; i++)
+ {
+ int index;
+ char c = alphabet_chars[i];
+
+ /* Find a tag with this label */
+ if (get_tag(&index, c, mode))
+ {
+ /* Delete the overwritten label */
+ if (label[i] == c) label[i] = ' ';
+
+ /* Move the label to the place of corresponding tag */
+ label[index - offset] = c;
+ }
+ }
+}
+
+
+/*
+ * 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;
+
+ /* Prepare normal labels */
+ strcpy(label, alphabet_chars);
+
+ /* Move each label */
+ for (i = 0; i < 52; i++)
+ {
+ int index;
+ char c = alphabet_chars[i];
+
+ /* Find a tag with this label */
+ if (get_tag_floor(&index, c, floor_list, floor_num))
+ {
+ /* Delete the overwritten label */
+ if (label[i] == c) label[i] = ' ';
+
+ /* Move the label to the place of corresponding tag */
+ label[index] = c;
+ }
+ }
+}
/*
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];
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;
/* 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++)
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++)
/* Describe the object */
object_desc(o_name, o_ptr, TRUE, 3);
- /* Hack -- enforce max length */
- o_name[lim] = '\0';
-
/* Save the object index, color, and description */
out_index[k] = i;
out_color[k] = tval_to_attr[o_ptr->tval % 128];
}
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
{
(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);
}
}
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];
char out_desc[23][MAX_NLEN];
int target_item_label = 0;
int wid, hgt;
-
+ char equip_label[52 + 1];
/* Starting column */
col = command_gap;
/* 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++)
/* Description */
object_desc(o_name, o_ptr, TRUE, 3);
- /* Truncate the description */
- o_name[lim] = 0;
-
if ((i == INVEN_LARM) && p_ptr->ryoute)
{
#ifdef JP
/* 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
/* 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
/* 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++)
}
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);
{
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);
}
}
/*
- * 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).
*/
{
s16b this_o_idx, next_o_idx = 0;
- char n1, n2, which = ' ';
+ char which = ' ';
int j, k, i1, i2, e1, e2;
char out_val[160];
/* See cmd5.c */
- extern bool select_spellbook;
extern bool select_the_force;
int menu_line = (use_menu ? 1 : 0);
/* Get the item index */
if (repeat_pull(cp))
{
- if (*cp == 1111) { /* the_force */
+ if (*cp == INVEN_FORCE) { /* the_force */
item_tester_tval = 0;
item_tester_hook = NULL;
return (TRUE);
done = TRUE;
if (select_the_force) {
- *cp = 1111;
+ *cp = INVEN_FORCE;
item = TRUE;
}
}
{
/* Hack -- Start on equipment if requested */
if (command_see && command_wrk && equip)
-
{
command_wrk = TRUE;
}
}
- /*
- * Äɲ媥ץ·¥ç¥ó(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)
/* 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);
}
/* 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);
}
{
/* 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);
{
/* 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);
done = TRUE;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
- *cp = 1111;
+ *cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
break;
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;
#if 0
case '\n':
case '\r':
-#endif
{
/* Choose "default" inventory item */
if (!command_wrk)
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;
+ break;
+ }
/* Extract "query" setting */
ver = isupper(which);
/* 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 */
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;
int floor_list[23], floor_num;
int wid, hgt;
+ char floor_label[52 + 1];
/* Get size */
Term_get_size(&wid, &hgt);
/* 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);
- /* 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';
-
/* Save the index */
out_index[k] = i;
/* 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++)
{
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);
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);
}
}
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);
/* Get the item index */
if (repeat_pull(cp))
{
- if (*cp == 1111) { /* the_force */
+ if (*cp == INVEN_FORCE) { /* the_force */
item_tester_tval = 0;
item_tester_hook = NULL;
return (TRUE);
done = TRUE;
if (select_the_force) {
- *cp = 1111;
+ *cp = INVEN_FORCE;
item = TRUE;
}
}
}
}
- /*
- * Äɲ媥ץ·¥ç¥ó(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)
{
/* 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);
{
/* 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);
{
/* 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
done = TRUE;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
- *cp = 1111;
+ *cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
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);
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 */
}
#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;
+ }
- if( !not_found ){
- /* Accept that choice */
- (*cp) = k;
- item = TRUE;
- done = TRUE;
- break;
- }
- }
+ /* 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;
+ }
+ }
+ else
+ {
+ /* Look up the alphabetical tag */
+ if (get_tag_floor(&k, which, floor_list, floor_num))
+ {
+ /* Special index */
+ k = 0 - floor_list[k];
+
+ /* Accept that choice */
+ (*cp) = k;
+ item = TRUE;
+ done = TRUE;
+ break;
+ }
+ }
/* Extract "query" setting */
ver = isupper(which);
/* 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();
{
s16b this_o_idx;
- object_type *o_ptr;
-
cptr q, s;
int item;
return (FALSE);
}
- /* Access the object */
- o_ptr = &o_list[this_o_idx];
-
/* Pick up the object */
py_pickup_aux(this_o_idx);
{
/* 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);
/* 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))
/* Message */
#ifdef JP
- msg_format("%s¤¬¤¢¤ë¡£", o_name);
+ msg_format("%s¤¬¤¢¤ë¡£", o_name);
#else
msg_format("You see %s.", o_name);
#endif
/* 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
{
/* 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
OSDN Git Service
