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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.40 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License 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
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24
25	#define ALLOWED_COMBINATION
26		23
27	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	24	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28	* It is useful for finding bugs in the treasures file. Since it only	25	* It is useful for finding bugs in the treasures file. Since it only
29	* slows the startup some (and not actual game play), it is by default	26	* slows the startup some (and not actual game play), it is by default
30	* left on	27	* left on
31	*/	28	*/
32	#define TREASURE_DEBUG	29	#define TREASURE_DEBUG
33		30
34	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	31	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35		32
36	/* #define TREASURE_VERBOSE */	33	//#define TREASURE_VERBOSE
37		34
38	#include <global.h>	35	#include <global.h>
39	#include <treasure.h>	36	#include <treasure.h>
40	#include <funcpoint.h>
41	#include <loader.h>	37	#include <loader.h>
42		38
		39	extern char *spell_mapping[];
		40
		41	static treasurelist *first_treasurelist;
43		42
44	static void change_treasure (treasure t, object op); /* overrule default values */	43	static void change_treasure (treasure t, object op); /* overrule default values */
45	extern char *spell_mapping[];
46		44
47	/*	45	typedef std::tr1::unordered_map<
48	* Initialize global archtype pointers:	46	const char *,
49	*/	47	treasurelist *,
		48	str_hash,
		49	str_equal,
		50	slice_allocator< std::pair<const char const, treasurelist > >
		51	> tl_map_t;
50		52
		53	static tl_map_t tl_map;
		54
		55	/*
		56	* Searches for the given treasurelist
		57	*/
		58	treasurelist *
		59	treasurelist::find (const char *name)
		60	{
		61	if (!name)
		62	return 0;
		63
		64	auto (i, tl_map.find (name));
		65
		66	if (i == tl_map.end ())
		67	return 0;
		68
		69	return i->second;
		70	}
		71
		72	/*
		73	* Searches for the given treasurelist in the globally linked list
		74	* of treasurelists which has been built by load_treasures().
		75	*/
		76	treasurelist *
		77	treasurelist::get (const char *name)
		78	{
		79	treasurelist *tl = find (name);
		80
		81	if (!tl)
		82	{
		83	tl = new treasurelist;
		84
		85	tl->name = name;
		86	tl->next = first_treasurelist;
		87	first_treasurelist = tl;
		88
		89	tl_map.insert (std::make_pair (tl->name, tl));
		90	}
		91
		92	return tl;
		93	}
		94
		95	//TODO: class method
51	void	96	void
52	init_archetype_pointers ()	97	clear (treasurelist *tl)
53	{	98	{
54	int prev_warn = warn_archetypes;	99	if (tl->items)
		100	{
		101	free_treasurestruct (tl->items);
		102	tl->items = 0;
		103	}
55		104
56	warn_archetypes = 1;
57	if (ring_arch == NULL)
58	ring_arch = archetype::find ("ring");
59	if (amulet_arch == NULL)
60	amulet_arch = archetype::find ("amulet");
61	if (staff_arch == NULL)
62	staff_arch = archetype::find ("staff");
63	if (crown_arch == NULL)
64	crown_arch = archetype::find ("crown");
65	warn_archetypes = prev_warn;
66	}
67
68	/*
69	* Allocate and return the pointer to an empty treasurelist structure.
70	*/
71
72	static treasurelist *
73	get_empty_treasurelist (void)
74	{
75	return new treasurelist;
76	}
77
78	/*
79	* Allocate and return the pointer to an empty treasure structure.
80	*/
81	//TODO: make this a constructor
82	static treasure *
83	get_empty_treasure (void)
84	{
85	treasure *t = new treasure;
86
87	t->chance = 100;	105	tl->total_chance = 0;
88
89	return t;
90	}	106	}
		107
		108	#ifdef TREASURE_DEBUG
		109	/* recursived checks the linked list. Treasurelist is passed only
		110	* so that the treasure name can be printed out
		111	*/
		112	static void
		113	check_treasurelist (const treasure t, const treasurelist tl)
		114	{
		115	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
		116	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		117
		118	if (t->next)
		119	check_treasurelist (t->next, tl);
		120
		121	if (t->next_yes)
		122	check_treasurelist (t->next_yes, tl);
		123
		124	if (t->next_no)
		125	check_treasurelist (t->next_no, tl);
		126	}
		127	#endif
91		128
92	/*	129	/*
93	* Reads the lib/treasure file from disk, and parses the contents	130	* Reads the lib/treasure file from disk, and parses the contents
94	* into an internal treasure structure (very linked lists)	131	* into an internal treasure structure (very linked lists)
95	*/	132	*/
96
97	static treasure *	133	static treasure *
98	load_treasure (FILE * fp, int *line)	134	read_treasure (object_thawer &f)
99	{	135	{
100	char buf[MAX_BUF], *cp, variable[MAX_BUF];
101	treasure *t = get_empty_treasure ();	136	treasure *t = new treasure;
102	int value;
103		137
104	nroftreasures++;	138	f.next ();
105	while (fgets (buf, MAX_BUF, fp) != NULL)
106	{
107	(*line)++;
108		139
109	if (*buf == '#')	140	for (;;)
110	continue;	141	{
111	if ((cp = strchr (buf, '\n')) != NULL)	142	coroapi::cede_to_tick ();
112	*cp = '\0';
113	cp = buf;
114	while (isspace (cp)) / Skip blanks */
115	cp++;
116		143
117	if (sscanf (cp, "arch %s", variable))	144	switch (f.kw)
118	{
119	if ((t->item = archetype::find (variable)) == NULL)
120	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121	}	145	{
122	else if (sscanf (cp, "list %s", variable))	146	case KW_arch:
123	t->name = variable;	147	t->item = archetype::find (f.get_str ());
124	else if (sscanf (cp, "change_name %s", variable))	148
125	t->change_arch.name = variable;	149	if (!t->item)
126	else if (sscanf (cp, "change_title %s", variable))
127	t->change_arch.title = variable;
128	else if (sscanf (cp, "change_slaying %s", variable))
129	t->change_arch.slaying = variable;
130	else if (sscanf (cp, "chance %d", &value))
131	t->chance = (uint8) value;
132	else if (sscanf (cp, "nrof %d", &value))
133	t->nrof = (uint16) value;
134	else if (sscanf (cp, "magic %d", &value))
135	t->magic = (uint8) value;
136	else if (!strcmp (cp, "yes"))
137	t->next_yes = load_treasure (fp, line);
138	else if (!strcmp (cp, "no"))
139	t->next_no = load_treasure (fp, line);
140	else if (!strcmp (cp, "end"))
141	return t;
142	else if (!strcmp (cp, "more"))
143	{	150	{
144	t->next = load_treasure (fp, line);	151	f.parse_warn ("treasure references unknown archetype");
		152	t->item = archetype::empty;
		153	}
		154
		155	break;
		156
		157	case KW_list: f.get (t->name); break;
		158	case KW_change_name: f.get (t->change_arch.name); break;
		159	case KW_change_title: f.get (t->change_arch.title); break;
		160	case KW_change_slaying: f.get (t->change_arch.slaying); break;
		161	case KW_chance: f.get (t->chance); break;
		162	case KW_nrof: f.get (t->nrof); break;
		163	case KW_magic: f.get (t->magic); break;
		164
		165	case KW_yes: t->next_yes = read_treasure (f); continue;
		166	case KW_no: t->next_no = read_treasure (f); continue;
		167
		168	case KW_end:
		169	f.next ();
145	return t;	170	return t;
		171
		172	case KW_more:
		173	t->next = read_treasure (f);
		174	return t;
		175
		176	default:
		177	if (!f.parse_error ("treasurelist", t->name))
		178	goto error;
		179
		180	return t;
146	}	181	}
147	else	182
148	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);	183	f.next ();
149	}	184	}
150	LOG (llevError, "treasure lacks 'end'.\n");	185
		186	// not reached
		187
		188	error:
		189	delete t;
151	return t;	190	return 0;
152	}	191	}
153		192
154	#ifdef TREASURE_DEBUG
155
156	/* recursived checks the linked list. Treasurelist is passed only
157	* so that the treasure name can be printed out
158	*/
159	static void
160	check_treasurelist (const treasure t, const treasurelist tl)
161	{
162	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
163	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
164	/* find_treasurelist will print out its own error message */
165	if (t->name && *t->name)
166	find_treasurelist (t->name);
167	if (t->next)
168	check_treasurelist (t->next, tl);
169	if (t->next_yes)
170	check_treasurelist (t->next_yes, tl);
171	if (t->next_no)
172	check_treasurelist (t->next_no, tl);
173	}
174	#endif
175
176	/*	193	/*
177	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
178	* Each treasure is parsed with the help of load_treasure().	194	* Each treasure is parsed with the help of load_treasure().
179	*/	195	*/
180		196	treasurelist *
181	void	197	treasurelist::read (object_thawer &f)
182	load_treasures (void)
183	{	198	{
184	FILE *fp;	199	assert (f.kw == KW_treasure \|\| f.kw == KW_treasureone);
185	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186	treasurelist *previous = NULL;
187	treasure *t;
188	int comp, line = 0;
189		200
190	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	201	bool one = f.kw == KW_treasureone;
191	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	202	treasurelist *tl = treasurelist::get (f.get_str ());
192	{	203	clear (tl);
193	LOG (llevError, "Can't open treasure file.\n");	204	tl->items = read_treasure (f);
		205	if (!tl->items)
194	return;	206	return 0;
195	}
196	while (fgets (buf, MAX_BUF, fp) != NULL)
197	{
198	line++;
199	if (buf == '#' \|\| buf == '\n')
200	; // ignore
201	else if (sscanf (buf, "treasureone %s\n", name) \|\| sscanf (buf, "treasure %s\n", name))
202	{
203	treasurelist *tl = get_empty_treasurelist ();
204		207
205	tl->name = name;
206	if (previous == NULL)
207	first_treasurelist = tl;
208	else
209	previous->next = tl;
210
211	previous = tl;
212	tl->items = load_treasure (fp, &line);
213
214	/* This is a one of the many items on the list should be generated.	208	/* This is a one of the many items on the list should be generated.
215	* Add up the chance total, and check to make sure the yes & no	209	* Add up the chance total, and check to make sure the yes & no
216	* fields of the treasures are not being used.	210	* fields of the treasures are not being used.
217	*/	211	*/
218	if (!strncmp (buf, "treasureone", 11))	212	if (one)
		213	{
		214	for (treasure *t = tl->items; t; t = t->next)
		215	{
		216	if (t->next_yes \|\| t->next_no)
219	{	217	{
220	for (t = tl->items; t != NULL; t = t->next)
221	{
222	#ifdef TREASURE_DEBUG
223	if (t->next_yes \|\| t->next_no)
224	{
225	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	218	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
226	LOG (llevError, " the next_yes or next_no field is set\n");	219	LOG (llevError, " the next_yes or next_no field is set\n");
227	}
228	#endif
229	tl->total_chance += t->chance;
230	}
231	}	220	}
232	}
233	else
234	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
235	}
236	close_and_delete (fp, comp);
237		221
238	#ifdef TREASURE_DEBUG	222	tl->total_chance += t->chance;
239	/* Perform some checks on how valid the treasure data actually is.	223	}
240	* verify that list transitions work (ie, the list that it is supposed	224	}
241	* to transition to exists). Also, verify that at least the name
242	* or archetype is set for each treasure element.
243	*/
244	for (previous = first_treasurelist; previous != NULL; previous = previous->next)
245	check_treasurelist (previous->items, previous);
246	#endif
247	}
248		225
249	/*
250	* Searches for the given treasurelist in the globally linked list
251	* of treasurelists which has been built by load_treasures().
252	*/
253
254	treasurelist *
255	find_treasurelist (const char *name)
256	{
257	shstr_cmp name_ (name);
258
259	if (!name_)
260	return 0;
261
262	for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
263	if (name_ == tl->name)
264	return tl;
265
266	if (first_treasurelist)
267	LOG (llevError, "Couldn't find treasurelist %s\n", name);
268
269	return 0;	226	return tl;
270	}	227	}
271
272		228
273	/*	229	/*
274	* Generates the objects specified by the given treasure.	230	* Generates the objects specified by the given treasure.
275	* It goes recursively through the rest of the linked list.	231	* It goes recursively through the rest of the linked list.
276	* If there is a certain percental chance for a treasure to be generated,	232	* If there is a certain percental chance for a treasure to be generated,
282	* start with equipment, but only their abilities).	238	* start with equipment, but only their abilities).
283	*/	239	*/
284	static void	240	static void
285	put_treasure (object op, object creator, int flags)	241	put_treasure (object op, object creator, int flags)
286	{	242	{
287	object *tmp;	243	if (flags & GT_ENVIRONMENT)
288		244	{
289	/* Bit of a hack - spells should never be put onto the map. The entire	245	/* Bit of a hack - spells should never be put onto the map. The entire
290	* treasure stuff is a problem - there is no clear idea of knowing	246	* treasure stuff is a problem - there is no clear idea of knowing
291	* this is the original object, or if this is an object that should be created	247	* this is the original object, or if this is an object that should be created
292	* by another object.	248	* by another object.
293	*/	249	*/
294	if (flags & GT_ENVIRONMENT && op->type != SPELL)	250	//TODO: flag such as objects... as such (no drop, anybody?)
295	{	251	if (op->type == SPELL)
		252	{
		253	op->destroy ();
		254	return;
		255	}
		256
		257	op->expand_tail ();
		258
		259	if (!creator->is_on_map () \|\| op->blocked (creator->map, creator->x, creator->y))
		260	op->destroy ();
		261	else
		262	{
296	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	263	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
297	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);	264	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);
		265	}
298	}	266	}
299	else	267	else
300	{	268	{
301	op = creator->insert (op);	269	op = creator->insert (op);
302		270
303	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	271	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
304	monster_check_apply (creator, op);	272	monster_check_apply (creator, op);
305
306	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
307	esrv_send_item (tmp, op);
308	}	273	}
309	}	274	}
310		275
311	/* if there are change_xxx commands in the treasure, we include the changes	276	/* if there are change_xxx commands in the treasure, we include the changes
312	* in the generated object	277	* in the generated object
…		…
326		291
327	if (t->change_arch.slaying)	292	if (t->change_arch.slaying)
328	op->slaying = t->change_arch.slaying;	293	op->slaying = t->change_arch.slaying;
329	}	294	}
330		295
331	void	296	static void
332	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)	297	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)
333	{	298	{
334	object *tmp;
335
336	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)	299	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
337	{	300	{
338	if (t->name)	301	if (t->name)
339	{	302	{
340	if (difficulty >= t->magic)	303	if (difficulty >= t->magic)
		304	if (treasurelist *tl = treasurelist::find (t->name))
		305	create_treasure (tl, op, flag, difficulty, tries);
		306	else
		307	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
		308	}
		309	else
		310	{
		311	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
341	{	312	{
342	treasurelist *tl = find_treasurelist (t->name);
343	if (tl)
344	create_treasure (tl, op, flag, difficulty, tries);
345	}
346	}
347	else
348	{
349	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))
350	{
351	tmp = arch_to_object (t->item);	313	object *tmp = arch_to_object (t->item);
		314
352	if (t->nrof && tmp->nrof <= 1)	315	if (t->nrof && tmp->nrof <= 1)
353	tmp->nrof = rndm (t->nrof) + 1;	316	tmp->nrof = rndm (t->nrof) + 1;
354		317
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	318	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	319	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	320	put_treasure (tmp, op, flag);
358	}	321	}
359	}	322	}
360		323
361	if (t->next_yes != NULL)	324	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	325	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	326	}
364	else if (t->next_no != NULL)	327	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	328	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		329
367	if (t->next != NULL)	330	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	331	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	332	}
370		333
371	void	334	static void
372	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)	335	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
373	{	336	{
374	int value = rndm (tl->total_chance);	337	int value = rndm (tl->total_chance);
375	treasure *t;	338	treasure *t;
376		339
…		…
378	{	341	{
379	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	342	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
380	return;	343	return;
381	}	344	}
382		345
383	for (t = tl->items; t != NULL; t = t->next)	346	for (t = tl->items; t; t = t->next)
384	{	347	{
385	value -= t->chance;	348	value -= t->chance;
386		349
387	if (value < 0)	350	if (value < 0)
388	break;	351	break;
389	}	352	}
390		353
391	if (!t \|\| value >= 0)	354	if (!t \|\| value >= 0)
392	{
393	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	355	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
394	abort ();
395	return;
396	}
397		356
398	if (t->name)	357	if (t->name)
399	{	358	{
400	if (difficulty >= t->magic)	359	if (difficulty >= t->magic)
401	{	360	{
402	treasurelist *tl = find_treasurelist (t->name);	361	treasurelist *tl = treasurelist::find (t->name);
403	if (tl)	362	if (tl)
404	create_treasure (tl, op, flag, difficulty, tries);	363	create_treasure (tl, op, flag, difficulty, tries);
405	}	364	}
406	else if (t->nrof)	365	else if (t->nrof)
407	create_one_treasure (tl, op, flag, difficulty, tries);	366	create_one_treasure (tl, op, flag, difficulty, tries);
408
409	return;
410	}	367	}
411
412	if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	368	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
413	{	369	{
414	object *tmp = arch_to_object (t->item);	370	if (object *tmp = arch_to_object (t->item))
415		371	{
416	if (!tmp)
417	return;
418
419	if (t->nrof && tmp->nrof <= 1)	372	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	373	tmp->nrof = rndm (t->nrof) + 1;
421		374
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	375	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	376	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	377	put_treasure (tmp, op, flag);
		378	}
425	}	379	}
		380	}
		381
		382	void
		383	object::create_treasure (treasurelist *tl, int flags)
		384	{
		385	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
426	}	386	}
427		387
428	/* This calls the appropriate treasure creation function. tries is passed	388	/* This calls the appropriate treasure creation function. tries is passed
429	* to determine how many list transitions or attempts to create treasure	389	* to determine how many list transitions or attempts to create treasure
430	* have been made. It is really in place to prevent infinite loops with	390	* have been made. It is really in place to prevent infinite loops with
…		…
433	* to do that.	393	* to do that.
434	*/	394	*/
435	void	395	void
436	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)	396	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
437	{	397	{
		398	// empty treasurelists are legal
		399	if (!tl->items)
		400	return;
		401
438	if (tries++ > 100)	402	if (tries++ > 100)
439	{	403	{
440	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	404	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441	return;	405	return;
		406	}
		407
		408	if (op->flag [FLAG_TREASURE_ENV])
		409	{
		410	// do not generate items when there already is something above the object
		411	if (op->flag [FLAG_IS_FLOOR] && op->above)
		412	return;
		413
		414	flag \|= GT_ENVIRONMENT;
442	}	415	}
443		416
444	if (tl->total_chance)	417	if (tl->total_chance)
445	create_one_treasure (tl, op, flag, difficulty, tries);	418	create_one_treasure (tl, op, flag, difficulty, tries);
446	else	419	else
…		…
455	object *	428	object *
456	generate_treasure (treasurelist *tl, int difficulty)	429	generate_treasure (treasurelist *tl, int difficulty)
457	{	430	{
458	difficulty = clamp (difficulty, 1, settings.max_level);	431	difficulty = clamp (difficulty, 1, settings.max_level);
459		432
460	object ob = object::create (), tmp;	433	object *ob = object::create ();
461		434
462	create_treasure (tl, ob, 0, difficulty, 0);	435	create_treasure (tl, ob, 0, difficulty, 0);
463		436
464	/* Don't want to free the object we are about to return */	437	/* Don't want to free the object we are about to return */
465	tmp = ob->inv;	438	object *tmp = ob->inv;
466	if (tmp != NULL)	439	if (tmp)
467	tmp->remove ();	440	tmp->remove ();
468		441
469	if (ob->inv)	442	if (ob->inv)
470	LOG (llevError, "In generate treasure, created multiple objects.\n");	443	LOG (llevError, "In generate treasure, created multiple objects.\n");
471		444
…		…
479	* The array has two arguments, the difficulty of the level, and the	452	* The array has two arguments, the difficulty of the level, and the
480	* magical bonus "wanted".	453	* magical bonus "wanted".
481	*/	454	*/
482		455
483	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	456	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484
485	/chance of magic difficulty/	457	// chance of magic difficulty
486
487	/* +0 +1 +2 +3 +4 */	458	// +0 +1 +2 +3 +4
488	{95, 2, 2, 1, 0}, /1 /	459	{95, 2, 2, 1, 0}, // 1
489	{92, 5, 2, 1, 0}, /2 /	460	{92, 5, 2, 1, 0}, // 2
490	{85, 10, 4, 1, 0}, /3 /	461	{85, 10, 4, 1, 0}, // 3
491	{80, 14, 4, 2, 0}, /4 /	462	{80, 14, 4, 2, 0}, // 4
492	{75, 17, 5, 2, 1}, /5 /	463	{75, 17, 5, 2, 1}, // 5
493	{70, 18, 8, 3, 1}, /6 /	464	{70, 18, 8, 3, 1}, // 6
494	{65, 21, 10, 3, 1}, /7 /	465	{65, 21, 10, 3, 1}, // 7
495	{60, 22, 12, 4, 2}, /8 /	466	{60, 22, 12, 4, 2}, // 8
496	{55, 25, 14, 4, 2}, /9 /	467	{55, 25, 14, 4, 2}, // 9
497	{50, 27, 16, 5, 2}, /10 /	468	{50, 27, 16, 5, 2}, // 10
498	{45, 28, 18, 6, 3}, /11 /	469	{45, 28, 18, 6, 3}, // 11
499	{42, 28, 20, 7, 3}, /12 /	470	{42, 28, 20, 7, 3}, // 12
500	{40, 27, 21, 8, 4}, /13 /	471	{40, 27, 21, 8, 4}, // 13
501	{38, 25, 22, 10, 5}, /14 /	472	{38, 25, 22, 10, 5}, // 14
502	{36, 23, 23, 12, 6}, /15 /	473	{36, 23, 23, 12, 6}, // 15
503	{33, 21, 24, 14, 8}, /16 /	474	{33, 21, 24, 14, 8}, // 16
504	{31, 19, 25, 16, 9}, /17 /	475	{31, 19, 25, 16, 9}, // 17
505	{27, 15, 30, 18, 10}, /18 /	476	{27, 15, 30, 18, 10}, // 18
506	{20, 12, 30, 25, 13}, /19 /	477	{20, 12, 30, 25, 13}, // 19
507	{15, 10, 28, 30, 17}, /20 /	478	{15, 10, 28, 30, 17}, // 20
508	{13, 9, 27, 28, 23}, /21 /	479	{13, 9, 27, 28, 23}, // 21
509	{10, 8, 25, 28, 29}, /22 /	480	{10, 8, 25, 28, 29}, // 22
510	{8, 7, 23, 26, 36}, /23 /	481	{ 8, 7, 23, 26, 36}, // 23
511	{6, 6, 20, 22, 46}, /24 /	482	{ 6, 6, 20, 22, 46}, // 24
512	{4, 5, 17, 18, 56}, /25 /	483	{ 4, 5, 17, 18, 56}, // 25
513	{2, 4, 12, 14, 68}, /26 /	484	{ 2, 4, 12, 14, 68}, // 26
514	{0, 3, 7, 10, 80}, /27 /	485	{ 0, 3, 7, 10, 80}, // 27
515	{0, 0, 3, 7, 90}, /28 /	486	{ 0, 0, 3, 7, 90}, // 28
516	{0, 0, 0, 3, 97}, /29 /	487	{ 0, 0, 0, 3, 97}, // 29
517	{0, 0, 0, 0, 100}, /30 /	488	{ 0, 0, 0, 0, 100}, // 30
518	{0, 0, 0, 0, 100}, /31 /	489	{ 0, 0, 0, 0, 100}, // 31
519	};	490	};
520
521		491
522	/* calculate the appropriate level for wands staves and scrolls.	492	/* calculate the appropriate level for wands staves and scrolls.
523	* This code presumes that op has had its spell object created (in op->inv)	493	* This code presumes that op has had its spell object created (in op->inv)
524	*	494	*
525	* elmex Wed Aug 9 17:44:59 CEST 2006:	495	* elmex Wed Aug 9 17:44:59 CEST 2006:
526	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	496	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
527	*/	497	*/
528
529	int	498	int
530	level_for_item (const object *op, int difficulty)	499	level_for_item (const object *op, int difficulty)
531	{	500	{
532	int olevel = 0;
533
534	if (!op->inv)	501	if (!op->inv)
535	{	502	{
536	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	503	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
537	return 0;	504	return 0;
538	}	505	}
539		506
540	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	507	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
541		508
542	if (olevel <= 0)	509	if (olevel <= 0)
543	olevel = rndm (1, MIN (op->inv->level, 1));	510	olevel = rndm (1, op->inv->level);
544		511
545	if (olevel > MAXLEVEL)	512	return min (olevel, MAXLEVEL);
546	olevel = MAXLEVEL;
547
548	return olevel;
549	}	513	}
550		514
551	/*	515	/*
552	* Based upon the specified difficulty and upon the difftomagic_list array,	516	* Based upon the specified difficulty and upon the difftomagic_list array,
553	* a random magical bonus is returned. This is used when determine	517	* a random magical bonus is returned. This is used when determine
…		…
556	* elmex Thu Aug 10 18:45:44 CEST 2006:	520	* elmex Thu Aug 10 18:45:44 CEST 2006:
557	* Scaling difficulty by max_level, as difficulty is a level and not some	521	* Scaling difficulty by max_level, as difficulty is a level and not some
558	* weird integer between 1-31.	522	* weird integer between 1-31.
559	*	523	*
560	*/	524	*/
561
562	int	525	int
563	magic_from_difficulty (int difficulty)	526	magic_from_difficulty (int difficulty)
564	{	527	{
565	int percent = 0, magic = 0;	528	int percent = 0, magic = 0;
566	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	529	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
610		573
611	op->magic = magic;	574	op->magic = magic;
612	if (op->arch)	575	if (op->arch)
613	{	576	{
614	if (op->type == ARMOUR)	577	if (op->type == ARMOUR)
615	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	578	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616		579
617	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	580	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
618	magic = (-magic);	581	magic = (-magic);
		582
619	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	583	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620	}	584	}
621	else	585	else
622	{	586	{
623	if (op->type == ARMOUR)	587	if (op->type == ARMOUR)
624	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	588	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		589
625	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	590	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
626	magic = (-magic);	591	magic = (-magic);
		592
627	op->weight = (op->weight * (100 - magic * 10)) / 100;	593	op->weight = (op->weight * (100 - magic * 10)) / 100;
628	}	594	}
629	}	595	}
630		596
631	/*	597	/*
…		…
654	* 1) Since rings can have multiple bonuses, if the same bonus	620	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	621	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	622	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	623	* 2) Add code to deal with new PR method.
658	*/	624	*/
659
660	void	625	void
661	set_ring_bonus (object *op, int bonus)	626	set_ring_bonus (object *op, int bonus)
662	{	627	{
663		628
664	int r = rndm (bonus > 0 ? 25 : 11);	629	int r = rndm (bonus > 0 ? 25 : 11);
…		…
687	case 2:	652	case 2:
688	case 3:	653	case 3:
689	case 4:	654	case 4:
690	case 5:	655	case 5:
691	case 6:	656	case 6:
692	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	657	op->stats.stat (r) += bonus;
693	break;	658	break;
694		659
695	case 7:	660	case 7:
696	op->stats.dam += bonus;	661	op->stats.dam += bonus;
697	break;	662	break;
…		…
845	save_item_power = op->item_power;	810	save_item_power = op->item_power;
846	op->item_power = 0;	811	op->item_power = 0;
847		812
848	if (op->randomitems && op->type != SPELL)	813	if (op->randomitems && op->type != SPELL)
849	{	814	{
850	create_treasure (op->randomitems, op, flags, difficulty, 0);	815	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
851	if (!op->inv)
852	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
853
854	/* So the treasure doesn't get created again */	816	/* So the treasure doesn't get created again */
855	op->randomitems = NULL;	817	op->randomitems = 0;
856	}	818	}
857		819
858	if (difficulty < 1)	820	if (difficulty < 1)
859	difficulty = 1;	821	difficulty = 1;
860		822
…		…
864	ARG_INT (flags)))	826	ARG_INT (flags)))
865	return;	827	return;
866		828
867	if (!(flags & GT_MINIMAL))	829	if (!(flags & GT_MINIMAL))
868	{	830	{
869	if (op->arch == crown_arch)	831	if (IS_ARCH (op->arch, crown))
870	{	832	{
871	set_magic (difficulty, op, max_magic, flags);	833	set_magic (difficulty, op, max_magic, flags);
872	num_enchantments = calc_item_power (op, 1);	834	num_enchantments = calc_item_power (op, 1);
873	generate_artifact (op, difficulty);	835	generate_artifact (op, difficulty);
874	}	836	}
…		…
879		841
880	num_enchantments = calc_item_power (op, 1);	842	num_enchantments = calc_item_power (op, 1);
881		843
882	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	844	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
883	\|\| op->type == HORN	845	\|\| op->type == HORN
884	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	846	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
885	* used for shop_floors or treasures */
886	generate_artifact (op, difficulty);	847	generate_artifact (op, difficulty);
887	}	848	}
888		849
889	/* Object was made an artifact. Calculate its item_power rating.	850	/* Object was made an artifact. Calculate its item_power rating.
890	* the item_power in the object is what the artfiact adds.	851	* the item_power in the object is what the artfiact adds.
…		…
932	{	893	{
933	if (op->type == POTION)	894	if (op->type == POTION)
934	/* Handle healing and magic power potions */	895	/* Handle healing and magic power potions */
935	if (op->stats.sp && !op->randomitems)	896	if (op->stats.sp && !op->randomitems)
936	{	897	{
937	object *tmp;
938
939	tmp = get_archetype (spell_mapping[op->stats.sp]);	898	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
940	insert_ob_in_ob (tmp, op);	899	insert_ob_in_ob (tmp, op);
941	op->stats.sp = 0;	900	op->stats.sp = 0;
942	}	901	}
943	}	902	}
944	else if (!op->title) /* Only modify object if not special */	903	else if (!op->title) /* Only modify object if not special */
…		…
1002	SET_FLAG (op, FLAG_CURSED);	961	SET_FLAG (op, FLAG_CURSED);
1003	break;	962	break;
1004	}	963	}
1005		964
1006	case AMULET:	965	case AMULET:
1007	if (op->arch == amulet_arch)	966	if (IS_ARCH (op->arch, amulet))
1008	op->value = 5; / Since it's not just decoration */	967	op->value = 5; / Since it's not just decoration */
1009		968
1010	case RING:	969	case RING:
1011	if (op->arch == NULL)	970	if (!op->arch) // wtf? schmorp
1012	{	971	{
1013	op->destroy ();	972	op->destroy ();
1014	op = 0;	973	op = 0;
1015	break;	974	break;
1016	}	975	}
1017		976
1018	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	977	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1019	break;	978	break;
1020		979
1021	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	980	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1022	SET_FLAG (op, FLAG_CURSED);	981	SET_FLAG (op, FLAG_CURSED);
1023		982
…		…
1176	* Allocate and return the pointer to an empty artifactlist structure.	1135	* Allocate and return the pointer to an empty artifactlist structure.
1177	*/	1136	*/
1178	static artifactlist *	1137	static artifactlist *
1179	get_empty_artifactlist (void)	1138	get_empty_artifactlist (void)
1180	{	1139	{
1181	artifactlist al = (artifactlist ) malloc (sizeof (artifactlist));	1140	return salloc0<artifactlist> ();
1182
1183	if (al == NULL)
1184	fatal (OUT_OF_MEMORY);
1185	al->next = NULL;
1186	al->items = NULL;
1187	al->total_chance = 0;
1188	return al;
1189	}	1141	}
1190		1142
1191	/*	1143	/*
1192	* Allocate and return the pointer to an empty artifact structure.	1144	* Allocate and return the pointer to an empty artifact structure.
1193	*/	1145	*/
1194	static artifact *	1146	static artifact *
1195	get_empty_artifact (void)	1147	get_empty_artifact (void)
1196	{	1148	{
1197	artifact a = (artifact ) malloc (sizeof (artifact));	1149	return salloc0<artifact> ();
1198
1199	if (a == NULL)
1200	fatal (OUT_OF_MEMORY);
1201
1202	a->item = NULL;
1203	a->next = NULL;
1204	a->chance = 0;
1205	a->difficulty = 0;
1206	a->allowed = NULL;
1207	return a;
1208	}	1150	}
1209		1151
1210	/*	1152	/*
1211	* Searches the artifact lists and returns one that has the same type	1153	* Searches the artifact lists and returns one that has the same type
1212	* of objects on it.	1154	* of objects on it.
1213	*/	1155	*/
1214	artifactlist *	1156	artifactlist *
1215	find_artifactlist (int type)	1157	find_artifactlist (int type)
1216	{	1158	{
1217	artifactlist *al;
1218
1219	for (al = first_artifactlist; al; al = al->next)	1159	for (artifactlist *al = first_artifactlist; al; al = al->next)
1220	if (al->type == type)	1160	if (al->type == type)
1221	return al;	1161	return al;
1222		1162
1223	return 0;	1163	return 0;
1224	}
1225
1226	/*
1227	* For debugging purposes. Dumps all tables.
1228	*/
1229	void
1230	dump_artifacts (void)
1231	{
1232	artifactlist *al;
1233	artifact *art;
1234	linked_char *next;
1235
1236	fprintf (logfile, "\n");
1237	for (al = first_artifactlist; al != NULL; al = al->next)
1238	{
1239	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1240	for (art = al->items; art != NULL; art = art->next)
1241	{
1242	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1243	if (art->allowed != NULL)
1244	{
1245	fprintf (logfile, "\tallowed combinations:");
1246	for (next = art->allowed; next != NULL; next = next->next)
1247	fprintf (logfile, "%s,", &next->name);
1248	fprintf (logfile, "\n");
1249	}
1250	}
1251	}
1252	fprintf (logfile, "\n");
1253	}
1254
1255	/*
1256	* For debugging purposes. Dumps all treasures recursively (see below).
1257	*/
1258	void
1259	dump_monster_treasure_rec (const char name, treasure t, int depth)
1260	{
1261	treasurelist *tl;
1262	int i;
1263
1264	if (depth > 100)
1265	return;
1266	while (t)
1267	{
1268	if (t->name)
1269	{
1270	for (i = 0; i < depth; i++)
1271	fprintf (logfile, " ");
1272	fprintf (logfile, "{ (list: %s)\n", &t->name);
1273	tl = find_treasurelist (t->name);
1274	if (tl)
1275	dump_monster_treasure_rec (name, tl->items, depth + 2);
1276	for (i = 0; i < depth; i++)
1277	fprintf (logfile, " ");
1278	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1279	}
1280	else
1281	{
1282	for (i = 0; i < depth; i++)
1283	fprintf (logfile, " ");
1284	if (t->item && t->item->clone.type == FLESH)
1285	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1286	else
1287	fprintf (logfile, "%s\n", &t->item->clone.name);
1288	}
1289
1290	if (t->next_yes)
1291	{
1292	for (i = 0; i < depth; i++)
1293	fprintf (logfile, " ");
1294	fprintf (logfile, " (if yes)\n");
1295	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1296	}
1297
1298	if (t->next_no)
1299	{
1300	for (i = 0; i < depth; i++)
1301	fprintf (logfile, " ");
1302	fprintf (logfile, " (if no)\n");
1303	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1304	}
1305
1306	t = t->next;
1307	}
1308	}
1309
1310	/*
1311	* For debugging purposes. Dumps all treasures for a given monster.
1312	* Created originally by Raphael Quinet for debugging the alchemy code.
1313	*/
1314
1315	void
1316	dump_monster_treasure (const char *name)
1317	{
1318	archetype *at;
1319	int found;
1320
1321	found = 0;
1322	fprintf (logfile, "\n");
1323
1324	for (at = first_archetype; at != NULL; at = at->next)
1325	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1326	{
1327	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1328	if (at->clone.randomitems != NULL)
1329	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1330	else
1331	fprintf (logfile, "(nothing)\n");
1332
1333	fprintf (logfile, "\n");
1334	found++;
1335	}
1336
1337	if (found == 0)
1338	fprintf (logfile, "No objects have the name %s!\n\n", name);
1339	}	1164	}
1340		1165
1341	/*	1166	/*
1342	* Builds up the lists of artifacts from the file in the libdir.	1167	* Builds up the lists of artifacts from the file in the libdir.
1343	*/	1168	*/
…		…
1358	object_thawer f (filename);	1183	object_thawer f (filename);
1359		1184
1360	if (!f)	1185	if (!f)
1361	return;	1186	return;
1362		1187
1363	f.next ();
1364
1365	for (;;)	1188	for (;;)
1366	{	1189	{
1367	switch (f.kw)	1190	switch (f.kw)
1368	{	1191	{
1369	case KW_allowed:	1192	case KW_allowed:
1370	if (!art)	1193	if (!art)
1371	{
1372	art = get_empty_artifact ();	1194	art = get_empty_artifact ();
1373	nrofartifacts++;
1374	}
1375		1195
1376	{	1196	{
1377	if (!strcmp (f.get_str (), "all"))	1197	if (!strcmp (f.get_str (), "all"))
1378	break;	1198	break;
1379		1199
1380	char next, cp = f.get_str ();	1200	char next, cp = f.get_str ();
1381		1201
1382	do	1202	do
1383	{	1203	{
1384	nrofallowedstr++;
1385
1386	if ((next = strchr (cp, ',')))	1204	if ((next = strchr (cp, ',')))
1387	*next++ = '\0';	1205	*next++ = '\0';
1388		1206
1389	linked_char *tmp = new linked_char;	1207	linked_char *tmp = new linked_char;
1390		1208
…		…
1405	break;	1223	break;
1406		1224
1407	case KW_object:	1225	case KW_object:
1408	{	1226	{
1409	art->item = object::create ();	1227	art->item = object::create ();
		1228	f.get (art->item->name);
		1229	f.next ();
1410		1230
1411	if (!art->item->parse_kv (f))	1231	if (!art->item->parse_kv (f))
1412	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1232	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1413		1233
1414	al = find_artifactlist (art->item->type);	1234	al = find_artifactlist (art->item->type);
…		…
1440	}	1260	}
1441		1261
1442	done:	1262	done:
1443	for (al = first_artifactlist; al; al = al->next)	1263	for (al = first_artifactlist; al; al = al->next)
1444	{	1264	{
		1265	al->total_chance = 0;
		1266
1445	for (art = al->items; art; art = art->next)	1267	for (art = al->items; art; art = art->next)
1446	{	1268	{
1447	if (!art->chance)	1269	if (!art->chance)
1448	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1270	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1449	else	1271	else
…		…
1455	}	1277	}
1456		1278
1457	LOG (llevDebug, "done.\n");	1279	LOG (llevDebug, "done.\n");
1458	}	1280	}
1459		1281
1460
1461	/*	1282	/*
1462	* Used in artifact generation. The bonuses of the first object	1283	* Used in artifact generation. The bonuses of the first object
1463	* is modified by the bonuses of the second object.	1284	* is modified by the bonuses of the second object.
1464	*/	1285	*/
1465
1466	void	1286	void
1467	add_abilities (object op, object change)	1287	add_abilities (object op, object change)
1468	{	1288	{
1469	int i, tmp;	1289	int i, tmp;
1470		1290
1471	if (change->face != blank_face)	1291	if (change->face != blank_face)
1472	{	1292	{
1473	#ifdef TREASURE_VERBOSE	1293	#ifdef TREASURE_VERBOSE
1474	LOG (llevDebug, "FACE: %d\n", change->face->number);	1294	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1475	#endif	1295	#endif
1476	op->face = change->face;	1296	op->face = change->face;
1477	}	1297	}
1478		1298
1479	for (i = 0; i < NUM_STATS; i++)	1299	for (i = 0; i < NUM_STATS; i++)
1480	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1300	change_attr_value (&(op->stats), i, change->stats.stat (i));
1481		1301
1482	op->attacktype \|= change->attacktype;	1302	op->attacktype \|= change->attacktype;
1483	op->path_attuned \|= change->path_attuned;	1303	op->path_attuned \|= change->path_attuned;
1484	op->path_repelled \|= change->path_repelled;	1304	op->path_repelled \|= change->path_repelled;
1485	op->path_denied \|= change->path_denied;	1305	op->path_denied \|= change->path_denied;
…		…
1649	if (change->msg)	1469	if (change->msg)
1650	op->msg = change->msg;	1470	op->msg = change->msg;
1651	}	1471	}
1652		1472
1653	static int	1473	static int
1654	legal_artifact_combination (object op, artifact art)	1474	legal_artifact_combination (object op, artifact art)
1655	{	1475	{
1656	int neg, success = 0;	1476	int neg, success = 0;
1657	linked_char *tmp;	1477	linked_char *tmp;
1658	const char *name;	1478	const char *name;
1659		1479
1660	if (art->allowed == (linked_char *) NULL)	1480	if (!art->allowed)
1661	return 1; /* Ie, "all" */	1481	return 1; /* Ie, "all" */
		1482
1662	for (tmp = art->allowed; tmp; tmp = tmp->next)	1483	for (tmp = art->allowed; tmp; tmp = tmp->next)
1663	{	1484	{
1664	#ifdef TREASURE_VERBOSE	1485	#ifdef TREASURE_VERBOSE
1665	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1486	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1666	#endif	1487	#endif
1667	if (*tmp->name == '!')	1488	if (*tmp->name == '!')
1668	name = tmp->name + 1, neg = 1;	1489	name = tmp->name + 1, neg = 1;
1669	else	1490	else
1670	name = tmp->name, neg = 0;	1491	name = tmp->name, neg = 0;
1671		1492
1672	/* If we match name, then return the opposite of 'neg' */	1493	/* If we match name, then return the opposite of 'neg' */
1673	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->name)))	1494	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->archname)))
1674	return !neg;	1495	return !neg;
1675		1496
1676	/* Set success as true, since if the match was an inverse, it means	1497	/* Set success as true, since if the match was an inverse, it means
1677	* everything is allowed except what we match	1498	* everything is allowed except what we match
1678	*/	1499	*/
1679	else if (neg)	1500	else if (neg)
1680	success = 1;	1501	success = 1;
1681	}	1502	}
		1503
1682	return success;	1504	return success;
1683	}	1505	}
1684		1506
1685	/*	1507	/*
1686	* Fixes the given object, giving it the abilities and titles	1508	* Fixes the given object, giving it the abilities and titles
…		…
1765	continue;	1587	continue;
1766		1588
1767	if (!legal_artifact_combination (op, art))	1589	if (!legal_artifact_combination (op, art))
1768	{	1590	{
1769	#ifdef TREASURE_VERBOSE	1591	#ifdef TREASURE_VERBOSE
1770	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1592	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1771	#endif	1593	#endif
1772	continue;	1594	continue;
1773	}	1595	}
		1596
1774	give_artifact_abilities (op, art->item);	1597	give_artifact_abilities (op, art->item);
1775	return;	1598	return;
1776	}	1599	}
1777	}	1600	}
1778		1601
…		…
1822	SET_FLAG (item, FLAG_NO_STEAL);	1645	SET_FLAG (item, FLAG_NO_STEAL);
1823	}	1646	}
1824	}	1647	}
1825		1648
1826	/* special_potion() - so that old potion code is still done right. */	1649	/* special_potion() - so that old potion code is still done right. */
1827
1828	int	1650	int
1829	special_potion (object *op)	1651	special_potion (object *op)
1830	{	1652	{
1831	if (op->attacktype)	1653	if (op->attacktype)
1832	return 1;	1654	return 1;
…		…
1842	}	1664	}
1843		1665
1844	void	1666	void
1845	free_treasurestruct (treasure *t)	1667	free_treasurestruct (treasure *t)
1846	{	1668	{
1847	if (t->next)
1848	free_treasurestruct (t->next);	1669	if (t->next) free_treasurestruct (t->next);
1849	if (t->next_yes)
1850	free_treasurestruct (t->next_yes);	1670	if (t->next_yes) free_treasurestruct (t->next_yes);
1851	if (t->next_no)
1852	free_treasurestruct (t->next_no);	1671	if (t->next_no) free_treasurestruct (t->next_no);
1853		1672
1854	delete t;	1673	delete t;
1855	}	1674	}
1856		1675
1857	void	1676	void
…		…
1862		1681
1863	delete lc;	1682	delete lc;
1864	}	1683	}
1865		1684
1866	void	1685	void
1867	free_artifact (artifact * at)	1686	free_artifact (artifact *at)
1868	{	1687	{
1869	if (at->next)
1870	free_artifact (at->next);	1688	if (at->next) free_artifact (at->next);
1871
1872	if (at->allowed)
1873	free_charlinks (at->allowed);	1689	if (at->allowed) free_charlinks (at->allowed);
1874		1690
1875	at->item->destroy (1);	1691	at->item->destroy (1);
1876		1692
1877	delete at;	1693	sfree (at);
1878	}	1694	}
1879		1695
1880	void	1696	void
1881	free_artifactlist (artifactlist * al)	1697	free_artifactlist (artifactlist *al)
1882	{	1698	{
1883	artifactlist *nextal;	1699	artifactlist *nextal;
1884		1700
1885	for (al = first_artifactlist; al; al = nextal)	1701	for (al = first_artifactlist; al; al = nextal)
1886	{	1702	{
1887	nextal = al->next;	1703	nextal = al->next;
1888		1704
1889	if (al->items)	1705	if (al->items)
1890	free_artifact (al->items);	1706	free_artifact (al->items);
1891		1707
1892	free (al);	1708	sfree (al);
1893	}	1709	}
1894	}	1710	}
1895		1711
1896	void	1712	void
1897	free_all_treasures (void)	1713	free_all_treasures (void)
1898	{	1714	{
1899	treasurelist tl, next;	1715	treasurelist tl, next;
1900		1716
1901
1902	for (tl = first_treasurelist; tl != NULL; tl = next)	1717	for (tl = first_treasurelist; tl; tl = next)
1903	{	1718	{
		1719	clear (tl);
		1720
1904	next = tl->next;	1721	next = tl->next;
1905	if (tl->items)
1906	free_treasurestruct (tl->items);
1907	delete tl;	1722	delete tl;
1908	}	1723	}
		1724
1909	free_artifactlist (first_artifactlist);	1725	free_artifactlist (first_artifactlist);
1910	}	1726	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.40 by root, Wed Mar 14 00:04:58 2007 UTC vs. Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.40 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC