[ViewVC] Diff of: cvs/deliantra/server/common/item.C

Comparing deliantra/server/common/item.C (file contents):
Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.83 by root, Sun Apr 11 00:34:05 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
47	* Note that using the term 'human' may not be very accurate, humanoid	47	* Note that using the term 'human' may not be very accurate, humanoid
48	* may be better.	48	* may be better.
49	* Basically, for the use/nonuse, the code does something like:	49	* Basically, for the use/nonuse, the code does something like:
50	* "This item goes %s\n", with the use/nonuse values filling in the %s	50	* "This item goes %s\n", with the use/nonuse values filling in the %s
51	*/	51	*/
		52	// see include/object.h
52	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {	53	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
53	{KW_body_skill , "You can use it as your skill" , "It is used as a skill"},	54	{KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
54	{KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},	55	{KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
55	{KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},	56	{KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
56	{KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},	57	{KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
…		…
65	{KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},	66	{KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
66	{KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},	67	{KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
67	/{"body_dragon_torso", "your body", "a dragon's body"} /	68	/{"body_dragon_torso", "your body", "a dragon's body"} /
68	};	69	};
69		70
70	static char numbers[21][20] = {
71	"no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
72	"eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
73	"eighteen", "nineteen", "twenty"
74	};
75
76	static char numbers_10[10][20] = {	71	static char numbers_10[10][20] = {
77	"zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",	72	"zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
78	"eighty", "ninety"	73	"eighty", "ninety"
79	};	74	};
80		75
81	static char levelnumbers[21][20] = {	76	static char ordnumbers[21][20] = {
82	"zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",	77	"zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
83	"eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",	78	"eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
84	"fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen",	79	"fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
85	"nineteen", "twentieth"	80	"nineteenth", "twentieth"
86	};	81	};
87		82
88	static char levelnumbers_10[11][20] = {	83	static char ordnumbers_10[11][20] = {
89	"zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",	84	"zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
90	"seventieth", "eightieth", "ninetieth"	85	"seventieth", "eightieth", "ninetieth"
91	};	86	};
92		87
93	/* The following is a large table of item types, the fields are:	88	/* The following is a large table of item types, the fields are:
…		…
156	{EXIT, "exit", "exits", 0, 0},	151	{EXIT, "exit", "exits", 0, 0},
157	{ENCOUNTER, "encounter", "encounters", 0, 0},	152	{ENCOUNTER, "encounter", "encounters", 0, 0},
158	{SHOP_FLOOR, "shop floor", "shop floors", 0, 0},	153	{SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
159	{SHOP_MAT, "shop mat", "shop mats", 0, 0},	154	{SHOP_MAT, "shop mat", "shop mats", 0, 0},
160	{RING, "ring", "rings", SK_JEWELER, 0},	155	{RING, "ring", "rings", SK_JEWELER, 0},
161	{FLOOR, "floor", "floors", 0, 0},	156	// {FLOOR, "floor", "floors", 0, 0},
162	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},	157	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
163	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},	158	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
164	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},	159	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},
165	{LIGHTER, "lighter", "lighters", 0, 0},	160	{LIGHTER, "lighter", "lighters", 0, 0},
166	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},	161	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
…		…
170	{SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},	165	{SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
171	{CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},	166	{CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
172	{SPINNER, "spinner", "spinners", 0, 0},	167	{SPINNER, "spinner", "spinners", 0, 0},
173	{GATE, "gate", "gates", 0, 0},	168	{GATE, "gate", "gates", 0, 0},
174	{BUTTON, "button", "buttons", 0, 0},	169	{BUTTON, "button", "buttons", 0, 0},
175	{CF_HANDLE, "cf handle", "cf handles", 0, 0},	170	{T_HANDLE, "cf handle", "cf handles", 0, 0},
176	{HOLE, "hole", "holes", 0, 0},	171	{HOLE, "hole", "holes", 0, 0},
177	{TRAPDOOR, "trapdoor", "trapdoors", 0, 0},	172	{TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
178	{SIGN, "sign", "signs", 0, 0},	173	{SIGN, "sign", "signs", 0, 0},
179	{BOOTS, "boots", "boots", SK_SMITHERY, 0},	174	{BOOTS, "boots", "boots", SK_SMITHERY, 0},
180	{GLOVES, "gloves", "gloves", SK_SMITHERY, 0},	175	{GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
…		…
207	{BUILDER, "item builder", "item builders", 0, 0},	202	{BUILDER, "item builder", "item builders", 0, 0},
208	{MATERIAL, "building material", "building materials", 0, 0},	203	{MATERIAL, "building material", "building materials", 0, 0},
209	{ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},	204	{ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
210	};	205	};
211		206
212	const int item_types_size = sizeof (item_types) / sizeof (*item_types);	207	static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
213
214	materialtype_t *materialt;
215
216	/*
217	materialtype material[NROFMATERIALS] = {
218	* P M F E C C A D W G P S P T F C D D C C G H B I *
219	* H A I L O O C R E H O L A U E A E E H O O O L N *
220	* Y G R E L N I A A O I O R R A N P A A U D L I T *
221	* S I E C D F D I P S S W A N R C L T O N Y N R *
222	* I C T U N O T O L E E H S T P D N *
223	{"paper", {15,10,17, 9, 5, 7,13, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
224	{"metal", { 2,12, 3,12, 2,10, 7, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
225	{"glass", {14,11, 8, 3,10, 5, 1, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
226	{"leather", { 5,10,10, 3, 3,10,10, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
227	{"wood", {10,11,13, 2, 2,10, 9, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
228	{"organics", { 3,12, 9,11, 3,10, 9, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
229	{"stone", { 2, 5, 2, 2, 2, 2, 1, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
230	{"cloth", {14,11,13, 4, 4, 5,10, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
231	{"adamant", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
232	{"liquid", { 0, 8, 9, 6,17, 0,15, 0,20,15,12,0,0,0,0,11,0,0,0,0,0,0,0,0}},
233	{"soft metal",{ 6,12, 6,14, 2,10, 1, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
234	{"bone", {10, 9, 4, 5, 3,10,10, 0,20,15, 0,0,0,0,0, 2,0,0,0,0,0,0,0,0}},
235	{"ice", {14,11,16, 5, 0, 5, 6, 0,20,15, 0,0,0,0,0, 7,0,0,0,0,0,0,0,0}}
236	};
237	*/
238		208
239	/* This curve may be too steep. But the point is that there should	209	/* This curve may be too steep. But the point is that there should
240	* be tough choices - there is no real point to this if everyone can	210	* be tough choices - there is no real point to this if everyone can
241	* wear whatever they want with no worries. Perhaps having the steep	211	* wear whatever they want with no worries. Perhaps having the steep
242	* curve is good (maybe even steeper), but allowing players to	212	* curve is good (maybe even steeper), but allowing players to
…		…
319		289
320	enc += op->stats.luck;	290	enc += op->stats.luck;
321		291
322	/* Do spell paths now */	292	/* Do spell paths now */
323	for (i = 1; i < NRSPELLPATHS; i++)	293	for (i = 1; i < NRSPELLPATHS; i++)
324	{
325	if (op->path_attuned & (1 << i))	294	if (op->path_attuned & (1 << i))
326	enc++;	295	enc++;
327	else if (op->path_denied & (1 << i))	296	else if (op->path_denied & (1 << i))
328	enc -= 2;	297	enc -= 2;
329	else if (op->path_repelled & (1 << i))	298	else if (op->path_repelled & (1 << i))
330	enc--;	299	enc--;
331	}
332		300
333	if (op->flag [FLAG_LIFESAVE ]) enc += 5;	301	if (op->flag [FLAG_LIFESAVE ]) enc += 5;
334	if (op->flag [FLAG_REFL_SPELL ]) enc += 3;	302	if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
335	if (op->flag [FLAG_REFL_MISSILE]) enc += 2;	303	if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
336	if (op->flag [FLAG_XRAYS ]) enc += 2;	304	if (op->flag [FLAG_XRAYS ]) enc += 2;
…		…
381	* but do put a newline at the end. Useful when dumping to files	349	* but do put a newline at the end. Useful when dumping to files
382	*/	350	*/
383	const char *	351	const char *
384	describe_resistance (const object *op, int newline)	352	describe_resistance (const object *op, int newline)
385	{	353	{
386	static char buf[VERY_BIG_BUF];	354	static dynbuf_text buf; buf.clear ();
387	char buf1[VERY_BIG_BUF];
388	int tmpvar;
389		355
390	buf[0] = 0;	356	for (int i = 0; i < NROFATTACKS; i++)
391	for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
392	{
393	if (op->resist[tmpvar] && (op->type != FLESH \|\| atnr_is_dragon_enabled (tmpvar) == 1))	357	if (op->resist[i] && (op->type != FLESH \|\| atnr_is_dragon_enabled (i) == 1))
394	{	358	buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
395	if (!newline)
396	sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
397	else
398	sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
399
400	strcat (buf, buf1);
401	}
402	}
403		359
404	return buf;	360	return buf;
405	}	361	}
406
407		362
408	/*	363	/*
409	* query_weight(object) returns a character pointer to a static buffer	364	* query_weight(object) returns a character pointer to a static buffer
410	* containing the text-representation of the weight of the given object.	365	* containing the text-representation of the weight of the given object.
411	* The buffer will be overwritten by the next call to query_weight().	366	* The buffer will be overwritten by the next call to query_weight().
…		…
432	/*	387	/*
433	* Returns the pointer to a static buffer containing	388	* Returns the pointer to a static buffer containing
434	* the number requested (of the form first, second, third...)	389	* the number requested (of the form first, second, third...)
435	*/	390	*/
436	const char *	391	const char *
437	get_levelnumber (int i)	392	ordinal (int i)
438	{	393	{
439	static char buf[MAX_BUF];	394	if (i < 0)
440		395	return format ("minus %s", ordinal (-i));
441	if (i > 99)
442	{
443	sprintf (buf, "%d.", i);
444	return buf;
445	}
446		396
447	if (i < 21)	397	if (i < 21)
448	return levelnumbers[i];
449
450	if (!(i % 10))
451	return levelnumbers_10[i / 10];
452
453	strcpy (buf, numbers_10[i / 10]);
454	strcat (buf, levelnumbers[i % 10]);
455	return buf;
456	}
457
458	/*
459	* get_number(integer) returns the text-representation of the given number
460	* in a static buffer. The buffer might be overwritten at the next
461	* call to get_number().
462	* It is currently only used by the query_name() function.
463	*/
464	const char *
465	get_number (int i)
466	{
467	if (i <= 20)
468	return numbers[i];	398	return ordnumbers[i];
		399
		400	int digit = i % 10;
		401
		402	if (i >= 100)
		403	return format (
		404	digit == 1 ? "%dst"
		405	: digit == 2 ? "%dnd"
		406	: digit == 3 ? "%drd"
		407	: "%dth",
		408	i
		409	);
		410
		411	if (digit == 0)
		412	return ordnumbers_10[i / 10];
469	else	413	else
470	{	414	return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
471	static char buf[MAX_BUF];
472
473	sprintf (buf, "%d", i);
474	return buf;
475	}
476	}	415	}
477		416
478	/*	417	/*
479	* Returns pointer to static buffer containing ring's or amulet's	418	* Returns pointer to static buffer containing ring's or amulet's
480	* abilities	419	* abilities
…		…
486	*/	425	*/
487		426
488	/* Aug 95 modified this slightly so that Skill tools don't have magic bonus	427	/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
489	* from stats.sp - b.t.	428	* from stats.sp - b.t.
490	*/	429	*/
491	const char *	430	static const char *
492	ring_desc (const object *op)	431	ring_desc (const object *op)
493	{	432	{
494	static dynbuf_text buf; buf.clear ();	433	static dynbuf_text buf; buf.clear ();
495	int attr, val, len;	434	int attr, val, len;
496		435
497	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	436	if (op->flag [FLAG_IDENTIFIED])
498	{	437	{
499	for (attr = 0; attr < NUM_STATS; attr++)	438	for (attr = 0; attr < NUM_STATS; attr++)
500	if ((val = op->stats.stat (attr)))	439	if ((val = op->stats.stat (attr)))
501	buf.printf ("(%s%+d)", short_stat_name[attr], val);	440	buf.printf ("(%s%+d)", short_stat_name[attr], val);
502		441
…		…
511	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);	450	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
512	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);	451	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
513	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);	452	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
514	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);	453	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
515		454
516	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";	455	if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
517	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";	456	if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
518	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";	457	if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
519	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";	458	if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
520		459
521	buf.add_paths ("Attuned" , op->path_attuned);	460	buf.add_paths ("Attuned" , op->path_attuned);
522	buf.add_paths ("Repelled", op->path_repelled);	461	buf.add_paths ("Repelled", op->path_repelled);
523	buf.add_paths ("Denied" , op->path_denied);	462	buf.add_paths ("Denied" , op->path_denied);
524		463
…		…
550		489
551	static dynbuf_text buf; buf.clear ();	490	static dynbuf_text buf; buf.clear ();
552		491
553	buf << (op->nrof <= 1 ? op->name : op->name_pl);	492	buf << (op->nrof <= 1 ? op->name : op->name_pl);
554		493
555	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	494	if (op->title && op->flag [FLAG_IDENTIFIED])
556	buf << ' ' << op->title;	495	buf << ' ' << op->title;
557		496
558	switch (op->type)	497	switch (op->type)
559	{	498	{
560	case SPELLBOOK:	499	case SPELLBOOK:
561	case SCROLL:	500	case SCROLL:
562	case WAND:	501	case WAND:
563	case ROD:	502	case ROD:
564	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	503	if (op->flag [FLAG_IDENTIFIED] \|\| op->flag [FLAG_BEEN_APPLIED])
565	{	504	{
566	if (!op->title)	505	if (!op->title)
567	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");	506	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
568		507
569	if (op->type != SPELLBOOK)	508	if (op->type != SPELLBOOK)
…		…
608	buf << " " << s;	547	buf << " " << s;
609	}	548	}
610	break;	549	break;
611		550
612	default:	551	default:
613	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	552	if (op->magic && ((op->flag [FLAG_BEEN_APPLIED] && need_identify (op)) \|\| op->flag [FLAG_IDENTIFIED]))
614	buf.printf (" %+d", op->magic);	553	buf.printf (" %+d", op->magic);
615	}	554	}
616		555
617	return buf;	556	return buf;
618	}	557	}
…		…
627	* returned is good forever.) However, it makes printing statements that	566	* returned is good forever.) However, it makes printing statements that
628	* use several names much easier (don't need to store them to temp variables.)	567	* use several names much easier (don't need to store them to temp variables.)
629	*	568	*
630	* It is used extensively within messages, so should return only a prose	569	* It is used extensively within messages, so should return only a prose
631	* and short description of the item.	570	* and short description of the item.
		571	* It is also used by examine/ex and similar functions.
632	*/	572	*/
633	const char *	573	const char *
634	query_name (const object *op)	574	query_name (const object *op)
635	{	575	{
636	int len = 0;	576	int len = 0;
…		…
641	use_buf %= 5;	581	use_buf %= 5;
642		582
643	dynbuf_text &buf = bufs [use_buf];	583	dynbuf_text &buf = bufs [use_buf];
644	buf.clear ();	584	buf.clear ();
645		585
		586	#if 0
646	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	587	if ((op->is_armor () \|\| op->is_weapon ()) && op->material)
647	if (materialtype_t *mt = name_to_material (op->materialname))
648	buf << mt->description << ' ';	588	buf << op->material->description << ' ';
		589	#endif
649		590
650	buf << query_short_name (op);	591	buf << query_short_name (op);
651		592
652	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	593	if (op->flag [FLAG_INV_LOCKED])
653	buf << " *";	594	buf << " *";
654	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	595	if (op->is_open_container ())
655	buf << " (open)";	596	buf << " (open)";
656		597
657	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	598	if (op->flag [FLAG_KNOWN_CURSED])
658	{	599	{
659	if (QUERY_FLAG (op, FLAG_DAMNED))	600	if (op->flag [FLAG_DAMNED])
660	buf << " (damned)";	601	buf << " (damned)";
661	else if (QUERY_FLAG (op, FLAG_CURSED))	602	else if (op->flag [FLAG_CURSED])
662	buf << " (cursed)";	603	buf << " (cursed)";
663	}	604	}
664		605
665	/* Basically, if the object is known magical (detect magic spell on it),	606	/* Basically, if the object is known magical (detect magic spell on it),
666	* and it isn't identified, print out the fact that	607	* and it isn't identified, print out the fact that
…		…
669	*	610	*
670	* Changed in V 0.91.4 - still print that the object is magical even	611	* Changed in V 0.91.4 - still print that the object is magical even
671	* if it has been applied. Equipping an item does not tell full	612	* if it has been applied. Equipping an item does not tell full
672	* abilities, especially for artifact items.	613	* abilities, especially for artifact items.
673	*/	614	*/
674	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	615	if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
675	buf << " (magic)";	616	buf << " (magic)";
676		617
677	#if 0	618	#if 0
678	/* item_power will be returned in describe_item - it shouldn't really	619	/* item_power will be returned in describe_item - it shouldn't really
679	* be returned in the name.	620	* be returned in the name.
…		…
681	if (op->item_power)	622	if (op->item_power)
682	sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);	623	sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
683		624
684	#endif	625	#endif
685		626
686	if (QUERY_FLAG (op, FLAG_APPLIED))	627	if (op->flag [FLAG_APPLIED])
687	{	628	{
688	switch (op->type)	629	switch (op->type)
689	{	630	{
690	case BOW:	631	case BOW:
691	case WAND:	632	case WAND:
692	case ROD:	633	case ROD:
693	case HORN:	634	case HORN:
694	buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");	635	buf << " (applied)";
695	break;	636	break;
696	case WEAPON:	637	case WEAPON:
697	buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");	638	buf << " (applied)";
698	break;	639	break;
699	case ARMOUR:	640	case ARMOUR:
700	case HELMET:	641	case HELMET:
701	case SHIELD:	642	case SHIELD:
702	case RING:	643	case RING:
…		…
734	else if (op->stats.food <= 0)	675	else if (op->stats.food <= 0)
735	buf << " (burned out)";	676	buf << " (burned out)";
736	break;	677	break;
737	}	678	}
738		679
739	if (QUERY_FLAG (op, FLAG_UNPAID))	680	if (op->flag [FLAG_UNPAID])
740	buf << " (unpaid)";	681	buf << " (unpaid)";
741		682
742	return buf;	683	return buf;
743	}	684	}
744		685
…		…
751	* and sending to client.	692	* and sending to client.
752	* If plural is set, we generate the plural name of this.	693	* If plural is set, we generate the plural name of this.
753	*	694	*
754	* It is sometimes used to display messages, and usually only used to match stuff,	695	* It is sometimes used to display messages, and usually only used to match stuff,
755	* so maybe this function should be removed.	696	* so maybe this function should be removed.
		697	* It is also used for client-side inventory/item descriptions.
756	*/	698	*/
757	const char *	699	const char *
758	query_base_name (const object *op, int plural)	700	query_base_name (const object *op, int plural)
759	{	701	{
760	if ((!plural && !op->name) \|\| (plural && !op->name_pl))	702	if ((!plural && !op->name) \|\| (plural && !op->name_pl))
761	return "(null)";	703	return "(null)";
762		704
763	if (!op->nrof && !op->weight && !op->title && !is_magical (op))	705	if (!op->nrof && !op->weight && !op->title && !is_magical (op)
		706	&& op->type != EXIT)
764	return op->name; /* To speed things up (or make things slower?) */	707	return op->name; /* To speed things up (or make things slower?) */
765		708
766	static dynbuf_text buf; buf.clear ();	709	static dynbuf_text buf; buf.clear ();
767		710
		711	#if 0
768	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	712	if ((op->is_armor () \|\| op->is_weapon ()) && op->material)
769	if (materialtype_t *mt = name_to_material (op->materialname))
770	if (op->arch->materialname != mt->name)	713	if (op->arch->material != op->material)
771	buf << mt->description << ' ';	714	buf << op->material->description << ' ';
		715	#endif
772		716
773	buf << (plural ? op->name_pl : op->name);	717	buf << (plural ? op->name_pl : op->name);
774		718
775	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	719	if (op->title && op->flag [FLAG_IDENTIFIED])
776	buf << ' ' << op->title;	720	buf << ' ' << op->title;
777		721
778	switch (op->type)	722	switch (op->type)
779	{	723	{
780	case SPELLBOOK:	724	case SPELLBOOK:
781	case SCROLL:	725	case SCROLL:
782	case WAND:	726	case WAND:
783	case ROD:	727	case ROD:
784	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	728	if (op->flag [FLAG_IDENTIFIED] \|\| op->flag [FLAG_BEEN_APPLIED])
785	{	729	{
786	if (!op->title)	730	if (!op->title)
787	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");	731	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
788		732
789	if (op->type != SPELLBOOK)	733	if (op->type != SPELLBOOK)
…		…
803	if (s && *s)	747	if (s && *s)
804	buf << ' ' << s;	748	buf << ' ' << s;
805	}	749	}
806	break;	750	break;
807		751
		752	case EXIT:
		753	// random map exits "unfortunately" get patched, so this only works before entering
		754	if (EXIT_PATH (op) == shstr_random_map_exit)
		755	buf << " (random map)";
		756	else if (!EXIT_PATH (op))
		757	buf << " (closed)";
		758	break;
		759
808	default:	760	default:
809	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	761	if (op->magic && ((op->flag [FLAG_BEEN_APPLIED] && need_identify (op)) \|\| op->flag [FLAG_IDENTIFIED]))
810	buf.printf (" %+d", op->magic);	762	buf.printf (" %+d", op->magic);
811	}	763	}
812		764
813	return buf;	765	return buf;
814	}	766	}
…		…
827	/* Note that the resolution this provides for players really isn't	779	/* Note that the resolution this provides for players really isn't
828	* very good. Any player with a speed greater than .67 will	780	* very good. Any player with a speed greater than .67 will
829	* fall into the 'lightning fast movement' category.	781	* fall into the 'lightning fast movement' category.
830	*/	782	*/
831	if (op->has_active_speed ())	783	if (op->has_active_speed ())
832	switch ((int) ((FABS (op->speed)) * 15))	784	switch ((int)(op->speed * 15.))
833	{	785	{
834	case 0:	786	case 0:
835	buf << "(very slow movement)";	787	buf << "(very slow movement)";
836	break;	788	break;
837	case 1:	789	case 1:
…		…
857	default:	809	default:
858	buf << "(lightning fast movement)";	810	buf << "(lightning fast movement)";
859	break;	811	break;
860	}	812	}
861		813
862	if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";	814	if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
863	if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";	815	if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
864	if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";	816	if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
865	if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";	817	if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
866	if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";	818	if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
867	if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";	819	if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
868	if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";	820	if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
869	if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";	821	if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
870	if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";	822	if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
871	if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";	823	if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
872	if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";	824	if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
873	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";	825	if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
874	if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";	826	if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
875	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";	827	if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
876		828
877	if (op->randomitems)	829	if (op->randomitems)
878	{	830	{
879	bool first = 1;	831	bool first = 1;
880		832
…		…
907	if (op->stats.luck)	859	if (op->stats.luck)
908	buf.printf ("(luck%+d)", op->stats.luck);	860	buf.printf ("(luck%+d)", op->stats.luck);
909	}	861	}
910		862
911	/* describe attacktypes */	863	/* describe attacktypes */
912	if (is_dragon_pl (op))	864	if (op->is_dragon ())
913	{	865	{
914	/* for dragon players display the attacktypes from clawing skill	866	/* for dragon players display the attacktypes from clawing skill
915	* Break apart the for loop - move the comparison checking down -	867	* Break apart the for loop - move the comparison checking down -
916	* this makes it more readable.	868	* this makes it more readable.
917	*/	869	*/
…		…
962	* item (eg, debug dump or the like)	914	* item (eg, debug dump or the like)
963	*/	915	*/
964	const char *	916	const char *
965	describe_item (const object op, object owner)	917	describe_item (const object op, object owner)
966	{	918	{
967	if (QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER)	919	if (op->flag [FLAG_MONSTER] \|\| op->type == PLAYER)
968	return describe_monster (op);	920	return describe_monster (op);
969		921
970	static dynbuf_text buf; buf.clear ();	922	static dynbuf_text buf; buf.clear ();
971	int identified, i;	923	int identified, i;
972		924
973	/* figure this out once, instead of making multiple calls to need_identify.	925	/* figure this out once, instead of making multiple calls to need_identify.
974	* also makes the code easier to read.	926	* also makes the code easier to read.
975	*/	927	*/
976	identified = !need_identify (op) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED);	928	identified = !need_identify (op) \|\| op->flag [FLAG_IDENTIFIED];
977	if (!identified)	929	if (!identified)
978	buf << "(unidentified)";	930	buf << "(unidentified)";
979		931
980	switch (op->type)	932	switch (op->type)
981	{	933	{
…		…
1000	if (op->stats.maxsp > 1000)	952	if (op->stats.maxsp > 1000)
1001	{ /higher capacity crystals /	953	{ /higher capacity crystals /
1002	i = (op->stats.maxsp % 1000) / 100;	954	i = (op->stats.maxsp % 1000) / 100;
1003		955
1004	if (i)	956	if (i)
1005	buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);	957	buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
1006	else	958	else
1007	buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);	959	buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
1008	}	960	}
1009	else	961	else
1010	buf.printf ("(capacity %d). It is ", op->stats.maxsp);	962	buf.printf ("(capacity %d; it is ", op->stats.maxsp);
1011		963
1012	i = (op->stats.sp * 10) / op->stats.maxsp;	964	i = (op->stats.sp * 10) / op->stats.maxsp;
1013	if (op->stats.sp == 0)	965	if (op->stats.sp == 0)
1014	buf << "empty.";	966	buf << "empty";
1015	else if (i == 0)	967	else if (i == 0)
1016	buf << "almost empty.";	968	buf << "almost empty";
1017	else if (i < 3)	969	else if (i < 3)
1018	buf << "partially filled.";	970	buf << "partially filled";
1019	else if (i < 6)	971	else if (i < 6)
1020	buf << "half full.";	972	buf << "half full";
1021	else if (i < 9)	973	else if (i < 9)
1022	buf << "well charged.";	974	buf << "well charged";
1023	else if (op->stats.sp == op->stats.maxsp)	975	else if (op->stats.sp == op->stats.maxsp)
1024	buf << "fully charged.";	976	buf << "fully charged";
1025	else	977	else
1026	buf << "almost full.";	978	buf << "almost full";
		979
		980	buf << ')';
1027	break;	981	break;
1028		982
1029	case LAMP:	983	case LAMP:
1030	{	984	{
1031	int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;	985	int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
…		…
1049	break;	1003	break;
1050		1004
1051	case FOOD:	1005	case FOOD:
1052	case FLESH:	1006	case FLESH:
1053	case DRINK:	1007	case DRINK:
1054	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1008	if (identified \|\| op->flag [FLAG_BEEN_APPLIED])
1055	{	1009	{
1056	buf.printf ("(food+%d)", op->stats.food);	1010	buf.printf ("(food+%d)", op->stats.food);
1057		1011
1058	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))	1012	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1059	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);	1013	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1060		1014
1061	if (!QUERY_FLAG (op, FLAG_CURSED))	1015	if (!op->flag [FLAG_CURSED])
1062	{	1016	{
1063	if (op->stats.hp) buf << "(heals)";	1017	if (op->stats.hp) buf << "(heals)";
1064	if (op->stats.sp) buf << "(spellpoint regen)";	1018	if (op->stats.sp) buf << "(spellpoint regen)";
1065	}	1019	}
1066	else	1020	else
…		…
1087	}	1041	}
1088		1042
1089	/* Down here, we more further describe equipment type items.	1043	/* Down here, we more further describe equipment type items.
1090	* only describe them if they have been identified or the like.	1044	* only describe them if they have been identified or the like.
1091	*/	1045	*/
1092	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1046	if (identified \|\| op->flag [FLAG_BEEN_APPLIED])
1093	{	1047	{
1094	int attr, val;	1048	int attr, val;
1095		1049
1096	for (attr = 0; attr < NUM_STATS; attr++)	1050	for (attr = 0; attr < NUM_STATS; attr++)
1097	if ((val = op->stats.stat (attr)))	1051	if ((val = op->stats.stat (attr)))
…		…
1128		1082
1129	default:	1083	default:
1130	break;	1084	break;
1131	}	1085	}
1132		1086
1133	if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";	1087	if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1134	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";	1088	if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1135		1089
1136	/* levitate was what is was before, so we'll keep it */	1090	/* levitate was what is was before, so we'll keep it */
1137	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";	1091	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1138	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";	1092	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1139	if (op->move_type & MOVE_SWIM) buf << "(swim)";	1093	if (op->move_type & MOVE_SWIM) buf << "(swim)";
…		…
1201	}	1155	}
1202		1156
1203	if (op->stats.luck)	1157	if (op->stats.luck)
1204	buf.printf ("(luck%+d)", op->stats.luck);	1158	buf.printf ("(luck%+d)", op->stats.luck);
1205		1159
1206	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";	1160	if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1207	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";	1161	if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1208	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";	1162	if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1209	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";	1163	if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1210		1164
1211	if (op->slaying && op->type != FOOD)	1165	if (op->slaying && op->type != FOOD)
1212	buf.printf ("(slay %s)", &op->slaying);	1166	buf.printf ("(slay %s)", &op->slaying);
1213		1167
1214	if (op->type == SKILL_TOOL && op->skill)	1168	if (op->type == SKILL_TOOL && op->skill)
…		…
1216		1170
1217	buf.add_abilities ("Attacks", op->attacktype);	1171	buf.add_abilities ("Attacks", op->attacktype);
1218	/* resistance on flesh is only visible for quetzals. If	1172	/* resistance on flesh is only visible for quetzals. If
1219	* non flesh, everyone can see its resistances	1173	* non flesh, everyone can see its resistances
1220	*/	1174	*/
1221	if (op->type != FLESH \|\| (owner && is_dragon_pl (owner)))	1175	if (op->type != FLESH \|\| (owner && owner->is_dragon ()))
1222	buf << describe_resistance (op, 0);	1176	buf << describe_resistance (op, 0);
1223		1177
1224	buf.add_paths ("Attuned", op->path_attuned);	1178	buf.add_paths ("Attuned", op->path_attuned);
1225	buf.add_paths ("Repelled", op->path_repelled);	1179	buf.add_paths ("Repelled", op->path_repelled);
1226	buf.add_paths ("Denied", op->path_denied);	1180	buf.add_paths ("Denied", op->path_denied);
…		…
1231		1185
1232	std::string	1186	std::string
1233	object::describe_item (object *who)	1187	object::describe_item (object *who)
1234	{	1188	{
1235	return std::string (::describe_item (this, who));	1189	return std::string (::describe_item (this, who));
		1190	}
		1191
		1192	static void
		1193	describe_dump_object (dynbuf &buf, object *ob)
		1194	{
		1195	char *txt = dump_object (ob);
		1196	for (char p = txt; p; ++p) if (p == '\n') p = '\r';
		1197	buf << "\n" << txt << "\n";
		1198
		1199	if (!ob->is_arch ())
		1200	describe_dump_object (buf, ob->arch);
		1201	}
		1202
		1203	std::string
		1204	object::describe (object *who)
		1205	{
		1206	dynbuf_text buf (1024, 1024);
		1207
		1208	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
		1209
		1210	if (custom_name)
		1211	buf.printf ("You call it %s.\r", &custom_name);
		1212
		1213	switch (type)
		1214	{
		1215	case SPELLBOOK:
		1216	if (flag [FLAG_IDENTIFIED] && inv)
		1217	buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
		1218	break;
		1219
		1220	case BOOK:
		1221	if (msg)
		1222	buf << "Something is written in it.\r";
		1223	break;
		1224
		1225	case CONTAINER:
		1226	if (race)
		1227	{
		1228	if (weight_limit && stats.Str < 100)
		1229	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
		1230	&race, weight_limit / (10.0 * (100 - stats.Str)));
		1231	else
		1232	buf.printf ("It can hold only %s.\r", &race);
		1233	}
		1234	else if (weight_limit && stats.Str < 100)
		1235	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
		1236	break;
		1237
		1238	case WAND:
		1239	if (flag [FLAG_IDENTIFIED])
		1240	buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
		1241	break;
		1242	}
		1243
		1244	if (material != MATERIAL_NULL && !msg)
		1245	buf << (nrof > 1 ? "They are made of " : "It is made of ")
		1246	<< material->description
		1247	<< ".\r";
		1248
		1249	if (who)
		1250	/* Where to wear this item */
		1251	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
		1252	if (slot[i].info)
		1253	{
		1254	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
		1255
		1256	if (slot[i].info < -1 && who->slot[i].info)
		1257	buf.printf ("(%d)", -slot[i].info);
		1258
		1259	buf << ".\r";
		1260	}
		1261
		1262	if (weight)
		1263	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
		1264
		1265	if (flag [FLAG_STARTEQUIP])
		1266	buf << (nrof > 1 ? "They were" : "It was")
		1267	<< " given by a god and will vanish when dropped.\r";
		1268
		1269	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
		1270	{
		1271	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
		1272
		1273	if (who->is_in_shop ())
		1274	{
		1275	if (flag [FLAG_UNPAID])
		1276	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
		1277	else
		1278	buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
		1279	}
		1280	}
		1281
		1282	if (flag [FLAG_MONSTER])
		1283	buf << describe_monster (who);
		1284
		1285	/* Is this item buildable? */
		1286	if (flag [FLAG_IS_BUILDABLE])
		1287	buf << "This is a buildable item.\r";
		1288
		1289	/* Does the object have a message? Don't show message for all object
		1290	* types - especially if the first entry is a match
		1291	*/
		1292	if (msg)
		1293	{
		1294	if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
		1295	{
		1296	buf << '\r';
		1297
		1298	/* This is just a hack so when identifying the items, we print
		1299	* out the extra message
		1300	*/
		1301	if (need_identify (this) && flag [FLAG_IDENTIFIED])
		1302	buf << "The object has a story:\r";
		1303
		1304	buf << msg << '\n';
		1305	}
		1306	}
		1307	else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1308	&& (type == SPELLBOOK \|\| type == ROD \|\| type == WAND
		1309	\|\| type == ROD \|\| type == POTION \|\| type == SCROLL))
		1310	// for spellbooks and other stuff that contains spells, print the spell message,
		1311	// unless the object has a custom message handled above.
		1312	buf << '\r' << inv->msg << '\n';
		1313
		1314	// try to display the duration for some potions and scrolls
		1315	// this includes change ability potions and group spells,
		1316	// but does not handle protection potions
		1317	if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1318	&& (type == POTION \|\| type == SCROLL))
		1319	{
		1320	object *spell = inv;
		1321
		1322	if (spell->subtype == SP_PARTY_SPELL)
		1323	spell = spell->other_arch;
		1324
		1325	if (spell->subtype == SP_CHANGE_ABILITY)
		1326	buf.printf ("\nH<The effect will last about %.10g seconds.>",
		1327	TICK2TIME (change_ability_duration (spell, this)));
		1328	}
		1329
		1330	// some help text for skill tools
		1331	if (type == SKILL_TOOL)
		1332	buf << "\nH<This item is a skill tool: as long as you have this item applied "
		1333	"you can use the " << &skill << " skill as if you had learned it.>";
		1334
		1335	// Display a hint about inscribable items [empty books]
		1336	// This includes the amount of text they can hold.
		1337	if (type == INSCRIBABLE)
		1338	{
		1339	if (other_arch && other_arch->type == SCROLL)
		1340	buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
		1341	else
		1342	buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
		1343	weight_limit);
		1344	}
		1345
		1346	buf << '\n';
		1347
		1348	// the dungeon master additionally gets a complete dump
		1349	if (who && who->flag [FLAG_WIZLOOK])
		1350	{
		1351	buf << "\nT<Object>\n";
		1352	describe_dump_object (buf, this);
		1353
		1354	if (inv)
		1355	{
		1356	buf << "\nT<Top Inventory>\n";
		1357	describe_dump_object (buf, inv);
		1358	}
		1359	}
		1360
		1361	return std::string (buf.linearise (), buf.size ());
1236	}	1362	}
1237		1363
1238	void	1364	void
1239	examine (object op, object tmp)	1365	examine (object op, object tmp)
1240	{	1366	{
…		…
1252	object::query_inventory (object who, const char indent)	1378	object::query_inventory (object who, const char indent)
1253	{	1379	{
1254	static dynbuf_text buf; buf.clear ();	1380	static dynbuf_text buf; buf.clear ();
1255		1381
1256	for (object *tmp = inv; tmp; tmp = tmp->below)	1382	for (object *tmp = inv; tmp; tmp = tmp->below)
1257	if (who && QUERY_FLAG (who, FLAG_WIZ))	1383	if (who && who->flag [FLAG_WIZ])
1258	buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());	1384	buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1259	else if (!tmp->invisible && (type == CONTAINER \|\| QUERY_FLAG (tmp, FLAG_APPLIED)))	1385	else if (!tmp->invisible && (type == CONTAINER \|\| tmp->flag [FLAG_APPLIED]))
1260	buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());	1386	buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1261		1387
1262	if (buf.size ())	1388	if (buf.size ())
1263	buf.printf ("%s(total weight: %s)\n", indent, query_weight ());	1389	buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1264	else	1390	else
…		…
1277	is_magical (const object *op)	1403	is_magical (const object *op)
1278	{	1404	{
1279	int i;	1405	int i;
1280		1406
1281	/* living creatures are considered non magical */	1407	/* living creatures are considered non magical */
1282	if (QUERY_FLAG (op, FLAG_ALIVE))	1408	if (op->flag [FLAG_ALIVE])
1283	return 0;	1409	return 0;
1284		1410
1285	/* This is a test for it being an artifact, as artifacts have titles */	1411	/* This is a test for it being an artifact, as artifacts have titles */
1286	if (op->title != NULL)	1412	if (op->title != NULL)
1287	return 1;	1413	return 1;
…		…
1293	(op->stats.ac \|\| op->stats.food \|\| op->stats.exp \|\| op->stats.dam \|\| op->stats.wc \|\| op->stats.sp \|\| op->stats.hp \|\| op->stats.luck))	1419	(op->stats.ac \|\| op->stats.food \|\| op->stats.exp \|\| op->stats.dam \|\| op->stats.wc \|\| op->stats.sp \|\| op->stats.hp \|\| op->stats.luck))
1294	return 1;	1420	return 1;
1295		1421
1296	/* Check for stealty, speed, flying, or just plain magic in the boots */	1422	/* Check for stealty, speed, flying, or just plain magic in the boots */
1297	/* Presume any boots that hvae a move_type are special. */	1423	/* Presume any boots that hvae a move_type are special. */
1298	if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) \|\| op->move_type \|\| op->stats.exp)))	1424	if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] \|\| op->move_type \|\| op->stats.exp)))
1299	return 1;	1425	return 1;
1300		1426
1301	/* Take care of amulet/shield that reflects spells/missiles */	1427	/* Take care of amulet/shield that reflects spells/missiles */
1302	if ((op->type == AMULET \|\| op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) \|\| QUERY_FLAG (op, FLAG_REFL_MISSILE)))	1428	if ((op->type == AMULET \|\| op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] \|\| op->flag [FLAG_REFL_MISSILE]))
1303	return 1;	1429	return 1;
1304		1430
1305	/* Take care of helmet of xrays */	1431	/* Take care of helmet of xrays */
1306	if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS))	1432	if (op->type == HELMET && op->flag [FLAG_XRAYS])
1307	return 1;	1433	return 1;
1308		1434
1309	/* Potions & rods are always magical. Wands/staves are also magical,	1435	/* Potions & rods are always magical. Wands/staves are also magical,
1310	* assuming they still have any charges left.	1436	* assuming they still have any charges left.
1311	*/	1437	*/
…		…
1400	* Supposed to fix face-values as well here, but later.	1526	* Supposed to fix face-values as well here, but later.
1401	*/	1527	*/
1402	void	1528	void
1403	identify (object *op)	1529	identify (object *op)
1404	{	1530	{
1405	SET_FLAG (op, FLAG_IDENTIFIED);	1531	op->set_flag (FLAG_IDENTIFIED);
1406	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	1532	op->clr_flag (FLAG_KNOWN_MAGICAL);
1407	CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);	1533	op->clr_flag (FLAG_NO_SKILL_IDENT);
1408		1534
1409	/*	1535	/*
1410	* We want autojoining of equal objects:	1536	* We want autojoining of equal objects:
1411	*/	1537	*/
1412	if (QUERY_FLAG (op, FLAG_CURSED) \|\| QUERY_FLAG (op, FLAG_DAMNED))	1538	if (op->flag [FLAG_CURSED] \|\| op->flag [FLAG_DAMNED])
1413	SET_FLAG (op, FLAG_KNOWN_CURSED);	1539	op->set_flag (FLAG_KNOWN_CURSED);
1414		1540
1415	if (op->type == POTION)	1541	if (op->type == POTION)
1416	{	1542	{
1417	if (op->inv && op->randomitems)	1543	if (op->inv && op->randomitems)
1418	op->title = op->inv->name;	1544	op->title = op->inv->name;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/item.C (file contents): Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs. Revision 1.83 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.83 by root, Sun Apr 11 00:34:05 2010 UTC