/* 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
*/
void reset_visuals(void)
{
- int i;
+ int i, j;
/* Extract some info about terrain features */
for (i = 0; i < max_f_idx; i++)
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 */
/*
* 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);
}
}
}
/*
* 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)
-{
- /* 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;
-
-
- /* 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);
-
-
- /* Restore "aware" flag */
- k_info[o_ptr->k_idx].aware = hack_aware;
-
- /* Clear the known flag */
- if (!hack_known) o_ptr->ident &= ~(IDENT_KNOWN);
-}
-
-
-
-
-/*
* Determine the "Activation" (if any) for an artifact
* Return a string, or NULL for "no activation"
*/
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
* for art_name
*/
- if (!(o_ptr->name1) &&
- !(o_ptr->name2) &&
- !(o_ptr->xtra1) &&
- (o_ptr->xtra2))
+ if (!object_is_fixed_artifact(o_ptr) &&
+ !object_is_ego(o_ptr) &&
+ !(o_ptr->xtra1) &&
+ (o_ptr->xtra2))
{
switch (o_ptr->xtra2)
{
case ACT_BA_COLD_1:
{
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (48) : 400 ¥¿¡¼¥óËè";
+return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (48) : 400 ¥¿¡¼¥óËè";
#else
return "ball of cold (48) every 400 turns";
#endif
case ACT_DRAIN_1:
{
#ifdef JP
-return "¥Ò¥Ã¥È¥Ý¥¤¥ó¥ÈµÛ¼ý (100) : 100+d100 ¥¿¡¼¥óËè";
+return "À¸Ì¿Îϵۼý (100) : 100+d100 ¥¿¡¼¥óËè";
#else
return "drain life (100) every 100+d100 turns";
#endif
case ACT_BA_COLD_2:
{
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) : 300 ¥¿¡¼¥óËè";
+return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) : 300 ¥¿¡¼¥óËè";
#else
return "ball of cold (100) every 300 turns";
#endif
case ACT_DRAIN_2:
{
#ifdef JP
-return "¥Ò¥Ã¥È¥Ý¥¤¥ó¥ÈµÛ¼ý(120) : 400 ¥¿¡¼¥óËè";
+return "À¸Ì¿Îϵۼý(120) : 400 ¥¿¡¼¥óËè";
#else
return "drain life (120) every 400 turns";
#endif
case ACT_BA_COLD_3:
{
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (200) : 325+d325 ¥¿¡¼¥óËè";
+return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (200) : 325+d325 ¥¿¡¼¥óËè";
#else
return "ball of cold (200) every 325+d325 turns";
#endif
case ACT_CALL_CHAOS:
{
#ifdef JP
-return "call chaos : 350 ¥¿¡¼¥óËè"; /*nuke me*/
+return "º®ÆÙ¾¤Íè : 350 ¥¿¡¼¥óËè"; /*nuke me*/
#else
return "call chaos every 350 turns";
#endif
case ACT_CHARM_UNDEAD:
{
#ifdef JP
-return "ÉԻཾ° : 333 ¥¿¡¼¥óËè";
+return "¥¢¥ó¥Ç¥Ã¥É½¾Â° : 333 ¥¿¡¼¥óËè";
#else
return "enslave undead every 333 turns";
#endif
case ACT_SUMMON_PHANTOM:
{
#ifdef JP
-return "»È¤¤Î´ : 200+d200 ¥¿¡¼¥óËè";
+return "¸¸Î´ : 200+d200 ¥¿¡¼¥óËè";
#else
return "summon phantasmal servant every 200+d200 turns";
#endif
case ACT_SUMMON_UNDEAD:
{
#ifdef JP
-return "ÉԻྤ´ : 666+d333 ¥¿¡¼¥óËè";
+return "¥¢¥ó¥Ç¥Ã¥É¾¤´ : 666+d333 ¥¿¡¼¥óËè";
#else
return "summon undead every 666+d333 turns";
#endif
case ACT_CURE_LW:
{
#ifdef JP
-return "ͦµ¤²óÉü & 30 hp ²óÉü : 10 ¥¿¡¼¥óËè";
+return "¶²Éݽüµî & 30 hp ²óÉü : 10 ¥¿¡¼¥óËè";
#else
return "remove fear & heal 30 hp every 10 turns";
#endif
case ACT_CURE_POISON:
{
#ifdef JP
-return "ͦµ¤²óÉü/ÆǾä· : 5 ¥¿¡¼¥óËè";
+return "¶²Éݽüµî/ÆǾä· : 5 ¥¿¡¼¥óËè";
#else
return "remove fear and cure poison every 5 turns";
#endif
case ACT_REST_ALL:
{
#ifdef JP
-return "Á´¥¹¥Æ¡¼¥¿¥¹¤È·Ð¸³ÃͲóÉü : 750 ¥¿¡¼¥óËè";
+return "Á´¥¹¥Æ¡¼¥¿¥¹¤È·Ð¸³ÃÍÉü³è : 750 ¥¿¡¼¥óËè";
#else
return "restore stats and life levels every 750 turns";
#endif
case ACT_ESP:
{
#ifdef JP
-return "°ì»þŪ¤Ê ESP (´ü´Ö 25+d30) : 200 ¥¿¡¼¥óËè";
+return "¥Æ¥ì¥Ñ¥·¡¼ (´ü´Ö 25+d30) : 200 ¥¿¡¼¥óËè";
#else
- return "temporary ESP (dur 25+d30) every 200 turns";
+ return "telepathy (dur 25+d30) every 200 turns";
#endif
}
case ACT_RESIST_ALL:
{
#ifdef JP
-return "±êÎä»ÀÅÅÆǤؤÎÂÑÀ (´ü´Ö 40+d40) : 200 ¥¿¡¼¥óËè";
+return "Á´ÂÑÀ (´ü´Ö 40+d40) : 200 ¥¿¡¼¥óËè";
#else
return "resist elements (dur 40+d40) every 200 turns";
#endif
case ACT_WRAITH:
{
#ifdef JP
-return "¥ì¥¤¥¹²½ (level/2 + d(level/2)) : 1000 ¥¿¡¼¥óËè";
+return "Í©Âβ½ (´ü´Ö level/2 + d(level/2)) : 1000 ¥¿¡¼¥óËè";
#else
- return "wraith form (level/2 + d(level/2)) every 1000 turns";
+ return "wraith form (dur level/2 + d(level/2)) every 1000 turns";
#endif
}
case ACT_INVULN:
{
#ifdef JP
-return "̵Ũ (´ü´Ö 8+d8) : 1000 ¥¿¡¼¥óËè";
+return "̵Ũ²½ (´ü´Ö 8+d8) : 1000 ¥¿¡¼¥óËè";
#else
return "invulnerability (dur 8+d8) every 1000 turns";
#endif
case ACT_RUNE_EXPLO:
{
#ifdef JP
-return "Çúȯ¥ë¡¼¥ó : 200 ¥¿¡¼¥óËè";
+return "Çúȯ¤Î¥ë¡¼¥ó : 200 ¥¿¡¼¥óËè";
#else
return "explosive rune every 200 turns";
#endif
case ACT_RECHARGE:
{
#ifdef JP
-return "ºÆ½¼Å¶ : 70 ¥¿¡¼¥óËè";
+return "ËâÎϽ¼Å¶ : 70 ¥¿¡¼¥óËè";
#else
return "recharging every 70 turns";
#endif
}
case ART_AVAVIR:
case ART_MAGATAMA:
+ case ART_HEAVENLY_MAIDEN:
{
#ifdef JP
return "µ¢´Ô¤Î¾Û : 200 ¥¿¡¼¥óËè";
case ART_GANDALF:
{
#ifdef JP
-return "õº÷¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 1000 ¥¿¡¼¥óËè";
+return "Ä´ºº¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 100 ¥¿¡¼¥óËè";
#else
- return "probing, detection and full id every 1000 turns";
+ return "probing, detection and full id every 100 turns";
#endif
}
case ART_LOTHARANG:
{
#ifdef JP
-return "½ý¤Î¼£Ìþ(4d7) : 3+d3 ¥¿¡¼¥óËè";
+return "½ý¤Î¼£Ìþ(4d8) : 3+d3 ¥¿¡¼¥óËè";
#else
- return "cure wounds (4d7) every 3+d3 turns";
+ return "cure wounds (4d8) every 3+d3 turns";
#endif
}
case ART_BRAND:
+ case ART_HELLFIRE:
{
#ifdef JP
return "¿ÏÀè¤Î¥Õ¥¡¥¤¥¢¡¦¥Ü¥ë¥È : 999 ¥¿¡¼¥óËè";
#ifdef JP
return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) : 200 ¥¿¡¼¥óËè";
#else
- return "Frost ball (100) every 200 turns";
+ return "frost ball (100) every 200 turns";
#endif
}
#ifdef JP
return "¥¹¥ê¡¼¥×(II) : 55 ¥¿¡¼¥óËè";
#else
- return "Sleep II every 55 turns";
+ return "sleep II every 55 turns";
#endif
}
case ART_AMBER:
{
#ifdef JP
-return "ÂÎÎϲóÉü(500) : 500 ¥¿¡¼¥óËè";
+return "ÂÎÎϲóÉü(700) : 250 ¥¿¡¼¥óËè";
#else
return "heal (700) every 250 turns";
#endif
case ART_JUDGE:
{
#ifdef JP
-return "ÂÎÎϤȰú¤Âؤ¨¤ËÀéΤ´ã¤Èµ¢´Ô";
+return "ÂÎÎϤȰú¤Âؤ¨¤ËÀéΤ´ã¤Èµ¢´Ô : 20+d20 ¥¿¡¼¥óËè";
#else
- return "clairvoyance and recall, draining you";
+ return "clairvoyance and recall, draining you every 20+d20 turns";
#endif
}
case ART_DOR: case ART_TERROR: case ART_STONEMASK:
{
#ifdef JP
-return "Á´Êý¸þ¤Ø¤Î¶²Éݤθ÷Àþ";
+ return "Á´Êý¸þ¤Ø¤Î¶²Éݤθ÷Àþ : 3*(¥ì¥Ù¥ë+10) ¥¿¡¼¥óËè";
#else
- return "rays of fear in every direction";
+ return "rays of fear in every direction every 3*(level+10) turns";
#endif
}
#ifdef JP
return "ËâÎϽ¼Å¶ : 200 ¥¿¡¼¥óËè";
#else
- return "Recharge item every 200 turns";
+ return "recharge item every 200 turns";
#endif
}
case ART_MURAMASA:
{
#ifdef JP
-return "ÏÓÎϤξ徺 : ³ÎΨ50%¤Ç²õ¤ì¤ë¡£";
+return "ÏÓÎϤξ徺 : ³ÎΨ50%¤Ç²õ¤ì¤ë";
#else
- return "Increase STR (destroyed 50%)";
+ return "increase STR (destroyed 50%)";
#endif
}
case ART_FLY_STONE:
#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 "ËâÎÏÉü³è: 777 ¥¿¡¼¥óËè";
+#else
+ return "restore mana every 777 turns";
+#endif
+
+ }
+ case ART_AESCULAPIUS:
+ {
+#ifdef JP
+ return "Á´¥¹¥Æ¡¼¥¿¥¹¤È·Ð¸³ÃÍÉü³è : 750 ¥¿¡¼¥óËè";
+#else
+ return "restore stats and life levels every 750 turns";
+#endif
+ }
}
}
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID))
+ if (object_is_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)
if (o_ptr->tval == TV_RING)
{
- if (o_ptr->name2)
+ if (object_is_ego(o_ptr))
{
switch (o_ptr->name2)
{
#endif
case EGO_RING_COLD_BALL:
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) : 80+d80 ¥¿¡¼¥óËè";
+return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) : 80+d80 ¥¿¡¼¥óËè";
#else
return "cold ball (100) every 80+d80 turns";
#endif
case EGO_RING_DRAGON_F:
if (o_ptr->sval == SV_RING_FLAMES)
#ifdef JP
-return "²Ð±ê¤Î¥Ö¥ì¥¹¤È²Ð¤Ø¤ÎÂÑÀ";
+return "²Ð±ê¤Î¥Ö¥ì¥¹ (200) ¤È²Ð¤Ø¤ÎÂÑÀ : 200 ¥¿¡¼¥óËè";
#else
- return "breath of fire and resist fire";
+ return "breath of fire (200) and resist fire every 200 turns";
#endif
else
#ifdef JP
case EGO_RING_DRAGON_C:
if (o_ptr->sval == SV_RING_ICE)
#ifdef JP
-return "Î䵤¤Î¥Ö¥ì¥¹¤ÈÎ䵤¤Ø¤ÎÂÑÀ";
+return "Î䵤¤Î¥Ö¥ì¥¹ (200) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ : 200 ¥¿¡¼¥óËè";
#else
- return "breath of cold and resist cold";
+ return "breath of cold (200) and resist cold every 200 turns";
#endif
else
#ifdef JP
#endif
case EGO_RING_TRUE:
#ifdef JP
-return "»Îµ¤¹âÍÈ¡¢½ËÊ¡¡¢µæ¶Ë¤ÎÂÑÀ";
+return "»Îµ¤¹âÍÈ¡¢½ËÊ¡¡¢µæ¶Ë¤ÎÂÑÀ : 777 ¥¿¡¼¥óËè";
#else
- return "hero, bless, and ultimate resistance";
+ return "hero, bless, and ultimate resistance every 777 turns";
#endif
}
}
{
case SV_RING_FLAMES:
#ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤È²Ð¤Ø¤ÎÂÑÀ";
+return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (100) ¤È²Ð¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of fire and resist fire";
+ return "ball of fire (100) and resist fire every 50+d50 turns";
#endif
case SV_RING_ICE:
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë¤ÈÎ䵤¤Ø¤ÎÂÑÀ";
+return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of cold and resist cold";
+ return "ball of cold (100) and resist cold every 50+d50 turns";
#endif
case SV_RING_ACID:
#ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤È»À¤Ø¤ÎÂÑÀ";
+return "¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë (100) ¤È»À¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of acid and resist acid";
+ return "ball of acid (100) and resist acid every 50+d50 turns";
#endif
case SV_RING_ELEC:
#ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤ÈÅÅ·â¤Ø¤ÎÂÑÀ";
+return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) ¤ÈÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of elec and resist elec";
+ return "ball of elec (100) and resist elec every 50+d50 turns";
#endif
default:
if (o_ptr->tval == TV_AMULET)
{
- if (o_ptr->name2)
+ if (object_is_ego(o_ptr))
{
switch (o_ptr->name2)
{
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, u32b mode)
{
int i = 0, j, k;
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
+ char temp[70 * 20];
cptr info[128];
- u32b flag;
char o_name[MAX_NLEN];
int wid, hgt;
+ int trivial_info = 0;
+
/* Extract the flags */
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
- if( o_ptr->name1)
+ /* 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[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++;}
+ }
- roff_to_buf( a_text + a_info[ o_ptr->name1 ].text ,77-15,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 (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)
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-3)¡£";
+#else
+ info[i++] = "It decreases radius of light source by 3.";
+#endif
+ }
+ else if (o_ptr->sval == SV_LITE_LANTERN)
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
#else
- info[i++] = "It provides no light..";
+ info[i++] = "It decreases radius of light source by 2.";
#endif
+ }
+ else
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
+#else
+ info[i++] = "It decreases radius of light source by 1.";
+#endif
+ }
}
- else if (artifact_p(o_ptr))
+ else if (object_is_fixed_artifact(o_ptr))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï±Ê±ó¤Ê¤ëÌÀ¤«¤ê(Ⱦ·Â 3)¤ò¼ø¤±¤ë¡£";
/* 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
info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤ÏÈó¾ï¤Ë»È¤¤¤ä¤¹¤¤¡£";
#else
- info[i++] = "It is made for riding.";
+ info[i++] = "It is made for use while riding.";
#endif
else
+ {
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
+ info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
#else
- info[i++] = "It is suitable for riding.";
+ info[i++] = "It is suitable for use while riding.";
#endif
-
+ /* This information is not important enough */
+ trivial_info++;
+ }
}
- if (f1 & (TR1_STR))
+ if (have_flag(flgs, TR_STR))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your strength.";
#endif
}
- if (f1 & (TR1_INT))
+ if (have_flag(flgs, TR_INT))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your intelligence.";
#endif
}
- if (f1 & (TR1_WIS))
+ if (have_flag(flgs, TR_WIS))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¸¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï¸¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your wisdom.";
#endif
}
- if (f1 & (TR1_DEX))
+ if (have_flag(flgs, TR_DEX))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your dexterity.";
#endif
}
- if (f1 & (TR1_CON))
+ if (have_flag(flgs, TR_CON))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your constitution.";
#endif
}
- if (f1 & (TR1_CHR))
+ if (have_flag(flgs, TR_CHR))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your charisma.";
#endif
}
- if (f1 & (TR1_MAGIC_MASTERY))
+ if (have_flag(flgs, TR_MAGIC_MASTERY))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏËâË¡Æ»¶ñ»ÈÍÑǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏËâË¡Æ»¶ñ»ÈÍÑǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your ability to use magic devices.";
#endif
}
- if (f1 & (TR1_STEALTH))
+ if (have_flag(flgs, TR_STEALTH))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your stealth.";
#endif
}
- if (f1 & (TR1_SEARCH))
+ if (have_flag(flgs, TR_SEARCH))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your searching.";
#endif
}
- if (f1 & (TR1_INFRA))
+ if (have_flag(flgs, TR_INFRA))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your infravision.";
#endif
}
- if (f1 & (TR1_TUNNEL))
+ if (have_flag(flgs, TR_TUNNEL))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your ability to tunnel.";
#endif
}
- if (f1 & (TR1_SPEED))
+ if (have_flag(flgs, TR_SPEED))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your speed.";
#endif
}
- if (f1 & (TR1_BLOWS))
+ if (have_flag(flgs, TR_BLOWS))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your attack speed.";
#endif
}
- if (f1 & (TR1_BRAND_ACID))
+ if (have_flag(flgs, TR_BRAND_ACID))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from acid.";
#endif
}
- if (f1 & (TR1_BRAND_ELEC))
+ if (have_flag(flgs, TR_BRAND_ELEC))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from electricity.";
#endif
}
- if (f1 & (TR1_BRAND_FIRE))
+ if (have_flag(flgs, TR_BRAND_FIRE))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from fire.";
#endif
}
- if (f1 & (TR1_BRAND_COLD))
+ if (have_flag(flgs, TR_BRAND_COLD))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from frost.";
#endif
}
- 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++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
}
- if (f1 & (TR1_FORCE_WEAPON))
+ 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++] = "¤½¤ì¤Ï¿Í´Ö¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
+#else
+ info[i++] = "It is especially deadly against humans.";
+#endif
+
+ }
+
+ 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_LEVITATION))
{
#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++] = "¤½¤ì¤ÏÎ䵤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
#else
- info[i++] = "It produces a coldly sheath.";
+ info[i++] = "It produces a sheath of coldness.";
#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 (cursed_p(o_ptr))
+ if (object_is_cursed(o_ptr))
{
if (o_ptr->curse_flags & TRC_PERMA_CURSE)
{
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++] = "¤½¤ì¤ÏÂÀ¸Å¤Î²Ò¡¹¤·¤¤±åÇ°¤¬½É¤Ã¤Æ¤¤¤ë¡£";
#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
}
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡¤ò¾§¤¨¤Ë¤¯¤¯¤¹¤ë¡£";
#else
- info[i++] = "It is unsuitable for spellcasting.";
+ info[i++] = "It encumbers you while spellcasting.";
#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 (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 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
-
+ }
+ 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
+ }
}
- /* 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();
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);
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
}
+/* 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
/* 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);
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;
}
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;
+ case INVEN_FEET: p = "¤ˤϤ¤¤Æ¤¤¤ë"; break;
#else
case INVEN_FEET: p = "wearing on your feet"; break;
#endif
#ifdef JP
-default: p = "¥¶¥Ã¥¯¤ËÆþ¤Ã¤Æ¤¤¤ë"; break;
+ 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 = "»ý¤Ä¤À¤±¤ÇÀº°ìÇÕ¤Î";
-#else
- p = "just holding";
-#endif
-
- }
}
/* Return the result */
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)
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++)
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);
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
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++)
tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
/* Is this item "acceptable"? */
- if (item_tester_okay(o_ptr))
+ if (select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr))
{
/* Prepare an "index" */
tmp_val[0] = index_to_label(i);
Term_putstr(0, i - INVEN_RARM, 3, TERM_WHITE, tmp_val);
/* Obtain an item description */
- 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
strcpy(o_name, "(Éð´ï¤òξ¼ê»ý¤Á)");
#else
strcpy(o_name, "(wielding with two-hands)");
#endif
- attr = 1;
+ attr = TERM_WHITE;
}
else
{
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
attr = tval_to_attr[o_ptr->tval % 128];
}
/* 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)
+ if (show_weights)
{
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 = 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, '@');
+ }
+ }
+
+ /* 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;
+ }
+ }
+}
+
/*
* Display the inventory.
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_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;
}
+ prepare_label_string(inven_label, USE_INVEN);
+
/* Display the inventory */
for (k = 0, i = 0; i < z; i++)
{
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;
}
else strcpy(tmp_val, " ");
}
+ else if (i <= INVEN_PACK)
+ {
+ /* Prepare an index --(-- */
+ sprintf(tmp_val, "%c)", inven_label[i]);
+ }
else
+ {
/* 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);
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, 255);
- }
+ Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0);
+ if (use_bigtile) cur_col++;
+
cur_col += 2;
}
(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;
- /* Starting column */
- col = command_gap;
-
- /* Get size */
- Term_get_size(&wid, &hgt);
-
- /* 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
+ /* Get size */
+ Term_get_size(&wid, &hgt);
+ /* Maximal length */
+ len = wid - col - 1;
- if (show_item_graph) lim -= 2;
/* Scan the equipment list */
for (k = 0, i = INVEN_RARM; i < INVEN_TOTAL; i++)
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
{
/* 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);
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, 255);
- }
+ Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0);
+ if (use_bigtile) cur_col++;
+
cur_col += 2;
}
{
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);
}
}
}
/* Describe */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Prompt */
#ifdef JP
object_type *o_ptr;
+ if (!command_cmd) return TRUE; /* command_cmd is no longer effective */
+
/* Inventory */
if (item >= 0)
{
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)
}
/* Find another '!' */
- s = strchr(s + 1, '!');
+ s = my_strchr(s + 1, '!');
}
/* Allow it */
/* 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);
/*
- * 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.
- */
-static 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).
*/
if (item_tester_okay(&inventory[j]))
return TRUE;
- (void)scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x03);
if (floor_num)
return TRUE;
{
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);
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) return get_item_floor(cp, pmt, str, mode);
+ 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;
/* 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);
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++;
}
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 */
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;
}
}
-
/* Require at least one legal choice */
if (!allow_floor && (i1 > i2) && (e1 > e2))
{
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)
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);
}
/* 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);
}
{
/* 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);
/* 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 */
{
/* 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);
/* 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, " / for Inven,");
+ 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");
/* Show the prompt */
prt(tmp_val, 0, 0);
-
/* Get a key */
which = inkey();
case '\r':
case '\n':
{
- /* Validate the item */
- if (!get_item_okay(get_item_label))
+ if (command_wrk == USE_FLOOR)
{
- bell();
- break;
+ /* Special index */
+ (*cp) = -get_item_label;
}
-
- /* Allow player to "refuse" certain actions */
- if (!get_item_allow(get_item_label))
+ else
{
- done = TRUE;
- break;
+ /* Validate the item */
+ if (!get_item_okay(get_item_label))
+ {
+ bell();
+ break;
+ }
+
+ /* Allow player to "refuse" certain actions */
+ if (!get_item_allow(get_item_label))
+ {
+ done = TRUE;
+ break;
+ }
+
+ /* Accept that choice */
+ (*cp) = get_item_label;
}
- /* Accept that choice */
- (*cp) = get_item_label;
item = TRUE;
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;
(*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)
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);
/* 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 */
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 */
/* 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);
}
* mode & 0x02 -- Marked items only
* mode & 0x04 -- Stop after first
*/
-bool scan_floor(int *items, int *item_num, int y, int x, int mode)
+int scan_floor(int *items, int y, int x, int mode)
{
int this_o_idx, next_o_idx;
int num = 0;
- (*item_num) = 0;
-
/* Sanity */
- if (!in_bounds(y, x)) return (FALSE);
+ if (!in_bounds(y, x)) return 0;
/* Scan all objects in the grid */
for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
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 */
- items[num++] = this_o_idx;
+ /* XXX Hack -- Enforce limit */
+ if (num < 23)
+ items[num] = this_o_idx;
+
+ num++;
/* Only one */
if (mode & 0x04) break;
-
- /* XXX Hack -- Enforce limit */
- if (num == 23) break;
}
- /* Number of items */
- (*item_num) = num;
-
/* Result */
- return (num != 0);
+ 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 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];
+
+ bool dont_need_to_show_weights = TRUE;
/* Get size */
Term_get_size(&wid, &hgt);
/* Default length */
- len = 20;
+ 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() */
- (void) scan_floor(floor_list, &floor_num, y, x, 0x01);
+ floor_num = scan_floor(floor_list, y, x, 0x03);
- /* Display the inventory */
- for (k = 0, i = 0; i < floor_num; i++)
+ /* 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;
/* 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;
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++)
{
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);
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
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);
}
}
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;
char out_val[160];
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);
#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];
+
+ /* Forget restrictions */
+ item_tester_tval = 0;
+ item_tester_hook = NULL;
+ command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+
+ /* Success */
+ return TRUE;
+ }
- /* Acquire object */
- o_ptr = &o_list[k];
+ 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);
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++;
}
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;
if (floor)
{
/* Scan all objects in the grid */
- (void) scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x03);
}
/* Accept inventory */
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)
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))
n2 = I2A(k - floor_top);
/* Redraw if needed */
- if (command_see) get_item_label = show_floor(menu_line, py, px);
+ if (command_see) get_item_label = show_floor(menu_line, py, px, &min_width);
}
/* Viewing inventory */
{
/* Begin the prompt */
#ifdef JP
-sprintf(out_val, "»ý¤Áʪ:");
+ sprintf(out_val, "»ý¤Áʪ:");
#else
sprintf(out_val, "Inven:");
#endif
{
/* 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);
/* 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_equip)
+ {
#ifdef JP
-if (allow_equip)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " '6' ÁõÈ÷ÉÊ,");
- else
- strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
- }
- else strcat(out_val, " '/' ÁõÈ÷ÉÊ,");
-}
-else if (select_the_force)
- strcat(out_val, " 'w'Îýµ¤½Ñ,");
+ if (!use_menu)
+ strcat(out_val, " '/' ÁõÈ÷ÉÊ,");
+ else if (allow_floor)
+ strcat(out_val, " '6' ÁõÈ÷ÉÊ,");
+ else
+ strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
#else
-if (allow_equip)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " 6 for Equip,");
- else
- strcat(out_val, " 4 or 6 for Equip,");
- }
- else strcat(out_val, " / for Equip,");
-}
-else if (select_the_force)
- strcat(out_val, " w for the Force,");
+ 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,");
#endif
+ }
/* Append */
+ if (allow_floor)
+ {
#ifdef JP
-if (allow_floor)
-{
- if (use_menu)
- {
- if (allow_equip)
- strcat(out_val, " '4' ¾²¾å,");
- else
- strcat(out_val, " '4'or'6' ¾²¾å,");
- }
- else strcat(out_val, " '-'¾²¾å,");
-}
+ if (!use_menu)
+ strcat(out_val, " '-'¾²¾å,");
+ else if (allow_equip)
+ strcat(out_val, " '4' ¾²¾å,");
+ else
+ strcat(out_val, " '4'or'6' ¾²¾å,");
#else
- if (allow_floor) strcat(out_val, " - for floor,");
+ if (!use_menu)
+ strcat(out_val, " - for floor,");
+ else if (allow_equip)
+ strcat(out_val, " 4 for floor,");
+ else
+ strcat(out_val, " 4 or 6 for floor,");
#endif
-
+ }
}
/* Viewing equipment */
{
/* 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);
/* 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)
+ {
#ifdef JP
-if (allow_inven)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " '4' »ý¤Áʪ,");
- else
- strcat(out_val, " '4'or'6' »ý¤Áʪ,");
- }
- else strcat(out_val, " '/' »ý¤Áʪ,");
-}
+ if (!use_menu)
+ strcat(out_val, " '/' »ý¤Áʪ,");
+ else if (allow_floor)
+ strcat(out_val, " '4' »ý¤Áʪ,");
+ else
+ strcat(out_val, " '4'or'6' »ý¤Áʪ,");
#else
- if (allow_inven) strcat(out_val, " / for Inven,");
+ if (!use_menu)
+ strcat(out_val, " / for Inven,");
+ else if (allow_floor)
+ strcat(out_val, " 4 for Inven,");
+ else
+ strcat(out_val, " 4 or 6 for Inven,");
#endif
-
+ }
/* Append */
+ if (allow_floor)
+ {
#ifdef JP
-if (allow_floor)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " '6' ¾²¾å,");
- else
- strcat(out_val, " '4'or'6' ¾²¾å,");
- }
- else strcat(out_val, " '-'¾²¾å,");
-}
+ if (!use_menu)
+ strcat(out_val, " '-'¾²¾å,");
+ else if (allow_inven)
+ strcat(out_val, " '6' ¾²¾å,");
+ else
+ strcat(out_val, " '4'or'6' ¾²¾å,");
#else
- if (allow_floor) strcat(out_val, " - for floor,");
+ if (!use_menu)
+ strcat(out_val, " - for floor,");
+ else if (allow_inven)
+ strcat(out_val, " 6 for floor,");
+ else
+ strcat(out_val, " 4 or 6 for floor,");
#endif
-
+ }
}
/* Viewing floor */
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)
{
#ifdef JP
-strcat(out_val, " '4' ÁõÈ÷ÉÊ, '6' »ý¤Áʪ,");
+ strcat(out_val, " '4' ÁõÈ÷ÉÊ, '6' »ý¤Áʪ,");
#else
- strcat(out_val, " / for Inven,");
+ strcat(out_val, " 4 for Equip, 6 for Inven,");
#endif
-
}
else if (allow_inven)
{
#ifdef JP
-strcat(out_val, " '4'or'6' »ý¤Áʪ,");
+ strcat(out_val, " '4'or'6' »ý¤Áʪ,");
#else
- strcat(out_val, " / for Inven,");
+ strcat(out_val, " 4 or 6 for Inven,");
#endif
-
}
else if (allow_equip)
{
#ifdef JP
-strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
+ strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
#else
- strcat(out_val, " / for Equip,");
+ strcat(out_val, " 4 or 6 for Equip,");
#endif
-
}
}
/* Append */
else if (allow_inven)
{
#ifdef JP
-strcat(out_val, " '/' »ý¤Áʪ,");
+ strcat(out_val, " '/' »ý¤Áʪ,");
#else
strcat(out_val, " / for Inven,");
#endif
-
}
else if (allow_equip)
{
#ifdef JP
-strcat(out_val, " '/'ÁõÈ÷ÉÊ,");
+ strcat(out_val, " '/'ÁõÈ÷ÉÊ,");
#else
strcat(out_val, " / for Equip,");
#endif
+ }
+ /* Append */
+ if (command_see && !use_menu)
+ {
+#ifdef JP
+ strcat(out_val, " Enter ¼¡,");
+#else
+ strcat(out_val, " Enter for scroll down,");
+#endif
}
}
+ /* 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");
int max_line = 1;
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
switch (which)
{
case ESCAPE:
/* Switch inven/equip */
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
if (menu_line > max_line) menu_line = max_line;
/* Need to redraw */
/* Switch inven/equip */
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
if (menu_line > max_line) menu_line = max_line;
/* Need to redraw */
case '\r':
case '\n':
{
- /* Validate the item */
- if (!get_item_okay(get_item_label))
+ if (command_wrk == USE_FLOOR)
{
- bell();
- break;
+ /* Special index */
+ (*cp) = -get_item_label;
}
-
- /* Allow player to "refuse" certain actions */
- if (!get_item_allow(get_item_label))
+ else
{
- done = TRUE;
- break;
+ /* Validate the item */
+ if (!get_item_okay(get_item_label))
+ {
+ bell();
+ break;
+ }
+
+ /* Allow player to "refuse" certain actions */
+ if (!get_item_allow(get_item_label))
+ {
+ done = TRUE;
+ break;
+ }
+
+ /* Accept that choice */
+ (*cp) = get_item_label;
}
- /* Accept that choice */
- (*cp) = get_item_label;
item = TRUE;
done = TRUE;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
- *cp = 1111;
+ *cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
break;
break;
}
+ case '\n':
+ case '\r':
+ case '+':
+ {
+ 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;
+
+ /* 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, 0x03);
+
+ /* Hack -- Fix screen */
+ if (command_see)
+ {
+ /* Load screen */
+ screen_load();
+
+ /* Save screen */
+ screen_save();
+ }
+
+ break;
+ }
+
case '/':
{
if (command_wrk == (USE_INVEN))
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 */
(*cp) = k;
item = TRUE;
done = TRUE;
+#ifdef ALLOW_REPEAT
+ cur_tag = which;
+#endif /* ALLOW_REPEAT */
break;
}
- case '\n':
#if 0
+ case '\n':
case '\r':
-#endif
{
/* Choose "default" inventory item */
if (command_wrk == (USE_INVEN))
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;
- 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);
/* 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 (k < 0 || k >= floor_num)
+ 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();
break;
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 */
/* 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);
}
-bool py_pickup_floor_aux(void)
+static bool py_pickup_floor_aux(void)
{
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);
*
* 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;
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;
{
/* 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))
}
/* Remember this object index */
- floor_list[floor_num] = this_o_idx;
+ if (floor_num < 23)
+ floor_list[floor_num] = this_o_idx;
/* Count non-gold objects */
floor_num++;
- if (floor_num == 23) break;
-
/* Remember this index */
floor_o_idx = this_o_idx;
}
#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
#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
{
/* 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
#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
OSDN Git Service
