table.c の整理。

diff --git a/src/tables.c b/src/tables.c
index 607b797..604dae0 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -2171,151 +2171,66 @@ owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢",       20000,  250,  150,  10,   5,  RACE_HALF_ORC},
                { "¥Õ¥§¥ì¥ó¥®¿Í¥¯¥¢¡¼¥¯",           30000,  250,  150,  10,   5,  RACE_HUMAN},
                { "¸øÀµ¤Ê¤ë(?)¥È¥Ã¥Ô",                     30000,  250,  150,  10,   5,  RACE_ELF},
                { "¥´¥Ö¥ê¥ó¤Î¥Ò¥¹¥È¡¼¥¢",       20000,  250,  150,  10,   5,  RACE_HALF_ORC},
                { "¥Õ¥§¥ì¥ó¥®¿Í¥¯¥¢¡¼¥¯",           30000,  250,  150,  10,   5,  RACE_HUMAN},
                { "¸øÀµ¤Ê¤ë(?)¥È¥Ã¥Ô",                     30000,  250,  150,  10,   5,  RACE_ELF},

+               { "»à¿Í¥ô¥¡¥Ã¥µ",             20000,  250, 150, 10,  5, RACE_ZOMBIE},
+               { "΢ÀÚ¤ê¼Ô¥«¥¤¥ó",          20000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "¥Ö¥Ü¥Ë¥«¥¹",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
+               { "¥³¡¼¥×¥¹¥é¥¤¥È",           30000,  250, 150, 10,  5, RACE_SPECTRE},
+               { "·ì¤Ëµ²¤¨¤·¥Ñ¥ê¥Ã¥·¥å",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "¥ô¥¡¥¤¥ë",          20000,  250, 150, 10,  5, RACE_SKELETON},
+               { "¿®Íê¤Î¥×¥ì¥ó¥Æ¥£¥¹",          30000,  250, 150, 10,  5, RACE_SKELETON},
+               { "¿Í´Ö»¦¤·¤Î¥°¥ê¥¨¥é",           30000,  250, 150, 10,  5, RACE_IMP},
+               { "¥¨¥ó¥¸¥§¥ë",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "¿åËĤì¥Õ¥í¥Ä¥¡¥à",          20000,  250, 150, 10,  5, RACE_ZOMBIE},
+               { "¥Ë¡¼¥ô¥¡¥ë",          30000,  250, 150, 10,  5, RACE_VAMPIRE},
+               { "ÌÀ¤ë¤¤¥¢¥Ê¥¹¥¿¥·¥¢",           30000,  250, 150, 10,  5, RACE_SPECTRE},
+               { "»àÎî½Ñ»Õ¥Á¥ã¥ê¥Æ¥£¡¼", 20000,  250, 150, 10,  5, RACE_DARK_ELF},
+               { "¥Ü¥¯¥µ¡¼¤Î¥×¥°¥Ê¥·¥ª¥¹",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
+               { "¹¬±¿¤Ê¥Õ¥Ã¥È¥½¥¢",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
+               { "¸÷»Ø¤Î¥·¥É¥ê¥¢",           30000,  250, 150, 10,  5, RACE_HUMAN},
+               { "¼êÉʻեꥢ¥½¡¼",                 20000,  250, 150, 10,  5, RACE_HOBBIT},
+               { "¤ä¤ê¤¯¤ê¾å¼ê¤Î¥¸¥ã¥Ê¥Ã¥«",          20000,  250, 150, 10,  5, RACE_GNOME},
+               { "°­ÅÞ¥·¡¼¥Ê",          30000,  250, 150, 10,  5, RACE_GNOME},
+               { "ÂçÄÞ¥¢¥ë¥Ë¥Ã¥­",           30000,  250, 150, 10,  5, RACE_DRACONIAN},
+               { "ÉÏ˳¥Á¥ã¥¨¥¢¥ó¥É",                 20000,  250, 150, 10,  5, RACE_HUMAN},
+               { "»³Â±¥¢¥Õ¥¡¡¼¥É¡¼¥Õ",          20000,  250, 150, 10,  5, RACE_BARBARIAN},
+               { "¶¯Íߥ饶¥¯¥¹¥ë",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},
+               { "¥Õ¥¡¥é¥ì¥¦¥£¥ó",           30000,  250, 150, 10,  5, RACE_SPRITE},
+               { "¤·¤ï¤·¤ï¥ô¥©¥¹¡¼¥ë",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},
+               { "¥Ï¥ó¥µ¥à¤Ê¥¢¥é¥ª¡¼¥É",          20000,  250, 150, 10,  5, RACE_AMBERITE},
+               { "É餱¸¤¥»¥é¥É¥Õ¥ê¥É",          30000,  250, 150, 10,  5, RACE_HUMAN},
+               { "ÊÒ­¤Î¥¨¥ë¡¼¥í",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},

 #else
                { "Gary Gygaz",                 20000,  250, 150, 10,  5, RACE_HALF_TROLL},
                { "Histor the Goblin",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
                { "Quark the Ferengi",          30000,  250, 150, 10,  5, RACE_DWARF},
                { "Topi the Fair(?)",           30000,  250, 150, 10,  5, RACE_HUMAN},
 #else
                { "Gary Gygaz",                 20000,  250, 150, 10,  5, RACE_HALF_TROLL},
                { "Histor the Goblin",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
                { "Quark the Ferengi",          30000,  250, 150, 10,  5, RACE_DWARF},
                { "Topi the Fair(?)",           30000,  250, 150, 10,  5, RACE_HUMAN},

-#endif
-
-#ifdef JP
-{ "»à¿Í¥ô¥¡¥Ã¥µ",             20000,  250, 150, 10,  5, RACE_ZOMBIE},
-#else

                { "Vhassa the Dead",             20000,  250, 150, 10,  5, RACE_ZOMBIE},
                { "Vhassa the Dead",             20000,  250, 150, 10,  5, RACE_ZOMBIE},

-#endif
-#ifdef JP
-{ "΢ÀÚ¤ê¼Ô¥«¥¤¥ó",          20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else

                { "Kyn the Treacherous",          20000,  250, 150, 10,  5, RACE_VAMPIRE},
                { "Kyn the Treacherous",          20000,  250, 150, 10,  5, RACE_VAMPIRE},

-#endif
-#ifdef JP
-{ "¥Ö¥Ü¥Ë¥«¥¹",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
-#else

                { "Bubonicus",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
                { "Bubonicus",          30000,  250, 150, 10,  5, RACE_BEASTMAN},

-#endif
-#ifdef JP
-{ "¥³¡¼¥×¥¹¥é¥¤¥È",           30000,  250, 150, 10,  5, RACE_SPECTRE},
-#else

                { "Corpselight",           30000,  250, 150, 10,  5, RACE_SPECTRE},
                { "Corpselight",           30000,  250, 150, 10,  5, RACE_SPECTRE},

-#endif
-#ifdef JP
-{ "·ì¤Ëµ²¤¨¤·¥Ñ¥ê¥Ã¥·¥å",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else

                { "Parrish the Bloodthirsty",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
                { "Parrish the Bloodthirsty",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},

-#endif
-#ifdef JP
-{ "¥ô¥¡¥¤¥ë",          20000,  250, 150, 10,  5, RACE_SKELETON},
-#else

                { "Vile",          20000,  250, 150, 10,  5, RACE_SKELETON},
                { "Vile",          20000,  250, 150, 10,  5, RACE_SKELETON},

-#endif
-#ifdef JP
-{ "¿®Íê¤Î¥×¥ì¥ó¥Æ¥£¥¹",          30000,  250, 150, 10,  5, RACE_SKELETON},
-#else

                { "Prentice the Trusted",          30000,  250, 150, 10,  5, RACE_SKELETON},
                { "Prentice the Trusted",          30000,  250, 150, 10,  5, RACE_SKELETON},

-#endif
-#ifdef JP
-{ "¿Í´Ö»¦¤·¤Î¥°¥ê¥¨¥é",           30000,  250, 150, 10,  5, RACE_IMP},
-#else

                { "Griella Humanslayer",           30000,  250, 150, 10,  5, RACE_IMP},
                { "Griella Humanslayer",           30000,  250, 150, 10,  5, RACE_IMP},

-#endif
-#ifdef JP
-{ "¥¨¥ó¥¸¥§¥ë",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else

                { "Angel",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},
                { "Angel",                 20000,  250, 150, 10,  5, RACE_VAMPIRE},

-#endif
-#ifdef JP
-{ "¿åËĤì¥Õ¥í¥Ä¥¡¥à",          20000,  250, 150, 10,  5, RACE_ZOMBIE},
-#else

                { "Flotsam the Bloated",          20000,  250, 150, 10,  5, RACE_ZOMBIE},
                { "Flotsam the Bloated",          20000,  250, 150, 10,  5, RACE_ZOMBIE},

-#endif
-#ifdef JP
-{ "¥Ë¡¼¥ô¥¡¥ë",          30000,  250, 150, 10,  5, RACE_VAMPIRE},
-#else

                { "Nieval",          30000,  250, 150, 10,  5, RACE_VAMPIRE},
                { "Nieval",          30000,  250, 150, 10,  5, RACE_VAMPIRE},

-#endif
-#ifdef JP
-{ "ÌÀ¤ë¤¤¥¢¥Ê¥¹¥¿¥·¥¢",           30000,  250, 150, 10,  5, RACE_SPECTRE},
-#else

                { "Anastasia the Luminous",           30000,  250, 150, 10,  5, RACE_SPECTRE},
                { "Anastasia the Luminous",           30000,  250, 150, 10,  5, RACE_SPECTRE},

-#endif
-#ifdef JP
-{ "»àÎî½Ñ»Õ¥Á¥ã¥ê¥Æ¥£¡¼", 20000,  250, 150, 10,  5, RACE_DARK_ELF},
-#else

                { "Charity the Necromancer", 20000,  250, 150, 10,  5, RACE_DARK_ELF},
                { "Charity the Necromancer", 20000,  250, 150, 10,  5, RACE_DARK_ELF},

-#endif
-#ifdef JP
-{ "¥Ü¥¯¥µ¡¼¤Î¥×¥°¥Ê¥·¥ª¥¹",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
-#else

                { "Pugnacious the Pugilist",          20000,  250, 150, 10,  5, RACE_HALF_ORC},
                { "Pugnacious the Pugilist",          20000,  250, 150, 10,  5, RACE_HALF_ORC},

-#endif
-#ifdef JP
-{ "¹¬±¿¤Ê¥Õ¥Ã¥È¥½¥¢",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
-#else

                { "Footsore the Lucky",          30000,  250, 150, 10,  5, RACE_BEASTMAN},
                { "Footsore the Lucky",          30000,  250, 150, 10,  5, RACE_BEASTMAN},

-#endif
-#ifdef JP
-{ "¸÷»Ø¤Î¥·¥É¥ê¥¢",           30000,  250, 150, 10,  5, RACE_HUMAN},
-#else

                { "Sidria Lighfingered",           30000,  250, 150, 10,  5, RACE_HUMAN},
                { "Sidria Lighfingered",           30000,  250, 150, 10,  5, RACE_HUMAN},

-#endif
-#ifdef JP
-{ "¼êÉʻեꥢ¥½¡¼",                 20000,  250, 150, 10,  5, RACE_HOBBIT},
-#else

                { "Riatho the Juggler",                 20000,  250, 150, 10,  5, RACE_HOBBIT},
                { "Riatho the Juggler",                 20000,  250, 150, 10,  5, RACE_HOBBIT},

-#endif
-#ifdef JP
-{ "¤ä¤ê¤¯¤ê¾å¼ê¤Î¥¸¥ã¥Ê¥Ã¥«",          20000,  250, 150, 10,  5, RACE_GNOME},
-#else

                { "Janaaka the Shifty",          20000,  250, 150, 10,  5, RACE_GNOME},
                { "Janaaka the Shifty",          20000,  250, 150, 10,  5, RACE_GNOME},

-#endif
-#ifdef JP
-{ "°­ÅÞ¥·¡¼¥Ê",          30000,  250, 150, 10,  5, RACE_GNOME},
-#else

                { "Cina the Rogue",          30000,  250, 150, 10,  5, RACE_GNOME},
                { "Cina the Rogue",          30000,  250, 150, 10,  5, RACE_GNOME},

-#endif
-#ifdef JP
-{ "ÂçÄÞ¥¢¥ë¥Ë¥Ã¥­",           30000,  250, 150, 10,  5, RACE_DRACONIAN},
-#else

                { "Arunikki Greatclaw",           30000,  250, 150, 10,  5, RACE_DRACONIAN},
                { "Arunikki Greatclaw",           30000,  250, 150, 10,  5, RACE_DRACONIAN},

-#endif
-#ifdef JP
-{ "ÉÏ˳¥Á¥ã¥¨¥¢¥ó¥É",                 20000,  250, 150, 10,  5, RACE_HUMAN},
-#else

                { "Chaeand the Poor",                 20000,  250, 150, 10,  5, RACE_HUMAN},
                { "Chaeand the Poor",                 20000,  250, 150, 10,  5, RACE_HUMAN},

-#endif
-#ifdef JP
-{ "»³Â±¥¢¥Õ¥¡¡¼¥É¡¼¥Õ",          20000,  250, 150, 10,  5, RACE_BARBARIAN},
-#else

                { "Afardorf the Brigand",          20000,  250, 150, 10,  5, RACE_BARBARIAN},
                { "Afardorf the Brigand",          20000,  250, 150, 10,  5, RACE_BARBARIAN},

-#endif
-#ifdef JP
-{ "¶¯Íߥ饶¥¯¥¹¥ë",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},
-#else

                { "Lathaxl the Greedy",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},
                { "Lathaxl the Greedy",          30000,  250, 150, 10,  5, RACE_MIND_FLAYER},

-#endif
-#ifdef JP
-{ "¥Õ¥¡¥é¥ì¥¦¥£¥ó",           30000,  250, 150, 10,  5, RACE_SPRITE},
-#else

                { "Falarewyn",           30000,  250, 150, 10,  5, RACE_SPRITE},
                { "Falarewyn",           30000,  250, 150, 10,  5, RACE_SPRITE},

-#endif
-#ifdef JP
-{ "¤·¤ï¤·¤ï¥ô¥©¥¹¡¼¥ë",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},
-#else

                { "Vosur the Wrinkled",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},
                { "Vosur the Wrinkled",                 20000,  250, 150, 10,  5, RACE_NIBELUNG},

-#endif
-#ifdef JP
-{ "¥Ï¥ó¥µ¥à¤Ê¥¢¥é¥ª¡¼¥É",          20000,  250, 150, 10,  5, RACE_AMBERITE},
-#else

                { "Araord the Handsome",          20000,  250, 150, 10,  5, RACE_AMBERITE},
                { "Araord the Handsome",          20000,  250, 150, 10,  5, RACE_AMBERITE},

-#endif
-#ifdef JP
-{ "É餱¸¤¥»¥é¥É¥Õ¥ê¥É",          30000,  250, 150, 10,  5, RACE_HUMAN},
-#else

                { "Theradfrid the Loser",          30000,  250, 150, 10,  5, RACE_HUMAN},
                { "Theradfrid the Loser",          30000,  250, 150, 10,  5, RACE_HUMAN},

-#endif
-#ifdef JP
-{ "ÊÒ­¤Î¥¨¥ë¡¼¥í",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},
-#else

                { "One-Legged Eroolo",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},
 #endif
        },
                { "One-Legged Eroolo",           30000,  250, 150, 10,  5, RACE_HALF_OGRE},
 #endif
        },