X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fflavor.c;h=08b66f3f83851003c3d9e9cd23cb02d231329f19;hb=482ae4755d93e941172deb76a5581a260fb41c09;hp=1b74fbbbae45e1bb0275a96c05c1c2a62ddcd459;hpb=732b4d08c407ba107071a24f6231c005aa37c64b;p=hengband%2Fhengband.git diff --git a/src/flavor.c b/src/flavor.c index 1b74fbbba..08b66f3f8 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -1,387 +1,15 @@ /* Purpose: Object flavor code */ /* - * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke + * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke * - * 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. + * 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. */ #include "angband.h" - -/* - * Hack -- note that "TERM_MULTI" is now just "TERM_VIOLET". - * We will have to find a cleaner method for "MULTI_HUED" later. - * There were only two multi-hued "flavors" (one potion, one food). - * Plus five multi-hued "base-objects" (3 dragon scales, one blade - * of chaos, and one something else). See the SHIMMER_OBJECTS code - * in "dungeon.c" and the object color extractor in "cave.c". - */ -#define TERM_MULTI TERM_VIOLET - - -/* - * Max sizes of the following arrays - */ -#define MAX_ROCKS 59 /* Used with rings (min 38) */ -#define MAX_AMULETS 26 /* Used with amulets (min 14) */ -#define MAX_WOODS 34 /* Used with staffs (min 30) */ -#define MAX_METALS 40 /* Used with wands/rods (min 29/29) */ -#define MAX_COLORS 70 /* Used with potions (min 60) */ -#define MAX_SHROOM 20 /* Used with mushrooms (min 20) */ -#define MAX_TITLES 55 /* Used with scrolls (min 48) */ -#define MAX_SYLLABLES 164 /* Used with scrolls (see below) */ - - -/* - * Rings (adjectives and colors) - */ - -static cptr ring_adj[MAX_ROCKS] = -{ - "Alexandrite", "Amethyst", "Aquamarine", "Azurite", "Beryl", - "Bloodstone", "Calcite", "Carnelian", "Corundum", "Diamond", - "Emerald", "Fluorite", "Garnet", "Granite", "Jade", - "Jasper", "Lapis Lazuli", "Malachite", "Marble", "Moonstone", - "Onyx", "Opal", "Pearl", "Quartz", "Quartzite", - "Rhodonite", "Ruby", "Sapphire", "Tiger Eye", "Topaz", - "Turquoise", "Zircon", "Platinum", "Bronze", "Gold", - "Obsidian", "Silver", "Tortoise Shell", "Mithril", "Jet", - "Engagement", "Adamantite", - "Wire", "Dilithium", "Bone", "Wooden", - "Spikard", "Serpent", "Wedding", "Double", - "Plain", "Brass", "Scarab","Shining", - "Rusty","Transparent", "Steel", "Tanzanite", - "Nephrite", -}; - -#ifdef JP -static cptr J_ring_adj[MAX_ROCKS] = -{ - "¶âÎÐÀФÎ","¥¢¥á¥¸¥¹¥È¤Î","¥¢¥¯¥¢¥Þ¥ê¥ó¤Î","¤á¤Î¤¦¤Î","ÎÐÃìÀФÎ", - "·ì¶Ì¿ï¤Î","Êý²òÀФÎ","ÀÖ¤á¤Î¤¦¤Î","¹Ë¶Ì¤Î","¥À¥¤¥¢¥â¥ó¥É¤Î", - "¥¨¥á¥é¥ë¥É¤Î","¥Û¥¿¥ëÀФÎ","¥¬¡¼¥Í¥Ã¥È¤Î","¸æ±ÆÀФÎ","¤Ò¤¹¤¤¤Î", - "¥¸¥ã¥¹¥Ñ¡¼¤Î","ÀÄÎÜÍþ¤Î","¥¯¥¸¥ã¥¯ÀФÎ","ÂçÍýÀФÎ","¥à¡¼¥ó¥¹¥È¡¼¥ó¤Î", - "¼Ê¤á¤Î¤¦¤Î","¥ª¥Ñ¡¼¥ë¤Î","¿¿¼î¤Î","¿å¾½¤Î","ÀбѴä¤Î", - "¥¶¥¯¥íÀФÎ","¥ë¥Ó¡¼¤Î","¥µ¥Õ¥¡¥¤¥¢¤Î","¥¿¥¤¥¬¡¼¥¢¥¤¤Î","¥È¥Ñ¡¼¥º¤Î", - "¥È¥ë¥³ÀФÎ","¥¸¥ë¥³¥ó¤Î","¥×¥é¥Á¥Ê¤Î","¥Ö¥í¥ó¥º¤Î","¶â¤Î", - "¹õÍËÀФÎ","¶ä¤Î","¤Ù¤Ã¹Ã¤Î","¥ß¥¹¥ê¥ë¤Î","¹õ¶Ì¤Î", - "º§Ìó","¥¢¥À¥Þ¥ó¥¿¥¤¥È¤Î", - "¿Ë¶â¤Î","¥Ç¥£¥ê¥·¥¦¥à¤Î","¹ü¤Î","ÌÚ¤Î", - "¥¹¥Ô¥«¤Î" /*nuke me*/ ,"¼Ø¤Î","·ëº§","Æó½Å¤Î", - "¾þ¤ê¤Î¤Ê¤¤","ÀÄƼ¤Î","¥¹¥«¥é¥Ù¤Î" ,"µ±¤¯", - "»¬¤Ó¤¿","Æ©ÌÀ¤Ê","¹ÝÅ´¤Î","¥¿¥ó¥¶¥Ê¥¤¥È¤Î", - "Æð¶Ì¤Î", -}; -#endif -static byte ring_col[MAX_ROCKS] = -{ - TERM_GREEN, TERM_VIOLET, TERM_L_BLUE, TERM_L_BLUE, TERM_L_GREEN, - TERM_RED, TERM_WHITE, TERM_RED, TERM_SLATE, TERM_WHITE, - TERM_GREEN, TERM_L_GREEN, TERM_RED, TERM_L_DARK, TERM_L_GREEN, - TERM_UMBER, TERM_BLUE, TERM_GREEN, TERM_WHITE, TERM_L_WHITE, - TERM_L_RED, TERM_L_WHITE, TERM_WHITE, TERM_L_WHITE, TERM_L_WHITE, - TERM_L_RED, TERM_RED, TERM_BLUE, TERM_YELLOW, TERM_YELLOW, - TERM_L_BLUE, TERM_L_UMBER, TERM_WHITE, TERM_L_UMBER, TERM_YELLOW, - TERM_L_DARK, TERM_L_WHITE, TERM_GREEN, TERM_L_BLUE, TERM_L_DARK, - TERM_YELLOW, TERM_VIOLET, - TERM_UMBER, TERM_L_WHITE, TERM_WHITE, TERM_UMBER, - TERM_BLUE, TERM_GREEN, TERM_YELLOW, TERM_ORANGE, - TERM_YELLOW, TERM_ORANGE, TERM_L_GREEN, TERM_YELLOW, - TERM_RED, TERM_WHITE, TERM_WHITE, TERM_YELLOW, - TERM_GREEN, -}; - - -/* - * Amulets (adjectives and colors) - */ -static cptr amulet_adj[MAX_AMULETS] = -{ - "Amber", "Driftwood", "Coral", "Agate", "Ivory", - "Obsidian", "Bone", "Brass", "Bronze", "Pewter", - "Tortoise Shell", "Golden", "Azure", "Crystal", "Silver", - "Copper", "Swastika", "Platinum","Runed", "Rusty", - "Curved", "Dragon's claw", "Rosary", "Jade", "Mithril", - "Ruby" -}; - -#ifdef JP -static cptr J_amulet_adj[MAX_AMULETS] = -{ - "àèàá¤Î","ήÌÚ¤Î","¥µ¥ó¥´¤Î","¤á¤Î¤¦¤Î","¾Ý²ç¤Î", - "¹õÍËÀФÎ","¹ü¤Î","¿¿ï«¤Î","ÀÄƼ¤Î","¤·¤í¤á¤Î", - "¤Ù¤Ã¹Ã¤Î","¶â¤Î","ÎÜÍþ¤Î","¿å¾½¤Î","¶ä¤Î", - "Ƽ¤Î","ÒĤÎ", "¥×¥é¥Á¥Ê¤Î", "¥ë¡¼¥ó¤¬¹ï¤Þ¤ì¤¿","»¬¤Ó¤¿", - "¶Ê¤¬¤Ã¤¿", "¥É¥é¥´¥ó¤ÎÄÞ¤Î", "¿ô¼î¤Î", "¤Ò¤¹¤¤¤Î", "¥ß¥¹¥ê¥ë¤Î", - "¥ë¥Ó¡¼¤Î" -}; -#endif -static byte amulet_col[MAX_AMULETS] = -{ - TERM_YELLOW, TERM_L_UMBER, TERM_WHITE, TERM_L_WHITE, TERM_WHITE, - TERM_L_DARK, TERM_WHITE, TERM_L_UMBER, TERM_L_UMBER, TERM_SLATE, - TERM_GREEN, TERM_YELLOW, TERM_L_BLUE, TERM_L_BLUE, TERM_L_WHITE, - TERM_L_UMBER, TERM_VIOLET, TERM_WHITE, TERM_UMBER, TERM_RED, - TERM_GREEN, TERM_L_GREEN, TERM_L_GREEN, TERM_GREEN, TERM_L_BLUE, - TERM_RED -}; - - -/* - * Staffs (adjectives and colors) - */ -static cptr staff_adj[MAX_WOODS] = -{ - "Aspen", "Balsa", "Banyan", "Birch", "Cedar", - "Cottonwood", "Cypress", "Dogwood", "Elm", "Eucalyptus", - "Hemlock", "Hickory", "Ironwood", "Locust", "Mahogany", - "Maple", "Mulberry", "Oak", "Pine", "Redwood", - "Rosewood", "Spruce", "Sycamore", "Teak", "Walnut", - "Mistletoe", "Hawthorn", "Bamboo", "Silver", "Runed", - "Golden", "Ashen", "Ivory","Gnarled"/*,"Willow"*/ -}; - -#ifdef JP -static cptr J_staff_adj[MAX_WOODS] = -{ - "¥Ý¥×¥é¤Î","¥Ð¥ë¥µ¤Î","¥Ð¥ó¥ä¥ó¤Î","¥«¥Ð¤Î","À¾ÍÎ¥¹¥®¤Î", - "ÛؤÎ","¥¤¥È¥¹¥®¤Î","¥ß¥º¥­¤Î","¥Ë¥ì¤Î","¥æ¡¼¥«¥ê¤Î", - "¥Ä¥¬¤Î","¥Ö¥Ê¤Î","¹õÃɤÎ","¥¢¥«¥·¥¢¤Î","¥Þ¥Û¥¬¥Ë¡¼¤Î", - "¥«¥¨¥Ç¤Î","¥¯¥ï¤Î","¥«¥·¤Î","¾¾¤Î","¿ù¤Î", - "»çÃɤÎ","¥¨¥¾¥Þ¥Ä¤Î","¥¤¥Á¥¸¥¯¤Î","¥Á¡¼¥¯¤Î","¥¯¥ë¥ß¤Î", - "¥ä¥É¥ê¥®¤Î","¥µ¥ó¥¶¥·¤Î","ÃݤÎ","¶ä¤Î","¥ë¡¼¥ó¤Î", - "¶â¤Î","¥È¥Í¥ê¥³¤Î", "¾Ý²ç¤Î", "·î·Ë¼ù¤Î" -}; -#endif -static byte staff_col[MAX_WOODS] = -{ - TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, - TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, - TERM_L_UMBER, TERM_L_UMBER, TERM_UMBER, TERM_L_UMBER, TERM_UMBER, - TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_RED, - TERM_RED, TERM_L_UMBER, TERM_L_UMBER, TERM_L_UMBER, TERM_UMBER, - TERM_GREEN, TERM_L_UMBER, TERM_L_UMBER, TERM_L_WHITE, TERM_UMBER, - TERM_YELLOW, TERM_SLATE, TERM_WHITE, TERM_SLATE -}; - - -/* - * Wands (adjectives and colors) - */ -static cptr wand_adj[MAX_METALS] = -{ - "Aluminum", "Cast Iron", "Chromium", "Copper", "Gold", - "Iron", "Magnesium", "Molybdenum", "Nickel", "Rusty", - "Silver", "Steel", "Tin", "Titanium", "Tungsten", - "Zirconium", "Zinc", "Aluminum-Plated", "Copper-Plated", "Gold-Plated", - "Nickel-Plated", "Silver-Plated", "Steel-Plated", "Tin-Plated", "Zinc-Plated", - "Mithril-Plated", "Mithril", "Runed", "Bronze", "Brass", - "Platinum", "Lead","Lead-Plated", "Ivory" , "Adamantite", - "Uridium", "Long", "Short", "Hexagonal", "Carbonized" -}; - -#ifdef JP -static cptr J_wand_adj[MAX_METALS] = -{ - "¥¢¥ë¥ß¤Î","ÃòÅ´¤Î","¥¯¥í¥à¤Î","Ƽ¤Î","¶â¤Î", - "Å´¤Î","¥Þ¥°¥Í¥·¥¦¥à¤Î","¥â¥ê¥Ö¥Ç¥ó¤Î","¥Ë¥Ã¥±¥ë¤Î","»¬¤Ó¤¿", - "¶ä¤Î","¹ÝÅ´¤Î","¥Ö¥ê¥­¤Î","¥Á¥¿¥ó¤Î","¥¿¥ó¥°¥¹¥Æ¥ó¤Î", - "¥¸¥ë¥³¥ó¤Î","°¡±ô¤Î","¥¢¥ë¥ß¥á¥Ã¥­¤Î","Ƽ¥á¥Ã¥­¤Î","¶â¥á¥Ã¥­¤Î", - "ÇòƼ¥á¥Ã¥­¤Î","¶ä¥á¥Ã¥­¤Î","Å´¥á¥Ã¥­¤Î","¥¹¥º¥á¥Ã¥­¤Î","°¡±ô¥á¥Ã¥­¤Î", - "¥ß¥¹¥ê¥ë¥á¥Ã¥­¤Î","¥ß¥¹¥ê¥ë¤Î","¥ë¡¼¥ó¤¬¹ï¤Þ¤ì¤¿","ÀÄƼ¤Î","¿¿ï«¤Î", - "¥×¥é¥Á¥Ê¤Î","±ô¤Î","±ô¥á¥Ã¥­¤Î","¾Ý²ç¤Î","¥¢¥À¥Þ¥ó¥¿¥¤¥È¤Î", - "¥¤¥ê¥Â¥¦¥à¤Î","Ť¤","û¤¤","Ï»³Ñ·Á¤Î", "úÁǤÎ" -}; -#endif -static byte wand_col[MAX_METALS] = -{ - TERM_L_BLUE, TERM_L_DARK, TERM_WHITE, TERM_L_UMBER, TERM_YELLOW, - TERM_SLATE, TERM_L_WHITE, TERM_L_WHITE, TERM_L_UMBER, TERM_RED, - TERM_L_WHITE, TERM_L_WHITE, TERM_L_WHITE, TERM_WHITE, TERM_WHITE, - TERM_L_WHITE, TERM_L_WHITE, TERM_L_BLUE, TERM_L_UMBER, TERM_YELLOW, - TERM_L_UMBER, TERM_L_WHITE, TERM_L_WHITE, TERM_L_WHITE, TERM_L_WHITE, - TERM_L_BLUE, TERM_L_BLUE, TERM_UMBER, TERM_L_UMBER, TERM_L_UMBER, - TERM_WHITE, TERM_SLATE, TERM_SLATE, TERM_WHITE, TERM_VIOLET, - TERM_L_RED, TERM_L_BLUE, TERM_BLUE, TERM_RED, TERM_L_DARK -}; - - -/* - * Rods (adjectives and colors). - * Efficiency -- copied from wand arrays - */ - -static cptr rod_adj[MAX_METALS]; - -#ifdef JP -static cptr J_rod_adj[MAX_METALS]; -#endif -static byte rod_col[MAX_METALS]; - - -/* - * Mushrooms (adjectives and colors) - */ - -static cptr food_adj[MAX_SHROOM] = -{ - "Blue", "Black", "Black Spotted", "Brown", "Dark Blue", - "Dark Green", "Dark Red", "Yellow", "Furry", "Green", - "Grey", "Light Blue", "Light Green", "Violet", "Red", - "Slimy", "Tan", "White", "White Spotted", "Wrinkled", -}; - -#ifdef JP -static cptr J_food_adj[MAX_SHROOM] = -{ - "ÀĤ¤","¹õ¤¤","¹õÈäÎ","Ã㿧¤Î","·²ÀĤÎ", - "¿¼ÎФÎ","¹È¿§¤Î","²«¿§¤¤","Âݤष¤¿","ÎФÎ", - "¥°¥ì¡¼¤Î","¶õ¿§¤Î","²«ÎФÎ","¥¹¥ß¥ì¿§¤Î","ÀÖ¤¤", - "¤Í¤Ð¤Í¤Ð¤·¤¿","²«³ì¿§¤Î","Çò¤¤","ÇòÈäÎ","¤·¤ï¤·¤ï¤Î", -}; -#endif -static byte food_col[MAX_SHROOM] = -{ - TERM_BLUE, TERM_L_DARK, TERM_L_DARK, TERM_UMBER, TERM_BLUE, - TERM_GREEN, TERM_RED, TERM_YELLOW, TERM_L_WHITE, TERM_GREEN, - TERM_SLATE, TERM_L_BLUE, TERM_L_GREEN, TERM_VIOLET, TERM_RED, - TERM_SLATE, TERM_L_UMBER, TERM_WHITE, TERM_WHITE, TERM_UMBER -}; - - -/* - * Color adjectives and colors, for potions. - * Hack -- The first four entries are hard-coded. - * (water, apple juice, slime mold juice, something) - */ - -static cptr potion_adj[MAX_COLORS] = -{ - "Clear", "Light Brown", "Icky Green", "xxx", - "Azure", "Blue", "Blue Speckled", "Black", "Brown", "Brown Speckled", - "Bubbling", "Chartreuse", "Cloudy", "Copper Speckled", "Crimson", "Cyan", - "Dark Blue", "Dark Green", "Dark Red", "Gold Speckled", "Green", - "Green Speckled", "Grey", "Grey Speckled", "Hazy", "Indigo", - "Light Blue", "Light Green", "Magenta", "Metallic Blue", "Metallic Red", - "Metallic Green", "Metallic Purple", "Misty", "Orange", "Orange Speckled", - "Pink", "Pink Speckled", "Puce", "Purple", "Purple Speckled", - "Red", "Red Speckled", "Silver Speckled", "Smoky", "Tangerine", - "Violet", "Vermilion", "White", "Yellow", "Violet Speckled", - "Pungent", "Clotted Red", "Viscous Pink", "Oily Yellow", "Gloopy Green", - "Shimmering", "Coagulated Crimson", "Yellow Speckled", "Gold", - "Manly", "Stinking", "Oily Black", "Ichor", "Ivory White", "Sky Blue", - "Gray", "Silver", "Bronze", "Flashing", -}; - -#ifdef JP -static cptr J_potion_adj[MAX_COLORS] = -{ - "Æ©ÌÀ¤Ê","ÇöÃ㿧¤Î","¤è¤É¤ó¤ÀÎФÎ","¼¿¹õ¤Î", - "º°ÊˤÎ","ÀĤ¤","ÀÄÈäÎ","¹õ¤¤","Ã㿧¤Î","ÃãÈäÎ", - "Ë¢¤À¤Ã¤¿","Çö²«Î理Î","Âù¤Ã¤¿","ƼÈäÎ","¹È¿§¤Î","¥·¥¢¥ó¿§¤Î", - "·²ÀÄ¿§¤Î","¿¼¤¤ÎФÎ","¿¼¤¤ÀÖ¿§¤Î","¶âÈäÎ","Î理Î", - "ÎÐÈäÎ","³¥¿§¤Î","³¥ÈäÎ","¤Ü¤ä¤±¤¿¿§¤Î","Íõ¿§¤Î", - "Çö¤¤ÀÄ¿§¤Î","Çö¤¤Î理Î","¥Þ¥¼¥ó¥¿¿§¤Î","ÀĤ¯µ±¤¯","ÀÖ¤¯µ±¤¯", - "ÎФ˵±¤¯","»ç¤Ëµ±¤¯","̸¾õ¤Î","¥ª¥ì¥ó¥¸¿§¤Î","¥ª¥ì¥ó¥¸ÈäÎ", - "¥Ô¥ó¥¯¿§¤Î","¥Ô¥ó¥¯ÈäÎ","¹õ³ì¿§¤Î","»ç¿§¤Î","¤¦¤¹¤¤»çÈäÎ", - "ÀÖ¤¤","ÀÖÈäÎ","¶äÈäÎ","±ì¤Ã¤¿","Üô¿§¤Î", - "¥¹¥ß¥ì¿§¤Î","¼ë¿§¤Î","Çò¤¤","²«¿§¤¤", "»çÈäÎ", - "»É·ã½­¤Î¤¹¤ë","¤è¤É¤ó¤ÀÀÖ¤Î","¥É¥í¥É¥í¤Î","¤Í¤Ð¤Ã¤¿²«¿§¤Î","°ÅÎ理Î", - "µ±¤¯","¤Í¤Ð¤Ã¤¿¿¼¹È¤Î","²«ÈäÎ","¶â¿§¤Î", - "Ã˽­¤¤" /*nuke me*/,"°­½­¤Î¤¹¤ë","¹õÌý¿§¤Î","ǾÞù¤Î", - "¾Ý²ç¿§¤Î","¶õ¿§¤Î", "¤Í¤º¤ß¿§¤Î", "¶ä¿§¤Î", "ÀÖƼ¿§¤Î", - "¥­¥é¥­¥é¸÷¤ë" -}; -#endif -static byte potion_col[MAX_COLORS] = -{ - TERM_WHITE, TERM_L_UMBER, TERM_GREEN, 0, - TERM_L_BLUE, TERM_BLUE, TERM_BLUE, TERM_L_DARK, TERM_UMBER, TERM_UMBER, - TERM_L_WHITE, TERM_L_GREEN, TERM_WHITE, TERM_L_UMBER, TERM_RED, TERM_L_BLUE, - TERM_BLUE, TERM_GREEN, TERM_RED, TERM_YELLOW, TERM_GREEN, - TERM_GREEN, TERM_SLATE, TERM_SLATE, TERM_L_WHITE, TERM_VIOLET, - TERM_L_BLUE, TERM_L_GREEN, TERM_RED, TERM_BLUE, TERM_RED, - TERM_GREEN, TERM_VIOLET, TERM_L_WHITE, TERM_ORANGE, TERM_ORANGE, - TERM_L_RED, TERM_L_RED, TERM_VIOLET, TERM_VIOLET, TERM_VIOLET, - TERM_RED, TERM_RED, TERM_L_WHITE, TERM_L_DARK, TERM_ORANGE, - TERM_VIOLET, TERM_RED, TERM_WHITE, TERM_YELLOW, TERM_VIOLET, - TERM_L_RED, TERM_RED, TERM_L_RED, TERM_YELLOW, TERM_GREEN, - TERM_MULTI, TERM_RED, TERM_YELLOW, TERM_YELLOW, - TERM_L_UMBER, TERM_UMBER, TERM_L_DARK, TERM_RED, - TERM_WHITE, TERM_L_BLUE, TERM_L_WHITE, TERM_WHITE, TERM_RED, - TERM_YELLOW -}; - - -/* - * Syllables for scrolls (must be 1-4 letters each) - */ - -#ifdef JP -static cptr J_syllables[MAX_SYLLABLES] = -{ - "Å·", "ÃÏ", "̵", "ÍÑ", "°ì", "Åá", "ξ", "ÃÇ", - "°á", "Ë¥", "Æü", "Àé", "½©", "Ëþ", "¿È", "ÁÏ", - "áØ", "¼·", "ž", "Ȭ", "ÅÝ", "²é", "¿Å", - "¾¨", "ÃÀ", "µ¯", "»à", "²ó", "À¸", "ʸ", - "Éð", "Æ»", "ε", "Ƭ", "¼Ø", "Èø", "ñ", "Åá", "ľ", "Æþ", - "¿Ê", "Âà", "¸Þ", "¡", "Ï»", "ç¥", "Âç", "»³", "ÌÄ", - "Æ°", "É÷", "ÎÓ", "²Ð", "Àä", "ÂÎ", "Ì¿", "»Í", - "ÌÌ", "Á¿", "²Î", "´°", "Á´", "·ç", "Ä·", "ÎÂ", - "ìí", "î½", "òµ", "Ì¥", "ò³", "ò´", "½Ä", - "²£", "¿Ô", "¿À", "½Ð", "µ´", "Ë×", "²¹", "¸Î", "ÃÎ", - "¿·", "½Õ", "²Æ", "Åß", "½ã", "¿¿", "¹¤", "¶½", - "Ì£", "ÄÅ", "³Î", "Èæ", "¶ì", "¿´", "»´", "߸", - "Ç°", "ȯ", "Á°", "Âå", "̤", "ʹ", "¶õ", "¸å", - "Ú¼", "¶â", "¿¹", "Íå", "Ëü", "¾Ý", "ÊÑ", "²½", - "½½", "Ãæ", "Ȭ", "¶å", "¿Í", "¿§", "»î", "¹Ô", - "ºø", "¸í", "»ö", "¼Â", "º¬", "µÛ", "¼ý", "¹ç", - "Ê»", "Á´", "¹ñ", "À©", "ÇÆ", "¾Æ", "Æù", "Äê", - "¿©", "¹ü", "²ç", "Ìø", "Èô", "æÆ", "Éõ", "°õ", - "¼À", "Íð", "Éð", "¾­", "·Ú", "Ǧ", "·õ", "ǽ", - "À»", "¼Ù", "¼ö", "¼±", "¸¸", "´¶", "ÆÇ", "°Ç", - "Íî", "±¢", "ÍÛ" -}; -#else -static cptr syllables[MAX_SYLLABLES] = -{ - "a", "ab", "ag", "aks", "ala", "an", "ankh", "app", - "arg", "arze", "ash", "aus", "ban", "bar", "bat", "bek", - "bie", "bin", "bit", "bjor", "blu", "bot", "bu", - "byt", "comp", "con", "cos", "cre", "dalf", "dan", - "den", "der", "doe", "dok", "eep", "el", "eng", "er", "ere", "erk", - "esh", "evs", "fa", "fid", "flit", "for", "fri", "fu", "gan", - "gar", "glen", "gop", "gre", "ha", "he", "hyd", "i", - "ing", "ion", "ip", "ish", "it", "ite", "iv", "jo", - "kho", "kli", "klis", "la", "lech", "man", "mar", - "me", "mi", "mic", "mik", "mon", "mung", "mur", "nag", "nej", - "nelg", "nep", "ner", "nes", "nis", "nih", "nin", "o", - "od", "ood", "org", "orn", "ox", "oxy", "pay", "pet", - "ple", "plu", "po", "pot", "prok", "re", "rea", "rhov", - "ri", "ro", "rog", "rok", "rol", "sa", "san", "sat", - "see", "sef", "seh", "shu", "ski", "sna", "sne", "snik", - "sno", "so", "sol", "sri", "sta", "sun", "ta", "tab", - "tem", "ther", "ti", "tox", "trol", "tue", "turs", "u", - "ulk", "um", "un", "uni", "ur", "val", "viv", "vly", - "vom", "wah", "wed", "werg", "wex", "whon", "wun", "x", - "yerg", "yp", "zun", "tri", "blaa", "jah", "bul", "on", - "foo", "ju", "xuxu" -}; -#endif - - -/* - * Hold the titles of scrolls, 6 to 14 characters each - * Also keep an array of scroll colors (always WHITE for now) - */ -static char scroll_adj[MAX_TITLES][16]; - -static byte scroll_col[MAX_TITLES]; - - /* * Certain items, if aware, are known instantly * This function is used only by "flavor_init()" @@ -401,10 +29,12 @@ static bool object_easy_know(int i) case TV_DEATH_BOOK: case TV_TRUMP_BOOK: case TV_ARCANE_BOOK: - case TV_ENCHANT_BOOK: + case TV_CRAFT_BOOK: case TV_DAEMON_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: + case TV_HEX_BOOK: { return (TRUE); } @@ -436,109 +66,174 @@ static bool object_easy_know(int i) /* - * Certain items have a flavor - * This function is used only by "flavor_init()" + * Create a name from random parts. */ -static bool object_flavor(int k_idx) +void get_table_name_aux(char *out_string) { - object_kind *k_ptr = &k_info[k_idx]; +#ifdef JP + char Syllable[80]; + get_rnd_line("aname_j.txt", 1, Syllable); + strcpy(out_string, Syllable); + get_rnd_line("aname_j.txt", 2, Syllable); + strcat(out_string, Syllable); +#else +#define MAX_SYLLABLES 164 /* Used with scrolls (see below) */ - /* Analyze the item */ - switch (k_ptr->tval) + static cptr syllables[MAX_SYLLABLES] = { + "a", "ab", "ag", "aks", "ala", "an", "ankh", "app", + "arg", "arze", "ash", "aus", "ban", "bar", "bat", "bek", + "bie", "bin", "bit", "bjor", "blu", "bot", "bu", + "byt", "comp", "con", "cos", "cre", "dalf", "dan", + "den", "der", "doe", "dok", "eep", "el", "eng", "er", "ere", "erk", + "esh", "evs", "fa", "fid", "flit", "for", "fri", "fu", "gan", + "gar", "glen", "gop", "gre", "ha", "he", "hyd", "i", + "ing", "ion", "ip", "ish", "it", "ite", "iv", "jo", + "kho", "kli", "klis", "la", "lech", "man", "mar", + "me", "mi", "mic", "mik", "mon", "mung", "mur", "nag", "nej", + "nelg", "nep", "ner", "nes", "nis", "nih", "nin", "o", + "od", "ood", "org", "orn", "ox", "oxy", "pay", "pet", + "ple", "plu", "po", "pot", "prok", "re", "rea", "rhov", + "ri", "ro", "rog", "rok", "rol", "sa", "san", "sat", + "see", "sef", "seh", "shu", "ski", "sna", "sne", "snik", + "sno", "so", "sol", "sri", "sta", "sun", "ta", "tab", + "tem", "ther", "ti", "tox", "trol", "tue", "turs", "u", + "ulk", "um", "un", "uni", "ur", "val", "viv", "vly", + "vom", "wah", "wed", "werg", "wex", "whon", "wun", "x", + "yerg", "yp", "zun", "tri", "blaa", "jah", "bul", "on", + "foo", "ju", "xuxu" + }; + + int testcounter = randint1(3) + 1; + + strcpy(out_string, ""); + + if (randint1(3) == 2) { - case TV_AMULET: + while (testcounter--) + strcat(out_string, syllables[randint0(MAX_SYLLABLES)]); + } + else + { + char Syllable[80]; + testcounter = randint1(2) + 1; + while (testcounter--) { - return (0x80 + amulet_col[k_ptr->sval]); + (void)get_rnd_line("elvish.txt", 0, Syllable); + strcat(out_string, Syllable); } + } - case TV_RING: - { - return (0x90 + ring_col[k_ptr->sval]); - } + out_string[0] = toupper(out_string[1]); - case TV_STAFF: - { - return (0xA0 + staff_col[k_ptr->sval]); - } + out_string[16] = '\0'; +#endif +} - case TV_WAND: - { - return (0xB0 + wand_col[k_ptr->sval]); - } - case TV_ROD: - { - return (0xC0 + rod_col[k_ptr->sval]); - } +/* + * Create a name from random parts with quotes. + */ +void get_table_name(char *out_string) +{ + char buff[80]; + get_table_name_aux(buff); - case TV_SCROLL: - { - return (0xD0 + scroll_col[k_ptr->sval]); - } +#ifdef JP + sprintf(out_string, "¡Ø%s¡Ù", buff); +#else + sprintf(out_string, "'%s'", buff); +#endif +} - case TV_POTION: - { - return (0xE0 + potion_col[k_ptr->sval]); - } - case TV_FOOD: - { - if (k_ptr->sval < SV_FOOD_MIN_FOOD) - { - return (0xF0 + food_col[k_ptr->sval]); - } +/* + * Make random Sindarin name + */ +void get_table_sindarin_aux(char *out_string) +{ + char Syllable[80]; +#ifdef JP + char tmp[80]; +#endif - break; - } - } + get_rnd_line("sname.txt", 1, Syllable); +#ifdef JP + strcpy(tmp, Syllable); +#else + strcpy(out_string, Syllable); +#endif - /* No flavor */ - return (0); + get_rnd_line("sname.txt", 2, Syllable); +#ifdef JP + strcat(tmp, Syllable); + sindarin_to_kana(out_string, tmp); +#else + strcat(out_string, Syllable); +#endif } -void get_table_name(char *out_string) +/* + * Make random Sindarin name with quotes + */ +void get_table_sindarin(char *out_string) { + char buff[80]; + get_table_sindarin_aux(buff); + #ifdef JP - char Syllable[80]; - strcpy(out_string, "¡Ø"); - get_rnd_line("aname_j.txt", 1, Syllable); - strcat(out_string, Syllable); - get_rnd_line("aname_j.txt", 2, Syllable); - strcat(out_string, Syllable); - strcat(out_string, "¡Ù"); + sprintf(out_string, "¡Ø%s¡Ù", buff); #else - int testcounter = randint(3) + 1; + sprintf(out_string, "'%s'", buff); +#endif +} - strcpy(out_string, "'"); - if (randint(3) == 2) - { - while (testcounter--) - strcat(out_string, syllables[rand_int(MAX_SYLLABLES)]); - } - else +/* + * Shuffle flavor indices of a group of objects with given tval + */ +static void shuffle_flavors(byte tval) +{ + s16b *k_idx_list; + int k_idx_list_num = 0; + int i; + + /* Allocate an array for a list of k_idx */ + C_MAKE(k_idx_list, max_k_idx, s16b); + + /* Search objects with given tval for shuffle */ + for (i = 0; i < max_k_idx; i++) { - char Syllable[80]; - testcounter = randint(2) + 1; - while (testcounter--) - { - (void)get_rnd_line("elvish.txt", 0, Syllable); - strcat(out_string, Syllable); - } - } + object_kind *k_ptr = &k_info[i]; - out_string[1] = toupper(out_string[1]); + /* Skip non-Rings */ + if (k_ptr->tval != tval) continue; - strcat(out_string, "'"); -#endif + /* Paranoia -- Skip objects without flavor */ + if (!k_ptr->flavor) continue; + /* Skip objects with a fixed flavor name */ + if (have_flag(k_ptr->flags, TR_FIXED_FLAVOR)) continue; - out_string[18] = '\0'; + /* Remember k_idx */ + k_idx_list[k_idx_list_num] = i; - return; -} + /* Increase number of remembered indices */ + k_idx_list_num++; + } + /* Shuffle flavors */ + for (i = 0; i < k_idx_list_num; i++) + { + object_kind *k1_ptr = &k_info[k_idx_list[i]]; + object_kind *k2_ptr = &k_info[k_idx_list[randint0(k_idx_list_num)]]; + + /* Swap flavors of this pair */ + s16b tmp = k1_ptr->flavor; + k1_ptr->flavor = k2_ptr->flavor; + k2_ptr->flavor = tmp; + } +} /* * Prepare the "variable" part of the "k_info" array. @@ -573,12 +268,7 @@ void get_table_name(char *out_string) */ void flavor_init(void) { - int i, j; - - byte temp_col; - - cptr temp_adj; - + int i; /* Hack -- Use the "simple" RNG */ Rand_quick = TRUE; @@ -587,215 +277,44 @@ void flavor_init(void) Rand_value = seed_flavor; - /* Efficiency -- Rods/Wands share initial array */ - for (i = 0; i < MAX_METALS; i++) + /* Initialize flavor index of each object by itself */ + for (i = 0; i < max_k_idx; i++) { - rod_adj[i] = wand_adj[i]; -#ifdef JP - J_rod_adj[i] = J_wand_adj[i]; -#endif - rod_col[i] = wand_col[i]; - } - - - /* Rings have "ring colors" */ - for (i = 0; i < MAX_ROCKS; i++) - { - j = rand_int(MAX_ROCKS); - temp_adj = ring_adj[i]; - ring_adj[i] = ring_adj[j]; - ring_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_ring_adj[i]; - J_ring_adj[i] = J_ring_adj[j]; - J_ring_adj[j] = temp_adj; -#endif - temp_col = ring_col[i]; - ring_col[i] = ring_col[j]; - ring_col[j] = temp_col; - } - - /* Amulets have "amulet colors" */ - for (i = 0; i < MAX_AMULETS; i++) - { - j = rand_int(MAX_AMULETS); - temp_adj = amulet_adj[i]; - amulet_adj[i] = amulet_adj[j]; - amulet_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_amulet_adj[i]; - J_amulet_adj[i] = J_amulet_adj[j]; - J_amulet_adj[j] = temp_adj; -#endif - temp_col = amulet_col[i]; - amulet_col[i] = amulet_col[j]; - amulet_col[j] = temp_col; - } - - /* Staffs */ - for (i = 0; i < MAX_WOODS; i++) - { - j = rand_int(MAX_WOODS); - temp_adj = staff_adj[i]; - staff_adj[i] = staff_adj[j]; - staff_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_staff_adj[i]; - J_staff_adj[i] = J_staff_adj[j]; - J_staff_adj[j] = temp_adj; -#endif - temp_col = staff_col[i]; - staff_col[i] = staff_col[j]; - staff_col[j] = temp_col; - } - - /* Wands */ - for (i = 0; i < MAX_METALS; i++) - { - j = rand_int(MAX_METALS); - temp_adj = wand_adj[i]; - wand_adj[i] = wand_adj[j]; - wand_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_wand_adj[i]; - J_wand_adj[i] = J_wand_adj[j]; - J_wand_adj[j] = temp_adj; -#endif - temp_col = wand_col[i]; - wand_col[i] = wand_col[j]; - wand_col[j] = temp_col; - } + object_kind *k_ptr = &k_info[i]; - /* Rods */ - for (i = 0; i < MAX_METALS; i++) - { - j = rand_int(MAX_METALS); - temp_adj = rod_adj[i]; - rod_adj[i] = rod_adj[j]; - rod_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_rod_adj[i]; - J_rod_adj[i] = J_rod_adj[j]; - J_rod_adj[j] = temp_adj; -#endif - temp_col = rod_col[i]; - rod_col[i] = rod_col[j]; - rod_col[j] = temp_col; - } + /* Skip objects without flavor name */ + if (!k_ptr->flavor_name) continue; - /* Foods (Mushrooms) */ - for (i = 0; i < MAX_SHROOM; i++) - { - j = rand_int(MAX_SHROOM); - temp_adj = food_adj[i]; - food_adj[i] = food_adj[j]; - food_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_food_adj[i]; - J_food_adj[i] = J_food_adj[j]; - J_food_adj[j] = temp_adj; -#endif - temp_col = food_col[i]; - food_col[i] = food_col[j]; - food_col[j] = temp_col; + /* + * Initialize flavor index to itself + * -> Shuffle it later + */ + k_ptr->flavor = i; } - /* Potions */ - for (i = 4; i < MAX_COLORS; i++) - { - j = rand_int(MAX_COLORS - 4) + 4; - temp_adj = potion_adj[i]; - potion_adj[i] = potion_adj[j]; - potion_adj[j] = temp_adj; -#ifdef JP - temp_adj = J_potion_adj[i]; - J_potion_adj[i] = J_potion_adj[j]; - J_potion_adj[j] = temp_adj; -#endif - temp_col = potion_col[i]; - potion_col[i] = potion_col[j]; - potion_col[j] = temp_col; - } + /* Shuffle Rings */ + shuffle_flavors(TV_RING); - /* Scrolls (random titles, always white) */ - for (i = 0; i < MAX_TITLES; i++) - { - /* Get a new title */ - while (TRUE) - { - char buf[80]; + /* Shuffle Amulets */ + shuffle_flavors(TV_AMULET); - bool okay; + /* Shuffle Staves */ + shuffle_flavors(TV_STAFF); - /* Start a new title */ - buf[0] = '\0'; + /* Shuffle Wands */ + shuffle_flavors(TV_WAND); - /* Collect words until done */ - while (1) - { - int q, s; + /* Shuffle Rods */ + shuffle_flavors(TV_ROD); - char tmp[80]; + /* Shuffle Mushrooms */ + shuffle_flavors(TV_FOOD); - /* Start a new word */ - tmp[0] = '\0'; + /* Shuffle Potions */ + shuffle_flavors(TV_POTION); - /* Choose one or two syllables */ - s = ((rand_int(100) < 30) ? 1 : 2); - - /* Add a one or two syllable word */ - for (q = 0; q < s; q++) - { - /* Add the syllable */ -#ifdef JP - strcat(tmp, J_syllables[rand_int(MAX_SYLLABLES)]); -#else - strcat(tmp, syllables[rand_int(MAX_SYLLABLES)]); -#endif - } - - /* Stop before getting too long */ - if (strlen(buf) + 1 + strlen(tmp) > 15) break; - - /* Add a space */ - strcat(buf, " "); - - /* Add the word */ - strcat(buf, tmp); - } - - /* Save the title */ - strcpy(scroll_adj[i], buf+1); - - /* Assume okay */ - okay = TRUE; - - /* Check for "duplicate" scroll titles */ - for (j = 0; j < i; j++) - { - cptr hack1 = scroll_adj[j]; - cptr hack2 = scroll_adj[i]; - - /* Compare first four characters */ - if (*hack1++ != *hack2++) continue; - if (*hack1++ != *hack2++) continue; - if (*hack1++ != *hack2++) continue; - if (*hack1++ != *hack2++) continue; - - /* Not okay */ - okay = FALSE; - - /* Stop looking */ - break; - } - - /* Break when done */ - if (okay) break; - } - - /* All scrolls are white */ - scroll_col[i] = TERM_WHITE; - } + /* Shuffle Scrolls */ + shuffle_flavors(TV_SCROLL); /* Hack -- Use the "complex" RNG */ @@ -809,9 +328,6 @@ void flavor_init(void) /* Skip "empty" objects */ if (!k_ptr->name) continue; - /* Extract "flavor" (if any) */ - k_ptr->flavor = object_flavor(i); - /* No flavor yields aware */ if (!k_ptr->flavor) k_ptr->aware = TRUE; @@ -896,7 +412,7 @@ static char *object_desc_num(char *t, uint n) *¡Êcmd1.c ¤ÇήÍѤ¹¤ë¤¿¤á¤Ë object_desc_japanese ¤«¤é°ÜÆ°¤·¤¿¡£¡Ë */ -extern char *object_desc_kosuu(char *t, object_type *o_ptr) +char *object_desc_kosuu(char *t, object_type *o_ptr) { t = object_desc_num(t, o_ptr->number); @@ -930,10 +446,12 @@ extern char *object_desc_kosuu(char *t, object_type *o_ptr) case TV_DEATH_BOOK: case TV_TRUMP_BOOK: case TV_ARCANE_BOOK: - case TV_ENCHANT_BOOK: + case TV_CRAFT_BOOK: case TV_DAEMON_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: + case TV_HEX_BOOK: { t = object_desc_str(t, "ºý"); break; @@ -967,7 +485,7 @@ extern char *object_desc_kosuu(char *t, object_type *o_ptr) case TV_FOOD: { if(o_ptr->sval == SV_FOOD_JERKY) - { + { t = object_desc_str(t, "ÀÚ¤ì"); break; } @@ -989,56 +507,644 @@ extern char *object_desc_kosuu(char *t, object_type *o_ptr) } #endif -/* - * Print an signed number "v" into a string "t", as if by - * sprintf(t, "%+d", n), and return a pointer to the terminator. - * Note that we always print a sign, either "+" or "-". - */ -static char *object_desc_int(char *t, sint v) -{ - uint p, n; +/* + * Print an signed number "v" into a string "t", as if by + * sprintf(t, "%+d", n), and return a pointer to the terminator. + * Note that we always print a sign, either "+" or "-". + */ +static char *object_desc_int(char *t, sint v) +{ + uint p, n; + + /* Negative */ + if (v < 0) + { + /* Take the absolute value */ + n = 0 - v; + + /* Use a "minus" sign */ + *t++ = '-'; + } + + /* Positive (or zero) */ + else + { + /* Use the actual number */ + n = v; + + /* Use a "plus" sign */ + *t++ = '+'; + } + + /* Find "size" of "n" */ + for (p = 1; n >= p * 10; p = p * 10) /* loop */; + + /* Dump each digit */ + while (p >= 1) + { + /* Dump the digit */ + *t++ = '0' + n / p; + + /* Remove the digit */ + n = n % p; + + /* Process next digit */ + p = p / 10; + } + + /* Terminate */ + *t = '\0'; + + /* Result */ + return (t); +} + + +/* + * Structs and tables for Auto Inscription for flags + */ + +typedef struct flag_insc_table +{ +#ifdef JP + cptr japanese; +#endif + cptr english; + int flag; + int except_flag; +} flag_insc_table; + +#ifdef JP +static flag_insc_table flag_insc_plus[] = +{ + { "¹¶", "At", TR_BLOWS, -1 }, + { "®", "Sp", TR_SPEED, -1 }, + { "ÏÓ", "St", TR_STR, -1 }, + { "ÃÎ", "In", TR_INT, -1 }, + { "¸­", "Wi", TR_WIS, -1 }, + { "´ï", "Dx", TR_DEX, -1 }, + { "ÂÑ", "Cn", TR_CON, -1 }, + { "Ì¥", "Ch", TR_CHR, -1 }, + { "Æ»", "Md", TR_MAGIC_MASTERY, -1 }, + { "±£", "Sl", TR_STEALTH, -1 }, + { "õ", "Sr", TR_SEARCH, -1 }, + { "ÀÖ", "If", TR_INFRA, -1 }, + { "·¡", "Dg", TR_TUNNEL, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_immune[] = +{ + { "»À", "Ac", TR_IM_ACID, -1 }, + { "ÅÅ", "El", TR_IM_ELEC, -1 }, + { "²Ð", "Fi", TR_IM_FIRE, -1 }, + { "Îä", "Co", TR_IM_COLD, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_resistance[] = +{ + { "»À", "Ac", TR_RES_ACID, TR_IM_ACID }, + { "ÅÅ", "El", TR_RES_ELEC, TR_IM_ELEC }, + { "²Ð", "Fi", TR_RES_FIRE, TR_IM_FIRE }, + { "Îä", "Co", TR_RES_COLD, TR_IM_COLD }, + { "ÆÇ", "Po", TR_RES_POIS, -1 }, + { "Á®", "Li", TR_RES_LITE, -1 }, + { "°Å", "Dk", TR_RES_DARK, -1 }, + { "ÇË", "Sh", TR_RES_SHARDS, -1 }, + { "ÌÕ", "Bl", TR_RES_BLIND, -1 }, + { "Íð", "Cf", TR_RES_CONF, -1 }, + { "¹ì", "So", TR_RES_SOUND, -1 }, + { "¹ö", "Nt", TR_RES_NETHER, -1 }, + { "°ø", "Nx", TR_RES_NEXUS, -1 }, + { "ÆÙ", "Ca", TR_RES_CHAOS, -1 }, + { "Îô", "Di", TR_RES_DISEN, -1 }, + { "¶²", "Fe", TR_RES_FEAR, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_misc[] = +{ + { "°×", "Es", TR_EASY_SPELL, -1 }, + { "¸º", "Dm", TR_DEC_MANA, -1 }, + { "Åê", "Th", TR_THROW, -1 }, + { "È¿", "Rf", TR_REFLECT, -1 }, + { "Ëã", "Fa", TR_FREE_ACT, -1 }, + { "»ë", "Si", TR_SEE_INVIS, -1 }, + { "·Ð", "Hl", TR_HOLD_LIFE, -1 }, + { "ÃÙ", "Sd", TR_SLOW_DIGEST, -1 }, + { "³è", "Rg", TR_REGEN, -1 }, + { "Éâ", "Lv", TR_LEVITATION, -1 }, + { "ÌÀ", "Lu", TR_LITE, -1 }, + { "·Ù", "Wr", TR_WARNING, -1 }, + { "ÇÜ", "Xm", TR_XTRA_MIGHT, -1 }, + { "¼Í", "Xs", TR_XTRA_SHOTS, -1 }, + { "½Ö", "Te", TR_TELEPORT, -1 }, + { "ÅÜ", "Ag", TR_AGGRAVATE, -1 }, + { "½Ë", "Bs", TR_BLESSED, -1 }, + { "´÷", "Ty", TR_TY_CURSE, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_aura[] = +{ + { "±ê", "F", TR_SH_FIRE, -1 }, + { "ÅÅ", "E", TR_SH_ELEC, -1 }, + { "Îä", "C", TR_SH_COLD, -1 }, + { "Ëâ", "M", TR_NO_MAGIC, -1 }, + { "½Ö", "T", TR_NO_TELE, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_brand[] = +{ + { "»À", "A", TR_BRAND_ACID, -1 }, + { "ÅÅ", "E", TR_BRAND_ELEC, -1 }, + { "¾Æ", "F", TR_BRAND_FIRE, -1 }, + { "Åà", "Co", TR_BRAND_COLD, -1 }, + { "ÆÇ", "P", TR_BRAND_POIS, -1 }, + { "ÆÙ", "Ca", TR_CHAOTIC, -1 }, + { "µÛ", "V", TR_VAMPIRIC, -1 }, + { "¿Ì", "Q", TR_IMPACT, -1 }, + { "ÀÚ", "S", TR_VORPAL, -1 }, + { "Íý", "M", TR_FORCE_WEAPON, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_kill[] = +{ + { "¼Ù", "*", TR_KILL_EVIL, -1 }, + { "¿Í", "p", TR_KILL_HUMAN, -1 }, + { "ζ", "D", TR_KILL_DRAGON, -1 }, + { "¥ª", "o", TR_KILL_ORC, -1 }, + { "¥È", "T", TR_KILL_TROLL, -1 }, + { "µð", "P", TR_KILL_GIANT, -1 }, + { "¥Ç", "U", TR_KILL_DEMON, -1 }, + { "»à", "L", TR_KILL_UNDEAD, -1 }, + { "Æ°", "Z", TR_KILL_ANIMAL, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_slay[] = +{ + { "¼Ù", "*", TR_SLAY_EVIL, TR_KILL_EVIL }, + { "¿Í", "p", TR_SLAY_HUMAN, TR_KILL_HUMAN }, + { "ε", "D", TR_SLAY_DRAGON, TR_KILL_DRAGON }, + { "¥ª", "o", TR_SLAY_ORC, TR_KILL_ORC }, + { "¥È", "T", TR_SLAY_TROLL, TR_KILL_TROLL }, + { "µð", "P", TR_SLAY_GIANT, TR_KILL_GIANT }, + { "¥Ç", "U", TR_SLAY_DEMON, TR_KILL_DEMON }, + { "»à", "L", TR_SLAY_UNDEAD, TR_KILL_UNDEAD }, + { "Æ°", "Z", TR_SLAY_ANIMAL, TR_KILL_ANIMAL }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_esp1[] = +{ + { "´¶", "Tele", TR_TELEPATHY, -1 }, + { "¼Ù", "Evil", TR_ESP_EVIL, -1 }, + { "Á±", "Good", TR_ESP_GOOD, -1 }, + { "̵", "Nolv", TR_ESP_NONLIVING, -1 }, + { "¸Ä", "Uniq", TR_ESP_UNIQUE, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_esp2[] = +{ + { "¿Í", "p", TR_ESP_HUMAN, -1 }, + { "ε", "D", TR_ESP_DRAGON, -1 }, + { "¥ª", "o", TR_ESP_ORC, -1 }, + { "¥È", "T", TR_ESP_TROLL, -1 }, + { "µð", "P", TR_ESP_GIANT, -1 }, + { "¥Ç", "U", TR_ESP_DEMON, -1 }, + { "»à", "L", TR_ESP_UNDEAD, -1 }, + { "Æ°", "Z", TR_ESP_ANIMAL, -1 }, + { NULL, NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_sust[] = +{ + { "ÏÓ", "St", TR_SUST_STR, -1 }, + { "ÃÎ", "In", TR_SUST_INT, -1 }, + { "¸­", "Wi", TR_SUST_WIS, -1 }, + { "´ï", "Dx", TR_SUST_DEX, -1 }, + { "ÂÑ", "Cn", TR_SUST_CON, -1 }, + { "Ì¥", "Ch", TR_SUST_CHR, -1 }, + { NULL, NULL, 0, -1 } +}; + +#else +static flag_insc_table flag_insc_plus[] = +{ + { "At", TR_BLOWS, -1 }, + { "Sp", TR_SPEED, -1 }, + { "St", TR_STR, -1 }, + { "In", TR_INT, -1 }, + { "Wi", TR_WIS, -1 }, + { "Dx", TR_DEX, -1 }, + { "Cn", TR_CON, -1 }, + { "Ch", TR_CHR, -1 }, + { "Md", TR_MAGIC_MASTERY, -1 }, + { "Sl", TR_STEALTH, -1 }, + { "Sr", TR_SEARCH, -1 }, + { "If", TR_INFRA, -1 }, + { "Dg", TR_TUNNEL, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_immune[] = +{ + { "Ac", TR_IM_ACID, -1 }, + { "El", TR_IM_ELEC, -1 }, + { "Fi", TR_IM_FIRE, -1 }, + { "Co", TR_IM_COLD, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_resistance[] = +{ + { "Ac", TR_RES_ACID, TR_IM_ACID }, + { "El", TR_RES_ELEC, TR_IM_ELEC }, + { "Fi", TR_RES_FIRE, TR_IM_FIRE }, + { "Co", TR_RES_COLD, TR_IM_COLD }, + { "Po", TR_RES_POIS, -1 }, + { "Li", TR_RES_LITE, -1 }, + { "Dk", TR_RES_DARK, -1 }, + { "Sh", TR_RES_SHARDS, -1 }, + { "Bl", TR_RES_BLIND, -1 }, + { "Cf", TR_RES_CONF, -1 }, + { "So", TR_RES_SOUND, -1 }, + { "Nt", TR_RES_NETHER, -1 }, + { "Nx", TR_RES_NEXUS, -1 }, + { "Ca", TR_RES_CHAOS, -1 }, + { "Di", TR_RES_DISEN, -1 }, + { "Fe", TR_RES_FEAR, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_misc[] = +{ + { "Es", TR_EASY_SPELL, -1 }, + { "Dm", TR_DEC_MANA, -1 }, + { "Th", TR_THROW, -1 }, + { "Rf", TR_REFLECT, -1 }, + { "Fa", TR_FREE_ACT, -1 }, + { "Si", TR_SEE_INVIS, -1 }, + { "Hl", TR_HOLD_LIFE, -1 }, + { "Sd", TR_SLOW_DIGEST, -1 }, + { "Rg", TR_REGEN, -1 }, + { "Lv", TR_LEVITATION, -1 }, + { "Lu", TR_LITE, -1 }, + { "Wr", TR_WARNING, -1 }, + { "Xm", TR_XTRA_MIGHT, -1 }, + { "Xs", TR_XTRA_SHOTS, -1 }, + { "Te", TR_TELEPORT, -1 }, + { "Ag", TR_AGGRAVATE, -1 }, + { "Bs", TR_BLESSED, -1 }, + { "Ty", TR_TY_CURSE, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_aura[] = +{ + { "F", TR_SH_FIRE, -1 }, + { "E", TR_SH_ELEC, -1 }, + { "C", TR_SH_COLD, -1 }, + { "M", TR_NO_MAGIC, -1 }, + { "T", TR_NO_TELE, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_brand[] = +{ + { "A", TR_BRAND_ACID, -1 }, + { "E", TR_BRAND_ELEC, -1 }, + { "F", TR_BRAND_FIRE, -1 }, + { "Co", TR_BRAND_COLD, -1 }, + { "P", TR_BRAND_POIS, -1 }, + { "Ca", TR_CHAOTIC, -1 }, + { "V", TR_VAMPIRIC, -1 }, + { "Q", TR_IMPACT, -1 }, + { "S", TR_VORPAL, -1 }, + { "M", TR_FORCE_WEAPON, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_kill[] = +{ + { "*", TR_KILL_EVIL, -1 }, + { "p", TR_KILL_HUMAN, -1 }, + { "D", TR_KILL_DRAGON, -1 }, + { "o", TR_KILL_ORC, -1 }, + { "T", TR_KILL_TROLL, -1 }, + { "P", TR_KILL_GIANT, -1 }, + { "U", TR_KILL_DEMON, -1 }, + { "L", TR_KILL_UNDEAD, -1 }, + { "Z", TR_KILL_ANIMAL, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_slay[] = +{ + { "*", TR_SLAY_EVIL, TR_KILL_EVIL }, + { "p", TR_SLAY_HUMAN, TR_KILL_HUMAN }, + { "D", TR_SLAY_DRAGON, TR_KILL_DRAGON }, + { "o", TR_SLAY_ORC, TR_KILL_ORC }, + { "T", TR_SLAY_TROLL, TR_KILL_TROLL }, + { "P", TR_SLAY_GIANT, TR_KILL_GIANT }, + { "U", TR_SLAY_DEMON, TR_KILL_DEMON }, + { "L", TR_SLAY_UNDEAD, TR_KILL_UNDEAD }, + { "Z", TR_SLAY_ANIMAL, TR_KILL_ANIMAL }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_esp1[] = +{ + { "Tele", TR_TELEPATHY, -1 }, + { "Evil", TR_ESP_EVIL, -1 }, + { "Good", TR_ESP_GOOD, -1 }, + { "Nolv", TR_ESP_NONLIVING, -1 }, + { "Uniq", TR_ESP_UNIQUE, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_esp2[] = +{ + { "p", TR_ESP_HUMAN, -1 }, + { "D", TR_ESP_DRAGON, -1 }, + { "o", TR_ESP_ORC, -1 }, + { "T", TR_ESP_TROLL, -1 }, + { "P", TR_ESP_GIANT, -1 }, + { "U", TR_ESP_DEMON, -1 }, + { "L", TR_ESP_UNDEAD, -1 }, + { "Z", TR_ESP_ANIMAL, -1 }, + { NULL, 0, -1 } +}; + +static flag_insc_table flag_insc_sust[] = +{ + { "St", TR_SUST_STR, -1 }, + { "In", TR_SUST_INT, -1 }, + { "Wi", TR_SUST_WIS, -1 }, + { "Dx", TR_SUST_DEX, -1 }, + { "Cn", TR_SUST_CON, -1 }, + { "Ch", TR_SUST_CHR, -1 }, + { NULL, 0, -1 } +}; +#endif + +/* Simple macro for get_inscription() */ +#define ADD_INSC(STR) (void)(ptr = object_desc_str(ptr, (STR))) + +/* + * Helper function for get_inscription() + */ +static char *inscribe_flags_aux(flag_insc_table *fi_ptr, u32b flgs[TR_FLAG_SIZE], bool kanji, char *ptr) +{ +#ifndef JP + (void)kanji; +#endif + + while (fi_ptr->english) + { + if (have_flag(flgs, fi_ptr->flag) && + (fi_ptr->except_flag == -1 || !have_flag(flgs, fi_ptr->except_flag))) +#ifdef JP + ADD_INSC(kanji ? fi_ptr->japanese : fi_ptr->english); +#else + ADD_INSC(fi_ptr->english); +#endif + fi_ptr++; + } + + return ptr; +} + + +/* + * Special variation of have_flag for auto-inscription + */ +static bool have_flag_of(flag_insc_table *fi_ptr, u32b flgs[TR_FLAG_SIZE]) +{ + while (fi_ptr->english) + { + if (have_flag(flgs, fi_ptr->flag) && + (fi_ptr->except_flag == -1 || !have_flag(flgs, fi_ptr->except_flag))) + return (TRUE); + fi_ptr++; + } + + return (FALSE); +} + +static char *get_ability_abbreviation(char *ptr, object_type *o_ptr, bool kanji, bool all) +{ + char *prev_ptr = ptr; + u32b flgs[TR_FLAG_SIZE]; + + /* Extract the flags */ + object_flags(o_ptr, flgs); + + + /* Remove obvious flags */ + if (!all) + { + object_kind *k_ptr = &k_info[o_ptr->k_idx]; + int j; + + /* Base object */ + for (j = 0; j < TR_FLAG_SIZE; j++) + flgs[j] &= ~k_ptr->flags[j]; + + if (object_is_fixed_artifact(o_ptr)) + { + artifact_type *a_ptr = &a_info[o_ptr->name1]; + + for (j = 0; j < TR_FLAG_SIZE; j++) + flgs[j] &= ~a_ptr->flags[j]; + } + + if (object_is_ego(o_ptr)) + { + ego_item_type *e_ptr = &e_info[o_ptr->name2]; + + for (j = 0; j < TR_FLAG_SIZE; j++) + flgs[j] &= ~e_ptr->flags[j]; + } + } + + + /* Plusses */ + if (have_flag_of(flag_insc_plus, flgs)) + { + if (kanji) + ADD_INSC("+"); + } + ptr = inscribe_flags_aux(flag_insc_plus, flgs, kanji, ptr); + + /* Immunity */ + if (have_flag_of(flag_insc_immune, flgs)) + { + if (!kanji && ptr != prev_ptr) + { + ADD_INSC(";"); + prev_ptr = ptr; + } + ADD_INSC("*"); + } + ptr = inscribe_flags_aux(flag_insc_immune, flgs, kanji, ptr); - /* Negative */ - if (v < 0) + /* Resistance */ + if (have_flag_of(flag_insc_resistance, flgs)) { - /* Take the absolute value */ - n = 0 - v; + if (kanji) + ADD_INSC("r"); + else if (ptr != prev_ptr) + { + ADD_INSC(";"); + prev_ptr = ptr; + } + } + ptr = inscribe_flags_aux(flag_insc_resistance, flgs, kanji, ptr); - /* Use a "minus" sign */ - *t++ = '-'; + /* Misc Ability */ + if (have_flag_of(flag_insc_misc, flgs)) + { + if (ptr != prev_ptr) + { + ADD_INSC(";"); + prev_ptr = ptr; + } } + ptr = inscribe_flags_aux(flag_insc_misc, flgs, kanji, ptr); - /* Positive (or zero) */ + /* Aura */ + if (have_flag_of(flag_insc_aura, flgs)) + { + ADD_INSC("["); + } + ptr = inscribe_flags_aux(flag_insc_aura, flgs, kanji, ptr); + + /* Brand Weapon */ + if (have_flag_of(flag_insc_brand, flgs)) + ADD_INSC("|"); + ptr = inscribe_flags_aux(flag_insc_brand, flgs, kanji, ptr); + + /* Kill Weapon */ + if (have_flag_of(flag_insc_kill, flgs)) + ADD_INSC("/X"); + ptr = inscribe_flags_aux(flag_insc_kill, flgs, kanji, ptr); + + /* Slay Weapon */ + if (have_flag_of(flag_insc_slay, flgs)) + ADD_INSC("/"); + ptr = inscribe_flags_aux(flag_insc_slay, flgs, kanji, ptr); + + /* Esp */ + if (kanji) + { + if (have_flag_of(flag_insc_esp1, flgs) || + have_flag_of(flag_insc_esp2, flgs)) + ADD_INSC("~"); + ptr = inscribe_flags_aux(flag_insc_esp1, flgs, kanji, ptr); + ptr = inscribe_flags_aux(flag_insc_esp2, flgs, kanji, ptr); + } else { - /* Use the actual number */ - n = v; + if (have_flag_of(flag_insc_esp1, flgs)) + ADD_INSC("~"); + ptr = inscribe_flags_aux(flag_insc_esp1, flgs, kanji, ptr); + if (have_flag_of(flag_insc_esp2, flgs)) + ADD_INSC("~"); + ptr = inscribe_flags_aux(flag_insc_esp2, flgs, kanji, ptr); + } - /* Use a "plus" sign */ - *t++ = '+'; + /* sustain */ + if (have_flag_of(flag_insc_sust, flgs)) + { + ADD_INSC("("); } + ptr = inscribe_flags_aux(flag_insc_sust, flgs, kanji, ptr); - /* Find "size" of "n" */ - for (p = 1; n >= p * 10; p = p * 10) /* loop */; + *ptr = '\0'; - /* Dump each digit */ - while (p >= 1) - { - /* Dump the digit */ - *t++ = '0' + n / p; + return ptr; +} - /* Remove the digit */ - n = n % p; - /* Process next digit */ - p = p / 10; +/* + * Get object inscription with auto inscription of object flags. + */ +static void get_inscription(char *buff, object_type *o_ptr) +{ + cptr insc = quark_str(o_ptr->inscription); + char *ptr = buff; + + /* Not fully identified */ + if (!(o_ptr->ident & IDENT_MENTAL)) + { + /* Copy until end of line or '#' */ + while (*insc) + { + if (*insc == '#') break; +#ifdef JP + if (iskanji(*insc)) *buff++ = *insc++; +#endif + *buff++ = *insc++; + } + + *buff = '\0'; + return; } - /* Terminate */ - *t = '\0'; + *buff = '\0'; + for (; *insc; insc++) + { + /* Ignore fake artifact inscription */ + if (*insc == '#') break; - /* Result */ - return (t); + /* {%} will be automatically converted */ + else if ('%' == *insc) + { + bool kanji = FALSE; + bool all; + cptr start = ptr; + + /* check for too long inscription */ + if (ptr >= buff + MAX_NLEN) continue; + +#ifdef JP + if ('%' == insc[1]) + { + insc++; + kanji = FALSE; + } + else + { + kanji = TRUE; + } +#endif + if ('a' == insc[1] && 'l' == insc[2] && 'l' == insc[3]) + { + all = TRUE; + insc += 3; + } + else + { + all = FALSE; + } + + ptr = get_ability_abbreviation(ptr, o_ptr, kanji, all); + + if (ptr == start) + ADD_INSC(" "); + } + else + { + *ptr++ = *insc; + } + } + *ptr = '\0'; } @@ -1076,28 +1182,39 @@ static char *object_desc_int(char *t, sint v) * * Hack -- Display "The One Ring" as "a Plain Gold Ring" until aware. * - * If "pref" then a "numeric" prefix will be pre-pended. - * * Mode: - * 0 -- The Cloak of Death - * 1 -- The Cloak of Death [1,+3] - * 2 -- The Cloak of Death [1,+3] (+2 to Stealth) - * 3 -- The Cloak of Death [1,+3] (+2 to Stealth) {nifty} + * OD_NAME_ONLY : The Cloak of Death + * OD_NAME_AND_ENCHANT : The Cloak of Death [1,+3] + * OD_OMIT_INSCRIPTION : The Cloak of Death [1,+3] (+2 to Stealth) + * 0 : The Cloak of Death [1,+3] (+2 to Stealth) {nifty} + * + * OD_OMIT_PREFIX : Forbidden numeric prefix + * OD_NO_PLURAL : Forbidden use of plural + * OD_STORE : Assume to be aware and known + * OD_NO_FLAVOR : Allow to hidden flavor + * OD_FORCE_FLAVOR : Get un-shuffled flavor name */ -void object_desc(char *buf, object_type *o_ptr, int pref, int mode) +void object_desc(char *buf, object_type *o_ptr, u32b mode) { - cptr basenm, modstr; - int power, indexx, i; + /* Extract object kind name */ + cptr kindname = k_name + k_info[o_ptr->k_idx].name; + + /* Extract default "base" string */ + cptr basenm = kindname; + + /* Assume no "modifier" string */ + cptr modstr = ""; + + int power; bool aware = FALSE; bool known = FALSE; - - bool append_name = FALSE; + bool flavor = TRUE; bool show_weapon = FALSE; bool show_armour = FALSE; - cptr s, u; + cptr s, s0; char *t; char p1 = '(', p2 = ')'; @@ -1106,34 +1223,48 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) char tmp_val[MAX_NLEN+160]; char tmp_val2[MAX_NLEN+10]; + char fake_insc_buf[30]; - u32b f1, f2, f3; - - object_type *bow_ptr; + u32b flgs[TR_FLAG_SIZE]; + object_type *bow_ptr; object_kind *k_ptr = &k_info[o_ptr->k_idx]; - - monster_race *r_ptr = &r_info[o_ptr->pval]; + object_kind *flavor_k_ptr = &k_info[k_ptr->flavor]; /* Extract some flags */ - object_flags(o_ptr, &f1, &f2, &f3); + object_flags(o_ptr, flgs); /* See if the object is "aware" */ - if (object_aware_p(o_ptr) || (o_ptr->ident & IDENT_MENTAL)) aware = TRUE; + if (object_is_aware(o_ptr)) aware = TRUE; /* See if the object is "known" */ - if (object_known_p(o_ptr)) known = TRUE; + if (object_is_known(o_ptr)) known = TRUE; - /* Hack -- Extract the sub-type "indexx" */ - indexx = o_ptr->sval; + /* Allow flavors to be hidden when aware */ + if (aware && ((mode & OD_NO_FLAVOR) || plain_descriptions)) flavor = FALSE; - /* Extract default "base" string */ - basenm = get_object_name(o_ptr); + /* Object is in the inventory of a store or spoiler */ + if ((mode & OD_STORE) || (o_ptr->ident & IDENT_STORE)) + { + /* Don't show flavors */ + flavor = FALSE; - /* Assume no "modifier" string */ - modstr = ""; + /* Pretend known and aware */ + aware = TRUE; + known = TRUE; + } + /* Force to be flavor name only */ + if (mode & OD_FORCE_FLAVOR) + { + aware = FALSE; + flavor = TRUE; + known = FALSE; + + /* Cancel shuffling */ + flavor_k_ptr = k_ptr; + } /* Analyze the object */ switch (o_ptr->tval) @@ -1152,12 +1283,14 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_CAPTURE: { + monster_race *r_ptr = &r_info[o_ptr->pval]; + if (known) { if (!o_ptr->pval) { #ifdef JP - modstr = "¡Ê¶õ¡Ë"; + modstr = " (¶õ)"; #else modstr = " (empty)"; #endif @@ -1165,7 +1298,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) 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; @@ -1192,6 +1325,8 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_FIGURINE: case TV_STATUE: { + monster_race *r_ptr = &r_info[o_ptr->pval]; + #ifdef JP modstr = r_name + r_ptr->name; #else @@ -1216,24 +1351,19 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) /* Corpses */ case TV_CORPSE: { - modstr = r_name + r_ptr->name; + monster_race *r_ptr = &r_info[o_ptr->pval]; + modstr = r_name + r_ptr->name; #ifdef JP - sprintf(tmp_val2, "& #%s", basenm + 2); + basenm = "#%"; #else if (r_ptr->flags1 & RF1_UNIQUE) - { - sprintf(tmp_val2, "%s %s", basenm, "of #"); - } + basenm = "& % of #"; else - { - sprintf(tmp_val2, "& # %s", basenm + 2); - } + basenm = "& # %"; #endif - - basenm = tmp_val2; break; } @@ -1251,7 +1381,6 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) break; } - /* Armour */ case TV_BOOTS: case TV_GLOVES: @@ -1267,7 +1396,6 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) break; } - /* Lites (including a few "Specials") */ case TV_LITE: { @@ -1278,28 +1406,23 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_AMULET: { /* Known artifacts */ - if (artifact_p(o_ptr) && aware) break; - - if ((k_ptr->flags3 & TR3_INSTA_ART) && aware) break; + if (aware) + { + if (object_is_fixed_artifact(o_ptr)) break; + if (k_ptr->gen_flags & TRG_INSTA_ART) break; + } /* Color the object */ -#ifdef JP - modstr = J_amulet_adj[indexx]; -#else - modstr = amulet_adj[indexx]; -#endif + modstr = k_name + flavor_k_ptr->flavor_name; - if (aware) append_name = TRUE; - - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware ? "& %¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "& ¥¢¥ß¥å¥ì¥Ã¥È"; - else - basenm = aware ? "& #%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "& #¥¢¥ß¥å¥ì¥Ã¥È"; + if (!flavor) basenm = "%¤Î¥¢¥ß¥å¥ì¥Ã¥È"; + else if (aware) basenm = "%¤Î#¥¢¥ß¥å¥ì¥Ã¥È"; + else basenm = "#¥¢¥ß¥å¥ì¥Ã¥È"; #else - basenm = "& Amulet~"; - else - basenm = aware ? "& # Amulet~" : "& # Amulet~"; + if (!flavor) basenm = "& Amulet~ of %"; + else if (aware) basenm = "& # Amulet~ of %"; + else basenm = "& # Amulet~"; #endif break; @@ -1309,39 +1432,25 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_RING: { /* Known artifacts */ - if (artifact_p(o_ptr) && aware) break; - - if ((k_ptr->flags3 & TR3_INSTA_ART) && aware) break; + if (aware) + { + if (object_is_fixed_artifact(o_ptr)) break; + if (k_ptr->gen_flags & TRG_INSTA_ART) break; + } /* Color the object */ -#ifdef JP - modstr = J_ring_adj[indexx]; -#else - modstr = ring_adj[indexx]; -#endif - - if (aware) append_name = TRUE; + modstr = k_name + flavor_k_ptr->flavor_name; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware ? "& %¤Î»ØÎØ" : "& »ØÎØ"; - else - basenm = aware ? "& #%¤Î»ØÎØ" : "& #»ØÎØ"; + if (!flavor) basenm = "%¤Î»ØÎØ"; + else if (aware) basenm = "%¤Î#»ØÎØ"; + else basenm = "#»ØÎØ"; #else - basenm = "& Ring~"; - else - basenm = aware ? "& # Ring~" : "& # Ring~"; + if (!flavor) basenm = "& Ring~ of %"; + else if (aware) basenm = "& # Ring~ of %"; + else basenm = "& # Ring~"; #endif - - /* Hack -- The One Ring */ -#ifdef JP - if (!aware && (o_ptr->sval == SV_RING_POWER)) modstr = "¶â̵¹¤¤Î"; - if (!aware && (o_ptr->sval == SV_RING_AHO)) modstr = "¶âÍ­¹¤¤Î"; -#else - if (!aware && (o_ptr->sval == SV_RING_POWER)) modstr = "Plain Gold"; - if (!aware && (o_ptr->sval == SV_RING_AHO)) modstr = "Plain Goldarn"; -#endif if (!k_ptr->to_h && !k_ptr->to_d && (o_ptr->to_h || o_ptr->to_d)) show_weapon = TRUE; break; @@ -1355,22 +1464,16 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_STAFF: { /* Color the object */ -#ifdef JP - modstr = J_staff_adj[indexx]; -#else - modstr = staff_adj[indexx]; -#endif + modstr = k_name + flavor_k_ptr->flavor_name; - if (aware) append_name = TRUE; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware ? "& %¤Î¾ó" : "& ¾ó"; - else - basenm = aware ? "& #%¤Î¾ó" : "& #¾ó"; + if (!flavor) basenm = "%¤Î¾ó"; + else if (aware) basenm = "%¤Î#¾ó"; + else basenm = "#¾ó"; #else - basenm = "& Staff~"; - else - basenm = aware ? "& # Staff~" : "& # Staff~"; + if (!flavor) basenm = "& Staff~ of %"; + else if (aware) basenm = "& # Staff~ of %"; + else basenm = "& # Staff~"; #endif break; @@ -1379,22 +1482,16 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_WAND: { /* Color the object */ -#ifdef JP - modstr = J_wand_adj[indexx]; -#else - modstr = wand_adj[indexx]; -#endif + modstr = k_name + flavor_k_ptr->flavor_name; - if (aware) append_name = TRUE; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware? "& %¤ÎËâË¡ËÀ":"& ËâË¡ËÀ"; - else - basenm = aware ? "& #%¤ÎËâË¡ËÀ" : "& #ËâË¡ËÀ"; + if (!flavor) basenm = "%¤ÎËâË¡ËÀ"; + else if (aware) basenm = "%¤Î#ËâË¡ËÀ"; + else basenm = "#ËâË¡ËÀ"; #else - basenm = "& Wand~"; - else - basenm = aware ? "& # Wand~" : "& # Wand~"; + if (!flavor) basenm = "& Wand~ of %"; + else if (aware) basenm = "& # Wand~ of %"; + else basenm = "& # Wand~"; #endif break; @@ -1403,22 +1500,16 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_ROD: { /* Color the object */ -#ifdef JP - modstr = J_rod_adj[indexx]; -#else - modstr = rod_adj[indexx]; -#endif + modstr = k_name + flavor_k_ptr->flavor_name; - if (aware) append_name = TRUE; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware? "& %¤Î¥í¥Ã¥É":"& ¥í¥Ã¥É"; - else - basenm = aware ? "& #%¤Î¥í¥Ã¥É" : "& #¥í¥Ã¥É"; + if (!flavor) basenm = "%¤Î¥í¥Ã¥É"; + else if (aware) basenm = "%¤Î#¥í¥Ã¥É"; + else basenm = "#¥í¥Ã¥É"; #else - basenm = "& Rod~"; - else - basenm = aware ? "& # Rod~" : "& # Rod~"; + if (!flavor) basenm = "& Rod~ of %"; + else if (aware) basenm = "& # Rod~ of %"; + else basenm = "& # Rod~"; #endif break; @@ -1427,17 +1518,16 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_SCROLL: { /* Color the object */ - modstr = scroll_adj[indexx]; - if (aware) append_name = TRUE; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) + modstr = k_name + flavor_k_ptr->flavor_name; + #ifdef JP - basenm = aware ? "& %¤Î´¬Êª" : "& ´¬Êª"; - else - basenm = aware ? "& ¡Ö#¡×¤È½ñ¤«¤ì¤¿%¤Î´¬Êª" : "& ¡Ö#¡×¤È½ñ¤«¤ì¤¿´¬Êª"; + if (!flavor) basenm = "%¤Î´¬Êª"; + else if (aware) basenm = "¡Ö#¡×¤È½ñ¤«¤ì¤¿%¤Î´¬Êª"; + else basenm = "¡Ö#¡×¤È½ñ¤«¤ì¤¿´¬Êª"; #else - basenm = "& Scroll~"; - else - basenm = aware ? "& Scroll~ titled \"#\"" : "& Scroll~ titled \"#\""; + if (!flavor) basenm = "& Scroll~ of %"; + else if (aware) basenm = "& Scroll~ titled \"#\" of %"; + else basenm = "& Scroll~ titled \"#\""; #endif break; @@ -1446,22 +1536,16 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_POTION: { /* Color the object */ -#ifdef JP - modstr = J_potion_adj[indexx]; -#else - modstr = potion_adj[indexx]; -#endif + modstr = k_name + flavor_k_ptr->flavor_name; - if (aware) append_name = TRUE; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware ? "& %¤ÎÌô" : "& Ìô"; - else - basenm = aware ? "& #%¤ÎÌô" : "& #Ìô"; + if (!flavor) basenm = "%¤ÎÌô"; + else if (aware) basenm = "%¤Î#Ìô"; + else basenm = "#Ìô"; #else - basenm = "& Potion~"; - else - basenm = aware ? "& # Potion~" : "& # Potion~"; + if (!flavor) basenm = "& Potion~ of %"; + else if (aware) basenm = "& # Potion~ of %"; + else basenm = "& # Potion~"; #endif break; @@ -1470,37 +1554,30 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_FOOD: { /* Ordinary food is "boring" */ - if (o_ptr->sval >= SV_FOOD_MIN_FOOD) break; + if (!k_ptr->flavor_name) break; /* Color the object */ -#ifdef JP - modstr = J_food_adj[indexx]; -#else - modstr = food_adj[indexx]; -#endif + modstr = k_name + flavor_k_ptr->flavor_name; - if (aware) append_name = TRUE; - if (((plain_descriptions) && (aware)) || o_ptr->ident & IDENT_STOREB) #ifdef JP - basenm = aware ? "& %¤Î¥­¥Î¥³" : "& ¥­¥Î¥³"; - else - basenm = aware ? "& #%¤Î¥­¥Î¥³" : "& #¥­¥Î¥³"; + if (!flavor) basenm = "%¤Î¥­¥Î¥³"; + else if (aware) basenm = "%¤Î#¥­¥Î¥³"; + else basenm = "#¥­¥Î¥³"; #else - basenm = "& Mushroom~"; - else - basenm = aware ? "& # Mushroom~" : "& # Mushroom~"; + if (!flavor) basenm = "& Mushroom~ of %"; + else if (aware) basenm = "& # Mushroom~ of %"; + else basenm = "& # Mushroom~"; #endif break; } - case TV_PARCHEMENT: + case TV_PARCHMENT: { - modstr = basenm; #ifdef JP - basenm = "& ÍÓÈé»æ - #"; + basenm = "ÍÓÈé»æ - %"; #else - basenm = "& Parchement~ - #"; + basenm = "& Parchment~ - %"; #endif break; } @@ -1508,14 +1585,13 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) /* Magic Books */ case TV_LIFE_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& À¸Ì¿¤ÎËâË¡½ñ#"; + basenm = "À¸Ì¿¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Life Magic #"; + basenm = "& Book~ of Life Magic %"; else - basenm = "& Life Spellbook~ #"; + basenm = "& Life Spellbook~ %"; #endif break; @@ -1523,14 +1599,13 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_SORCERY_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& Àç½Ñ¤ÎËâË¡½ñ#"; + basenm = "Àç½Ñ¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Sorcery #"; + basenm = "& Book~ of Sorcery %"; else - basenm = "& Sorcery Spellbook~ #"; + basenm = "& Sorcery Spellbook~ %"; #endif break; @@ -1538,14 +1613,13 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_NATURE_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& ¼«Á³¤ÎËâË¡½ñ#"; + basenm = "¼«Á³¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Nature Magic #"; + basenm = "& Book~ of Nature Magic %"; else - basenm = "& Nature Spellbook~ #"; + basenm = "& Nature Spellbook~ %"; #endif break; @@ -1553,14 +1627,13 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_CHAOS_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& ¥«¥ª¥¹¤ÎËâË¡½ñ#"; + basenm = "¥«¥ª¥¹¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Chaos Magic #"; + basenm = "& Book~ of Chaos Magic %"; else - basenm = "& Chaos Spellbook~ #"; + basenm = "& Chaos Spellbook~ %"; #endif break; @@ -1568,14 +1641,13 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_DEATH_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& °Å¹õ¤ÎËâË¡½ñ#"; + basenm = "°Å¹õ¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Death Magic #"; + basenm = "& Book~ of Death Magic %"; else - basenm = "& Death Spellbook~ #"; + basenm = "& Death Spellbook~ %"; #endif break; @@ -1583,14 +1655,13 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_TRUMP_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& ¥È¥é¥ó¥×¤ÎËâË¡½ñ#"; + basenm = "¥È¥é¥ó¥×¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Trump Magic #"; + basenm = "& Book~ of Trump Magic %"; else - basenm = "& Trump Spellbook~ #"; + basenm = "& Trump Spellbook~ %"; #endif break; @@ -1598,70 +1669,95 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) case TV_ARCANE_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& Èë½Ñ¤ÎËâË¡½ñ#"; + basenm = "Èë½Ñ¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Arcane Magic #"; + basenm = "& Book~ of Arcane Magic %"; else - basenm = "& Arcane Spellbook~ #"; + basenm = "& Arcane Spellbook~ %"; #endif break; } - case TV_ENCHANT_BOOK: + + case TV_CRAFT_BOOK: { - modstr = basenm; #ifdef JP - basenm = "& ¾¢¤ÎËâË¡½ñ#"; + basenm = "¾¢¤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Craft Magic #"; + basenm = "& Book~ of Craft Magic %"; else - basenm = "& Craft Spellbook~ #"; + basenm = "& Craft Spellbook~ %"; #endif 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 %"; + else + basenm = "& Daemon Spellbook~ %"; +#endif + + break; + } + + case TV_CRUSADE_BOOK: + { +#ifdef JP + basenm = "Ç˼٤ÎËâË¡½ñ%"; #else if (mp_ptr->spell_book == TV_LIFE_BOOK) - basenm = "& Book~ of Daemon Magic #"; + basenm = "& Book~ of Crusade Magic %"; else - basenm = "& Daemon Spellbook~ #"; + basenm = "& Crusade Spellbook~ %"; #endif 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; } + case TV_HEX_BOOK: + { +#ifdef JP + basenm = "¼ö½Ñ¤ÎËâË¡½ñ%"; +#else + if (mp_ptr->spell_book == TV_LIFE_BOOK) + basenm = "& Book~ of Crusade Magic %"; + else + basenm = "& Crusade Spellbook~ %"; +#endif + break; + } /* Hack -- Gold/Gems */ case TV_GOLD: @@ -1674,7 +1770,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) default: { #ifdef JP - strcpy(buf, "(¤Ê¤·)"); + strcpy(buf, "(¤Ê¤·)"); #else strcpy(buf, "(nothing)"); #endif @@ -1683,6 +1779,12 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) } } + /* Use full name from k_info or a_info */ + if (aware && have_flag(flgs, TR_FULL_NAME)) + { + if (known && o_ptr->name1) basenm = a_name + a_info[o_ptr->name1].name; + else basenm = kindname; + } /* Start dumping the result */ t = tmp_val; @@ -1694,31 +1796,24 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) s = basenm; /* No prefix */ - if (!pref) + if (mode & OD_OMIT_PREFIX) { /* Nothing */ } else if (o_ptr->number > 1) { - if ( old_way_of_kaz == 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, "¤Ä¤Î "); - } - else - { - t = object_desc_kosuu(t,o_ptr); - t = object_desc_str(t, "¤Î "); - } + 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 (object_is_fixed_artifact(o_ptr)) t = object_desc_str(t, "¡ú"); + else if (o_ptr->art_name) t = object_desc_str(t, "¡ù"); + } #else @@ -1729,7 +1824,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) s = basenm + 2; /* No prefix */ - if (!pref) + if (mode & OD_OMIT_PREFIX) { /* Nothing */ } @@ -1748,33 +1843,35 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) } /* Hack -- The only one of its kind */ - else if (known && (artifact_p(o_ptr) || o_ptr->art_name)) - { - t = object_desc_str(t, "The "); - } - - /* Unique corpses are unique */ - else if ((o_ptr->tval == TV_CORPSE) && (r_ptr->flags1 & RF1_UNIQUE)) + else if ((known && object_is_artifact(o_ptr)) || + ((o_ptr->tval == TV_CORPSE) && + (r_info[o_ptr->pval].flags1 & RF1_UNIQUE))) { t = object_desc_str(t, "The "); } - /* A single one, with a vowel in the modifier */ - else if ((*s == '#') && (is_a_vowel(modstr[0]))) + /* A single one */ + else { - t = object_desc_str(t, "an "); - } + bool vowel; - /* A single one, with a vowel */ - else if (is_a_vowel(*s)) - { - t = object_desc_str(t, "an "); - } + switch (*s) + { + case '#': vowel = is_a_vowel(modstr[0]); break; + case '%': vowel = is_a_vowel(*kindname); break; + default: vowel = is_a_vowel(*s); break; + } - /* A single one, without a vowel */ - else - { - t = object_desc_str(t, "a "); + if (vowel) + { + /* A single one, with a vowel */ + t = object_desc_str(t, "an "); + } + else + { + /* A single one, without a vowel */ + t = object_desc_str(t, "a "); + } } } @@ -1785,7 +1882,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) s = basenm; /* No pref */ - if (!pref) + if (mode & OD_OMIT_PREFIX) { /* Nothing */ } @@ -1804,67 +1901,103 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) } /* Hack -- The only one of its kind */ - else if (known && (artifact_p(o_ptr) || o_ptr->art_name)) + else if (known && object_is_artifact(o_ptr)) + { + t = object_desc_str(t, "The "); + } + + /* Hack -- single items get no prefix */ + else + { + /* Nothing */ + } + } +#endif + + /* Paranoia -- skip illegal tildes */ + /* while (*s == '~') s++; */ + +#ifdef JP + if (object_is_smith(o_ptr)) + { + t = object_desc_str(t, format("ÃÃÌê»Õ%s¤Î", player_name)); + } + + /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¡¢Ì¾¤Î¤¢¤ë¥¢¥¤¥Æ¥à¤Î̾Á°¤òÉղ乤ë */ + if (known) + { + /* ¥é¥ó¥À¥à¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È */ + if (o_ptr->art_name) + { + cptr 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) && + (strncmp(temp, "¡Ô", 2) != 0) && + (temp[0] != '\'')) + t = object_desc_str(t, temp); + } + /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à */ + 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); + } + } + /* ̾¤Î¤¢¤ë¥¢¥¤¥Æ¥à */ + else if (object_is_ego(o_ptr)) + { + ego_item_type *e_ptr = &e_info[o_ptr->name2]; + t = object_desc_str(t, e_name + e_ptr->name); + } + } +#endif + + /* Copy the string */ + for (s0 = NULL; *s || s0; ) + { + /* The end of the flavour/kind string. */ + if (!*s) { - t = object_desc_str(t, "The "); + s = s0 + 1; + s0 = NULL; } - /* Hack -- single items get no prefix */ - else + /* Begin to append the modifier (flavor) */ + else if ((*s == '#') && !s0) { - /* Nothing */ + s0 = s; + s = modstr; + + /* Paranoia -- Never append multiple modstrs */ + modstr = ""; } - } -#endif - /* Paranoia -- skip illegal tildes */ - /* while (*s == '~') s++; */ + /* Begin to append the kind name */ + else if ((*s == '%') && !s0) + { + s0 = s; + s = kindname; -#ifdef JP - if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3) - { - t = object_desc_str(t,format("ÃÃÌê»Õ%s¤Î",player_name)); - } + /* Paranoia -- Never append multiple kindnames */ + kindname = ""; + } - /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¡¢Ì¾¤Î¤¢¤ë¥¢¥¤¥Æ¥à¤Î̾Á°¤òÉղ乤ë */ - if (known) { - /* ¥é¥ó¥À¥à¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È */ - if (o_ptr->art_name) - { 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); - } - /* ÅÁÀâ¤Î¥¢¥¤¥Æ¥à */ - 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->name2) { - ego_item_type *e_ptr = &e_info[o_ptr->name2]; - t=object_desc_str(t, (e_name + e_ptr->name)); - } - } -#endif - /* Copy the string */ - for (; *s; s++) - { +#ifndef JP /* Pluralizer */ -#ifdef JP - if (*s == '#') -#else - if (*s == '~') + else if (*s == '~') { /* Add a plural if needed */ - if (pref && o_ptr->number != 1) + if (!(mode & OD_NO_PLURAL) && (o_ptr->number != 1)) { char k = t[-1]; @@ -1876,30 +2009,15 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) /* Add an 's' */ *t++ = 's'; } + s++; } - - /* Modifier */ - else if (*s == '#') #endif - { - /* Insert the modifier */ - for (u = modstr; *u; u++) *t++ = *u; - } - -#ifdef JP - else if (*s == '%') - /* saigo ¤ÎÂå¤ï¤ê¡£¸úǽ¤òÉÕ²½¤¹¤ë by ita*/ - { - modstr=get_object_name(o_ptr); - for (u = modstr; *u; u++) *t++ = *u; - } -#endif /* Normal */ else { /* Copy */ - *t++ = *s; + *t++ = *s++; } } @@ -1907,38 +2025,38 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) *t = '\0'; - /* Append the "kind name" to the "base name" */ -#ifndef JP - if (append_name) - { - t = object_desc_str(t, " of "); - t = object_desc_str(t, get_object_name(o_ptr)); - } -#endif - - #ifdef JP - /* '¡Ø'¤«¤é»Ï¤Þ¤ëÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ¸å¤ËÉղ乤ë */ - if (known) { + /* '¡Ø'¤«¤é»Ï¤Þ¤ëÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ¸å¤ËÉղ乤ë */ + if (known) + { /* ¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î̾Á°¤Ï¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤Ëµ­Ï¿ - ¤µ¤ì¤ë¤Î¤Ç¡¢±Ñ¸ìÈǤÎ̾Á°¤â¤½¤ì¤é¤·¤¯ÊÑ´¹¤¹¤ë */ + ¤µ¤ì¤ë¤Î¤Ç¡¢±Ñ¸ìÈǤÎ̾Á°¤â¤½¤ì¤é¤·¤¯ÊÑ´¹¤¹¤ë */ if (o_ptr->art_name) - { 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,"¡Ù");} - - } - 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)); - } - } + { + char temp[256]; + int itemp; + strcpy(temp, quark_str(o_ptr->art_name)); + /* MEGA HACK by ita */ + if (strncmp(temp, "¡Ø", 2) == 0 || + 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 (object_is_fixed_artifact(o_ptr)) + { + 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 = quark_str(o_ptr->inscription); @@ -1956,66 +2074,67 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) if (*str) { /* Find the '#' */ - cptr str = strchr(quark_str(o_ptr->inscription), '#'); + cptr str = my_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,"¡Ù"); } } - } + } #else - if ((o_ptr->tval > TV_CAPTURE) && o_ptr->xtra3) + if (object_is_smith(o_ptr)) { - t = object_desc_str(t,format(" of %s the smith",player_name)); + t = object_desc_str(t,format(" of %s the Smith",player_name)); } /* Hack -- Append "Artifact" or "Special" names */ - if (known) + if (known && !have_flag(flgs, TR_FULL_NAME)) { - if (o_ptr->inscription && strchr(quark_str(o_ptr->inscription), '#')) - { - /* Find the '#' */ - cptr str = strchr(quark_str(o_ptr->inscription), '#'); - - /* Add the false name */ - t = object_desc_chr(t, ' '); - t = object_desc_str(t, &str[1]); - } - /* Is it a new random artifact ? */ - else if (o_ptr->art_name) + if (o_ptr->art_name) { t = object_desc_chr(t, ' '); - t = object_desc_str(t, quark_str(o_ptr->art_name)); } /* Grab any artifact name */ - else if (o_ptr->name1) + else if (object_is_fixed_artifact(o_ptr)) { 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 */ - else if (o_ptr->name2) + else { - ego_item_type *e_ptr = &e_info[o_ptr->name2]; + if (object_is_ego(o_ptr)) + { + 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_chr(t, ' '); + t = object_desc_str(t, e_name + e_ptr->name); + } + + if (o_ptr->inscription && my_strchr(quark_str(o_ptr->inscription), '#')) + { + /* Find the '#' */ + cptr str = my_strchr(quark_str(o_ptr->inscription), '#'); + + /* Add the false name */ + t = object_desc_chr(t, ' '); + t = object_desc_str(t, &str[1]); + } } } #endif - /* No more details wanted */ - if (mode < 1) goto copyback; + if (mode & OD_NAME_ONLY) goto object_desc_done; /* Hack -- Chests must be described in detail */ if (o_ptr->tval == TV_CHEST) @@ -2030,11 +2149,10 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) 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" */ @@ -2043,20 +2161,18 @@ t = object_desc_str(t, "( 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 - } } @@ -2069,61 +2185,55 @@ t = object_desc_str(t, "( 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: @@ -2132,31 +2242,37 @@ t = object_desc_str(t, "( 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, "(·ÙÊóÁõÃÖ)"); +#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; } } @@ -2165,7 +2281,11 @@ t = object_desc_str(t, "( /* Display the item like a weapon */ - if (f3 & (TR3_SHOW_MODS)) show_weapon = TRUE; + if (have_flag(flgs, TR_SHOW_MODS)) show_weapon = TRUE; + + /* Display the item like a weapon */ + if (object_is_smith(o_ptr) && (o_ptr->xtra3 == 1 + ESSENCE_SLAY_GLOVE)) + show_weapon = TRUE; /* Display the item like a weapon */ if (o_ptr->to_h && o_ptr->to_d) show_weapon = TRUE; @@ -2202,10 +2322,10 @@ t = object_desc_str(t, "( case TV_BOW: /* Mega-Hack -- Extract the "base power" */ - power = (o_ptr->sval % 10); + power = bow_tmul(o_ptr->sval); /* Apply the "Extra Might" flag */ - if (f3 & (TR3_XTRA_MIGHT)) power++; + if (have_flag(flgs, TR_XTRA_MIGHT)) power++; /* Append a special "damage" string */ t = object_desc_chr(t, ' '); @@ -2254,118 +2374,72 @@ t = object_desc_str(t, "( 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,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_is_known(bow_ptr)) avgdam += (bow_ptr->to_d * 10); - /* effect of ammo */ + /* Effect of ammo */ if (known) avgdam += (o_ptr->to_d * 10); - /* Stop compiler warnings */ - energy_fire = 100; - tmul = 1; - - /* Analyze the launcher */ - switch (bow_ptr->sval) - { - /* Sling and ammo */ - case SV_SLING: - { - tmul = 2; - energy_fire = 8000; - break; - } - - /* Short Bow and Arrow */ - case SV_SHORT_BOW: - { - tmul = 2; - energy_fire = 10000; - break; - } - - /* Long Bow and Arrow */ - case SV_LONG_BOW: - { - tmul = 3; - energy_fire = 10000; - break; - } - - case SV_NAMAKE_BOW: - { - tmul = 3; - energy_fire = 7777; - break; - } - - /* Light Crossbow and Bolt */ - case SV_LIGHT_XBOW: - { - tmul = 3; - energy_fire = 12000; - break; - } - - /* Heavy Crossbow and Bolt */ - case SV_HEAVY_XBOW: - { - tmul = 4; - energy_fire = 13333; - break; - } - } - /* 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); + + /* Get extra damage from concentration */ + if (p_ptr->concent) avgdam = boost_concentration_damage(avgdam); + 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); t = object_desc_chr(t, '/'); - tmul = p_ptr->num_fire; - if (tmul == 0) + if (p_ptr->num_fire == 0) { t = object_desc_chr(t, '0'); } else { - /* calc effects of energy */ + /* Calc effects of energy */ avgdam *= (p_ptr->num_fire * 100); - avgdam /= energy_fire; - t = object_desc_num(t, avgdam); } t = object_desc_chr(t, p2); } + else if ((p_ptr->pclass == CLASS_NINJA) && (o_ptr->tval == TV_SPIKE)) + { + int avgdam = p_ptr->mighty_throw ? (1 + 3) : 1; + s16b energy_fire = 100 - p_ptr->lev; + + avgdam += ((p_ptr->lev + 30) * (p_ptr->lev + 30) - 900) / 55; + /* 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 */ + avgdam = 100 * avgdam / energy_fire; + + t = object_desc_num(t, avgdam); + t = object_desc_chr(t, p2); + } /* Add the armor bonuses */ if (known) @@ -2402,326 +2476,336 @@ t = object_desc_str(t, "( /* No more details wanted */ - if (mode < 2) goto copyback; + if (mode & OD_NAME_AND_ENCHANT) goto object_desc_done; - /* - * 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 && (f1 & (TR1_PVAL_MASK))) - { - /* 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 (f3 & (TR3_HIDE_TYPE)) - { - /* Nothing */ - } + /* Do not display the "pval" flags */ + if (have_flag(flgs, TR_HIDE_TYPE)) + { + /* Nothing */ + } - /* Speed */ - else if (f1 & (TR1_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 (f1 & (TR1_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 (f1 & (TR1_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 (f1 & (TR1_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 (f1 & (TR1_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 (f1 & (TR1_TUNNEL)) + /* Hack -- Process Lanterns/Torches */ + if ((o_ptr->tval == TV_LITE) && (!(object_is_fixed_artifact(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 - + } } /* No more details wanted */ - if (mode < 3) goto copyback; + if (mode & OD_OMIT_INSCRIPTION) goto object_desc_done; - /* No inscription yet */ + /* Prepare real inscriptions in a buffer */ tmp_val2[0] = '\0'; + /* Auto abbreviation inscribe */ + if ((abbrev_extra || abbrev_all) && (o_ptr->ident & IDENT_MENTAL)) + { + if (!o_ptr->inscription || !my_strchr(quark_str(o_ptr->inscription), '%')) + { + bool kanji, all; + +#ifdef JP + kanji = TRUE; +#else + kanji = FALSE; +#endif + all = abbrev_all; + + get_ability_abbreviation(tmp_val2, o_ptr, kanji, all); + } + } + /* Use the standard inscription if available */ if (o_ptr->inscription) { - char *u = tmp_val2; + char buff[1024]; - strcpy(tmp_val2, quark_str(o_ptr->inscription)); + if (tmp_val2[0]) strcat(tmp_val2, ", "); - for (; *u && (*u != '#'); u++); + /* Get inscription and convert {%} */ + get_inscription(buff, o_ptr); - *u = '\0'; + /* strcat with correct treating of kanji */ + my_strcat(tmp_val2, buff, sizeof(tmp_val2)); } + + /* No fake inscription yet */ + fake_insc_buf[0] = '\0'; + /* Use the game-generated "feeling" otherwise, if available */ - else if (o_ptr->feeling) + if (o_ptr->feeling) { - strcpy(tmp_val2, game_inscriptions[o_ptr->feeling]); + strcpy(fake_insc_buf, game_inscriptions[o_ptr->feeling]); } /* Note "cursed" if the item is known to be cursed */ - else if (cursed_p(o_ptr) && (known || (o_ptr->ident & (IDENT_SENSE)))) + else if (object_is_cursed(o_ptr) && (known || (o_ptr->ident & IDENT_SENSE))) { #ifdef JP -strcpy(tmp_val2, "¼ö¤ï¤ì¤Æ¤¤¤ë"); + strcpy(fake_insc_buf, "¼ö¤ï¤ì¤Æ¤¤¤ë"); #else - strcpy(tmp_val2, "cursed"); + strcpy(fake_insc_buf, "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)) + && aware && !known + && !(o_ptr->ident & IDENT_SENSE)) { #ifdef JP -strcpy(tmp_val2, "̤´ÕÄê"); + strcpy(fake_insc_buf, "̤´ÕÄê"); #else - strcpy(tmp_val2, "unidentified"); + strcpy(fake_insc_buf, "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(fake_insc_buf, "¶õ"); #else - strcpy(tmp_val2, "empty"); + strcpy(fake_insc_buf, "empty"); #endif - } /* Note "tried" if the object has been tested unsuccessfully */ - else if (!aware && object_tried_p(o_ptr)) + else if (!aware && object_is_tried(o_ptr)) { #ifdef JP -strcpy(tmp_val2, "̤ȽÌÀ"); + strcpy(fake_insc_buf, "̤ȽÌÀ"); #else - strcpy(tmp_val2, "tried"); + strcpy(fake_insc_buf, "tried"); #endif - } /* Note the discount, if any */ - else if (o_ptr->discount) + if (o_ptr->discount) { - (void)object_desc_num(tmp_val2, o_ptr->discount); + /* Hidden by real inscription unless in a store */ + if (!tmp_val2[0] || (o_ptr->ident & IDENT_STORE)) + { + char discount_num_buf[4]; + + /* Append to other fake inscriptions if any */ + if (fake_insc_buf[0]) strcat(fake_insc_buf, ", "); + + (void)object_desc_num(discount_num_buf, o_ptr->discount); + strcat(fake_insc_buf, discount_num_buf); #ifdef JP -strcat(tmp_val2, "%°ú¤­"); + strcat(fake_insc_buf, "%°ú¤­"); #else - strcat(tmp_val2, "% off"); + strcat(fake_insc_buf, "% off"); #endif - + } } + /* Append the inscription, if any */ - if (tmp_val2[0]) + if (fake_insc_buf[0] || tmp_val2[0]) { /* Append the inscription */ t = object_desc_chr(t, ' '); t = object_desc_chr(t, c1); - t = object_desc_str(t, tmp_val2); - t = object_desc_chr(t, c2); - } -copyback: - t = tmp_val; - for (i = 0; i < MAX_NLEN-2; i++) - { -#ifdef JP - if (iskanji(*(t+i))) + /* Append fake inscriptions */ + if (fake_insc_buf[0]) { - *(buf+i) = *(t+i); - i++; + t = object_desc_str(t, fake_insc_buf); } -#endif - *(buf+i) = *(t+i); - } - if (i == MAX_NLEN-2) - { -#ifdef JP - if (iskanji(*(t+i))) - *(buf+i) = '\0'; - else -#endif - *(buf+i) = *(t+i); + + /* Append a separater */ + if (fake_insc_buf[0] && tmp_val2[0]) + { + t = object_desc_chr(t, ','); + t = object_desc_chr(t, ' '); + } + + /* Append real inscriptions */ + if (tmp_val2[0]) + { + t = object_desc_str(t, tmp_val2); + } + + t = object_desc_chr(t, c2); } - *(buf+MAX_NLEN-1) = '\0'; + +object_desc_done: + my_strcpy(buf, tmp_val, MAX_NLEN); } +