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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.29 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#define ALLOWED_COMBINATION	25	#define ALLOWED_COMBINATION
25		26
26	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	27	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
27	* It is useful for finding bugs in the treasures file. Since it only	28	* It is useful for finding bugs in the treasures file. Since it only
156	* so that the treasure name can be printed out	157	* so that the treasure name can be printed out
157	*/	158	*/
158	static void	159	static void
159	check_treasurelist (const treasure t, const treasurelist tl)	160	check_treasurelist (const treasure t, const treasurelist tl)
160	{	161	{
161	if (t->item == NULL && t->name == NULL)
162	LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name);
163	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))	162	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
164	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);	163	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
165	/* find_treasurelist will print out its own error message */	164	/* find_treasurelist will print out its own error message */
166	if (t->name && *t->name)	165	if (t->name && *t->name)
167	(void) find_treasurelist (t->name);	166	find_treasurelist (t->name);
168	if (t->next)	167	if (t->next)
169	check_treasurelist (t->next, tl);	168	check_treasurelist (t->next, tl);
170	if (t->next_yes)	169	if (t->next_yes)
171	check_treasurelist (t->next_yes, tl);	170	check_treasurelist (t->next_yes, tl);
172	if (t->next_no)	171	if (t->next_no)
…		…
332	void	331	void
333	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)	332	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)
334	{	333	{
335	object *tmp;	334	object *tmp;
336		335
337	if ((int) t->chance >= 100 \|\| (RANDOM () % 100 + 1) < (int) t->chance)	336	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
338	{	337	{
339	if (t->name)	338	if (t->name)
340	{	339	{
341	if (strcmp (t->name, "NONE") && difficulty >= t->magic)	340	if (difficulty >= t->magic)
342	{	341	{
343	treasurelist *tl = find_treasurelist (t->name);	342	treasurelist *tl = find_treasurelist (t->name);
344	if (tl)	343	if (tl)
345	create_treasure (tl, op, flag, difficulty, tries);	344	create_treasure (tl, op, flag, difficulty, tries);
346	}	345	}
347	}	346	}
348	else	347	else
349	{	348	{
350	if (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE))	349	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))
351	{	350	{
352	tmp = arch_to_object (t->item);	351	tmp = arch_to_object (t->item);
353	if (t->nrof && tmp->nrof <= 1)	352	if (t->nrof && tmp->nrof <= 1)
354	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	353	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	354	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
395	return;	394	return;
396	}	395	}
397		396
398	if (t->name)	397	if (t->name)
399	{	398	{
400	if (!strcmp (t->name, "NONE"))
401	return;
402
403	if (difficulty >= t->magic)	399	if (difficulty >= t->magic)
404	{	400	{
405	treasurelist *tl = find_treasurelist (t->name);	401	treasurelist *tl = find_treasurelist (t->name);
406	if (tl)	402	if (tl)
407	create_treasure (tl, op, flag, difficulty, tries);	403	create_treasure (tl, op, flag, difficulty, tries);
…		…
410	create_one_treasure (tl, op, flag, difficulty, tries);	406	create_one_treasure (tl, op, flag, difficulty, tries);
411		407
412	return;	408	return;
413	}	409	}
414		410
415	if ((t->item && t->item->clone.invisible != 0) \|\| flag != GT_INVISIBLE)	411	if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))
416	{	412	{
417	object *tmp = arch_to_object (t->item);	413	object *tmp = arch_to_object (t->item);
418		414
419	if (!tmp)	415	if (!tmp)
420	return;	416	return;
…		…
434	* list transitions, or so that excessively good treasure will not be	430	* list transitions, or so that excessively good treasure will not be
435	* created on weak maps, because it will exceed the number of allowed tries	431	* created on weak maps, because it will exceed the number of allowed tries
436	* to do that.	432	* to do that.
437	*/	433	*/
438	void	434	void
439	create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries)	435	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
440	{	436	{
441		437
442	if (tries++ > 100)	438	if (tries++ > 100)
443	{	439	{
444	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	440	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
445	return;	441	return;
446	}	442	}
447	if (t->total_chance)	443	if (tl->total_chance)
448	create_one_treasure (t, op, flag, difficulty, tries);	444	create_one_treasure (tl, op, flag, difficulty, tries);
449	else	445	else
450	create_all_treasures (t->items, op, flag, difficulty, tries);	446	create_all_treasures (tl->items, op, flag, difficulty, tries);
451	}	447	}
452		448
453	/* This is similar to the old generate treasure function. However,	449	/* This is similar to the old generate treasure function. However,
454	* it instead takes a treasurelist. It is really just a wrapper around	450	* it instead takes a treasurelist. It is really just a wrapper around
455	* create_treasure. We create a dummy object that the treasure gets	451	* create_treasure. We create a dummy object that the treasure gets
456	* inserted into, and then return that treausre	452	* inserted into, and then return that treausre
457	*/	453	*/
458	object *	454	object *
459	generate_treasure (treasurelist *t, int difficulty)	455	generate_treasure (treasurelist *tl, int difficulty)
460	{	456	{
461	difficulty = clamp (difficulty, 1, settings.max_level);	457	difficulty = clamp (difficulty, 1, settings.max_level);
462		458
463	object ob = object::create (), tmp;	459	object ob = object::create (), tmp;
464		460
465	create_treasure (t, ob, 0, difficulty, 0);	461	create_treasure (tl, ob, 0, difficulty, 0);
466		462
467	/* Don't want to free the object we are about to return */	463	/* Don't want to free the object we are about to return */
468	tmp = ob->inv;	464	tmp = ob->inv;
469	if (tmp != NULL)	465	if (tmp != NULL)
470	tmp->remove ();	466	tmp->remove ();
…		…
574	scaled_diff = 0;	570	scaled_diff = 0;
575		571
576	if (scaled_diff >= DIFFLEVELS)	572	if (scaled_diff >= DIFFLEVELS)
577	scaled_diff = DIFFLEVELS - 1;	573	scaled_diff = DIFFLEVELS - 1;
578		574
579	percent = RANDOM () % 100;	575	percent = rndm (100);
580		576
581	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	577	for (magic = 0; magic < (MAXMAGIC + 1); magic++)
582	{	578	{
583	percent -= difftomagic_list[scaled_diff][magic];	579	percent -= difftomagic_list[scaled_diff][magic];
584		580
…		…
590	{	586	{
591	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	587	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
592	magic = 0;	588	magic = 0;
593	}	589	}
594		590
595	magic = (RANDOM () % 3) ? magic : -magic;	591	magic = (rndm (3)) ? magic : -magic;
596	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	592	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
597		593
598	return magic;	594	return magic;
599	}	595	}
600		596
…		…
615	if (op->arch)	611	if (op->arch)
616	{	612	{
617	if (op->type == ARMOUR)	613	if (op->type == ARMOUR)
618	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	614	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
619		615
620	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	616	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
621	magic = (-magic);	617	magic = (-magic);
622	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	618	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
623	}	619	}
624	else	620	else
625	{	621	{
626	if (op->type == ARMOUR)	622	if (op->type == ARMOUR)
627	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	623	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
628	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	624	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
629	magic = (-magic);	625	magic = (-magic);
630	op->weight = (op->weight * (100 - magic * 10)) / 100;	626	op->weight = (op->weight * (100 - magic * 10)) / 100;
631	}	627	}
632	}	628	}
633		629
…		…
666		662
667	int r = RANDOM () % (bonus > 0 ? 25 : 11);	663	int r = RANDOM () % (bonus > 0 ? 25 : 11);
668		664
669	if (op->type == AMULET)	665	if (op->type == AMULET)
670	{	666	{
671	if (!(RANDOM () % 21))	667	if (!(rndm (21)))
672	r = 20 + RANDOM () % 2;	668	r = 20 + rndm (2);
673	else	669	else
674	{	670	{
675	if (RANDOM () & 2)	671	if (RANDOM () & 2)
676	r = 10;	672	r = 10;
677	else	673	else
678	r = 11 + RANDOM () % 9;	674	r = 11 + rndm (9);
679	}	675	}
680	}	676	}
681		677
682	switch (r)	678	switch (r)
683	{	679	{
…		…
720	case 16:	716	case 16:
721	case 17:	717	case 17:
722	case 18:	718	case 18:
723	case 19:	719	case 19:
724	{	720	{
725	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	721	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
726		722
727	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	723	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
728	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	724	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
729		725
730	/* Cursed items need to have higher negative values to equal out with	726	/* Cursed items need to have higher negative values to equal out with
731	* positive values for how protections work out. Put another	727	* positive values for how protections work out. Put another
732	* little random element in since that they don't always end up with	728	* little random element in since that they don't always end up with
733	* even values.	729	* even values.
…		…
735	if (bonus < 0)	731	if (bonus < 0)
736	val = 2 * -val - RANDOM () % b;	732	val = 2 * -val - RANDOM () % b;
737	if (val > 35)	733	if (val > 35)
738	val = 35; /* Upper limit */	734	val = 35; /* Upper limit */
739	b = 0;	735	b = 0;
		736
740	while (op->resist[resist_table[resist]] != 0 && b < 4)	737	while (op->resist[resist_table[resist]] != 0 && b < 4)
741	{
742	resist = RANDOM () % num_resist_table;	738	resist = rndm (num_resist_table);
743	}	739
744	if (b == 4)	740	if (b == 4)
745	return; /* Not able to find a free resistance */	741	return; /* Not able to find a free resistance */
		742
746	op->resist[resist_table[resist]] = val;	743	op->resist[resist_table[resist]] = val;
747	/* We should probably do something more clever here to adjust value	744	/* We should probably do something more clever here to adjust value
748	* based on how good a resistance we gave.	745	* based on how good a resistance we gave.
749	*/	746	*/
750	break;	747	break;
…		…
778	case 22:	775	case 22:
779	op->stats.exp += bonus; /* Speed! */	776	op->stats.exp += bonus; /* Speed! */
780	op->value = (op->value * 2) / 3;	777	op->value = (op->value * 2) / 3;
781	break;	778	break;
782	}	779	}
		780
783	if (bonus > 0)	781	if (bonus > 0)
784	op->value = 2 bonus;	782	op->value = 2 bonus;
785	else	783	else
786	op->value = -(op->value * 2 * bonus) / 3;	784	op->value = -(op->value * 2 * bonus) / 3;
787	}	785	}
…		…
807	return i;	805	return i;
808	return 4;	806	return 4;
809	}	807	}
810		808
811	#define DICE2 (get_magic(2)==2?2:1)	809	#define DICE2 (get_magic(2)==2?2:1)
812	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	810	#define DICESPELL (rndm (3)+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)
813		811
814	/*	812	/*
815	* fix_generated_item(): This is called after an item is generated, in	813	* fix_generated_item(): This is called after an item is generated, in
816	* order to set it up right. This produced magical bonuses, puts spells	814	* order to set it up right. This produced magical bonuses, puts spells
817	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	815	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
946	case WEAPON:	944	case WEAPON:
947	case ARMOUR:	945	case ARMOUR:
948	case SHIELD:	946	case SHIELD:
949	case HELMET:	947	case HELMET:
950	case CLOAK:	948	case CLOAK:
951	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	949	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
952	set_ring_bonus (op, -DICE2);	950	set_ring_bonus (op, -DICE2);
953	break;	951	break;
954		952
955	case BRACERS:	953	case BRACERS:
956	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	954	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))
…		…
995	{	993	{
996	op->name = "potion";	994	op->name = "potion";
997	op->name_pl = "potions";	995	op->name_pl = "potions";
998	}	996	}
999		997
1000	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	998	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1001	SET_FLAG (op, FLAG_CURSED);	999	SET_FLAG (op, FLAG_CURSED);
1002	break;	1000	break;
1003	}	1001	}
1004		1002
1005	case AMULET:	1003	case AMULET:
…		…
1015	}	1013	}
1016		1014
1017	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	1015	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1018	break;	1016	break;
1019		1017
1020	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	1018	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1021	SET_FLAG (op, FLAG_CURSED);	1019	SET_FLAG (op, FLAG_CURSED);
1022		1020
1023	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	1021	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1024		1022
1025	if (op->type != RING) /* Amulets have only one ability */	1023	if (op->type != RING) /* Amulets have only one ability */
1026	break;	1024	break;
1027		1025
1028	if (!(RANDOM () % 4))	1026	if (!(rndm (4)))
1029	{	1027	{
1030	int d = (RANDOM () % 2 \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1028	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1031		1029
1032	if (d > 0)	1030	if (d > 0)
1033	op->value *= 3;	1031	op->value *= 3;
1034		1032
1035	set_ring_bonus (op, d);	1033	set_ring_bonus (op, d);
1036		1034
1037	if (!(RANDOM () % 4))	1035	if (!(rndm (4)))
1038	{	1036	{
1039	int d = (RANDOM () % 3 \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1037	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1040		1038
1041	if (d > 0)	1039	if (d > 0)
1042	op->value *= 5;	1040	op->value *= 5;
1043	set_ring_bonus (op, d);	1041	set_ring_bonus (op, d);
1044	}	1042	}
…		…
1052	case BOOK:	1050	case BOOK:
1053	/* Is it an empty book?, if yes lets make a special·	1051	/* Is it an empty book?, if yes lets make a special·
1054	* msg for it, and tailor its properties based on the·	1052	* msg for it, and tailor its properties based on the·
1055	* creator and/or map level we found it on.	1053	* creator and/or map level we found it on.
1056	*/	1054	*/
1057	if (!op->msg && RANDOM () % 10)	1055	if (!op->msg && rndm (10))
1058	{	1056	{
1059	/* set the book level properly */	1057	/* set the book level properly */
1060	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1058	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))
1061	{	1059	{
1062	if (op->map && op->map->difficulty)	1060	if (op->map && op->map->difficulty)
1063	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1061	op->level = RANDOM () % (op->map->difficulty) + rndm (10) + 1;
1064	else	1062	else
1065	op->level = RANDOM () % 20 + 1;	1063	op->level = rndm (20) + 1;
1066	}	1064	}
1067	else	1065	else
1068	op->level = RANDOM () % creator->level;	1066	op->level = RANDOM () % creator->level;
1069		1067
1070	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1068	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
…		…
1176	*/	1174	*/
1177		1175
1178	static artifactlist *	1176	static artifactlist *
1179	get_empty_artifactlist (void)	1177	get_empty_artifactlist (void)
1180	{	1178	{
1181	artifactlist tl = (artifactlist ) malloc (sizeof (artifactlist));	1179	artifactlist al = (artifactlist ) malloc (sizeof (artifactlist));
1182		1180
1183	if (tl == NULL)	1181	if (al == NULL)
1184	fatal (OUT_OF_MEMORY);	1182	fatal (OUT_OF_MEMORY);
1185	tl->next = NULL;	1183	al->next = NULL;
1186	tl->items = NULL;	1184	al->items = NULL;
1187	tl->total_chance = 0;	1185	al->total_chance = 0;
1188	return tl;	1186	return al;
1189	}	1187	}
1190		1188
1191	/*	1189	/*
1192	* Allocate and return the pointer to an empty artifact structure.	1190	* Allocate and return the pointer to an empty artifact structure.
1193	*/	1191	*/
1194		1192
1195	static artifact *	1193	static artifact *
1196	get_empty_artifact (void)	1194	get_empty_artifact (void)
1197	{	1195	{
1198	artifact t = (artifact ) malloc (sizeof (artifact));	1196	artifact a = (artifact ) malloc (sizeof (artifact));
1199		1197
1200	if (t == NULL)	1198	if (a == NULL)
1201	fatal (OUT_OF_MEMORY);	1199	fatal (OUT_OF_MEMORY);
1202	t->item = NULL;	1200	a->item = NULL;
1203	t->next = NULL;	1201	a->next = NULL;
1204	t->chance = 0;	1202	a->chance = 0;
1205	t->difficulty = 0;	1203	a->difficulty = 0;
1206	t->allowed = NULL;	1204	a->allowed = NULL;
1207	return t;	1205	return a;
1208	}	1206	}
1209		1207
1210	/*	1208	/*
1211	* Searches the artifact lists and returns one that has the same type	1209	* Searches the artifact lists and returns one that has the same type
1212	* of objects on it.	1210	* of objects on it.
…		…
1262	treasurelist *tl;	1260	treasurelist *tl;
1263	int i;	1261	int i;
1264		1262
1265	if (depth > 100)	1263	if (depth > 100)
1266	return;	1264	return;
1267	while (t != NULL)	1265	while (t)
1268	{	1266	{
1269	if (t->name != NULL)	1267	if (t->name)
1270	{	1268	{
1271	for (i = 0; i < depth; i++)	1269	for (i = 0; i < depth; i++)
1272	fprintf (logfile, " ");	1270	fprintf (logfile, " ");
1273	fprintf (logfile, "{ (list: %s)\n", &t->name);	1271	fprintf (logfile, "{ (list: %s)\n", &t->name);
1274	tl = find_treasurelist (t->name);	1272	tl = find_treasurelist (t->name);
…		…
1280	}	1278	}
1281	else	1279	else
1282	{	1280	{
1283	for (i = 0; i < depth; i++)	1281	for (i = 0; i < depth; i++)
1284	fprintf (logfile, " ");	1282	fprintf (logfile, " ");
1285	if (t->item->clone.type == FLESH)	1283	if (t->item && t->item->clone.type == FLESH)
1286	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1284	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1287	else	1285	else
1288	fprintf (logfile, "%s\n", &t->item->clone.name);	1286	fprintf (logfile, "%s\n", &t->item->clone.name);
1289	}	1287	}
		1288
1290	if (t->next_yes != NULL)	1289	if (t->next_yes)
1291	{	1290	{
1292	for (i = 0; i < depth; i++)	1291	for (i = 0; i < depth; i++)
1293	fprintf (logfile, " ");	1292	fprintf (logfile, " ");
1294	fprintf (logfile, " (if yes)\n");	1293	fprintf (logfile, " (if yes)\n");
1295	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1294	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1296	}	1295	}
		1296
1297	if (t->next_no != NULL)	1297	if (t->next_no)
1298	{	1298	{
1299	for (i = 0; i < depth; i++)	1299	for (i = 0; i < depth; i++)
1300	fprintf (logfile, " ");	1300	fprintf (logfile, " ");
1301	fprintf (logfile, " (if no)\n");	1301	fprintf (logfile, " (if no)\n");
1302	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1302	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1303	}	1303	}
		1304
1304	t = t->next;	1305	t = t->next;
1305	}	1306	}
1306	}	1307	}
1307		1308
1308	/*	1309	/*
…		…
1808	/* special_potion() - so that old potion code is still done right. */	1809	/* special_potion() - so that old potion code is still done right. */
1809		1810
1810	int	1811	int
1811	special_potion (object *op)	1812	special_potion (object *op)
1812	{	1813	{
1813
1814	int i;
1815
1816	if (op->attacktype)	1814	if (op->attacktype)
1817	return 1;	1815	return 1;
1818		1816
1819	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)	1817	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1820	return 1;	1818	return 1;
1821		1819
1822	for (i = 0; i < NROFATTACKS; i++)	1820	for (int i = 0; i < NROFATTACKS; i++)
1823	if (op->resist[i])	1821	if (op->resist[i])
1824	return 1;	1822	return 1;
1825		1823
1826	return 0;	1824	return 0;
1827	}	1825	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.29 by root, Tue Dec 26 20:04:09 2006 UTC vs. Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.29 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC