-/* File: wizard1.c */
-
-/*
+/*!
+ * @file wizard1.c
+ * @brief ¥¦¥£¥¶¡¼¥É¥â¡¼¥É¤Î½èÍý(¥¹¥Ý¥¤¥é¡¼½ÐÎÏÃæ¿´) / Spoiler generation -BEN-
+ * @date 2014/02/17
+ * @author
* Copyright (c) 1997 Ben Harrison, and others
- *
* This software may be copied and distributed for educational, research,
* and not for profit purposes provided that this copyright and statement
* are included in all such copies. Other copyrights may also apply.
+ * 2013 Deskull rearranged comment for Doxygen.
*/
-/* Purpose: Spoiler generation -BEN- */
-
#include "angband.h"
-/*
+/*!
+ * @brief ¥·¥ó¥Ü¥ë¿¦¤Îµ½Ò̾¤òÊÖ¤¹ /
* Extract a textual representation of an attribute
+ * @param r_ptr ¥â¥ó¥¹¥¿¡¼¼ï²¤Î¹½Â¤ÂΥݥ¤¥ó¥¿
+ * @return ¥·¥ó¥Ü¥ë¿¦¤Îµ½Ò̾
*/
static cptr attr_to_text(monster_race *r_ptr)
{
};
-/*
+/*!
+ * @brief ¥Ù¡¼¥¹¥¢¥¤¥Æ¥à¤Î³Æ¾ðÊó¤òʸ»úÎ󲽤¹¤ë /
* Describe the kind
+ * @param buf ̾¾Î¤òÊÖ¤¹¥Ð¥Ã¥Õ¥¡»²¾È¥Ý¥¤¥ó¥¿
+ * @param dam ¥À¥á¡¼¥¸¥À¥¤¥¹µ½Ò¤òÊÖ¤¹¥Ð¥Ã¥Õ¥¡»²¾È¥Ý¥¤¥ó¥¿
+ * @param wgt ½ÅÎ̵½Ò¤òÊÖ¤¹¥Ð¥Ã¥Õ¥¡»²¾È¥Ý¥¤¥ó¥¿
+ * @param lev À¸À®³¬µ½Ò¤òÊÖ¤¹¥Ð¥Ã¥Õ¥¡»²¾È¥Ý¥¤¥ó¥¿
+ * @param val ²ÁÃͤòÊÖ¤¹¥Ð¥Ã¥Õ¥¡»²¾È¥Ý¥¤¥ó¥¿
+ * @param k ¥Ù¡¼¥¹¥¢¥¤¥Æ¥àID
+ * @return ¤Ê¤·
*/
static void kind_info(char *buf, char *dam, char *wgt, int *lev, s32b *val, int k)
{
}
-/*
+/*!
+ * @brief ³Æ¥Ù¡¼¥¹¥¢¥¤¥Æ¥à¤Î¾ðÊó¤ò°ì¹ÔËè¤Ëµ½Ò¤¹¤ë /
* Create a spoiler file for items
+ * @param fname ¥Õ¥¡¥¤¥ë̾
+ * @return ¤Ê¤·
*/
static void spoil_obj_desc(cptr fname)
{
{ TR_THROW, "ÅêÚ³" },
{ TR_REFLECT, "È¿¼Í" },
{ TR_FREE_ACT, "ËãáãÃΤ餺" },
- { TR_HOLD_LIFE, "À¸Ì¿ÎÏ°Ý»ý" },
+ { TR_HOLD_EXP, "·Ð¸³ÃÍ°Ý»ý" },
#else
{ TR_THROW, "Throwing" },
{ TR_REFLECT, "Reflection" },
{ TR_FREE_ACT, "Free Action" },
- { TR_HOLD_LIFE, "Hold Life" },
+ { TR_HOLD_EXP, "Hold Experience" },
#endif
};
{ TR_SH_COLD, "Î䵤¥ª¡¼¥é" },
{ TR_NO_TELE, "È¿¥Æ¥ì¥Ý¡¼¥È" },
{ TR_NO_MAGIC, "È¿ËâË¡" },
- { TR_LEVITATION, "ÉâÍ·" },
+ { TR_LEVITATION, "ÉâÍ·" },
{ TR_SEE_INVIS, "²Ä»ëÆ©ÌÀ" },
{ TR_TELEPATHY, "¥Æ¥ì¥Ñ¥·¡¼" },
- { TR_ESP_ANIMAL, "ưʪ´¶ÃÎ" },
- { TR_ESP_UNDEAD, "ÉԻശÃÎ" },
- { TR_ESP_DEMON, "°Ëâ´¶ÃÎ" },
- { TR_ESP_ORC, "¥ª¡¼¥¯´¶ÃÎ" },
- { TR_ESP_TROLL, "¥È¥í¥ë´¶ÃÎ" },
- { TR_ESP_GIANT, "µð¿Í´¶ÃÎ" },
- { TR_ESP_DRAGON, "¥É¥é¥´¥ó´¶ÃÎ" },
- { TR_ESP_HUMAN, "¿Í´Ö´¶ÃÎ" },
- { TR_ESP_EVIL, "¼Ù°´¶ÃÎ" },
- { TR_ESP_GOOD, "Á±ÎÉ´¶ÃÎ" },
- { TR_ESP_NONLIVING, "̵À¸Êª´¶ÃÎ" },
- { TR_ESP_UNIQUE, "¥æ¥Ë¡¼¥¯´¶ÃÎ" },
+ { TR_ESP_ANIMAL, "ưʪ´¶ÃÎ" },
+ { TR_ESP_UNDEAD, "ÉԻശÃÎ" },
+ { TR_ESP_DEMON, "°Ëâ´¶ÃÎ" },
+ { TR_ESP_ORC, "¥ª¡¼¥¯´¶ÃÎ" },
+ { TR_ESP_TROLL, "¥È¥í¥ë´¶ÃÎ" },
+ { TR_ESP_GIANT, "µð¿Í´¶ÃÎ" },
+ { TR_ESP_DRAGON, "¥É¥é¥´¥ó´¶ÃÎ" },
+ { TR_ESP_HUMAN, "¿Í´Ö´¶ÃÎ" },
+ { TR_ESP_EVIL, "¼Ù°´¶ÃÎ" },
+ { TR_ESP_GOOD, "Á±ÎÉ´¶ÃÎ" },
+ { TR_ESP_NONLIVING, "̵À¸Êª´¶ÃÎ" },
+ { TR_ESP_UNIQUE, "¥æ¥Ë¡¼¥¯´¶ÃÎ" },
{ TR_SLOW_DIGEST, "Ãپò½" },
{ TR_REGEN, "µÞ®²óÉü" },
{ TR_WARNING, "·Ù¹ð" },
{ TR_LEVITATION, "Levitation" },
{ TR_SEE_INVIS, "See Invisible" },
{ TR_TELEPATHY, "ESP" },
+ { TR_ESP_ANIMAL, "Sense Animal" },
+ { TR_ESP_UNDEAD, "Sense Undead" },
+ { TR_ESP_DEMON, "Sense Demon" },
+ { TR_ESP_ORC, "Sense Orc" },
+ { TR_ESP_TROLL, "Sense Troll" },
+ { TR_ESP_GIANT, "Sense Giant" },
+ { TR_ESP_DRAGON, "Sense Dragon" },
+ { TR_ESP_HUMAN, "Sense Human" },
+ { TR_ESP_EVIL, "Sense Evil" },
+ { TR_ESP_GOOD, "Sense Good" },
+ { TR_ESP_NONLIVING, "Sense Nonliving" },
+ { TR_ESP_UNIQUE, "Sense Unique" },
{ TR_SLOW_DIGEST, "Slow Digestion" },
{ TR_REGEN, "Regeneration" },
{ TR_WARNING, "Warning" },
static void analyze_misc_magic(object_type *o_ptr, cptr *misc_list)
{
u32b flgs[TR_FLAG_SIZE];
+ int rad;
+ char desc[256];
object_flags(o_ptr, flgs);
N_ELEMENTS(misc_flags3_desc));
/*
- * Artifact lights -- large radius light.
- */
- if ((o_ptr->tval == TV_LITE) && object_is_fixed_artifact(o_ptr))
+ * Glowing artifacts -- small radius light.
+ */
+ rad = 0;
+ if (have_flag(flgs, TR_LITE_1)) rad += 1;
+ if (have_flag(flgs, TR_LITE_2)) rad += 2;
+ if (have_flag(flgs, TR_LITE_3)) rad += 3;
+ if (have_flag(flgs, TR_LITE_M1)) rad -= 1;
+ if (have_flag(flgs, TR_LITE_M2)) rad -= 2;
+ if (have_flag(flgs, TR_LITE_M3)) rad -= 3;
+
+ if(o_ptr->name2 == EGO_LITE_SHINE) rad++;
+
+ if (have_flag(flgs, TR_LITE_FUEL))
{
-#ifdef JP
- *misc_list++ = "±Êµ×¸÷¸»(Ⱦ·Â3)";
-#else
- *misc_list++ = "Permanent Light(3)";
-#endif
+ if(rad > 0) sprintf(desc, _("¤½¤ì¤ÏdzÎÁÊäµë¤Ë¤è¤Ã¤ÆÌÀ¤«¤ê(Ⱦ·Â %d)¤ò¼ø¤±¤ë¡£", "It provides light (radius %d) when fueled."), rad);
}
-
- /*
- * Glowing artifacts -- small radius light.
- */
- if (have_flag(flgs, TR_LITE))
+ else
{
-#ifdef JP
- *misc_list++ = "±Êµ×¸÷¸»(Ⱦ·Â1)";
-#else
- *misc_list++ = "Permanent Light(1)";
-#endif
+ if(rad > 0) sprintf(desc, _("±Êµ×¸÷¸»(Ⱦ·Â %d)", "Permanent Light(radius %d)"), rad);
+ if(rad < 0) sprintf(desc, _("±Êµ×¸÷¸»(Ⱦ·Â-%d)¡£", "Permanent Light(radius -%d)"), -rad);
}
+ if(rad != 0) *misc_list++ = quark_str(quark_add(desc));
+
/*
* Handle cursed objects here to avoid redundancies such as noting
* that a permanently cursed object is heavily cursed as well as
{
if (have_flag(flgs, TR_TY_CURSE))
{
-#ifdef JP
- *misc_list++ = "ÂÀ¸Å¤Î±åÇ°";
-#else
- *misc_list++ = "Ancient Curse";
-#endif
+ *misc_list++ = _("ÂÀ¸Å¤Î±åÇ°", "Ancient Curse");
}
if (o_ptr->curse_flags & TRC_PERMA_CURSE)
{
-#ifdef JP
- *misc_list++ = "±Ê±ó¤Î¼ö¤¤";
-#else
- *misc_list++ = "Permanently Cursed";
-#endif
+ *misc_list++ = _("±Ê±ó¤Î¼ö¤¤", "Permanently Cursed");
}
else if (o_ptr->curse_flags & TRC_HEAVY_CURSE)
{
-#ifdef JP
- *misc_list++ = "¶¯ÎϤʼö¤¤";
-#else
- *misc_list++ = "Heavily Cursed";
-#endif
+ *misc_list++ = _("¶¯ÎϤʼö¤¤", "Heavily Cursed");
}
/* else */
else if (o_ptr->curse_flags & TRC_CURSED)
{
-#ifdef JP
- *misc_list++ = "¼ö¤¤";
-#else
- *misc_list++ = "Cursed";
-#endif
+ *misc_list++ = _("¼ö¤¤", "Cursed");
+ }
+ if (have_flag(flgs, TR_ADD_L_CURSE))
+ {
+ *misc_list++ = _("¼ö¤¤¤òÁý¤ä¤¹", "Cursing");
+ }
+ if (have_flag(flgs, TR_ADD_H_CURSE))
+ {
+ *misc_list++ = _("¶¯ÎϤʼö¤¤¤òÁý¤ä¤¹", "Heavily Cursing");
}
}
#ifdef JP
sprintf(misc_desc, "¥ì¥Ù¥ë %u, ´õ¾¯ÅÙ %u, %d.%d kg, ¡ð%ld",
a_ptr->level, a_ptr->rarity,
- lbtokg1(a_ptr->weight), lbtokg2(a_ptr->weight), a_ptr->cost);
+ lbtokg1(a_ptr->weight), lbtokg2(a_ptr->weight), (long int)a_ptr->cost);
#else
sprintf(misc_desc, "Level %u, Rarity %u, %d.%d lbs, %ld Gold",
a_ptr->level, a_ptr->rarity,