*/
void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
{
- cptr basenm, modstr;
- int power, indexx, i;
+ /* Extract default "base" string */
+ cptr basenm = get_object_name(o_ptr);
+
+ /* Assume no "modifier" string */
+ cptr modstr = "";
+
+ /* Hack -- Extract the sub-type "indexx" */
+ int indexx = o_ptr->sval;
+
+ int power, i;
bool aware = FALSE;
bool known = FALSE;
u32b flgs[TR_FLAG_SIZE];
- object_type *bow_ptr;
-
+ object_type *bow_ptr;
object_kind *k_ptr = &k_info[o_ptr->k_idx];
/* See if the object is "known" */
if (object_known_p(o_ptr)) known = TRUE;
- /* Hack -- Extract the sub-type "indexx" */
- indexx = o_ptr->sval;
-
- /* Extract default "base" string */
- basenm = get_object_name(o_ptr);
-
- /* Assume no "modifier" string */
- modstr = "";
-
/* Analyze the object */
switch (o_ptr->tval)
if (!o_ptr->pval)
{
#ifdef JP
- modstr = "¡Ê¶õ¡Ë";
+ modstr = " (¶õ)";
#else
modstr = " (empty)";
#endif
else
{
#ifdef JP
- sprintf(tmp_val2, "¡Ê%s¡Ë",r_name + r_ptr->name);
+ sprintf(tmp_val2, " (%s)",r_name + r_ptr->name);
modstr = tmp_val2;
#else
cptr t = r_name + r_ptr->name;
case TV_AMULET:
{
/* Known artifacts */
- if (artifact_p(o_ptr) && aware) break;
-
- if ((k_ptr->gen_flags & TRG_INSTA_ART) && aware) break;
+ if (aware)
+ {
+ if (artifact_p(o_ptr)) break;
+ if (k_ptr->gen_flags & TRG_INSTA_ART) break;
+ }
/* Color the object */
modstr = amulet_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware ? "%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "¥¢¥ß¥å¥ì¥Ã¥È";
else
case TV_RING:
{
/* Known artifacts */
- if (artifact_p(o_ptr) && aware) break;
-
- if ((k_ptr->gen_flags & TRG_INSTA_ART) && aware) break;
+ if (aware)
+ {
+ if (artifact_p(o_ptr)) break;
+ if (k_ptr->gen_flags & TRG_INSTA_ART) break;
+ }
/* Color the object */
modstr = ring_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware ? "%¤Î»ØÎØ" : "»ØÎØ";
else
/* Color the object */
modstr = staff_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware ? "%¤Î¾ó" : "¾ó";
else
/* Color the object */
modstr = wand_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware? "%¤ÎËâË¡ËÀ":"ËâË¡ËÀ";
else
/* Color the object */
modstr = rod_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware? "%¤Î¥í¥Ã¥É":"¥í¥Ã¥É";
else
/* Color the object */
modstr = scroll_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware ? "%¤Î´¬Êª" : "´¬Êª";
else
/* Color the object */
modstr = potion_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware ? "%¤ÎÌô" : "Ìô";
else
/* Color the object */
modstr = food_adj[indexx];
- if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB)
+ if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
basenm = aware ? "%¤Î¥¥Î¥³" : "¥¥Î¥³";
else
{
modstr = basenm;
#ifdef JP
- basenm = "À¸Ì¿¤ÎËâË¡½ñ#";
+ basenm = "À¸Ì¿¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Life Magic #";
{
modstr = basenm;
#ifdef JP
- basenm = "Àç½Ñ¤ÎËâË¡½ñ#";
+ basenm = "Àç½Ñ¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Sorcery #";
{
modstr = basenm;
#ifdef JP
- basenm = "¼«Á³¤ÎËâË¡½ñ#";
+ basenm = "¼«Á³¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Nature Magic #";
{
modstr = basenm;
#ifdef JP
- basenm = "¥«¥ª¥¹¤ÎËâË¡½ñ#";
+ basenm = "¥«¥ª¥¹¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Chaos Magic #";
{
modstr = basenm;
#ifdef JP
- basenm = "°Å¹õ¤ÎËâË¡½ñ#";
+ basenm = "°Å¹õ¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Death Magic #";
{
modstr = basenm;
#ifdef JP
- basenm = "¥È¥é¥ó¥×¤ÎËâË¡½ñ#";
+ basenm = "¥È¥é¥ó¥×¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Trump Magic #";
{
modstr = basenm;
#ifdef JP
- basenm = "Èë½Ñ¤ÎËâË¡½ñ#";
+ basenm = "Èë½Ñ¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Arcane Magic #";
break;
}
+
case TV_ENCHANT_BOOK:
{
modstr = basenm;
#ifdef JP
- basenm = "¾¢¤ÎËâË¡½ñ#";
+ basenm = "¾¢¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Craft Magic #";
break;
}
+
case TV_DAEMON_BOOK:
{
modstr = basenm;
#ifdef JP
- basenm = "°Ëâ¤ÎËâË¡½ñ#";
+ basenm = "°Ëâ¤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Daemon Magic #";
break;
}
+
case TV_CRUSADE_BOOK:
{
modstr = basenm;
#ifdef JP
- basenm = "Ç˼٤ÎËâË¡½ñ#";
+ basenm = "Ç˼٤ÎËâË¡½ñ#";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
basenm = "& Book~ of Crusade Magic #";
break;
}
+
case TV_MUSIC_BOOK:
{
modstr = basenm;
#ifdef JP
- basenm = "²Î½¸#";
+ basenm = "²Î½¸#";
#else
- basenm = "& Song Book~ #";
+ basenm = "& Song Book~ #";
#endif
break;
}
+
case TV_HISSATSU_BOOK:
{
modstr = basenm;
#ifdef JP
- basenm = "& Éð·Ý¤Î½ñ#";
+ basenm = "& Éð·Ý¤Î½ñ#";
#else
- basenm = "Book~ of Kendo #";
+ basenm = "Book~ of Kendo #";
#endif
break;
}
-
-
/* Hack -- Gold/Gems */
case TV_GOLD:
{
}
else if (o_ptr->number > 1)
{
- if ( change_numeral == FALSE ){
+ if (change_numeral == FALSE)
+ {
t = object_desc_num(t, o_ptr->number);
- if (o_ptr->number > 9)
- t = object_desc_str(t, "¸Ä¤Î ");
- else
- t = object_desc_str(t, "¤Ä¤Î ");
+ t = object_desc_str(t, (o_ptr->number > 9) ? "¸Ä¤Î " : "¤Ä¤Î ");
}
else
{
- t = object_desc_kosuu(t,o_ptr);
+ t = object_desc_kosuu(t, o_ptr);
t = object_desc_str(t, "¤Î ");
}
}
/* ±Ñ¸ì¤Î¾ì¹ç¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ï The ¤¬ÉÕ¤¯¤Î¤Çʬ¤«¤ë¤¬
* ÆüËܸì¤Ç¤Ïʬ¤«¤é¤Ê¤¤¤Î¤Ç¥Þ¡¼¥¯¤ò¤Ä¤±¤ë
*/
- if (known && artifact_p(o_ptr)) t = object_desc_str(t, "¡ú");
- else if (known && o_ptr->art_name) t = object_desc_str(t, "¡ù");
+ if (known)
+ {
+ if (artifact_p(o_ptr)) t = object_desc_str(t, "¡ú");
+ else if (o_ptr->art_name) t = object_desc_str(t, "¡ù");
+ }
#else
#ifdef JP
if (item_tester_hook_smith(o_ptr))
{
- t = object_desc_str(t,format("ÃÃÌê»Õ%s¤Î",player_name));
+ t = object_desc_str(t, format("ÃÃÌê»Õ%s¤Î", player_name));
}
/* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¡¢Ì¾¤Î¤¢¤ë¥¢¥¤¥Æ¥à¤Î̾Á°¤òÉղ乤ë */
- if (known) {
+ if (known)
+ {
/* ¥é¥ó¥À¥à¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È */
if (o_ptr->art_name)
- { char temp[256];
+ {
+ char temp[256];
strcpy(temp, quark_str(o_ptr->art_name));
/* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
/* ±Ñ¸ìÈǤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤«¤éÍ褿 'of XXX' ¤Ï,¡ÖXXX¤Î¡×¤Èɽ¼¨¤¹¤ë */
- if ( strncmp( temp , "of ",3)==0 ) {t=object_desc_str(t,&temp[3]);t=object_desc_str(t,"¤Î");}
- else
- if ( strncmp( temp , "¡Ø" , 2 ) != 0 && temp[0]!='\'')
- t=object_desc_str(t, temp);
+ if (strncmp(temp, "of ", 3) == 0)
+ {
+ t = object_desc_str(t, &temp[3]);
+ t = object_desc_str(t, "¤Î");
+ }
+ else if ((strncmp(temp, "¡Ø", 2) != 0) && (temp[0] != '\''))
+ t = object_desc_str(t, temp);
}
/* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à */
- else if (o_ptr->name1 && !have_flag(flgs, TR_FULL_NAME)) {
+ else if (o_ptr->name1 && !have_flag(flgs, TR_FULL_NAME))
+ {
artifact_type *a_ptr = &a_info[o_ptr->name1];
/* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
- if ( strncmp( (a_name + a_ptr->name), "¡Ø" , 2) != 0){
- t=object_desc_str(t, (a_name + a_ptr->name));
+ if (strncmp(a_name + a_ptr->name, "¡Ø", 2) != 0)
+ {
+ t = object_desc_str(t, a_name + a_ptr->name);
}
}
/* ̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à */
- else if (o_ptr->name2) {
+ else if (o_ptr->name2)
+ {
ego_item_type *e_ptr = &e_info[o_ptr->name2];
- t=object_desc_str(t, (e_name + e_ptr->name));
+ t = object_desc_str(t, e_name + e_ptr->name);
}
}
#endif
if (*s == '~')
{
/* Add a plural if needed */
- if (pref && o_ptr->number != 1)
+ if (pref && (o_ptr->number != 1))
{
char k = t[-1];
/* Modifier */
else if (*s == '#')
#endif
-
{
/* Insert the modifier */
for (u = modstr; *u; u++) *t++ = *u;
#ifdef JP
else if (*s == '%')
- /* saigo ¤ÎÂå¤ï¤ê¡£¸úǽ¤òÉÕ²½¤¹¤ë by ita*/
+ /* saigo ¤ÎÂå¤ï¤ê¡£¸úǽ¤òÉղ乤ë by ita */
{
- modstr=get_object_name(o_ptr);
- for (u = modstr; *u; u++) *t++ = *u;
+ modstr = get_object_name(o_ptr);
+ for (u = modstr; *u; u++) *t++ = *u;
}
#endif
/* Normal */
#ifdef JP
/* '¡Ø'¤«¤é»Ï¤Þ¤ëÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ¸å¤ËÉղ乤ë */
- if (known) {
+ if (known)
+ {
/* ¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î̾Á°¤Ï¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ËµÏ¿
¤µ¤ì¤ë¤Î¤Ç¡¢±Ñ¸ìÈǤÎ̾Á°¤â¤½¤ì¤é¤·¤¯ÊÑ´¹¤¹¤ë */
if (o_ptr->art_name)
- { char temp[256];int itemp;
+ {
+ char temp[256];
+ int itemp;
strcpy(temp, quark_str(o_ptr->art_name));
- /* MEGA HACK by ita*/
- if ( strncmp( temp , "¡Ø" , 2 ) == 0 ) t=object_desc_str(t, temp);else
- if( temp[0]=='\'' ) { itemp=strlen(temp);temp[itemp-1]=0;
- t=object_desc_str(t,"¡Ø");
- t=object_desc_str(t,&temp[1]);
- t=object_desc_str(t,"¡Ù");}
-
+ /* MEGA HACK by ita */
+ if (strncmp(temp, "¡Ø", 2) == 0) t = object_desc_str(t, temp);
+ else if (temp[0] == '\'')
+ {
+ itemp = strlen(temp);
+ temp[itemp - 1] = 0;
+ t = object_desc_str(t, "¡Ø");
+ t = object_desc_str(t, &temp[1]);
+ t = object_desc_str(t, "¡Ù");
+ }
}
- else if (o_ptr->name1) {
- artifact_type *a_ptr = &a_info[o_ptr->name1];
- if ( strncmp( (a_name + a_ptr->name) , "¡Ø" , 2 ) == 0 ){
- t=object_desc_str(t, (a_name + a_ptr->name));
- }
+ else if (o_ptr->name1)
+ {
+ artifact_type *a_ptr = &a_info[o_ptr->name1];
+ if (strncmp(a_name + a_ptr->name, "¡Ø", 2) == 0)
+ {
+ t = object_desc_str(t, a_name + a_ptr->name);
+ }
}
else if (o_ptr->inscription)
{
cptr str = strchr(quark_str(o_ptr->inscription), '#');
/* Add the false name */
- t=object_desc_str(t,"¡Ø");
+ t = object_desc_str(t,"¡Ø");
t = object_desc_str(t, &str[1]);
- t=object_desc_str(t,"¡Ù");
+ t = object_desc_str(t,"¡Ù");
}
}
}
if (o_ptr->art_name)
{
t = object_desc_chr(t, ' ');
-
t = object_desc_str(t, quark_str(o_ptr->art_name));
}
artifact_type *a_ptr = &a_info[o_ptr->name1];
t = object_desc_chr(t, ' ');
- t = object_desc_str(t, (a_name + a_ptr->name));
+ t = object_desc_str(t, a_name + a_ptr->name);
}
/* Grab any ego-item name */
ego_item_type *e_ptr = &e_info[o_ptr->name2];
t = object_desc_chr(t, ' ');
- t = object_desc_str(t, (e_name + e_ptr->name));
+ t = object_desc_str(t, e_name + e_ptr->name);
}
if (o_ptr->inscription && strchr(quark_str(o_ptr->inscription), '#'))
#endif
-
/* No more details wanted */
if (mode < 1) goto copyback;
else if (!o_ptr->pval)
{
#ifdef JP
-t = object_desc_str(t, "(¶õ)");
+ t = object_desc_str(t, "(¶õ)");
#else
t = object_desc_str(t, " (empty)");
#endif
-
}
/* May be "disarmed" */
if (chest_traps[0 - o_ptr->pval])
{
#ifdef JP
-t = object_desc_str(t, "(²ò½üºÑ)");
+ t = object_desc_str(t, "(²ò½üºÑ)");
#else
t = object_desc_str(t, " (disarmed)");
#endif
-
}
else
{
#ifdef JP
-t = object_desc_str(t, "(Èó»Ü¾û)");
+ t = object_desc_str(t, "(Èó»Ü¾û)");
#else
t = object_desc_str(t, " (unlocked)");
#endif
-
}
}
case 0:
{
#ifdef JP
-t = object_desc_str(t, "(»Ü¾û)");
+ t = object_desc_str(t, "(»Ü¾û)");
#else
t = object_desc_str(t, " (Locked)");
#endif
-
break;
}
case CHEST_LOSE_STR:
{
#ifdef JP
-t = object_desc_str(t, "(ÆÇ¿Ë)");
+ t = object_desc_str(t, "(ÆÇ¿Ë)");
#else
t = object_desc_str(t, " (Poison Needle)");
#endif
-
break;
}
case CHEST_LOSE_CON:
{
#ifdef JP
-t = object_desc_str(t, "(ÆÇ¿Ë)");
+ t = object_desc_str(t, "(ÆÇ¿Ë)");
#else
t = object_desc_str(t, " (Poison Needle)");
#endif
-
break;
}
case CHEST_POISON:
{
#ifdef JP
-t = object_desc_str(t, "(¥¬¥¹¡¦¥È¥é¥Ã¥×)");
+ t = object_desc_str(t, "(¥¬¥¹¡¦¥È¥é¥Ã¥×)");
#else
t = object_desc_str(t, " (Gas Trap)");
#endif
-
break;
}
case CHEST_PARALYZE:
{
#ifdef JP
-t = object_desc_str(t, "(¥¬¥¹¡¦¥È¥é¥Ã¥×)");
+ t = object_desc_str(t, "(¥¬¥¹¡¦¥È¥é¥Ã¥×)");
#else
t = object_desc_str(t, " (Gas Trap)");
#endif
-
break;
}
case CHEST_EXPLODE:
{
#ifdef JP
-t = object_desc_str(t, "(ÇúȯÁõÃÖ)");
+ t = object_desc_str(t, "(ÇúȯÁõÃÖ)");
#else
t = object_desc_str(t, " (Explosion Device)");
#endif
-
break;
}
case CHEST_SUMMON:
case CHEST_H_SUMMON:
{
#ifdef JP
-t = object_desc_str(t, "(¾¤´¤Î¥ë¡¼¥ó)");
+ t = object_desc_str(t, "(¾¤´¤Î¥ë¡¼¥ó)");
#else
t = object_desc_str(t, " (Summoning Runes)");
#endif
-
break;
}
case CHEST_RUNES_OF_EVIL:
{
#ifdef JP
-t = object_desc_str(t, "(¼Ù°¤Ê¥ë¡¼¥ó)");
+ t = object_desc_str(t, "(¼Ù°¤Ê¥ë¡¼¥ó)");
#else
t = object_desc_str(t, " (Gleaming Black Runes)");
#endif
-
break;
}
case CHEST_ALARM:
{
#ifdef JP
-t = object_desc_str(t, "(·ÙÊóÁõÃÖ)");
+ t = object_desc_str(t, "(·ÙÊóÁõÃÖ)");
#else
t = object_desc_str(t, " (Alarm)");
#endif
-
break;
}
default:
{
#ifdef JP
-t = object_desc_str(t, "(¥Þ¥ë¥Á¡¦¥È¥é¥Ã¥×)");
+ t = object_desc_str(t, "(¥Þ¥ë¥Á¡¦¥È¥é¥Ã¥×)");
#else
t = object_desc_str(t, " (Multiple Traps)");
#endif
-
break;
}
}
bow_ptr = &inventory[INVEN_BOW];
- /* if have a firing weapon + ammo matches bow*/
- if (bow_ptr->k_idx &&
- (((bow_ptr->sval == SV_SLING) && (o_ptr->tval == TV_SHOT)) ||
- (((bow_ptr->sval == SV_SHORT_BOW) ||
- (bow_ptr->sval == SV_LONG_BOW) ||
- (bow_ptr->sval == SV_NAMAKE_BOW)) && (o_ptr->tval == TV_ARROW)) ||
- (((bow_ptr->sval == SV_LIGHT_XBOW) ||
- (bow_ptr->sval == SV_HEAVY_XBOW)) && (o_ptr->tval == TV_BOLT))))
+ /* If have a firing weapon + ammo matches bow */
+ if (bow_ptr->k_idx && (o_ptr->tval == p_ptr->tval_ammo))
{
- int avgdam = 10;
- int tmul;
- s16b energy_fire;
+ int avgdam = o_ptr->dd * (o_ptr->ds + 1) * 10 / 2;
+ int tmul = bow_tmul(bow_ptr->sval);
+ s16b energy_fire = bow_energy(bow_ptr->sval);
- avgdam = o_ptr->dd * (o_ptr->ds + 1) * 10 / 2;
+ /* See if the bow is "known" - then set damage bonus */
+ if (object_known_p(bow_ptr)) avgdam += (bow_ptr->to_d * 10);
- /* See if the bow is "known" - then set damage bonus*/
- if (object_known_p(bow_ptr))
- {
- avgdam += (bow_ptr->to_d * 10);
- }
-
- /* effect of ammo */
+ /* Effect of ammo */
if (known) avgdam += (o_ptr->to_d * 10);
- energy_fire = bow_energy(bow_ptr->sval);
- tmul = bow_tmul(bow_ptr->sval);
-
/* Get extra "power" from "extra might" */
if (p_ptr->xtra_might) tmul++;
tmul = tmul * (100 + (int)(adj_str_td[p_ptr->stat_ind[A_STR]]) - 128);
- /* launcher multiplier */
+ /* Launcher multiplier */
avgdam *= tmul;
avgdam /= (100 * 10);
if (avgdam < 0) avgdam = 0;
- /* display (shot damage/ avg damage) */
+ /* Display (shot damage/ avg damage) */
t = object_desc_chr(t, ' ');
t = object_desc_chr(t, p1);
t = object_desc_num(t, avgdam);
}
else
{
- /* calc effects of energy */
+ /* Calc effects of energy */
avgdam *= (p_ptr->num_fire * 100);
-
avgdam /= energy_fire;
-
t = object_desc_num(t, avgdam);
}
}
else if ((p_ptr->pclass == CLASS_NINJA) && (o_ptr->tval == TV_SPIKE))
{
- int avgdam;
- s16b energy_fire;
-
- if (p_ptr->mighty_throw)
- avgdam = 1 + 3;
- else
- avgdam = 1;
- avgdam += ((p_ptr->lev+30)*(p_ptr->lev+30)-900)/55;
+ int avgdam = p_ptr->mighty_throw ? (1 + 3) : 1;
+ s16b energy_fire = 100 - p_ptr->lev;
- energy_fire = 100 - p_ptr->lev;
+ avgdam += ((p_ptr->lev + 30) * (p_ptr->lev + 30) - 900) / 55;
- /* display (shot damage/ avg damage) */
+ /* Display (shot damage/ avg damage) */
t = object_desc_chr(t, ' ');
t = object_desc_chr(t, p1);
t = object_desc_num(t, avgdam);
t = object_desc_chr(t, '/');
- /* calc effects of energy */
+ /* Calc effects of energy */
avgdam = 100 * avgdam / energy_fire;
t = object_desc_num(t, avgdam);
-
t = object_desc_chr(t, p2);
}
-
/* Add the armor bonuses */
if (known)
if (mode < 2) goto copyback;
- /*
- * Hack -- Wands and Staffs have charges. Make certain how many charges
- * a stack of staffs really has is clear. -LM-
- */
- if (known &&
- ((o_ptr->tval == TV_STAFF) ||
- (o_ptr->tval == TV_WAND)))
+ if (known) /* Known item only */
{
- /* Dump " (N charges)" */
- t = object_desc_chr(t, ' ');
- t = object_desc_chr(t, p1);
-
- /* Clear explaination for staffs. */
- if ((o_ptr->tval == TV_STAFF) && (o_ptr->number > 1))
+ /*
+ * Hack -- Wands and Staffs have charges. Make certain how many charges
+ * a stack of staffs really has is clear. -LM-
+ */
+ if (((o_ptr->tval == TV_STAFF) || (o_ptr->tval == TV_WAND)))
{
- t = object_desc_num(t, o_ptr->number);
- t = object_desc_str(t, "x ");
- }
- t = object_desc_num(t, o_ptr->pval);
+ /* Dump " (N charges)" */
+ t = object_desc_chr(t, ' ');
+ t = object_desc_chr(t, p1);
+
+ /* Clear explaination for staffs. */
+ if ((o_ptr->tval == TV_STAFF) && (o_ptr->number > 1))
+ {
+ t = object_desc_num(t, o_ptr->number);
+ t = object_desc_str(t, "x ");
+ }
+ t = object_desc_num(t, o_ptr->pval);
#ifdef JP
- t = object_desc_str(t, "²óʬ");
+ t = object_desc_str(t, "²óʬ");
#else
- t = object_desc_str(t, " charge");
-
- if (o_ptr->pval != 1)
- {
- t = object_desc_chr(t, 's');
- }
+ t = object_desc_str(t, " charge");
+ if (o_ptr->pval != 1) t = object_desc_chr(t, 's');
#endif
-
- t = object_desc_chr(t, p2);
- }
- /* Hack -- Rods have a "charging" indicator. Now that stacks of rods may
- * be in any state of charge or discharge, this now includes a number. -LM-
- */
- else if (known && (o_ptr->tval == TV_ROD))
- {
- /* Hack -- Dump " (# charging)" if relevant */
- if (o_ptr->timeout)
+ t = object_desc_chr(t, p2);
+ }
+ /* Hack -- Rods have a "charging" indicator. Now that stacks of rods may
+ * be in any state of charge or discharge, this now includes a number. -LM-
+ */
+ else if (o_ptr->tval == TV_ROD)
{
- /* Stacks of rods display an exact count of charging rods. */
- if (o_ptr->number > 1)
+ /* Hack -- Dump " (# charging)" if relevant */
+ if (o_ptr->timeout)
{
- /* Paranoia. */
- if (k_ptr->pval == 0) k_ptr->pval = 1;
+ /* Stacks of rods display an exact count of charging rods. */
+ if (o_ptr->number > 1)
+ {
+ /* Paranoia. */
+ if (k_ptr->pval == 0) k_ptr->pval = 1;
- /* Find out how many rods are charging, by dividing
- * current timeout by each rod's maximum timeout.
- * Ensure that any remainder is rounded up. Display
- * very discharged stacks as merely fully discharged.
- */
- power = (o_ptr->timeout + (k_ptr->pval - 1)) / k_ptr->pval;
- if (power > o_ptr->number) power = o_ptr->number;
+ /* Find out how many rods are charging, by dividing
+ * current timeout by each rod's maximum timeout.
+ * Ensure that any remainder is rounded up. Display
+ * very discharged stacks as merely fully discharged.
+ */
+ power = (o_ptr->timeout + (k_ptr->pval - 1)) / k_ptr->pval;
+ if (power > o_ptr->number) power = o_ptr->number;
- /* Display prettily. */
- t = object_desc_str(t, " (");
- t = object_desc_num(t, power);
+ /* Display prettily. */
+ t = object_desc_str(t, " (");
+ t = object_desc_num(t, power);
#ifdef JP
- t = object_desc_str(t, "ËÜ ½¼Å¶Ãæ)");
+ t = object_desc_str(t, "ËÜ ½¼Å¶Ãæ)");
#else
- t = object_desc_str(t, " charging)");
+ t = object_desc_str(t, " charging)");
#endif
+ }
- }
-
- /* "one Rod of Perception (1 charging)" would look tacky. */
- else
- {
+ /* "one Rod of Perception (1 charging)" would look tacky. */
+ else
+ {
#ifdef JP
-t = object_desc_str(t, "(½¼Å¶Ãæ)");
+ t = object_desc_str(t, "(½¼Å¶Ãæ)");
#else
- t = object_desc_str(t, " (charging)");
+ t = object_desc_str(t, " (charging)");
#endif
-
+ }
}
}
- }
- /* Dump "pval" flags for wearable items */
- if (known && (have_pval_flags(flgs)))
- {
- /* Start the display */
- t = object_desc_chr(t, ' ');
- t = object_desc_chr(t, p1);
+ /* Dump "pval" flags for wearable items */
+ if (have_pval_flags(flgs))
+ {
+ /* Start the display */
+ t = object_desc_chr(t, ' ');
+ t = object_desc_chr(t, p1);
- /* Dump the "pval" itself */
- t = object_desc_int(t, o_ptr->pval);
+ /* Dump the "pval" itself */
+ t = object_desc_int(t, o_ptr->pval);
- /* Do not display the "pval" flags */
- if (have_flag(flgs, TR_HIDE_TYPE))
- {
- /* Nothing */
- }
+ /* Do not display the "pval" flags */
+ if (have_flag(flgs, TR_HIDE_TYPE))
+ {
+ /* Nothing */
+ }
- /* Speed */
- else if (have_flag(flgs, TR_SPEED))
- {
- /* Dump " to speed" */
+ /* Speed */
+ else if (have_flag(flgs, TR_SPEED))
+ {
+ /* Dump " to speed" */
#ifdef JP
-t = object_desc_str(t, "²Ã®");
+ t = object_desc_str(t, "²Ã®");
#else
- t = object_desc_str(t, " to speed");
+ t = object_desc_str(t, " to speed");
#endif
+ }
- }
-
- /* Attack speed */
- else if (have_flag(flgs, TR_BLOWS))
- {
- /* Add " attack" */
+ /* Attack speed */
+ else if (have_flag(flgs, TR_BLOWS))
+ {
+ /* Add " attack" */
#ifdef JP
-t = object_desc_str(t, "¹¶·â");
+ t = object_desc_str(t, "¹¶·â");
#else
- t = object_desc_str(t, " attack");
+ t = object_desc_str(t, " attack");
- /* Add "attacks" */
- if (ABS(o_ptr->pval) != 1) t = object_desc_chr(t, 's');
+ /* Add "attacks" */
+ if (ABS(o_ptr->pval) != 1) t = object_desc_chr(t, 's');
#endif
+ }
- }
-
- /* Stealth */
- else if (have_flag(flgs, TR_STEALTH))
- {
- /* Dump " to stealth" */
+ /* Stealth */
+ else if (have_flag(flgs, TR_STEALTH))
+ {
+ /* Dump " to stealth" */
#ifdef JP
-t = object_desc_str(t, "±£Ì©");
+ t = object_desc_str(t, "±£Ì©");
#else
- t = object_desc_str(t, " to stealth");
+ t = object_desc_str(t, " to stealth");
#endif
+ }
- }
-
- /* Search */
- else if (have_flag(flgs, TR_SEARCH))
- {
- /* Dump " to searching" */
+ /* Search */
+ else if (have_flag(flgs, TR_SEARCH))
+ {
+ /* Dump " to searching" */
#ifdef JP
-t = object_desc_str(t, "õº÷");
+ t = object_desc_str(t, "õº÷");
#else
- t = object_desc_str(t, " to searching");
+ t = object_desc_str(t, " to searching");
#endif
+ }
- }
-
- /* Infravision */
- else if (have_flag(flgs, TR_INFRA))
- {
- /* Dump " to infravision" */
+ /* Infravision */
+ else if (have_flag(flgs, TR_INFRA))
+ {
+ /* Dump " to infravision" */
#ifdef JP
-t = object_desc_str(t, "ÀÖ³°Àþ»ëÎÏ");
+ t = object_desc_str(t, "ÀÖ³°Àþ»ëÎÏ");
#else
- t = object_desc_str(t, " to infravision");
+ t = object_desc_str(t, " to infravision");
#endif
+ }
+ /* Finish the display */
+ t = object_desc_chr(t, p2);
}
- /* Tunneling */
- else if (have_flag(flgs, TR_TUNNEL))
+ /* Hack -- Process Lanterns/Torches */
+ if ((o_ptr->tval == TV_LITE) && (!(artifact_p(o_ptr) || (o_ptr->sval == SV_LITE_FEANOR))))
{
- /* Nothing */
- }
-
- /* Finish the display */
- t = object_desc_chr(t, p2);
- }
-
- /* Hack -- Process Lanterns/Torches */
- if (known && (o_ptr->tval == TV_LITE) && (!(artifact_p(o_ptr) || (o_ptr->sval == SV_LITE_FEANOR))))
- {
- /* Hack -- Turns of light for normal lites */
+ /* Hack -- Turns of light for normal lites */
#ifdef JP
-t = object_desc_str(t, "(");
+ t = object_desc_chr(t, '(');
#else
- t = object_desc_str(t, " (with ");
+ t = object_desc_str(t, " (with ");
#endif
- if (o_ptr->name2 == EGO_LITE_LONG) t = object_desc_num(t, o_ptr->xtra4*2);
- else t = object_desc_num(t, o_ptr->xtra4);
+ if (o_ptr->name2 == EGO_LITE_LONG) t = object_desc_num(t, o_ptr->xtra4 * 2);
+ else t = object_desc_num(t, o_ptr->xtra4);
#ifdef JP
-t = object_desc_str(t, "¥¿¡¼¥ó¤Î¼÷Ì¿)");
+ t = object_desc_str(t, "¥¿¡¼¥ó¤Î¼÷Ì¿)");
#else
- t = object_desc_str(t, " turns of light)");
+ t = object_desc_str(t, " turns of light)");
#endif
+ }
- }
-
-
- /* Indicate charging objects, but not rods. */
- if (known && o_ptr->timeout && o_ptr->tval != TV_ROD)
- {
- /* Hack -- Dump " (charging)" if relevant */
+ /* Indicate charging objects, but not rods. */
+ if (o_ptr->timeout && (o_ptr->tval != TV_ROD))
+ {
+ /* Hack -- Dump " (charging)" if relevant */
#ifdef JP
-t = object_desc_str(t, "(½¼Å¶Ãæ)");
+ t = object_desc_str(t, "(½¼Å¶Ãæ)");
#else
- t = object_desc_str(t, " (charging)");
+ t = object_desc_str(t, " (charging)");
#endif
-
+ }
}
}
/* Note "cursed" if the item is known to be cursed */
- else if (cursed_p(o_ptr) && (known || (o_ptr->ident & (IDENT_SENSE))))
+ else if (cursed_p(o_ptr) && (known || (o_ptr->ident & IDENT_SENSE)))
{
#ifdef JP
-strcpy(tmp_val2, "¼ö¤ï¤ì¤Æ¤¤¤ë");
+ strcpy(tmp_val2, "¼ö¤ï¤ì¤Æ¤¤¤ë");
#else
strcpy(tmp_val2, "cursed");
#endif
-
}
-
+
/* Note "unidentified" if the item is unidentified */
- else if ((o_ptr->tval == TV_RING || o_ptr->tval == TV_AMULET
- || o_ptr->tval == TV_LITE || o_ptr->tval == TV_FIGURINE)
- && object_aware_p(o_ptr) && !object_known_p(o_ptr)
- && !((o_ptr->ident)&IDENT_SENSE))
+ else if (((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET)
+ || (o_ptr->tval == TV_LITE) || (o_ptr->tval == TV_FIGURINE))
+ && object_aware_p(o_ptr) && !known
+ && !(o_ptr->ident & IDENT_SENSE))
{
#ifdef JP
-strcpy(tmp_val2, "̤´ÕÄê");
+ strcpy(tmp_val2, "̤´ÕÄê");
#else
strcpy(tmp_val2, "unidentified");
#endif
}
/* Mega-Hack -- note empty wands/staffs */
- else if (!known && (o_ptr->ident & (IDENT_EMPTY)))
+ else if (!known && (o_ptr->ident & IDENT_EMPTY))
{
#ifdef JP
-strcpy(tmp_val2, "¶õ");
+ strcpy(tmp_val2, "¶õ");
#else
strcpy(tmp_val2, "empty");
#endif
-
}
/* Note "tried" if the object has been tested unsuccessfully */
else if (!aware && object_tried_p(o_ptr))
{
#ifdef JP
-strcpy(tmp_val2, "̤ȽÌÀ");
+ strcpy(tmp_val2, "̤ȽÌÀ");
#else
strcpy(tmp_val2, "tried");
#endif
-
}
/* Use the standard inscription if available */
#else
strcat(tmp_val2, "% off");
#endif
-
}
/* Append the inscription, if any */
copyback:
t = tmp_val;
- for (i = 0; i < MAX_NLEN-2; i++)
+ for (i = 0; i < MAX_NLEN - 2; i++)
{
#ifdef JP
- if (iskanji(*(t+i)))
+ if (iskanji(*(t + i)))
{
- *(buf+i) = *(t+i);
+ *(buf + i) = *(t + i);
i++;
}
#endif
- *(buf+i) = *(t+i);
+ *(buf + i) = *(t + i);
}
- if (i == MAX_NLEN-2)
+ if (i == MAX_NLEN - 2)
{
#ifdef JP
- if (iskanji(*(t+i)))
- *(buf+i) = '\0';
+ if (iskanji(*(t + i)))
+ *(buf + i) = '\0';
else
#endif
- *(buf+i) = *(t+i);
+ *(buf + i) = *(t + i);
}
- *(buf+MAX_NLEN-1) = '\0';
+ *(buf + MAX_NLEN - 1) = '\0';
}
-
OSDN Git Service
