#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 */
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];
}
/* Ego-item */
- if (o_ptr->name2)
+ if (object_is_ego(o_ptr))
{
ego_item_type *e_ptr = &e_info[o_ptr->name2];
for (i = 0; i < TR_FLAG_SIZE; i++)
flgs[i] |= o_ptr->art_flags[i];
- if (item_tester_hook_smith(o_ptr))
+ if (object_is_smith(o_ptr))
{
int add = o_ptr->xtra3 - 1;
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 */
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];
#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];
flgs[i] |= o_ptr->art_flags[i];
}
- if (item_tester_hook_smith(o_ptr))
+ if (object_is_smith(o_ptr))
{
int add = o_ptr->xtra3 - 1;
* 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_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
}
#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
}
#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:
#ifdef JP
return "*²ò¼ö*¤ÈÄ´ºº: ¤¤¤Ä¤Ç¤â";
#else
- return "Dispel Curse and Probing every turn";
+ return "dispel curse and probing every turn";
#endif
}
#ifdef JP
return "ËâÎÏÉü³è: 777 ¥¿¡¼¥óËè";
#else
- return "Restore Mana every 777 turns";
+ return "restore mana every 777 turns";
#endif
}
}
- if (item_tester_hook_smith(o_ptr))
+ if (object_is_smith(o_ptr))
{
switch (o_ptr->xtra3 - 1)
{
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 SV_RING_ICE:
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
+return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
return "ball of cold (100) and resist cold every 50+d50 turns";
#endif
if (o_ptr->tval == TV_AMULET)
{
- if (o_ptr->name2)
+ if (object_is_ego(o_ptr))
{
switch (o_ptr->name2)
{
/*
* Describe a "fully identified" item
*/
-bool screen_object(object_type *o_ptr, bool real)
+bool screen_object(object_type *o_ptr, u32b mode)
{
int i = 0, j, k;
char o_name[MAX_NLEN];
int wid, hgt;
+ int trivial_info = 0;
+
/* Extract the flags */
object_flags(o_ptr, flgs);
char temp[70 * 20];
roff_to_buf(o_ptr->name1 ? (a_text + a_info[o_ptr->name1].text) :
- (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text),
+ (k_text + k_info[o_ptr->k_idx].text),
77 - 15, temp, sizeof(temp));
for (j = 0; temp[j]; j += 1 + strlen(&temp[j]))
{ info[i] = &temp[j]; i++;}
}
+ if (object_is_equipment(o_ptr))
+ {
+ /* Descriptions of a basic equipment is just a flavor */
+ trivial_info = i;
+ }
+
/* Mega-Hack -- describe activation */
if (have_flag(flgs, TR_ACTIVATE))
{
info[i++] = "It provides no light.";
#endif
- if (o_ptr->sval == SV_LITE_FEANOR ||
- o_ptr->sval == SV_LITE_LANTERN)
+ if (o_ptr->sval == SV_LITE_FEANOR)
{
#ifdef JP
- info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
+ 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 decreases radius of light source by 2.";
#endif
else
{
#ifdef JP
- info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
+ 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)¤ò¼ø¤±¤ë¡£";
info[i++] = "It is made for use while riding.";
#endif
else
+ {
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
+ info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
#else
info[i++] = "It is suitable for use while riding.";
#endif
-
+ /* This information is not important enough */
+ trivial_info++;
+ }
}
if (have_flag(flgs, TR_STR))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your strength.";
#endif
if (have_flag(flgs, TR_INT))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your intelligence.";
#endif
if (have_flag(flgs, TR_WIS))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¸¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï¸¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your wisdom.";
#endif
if (have_flag(flgs, TR_DEX))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your dexterity.";
#endif
if (have_flag(flgs, TR_CON))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your constitution.";
#endif
if (have_flag(flgs, TR_CHR))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your charisma.";
#endif
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 (have_flag(flgs, TR_STEALTH))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your stealth.";
#endif
if (have_flag(flgs, TR_SEARCH))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your searching.";
#endif
if (have_flag(flgs, TR_INFRA))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your infravision.";
#endif
if (have_flag(flgs, TR_TUNNEL))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your ability to tunnel.";
#endif
if (have_flag(flgs, TR_SPEED))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your speed.";
#endif
if (have_flag(flgs, TR_BLOWS))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
+info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹¡£";
#else
info[i++] = "It affects your attack speed.";
#endif
if (have_flag(flgs, TR_BRAND_ACID))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from acid.";
#endif
if (have_flag(flgs, TR_BRAND_ELEC))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from electricity.";
#endif
if (have_flag(flgs, TR_BRAND_FIRE))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from fire.";
#endif
if (have_flag(flgs, TR_BRAND_COLD))
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
+info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë¡£";
#else
info[i++] = "It does extra damage from frost.";
#endif
}
- if (have_flag(flgs, TR_FEATHER))
+ if (have_flag(flgs, TR_LEVITATION))
{
#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++;
}
}
}
/* Describe about this kind of object instead of THIS fake object */
- if (!real)
+ if (mode & SCROBJ_FAKE_OBJECT)
{
switch (o_ptr->tval)
{
}
}
- /* No special effects */
- if (!i) return (FALSE);
+ if (mode & SCROBJ_FORCE_DETAIL) trivial_info = 0;
+
+ /* No relevant informations */
+ if (i <= trivial_info) return (FALSE);
/* Save the screen */
screen_save();
Term_get_size(&wid, &hgt);
/* Display Item name */
- if (real)
+ if (!(mode & SCROBJ_FAKE_OBJECT))
object_desc(o_name, o_ptr, 0);
else
object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
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)
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
{
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, 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
{
/* 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);
if (item_tester_okay(&inventory[j]))
return TRUE;
- floor_num = scan_floor(floor_list, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x03);
if (floor_num)
return TRUE;
#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))
{
/* the_force */
- if (*cp == INVEN_FORCE)
+ if (select_the_force && (*cp == INVEN_FORCE))
{
item_tester_tval = 0;
item_tester_hook = NULL;
}
/* Floor item? */
- else if (*cp < 0)
+ else if (floor && (*cp < 0))
{
object_type *o_ptr;
}
}
- /* 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;
+ /* Verify the item */
+ if (get_item_okay(*cp))
+ {
+ /* Forget the item_tester_tval restriction */
+ item_tester_tval = 0;
- /* Forget the item_tester_hook restriction */
- item_tester_hook = NULL;
+ /* Forget the item_tester_hook restriction */
+ item_tester_hook = NULL;
- command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+ command_cmd = 0; /* Hack -- command_cmd is no longer effective */
- /* Success */
- return (TRUE);
+ /* 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;
}
}
{
/* 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,'(',')',",
#endif
-
index_to_label(i1), index_to_label(i2));
/* Append */
/* 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,'(',')',",
#endif
-
index_to_label(e1), index_to_label(e2));
/* Append */
/* Indicate ability to "view" */
#ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+ if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
#else
if (!command_see) strcat(out_val, " * to see,");
#endif
-
/* Append */
#ifdef JP
-if (inven) strcat(out_val, format(" %s »ý¤Áʪ,", use_menu ? "'4'or'6'" : "'/'"));
+ if (inven) strcat(out_val, format(" %s »ý¤Áʪ,", use_menu ? "'4'or'6'" : "'/'"));
#else
-if (inven) strcat(out_val, format(" %s for Inven,", use_menu ? "4 or 6" : "'/'"));
+ if (inven) strcat(out_val, format(" %s for Inven,", use_menu ? "4 or 6" : "'/'"));
#endif
-
}
/* Indicate legality of the "floor" item */
#ifdef JP
-if (allow_floor) strcat(out_val, " '-'¾²¾å,");
+ if (allow_floor) strcat(out_val, " '-'¾²¾å,");
+ if (select_the_force) strcat(out_val, " 'w'Îýµ¤½Ñ,");
#else
if (allow_floor) strcat(out_val, " - for floor,");
+ if (select_the_force) strcat(out_val, " w for the Force,");
#endif
-
/* Finish the prompt */
strcat(out_val, " ESC");
/* Show the prompt */
prt(tmp_val, 0, 0);
-
/* Get a key */
which = inkey();
if ((mode & 0x01) && !item_tester_okay(o_ptr)) continue;
/* Marked */
- if ((mode & 0x02) && !o_ptr->marked) continue;
+ if ((mode & 0x02) && !(o_ptr->marked & OM_FOUND)) continue;
/* Accept this item */
/* XXX Hack -- Enforce limit */
int wid, hgt;
char floor_label[52 + 1];
+ bool dont_need_to_show_weights = TRUE;
+
/* Get size */
Term_get_size(&wid, &hgt);
/* Scan for objects in the grid, using item_tester_okay() */
- floor_num = scan_floor(floor_list, y, x, 0x01);
+ floor_num = scan_floor(floor_list, y, x, 0x03);
/* Display the floor objects */
for (k = 0, i = 0; i < floor_num && i < 23; 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;
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
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;
if (repeat_pull(cp))
{
/* the_force */
- if (*cp == INVEN_FORCE)
+ if (select_the_force && (*cp == INVEN_FORCE))
{
item_tester_tval = 0;
item_tester_hook = NULL;
}
/* Floor item? */
- else if (*cp < 0)
+ else if (floor && (*cp < 0))
{
object_type *o_ptr;
}
}
- /* 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;
+ /* Verify the item */
+ if (get_item_okay(*cp))
+ {
+ /* Forget the item_tester_tval restriction */
+ item_tester_tval = 0;
- /* Forget the item_tester_hook restriction */
- item_tester_hook = NULL;
+ /* Forget the item_tester_hook restriction */
+ item_tester_hook = NULL;
- command_cmd = 0; /* Hack -- command_cmd is no longer effective */
+ command_cmd = 0; /* Hack -- command_cmd is no longer effective */
- /* Success */
- return (TRUE);
+ /* 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 */
- floor_num = scan_floor(floor_list, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x03);
}
/* Accept 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,'(',')',",
#endif
-
index_to_label(i1), index_to_label(i2));
/* Append */
/* Indicate ability to "view" */
#ifdef JP
-if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
+ if (!command_see && !use_menu) strcat(out_val, " '*'°ìÍ÷,");
#else
if (!command_see && !use_menu) strcat(out_val, " * to see,");
#endif
-
/* Append */
-#ifdef JP
if (allow_equip)
{
+#ifdef JP
if (!use_menu)
strcat(out_val, " '/' ÁõÈ÷ÉÊ,");
else if (allow_floor)
strcat(out_val, " '6' ÁõÈ÷ÉÊ,");
else
strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
- }
- else if (select_the_force)
- strcat(out_val, " 'w'Îýµ¤½Ñ,");
#else
- if (allow_equip)
- {
if (!use_menu)
strcat(out_val, " / for Equip,");
else if (allow_floor)
strcat(out_val, " 6 for Equip,");
else
strcat(out_val, " 4 or 6 for Equip,");
- }
- else if (select_the_force)
- strcat(out_val, " w for the Force,");
#endif
+ }
/* Append */
if (allow_floor)
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,'(',')',",
#endif
-
index_to_label(e1), index_to_label(e2));
/* Append */
/* 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)
{
else
strcat(out_val, " '4'or'6' »ý¤Áʪ,");
#else
-
if (!use_menu)
strcat(out_val, " / for Inven,");
else if (allow_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);
#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)
#else
strcat(out_val, " 4 for Equip, 6 for Inven,");
#endif
-
}
else if (allow_inven)
{
#else
strcat(out_val, " 4 or 6 for Inven,");
#endif
-
}
else if (allow_equip)
{
#else
strcat(out_val, " 4 or 6 for Equip,");
#endif
-
}
}
/* Append */
#else
strcat(out_val, " / for Inven,");
#endif
-
}
else if (allow_equip)
{
#else
strcat(out_val, " / for Equip,");
#endif
-
}
/* Append */
}
}
+ /* 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 i, o_idx;
cave_type *c_ptr = &cave[py][px];
-
+
if (command_wrk != (USE_FLOOR)) break;
/* Get the object being moved. */
- o_idx = c_ptr->o_idx;
-
+ o_idx = c_ptr->o_idx;
+
/* Only rotate a pile of two or more objects. */
if (!(o_idx && o_list[o_idx].next_o_idx)) break;
/* Remove the first object from the list. */
excise_object_idx(o_idx);
-
+
/* Find end of the list. */
i = c_ptr->o_idx;
while (o_list[i].next_o_idx)
i = o_list[i].next_o_idx;
-
+
/* Add after the last object. */
o_list[i].next_o_idx = o_idx;
-
+
/* Re-scan floor list */
- floor_num = scan_floor(floor_list, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x03);
/* Hack -- Fix screen */
if (command_see)
*
* 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;