OSDN Git Service

アイテムのスポイラー出力に関する変更.
authornothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Tue, 6 Jan 2004 06:24:50 +0000 (06:24 +0000)
committernothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Tue, 6 Jan 2004 06:24:50 +0000 (06:24 +0000)
* 分類されないアイテムは "くさび" と表示せず "その他" と表示するよう
  に変更.
* 光源は独立カテゴリとした.
* 羊皮紙を独立カテゴリではなく "その他" に移転.
* グループ出力順序を一部変更.
* 2byteの括弧は1byteに直した.
* グループに表示可能なアイテムがない場合はグループ名を表示しないよう
  に修正.

src/wizard1.c

index 6fbce43..194284a 100644 (file)
@@ -101,7 +101,7 @@ typedef struct
 static grouper group_item[] =
 {
 #ifdef JP
-{ TV_SHOT,          "¼Í·âʪ" },
+       { TV_SHOT,          "¼Í·âʪ" },
 #else
        { TV_SHOT,          "Ammo" },
 #endif
@@ -110,24 +110,23 @@ static grouper group_item[] =
        { TV_BOLT,          NULL },
 
 #ifdef JP
-{ TV_BOW,           "µÝ" },
+       { TV_BOW,           "µÝ" },
 #else
        { TV_BOW,           "Bows" },
 #endif
 
-
 #ifdef JP
-{ TV_SWORD,         "Éð´ï" },
+       { TV_DIGGING,       "Éð´ï" },
 #else
-       { TV_SWORD,         "Weapons" },
+       { TV_DIGGING,       "Weapons" },
 #endif
 
        { TV_POLEARM,       NULL },
        { TV_HAFTED,        NULL },
-       { TV_DIGGING,       NULL },
+       { TV_SWORD,         NULL },
 
 #ifdef JP
-{ TV_SOFT_ARMOR,    "Ëɶñ¡ÊÂΡË" },
+       { TV_SOFT_ARMOR,    "Ëɶñ (ÂÎ)" },
 #else
        { TV_SOFT_ARMOR,    "Armour (Body)" },
 #endif
@@ -136,61 +135,60 @@ static grouper group_item[] =
        { TV_DRAG_ARMOR,    NULL },
 
 #ifdef JP
-{ TV_CLOAK,         "Ëɶñ¡Ê¤½¤Î¾¡Ë" },
+       { TV_BOOTS,         "Ëɶñ (¤½¤Î¾)" },
 #else
-       { TV_CLOAK,         "Armour (Misc)" },
+       { TV_BOOTS,         "Armour (Misc)" },
 #endif
 
-       { TV_SHIELD,        NULL },
+       { TV_GLOVES,        NULL },
        { TV_HELM,          NULL },
        { TV_CROWN,         NULL },
-       { TV_GLOVES,        NULL },
-       { TV_BOOTS,         NULL },
+       { TV_SHIELD,        NULL },
+       { TV_CLOAK,         NULL },
 
 #ifdef JP
-{ TV_AMULET,        "¥¢¥ß¥å¥ì¥Ã¥È" },
-{ TV_RING,          "»ØÎØ" },
+       { TV_LITE,          "¸÷¸»" },
+       { TV_AMULET,        "¥¢¥ß¥å¥ì¥Ã¥È" },
+       { TV_RING,          "»ØÎØ" },
 #else
+       { TV_LITE,          "Light Sources" },
        { TV_AMULET,        "Amulets" },
        { TV_RING,          "Rings" },
 #endif
 
-
 #ifdef JP
-{ TV_SCROLL,        "´¬Êª" },
-{ TV_POTION,        "Ìô" },
-{ TV_FOOD,          "¿©ÎÁ" },
+       { TV_STAFF,         "¾ó" },
+       { TV_WAND,          "ËâË¡ËÀ" },
+       { TV_ROD,           "¥í¥Ã¥É" },
 #else
-       { TV_SCROLL,        "Scrolls" },
-       { TV_POTION,        "Potions" },
-       { TV_FOOD,          "Food" },
+       { TV_STAFF,         "Staffs" },
+       { TV_WAND,          "Wands" },
+       { TV_ROD,           "Rods" },
 #endif
 
-
 #ifdef JP
-{ TV_ROD,           "¥í¥Ã¥É" },
-{ TV_WAND,          "ËâË¡ËÀ" },
-{ TV_STAFF,         "¾ó" },
+       { TV_SCROLL,        "´¬Êª" },
+       { TV_POTION,        "Ìô" },
+       { TV_FOOD,          "¿©ÎÁ" },
 #else
-       { TV_ROD,           "Rods" },
-       { TV_WAND,          "Wands" },
-       { TV_STAFF,         "Staffs" },
+       { TV_SCROLL,        "Scrolls" },
+       { TV_POTION,        "Potions" },
+       { TV_FOOD,          "Food" },
 #endif
 
-
 #ifdef JP
-{ TV_LIFE_BOOK,     "ËâË¡½ñ¡ÊÀ¸Ì¿¡Ë" },
-{ TV_SORCERY_BOOK,  "ËâË¡½ñ¡ÊÀç½Ñ¡Ë" },
-{ TV_NATURE_BOOK,   "ËâË¡½ñ¡Ê¼«Á³¡Ë" },
-{ TV_CHAOS_BOOK,    "ËâË¡½ñ¡Ê¥«¥ª¥¹¡Ë" },
-{ TV_DEATH_BOOK,    "ËâË¡½ñ¡Ê°Å¹õ¡Ë" },
-{ TV_TRUMP_BOOK,    "ËâË¡½ñ¡Ê¥È¥é¥ó¥×¡Ë" },
-{ TV_ARCANE_BOOK,   "ËâË¡½ñ¡ÊÈë½Ñ¡Ë" },
-{ TV_CRAFT_BOOK,  "ËâË¡½ñ¡Ê¾¢¡Ë" },
-{ TV_DAEMON_BOOK,   "ËâË¡½ñ¡Ê°­Ëâ¡Ë" },
-{ TV_CRUSADE_BOOK,     "ËâË¡½ñ¡ÊÇ˼١Ë" },
-{ TV_MUSIC_BOOK,    "²Î½¸" },
-{ TV_HISSATSU_BOOK, "Éð·Ý¤Î½ñ" },
+       { TV_LIFE_BOOK,     "ËâË¡½ñ (À¸Ì¿)" },
+       { TV_SORCERY_BOOK,  "ËâË¡½ñ (Àç½Ñ)" },
+       { TV_NATURE_BOOK,   "ËâË¡½ñ (¼«Á³)" },
+       { TV_CHAOS_BOOK,    "ËâË¡½ñ (¥«¥ª¥¹)" },
+       { TV_DEATH_BOOK,    "ËâË¡½ñ (°Å¹õ)" },
+       { TV_TRUMP_BOOK,    "ËâË¡½ñ (¥È¥é¥ó¥×)" },
+       { TV_ARCANE_BOOK,   "ËâË¡½ñ (Èë½Ñ)" },
+       { TV_CRAFT_BOOK,    "ËâË¡½ñ (¾¢)" },
+       { TV_DAEMON_BOOK,   "ËâË¡½ñ (°­Ëâ)" },
+       { TV_CRUSADE_BOOK,  "ËâË¡½ñ (Ç˼Ù)" },
+       { TV_MUSIC_BOOK,    "²Î½¸" },
+       { TV_HISSATSU_BOOK, "Éð·Ý¤Î½ñ" },
 #else
        { TV_LIFE_BOOK,     "Books (Life)" },
        { TV_SORCERY_BOOK,  "Books (Sorcery)" },
@@ -199,58 +197,50 @@ static grouper group_item[] =
        { TV_DEATH_BOOK,    "Books (Death)" },
        { TV_TRUMP_BOOK,    "Books (Trump)" },
        { TV_ARCANE_BOOK,   "Books (Arcane)" },
-       { TV_CRAFT_BOOK,  "Books (Craft)" },
+       { TV_CRAFT_BOOK,    "Books (Craft)" },
        { TV_DAEMON_BOOK,   "Books (Daemon)" },
-       { TV_CRUSADE_BOOK,     "Books (Crusade)" },
+       { TV_CRUSADE_BOOK,  "Books (Crusade)" },
        { TV_MUSIC_BOOK,    "Song Books" },
        { TV_HISSATSU_BOOK, "Books (Kendo)" },
 #endif
 
 #ifdef JP
-{ TV_PARCHMENT,    "ÍÓÈé»æ" },
+       { TV_WHISTLE,       "ū" },
+       { TV_CAPTURE,       "¥­¥ã¥×¥Á¥ã¡¼¡¦¥Ü¡¼¥ë" },
+       { TV_CARD,          "¥¨¥¯¥¹¥×¥ì¥¹¥«¡¼¥É" },
 #else
-{ TV_PARCHMENT,    "Parchment" },
+       { TV_WHISTLE,       "Whistle" },
+       { TV_CAPTURE,       "Capture Ball" },
+       { TV_CARD,          "Express Card" },
 #endif
 
 #ifdef JP
-{ TV_CHEST,         "Ȣ" },
+       { TV_CHEST,         "Ȣ" },
 #else
        { TV_CHEST,         "Chests" },
 #endif
 
 #ifdef JP
-{ TV_CAPTURE,         "¥­¥ã¥×¥Á¥ã¡¼¡¦¥Ü¡¼¥ë" },
+       { TV_FIGURINE,      "¿Í·Á" },
+       { TV_STATUE,        "Áü" },
+       { TV_CORPSE,        "»àÂÎ" },
 #else
-       { TV_CAPTURE,         "Capture Ball" },
-#endif
-
-#ifdef JP
-{ TV_CARD,         "¥¨¥¯¥¹¥×¥ì¥¹¥«¡¼¥É" },
-#else
-       { TV_CARD,         "Express Card" },
-#endif
-
        { TV_FIGURINE,      "Magical Figurines" },
        { TV_STATUE,        "Statues" },
        { TV_CORPSE,        "Corpses" },
-
-#ifdef JP
-{ TV_WHISTLE,         "ū" },
-#else
-       { TV_WHISTLE,         "Whistle" },
 #endif
 
 #ifdef JP
-{ TV_SPIKE,         "¤¯¤µ¤Ó" },
+       { TV_SKELETON,      "¤½¤Î¾" },
 #else
-       { TV_SPIKE,         "Spike" },
+       { TV_SKELETON,      "Misc" },
 #endif
 
-       { TV_LITE,          NULL },
-       { TV_FLASK,         NULL },
-       { TV_JUNK,          NULL },
        { TV_BOTTLE,        NULL },
-       { TV_SKELETON,      NULL },
+       { TV_JUNK,          NULL },
+       { TV_SPIKE,         NULL },
+       { TV_FLASK,         NULL },
+       { TV_PARCHMENT,     NULL },
 
        { 0, "" }
 };
