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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.18 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.37 by root, Mon Jun 4 13:04:00 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
9	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	(at your option) any later version.	11	* any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful, but
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	GNU General Public License for more details.	16	* for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License along
19	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <funcpoint.h>	26	#include <funcpoint.h>
27	#include <living.h>	27	#include <living.h>
28	#include <spells.h>	28	#include <spells.h>
47	* may be better.	47	* may be better.
48	* Basically, for the use/nonuse, the code does something like:	48	* Basically, for the use/nonuse, the code does something like:
49	* "This item goes %s\n", with the use/nonuse values filling in the %s	49	* "This item goes %s\n", with the use/nonuse values filling in the %s
50	*/	50	*/
51	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {	51	Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52	{"body_range", "in your range slot", "in a human's range slot"},	52	{KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
53	{"body_arm", "on your arm", "on a human's arm"},	53	{KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
54	{"body_torso", "on your body", "on a human's torso"},	54	{KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
55	{"body_head", "on your head", "on a human's head"},	55	{KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
56	{"body_neck", "around your neck", "around a humans neck"},	56	{KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
57	{"body_skill", "in your skill slot", "in a human's skill slot"},	57	{KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
58	{"body_finger", "on your finger", "on a human's finger"} ,	58	{KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
		59	{KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
		60	{KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
59	{"body_shoulder", "around your shoulders", "around a human's shoulders"},	61	{KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
60	{"body_foot", "on your feet", "on a human's feet"},	62	{KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
61	{"body_hand", "on your hands", "on a human's hands"},	63	{KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
62	{"body_wrist", "around your wrists", "around a human's wrist"},	64	{KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
63	{"body_waist", "around your waist", "around a human's waist"},	65	{KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
64	/{"body_dragon_torso", "your body", "a dragon's body"} /	66	/{"body_dragon_torso", "your body", "a dragon's body"} /
65	};	67	};
66		68
67	static char numbers[21][20] = {	69	static char numbers[21][20] = {
68	"no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",	70	"no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
…		…
250	};	252	};
251		253
252	int	254	int
253	get_power_from_ench (int ench)	255	get_power_from_ench (int ench)
254	{	256	{
255	if (ench < 0)	257	if (ench < 0) ench = 0;
256	ench = 0;	258	if (ench > 20) ench = 20;
257	if (ench > 20)	259
258	ench = 20;
259	return enc_to_item_power[ench];	260	return enc_to_item_power[ench];
260	}	261	}
261		262
262	/* This takes an object 'op' and figures out what its item_power	263	/* This takes an object 'op' and figures out what its item_power
263	* rating should be. This should only really be used by the treasure	264	* rating should be. This should only really be used by the treasure
…		…
271	{	272	{
272	int i, tmp, enc;	273	int i, tmp, enc;
273		274
274	enc = 0;	275	enc = 0;
275	for (i = 0; i < NUM_STATS; i++)	276	for (i = 0; i < NUM_STATS; i++)
276	enc += get_attr_value (&op->stats, i);	277	enc += op->stats.stat (i);
277		278
278	/* This protection logic is pretty flawed. 20% fire resistance	279	/* This protection logic is pretty flawed. 20% fire resistance
279	* is much more valuable than 20% confusion, or 20% slow, or	280	* is much more valuable than 20% confusion, or 20% slow, or
280	* several others. Start at 1 - ignore physical - all that normal	281	* several others. Start at 1 - ignore physical - all that normal
281	* armour shouldn't be counted against	282	* armour shouldn't be counted against
…		…
342	enc += 1;	343	enc += 1;
343	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	344	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
344	enc += 1;	345	enc += 1;
345		346
346	return get_power_from_ench (enc);	347	return get_power_from_ench (enc);
347
348	}	348	}
349		349
350	/* returns the typedata that has a number equal to itemtype, if there	350	/* returns the typedata that has a number equal to itemtype, if there
351	* isn't one, returns NULL */	351	* isn't one, returns NULL */
352
353	const typedata *	352	const typedata *
354	get_typedata (int itemtype)	353	get_typedata (int itemtype)
355	{	354	{
356	int i;	355	int i;
357		356
…		…
362	}	361	}
363		362
364	/* returns the typedata that has a name equal to itemtype, if there	363	/* returns the typedata that has a name equal to itemtype, if there
365	* isn't one, return the plural name that matches, if there still isn't	364	* isn't one, return the plural name that matches, if there still isn't
366	* one return NULL */	365	* one return NULL */
367
368	const typedata *	366	const typedata *
369	get_typedata_by_name (const char *name)	367	get_typedata_by_name (const char *name)
370	{	368	{
371	int i;	369	int i;
372		370
…		…
387	* returns a static array of the description. This can return	385	* returns a static array of the description. This can return
388	* a big buffer.	386	* a big buffer.
389	* if newline is true, we don't put parens around the description	387	* if newline is true, we don't put parens around the description
390	* but do put a newline at the end. Useful when dumping to files	388	* but do put a newline at the end. Useful when dumping to files
391	*/	389	*/
392	char *	390	const char *
393	describe_resistance (const object *op, int newline)	391	describe_resistance (const object *op, int newline)
394	{	392	{
395	static char buf[VERY_BIG_BUF];	393	static char buf[VERY_BIG_BUF];
396	char buf1[VERY_BIG_BUF];	394	char buf1[VERY_BIG_BUF];
397	int tmpvar;	395	int tmpvar;
…		…
416	/*	414	/*
417	* query_weight(object) returns a character pointer to a static buffer	415	* query_weight(object) returns a character pointer to a static buffer
418	* containing the text-representation of the weight of the given object.	416	* containing the text-representation of the weight of the given object.
419	* The buffer will be overwritten by the next call to query_weight().	417	* The buffer will be overwritten by the next call to query_weight().
420	*/	418	*/
421		419	const char *
422	char *
423	query_weight (const object *op)	420	query_weight (const object *op)
424	{	421	{
425	static char buf[10];	422	static char buf[10];
426	sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;	423	sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
427		424
428	if (op->weight < 0)	425	if (op->weight < 0)
429	return " ";	426	return " ";
		427
430	if (i % 1000)	428	if (i % 1000)
431	sprintf (buf, "%6.1f", i / 1000.0);	429	sprintf (buf, "%6.1f", i / 1000.0);
432	else	430	else
433	sprintf (buf, "%4d ", i / 1000);	431	sprintf (buf, "%4d ", i / 1000);
		432
434	return buf;	433	return buf;
435	}	434	}
436		435
437	/*	436	/*
438	* Returns the pointer to a static buffer containing	437	* Returns the pointer to a static buffer containing
439	* the number requested (of the form first, second, third...)	438	* the number requested (of the form first, second, third...)
440	*/	439	*/
441		440	const char *
442	char *
443	get_levelnumber (int i)	441	get_levelnumber (int i)
444	{	442	{
445	static char buf[MAX_BUF];	443	static char buf[MAX_BUF];
446		444
447	if (i > 99)	445	if (i > 99)
448	{	446	{
449	sprintf (buf, "%d.", i);	447	sprintf (buf, "%d.", i);
450	return buf;	448	return buf;
451	}	449	}
		450
452	if (i < 21)	451	if (i < 21)
453	return levelnumbers[i];	452	return levelnumbers[i];
454	if (!(i % 10))	453	if (!(i % 10))
455	return levelnumbers_10[i / 10];	454	return levelnumbers_10[i / 10];
		455
456	strcpy (buf, numbers_10[i / 10]);	456	strcpy (buf, numbers_10[i / 10]);
457	strcat (buf, levelnumbers[i % 10]);	457	strcat (buf, levelnumbers[i % 10]);
458	return buf;	458	return buf;
459	}	459	}
460
461		460
462	/*	461	/*
463	* get_number(integer) returns the text-representation of the given number	462	* get_number(integer) returns the text-representation of the given number
464	* in a static buffer. The buffer might be overwritten at the next	463	* in a static buffer. The buffer might be overwritten at the next
465	* call to get_number().	464	* call to get_number().
466	* It is currently only used by the query_name() function.	465	* It is currently only used by the query_name() function.
467	*/	466	*/
468		467	const char *
469	char *
470	get_number (int i)	468	get_number (int i)
471	{	469	{
472	if (i <= 20)	470	if (i <= 20)
473	return numbers[i];	471	return numbers[i];
474	else	472	else
…		…
491	*/	489	*/
492		490
493	/* Aug 95 modified this slightly so that Skill tools don't have magic bonus	491	/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
494	* from stats.sp - b.t.	492	* from stats.sp - b.t.
495	*/	493	*/
496	char *	494	const char *
497	ring_desc (const object *op)	495	ring_desc (const object *op)
498	{	496	{
499	static char buf[VERY_BIG_BUF];	497	static char buf[VERY_BIG_BUF];
500	int attr, val, len;	498	int attr, val, len;
501		499
…		…
504	if (!QUERY_FLAG (op, FLAG_IDENTIFIED))	502	if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
505	return buf;	503	return buf;
506		504
507	for (attr = 0; attr < NUM_STATS; attr++)	505	for (attr = 0; attr < NUM_STATS; attr++)
508	{	506	{
509	if ((val = get_attr_value (&(op->stats), attr)) != 0)	507	if ((val = op->stats.stat (attr)))
510	{
511	sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);	508	sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
512	}
513	}	509	}
		510
514	if (op->stats.exp)	511	if (op->stats.exp)
515	sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);	512	sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
516	if (op->stats.wc)	513	if (op->stats.wc)
517	sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);	514	sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
518	if (op->stats.dam)	515	if (op->stats.dam)
…		…
540	strcat (buf, "(reflect spells)");	537	strcat (buf, "(reflect spells)");
541	if (QUERY_FLAG (op, FLAG_REFL_MISSILE))	538	if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
542	strcat (buf, "(reflect missiles)");	539	strcat (buf, "(reflect missiles)");
543	if (QUERY_FLAG (op, FLAG_STEALTH))	540	if (QUERY_FLAG (op, FLAG_STEALTH))
544	strcat (buf, "(stealth)");	541	strcat (buf, "(stealth)");
		542
545	/* Shorten some of the names, so they appear better in the windows */	543	/* Shorten some of the names, so they appear better in the windows */
546	len = strlen (buf);	544	len = strlen (buf);
547	DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);	545	DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
548	DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);	546	DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
549	DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);	547	DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
…		…
614	case AMULET:	612	case AMULET:
615	case RING:	613	case RING:
616	if (!op->title)	614	if (!op->title)
617	{	615	{
618	/* If ring has a title, full description isn't so useful */	616	/* If ring has a title, full description isn't so useful */
619	char *s = ring_desc (op);	617	const char *s = ring_desc (op);
620		618
621	if (s[0])	619	if (s[0])
622	{	620	{
623	safe_strcat (buf, " ", &len, HUGE_BUF);	621	safe_strcat (buf, " ", &len, HUGE_BUF);
624	safe_strcat (buf, s, &len, HUGE_BUF);	622	safe_strcat (buf, s, &len, HUGE_BUF);
…		…
644	* overwritten. This may be a bad thing (it may be easier to assume the value	642	* overwritten. This may be a bad thing (it may be easier to assume the value
645	* returned is good forever.) However, it makes printing statements that	643	* returned is good forever.) However, it makes printing statements that
646	* use several names much easier (don't need to store them to temp variables.)	644	* use several names much easier (don't need to store them to temp variables.)
647	*	645	*
648	*/	646	*/
649	char *	647	const char *
650	query_name (const object *op)	648	query_name (const object *op)
651	{	649	{
652	static char buf[5][HUGE_BUF];	650	static char buf[5][HUGE_BUF]; // OMFG
653	static int use_buf = 0;	651	static int use_buf = 0;
654	int len = 0;	652	int len = 0;
655		653
656	#ifdef NEW_MATERIAL_CODE	654	#ifdef NEW_MATERIAL_CODE
657	materialtype_t *mt;	655	materialtype_t *mt;
…		…
684	if (QUERY_FLAG (op, FLAG_DAMNED))	682	if (QUERY_FLAG (op, FLAG_DAMNED))
685	safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);	683	safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
686	else if (QUERY_FLAG (op, FLAG_CURSED))	684	else if (QUERY_FLAG (op, FLAG_CURSED))
687	safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);	685	safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
688	}	686	}
		687
689	/* Basically, if the object is known magical (detect magic spell on it),	688	/* Basically, if the object is known magical (detect magic spell on it),
690	* and it isn't identified, print out the fact that	689	* and it isn't identified, print out the fact that
691	* it is magical. Assume that the detect magical spell will only set	690	* it is magical. Assume that the detect magical spell will only set
692	* KNOWN_MAGICAL if the item actually is magical.	691	* KNOWN_MAGICAL if the item actually is magical.
693	*	692	*
…		…
709		708
710	if (QUERY_FLAG (op, FLAG_APPLIED))	709	if (QUERY_FLAG (op, FLAG_APPLIED))
711	{	710	{
712	switch (op->type)	711	switch (op->type)
713	{	712	{
714	case BOW:	713	case BOW:
715	case WAND:	714	case WAND:
716	case ROD:	715	case ROD:
717	case HORN:	716	case HORN:
718	safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);	717	safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
719	break;	718	break;
720	case WEAPON:	719	case WEAPON:
721	safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);	720	safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
722	break;	721	break;
723	case ARMOUR:	722	case ARMOUR:
724	case HELMET:	723	case HELMET:
725	case SHIELD:	724	case SHIELD:
726	case RING:	725	case RING:
727	case BOOTS:	726	case BOOTS:
728	case GLOVES:	727	case GLOVES:
729	case AMULET:	728	case AMULET:
730	case GIRDLE:	729	case GIRDLE:
731	case BRACERS:	730	case BRACERS:
732	case CLOAK:	731	case CLOAK:
733	safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);	732	safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
734	break;	733	break;
735	case CONTAINER:	734	case CONTAINER:
736	safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);	735	safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
737	break;	736	break;
738	case SKILL:	737	case SKILL:
739	default:	738	default:
740	safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);	739	safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
741	}	740	}
742	}	741	}
		742
743	if (QUERY_FLAG (op, FLAG_UNPAID))	743	if (QUERY_FLAG (op, FLAG_UNPAID))
744	safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);	744	safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
745		745
746	return buf[use_buf];	746	return buf [use_buf];
747	}	747	}
748		748
749	/*	749	/*
750	* query_base_name(object) returns a character pointer pointing to a static	750	* query_base_name(object) returns a character pointer pointing to a static
751	* buffer which contains a verbose textual representation of the name	751	* buffer which contains a verbose textual representation of the name
…		…
771	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)	771	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname)
772	mt = name_to_material (op->materialname);	772	mt = name_to_material (op->materialname);
773		773
774	#ifdef NEW_MATERIAL_CODE	774	#ifdef NEW_MATERIAL_CODE
775	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname && mt &&	775	if ((op->is_armor () \|\| op->is_weapon ()) && op->materialname && mt &&
776	op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))	776	op->arch->materialname != mt->name && !(op->material & M_SPECIAL))
777	{	777	{
778	strcpy (buf, mt->description);	778	strcpy (buf, mt->description);
779	len = strlen (buf);	779	len = strlen (buf);
780	safe_strcat (buf, " ", &len, MAX_BUF);	780	safe_strcat (buf, " ", &len, MAX_BUF);
781	if (!plural)	781	if (!plural)
…		…
785	}	785	}
786	else	786	else
787	{	787	{
788	#endif	788	#endif
789	if (!plural)	789	if (!plural)
790	strcpy (buf, op->name);	790	assign (buf, op->name);
791	else	791	else
792	strcpy (buf, op->name_pl);	792	assign (buf, op->name_pl);
		793
793	len = strlen (buf);	794	len = strlen (buf);
794	#ifdef NEW_MATERIAL_CODE	795	#ifdef NEW_MATERIAL_CODE
795	}	796	}
796	#endif	797	#endif
797		798
…		…
801	safe_strcat (buf, op->title, &len, MAX_BUF);	802	safe_strcat (buf, op->title, &len, MAX_BUF);
802	}	803	}
803		804
804	switch (op->type)	805	switch (op->type)
805	{	806	{
806	case SPELLBOOK:	807	case SPELLBOOK:
807	case SCROLL:	808	case SCROLL:
808	case WAND:	809	case WAND:
809	case ROD:	810	case ROD:
810	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))	811	if (QUERY_FLAG (op, FLAG_IDENTIFIED) \|\| QUERY_FLAG (op, FLAG_BEEN_APPLIED))
811	{	812	{
812	if (!op->title)	813	if (!op->title)
813	{	814	{
814	safe_strcat (buf, " of ", &len, MAX_BUF);	815	safe_strcat (buf, " of ", &len, MAX_BUF);
815	if (op->inv)	816	if (op->inv)
816	safe_strcat (buf, op->inv->name, &len, MAX_BUF);	817	safe_strcat (buf, op->inv->name, &len, MAX_BUF);
817	else	818	else
818	LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);	819	LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
819	}	820	}
820	if (op->type != SPELLBOOK)	821	if (op->type != SPELLBOOK)
821	{	822	{
822	sprintf (buf2, " (lvl %d)", op->level);	823	sprintf (buf2, " (lvl %d)", op->level);
823	safe_strcat (buf, buf2, &len, MAX_BUF);	824	safe_strcat (buf, buf2, &len, MAX_BUF);
824	}	825	}
825	}	826	}
826	break;	827	break;
827		828
828		829
829	case SKILL:	830	case SKILL:
830	case AMULET:	831	case AMULET:
831	case RING:	832	case RING:
832	if (!op->title)	833	if (!op->title)
833	{	834	{
834	/* If ring has a title, full description isn't so useful */	835	/* If ring has a title, full description isn't so useful */
835	char *s = ring_desc (op);	836	const char *s = ring_desc (op);
836		837
837	if (s[0])	838	if (s[0])
838	{	839	{
839	safe_strcat (buf, " ", &len, MAX_BUF);	840	safe_strcat (buf, " ", &len, MAX_BUF);
840	safe_strcat (buf, s, &len, MAX_BUF);	841	safe_strcat (buf, s, &len, MAX_BUF);
841	}	842	}
842	}	843	}
843	break;	844	break;
		845
844	default:	846	default:
845	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))	847	if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) \|\| QUERY_FLAG (op, FLAG_IDENTIFIED)))
846	{
847	sprintf (buf + strlen (buf), " %+d", op->magic);	848	sprintf (buf + strlen (buf), " %+d", op->magic);
848	}
849	}	849	}
		850
850	return buf;	851	return buf;
851	}	852	}
852		853
853	/* Break this off from describe_item - that function was way	854	/* Break this off from describe_item - that function was way
854	* too long, making it difficult to read. This function deals	855	* too long, making it difficult to read. This function deals
855	* with describing the monsters & players abilities. It should only	856	* with describing the monsters & players abilities. It should only
856	* be called with monster & player objects. Returns a description	857	* be called with monster & player objects. Returns a description
857	* in a static buffer.	858	* in a static buffer.
858	*/	859	*/
859
860	static char *	860	static char *
861	describe_monster (const object *op)	861	describe_monster (const object *op)
862	{	862	{
863	char buf[MAX_BUF];	863	char buf[MAX_BUF];
864	static char retbuf[VERY_BIG_BUF];	864	static char retbuf[VERY_BIG_BUF];
…		…
934	{	934	{
935	treasure *t;	935	treasure *t;
936	int first = 1;	936	int first = 1;
937		937
938	for (t = op->randomitems->items; t != NULL; t = t->next)	938	for (t = op->randomitems->items; t != NULL; t = t->next)
939	if (t->item && t->item->clone.type == SPELL)	939	if (t->item && t->item->type == SPELL)
940	{	940	{
941	if (first)	941	if (first)
942	{	942	{
943	first = 0;	943	first = 0;
944	strcat (retbuf, "(Spell abilities:)");	944	strcat (retbuf, "(Spell abilities:)");
945	}	945	}
946	strcat (retbuf, "(");	946	strcat (retbuf, "(");
947	strcat (retbuf, t->item->clone.name);	947	strcat (retbuf, t->item->object::name);
948	strcat (retbuf, ")");	948	strcat (retbuf, ")");
949	}	949	}
950	}	950	}
951	if (op->type == PLAYER)	951	if (op->type == PLAYER)
952	{	952	{
…		…
990	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	990	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
991	if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))	991	if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
992	break;	992	break;
993		993
994	if (tmp && tmp->attacktype != 0)	994	if (tmp && tmp->attacktype != 0)
995	{
996	DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");	995	{ DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
997	}
998	else	996	else
999	{
1000	DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");	997	{ DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1001	}
1002	}	998	}
1003	else	999	else
1004	{
1005	DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");	1000	{ DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1006	}	1001
1007	DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");	1002	DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1008	DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");	1003	DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1009	DESCRIBE_PATH (retbuf, op->path_denied, "Denied");	1004	DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
		1005
1010	for (i = 0; i < NROFATTACKS; i++)	1006	for (i = 0; i < NROFATTACKS; i++)
1011	{
1012	if (op->resist[i])	1007	if (op->resist[i])
1013	{	1008	{
1014	sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);	1009	sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1015	strcat (retbuf, buf);	1010	strcat (retbuf, buf);
1016	}	1011	}
1017	}	1012
1018	return retbuf;	1013	return retbuf;
1019	}	1014	}
1020		1015
1021		1016
1022	/*	1017	/*
…		…
1043	*	1038	*
1044	* Add 'owner' who is the person examining this object.	1039	* Add 'owner' who is the person examining this object.
1045	* owner can be null if no one is being associated with this	1040	* owner can be null if no one is being associated with this
1046	* item (eg, debug dump or the like)	1041	* item (eg, debug dump or the like)
1047	*/	1042	*/
1048		1043	const char *
1049	char *
1050	describe_item (const object op, object owner)	1044	describe_item (const object op, object owner)
1051	{	1045	{
1052	char buf[MAX_BUF];	1046	char buf[MAX_BUF];
1053	static char retbuf[VERY_BIG_BUF];	1047	static char retbuf[VERY_BIG_BUF];
1054	int identified, i;	1048	int identified, i;
…		…
1088	break; /* We have more information to do below this switch */	1082	break; /* We have more information to do below this switch */
1089		1083
1090	case POWER_CRYSTAL:	1084	case POWER_CRYSTAL:
1091	if (op->stats.maxsp > 1000)	1085	if (op->stats.maxsp > 1000)
1092	{ /higher capacity crystals /	1086	{ /higher capacity crystals /
1093	i = (op->stats.maxsp % 100) / 10;	1087	i = (op->stats.maxsp % 1000) / 100;
		1088
1094	if (i)	1089	if (i)
1095	snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i);	1090	snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1096	else	1091	else
1097	snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100);	1092	snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000);
1098	}	1093	}
1099	else	1094	else
1100	snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp);	1095	snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp);
		1096
1101	strcat (retbuf, buf);	1097	strcat (retbuf, buf);
1102	i = (op->stats.sp * 10) / op->stats.maxsp;	1098	i = (op->stats.sp * 10) / op->stats.maxsp;
1103	if (op->stats.sp == 0)	1099	if (op->stats.sp == 0)
1104	strcat (retbuf, "empty.");	1100	strcat (retbuf, "empty.");
1105	else if (i == 0)	1101	else if (i == 0)
…		…
1170	{	1166	{
1171	int attr, val;	1167	int attr, val;
1172		1168
1173	for (attr = 0; attr < NUM_STATS; attr++)	1169	for (attr = 0; attr < NUM_STATS; attr++)
1174	{	1170	{
1175	if ((val = get_attr_value (&(op->stats), attr)) != 0)	1171	if ((val = op->stats.stat (attr)))
1176	{	1172	{
1177	sprintf (buf, "(%s%+d)", short_stat_name[attr], val);	1173	sprintf (buf, "(%s%+d)", short_stat_name[attr], val);
1178	strcat (retbuf, buf);	1174	strcat (retbuf, buf);
1179	}	1175	}
1180	}	1176	}
…		…
1364	}	1360	}
1365		1361
1366	return retbuf;	1362	return retbuf;
1367	}	1363	}
1368		1364
		1365	std::string
		1366	object::describe_item (object *who)
		1367	{
		1368	return std::string (::describe_item (this, who));
		1369	}
		1370
