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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.65 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.84 by root, Thu Apr 15 02:51:39 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"},
…		…
70	static char numbers_10[10][20] = {	71	static char numbers_10[10][20] = {
71	"zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",	72	"zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
72	"eighty", "ninety"	73	"eighty", "ninety"
73	};	74	};
74		75
75	static char levelnumbers[21][20] = {	76	static char ordnumbers[21][20] = {
76	"zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",	77	"zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
77	"eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",	78	"eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
78	"fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen",	79	"fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
79	"nineteen", "twentieth"	80	"nineteenth", "twentieth"
80	};	81	};
81		82
82	static char levelnumbers_10[11][20] = {	83	static char ordnumbers_10[11][20] = {
83	"zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",	84	"zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
84	"seventieth", "eightieth", "ninetieth"	85	"seventieth", "eightieth", "ninetieth"
85	};	86	};
86		87
87	/* 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:
…		…
150	{EXIT, "exit", "exits", 0, 0},	151	{EXIT, "exit", "exits", 0, 0},
151	{ENCOUNTER, "encounter", "encounters", 0, 0},	152	{ENCOUNTER, "encounter", "encounters", 0, 0},
152	{SHOP_FLOOR, "shop floor", "shop floors", 0, 0},	153	{SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
153	{SHOP_MAT, "shop mat", "shop mats", 0, 0},	154	{SHOP_MAT, "shop mat", "shop mats", 0, 0},
154	{RING, "ring", "rings", SK_JEWELER, 0},	155	{RING, "ring", "rings", SK_JEWELER, 0},
155	{FLOOR, "floor", "floors", 0, 0},	156	// {FLOOR, "floor", "floors", 0, 0},
156	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},	157	{FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
157	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},	158	{INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
158	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},	159	{SKILL_TOOL, "skill tool", "skill tools", 0, 0},
159	{LIGHTER, "lighter", "lighters", 0, 0},	160	{LIGHTER, "lighter", "lighters", 0, 0},
160	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},	161	{BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
…		…
203	{ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},	204	{ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
204	};	205	};
205		206
206	static const int item_types_size = sizeof (item_types) / sizeof (*item_types);	207	static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
207		208
208	materialtype_t *materialt;
209
210	/*
211	materialtype material[NROFMATERIALS] = {
212	* P M F E C C A D W G P S P T F C D D C C G H B I *
213	* H A I L O O C R E H O L A U E A E E H O O O L N *
214	* Y G R E L N I A A O I O R R A N P A A U D L I T *
215	* S I E C D F D I P S S W A N R C L T O N Y N R *
216	* I C T U N O T O L E E H S T P D N *
217	{"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}},
218	{"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}},
219	{"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}},
220	{"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}},
221	{"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}},
222	{"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}},
223	{"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}},
224	{"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}},
225	{"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}},
226	{"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}},
227	{"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}},
228	{"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}},
229	{"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}}
230	};
231	*/
232
233	/* 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
234	* 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
235	* wear whatever they want with no worries. Perhaps having the steep	211	* wear whatever they want with no worries. Perhaps having the steep
236	* curve is good (maybe even steeper), but allowing players to	212	* curve is good (maybe even steeper), but allowing players to
237	* have 2 * level instead. Ideally, top level characters should only be	213	* have 2 * level instead. Ideally, top level characters should only be
…		…
250	get_power_from_ench (int ench)	226	get_power_from_ench (int ench)
251	{	227	{
252	return enc_to_item_power [clamp (ench, 0, 20)];	228	return enc_to_item_power [clamp (ench, 0, 20)];
253	}	229	}
254		230
		231	static const struct need_identify_types : typeset
		232	{
		233	need_identify_types ()
		234	{
		235	set (RING);
		236	set (WAND);
		237	set (ROD);
		238	set (HORN);
		239	set (SCROLL);
		240	set (SKILL);
		241	set (SKILLSCROLL);
		242	set (SPELLBOOK);
		243	set (FOOD);
		244	set (POTION);
		245	set (BOW);
		246	set (ARROW);
		247	set (WEAPON);
		248	set (ARMOUR);
		249	set (SHIELD);
		250	set (HELMET);
		251	set (AMULET);
		252	set (BOOTS);
		253	set (GLOVES);
		254	set (BRACERS);
		255	set (GIRDLE);
		256	set (CONTAINER);
		257	set (DRINK);
		258	set (FLESH);
		259	set (INORGANIC);
		260	set (CLOSE_CON);
		261	set (CLOAK);
		262	set (GEM);
		263	set (POWER_CRYSTAL);
		264	set (POISON);
		265	set (BOOK);
		266	set (SKILL_TOOL);
		267	}
		268	} need_identify_types;
		269
		270	bool
		271	object::need_identify () const
		272	{
		273	return need_identify_types [type];
		274	}
		275
255	/* This takes an object 'op' and figures out what its item_power	276	/* This takes an object 'op' and figures out what its item_power
256	* rating should be. This should only really be used by the treasure	277	* rating should be. This should only really be used by the treasure
257	* generation code, and when loading legacy objects. It returns	278	* generation code, and when loading legacy objects. It returns
258	* the item_power it calculates.	279	* the item_power it calculates.
259	* If flag is 1, we return the number of enchantment, and not the	280	* If flag is 1, we return the number of enchantment, and not the
…		…
313		334
314	enc += op->stats.luck;	335	enc += op->stats.luck;
315		336
316	/* Do spell paths now */	337	/* Do spell paths now */
317	for (i = 1; i < NRSPELLPATHS; i++)	338	for (i = 1; i < NRSPELLPATHS; i++)
318	{
319	if (op->path_attuned & (1 << i))	339	if (op->path_attuned & (1 << i))
320	enc++;	340	enc++;
321	else if (op->path_denied & (1 << i))	341	else if (op->path_denied & (1 << i))
322	enc -= 2;	342	enc -= 2;
323	else if (op->path_repelled & (1 << i))	343	else if (op->path_repelled & (1 << i))
324	enc--;	344	enc--;
325	}
326		345
327	if (op->flag [FLAG_LIFESAVE ]) enc += 5;	346	if (op->flag [FLAG_LIFESAVE ]) enc += 5;
328	if (op->flag [FLAG_REFL_SPELL ]) enc += 3;	347	if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
329	if (op->flag [FLAG_REFL_MISSILE]) enc += 2;	348	if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
330	if (op->flag [FLAG_XRAYS ]) enc += 2;	349	if (op->flag [FLAG_XRAYS ]) enc += 2;
…		…
413	/*	432	/*
414	* Returns the pointer to a static buffer containing	433	* Returns the pointer to a static buffer containing
415	* the number requested (of the form first, second, third...)	434	* the number requested (of the form first, second, third...)
416	*/	435	*/
417	const char *	436	const char *
418	get_levelnumber (int i)	437	ordinal (int i)
419	{	438	{
420	static char buf[MAX_BUF];	439	if (i < 0)
421		440	return format ("minus %s", ordinal (-i));
422	if (i > 99)
423	{
424	sprintf (buf, "%d.", i);
425	return buf;
426	}
427		441
428	if (i < 21)	442	if (i < 21)
429	return levelnumbers[i];	443	return ordnumbers[i];
430		444
		445	int digit = i % 10;
		446
431	if (!(i % 10))	447	if (i >= 100)
		448	return format (
		449	digit == 1 ? "%dst"
		450	: digit == 2 ? "%dnd"
		451	: digit == 3 ? "%drd"
		452	: "%dth",
		453	i
		454	);
		455
		456	if (digit == 0)
432	return levelnumbers_10[i / 10];	457	return ordnumbers_10[i / 10];
433		458	else
434	strcpy (buf, numbers_10[i / 10]);	459	return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
435	strcat (buf, levelnumbers[i % 10]);
436	return buf;
437	}	460	}
438		461
439	/*	462	/*
440	* Returns pointer to static buffer containing ring's or amulet's	463	* Returns pointer to static buffer containing ring's or amulet's
441	* abilities	464	* abilities
…		…
453	ring_desc (const object *op)	476	ring_desc (const object *op)
454	{	477	{
455	static dynbuf_text buf; buf.clear ();	478	static dynbuf_text buf; buf.clear ();
456	int attr, val, len;	479	int attr, val, len;
457		480
458	if (QUERY_FLAG (op, FLAG_IDENTIFIED))	481	if (op->flag [FLAG_IDENTIFIED])
459	{	482	{
460	for (attr = 0; attr < NUM_STATS; attr++)	483	for (attr = 0; attr < NUM_STATS; attr++)
461	if ((val = op->stats.stat (attr)))	484	if ((val = op->stats.stat (attr)))
462	buf.printf ("(%s%+d)", short_stat_name[attr], val);	485	buf.printf ("(%s%+d)", short_stat_name[attr], val);
463		486
…		…
472	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);	495	if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
473	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);	496	if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
474	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);	497	if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
475	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);	498	if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
476		499
477	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";	500	if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
478	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";	501	if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
479	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";	502	if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
480	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";	503	if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
481		504
482	buf.add_paths ("Attuned" , op->path_attuned);	505	buf.add_paths ("Attuned" , op->path_attuned);
483	buf.add_paths ("Repelled", op->path_repelled);	506	buf.add_paths ("Repelled", op->path_repelled);
484	buf.add_paths ("Denied" , op->path_denied);	507	buf.add_paths ("Denied" , op->path_denied);
485		508
…		…
511		534
512	static dynbuf_text buf; buf.clear ();	535	static dynbuf_text buf; buf.clear ();
513		536
514	buf << (op->nrof <= 1 ? op->name : op->name_pl);	537	buf << (op->nrof <= 1 ? op->name : op->name_pl);
515		538
516	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	539	if (op->title && op->flag [FLAG_IDENTIFIED])
517	buf << ' ' << op->title;	540	buf << ' ' << op->title;
518		541
519	switch (op->type)	542	switch (op->type)
520	{	543	{
521	case SPELLBOOK:	544	case SPELLBOOK:
522	case SCROLL:	545	case SCROLL:
523	case WAND:	546	case WAND:
524	case ROD:	547	case ROD:
525	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	548	if (op->flag [FLAG_IDENTIFIED] \|\| op->flag [FLAG_BEEN_APPLIED])
526	{	549	{
527	if (!op->title)	550	if (!op->title)
528	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");	551	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
529		552
530	if (op->type != SPELLBOOK)	553	if (op->type != SPELLBOOK)
…		…
569	buf << " " << s;	592	buf << " " << s;
570	}	593	}
571	break;	594	break;
572		595
573	default:	596	default:
574	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	597	if (op->magic
		598	&& ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
		599	\|\| op->flag [FLAG_IDENTIFIED]))
575	buf.printf (" %+d", op->magic);	600	buf.printf (" %+d", op->magic);
576	}	601	}
577		602
578	return buf;	603	return buf;
579	}	604	}
…		…
588	* returned is good forever.) However, it makes printing statements that	613	* returned is good forever.) However, it makes printing statements that
589	* use several names much easier (don't need to store them to temp variables.)	614	* use several names much easier (don't need to store them to temp variables.)
590	*	615	*
591	* It is used extensively within messages, so should return only a prose	616	* It is used extensively within messages, so should return only a prose
592	* and short description of the item.	617	* and short description of the item.
		618	* It is also used by examine/ex and similar functions.
593	*/	619	*/
594	const char *	620	const char *
595	query_name (const object *op)	621	query_name (const object *op)
596	{	622	{
597	int len = 0;	623	int len = 0;
…		…
602	use_buf %= 5;	628	use_buf %= 5;
603		629
604	dynbuf_text &buf = bufs [use_buf];	630	dynbuf_text &buf = bufs [use_buf];
605	buf.clear ();	631	buf.clear ();
606		632
		633	#if 0
607	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	634	if ((op->is_armor () \|\| op->is_weapon ()) && op->material)
608	if (materialtype_t *mt = name_to_material (op->materialname))
609	buf << mt->description << ' ';	635	buf << op->material->description << ' ';
		636	#endif
610		637
611	buf << query_short_name (op);	638	buf << query_short_name (op);
612		639
613	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	640	if (op->flag [FLAG_INV_LOCKED])
614	buf << " *";	641	buf << " *";
615	if (op->is_open_container ())	642	if (op->is_open_container ())
616	buf << " (open)";	643	buf << " (open)";
617		644
618	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	645	if (op->flag [FLAG_KNOWN_CURSED])
619	{	646	{
620	if (QUERY_FLAG (op, FLAG_DAMNED))	647	if (op->flag [FLAG_DAMNED])
621	buf << " (damned)";	648	buf << " (damned)";
622	else if (QUERY_FLAG (op, FLAG_CURSED))	649	else if (op->flag [FLAG_CURSED])
623	buf << " (cursed)";	650	buf << " (cursed)";
624	}	651	}
625		652
626	/* Basically, if the object is known magical (detect magic spell on it),	653	/* Basically, if the object is known magical (detect magic spell on it),
627	* and it isn't identified, print out the fact that	654	* and it isn't identified, print out the fact that
…		…
630	*	657	*
631	* Changed in V 0.91.4 - still print that the object is magical even	658	* Changed in V 0.91.4 - still print that the object is magical even
632	* if it has been applied. Equipping an item does not tell full	659	* if it has been applied. Equipping an item does not tell full
633	* abilities, especially for artifact items.	660	* abilities, especially for artifact items.
634	*/	661	*/
635	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	662	if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
636	buf << " (magic)";	663	buf << " (magic)";
637		664
638	#if 0	665	#if 0
639	/* item_power will be returned in describe_item - it shouldn't really	666	/* item_power will be returned in describe_item - it shouldn't really
640	* be returned in the name.	667	* be returned in the name.
…		…
642	if (op->item_power)	669	if (op->item_power)
643	sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);	670	sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
644		671
645	#endif	672	#endif
646		673
647	if (QUERY_FLAG (op, FLAG_APPLIED))	674	if (op->flag [FLAG_APPLIED])
648	{	675	{
649	switch (op->type)	676	switch (op->type)
650	{	677	{
651	case BOW:	678	case BOW:
652	case WAND:	679	case WAND:
653	case ROD:	680	case ROD:
654	case HORN:	681	case HORN:
655	buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");	682	buf << " (applied)";
656	break;	683	break;
657	case WEAPON:	684	case WEAPON:
658	buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");	685	buf << " (applied)";
659	break;	686	break;
660	case ARMOUR:	687	case ARMOUR:
661	case HELMET:	688	case HELMET:
662	case SHIELD:	689	case SHIELD:
663	case RING:	690	case RING:
…		…
695	else if (op->stats.food <= 0)	722	else if (op->stats.food <= 0)
696	buf << " (burned out)";	723	buf << " (burned out)";
697	break;	724	break;
698	}	725	}
699		726
700	if (QUERY_FLAG (op, FLAG_UNPAID))	727	if (op->flag [FLAG_UNPAID])
701	buf << " (unpaid)";	728	buf << " (unpaid)";
702		729
703	return buf;	730	return buf;
704	}	731	}
705		732
…		…
712	* and sending to client.	739	* and sending to client.
713	* If plural is set, we generate the plural name of this.	740	* If plural is set, we generate the plural name of this.
714	*	741	*
715	* It is sometimes used to display messages, and usually only used to match stuff,	742	* It is sometimes used to display messages, and usually only used to match stuff,
716	* so maybe this function should be removed.	743	* so maybe this function should be removed.
		744	* It is also used for client-side inventory/item descriptions.
717	*/	745	*/
718	const char *	746	const char *
719	query_base_name (const object *op, int plural)	747	query_base_name (const object *op, int plural)
720	{	748	{
721	if ((!plural && !op->name) \|\| (plural && !op->name_pl))	749	if ((!plural && !op->name) \|\| (plural && !op->name_pl))
722	return "(null)";	750	return "(null)";
723		751
724	if (!op->nrof && !op->weight && !op->title && !is_magical (op))	752	if (!op->nrof && !op->weight && !op->title && !is_magical (op)
		753	&& op->type != EXIT)
725	return op->name; /* To speed things up (or make things slower?) */	754	return op->name; /* To speed things up (or make things slower?) */
726		755
727	static dynbuf_text buf; buf.clear ();	756	static dynbuf_text buf; buf.clear ();
728		757
		758	#if 0
729	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	759	if ((op->is_armor () \|\| op->is_weapon ()) && op->material)
730	if (materialtype_t *mt = name_to_material (op->materialname))
731	if (op->arch->materialname != mt->name)	760	if (op->arch->material != op->material)
732	buf << mt->description << ' ';	761	buf << op->material->description << ' ';
		762	#endif
733		763
734	buf << (plural ? op->name_pl : op->name);	764	buf << (plural ? op->name_pl : op->name);
735		765
736	if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))	766	if (op->title && op->flag [FLAG_IDENTIFIED])
737	buf << ' ' << op->title;	767	buf << ' ' << op->title;
738		768
739	switch (op->type)	769	switch (op->type)
740	{	770	{
741	case SPELLBOOK:	771	case SPELLBOOK:
742	case SCROLL:	772	case SCROLL:
743	case WAND:	773	case WAND:
744	case ROD:	774	case ROD:
745	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	775	if (op->flag [FLAG_IDENTIFIED] \|\| op->flag [FLAG_BEEN_APPLIED])
746	{	776	{
747	if (!op->title)	777	if (!op->title)
748	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");	778	buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
749		779
750	if (op->type != SPELLBOOK)	780	if (op->type != SPELLBOOK)
…		…
764	if (s && *s)	794	if (s && *s)
765	buf << ' ' << s;	795	buf << ' ' << s;
766	}	796	}
767	break;	797	break;
768		798
		799	case EXIT:
		800	// random map exits "unfortunately" get patched, so this only works before entering
		801	if (EXIT_PATH (op) == shstr_random_map_exit)
		802	buf << " (random map)";
		803	else if (!EXIT_PATH (op))
		804	buf << " (closed)";
		805	break;
		806
769	default:	807	default:
770	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	808	if (op->magic
		809	&& ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
		810	\|\| op->flag [FLAG_IDENTIFIED]))
771	buf.printf (" %+d", op->magic);	811	buf.printf (" %+d", op->magic);
772	}	812	}
773		813
774	return buf;	814	return buf;
775	}	815	}
…		…
788	/* Note that the resolution this provides for players really isn't	828	/* Note that the resolution this provides for players really isn't
789	* very good. Any player with a speed greater than .67 will	829	* very good. Any player with a speed greater than .67 will
790	* fall into the 'lightning fast movement' category.	830	* fall into the 'lightning fast movement' category.
791	*/	831	*/
792	if (op->has_active_speed ())	832	if (op->has_active_speed ())
793	switch ((int)((fabs (op->speed)) * 15.))	833	switch ((int)(op->speed * 15.))
794	{	834	{
795	case 0:	835	case 0:
796	buf << "(very slow movement)";	836	buf << "(very slow movement)";
797	break;	837	break;
798	case 1:	838	case 1:
…		…
818	default:	858	default:
819	buf << "(lightning fast movement)";	859	buf << "(lightning fast movement)";
820	break;	860	break;
821	}	861	}
822		862
823	if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";	863	if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
824	if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";	864	if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
825	if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";	865	if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
826	if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";	866	if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
827	if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";	867	if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
828	if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";	868	if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
829	if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";	869	if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
830	if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";	870	if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
831	if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";	871	if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
832	if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";	872	if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
833	if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";	873	if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
834	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";	874	if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
835	if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";	875	if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
836	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";	876	if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
837		877
838	if (op->randomitems)	878	if (op->randomitems)
839	{	879	{
840	bool first = 1;	880	bool first = 1;
841		881
…		…
868	if (op->stats.luck)	908	if (op->stats.luck)
869	buf.printf ("(luck%+d)", op->stats.luck);	909	buf.printf ("(luck%+d)", op->stats.luck);
870	}	910	}
871		911
872	/* describe attacktypes */	912	/* describe attacktypes */
873	if (is_dragon_pl (op))	913	if (op->is_dragon ())
874	{	914	{
875	/* for dragon players display the attacktypes from clawing skill	915	/* for dragon players display the attacktypes from clawing skill
876	* Break apart the for loop - move the comparison checking down -	916	* Break apart the for loop - move the comparison checking down -
877	* this makes it more readable.	917	* this makes it more readable.
878	*/	918	*/
…		…
923	* item (eg, debug dump or the like)	963	* item (eg, debug dump or the like)
924	*/	964	*/
925	const char *	965	const char *
926	describe_item (const object op, object owner)	966	describe_item (const object op, object owner)
927	{	967	{
928	if (QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER)	968	if (op->flag [FLAG_MONSTER] \|\| op->type == PLAYER)
929	return describe_monster (op);	969	return describe_monster (op);
930		970
931	static dynbuf_text buf; buf.clear ();	971	static dynbuf_text buf; buf.clear ();
932	int identified, i;	972	int identified, i;
933		973
934	/* figure this out once, instead of making multiple calls to need_identify.	974	/* figure this out once, instead of making multiple calls to need_identify.
935	* also makes the code easier to read.	975	* also makes the code easier to read.
936	*/	976	*/
937	identified = !need_identify (op) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED);	977	identified = !op->need_identify () \|\| op->flag [FLAG_IDENTIFIED];
938	if (!identified)	978	if (!identified)
939	buf << "(unidentified)";	979	buf << "(unidentified)";
940		980
941	switch (op->type)	981	switch (op->type)
942	{	982	{
…		…
961	if (op->stats.maxsp > 1000)	1001	if (op->stats.maxsp > 1000)
962	{ /higher capacity crystals /	1002	{ /higher capacity crystals /
963	i = (op->stats.maxsp % 1000) / 100;	1003	i = (op->stats.maxsp % 1000) / 100;
964		1004
965	if (i)	1005	if (i)
966	buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);	1006	buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
967	else	1007	else
968	buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);	1008	buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
969	}	1009	}
970	else	1010	else
971	buf.printf ("(capacity %d). It is ", op->stats.maxsp);	1011	buf.printf ("(capacity %d; it is ", op->stats.maxsp);
972		1012
973	i = (op->stats.sp * 10) / op->stats.maxsp;	1013	i = (op->stats.sp * 10) / op->stats.maxsp;
974	if (op->stats.sp == 0)	1014	if (op->stats.sp == 0)
975	buf << "empty.";	1015	buf << "empty";
976	else if (i == 0)	1016	else if (i == 0)
977	buf << "almost empty.";	1017	buf << "almost empty";
978	else if (i < 3)	1018	else if (i < 3)
979	buf << "partially filled.";	1019	buf << "partially filled";
980	else if (i < 6)	1020	else if (i < 6)
981	buf << "half full.";	1021	buf << "half full";
982	else if (i < 9)	1022	else if (i < 9)
983	buf << "well charged.";	1023	buf << "well charged";
984	else if (op->stats.sp == op->stats.maxsp)	1024	else if (op->stats.sp == op->stats.maxsp)
985	buf << "fully charged.";	1025	buf << "fully charged";
986	else	1026	else
987	buf << "almost full.";	1027	buf << "almost full";
		1028
		1029	buf << ')';
988	break;	1030	break;
989		1031
990	case LAMP:	1032	case LAMP:
991	{	1033	{
992	int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;	1034	int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
…		…
1010	break;	1052	break;
1011		1053
1012	case FOOD:	1054	case FOOD:
1013	case FLESH:	1055	case FLESH:
1014	case DRINK:	1056	case DRINK:
1015	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1057	if (identified \|\| op->flag [FLAG_BEEN_APPLIED])
1016	{	1058	{
1017	buf.printf ("(food+%d)", op->stats.food);	1059	buf.printf ("(food+%d)", op->stats.food);
1018		1060
1019	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))	1061	if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1020	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);	1062	buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1021		1063
1022	if (!QUERY_FLAG (op, FLAG_CURSED))	1064	if (!op->flag [FLAG_CURSED])
1023	{	1065	{
1024	if (op->stats.hp) buf << "(heals)";	1066	if (op->stats.hp) buf << "(heals)";
1025	if (op->stats.sp) buf << "(spellpoint regen)";	1067	if (op->stats.sp) buf << "(spellpoint regen)";
1026	}	1068	}
1027	else	1069	else
…		…
1048	}	1090	}
1049		1091
1050	/* Down here, we more further describe equipment type items.	1092	/* Down here, we more further describe equipment type items.
1051	* only describe them if they have been identified or the like.	1093	* only describe them if they have been identified or the like.
1052	*/	1094	*/
1053	if (identified \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	1095	if (identified \|\| op->flag [FLAG_BEEN_APPLIED])
1054	{	1096	{
1055	int attr, val;	1097	int attr, val;
1056		1098
1057	for (attr = 0; attr < NUM_STATS; attr++)	1099	for (attr = 0; attr < NUM_STATS; attr++)
1058	if ((val = op->stats.stat (attr)))	1100	if ((val = op->stats.stat (attr)))
…		…
1089		1131
1090	default:	1132	default:
1091	break;	1133	break;
1092	}	1134	}
1093		1135
1094	if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";	1136	if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1095	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";	1137	if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1096		1138
1097	/* levitate was what is was before, so we'll keep it */	1139	/* levitate was what is was before, so we'll keep it */
1098	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";	1140	if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1099	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";	1141	if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1100	if (op->move_type & MOVE_SWIM) buf << "(swim)";	1142	if (op->move_type & MOVE_SWIM) buf << "(swim)";
…		…
1162	}	1204	}
1163		1205
1164	if (op->stats.luck)	1206	if (op->stats.luck)
1165	buf.printf ("(luck%+d)", op->stats.luck);	1207	buf.printf ("(luck%+d)", op->stats.luck);
1166		1208
1167	if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";	1209	if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1168	if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";	1210	if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1169	if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";	1211	if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1170	if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";	1212	if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1171		1213
1172	if (op->slaying && op->type != FOOD)	1214	if (op->slaying && op->type != FOOD)
1173	buf.printf ("(slay %s)", &op->slaying);	1215	buf.printf ("(slay %s)", &op->slaying);
1174		1216
1175	if (op->type == SKILL_TOOL && op->skill)	1217	if (op->type == SKILL_TOOL && op->skill)
…		…
1177		1219
1178	buf.add_abilities ("Attacks", op->attacktype);	1220	buf.add_abilities ("Attacks", op->attacktype);
1179	/* resistance on flesh is only visible for quetzals. If	1221	/* resistance on flesh is only visible for quetzals. If
1180	* non flesh, everyone can see its resistances	1222	* non flesh, everyone can see its resistances
1181	*/	1223	*/
1182	if (op->type != FLESH \|\| (owner && is_dragon_pl (owner)))	1224	if (op->type != FLESH \|\| (owner && owner->is_dragon ()))
1183	buf << describe_resistance (op, 0);	1225	buf << describe_resistance (op, 0);
1184		1226
1185	buf.add_paths ("Attuned", op->path_attuned);	1227	buf.add_paths ("Attuned", op->path_attuned);
1186	buf.add_paths ("Repelled", op->path_repelled);	1228	buf.add_paths ("Repelled", op->path_repelled);
1187	buf.add_paths ("Denied", op->path_denied);	1229	buf.add_paths ("Denied", op->path_denied);
…		…
1192		1234
1193	std::string	1235	std::string
1194	object::describe_item (object *who)	1236	object::describe_item (object *who)
1195	{	1237	{
1196	return std::string (::describe_item (this, who));	1238	return std::string (::describe_item (this, who));
		1239	}
		1240
		1241	static void
		1242	describe_dump_object (dynbuf &buf, object *ob)
		1243	{
		1244	char *txt = dump_object (ob);
		1245	for (char p = txt; p; ++p) if (p == '\n') p = '\r';
		1246	buf << "\n" << txt << "\n";
		1247
		1248	if (!ob->is_arch ())
		1249	describe_dump_object (buf, ob->arch);
		1250	}
		1251
		1252	std::string
		1253	object::describe (object *who)
		1254	{
		1255	dynbuf_text buf (1024, 1024);
		1256
		1257	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
		1258
		1259	if (custom_name)
		1260	buf.printf ("You call it %s.\r", &custom_name);
		1261
		1262	switch (type)
		1263	{
		1264	case SPELLBOOK:
		1265	if (flag [FLAG_IDENTIFIED] && inv)
		1266	buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
		1267	break;
		1268
		1269	case BOOK:
		1270	if (msg)
		1271	buf << "Something is written in it.\r";
		1272	break;
		1273
		1274	case CONTAINER:
		1275	if (race)
		1276	{
		1277	if (weight_limit && stats.Str < 100)
		1278	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
		1279	&race, weight_limit / (10.0 * (100 - stats.Str)));
		1280	else
		1281	buf.printf ("It can hold only %s.\r", &race);
		1282	}
		1283	else if (weight_limit && stats.Str < 100)
		1284	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
		1285	break;
		1286
		1287	case WAND:
		1288	if (flag [FLAG_IDENTIFIED])
		1289	buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
		1290	break;
		1291	}
		1292
		1293	if (material != MATERIAL_NULL && !msg)
		1294	buf << (nrof > 1 ? "They are made of " : "It is made of ")
		1295	<< material->description
		1296	<< ".\r";
		1297
		1298	if (who)
		1299	/* Where to wear this item */
		1300	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
		1301	if (slot[i].info)
		1302	{
		1303	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
		1304
		1305	if (slot[i].info < -1 && who->slot[i].info)
		1306	buf.printf ("(%d)", -slot[i].info);
		1307
		1308	buf << ".\r";
		1309	}
		1310
		1311	if (weight)
		1312	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
		1313
		1314	if (flag [FLAG_STARTEQUIP])
		1315	buf << (nrof > 1 ? "They were" : "It was")
		1316	<< " given by a god and will vanish when dropped.\r";
		1317
		1318	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
		1319	{
		1320	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
		1321
		1322	if (who->is_in_shop ())
		1323	{
		1324	if (flag [FLAG_UNPAID])
		1325	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
		1326	else
		1327	buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
		1328	}
		1329	}
		1330
		1331	if (flag [FLAG_MONSTER])
		1332	buf << describe_monster (who);
		1333
		1334	/* Is this item buildable? */
		1335	if (flag [FLAG_IS_BUILDABLE])
		1336	buf << "This is a buildable item.\r";
		1337
		1338	/* Does the object have a message? Don't show message for all object
		1339	* types - especially if the first entry is a match
		1340	*/
		1341	if (msg)
		1342	{
		1343	if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
		1344	{
		1345	if (!need_identify ())
		1346	buf << '\r' << msg << '\n';
		1347	else if (flag [FLAG_IDENTIFIED])
		1348	buf << '\r' << "The object has a story:\r" << msg;
		1349	}
		1350	}
		1351	else if (inv
		1352	&& inv->msg
		1353	&& inv->type == SPELL
		1354	&& flag [FLAG_IDENTIFIED]
		1355	&& (type == SPELLBOOK \|\| type == ROD \|\| type == WAND
		1356	\|\| type == ROD \|\| type == POTION \|\| type == SCROLL))
		1357	// for spellbooks and other stuff that contains spells, print the spell message,
		1358	// unless the object has a custom message handled above.
		1359	buf << '\r' << inv->msg << '\n';
		1360
		1361	// try to display the duration for some potions and scrolls
		1362	// this includes change ability potions and group spells,
		1363	// but does not handle protection potions
		1364	if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1365	&& (type == POTION \|\| type == SCROLL))
		1366	{
		1367	object *spell = inv;
		1368
		1369	if (spell->subtype == SP_PARTY_SPELL)
		1370	spell = spell->other_arch;
		1371
		1372	if (spell->subtype == SP_CHANGE_ABILITY)
		1373	buf.printf ("\nH<The effect will last about %.10g seconds.>",
		1374	TICK2TIME (change_ability_duration (spell, this)));
		1375	}
		1376
		1377	// some help text for skill tools
		1378	if (type == SKILL_TOOL)
		1379	buf << "\nH<This item is a skill tool: as long as you have this item applied "
		1380	"you can use the " << &skill << " skill as if you had learned it.>";
		1381
		1382	// Display a hint about inscribable items [empty books]
		1383	// This includes the amount of text they can hold.
		1384	if (type == INSCRIBABLE)
		1385	{
		1386	if (other_arch && other_arch->type == SCROLL)
		1387	buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
		1388	else
		1389	buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
		1390	weight_limit);
		1391	}
		1392
		1393	buf << '\n';
		1394
		1395	// the dungeon master additionally gets a complete dump
		1396	if (who && who->flag [FLAG_WIZLOOK])
		1397	{
		1398	buf << "\nT<Object>\n";
		1399	describe_dump_object (buf, this);
		1400
		1401	if (inv)
		1402	{
		1403	buf << "\nT<Top Inventory>\n";
		1404	describe_dump_object (buf, inv);
		1405	}
		1406	}
		1407
		1408	return std::string (buf.linearise (), buf.size ());