@@ -354,7 +344,7 @@ static void kind_info(char *buf, char *dam, char *wgt, int *lev, s32b *val, int
  */
 static void spoil_obj_desc(cptr fname)
 {
-       int i, k, s, t, n = 0;
+       int i, k, s, t, n = 0, group_start = 0;
 
        u16b who[200];
 
@@ -398,54 +388,59 @@ static void spoil_obj_desc(cptr fname)
                /* Write out the group title */
                if (group_item[i].name)
                {
-                       /* Hack -- bubble-sort by cost and then level */
-                       for (s = 0; s < n - 1; s++)
+                       if (n)
                        {
-                               for (t = 0; t < n - 1; t++)
+                               /* Hack -- bubble-sort by cost and then level */
+                               for (s = 0; s < n - 1; s++)
                                {
-                                       int i1 = t;
-                                       int i2 = t + 1;
+                                       for (t = 0; t < n - 1; t++)
+                                       {
+                                               int i1 = t;
+                                               int i2 = t + 1;
 
-                                       int e1;
-                                       int e2;
+                                               int e1;
+                                               int e2;
 
-                                       s32b t1;
-                                       s32b t2;
+                                               s32b t1;
+                                               s32b t2;
 
-                                       kind_info(NULL, NULL, NULL, &e1, &t1, who[i1]);
-                                       kind_info(NULL, NULL, NULL, &e2, &t2, who[i2]);
+                                               kind_info(NULL, NULL, NULL, &e1, &t1, who[i1]);
+                                               kind_info(NULL, NULL, NULL, &e2, &t2, who[i2]);
 
-                                       if ((t1 > t2) || ((t1 == t2) && (e1 > e2)))
-                                       {
-                                               int tmp = who[i1];
-                                               who[i1] = who[i2];
-                                               who[i2] = tmp;
+                                               if ((t1 > t2) || ((t1 == t2) && (e1 > e2)))
+                                               {
+                                                       int tmp = who[i1];
+                                                       who[i1] = who[i2];
+                                                       who[i2] = tmp;
+                                               }
                                        }
                                }
-                       }
 
-                       /* Spoil each item */
-                       for (s = 0; s < n; s++)
-                       {
-                               int e;
-                               s32b v;
+                               fprintf(fff, "\n\n%s\n\n", group_item[group_start].name);
+
+                               /* Spoil each item */
+                               for (s = 0; s < n; s++)
+                               {
+                                       int e;
+                                       s32b v;
 
-                               /* Describe the kind */
-                               kind_info(buf, dam, wgt, &e, &v, who[s]);
+                                       /* Describe the kind */
+                                       kind_info(buf, dam, wgt, &e, &v, who[s]);
 
-                               /* Dump it */
-                               fprintf(fff, "     %-45s%8s%7s%5d%9ld\n",
-                                       buf, dam, wgt, e, (long)(v));
-                       }
+                                       /* Dump it */
+                                       fprintf(fff, "     %-45s%8s%7s%5d%9ld\n",
+                                               buf, dam, wgt, e, (long)(v));
+                               }
 
-                       /* Start a new set */
-                       n = 0;
+                               /* Start a new set */
+                               n = 0;
+                       }
 
                        /* Notice the end */
                        if (!group_item[i].tval) break;
 
                        /* Start a new set */
-                       fprintf(fff, "\n\n%s\n\n", group_item[i].name);
+                       group_start = i;
                }
 
                /* Acquire legal item types */