1369	/* Return true if the item is magical. A magical item is one that	1371	/* Return true if the item is magical. A magical item is one that
1370	* increases/decreases any abilities, provides a resistance,	1372	* increases/decreases any abilities, provides a resistance,
1371	* has a generic magical bonus, or is an artifact.	1373	* has a generic magical bonus, or is an artifact.
1372	* This function is used by detect_magic to determine if an item	1374	* This function is used by detect_magic to determine if an item
1373	* should be marked as magical.	1375	* should be marked as magical.
…		…
1431	if (op->magic \|\| op->type == POWER_CRYSTAL \|\| op->type == SPELLBOOK \|\| op->type == SCROLL \|\| op->type == GIRDLE)	1433	if (op->magic \|\| op->type == POWER_CRYSTAL \|\| op->type == SPELLBOOK \|\| op->type == SCROLL \|\| op->type == GIRDLE)
1432	return 1;	1434	return 1;
1433		1435
1434	/* Check to see if it increases/decreases any stats */	1436	/* Check to see if it increases/decreases any stats */
1435	for (i = 0; i < NUM_STATS; i++)	1437	for (i = 0; i < NUM_STATS; i++)
1436	if (get_attr_value (&(op->stats), i) != 0)	1438	if (op->stats.stat (i))
1437	return 1;	1439	return 1;
1438		1440
1439	/* If it doesn't fall into any of the above categories, must	1441	/* If it doesn't fall into any of the above categories, must
1440	* be non magical.	1442	* be non magical.
1441	*/	1443	*/
…		…
1450	int	1452	int
1451	need_identify (const object *op)	1453	need_identify (const object *op)
1452	{	1454	{
1453	switch (op->type)	1455	switch (op->type)
1454	{	1456	{
1455	case RING:	1457	case RING:
1456	case WAND:	1458	case WAND:
1457	case ROD:	1459	case ROD:
1458	case HORN:	1460	case HORN:
1459	case SCROLL:	1461	case SCROLL:
1460	case SKILL:	1462	case SKILL:
1461	case SKILLSCROLL:	1463	case SKILLSCROLL:
1462	case SPELLBOOK:	1464	case SPELLBOOK:
1463	case FOOD:	1465	case FOOD:
1464	case POTION:	1466	case POTION:
1465	case BOW:	1467	case BOW:
1466	case ARROW:	1468	case ARROW:
1467	case WEAPON:	1469	case WEAPON:
1468	case ARMOUR:	1470	case ARMOUR:
1469	case SHIELD:	1471	case SHIELD:
1470	case HELMET:	1472	case HELMET:
1471	case AMULET:	1473	case AMULET:
1472	case BOOTS:	1474	case BOOTS:
1473	case GLOVES:	1475	case GLOVES:
1474	case BRACERS:	1476	case BRACERS:
1475	case GIRDLE:	1477	case GIRDLE:
1476	case CONTAINER:	1478	case CONTAINER:
1477	case DRINK:	1479	case DRINK:
1478	case FLESH:	1480	case FLESH:
1479	case INORGANIC:	1481	case INORGANIC:
1480	case CLOSE_CON:	1482	case CLOSE_CON:
1481	case CLOAK:	1483	case CLOAK:
1482	case GEM:	1484	case GEM:
1483	case POWER_CRYSTAL:	1485	case POWER_CRYSTAL:
1484	case POISON:	1486	case POISON:
1485	case BOOK:	1487	case BOOK:
1486	case SKILL_TOOL:	1488	case SKILL_TOOL:
1487	return 1;	1489	return 1;
1488	}	1490	}
		1491
1489	/* Try to track down some stuff that may show up here. Thus, the	1492	/* Try to track down some stuff that may show up here. Thus, the
1490	* archetype file can be updated, and this function removed.	1493	* archetype file can be updated, and this function removed.
1491	*/	1494	*/
1492	#if 0	1495	#if 0
1493	LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);	1496	LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
…		…
1517	{	1520	{
1518	if (op->inv && op->randomitems)	1521	if (op->inv && op->randomitems)
1519	op->title = op->inv->name;	1522	op->title = op->inv->name;
1520	else if (op->arch)	1523	else if (op->arch)
1521	{	1524	{
1522	op->name = op->arch->clone.name;	1525	op->name = op->arch->object::name;
1523	op->name_pl = op->arch->clone.name_pl;	1526	op->name_pl = op->arch->object::name_pl;
1524	}	1527	}
1525	}	1528	}
1526		1529
1527	/* If the object is on a map, make sure we update its face */	1530	/* If the object is on a map, make sure we update its face */
1528	if (op->map)	1531	if (op->map)
1529	update_object (op, UP_OBJ_FACE);	1532	update_object (op, UP_OBJ_CHANGE);
1530	else	1533	else
1531	{	1534	{
1532	pl = op->in_player ();	1535	pl = op->in_player ();
1533	if (pl)	1536	if (pl)
1534	/* A lot of the values can change from an update - might as well send	1537	/* A lot of the values can change from an update - might as well send

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.18 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs. Revision 1.37 by root, Mon Jun 4 13:04:00 2007 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.18 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.37 by root, Mon Jun 4 13:04:00 2007 UTC