1197	}	1409	}
1198		1410
1199	void	1411	void
1200	examine (object op, object tmp)	1412	examine (object op, object tmp)
1201	{	1413	{
…		…
1213	object::query_inventory (object who, const char indent)	1425	object::query_inventory (object who, const char indent)
1214	{	1426	{
1215	static dynbuf_text buf; buf.clear ();	1427	static dynbuf_text buf; buf.clear ();
1216		1428
1217	for (object *tmp = inv; tmp; tmp = tmp->below)	1429	for (object *tmp = inv; tmp; tmp = tmp->below)
1218	if (who && QUERY_FLAG (who, FLAG_WIZ))	1430	if (who && who->flag [FLAG_WIZ])
1219	buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());	1431	buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1220	else if (!tmp->invisible && (type == CONTAINER \|\| QUERY_FLAG (tmp, FLAG_APPLIED)))	1432	else if (!tmp->invisible && (type == CONTAINER \|\| tmp->flag [FLAG_APPLIED]))
1221	buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());	1433	buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1222		1434
1223	if (buf.size ())	1435	if (buf.size ())
1224	buf.printf ("%s(total weight: %s)\n", indent, query_weight ());	1436	buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1225	else	1437	else
…		…
1238	is_magical (const object *op)	1450	is_magical (const object *op)
1239	{	1451	{
1240	int i;	1452	int i;
1241		1453
1242	/* living creatures are considered non magical */	1454	/* living creatures are considered non magical */
1243	if (QUERY_FLAG (op, FLAG_ALIVE))	1455	if (op->flag [FLAG_ALIVE])
1244	return 0;	1456	return 0;
1245		1457
1246	/* This is a test for it being an artifact, as artifacts have titles */	1458	/* This is a test for it being an artifact, as artifacts have titles */
1247	if (op->title != NULL)	1459	if (op->title != NULL)
1248	return 1;	1460	return 1;
…		…
1254	(op->stats.ac \|\| op->stats.food \|\| op->stats.exp \|\| op->stats.dam \|\| op->stats.wc \|\| op->stats.sp \|\| op->stats.hp \|\| op->stats.luck))	1466	(op->stats.ac \|\| op->stats.food \|\| op->stats.exp \|\| op->stats.dam \|\| op->stats.wc \|\| op->stats.sp \|\| op->stats.hp \|\| op->stats.luck))
1255	return 1;	1467	return 1;
1256		1468
1257	/* Check for stealty, speed, flying, or just plain magic in the boots */	1469	/* Check for stealty, speed, flying, or just plain magic in the boots */
1258	/* Presume any boots that hvae a move_type are special. */	1470	/* Presume any boots that hvae a move_type are special. */
1259	if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) \|\| op->move_type \|\| op->stats.exp)))	1471	if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] \|\| op->move_type \|\| op->stats.exp)))
1260	return 1;	1472	return 1;
1261		1473
1262	/* Take care of amulet/shield that reflects spells/missiles */	1474	/* Take care of amulet/shield that reflects spells/missiles */
1263	if ((op->type == AMULET \|\| op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) \|\| QUERY_FLAG (op, FLAG_REFL_MISSILE)))	1475	if ((op->type == AMULET \|\| op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] \|\| op->flag [FLAG_REFL_MISSILE]))
1264	return 1;	1476	return 1;
1265		1477
1266	/* Take care of helmet of xrays */	1478	/* Take care of helmet of xrays */
1267	if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS))	1479	if (op->type == HELMET && op->flag [FLAG_XRAYS])
1268	return 1;	1480	return 1;
1269		1481
1270	/* Potions & rods are always magical. Wands/staves are also magical,	1482	/* Potions & rods are always magical. Wands/staves are also magical,
1271	* assuming they still have any charges left.	1483	* assuming they still have any charges left.
1272	*/	1484	*/
…		…
1301	* be non magical.	1513	* be non magical.
1302	*/	1514	*/
1303	return 0;	1515	return 0;
1304	}	1516	}
1305		1517
1306	/* need_identify returns true if the item should be identified. This
1307	* function really should not exist - by default, any item not identified
1308	* should need it.
1309	*/
1310
1311	int
1312	need_identify (const object *op)
1313	{
1314	switch (op->type)
1315	{
1316	case RING:
1317	case WAND:
1318	case ROD:
1319	case HORN:
1320	case SCROLL:
1321	case SKILL:
1322	case SKILLSCROLL:
1323	case SPELLBOOK:
1324	case FOOD:
1325	case POTION:
1326	case BOW:
1327	case ARROW:
1328	case WEAPON:
1329	case ARMOUR:
1330	case SHIELD:
1331	case HELMET:
1332	case AMULET:
1333	case BOOTS:
1334	case GLOVES:
1335	case BRACERS:
1336	case GIRDLE:
1337	case CONTAINER:
1338	case DRINK:
1339	case FLESH:
1340	case INORGANIC:
1341	case CLOSE_CON:
1342	case CLOAK:
1343	case GEM:
1344	case POWER_CRYSTAL:
1345	case POISON:
1346	case BOOK:
1347	case SKILL_TOOL:
1348	return 1;
1349	}
1350
1351	/* Try to track down some stuff that may show up here. Thus, the
1352	* archetype file can be updated, and this function removed.
1353	*/
1354	#if 0
1355	LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1356	#endif
1357	return 0;
1358	}
1359
1360	/*	1518	/*
1361	* Supposed to fix face-values as well here, but later.	1519	* Supposed to fix face-values as well here, but later.
1362	*/	1520	*/
1363	void	1521	void
1364	identify (object *op)	1522	identify (object *op)
1365	{	1523	{
1366	SET_FLAG (op, FLAG_IDENTIFIED);	1524	op->set_flag (FLAG_IDENTIFIED);
1367	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	1525	op->clr_flag (FLAG_KNOWN_MAGICAL);
1368	CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);	1526	op->clr_flag (FLAG_NO_SKILL_IDENT);
1369		1527
1370	/*	1528	/*
1371	* We want autojoining of equal objects:	1529	* We want autojoining of equal objects:
1372	*/	1530	*/
1373	if (QUERY_FLAG (op, FLAG_CURSED) \|\| QUERY_FLAG (op, FLAG_DAMNED))	1531	if (op->flag [FLAG_CURSED] \|\| op->flag [FLAG_DAMNED])
1374	SET_FLAG (op, FLAG_KNOWN_CURSED);	1532	op->set_flag (FLAG_KNOWN_CURSED);
1375		1533
1376	if (op->type == POTION)	1534	if (op->type == POTION)
1377	{	1535	{
1378	if (op->inv && op->randomitems)	1536	if (op->inv && op->randomitems)
1379	op->title = op->inv->name;	1537	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.65 by root, Sat Nov 7 18:30:05 2009 UTC vs. Revision 1.84 by root, Thu Apr 15 02:51:39 2010 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.65 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.84 by root, Thu Apr 15 02:51:39 2010 UTC