if (use_graphics)
{
+ char buf[1024];
+
/* Process "graf.prf" */
process_pref_file("graf.prf");
+
+ /* Access the "character" pref file */
+ sprintf(buf, "graf-%s.prf", player_base);
+
+ /* Process "graf-<playername>.prf" */
+ process_pref_file(buf);
}
/* Normal symbols */
else
{
+ char buf[1024];
+
/* Process "font.prf" */
process_pref_file("font.prf");
+
+ /* Access the "character" pref file */
+ sprintf(buf, "font-%s.prf", player_base);
+
+ /* Process "font-<playername>.prf" */
+ process_pref_file(buf);
}
}
/*
* Obtain the "flags" for an item
*/
-void object_flags(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
+void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
{
object_kind *k_ptr = &k_info[o_ptr->k_idx];
+ int i;
/* Base object */
- (*f1) = k_ptr->flags1;
- (*f2) = k_ptr->flags2;
- (*f3) = k_ptr->flags3;
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] = k_ptr->flags[i];
/* Artifact */
if (o_ptr->name1)
{
artifact_type *a_ptr = &a_info[o_ptr->name1];
- (*f1) = a_ptr->flags1;
- (*f2) = a_ptr->flags2;
- (*f3) = a_ptr->flags3;
- if (!cursed_p(o_ptr))
- {
- (*f3) &= ~(TR3_HEAVY_CURSE | TR3_CURSED);
- }
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] = a_ptr->flags[i];
}
/* Ego-item */
{
ego_item_type *e_ptr = &e_info[o_ptr->name2];
- (*f1) |= e_ptr->flags1;
- (*f2) |= e_ptr->flags2;
- (*f3) |= e_ptr->flags3;
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] |= e_ptr->flags[i];
if ((o_ptr->name2 == EGO_LITE_AURA_FIRE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
{
- (*f3) &= ~(TR3_SH_FIRE);
+ remove_flag(flgs, TR_SH_FIRE);
}
else if ((o_ptr->name2 == EGO_LITE_INFRA) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
{
- (*f1) &= ~(TR1_INFRA);
+ remove_flag(flgs, TR_INFRA);
}
else if ((o_ptr->name2 == EGO_LITE_EYE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
{
- (*f2) &= ~(TR2_RES_BLIND);
- (*f3) &= ~(TR3_SEE_INVIS);
+ remove_flag(flgs, TR_RES_BLIND);
+ remove_flag(flgs, TR_SEE_INVIS);
}
}
/* Random artifact ! */
- if (o_ptr->art_flags1 || o_ptr->art_flags2 || o_ptr->art_flags3)
- {
- (*f1) |= o_ptr->art_flags1;
- (*f2) |= o_ptr->art_flags2;
- (*f3) |= o_ptr->art_flags3;
- }
-
- /* Extra powers */
- if (!(o_ptr->art_name))
- {
- switch (o_ptr->xtra1)
- {
- case EGO_XTRA_SUSTAIN:
- {
- /* Choose a sustain */
- switch (o_ptr->xtra2 % 6)
- {
- case 0: (*f2) |= (TR2_SUST_STR); break;
- case 1: (*f2) |= (TR2_SUST_INT); break;
- case 2: (*f2) |= (TR2_SUST_WIS); break;
- case 3: (*f2) |= (TR2_SUST_DEX); break;
- case 4: (*f2) |= (TR2_SUST_CON); break;
- case 5: (*f2) |= (TR2_SUST_CHR); break;
- }
-
- break;
- }
-
- case EGO_XTRA_POWER:
- {
- /* Choose a power */
- switch (o_ptr->xtra2 % 11)
- {
- case 0: (*f2) |= (TR2_RES_BLIND); break;
- case 1: (*f2) |= (TR2_RES_CONF); break;
- case 2: (*f2) |= (TR2_RES_SOUND); break;
- case 3: (*f2) |= (TR2_RES_SHARDS); break;
- case 4: (*f2) |= (TR2_RES_NETHER); break;
- case 5: (*f2) |= (TR2_RES_NEXUS); break;
- case 6: (*f2) |= (TR2_RES_CHAOS); break;
- case 7: (*f2) |= (TR2_RES_DISEN); break;
- case 8: (*f2) |= (TR2_RES_POIS); break;
- case 9: (*f2) |= (TR2_RES_DARK); break;
- case 10: (*f2) |= (TR2_RES_LITE); break;
- }
-
- break;
- }
-
- case EGO_XTRA_ABILITY:
- {
- /* Choose an ability */
- switch (o_ptr->xtra2 % 8)
- {
- case 0: (*f3) |= (TR3_FEATHER); break;
- case 1: (*f3) |= (TR3_LITE); break;
- case 2: (*f3) |= (TR3_SEE_INVIS); break;
- case 3: (*f3) |= (TR3_WARNING); break;
- case 4: (*f3) |= (TR3_SLOW_DIGEST); break;
- case 5: (*f3) |= (TR3_REGEN); break;
- case 6: (*f2) |= (TR2_FREE_ACT); break;
- case 7: (*f2) |= (TR2_HOLD_LIFE); break;
- }
-
- break;
- }
- }
- }
+ 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 (o_ptr->xtra3 < 33)
- {
- (*f1) |= (0x00000001 << (o_ptr->xtra3-1));
- }
- else if (o_ptr->xtra3 < 65)
+ int add = o_ptr->xtra3 - 1;
+
+ if (add < TR_FLAG_MAX)
{
- (*f2) |= (0x00000001 << (o_ptr->xtra3-33));
+ add_flag(flgs, add);
}
- else if (o_ptr->xtra3 < 97)
+ else if (add == ESSENCE_TMP_RES_ACID)
{
- (*f3) |= (0x00000001 << (o_ptr->xtra3-65));
+ add_flag(flgs, TR_RES_ACID);
+ add_flag(flgs, TR_ACTIVATE);
}
- else if (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID)
+ else if (add == ESSENCE_TMP_RES_ELEC)
{
- (*f2) |= TR2_RES_ACID;
+ add_flag(flgs, TR_RES_ELEC);
+ add_flag(flgs, TR_ACTIVATE);
}
- else if (o_ptr->xtra3 == ESSENCE_TMP_RES_ELEC)
+ else if (add == ESSENCE_TMP_RES_FIRE)
{
- (*f2) |= TR2_RES_ELEC;
+ add_flag(flgs, TR_RES_FIRE);
+ add_flag(flgs, TR_ACTIVATE);
}
- else if (o_ptr->xtra3 == ESSENCE_TMP_RES_FIRE)
+ else if (add == ESSENCE_TMP_RES_COLD)
{
- (*f2) |= TR2_RES_FIRE;
+ add_flag(flgs, TR_RES_COLD);
+ add_flag(flgs, TR_ACTIVATE);
}
- else if (o_ptr->xtra3 == ESSENCE_TMP_RES_COLD)
+ else if (add == ESSENCE_SH_FIRE)
{
- (*f2) |= TR2_RES_COLD;
+ add_flag(flgs, TR_RES_FIRE);
+ add_flag(flgs, TR_SH_FIRE);
}
- else if (o_ptr->xtra3 == ESSENCE_SH_FIRE)
+ else if (add == ESSENCE_SH_ELEC)
{
- (*f2) |= TR2_RES_FIRE;
- (*f3) |= TR3_SH_FIRE;
+ add_flag(flgs, TR_RES_ELEC);
+ add_flag(flgs, TR_SH_ELEC);
}
- else if (o_ptr->xtra3 == ESSENCE_SH_ELEC)
+ else if (add == ESSENCE_SH_COLD)
{
- (*f2) |= TR2_RES_ELEC;
- (*f3) |= TR3_SH_ELEC;
+ add_flag(flgs, TR_RES_COLD);
+ add_flag(flgs, TR_SH_COLD);
}
- else if (o_ptr->xtra3 == ESSENCE_SH_COLD)
+ else if (add == ESSENCE_RESISTANCE)
{
- (*f2) |= TR2_RES_COLD;
- (*f3) |= TR3_SH_COLD;
+ add_flag(flgs, TR_RES_ACID);
+ add_flag(flgs, TR_RES_ELEC);
+ add_flag(flgs, TR_RES_FIRE);
+ add_flag(flgs, TR_RES_COLD);
}
- else if (o_ptr->xtra3 == ESSENCE_RESISTANCE)
+ else if (add == TR_IMPACT)
{
- (*f2) |= (TR2_RES_ACID | TR2_RES_ELEC | TR2_RES_FIRE | TR2_RES_COLD);;
+ add_flag(flgs, TR_ACTIVATE);
}
}
}
/*
* Obtain the "flags" for an item which are known to the player
*/
-void object_flags_known(object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3)
+void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
{
bool spoil = FALSE;
+ int i;
object_kind *k_ptr = &k_info[o_ptr->k_idx];
/* Clear */
- (*f1) = (*f2) = (*f3) = 0L;
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] = 0;
if (!object_aware_p(o_ptr)) return;
/* Base object */
- (*f1) = k_ptr->flags1;
- (*f2) = k_ptr->flags2;
- (*f3) = k_ptr->flags3;
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] = k_ptr->flags[i];
/* Must be identified */
if (!object_known_p(o_ptr)) return;
{
ego_item_type *e_ptr = &e_info[o_ptr->name2];
- (*f1) |= e_ptr->flags1;
- (*f2) |= e_ptr->flags2;
- (*f3) |= e_ptr->flags3;
+ for (i = 0; i < TR_FLAG_SIZE; i++)
+ flgs[i] |= e_ptr->flags[i];
if ((o_ptr->name2 == EGO_LITE_AURA_FIRE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
{
- (*f3) &= ~(TR3_SH_FIRE);
+ remove_flag(flgs, TR_SH_FIRE);
}
else if ((o_ptr->name2 == EGO_LITE_INFRA) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
{
- (*f1) &= ~(TR1_INFRA);
+ remove_flag(flgs, TR_INFRA);
}
else if ((o_ptr->name2 == EGO_LITE_EYE) && !o_ptr->xtra4 && (o_ptr->sval <= SV_LITE_LANTERN))
{
- (*f2) &= ~(TR2_RES_BLIND);
- (*f3) &= ~(TR3_SEE_INVIS);
+ remove_flag(flgs, TR_RES_BLIND);
+ remove_flag(flgs, TR_SEE_INVIS);
}
}
{
artifact_type *a_ptr = &a_info[o_ptr->name1];
- (*f1) = a_ptr->flags1;
- (*f2) = a_ptr->flags2;
- (*f3) = a_ptr->flags3;
-
- if (!cursed_p(o_ptr))
- {
- (*f3) &= ~(TR3_HEAVY_CURSE | TR3_CURSED);
- }
+ 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;
- }
-
- if (!(o_ptr->art_name))
- {
- /* Extra powers */
- switch (o_ptr->xtra1)
- {
- case EGO_XTRA_SUSTAIN:
- {
- /* Choose a sustain */
- switch (o_ptr->xtra2 % 6)
- {
- case 0: (*f2) |= (TR2_SUST_STR); break;
- case 1: (*f2) |= (TR2_SUST_INT); break;
- case 2: (*f2) |= (TR2_SUST_WIS); break;
- case 3: (*f2) |= (TR2_SUST_DEX); break;
- case 4: (*f2) |= (TR2_SUST_CON); break;
- case 5: (*f2) |= (TR2_SUST_CHR); break;
- }
-
- break;
- }
-
- case EGO_XTRA_POWER:
- {
- /* Choose a power */
- switch (o_ptr->xtra2 % 11)
- {
- case 0: (*f2) |= (TR2_RES_BLIND); break;
- case 1: (*f2) |= (TR2_RES_CONF); break;
- case 2: (*f2) |= (TR2_RES_SOUND); break;
- case 3: (*f2) |= (TR2_RES_SHARDS); break;
- case 4: (*f2) |= (TR2_RES_NETHER); break;
- case 5: (*f2) |= (TR2_RES_NEXUS); break;
- case 6: (*f2) |= (TR2_RES_CHAOS); break;
- case 7: (*f2) |= (TR2_RES_DISEN); break;
- case 8: (*f2) |= (TR2_RES_POIS); break;
- case 9: (*f2) |= (TR2_RES_DARK); break;
- case 10: (*f2) |= (TR2_RES_LITE); break;
- }
-
- break;
- }
-
- case EGO_XTRA_ABILITY:
- {
- /* Choose an ability */
- switch (o_ptr->xtra2 % 8)
- {
- case 0: (*f3) |= (TR3_FEATHER); break;
- case 1: (*f3) |= (TR3_LITE); break;
- case 2: (*f3) |= (TR3_SEE_INVIS); break;
- case 3: (*f3) |= (TR3_WARNING); break;
- case 4: (*f3) |= (TR3_SLOW_DIGEST); break;
- case 5: (*f3) |= (TR3_REGEN); break;
- case 6: (*f2) |= (TR2_FREE_ACT); break;
- case 7: (*f2) |= (TR2_HOLD_LIFE); break;
- }
-
- break;
- }
- }
- }
+ 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 (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);
}
}
-
- if (cursed_p(o_ptr))
- {
- if (o_ptr->art_flags3 & TR3_CURSED)
- (*f3) |= (TR3_CURSED);
- if (o_ptr->art_flags3 & TR3_HEAVY_CURSE)
- (*f3) |= (TR3_HEAVY_CURSE);
- }
}
*/
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
#endif
}
- case ART_BELANGIL:
+ case ART_FIONA:
{
#ifdef JP
return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë(48) : 5+d5 ¥¿¡¼¥óËè";
#endif
}
- case ART_DAL:
+ case ART_FLORA:
{
#ifdef JP
return "¶²Éݽüµî/ÆǾä· : 5 ¥¿¡¼¥óËè";
#endif
}
- case ART_OLORIN:
+ case ART_GANDALF:
{
#ifdef JP
return "õº÷¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 1000 ¥¿¡¼¥óËè";
}
case ART_KUSANAGI:
- case ART_ANGUIREL:
+ case ART_WEREWINDLE:
{
#ifdef JP
return "ƨÁö : 35 ¥¿¡¼¥óËè";
#endif
}
- case ART_OROME:
+ case ART_DESTINY:
{
#ifdef JP
return "´äÀÐÍϲò : 5 ¥¿¡¼¥óËè";
#endif
}
- case ART_BELEGENNON:
+ case ART_LOHENGRIN:
{
#ifdef JP
return ("²óÉü (777)¡¢Ìþ¤·¡¢»Îµ¤¹âÍÈ : 300 ¥¿¡¼¥óËè");
#endif
}
- case ART_CELEBORN:
+ case ART_JULIAN:
{
#ifdef JP
return "Ëõ»¦ : 500 ¥¿¡¼¥óËè";
#endif
}
- case ART_GONDOR:
+ case ART_AMBER:
{
#ifdef JP
return "ÂÎÎϲóÉü(500) : 500 ¥¿¡¼¥óËè";
#endif
}
- case ART_THRAIN:
+ 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_CARLAMMAS:
- case ART_VIOLET:
+ case ART_HERMIT:
{
#ifdef JP
return "Âмٰ·ë³¦ : 225+d225 ¥¿¡¼¥óËè";
#endif
}
- case ART_BARAHIR:
+ case ART_FRAKIR:
{
#ifdef JP
return "Ã⩹¶·â(100) : 100+d100 ¥¿¡¼¥óËè";
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
}
}
- if ((o_ptr->tval > TV_CAPTURE) && (o_ptr->xtra3 == ESSENCE_TMP_RES_ACID))
+ if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3)
{
+ 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
- }
+ break;
- 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
- }
+ break;
- 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
- }
+ break;
- 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
- }
+ break;
- 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
+ break;
+ }
}
if (o_ptr->name2 == EGO_TRUMP)
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:
{
int i = 0, j, k;
- u32b f1, f2, f3;
+ u32b flgs[TR_FLAG_SIZE];
cptr info[128];
- u32b flag;
+ char o_name[MAX_NLEN];
+ int wid, hgt;
/* Extract the flags */
- object_flags(o_ptr, &f1, &f2, &f3);
+ object_flags(o_ptr, flgs);
- if( o_ptr->name1)
+ /* Extract the description */
{
- char temp[70*20];
+ char temp[70 * 20];
- 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++;}
+ roff_to_buf(o_ptr->name1 ? (a_text + a_info[o_ptr->name1].text) :
+ (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text),
+ 77 - 15, temp);
+ for (j = 0; temp[j]; j += 1 + strlen(&temp[j]))
+ { info[i] = &temp[j]; i++;}
}
/* Mega-Hack -- describe activation */
- if (f3 & (TR3_ACTIVATE))
+ 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_2HAND)
+ if (o_ptr->name2 == EGO_2WEAPON)
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÆóÅáή¤Ç¤ÎÌ¿ÃæΨ¤ò¸þ¾å¤µ¤»¤ë¡£";
}
- if (o_ptr->name2 == EGO_RING_WIZARD)
+ if (have_flag(flgs, TR_EASY_SPELL))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò²¼¤²¤ë¡£";
#else
- info[i++] = "It affects your ability to use magic devices.";
+ info[i++] = "It affects your ability to cast spells.";
#endif
}
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡¤ÎÆñ°×ÅÙ¤ò¾å¤²¤ë¡£";
#else
- info[i++] = "It prevents you from using magic items.";
+ info[i++] = "It interferes with casting spells.";
#endif
}
if (o_ptr->name2 == EGO_LITE_DARKNESS)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
+ info[i++] = "¤½¤ì¤ÏÁ´¤¯¸÷¤é¤Ê¤¤¡£";
+#else
+ info[i++] = "It provides no light.";
+#endif
+
+ if (o_ptr->sval == SV_LITE_FEANOR ||
+ o_ptr->sval == SV_LITE_LANTERN)
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-2)¡£";
+#else
+ info[i++] = "It decreases radius of light source by 2.";
+#endif
+ }
+ else
+ {
+#ifdef JP
+ info[i++] = "¤½¤ì¤ÏÌÀ¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
#else
- info[i++] = "It provides no light..";
+ info[i++] = "It decreases radius of light source by 1.";
#endif
+ }
}
else if (artifact_p(o_ptr))
{
/* And then describe it fully */
- if (f2 & (TR2_RIDING))
+ if (have_flag(flgs, TR_RIDING))
{
if ((o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE)))
#ifdef JP
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++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
#else
- info[i++] = "It is suitable for riding.";
+ info[i++] = "It is suitable for use while riding.";
#endif
}
- if (f1 & (TR1_STR))
+ if (have_flag(flgs, TR_STR))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÏÓÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_INT))
+ if (have_flag(flgs, TR_INT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃÎǽ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_WIS))
+ if (have_flag(flgs, TR_WIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¸¤µ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_DEX))
+ if (have_flag(flgs, TR_DEX))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï´ïÍѤµ¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_CON))
+ if (have_flag(flgs, TR_CON))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÂѵ×ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_CHR))
+ if (have_flag(flgs, TR_CHR))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌ¥ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
}
- if (f1 & (TR1_MAGIC_MASTERY))
+ if (have_flag(flgs, TR_MAGIC_MASTERY))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡Æ»¶ñ»ÈÍÑǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_STEALTH))
+ if (have_flag(flgs, TR_STEALTH))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï±£Ì©¹ÔưǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_SEARCH))
+ if (have_flag(flgs, TR_SEARCH))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ïõº÷ǽÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_INFRA))
+ if (have_flag(flgs, TR_INFRA))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÀÖ³°Àþ»ëÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_TUNNEL))
+ if (have_flag(flgs, TR_TUNNEL))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏºÎ·¡Ç½ÎϤ˱ƶÁ¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_SPEED))
+ if (have_flag(flgs, TR_SPEED))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥¹¥Ô¡¼¥É¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
#endif
}
- if (f1 & (TR1_BLOWS))
+ if (have_flag(flgs, TR_BLOWS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÂÇ·â²ó¿ô¤Ë±Æ¶Á¤òµÚ¤Ü¤¹";
}
- if (f1 & (TR1_BRAND_ACID))
+ if (have_flag(flgs, TR_BRAND_ACID))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï»À¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
#endif
}
- if (f1 & (TR1_BRAND_ELEC))
+ if (have_flag(flgs, TR_BRAND_ELEC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
#endif
}
- if (f1 & (TR1_BRAND_FIRE))
+ if (have_flag(flgs, TR_BRAND_FIRE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
#endif
}
- if (f1 & (TR1_BRAND_COLD))
+ if (have_flag(flgs, TR_BRAND_COLD))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÎ䵤¤Ë¤è¤Ã¤ÆÂ礤ʥÀ¥á¡¼¥¸¤òÍ¿¤¨¤ë";
}
- if (f1 & (TR1_BRAND_POIS))
+ if (have_flag(flgs, TR_BRAND_POIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏŨ¤òÆǤ¹¤ë¡£";
}
- if (f1 & (TR1_CHAOTIC))
+ if (have_flag(flgs, TR_CHAOTIC))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥«¥ª¥¹Åª¤Ê¸ú²Ì¤òµÚ¤Ü¤¹¡£";
}
- if (f1 & (TR1_VAMPIRIC))
+ if (have_flag(flgs, TR_VAMPIRIC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏŨ¤«¤é¥Ò¥Ã¥È¥Ý¥¤¥ó¥È¤òµÛ¼ý¤¹¤ë¡£";
}
- if (f1 & (TR1_IMPACT))
+ if (have_flag(flgs, TR_IMPACT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃϿ̤òµ¯¤³¤¹¤³¤È¤¬¤Ç¤¤ë¡£";
}
- if (f1 & (TR1_VORPAL))
+ if (have_flag(flgs, TR_VORPAL))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÈó¾ï¤ËÀÚ¤ìÌ£¤¬±Ô¤¯Å¨¤òÀÚÃǤ¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
}
- if (f1 & (TR1_KILL_DRAGON))
+ if (have_flag(flgs, TR_KILL_DRAGON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
#endif
}
- else if (f1 & (TR1_SLAY_DRAGON))
+ else if (have_flag(flgs, TR_SLAY_DRAGON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_ORC))
+
+ if (have_flag(flgs, TR_KILL_ORC))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of orcs.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_ORC))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_TROLL))
+
+ if (have_flag(flgs, TR_KILL_TROLL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of trolls.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_TROLL))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_GIANT))
+
+ if (have_flag(flgs, TR_KILL_GIANT))
{
- if (o_ptr->name1 == ART_HRUNTING)
#ifdef JP
info[i++] = "¤½¤ì¤Ïµð¿Í¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
#else
info[i++] = "It is a great bane of giants.";
#endif
- else
+ }
+ else if (have_flag(flgs, TR_SLAY_GIANT))
+ {
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥¸¥ã¥¤¥¢¥ó¥È¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
#else
#endif
}
- if (f1 & (TR1_SLAY_DEMON))
+
+ if (have_flag(flgs, TR_KILL_DEMON))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of demons.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_DEMON))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥Ç¡¼¥â¥ó¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_UNDEAD))
+
+ if (have_flag(flgs, TR_KILL_UNDEAD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of undead.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_UNDEAD))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤòȯ´ø¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_EVIL))
+
+ if (have_flag(flgs, TR_KILL_EVIL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼Ù°¤Ê¤ë¸ºß¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of evil monsters.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_EVIL))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¼Ù°¤Ê¤ë¸ºß¤ËÂФ·¤ÆÀ»¤Ê¤ëÎϤǹ¶·â¤¹¤ë¡£";
#endif
}
- if (f1 & (TR1_SLAY_ANIMAL))
+
+ if (have_flag(flgs, TR_KILL_ANIMAL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤Ë¤È¤Ã¤Æ¤ÎŷŨ¤Ç¤¢¤ë¡£";
+#else
+ info[i++] = "It is a great bane of natural creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLAY_ANIMAL))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤Îưʪ¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤ÎϤòȯ´ø¤¹¤ë¡£";
}
- 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_FEATHER))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÃè¤ËÉ⤯¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_LITE))
+ if (have_flag(flgs, TR_LITE))
{
if ((o_ptr->name2 == EGO_DARK) || (o_ptr->name1 == ART_NIGHT))
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë¡£";
+info[i++] = "¤½¤ì¤ÏÌÀ¤«¤ê¤ÎȾ·Â¤ò¶¹¤á¤ë(Ⱦ·Â¤Ë-1)¡£";
#else
- info[i++] = "It decreases radius of your light source.";
+ info[i++] = "It decreases radius of your light source by 1.";
#endif
else
#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤ÎÌÀ¤«¤ê¤ò¼ø¤±¤ë¡£";
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤ÎÌÀ¤«¤ê¤ò¼ø¤±¤ë(Ⱦ·Â¤Ë+1)¡£";
#else
- info[i++] = "It provides permanent light.";
+ info[i++] = "It provides permanent light. (radius +1)";
#endif
}
- if (f3 & (TR3_SEE_INVIS))
+ if (have_flag(flgs, TR_SEE_INVIS))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÆ©ÌÀ¤Ê¥â¥ó¥¹¥¿¡¼¤ò¸«¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_TELEPATHY))
+ if (have_flag(flgs, TR_TELEPATHY))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ñ¥·¡¼Ç½ÎϤò¼ø¤±¤ë¡£";
#endif
}
- if (f3 & (TR3_SLOW_DIGEST))
+ if (have_flag(flgs, TR_ESP_ANIMAL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼«Á³³¦¤ÎÀ¸Êª¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses natural creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_UNDEAD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥¢¥ó¥Ç¥Ã¥É¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses undead.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_DEMON))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï°Ëâ¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses demons.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_ORC))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥ª¡¼¥¯¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses orcs.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_TROLL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥È¥í¥ë¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses trolls.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_GIANT))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ïµð¿Í¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses giants.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_DRAGON))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses dragons.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_HUMAN))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses humans.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_EVIL))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼Ù°¤Ê¸ºß¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses evil creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_GOOD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÁ±Îɤʸºß¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses good creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_NONLIVING))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï³èÆ°¤¹¤ë̵À¸ÊªÂΤò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses non-living creatures.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_ESP_UNIQUE))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÆÃÊ̤ʶ¯Å¨¤ò´¶ÃΤ¹¤ë¡£";
+#else
+ info[i++] = "It senses unique monsters.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SLOW_DIGEST))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤òÃÙ¤¯¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_REGEN))
+ if (have_flag(flgs, TR_REGEN))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÂÎÎϲóÉüÎϤò¶¯²½¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_WARNING))
+ if (have_flag(flgs, TR_WARNING))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï´í¸±¤ËÂФ·¤Æ·Ù¹ð¤òȯ¤¹¤ë¡£";
#endif
}
- if (f2 & (TR2_REFLECT))
+ if (have_flag(flgs, TR_REFLECT))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÌð¤ä¥Ü¥ë¥È¤òÈ¿¼Í¤¹¤ë¡£";
#endif
}
- if (f3 & (TR3_SH_FIRE))
+ if (have_flag(flgs, TR_SH_FIRE))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï±ê¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+#else
+ info[i++] = "It produces a fiery sheath.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SH_ELEC))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÅŵ¤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+#else
+ info[i++] = "It produces an electric sheath.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_SH_COLD))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÎ䵤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+#else
+ info[i++] = "It produces a sheath of coldness.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_NO_MAGIC))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÈ¿ËâË¡¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+#else
+ info[i++] = "It produces an anti-magic shell.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_NO_TELE))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤹¤ë¡£";
+#else
+ info[i++] = "It prevents teleportation.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_XTRA_MIGHT))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤò¤è¤ê¶¯ÎϤËȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
+#else
+ info[i++] = "It fires missiles with extra might.";
+#endif
+
+ }
+ if (have_flag(flgs, TR_XTRA_SHOTS))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤòÈó¾ï¤ËÁ᤯ȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
+#else
+ info[i++] = "It fires missiles excessively fast.";
+#endif
+
+ }
+
+ if (have_flag(flgs, TR_BLESSED))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¿À¤Ë½ËÊ¡¤µ¤ì¤Æ¤¤¤ë¡£";
+#else
+ info[i++] = "It has been blessed by the gods.";
+#endif
+
+ }
+
+ if (cursed_p(o_ptr))
+ {
+ if (o_ptr->curse_flags & TRC_PERMA_CURSE)
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï±Ê±ó¤Î¼ö¤¤¤¬¤«¤±¤é¤ì¤Æ¤¤¤ë¡£";
+#else
+ info[i++] = "It is permanently cursed.";
+#endif
+
+ }
+ else if (o_ptr->curse_flags & TRC_HEAVY_CURSE)
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¶¯ÎϤʼö¤¤¤¬¤«¤±¤é¤ì¤Æ¤¤¤ë¡£";
+#else
+ info[i++] = "It is heavily cursed.";
+#endif
+
+ }
+ else
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¼ö¤ï¤ì¤Æ¤¤¤ë¡£";
+#else
+ info[i++] = "It is cursed.";
+#endif
+
+ }
+ }
+
+ if ((have_flag(flgs, TR_TY_CURSE)) || (o_ptr->curse_flags & TRC_TY_CURSE))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÂÀ¸Å¤Î²Ò¡¹¤·¤¤±åÇ°¤¬½É¤Ã¤Æ¤¤¤ë¡£";
+#else
+ info[i++] = "It carries an ancient foul curse.";
+#endif
+
+ }
+ if ((have_flag(flgs, TR_AGGRAVATE)) || (o_ptr->curse_flags & TRC_AGGRAVATE))
+ {
+#ifdef JP
+info[i++] = "¤½¤ì¤ÏÉÕ¶á¤Î¥â¥ó¥¹¥¿¡¼¤òÅܤ餻¤ë¡£";
+#else
+ info[i++] = "It aggravates nearby creatures.";
+#endif
+
+ }
+ if ((have_flag(flgs, TR_DRAIN_EXP)) || (o_ptr->curse_flags & TRC_DRAIN_EXP))
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï±ê¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+info[i++] = "¤½¤ì¤Ï·Ð¸³ÃͤòµÛ¤¤¼è¤ë¡£";
#else
- info[i++] = "It produces a fiery sheath.";
+ info[i++] = "It drains experience.";
#endif
}
- if (f3 & (TR3_SH_ELEC))
+ if (o_ptr->curse_flags & TRC_SLOW_REGEN)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÅŵ¤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+info[i++] = "¤½¤ì¤Ï²óÉüÎϤò¼å¤á¤ë¡£";
#else
- info[i++] = "It produces an electric sheath.";
+ info[i++] = "It slows your regenerative powers.";
#endif
}
- if (f3 & (TR3_SH_COLD))
+ if (o_ptr->curse_flags & TRC_ADD_L_CURSE)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÎ䵤¤Î¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¼å¤¤¼ö¤¤¤òÁý¤ä¤¹¡£";
#else
- info[i++] = "It produces a coldly sheath.";
+ info[i++] = "It adds weak curses.";
#endif
}
- if (f3 & (TR3_NO_MAGIC))
+ if (o_ptr->curse_flags & TRC_ADD_H_CURSE)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÈ¿ËâË¡¥Ð¥ê¥¢¤òÄ¥¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¶¯ÎϤʼö¤¤¤òÁý¤ä¤¹¡£";
#else
- info[i++] = "It produces an anti-magic shell.";
+ info[i++] = "It adds heavy curses.";
#endif
}
- if (f3 & (TR3_NO_TELE))
+ if (o_ptr->curse_flags & TRC_CALL_ANIMAL)
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¥Æ¥ì¥Ý¡¼¥È¤ò¼ÙË⤹¤ë¡£";
+info[i++] = "¤½¤ì¤Ïưʪ¤ò¸Æ¤Ó´ó¤»¤ë¡£";
#else
- info[i++] = "It prevents teleportation.";
+ info[i++] = "It attracts animals.";
#endif
}
- if (f3 & (TR3_XTRA_MIGHT))
+ if (o_ptr->curse_flags & TRC_CALL_DEMON)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤò¤è¤ê¶¯ÎϤËȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
+info[i++] = "¤½¤ì¤Ï°Ëâ¤ò¸Æ¤Ó´ó¤»¤ë¡£";
#else
- info[i++] = "It fires missiles with extra might.";
+ info[i++] = "It attracts demons.";
#endif
}
- if (f3 & (TR3_XTRA_SHOTS))
+ if (o_ptr->curse_flags & TRC_CALL_DRAGON)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÌ𡿥ܥë¥È¡¿ÃƤòÈó¾ï¤ËÁ᤯ȯ¼Í¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¥É¥é¥´¥ó¤ò¸Æ¤Ó´ó¤»¤ë¡£";
#else
- info[i++] = "It fires missiles excessively fast.";
+ info[i++] = "It attracts dragons.";
#endif
}
-
- if (f3 & (TR3_DRAIN_EXP))
+ if (o_ptr->curse_flags & TRC_COWARDICE)
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï·Ð¸³ÃͤòµÛ¤¤¼è¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¶²ÉÝ´¶¤ò°ú¤µ¯¤³¤¹¡£";
#else
- info[i++] = "It drains experience.";
+ info[i++] = "It makes you subject to cowardice.";
#endif
}
- if (f3 & (TR3_TELEPORT))
+ if ((have_flag(flgs, TR_TELEPORT)) || (o_ptr->curse_flags & TRC_TELEPORT))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï¥é¥ó¥À¥à¤Ê¥Æ¥ì¥Ý¡¼¥È¤ò°ú¤µ¯¤³¤¹¡£";
#endif
}
- if (f3 & TR3_AGGRAVATE)
+ if (o_ptr->curse_flags & TRC_LOW_MELEE)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÉÕ¶á¤Î¥â¥ó¥¹¥¿¡¼¤òÅܤ餻¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¹¶·â¤ò³°¤·¤ä¤¹¤¤¡£";
#else
- info[i++] = "It aggravates nearby creatures.";
+ info[i++] = "It causes you to miss blows.";
#endif
}
-
- if (f3 & TR3_BLESSED)
+ if (o_ptr->curse_flags & TRC_LOW_AC)
{
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¿À¤Ë½ËÊ¡¤µ¤ì¤Æ¤¤¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¹¶·â¤ò¼õ¤±¤ä¤¹¤¤¡£";
#else
- info[i++] = "It has been blessed by the gods.";
+ info[i++] = "It helps your enemies' blows.";
#endif
}
-
- if (cursed_p(o_ptr))
+ if (o_ptr->curse_flags & TRC_LOW_MAGIC)
{
- if (f3 & TR3_PERMA_CURSE)
- {
#ifdef JP
-info[i++] = "¤½¤ì¤Ï±Ê±ó¤Î¼ö¤¤¤¬¤«¤±¤é¤ì¤Æ¤¤¤ë¡£";
+info[i++] = "¤½¤ì¤ÏËâË¡¤ò¾§¤¨¤Ë¤¯¤¯¤¹¤ë¡£";
#else
- info[i++] = "It is permanently cursed.";
+ info[i++] = "It encumbers you while spellcasting.";
#endif
- }
- else if (f3 & TR3_HEAVY_CURSE)
- {
+ }
+ if (o_ptr->curse_flags & TRC_FAST_DIGEST)
+ {
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¶¯ÎϤʼö¤¤¤¬¤«¤±¤é¤ì¤Æ¤¤¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤Î¿·ÄÄÂå¼Õ¤ò®¤¯¤¹¤ë¡£";
#else
- info[i++] = "It is heavily cursed.";
+ info[i++] = "It speeds your metabolism.";
#endif
- }
- else
- {
+ }
+ if (o_ptr->curse_flags & TRC_DRAIN_HP)
+ {
#ifdef JP
-info[i++] = "¤½¤ì¤Ï¼ö¤ï¤ì¤Æ¤¤¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎÂÎÎϤòµÛ¤¤¼è¤ë¡£";
#else
- info[i++] = "It is cursed.";
+ info[i++] = "It drains you.";
#endif
- }
}
-
- if (f3 & TR3_TY_CURSE)
+ if (o_ptr->curse_flags & TRC_DRAIN_MANA)
{
#ifdef JP
-info[i++] = "¤½¤ì¤ÏÂÀ¸Å¤Î²Ò¡¹¤·¤¤±åÇ°¤¬½É¤Ã¤Æ¤¤¤ë¡£";
+info[i++] = "¤½¤ì¤Ï¤¢¤Ê¤¿¤ÎËâÎϤòµÛ¤¤¼è¤ë¡£";
#else
- info[i++] = "It carries an ancient foul curse.";
+ info[i++] = "It drains your mana.";
#endif
}
/* XTRA HACK ARTDESC */
- flag = TR3_IGNORE_ACID | TR3_IGNORE_ELEC | TR3_IGNORE_FIRE | TR3_IGNORE_COLD ;
- if ((f3 & flag) == flag)
+ 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++] = "It cannot be harmed by the elements.";
#endif
} else {
- if (f3 & (TR3_IGNORE_ACID))
+ if (have_flag(flgs, TR_IGNORE_ACID))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï»À¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
#endif
}
- if (f3 & (TR3_IGNORE_ELEC))
+ if (have_flag(flgs, TR_IGNORE_ELEC))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÅÅ·â¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
#endif
}
- if (f3 & (TR3_IGNORE_FIRE))
+ if (have_flag(flgs, TR_IGNORE_FIRE))
{
#ifdef JP
info[i++] = "¤½¤ì¤Ï²Ð±ê¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
#endif
}
- if (f3 & (TR3_IGNORE_COLD))
+ if (have_flag(flgs, TR_IGNORE_COLD))
{
#ifdef JP
info[i++] = "¤½¤ì¤ÏÎ䵤¤Ç¤Ï½ý¤Ä¤«¤Ê¤¤¡£";
/* Save the screen */
screen_save();
+ /* Get size */
+ Term_get_size(&wid, &hgt);
+
+ /* Display Item name */
+ object_desc(o_name, o_ptr, TRUE, 3);
+ prt(format("%s", o_name), 0, 0);
+
/* Erase the screen */
- for (k = 1; k < 24; k++) prt("", k, 13);
+ for (k = 1; k < hgt; k++) prt("", k, 13);
/* Label the information */
if ((o_ptr->tval == TV_STATUE) && (o_ptr->sval == SV_PHOTO))
prt(info[j], k++, 15);
/* Every 20 entries (lines 2 to 21), start over */
- if ((k == 22) && (j+1 < i))
+ if ((k == hgt - 2) && (j+1 < i))
{
#ifdef JP
prt("-- ³¤¯ --", k, 15);
int show_inven(int target_item)
{
int i, j, k, l, z = 0;
- int col, len, lim;
+ int col, cur_col, len;
object_type *o_ptr;
char o_name[MAX_NLEN];
char tmp_val[80];
int out_index[23];
byte out_color[23];
- char out_desc[23][80];
+ char out_desc[23][MAX_NLEN];
int target_item_label = 0;
+ int wid, hgt;
+ char inven_spellbook_label[52+1];
+ /* See cmd5.c */
+ extern bool select_spellbook;
/* Starting column */
col = command_gap;
- /* Default "max-length" */
- len = 79 - col;
-
- /* Maximum space allowed for descriptions */
- lim = 79 - 3;
+ /* Get size */
+ Term_get_size(&wid, &hgt);
- /* Require space for weight (if needed) */
- if (show_weights) lim -= 9;
+ /* Default "max-length" */
+ len = wid - col - 1;
- /* Require space for icon */
- if (show_item_graph) lim -= 2;
/* Find the "final" slot */
for (i = 0; i < INVEN_PACK; i++)
z = i + 1;
}
+ if (select_spellbook)
+ {
+ int index;
+
+ strcpy(inven_spellbook_label, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+ for (i = 0; i < 52; i++)
+ {
+ char c;
+ if (i < 26) c = (char)('a' + i);
+ else c = (char)('A' + i - 26);
+
+ if (get_tag(&index, c))
+ {
+ if (inven_spellbook_label[i] == c)
+ inven_spellbook_label[i] = ' ';
+ inven_spellbook_label[index] = c;
+ }
+ }
+ }
+
/* Display the inventory */
for (k = 0, i = 0; i < z; i++)
{
/* Describe the object */
object_desc(o_name, o_ptr, TRUE, 3);
- /* Hack -- enforce max length */
- o_name[lim] = '\0';
-
/* Save the object index, color, and description */
out_index[k] = i;
out_color[k] = tval_to_attr[o_ptr->tval % 128];
if (show_weights) l += 9;
/* Account for icon if displayed */
- if (show_item_graph) l += 2;
+ if (show_item_graph)
+ {
+ l += 2;
+ if (use_bigtile) l++;
+ }
/* Maintain the maximum length */
if (l > len) len = l;
}
/* Find the column to start in */
- col = (len > 76) ? 0 : (79 - len);
+ col = (len > wid - 4) ? 0 : (wid - len - 1);
/* Output each entry */
for (j = 0; j < k; j++)
}
else strcpy(tmp_val, " ");
}
+ else if (i <= INVEN_PACK && select_spellbook)
+ {
+ sprintf(tmp_val, "%c)", inven_spellbook_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);
+ cur_col = col + 3;
+
/* Display graphics for object, if desired */
if (show_item_graph)
{
if (a & 0x80) a |= 0x40;
#endif
- Term_draw(col + 3, j + 1, a, c);
+ Term_draw(cur_col, j + 1, a, c);
+ if (use_bigtile)
+ {
+ cur_col++;
+ if (a & 0x80)
+ Term_draw(cur_col, j + 1, 255, -1);
+ }
+ cur_col += 2;
}
/* Display the entry itself */
- c_put_str(out_color[j], out_desc[j], j + 1, show_item_graph ? (col + 5) : (col + 3));
+ c_put_str(out_color[j], out_desc[j], j + 1, cur_col);
/* Display the weight if needed */
if (show_weights)
(void)sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
#endif
- put_str(tmp_val, j + 1, 71);
+ put_str(tmp_val, j + 1, wid - 9);
}
}
int show_equip(int target_item)
{
int i, j, k, l;
- int col, len, lim;
+ int col, cur_col, len;
object_type *o_ptr;
char tmp_val[80];
char o_name[MAX_NLEN];
int out_index[23];
byte out_color[23];
- char out_desc[23][80];
+ char out_desc[23][MAX_NLEN];
int target_item_label = 0;
+ int wid, hgt;
/* Starting column */
col = command_gap;
- /* Maximal length */
- len = 79 - col;
-
- /* Maximum space allowed for descriptions */
- lim = 79 - 3;
-
- /* 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++)
/* Description */
object_desc(o_name, o_ptr, TRUE, 3);
- /* Truncate the description */
- o_name[lim] = 0;
-
if ((i == INVEN_LARM) && p_ptr->ryoute)
{
#ifdef JP
/* Extract the maximal length (see below) */
#ifdef JP
- l = strlen(out_desc[k]) + (2 + 1);
+ l = strlen(out_desc[k]) + (2 + 1);
#else
l = strlen(out_desc[k]) + (2 + 3);
#endif
/* Increase length for labels (if needed) */
#ifdef JP
- if (show_labels) l += (7 + 2);
+ if (show_labels) l += (7 + 2);
#else
if (show_labels) l += (14 + 2);
#endif
/* Hack -- Find a column to start in */
#ifdef JP
- col = (len > 74) ? 0 : (79 - len);
+ col = (len > wid - 6) ? 0 : (wid - len - 1);
#else
- col = (len > 76) ? 0 : (79 - len);
+ col = (len > wid - 4) ? 0 : (wid - len - 1);
#endif
/* Clear the line with the (possibly indented) index */
put_str(tmp_val, j+1, col);
+ cur_col = col + 3;
+
+ /* Display graphics for object, if desired */
if (show_item_graph)
{
byte a = object_attr(o_ptr);
if (a & 0x80) a |= 0x40;
#endif
- Term_draw(col + 3, j + 1, a, c);
+ Term_draw(cur_col, j + 1, a, c);
+ if (use_bigtile)
+ {
+ cur_col++;
+ if (a & 0x80)
+ Term_draw(cur_col, j + 1, 255, -1);
+ }
+ cur_col += 2;
}
/* Use labels */
(void)sprintf(tmp_val, "%-14s: ", mention_use(i));
#endif
- put_str(tmp_val, j+1, show_item_graph ? col + 5 : col + 3);
+ put_str(tmp_val, j+1, cur_col);
/* Display the entry itself */
#ifdef JP
- c_put_str(out_color[j], out_desc[j], j+1, show_item_graph ? col + 14 : col + 12);
+ c_put_str(out_color[j], out_desc[j], j+1, cur_col + 9);
#else
- c_put_str(out_color[j], out_desc[j], j+1, show_item_graph ? col + 21 : col + 19);
+ c_put_str(out_color[j], out_desc[j], j+1, cur_col + 16);
#endif
-
}
/* No labels */
else
{
/* Display the entry itself */
- c_put_str(out_color[j], out_desc[j], j+1, show_item_graph ? col + 5 : col + 3);
+ c_put_str(out_color[j], out_desc[j], j+1, cur_col);
}
/* Display the weight if needed */
{
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, 71);
+ put_str(tmp_val, j+1, wid - 9);
}
}
* 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 get_tag(int *cp, char tag)
{
int i;
cptr s;
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, 0x01);
if (floor_num)
return TRUE;
#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 */
/* Get the item index */
if (repeat_pull(cp))
{
- if (*cp == 1111) { /* the_force */
+ if (*cp == 1111) { /* the_force */
item_tester_tval = 0;
item_tester_hook = NULL;
return (TRUE);
}
}
-
/* Require at least one legal choice */
if (!allow_floor && (i1 > i2) && (e1 > e2))
{
}
- /*
- * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
- */
- if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
+ /*
+ * Äɲ媥ץ·¥ç¥ó(always_show_list)¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¾ï¤Ë°ìÍ÷¤òɽ¼¨¤¹¤ë
+ */
+ if ((always_show_list == TRUE) || use_menu) command_see = TRUE;
/* Hack -- start out in "display" mode */
if (command_see)
{
/* Build the prompt */
#ifdef JP
-sprintf(tmp_val, "%c-%c,",
+sprintf(tmp_val, "%c-%c,'(',')',",
#else
- sprintf(tmp_val, " %c-%c,",
+ sprintf(tmp_val, " %c-%c,'(',')',",
#endif
- index_to_label(i1), index_to_label(i2));
+ index_to_label(i1), index_to_label(i2));
/* Append */
strcat(out_val, tmp_val);
{
/* Build the prompt */
#ifdef JP
-sprintf(tmp_val, "%c-%c,",
+sprintf(tmp_val, "%c-%c,'(',')',",
#else
- sprintf(tmp_val, " %c-%c,",
+ sprintf(tmp_val, " %c-%c,'(',')',",
#endif
- index_to_label(e1), index_to_label(e2));
+ index_to_label(e1), index_to_label(e2));
/* Append */
strcat(out_val, tmp_val);
#ifdef JP
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
}
case 'x':
case 'X':
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;
break;
}
- case 'w':
+ case 'w':
{
if (select_the_force) {
*cp = 1111;
default:
{
int ver;
-
if(select_spellbook){
- bool not_found = FALSE;
- /* Look up the tag */
- if (!get_tag(&k, which))
- {
+ bool not_found = FALSE;
+ /* Look up the tag */
+ if (!get_tag(&k, which))
+ {
not_found = TRUE;
- }
+ }
- /* Hack -- Validate the item */
- if ((k < INVEN_RARM) ? !inven : !equip)
- {
+ /* Hack -- Validate the item */
+ if ((k < INVEN_RARM) ? !inven : !equip)
+ {
not_found = TRUE;
- }
+ }
- /* Validate the item */
- if (!get_item_okay(k))
- {
+ /* Validate the item */
+ if (!get_item_okay(k))
+ {
not_found = TRUE;
- }
-
- if( !not_found ){
- /* Accept that choice */
- (*cp) = k;
- item = TRUE;
- done = TRUE;
- break;
- }
+ }
+
+ if( !not_found ){
+ /* Accept that choice */
+ (*cp) = k;
+ item = TRUE;
+ done = TRUE;
+ break;
+ }
}
/* Extract "query" setting */
/* 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 */
* 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 & 0x02) && !o_ptr->marked) 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 out_index[23];
byte out_color[23];
- char out_desc[23][80];
+ char out_desc[23][MAX_NLEN];
int target_item_label = 0;
int floor_list[23], floor_num;
+ int wid, hgt;
- /* Default length */
- len = 79 - 50;
+ /* Get size */
+ Term_get_size(&wid, &hgt);
- /* Maximum space allowed for descriptions */
- lim = 79 - 3;
+ /* Default length */
+ len = MAX((*min_width), 20);
- /* 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, 0x01);
/* Display the inventory */
- for (k = 0, i = 0; i < floor_num; i++)
+ for (k = 0, i = 0; i < floor_num && i < 23; i++)
{
o_ptr = &o_list[floor_list[i]];
/* Describe the object */
object_desc(o_name, o_ptr, TRUE, 3);
- /* Hack -- enforce max length */
- o_name[lim] = '\0';
-
/* Save the index */
out_index[k] = i;
k++;
}
+ /* Save width */
+ *min_width = len;
+
/* Find the column to start in */
- col = (len > 76) ? 0 : (79 - len);
+ col = (len > wid - 4) ? 0 : (wid - len - 1);
/* Output each entry */
for (j = 0; j < k; j++)
sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
#endif
- put_str(tmp_val, j + 1, 71);
+ put_str(tmp_val, j + 1, wid - 9);
}
}
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;
/* Get the item index */
if (repeat_pull(cp))
{
- if (*cp == 1111) { /* the_force */
+ if (*cp == 1111) { /* the_force */
item_tester_tval = 0;
item_tester_hook = NULL;
return (TRUE);
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, 0x01);
}
/* Accept inventory */
}
}
- /*
- * Äɲ媥ץ·¥ç¥ó(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)
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 */
{
/* 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);
/* Append */
#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 (allow_equip)
+ {
+ 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)
- {
- 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 (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)
+ {
#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
+ }
}
{
/* 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);
/* 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,");
-#endif
+ 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 */
{
/* 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
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
}
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
+ }
}
/* Finish the prompt */
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 'x':
case 'X':
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;
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, 0x01);
+
+ /* Hack -- Fix screen */
+ if (command_see)
+ {
+ /* Load screen */
+ screen_load();
+
+ /* Save screen */
+ screen_save();
+ }
+
+ break;
+ }
+
case '/':
{
if (command_wrk == (USE_INVEN))
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;
int ver;
if(select_spellbook){
- bool not_found = FALSE;
- /* Look up the tag */
- if (!get_tag(&k, which))
- {
+ bool not_found = FALSE;
+ /* Look up the tag */
+ if (!get_tag(&k, which))
+ {
not_found = TRUE;
- }
+ }
- /* Hack -- Validate the item */
- if ((k < INVEN_RARM) ? !inven : !equip)
- {
+ /* Hack -- Validate the item */
+ if ((k < INVEN_RARM) ? !inven : !equip)
+ {
not_found = TRUE;
- }
+ }
- /* Validate the item */
- if (!get_item_okay(k))
- {
+ /* Validate the item */
+ if (!get_item_okay(k))
+ {
not_found = TRUE;
- }
-
- if( !not_found ){
- /* Accept that choice */
- (*cp) = k;
- item = TRUE;
- done = TRUE;
- break;
- }
+ }
+
+ if( !not_found ){
+ /* Accept that choice */
+ (*cp) = k;
+ item = TRUE;
+ done = TRUE;
+ break;
+ }
}
/* Extract "query" setting */
/* 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;
}
-bool py_pickup_floor_aux(void)
+static bool py_pickup_floor_aux(void)
{
s16b this_o_idx;
{
/* Message */
#ifdef JP
- msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
- (long)o_ptr->pval, o_name);
+ msg_format(" $%ld ¤Î²ÁÃͤ¬¤¢¤ë%s¤ò¸«¤Ä¤±¤¿¡£",
+ (long)o_ptr->pval, o_name);
#else
msg_format("You have found %ld gold pieces worth of %s.",
(long) o_ptr->pval, o_name);
/* Check the next object */
continue;
}
+ else if (o_ptr->marked & OM_NOMSG)
+ {
+ /* If 0 or 1 non-NOMSG items are in the pile, the NOMSG ones are
+ * ignored. Otherwise, they are included in the prompt. */
+ o_ptr->marked &= ~(OM_NOMSG);
+ continue;
+ }
/* Count non-gold objects that can be picked up. */
if (inven_carry_okay(o_ptr))
}
/* 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;
}
/* Message */
#ifdef JP
- msg_format("%s¤¬¤¢¤ë¡£", o_name);
+ msg_format("%s¤¬¤¢¤ë¡£", o_name);
#else
msg_format("You see %s.", o_name);
#endif
/* Message */
#ifdef JP
- msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
+ msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
#else
msg_format("You have no room for %s.", o_name);
#endif
{
/* Message */
#ifdef JP
- msg_format("¥¶¥Ã¥¯¤Ë¤Ï¾²¤Ë¤¢¤ë¤É¤Î¥¢¥¤¥Æ¥à¤âÆþ¤é¤Ê¤¤¡£", o_name);
+ msg_format("¥¶¥Ã¥¯¤Ë¤Ï¾²¤Ë¤¢¤ë¤É¤Î¥¢¥¤¥Æ¥à¤âÆþ¤é¤Ê¤¤¡£", o_name);
#else
msg_print("You have no room for any of the objects on the floor.");
#endif
OSDN Git Service
