ViewVC Help

View File | Revision Log | Show Annotations | Download File

/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.70 by root, Wed Apr 2 11:13:52 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23
24	#define ALLOWED_COMBINATION
25		23
26	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	24	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
27	* 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
28	* 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
29	* left on	27	* left on
30	*/	28	*/
31	#define TREASURE_DEBUG	29	#define TREASURE_DEBUG
32		30
33	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	31	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
34		32
35	/* #define TREASURE_VERBOSE */	33	//#define TREASURE_VERBOSE
36		34
37	#include <global.h>	35	#include <global.h>
38	#include <treasure.h>	36	#include <treasure.h>
39	#include <funcpoint.h>	37	#include <funcpoint.h>
40	#include <loader.h>	38	#include <loader.h>
41		39
		40	extern char *spell_mapping[];
		41
		42	static treasurelist *first_treasurelist;
42		43
43	static void change_treasure (treasure *t, object *op); /* overrule default values */	44	static void change_treasure (treasure *t, object *op); /* overrule default values */
44	extern char *spell_mapping[];
45		45
46	/*	46	typedef std::tr1::unordered_map<
47	* Initialize global archtype pointers:	47	const char *,
48	*/	48	treasurelist *,
		49	str_hash,
		50	str_equal,
		51	slice_allocator< std::pair<const char *const, treasurelist *> >,
		52	true
		53	> tl_map_t;
49		54
		55	static tl_map_t tl_map;
		56
		57	/*
		58	* Searches for the given treasurelist
		59	*/
		60	treasurelist *
		61	treasurelist::find (const char *name)
		62	{
		63	if (!name)
		64	return 0;
		65
		66	auto (i, tl_map.find (name));
		67
		68	if (i == tl_map.end ())
		69	return 0;
		70
		71	return i->second;
		72	}
		73
		74	/*
		75	* Searches for the given treasurelist in the globally linked list
		76	* of treasurelists which has been built by load_treasures().
		77	*/
		78	treasurelist *
		79	treasurelist::get (const char *name)
		80	{
		81	treasurelist *tl = find (name);
		82
		83	if (!tl)
		84	{
		85	tl = new treasurelist;
		86
		87	tl->name = name;
		88	tl->next = first_treasurelist;
		89	first_treasurelist = tl;
		90
		91	tl_map.insert (std::make_pair (tl->name, tl));
		92	}
		93
		94	return tl;
		95	}
		96
		97	//TODO: class method
50	void	98	void
51	init_archetype_pointers ()	99	clear (treasurelist *tl)
52	{	100	{
53	int prev_warn = warn_archetypes;	101	if (tl->items)
		102	{
		103	free_treasurestruct (tl->items);
		104	tl->items = 0;
		105	}
54		106
55	warn_archetypes = 1;
56	if (ring_arch == NULL)
57	ring_arch = archetype::find ("ring");
58	if (amulet_arch == NULL)
59	amulet_arch = archetype::find ("amulet");
60	if (staff_arch == NULL)
61	staff_arch = archetype::find ("staff");
62	if (crown_arch == NULL)
63	crown_arch = archetype::find ("crown");
64	warn_archetypes = prev_warn;
65	}
66
67	/*
68	* Allocate and return the pointer to an empty treasurelist structure.
69	*/
70
71	static treasurelist *
72	get_empty_treasurelist (void)
73	{
74	return new treasurelist;
75	}
76
77	/*
78	* Allocate and return the pointer to an empty treasure structure.
79	*/
80	//TODO: make this a constructor
81	static treasure *
82	get_empty_treasure (void)
83	{
84	treasure *t = new treasure;
85
86	t->chance = 100;	107	tl->total_chance = 0;
87
88	return t;
89	}	108	}
		109
		110	#ifdef TREASURE_DEBUG
		111	/* recursived checks the linked list. Treasurelist is passed only
		112	* so that the treasure name can be printed out
		113	*/
		114	static void
		115	check_treasurelist (const treasure *t, const treasurelist * tl)
		116	{
		117	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
		118	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		119
		120	if (t->next)
		121	check_treasurelist (t->next, tl);
		122
		123	if (t->next_yes)
		124	check_treasurelist (t->next_yes, tl);
		125
		126	if (t->next_no)
		127	check_treasurelist (t->next_no, tl);
		128	}
		129	#endif
90		130
91	/*	131	/*
92	* Reads the lib/treasure file from disk, and parses the contents	132	* Reads the lib/treasure file from disk, and parses the contents
93	* into an internal treasure structure (very linked lists)	133	* into an internal treasure structure (very linked lists)
94	*/	134	*/
95
96	static treasure *	135	static treasure *
97	load_treasure (FILE * fp, int *line)	136	read_treasure (object_thawer &f)
98	{	137	{
99	char buf[MAX_BUF], *cp, variable[MAX_BUF];
100	treasure *t = get_empty_treasure ();	138	treasure *t = new treasure;
101	int value;
102		139
103	nroftreasures++;	140	f.next ();
104	while (fgets (buf, MAX_BUF, fp) != NULL)
105	{
106	(*line)++;
107		141
108	if (*buf == '#')	142	for (;;)
109	continue;	143	{
110	if ((cp = strchr (buf, '\n')) != NULL)	144	coroapi::cede_to_tick ();
111	*cp = '\0';
112	cp = buf;
113	while (isspace (*cp)) /* Skip blanks */
114	cp++;
115		145
116	if (sscanf (cp, "arch %s", variable))	146	switch (f.kw)
117	{
118	if ((t->item = archetype::find (variable)) == NULL)
119	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
120	}	147	{
121	else if (sscanf (cp, "list %s", variable))	148	case KW_arch:
122	t->name = variable;	149	t->item = archetype::get (f.get_str ());
123	else if (sscanf (cp, "change_name %s", variable))	150	break;
124	t->change_arch.name = variable;	151
125	else if (sscanf (cp, "change_title %s", variable))	152	case KW_list: f.get (t->name); break;
126	t->change_arch.title = variable;	153	case KW_change_name: f.get (t->change_arch.name); break;
127	else if (sscanf (cp, "change_slaying %s", variable))	154	case KW_change_title: f.get (t->change_arch.title); break;
128	t->change_arch.slaying = variable;	155	case KW_change_slaying: f.get (t->change_arch.slaying); break;
129	else if (sscanf (cp, "chance %d", &value))	156	case KW_chance: f.get (t->chance); break;
130	t->chance = (uint8) value;	157	case KW_nrof: f.get (t->nrof); break;
131	else if (sscanf (cp, "nrof %d", &value))	158	case KW_magic: f.get (t->magic); break;
132	t->nrof = (uint16) value;	159
133	else if (sscanf (cp, "magic %d", &value))	160	case KW_yes: t->next_yes = read_treasure (f); continue;
134	t->magic = (uint8) value;	161	case KW_no: t->next_no = read_treasure (f); continue;
135	else if (!strcmp (cp, "yes"))	162
136	t->next_yes = load_treasure (fp, line);	163	case KW_end:
137	else if (!strcmp (cp, "no"))	164	f.next ();
138	t->next_no = load_treasure (fp, line);
139	else if (!strcmp (cp, "end"))
140	return t;
141	else if (!strcmp (cp, "more"))
142	{
143	t->next = load_treasure (fp, line);
144	return t;	165	return t;
145	}
146	else
147	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
148	}
149	LOG (llevError, "treasure lacks 'end'.\n");
150	return t;
151	}
152		166
153	#ifdef TREASURE_DEBUG	167	case KW_more:
		168	t->next = read_treasure (f);
		169	return t;
154		170
155	/* recursived checks the linked list. Treasurelist is passed only	171	default:
156	* so that the treasure name can be printed out	172	if (!f.parse_error ("treasurelist", t->name))
157	*/	173	return 0;
158	static void
159	check_treasurelist (const treasure *t, const treasurelist * tl)
160	{
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))
164	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 */
166	if (t->name && *t->name)
167	(void) find_treasurelist (t->name);
168	if (t->next)
169	check_treasurelist (t->next, tl);
170	if (t->next_yes)
171	check_treasurelist (t->next_yes, tl);
172	if (t->next_no)
173	check_treasurelist (t->next_no, tl);
174	}
175	#endif
176		174
		175	return t;
		176	}
		177
		178	f.next ();
		179	}
		180	}
		181
177	/*	182	/*
178	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
179	* Each treasure is parsed with the help of load_treasure().	183	* Each treasure is parsed with the help of load_treasure().
180	*/	184	*/
181		185	treasurelist *
182	void	186	treasurelist::read (object_thawer &f)
183	load_treasures (void)
184	{	187	{
185	FILE *fp;	188	assert (f.kw == KW_treasure || f.kw == KW_treasureone);
186	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
187	treasurelist *previous = NULL;
188	treasure *t;
189	int comp, line = 0;
190		189
191	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	190	bool one = f.kw == KW_treasureone;
192	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	191	treasurelist *tl = treasurelist::get (f.get_str ());
193	{	192	clear (tl);
194	LOG (llevError, "Can't open treasure file.\n");	193	tl->items = read_treasure (f);
		194	if (!tl->items)
195	return;	195	return 0;
196	}
197	while (fgets (buf, MAX_BUF, fp) != NULL)
198	{
199	line++;
200	if (*buf == '#')
201	continue;
202		196
203	if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
204	{
205	treasurelist *tl = get_empty_treasurelist ();
206
207	tl->name = name;
208	if (previous == NULL)
209	first_treasurelist = tl;
210	else
211	previous->next = tl;
212	previous = tl;
213	tl->items = load_treasure (fp, &line);
214
215	/* This is a one of the many items on the list should be generated.	197	/* This is a one of the many items on the list should be generated.
216	* Add up the chance total, and check to make sure the yes & no	198	* Add up the chance total, and check to make sure the yes & no
217	* fields of the treasures are not being used.	199	* fields of the treasures are not being used.
218	*/	200	*/
219	if (!strncmp (buf, "treasureone", 11))	201	if (one)
		202	{
		203	for (treasure *t = tl->items; t; t = t->next)
		204	{
		205	if (t->next_yes || t->next_no)
220	{	206	{
221	for (t = tl->items; t != NULL; t = t->next)
222	{
223	#ifdef TREASURE_DEBUG
224	if (t->next_yes || t->next_no)
225	{
226	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	207	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
227	LOG (llevError, " the next_yes or next_no field is set\n");	208	LOG (llevError, " the next_yes or next_no field is set\n");
228	}
229	#endif
230	tl->total_chance += t->chance;
231	}
232	}	209	}
233	}
234	else
235	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
236	}
237	close_and_delete (fp, comp);
238		210
239	#ifdef TREASURE_DEBUG	211	tl->total_chance += t->chance;
240	/* Perform some checks on how valid the treasure data actually is.	212	}
241	* verify that list transitions work (ie, the list that it is supposed	213	}
242	* to transition to exists). Also, verify that at least the name
243	* or archetype is set for each treasure element.
244	*/
245	for (previous = first_treasurelist; previous != NULL; previous = previous->next)
246	check_treasurelist (previous->items, previous);
247	#endif
248	}
249		214
250	/*
251	* Searches for the given treasurelist in the globally linked list
252	* of treasurelists which has been built by load_treasures().
253	*/
254
255	treasurelist *
256	find_treasurelist (const char *name)
257	{
258	shstr_cmp name_ (name);
259
260	if (!name_)
261	return 0;
262
263	for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
264	if (name_ == tl->name)
265	return tl;
266
267	if (first_treasurelist)
268	LOG (llevError, "Couldn't find treasurelist %s\n", name);
269
270	return 0;	215	return tl;
271	}	216	}
272
273		217
274	/*	218	/*
275	* Generates the objects specified by the given treasure.	219	* Generates the objects specified by the given treasure.
276	* It goes recursively through the rest of the linked list.	220	* It goes recursively through the rest of the linked list.
277	* If there is a certain percental chance for a treasure to be generated,	221	* If there is a certain percental chance for a treasure to be generated,
…		…
283	* start with equipment, but only their abilities).	227	* start with equipment, but only their abilities).
284	*/	228	*/
285	static void	229	static void
286	put_treasure (object *op, object *creator, int flags)	230	put_treasure (object *op, object *creator, int flags)
287	{	231	{
288	object *tmp;	232	if (flags & GT_ENVIRONMENT)
289		233	{
290	/* Bit of a hack - spells should never be put onto the map. The entire	234	/* Bit of a hack - spells should never be put onto the map. The entire
291	* treasure stuff is a problem - there is no clear idea of knowing	235	* treasure stuff is a problem - there is no clear idea of knowing
292	* this is the original object, or if this is an object that should be created	236	* this is the original object, or if this is an object that should be created
293	* by another object.	237	* by another object.
294	*/	238	*/
295	if (flags & GT_ENVIRONMENT && op->type != SPELL)	239	//TODO: flag such as objects... as such (no drop, anybody?)
296	{	240	if (op->type == SPELL)
		241	{
		242	op->destroy ();
		243	return;
		244	}
		245
		246	op->expand_tail ();
		247
		248	if (op->blocked (creator->map, creator->x, creator->y))
		249	op->destroy ();
		250	else
		251	{
297	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	252	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
298	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);	253	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
		254	}
299	}	255	}
300	else	256	else
301	{	257	{
302	op = creator->insert (op);	258	op = creator->insert (op);
303		259
304	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	260	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
305	monster_check_apply (creator, op);	261	monster_check_apply (creator, op);
306		262
307	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))	263	if (flags & GT_UPDATE_INV)
		264	if (object *tmp = creator->in_player ())
308	esrv_send_item (tmp, op);	265	esrv_send_item (tmp, op);
309	}	266	}
310	}	267	}
311		268
312	/* if there are change_xxx commands in the treasure, we include the changes	269	/* if there are change_xxx commands in the treasure, we include the changes
313	* in the generated object	270	* in the generated object
…		…
327		284
328	if (t->change_arch.slaying)	285	if (t->change_arch.slaying)
329	op->slaying = t->change_arch.slaying;	286	op->slaying = t->change_arch.slaying;
330	}	287	}
331		288
332	void	289	static void
333	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)	290	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
334	{	291	{
335	object *tmp;
336
337	if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance)	292	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
338	{	293	{
339	if (t->name)	294	if (t->name)
340	{	295	{
341	if (strcmp (t->name, "NONE") && difficulty >= t->magic)	296	if (difficulty >= t->magic)
		297	if (treasurelist *tl = treasurelist::find (t->name))
		298	create_treasure (tl, op, flag, difficulty, tries);
		299	else
		300	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
		301	}
		302	else
		303	{
		304	if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
342	{	305	{
343	treasurelist *tl = find_treasurelist (t->name);
344	if (tl)
345	create_treasure (tl, op, flag, difficulty, tries);
346	}
347	}
348	else
349	{
350	if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))
351	{
352	tmp = arch_to_object (t->item);	306	object *tmp = arch_to_object (t->item);
		307
353	if (t->nrof && tmp->nrof <= 1)	308	if (t->nrof && tmp->nrof <= 1)
354	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	309	tmp->nrof = rndm (t->nrof) + 1;
		310
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	311	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	312	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	313	put_treasure (tmp, op, flag);
358	}	314	}
359	}	315	}
360		316
361	if (t->next_yes != NULL)	317	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	318	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	319	}
364	else if (t->next_no != NULL)	320	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	321	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		322
367	if (t->next != NULL)	323	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	324	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	325	}
370		326
371	void	327	static void
372	create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries)	328	create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
373	{	329	{
374	int value = RANDOM () % tl->total_chance;	330	int value = rndm (tl->total_chance);
375	treasure *t;	331	treasure *t;
376		332
377	if (tries++ > 100)	333	if (tries++ > 100)
378	{	334	{
379	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	335	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
380	return;	336	return;
381	}	337	}
382		338
383	for (t = tl->items; t != NULL; t = t->next)	339	for (t = tl->items; t; t = t->next)
384	{	340	{
385	value -= t->chance;	341	value -= t->chance;
386		342
387	if (value < 0)	343	if (value < 0)
388	break;	344	break;
389	}	345	}
390		346
391	if (!t || value >= 0)	347	if (!t || value >= 0)
392	{
393	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	348	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
394	abort ();
395	return;
396	}
397		349
398	if (t->name)	350	if (t->name)
399	{	351	{
400	if (!strcmp (t->name, "NONE"))
401	return;
402
403	if (difficulty >= t->magic)	352	if (difficulty >= t->magic)
404	{	353	{
405	treasurelist *tl = find_treasurelist (t->name);	354	treasurelist *tl = treasurelist::find (t->name);
406	if (tl)	355	if (tl)
407	create_treasure (tl, op, flag, difficulty, tries);	356	create_treasure (tl, op, flag, difficulty, tries);
408	}	357	}
409	else if (t->nrof)	358	else if (t->nrof)
410	create_one_treasure (tl, op, flag, difficulty, tries);	359	create_one_treasure (tl, op, flag, difficulty, tries);
411
412	return;
413	}	360	}
414
415	if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE)	361	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
416	{	362	{
417	object *tmp = arch_to_object (t->item);	363	if (object *tmp = arch_to_object (t->item))
418		364	{
419	if (!tmp)
420	return;
421
422	if (t->nrof && tmp->nrof <= 1)	365	if (t->nrof && tmp->nrof <= 1)
423	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	366	tmp->nrof = rndm (t->nrof) + 1;
424		367
425	fix_generated_item (tmp, op, difficulty, t->magic, flag);	368	fix_generated_item (tmp, op, difficulty, t->magic, flag);
426	change_treasure (t, tmp);	369	change_treasure (t, tmp);
427	put_treasure (tmp, op, flag);	370	put_treasure (tmp, op, flag);
		371	}
428	}	372	}
		373	}
		374
		375	void
		376	object::create_treasure (treasurelist *tl, int flags)
		377	{
		378	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
429	}	379	}
430		380
431	/* This calls the appropriate treasure creation function. tries is passed	381	/* This calls the appropriate treasure creation function. tries is passed
432	* to determine how many list transitions or attempts to create treasure	382	* to determine how many list transitions or attempts to create treasure
433	* have been made. It is really in place to prevent infinite loops with	383	* have been made. It is really in place to prevent infinite loops with
434	* list transitions, or so that excessively good treasure will not be	384	* 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	385	* created on weak maps, because it will exceed the number of allowed tries
436	* to do that.	386	* to do that.
437	*/	387	*/
438	void	388	void
439	create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries)	389	create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
440	{	390	{
		391	// empty treasurelists are legal
		392	if (!tl->items)
		393	return;
441		394
442	if (tries++ > 100)	395	if (tries++ > 100)
443	{	396	{
444	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	397	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
445	return;	398	return;
446	}	399	}
		400
		401	if (op->flag [FLAG_TREASURE_ENV])
		402	{
		403	// do not generate items when there already is something above the object
		404	if (op->flag [FLAG_IS_FLOOR] && op->above)
		405	return;
		406
		407	flag |= GT_ENVIRONMENT;
		408	}
		409
447	if (t->total_chance)	410	if (tl->total_chance)
448	create_one_treasure (t, op, flag, difficulty, tries);	411	create_one_treasure (tl, op, flag, difficulty, tries);
449	else	412	else
450	create_all_treasures (t->items, op, flag, difficulty, tries);	413	create_all_treasures (tl->items, op, flag, difficulty, tries);
451	}	414	}
452		415
453	/* This is similar to the old generate treasure function. However,	416	/* This is similar to the old generate treasure function. However,
454	* it instead takes a treasurelist. It is really just a wrapper around	417	* it instead takes a treasurelist. It is really just a wrapper around
455	* create_treasure. We create a dummy object that the treasure gets	418	* create_treasure. We create a dummy object that the treasure gets
456	* inserted into, and then return that treausre	419	* inserted into, and then return that treausre
457	*/	420	*/
458	object *	421	object *
459	generate_treasure (treasurelist *t, int difficulty)	422	generate_treasure (treasurelist *tl, int difficulty)
460	{	423	{
461	difficulty = clamp (difficulty, 1, settings.max_level);	424	difficulty = clamp (difficulty, 1, settings.max_level);
462		425
463	object *ob = object::create (), *tmp;	426	object *ob = object::create ();
464		427
465	create_treasure (t, ob, 0, difficulty, 0);	428	create_treasure (tl, ob, 0, difficulty, 0);
466		429
467	/* Don't want to free the object we are about to return */	430	/* Don't want to free the object we are about to return */
468	tmp = ob->inv;	431	object *tmp = ob->inv;
469	if (tmp != NULL)	432	if (tmp)
470	tmp->remove ();	433	tmp->remove ();
471		434
472	if (ob->inv)	435	if (ob->inv)
473	LOG (llevError, "In generate treasure, created multiple objects.\n");	436	LOG (llevError, "In generate treasure, created multiple objects.\n");
474		437
…		…
482	* The array has two arguments, the difficulty of the level, and the	445	* The array has two arguments, the difficulty of the level, and the
483	* magical bonus "wanted".	446	* magical bonus "wanted".
484	*/	447	*/
485		448
486	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	449	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
487
488	/*chance of magic difficulty*/	450	// chance of magic difficulty
489
490	/* +0 +1 +2 +3 +4 */	451	// +0 +1 +2 +3 +4
491	{95, 2, 2, 1, 0}, /*1 */	452	{95, 2, 2, 1, 0}, // 1
492	{92, 5, 2, 1, 0}, /*2 */	453	{92, 5, 2, 1, 0}, // 2
493	{85, 10, 4, 1, 0}, /*3 */	454	{85, 10, 4, 1, 0}, // 3
494	{80, 14, 4, 2, 0}, /*4 */	455	{80, 14, 4, 2, 0}, // 4
495	{75, 17, 5, 2, 1}, /*5 */	456	{75, 17, 5, 2, 1}, // 5
496	{70, 18, 8, 3, 1}, /*6 */	457	{70, 18, 8, 3, 1}, // 6
497	{65, 21, 10, 3, 1}, /*7 */	458	{65, 21, 10, 3, 1}, // 7
498	{60, 22, 12, 4, 2}, /*8 */	459	{60, 22, 12, 4, 2}, // 8
499	{55, 25, 14, 4, 2}, /*9 */	460	{55, 25, 14, 4, 2}, // 9
500	{50, 27, 16, 5, 2}, /*10 */	461	{50, 27, 16, 5, 2}, // 10
501	{45, 28, 18, 6, 3}, /*11 */	462	{45, 28, 18, 6, 3}, // 11
502	{42, 28, 20, 7, 3}, /*12 */	463	{42, 28, 20, 7, 3}, // 12
503	{40, 27, 21, 8, 4}, /*13 */	464	{40, 27, 21, 8, 4}, // 13
504	{38, 25, 22, 10, 5}, /*14 */	465	{38, 25, 22, 10, 5}, // 14
505	{36, 23, 23, 12, 6}, /*15 */	466	{36, 23, 23, 12, 6}, // 15
506	{33, 21, 24, 14, 8}, /*16 */	467	{33, 21, 24, 14, 8}, // 16
507	{31, 19, 25, 16, 9}, /*17 */	468	{31, 19, 25, 16, 9}, // 17
508	{27, 15, 30, 18, 10}, /*18 */	469	{27, 15, 30, 18, 10}, // 18
509	{20, 12, 30, 25, 13}, /*19 */	470	{20, 12, 30, 25, 13}, // 19
510	{15, 10, 28, 30, 17}, /*20 */	471	{15, 10, 28, 30, 17}, // 20
511	{13, 9, 27, 28, 23}, /*21 */	472	{13, 9, 27, 28, 23}, // 21
512	{10, 8, 25, 28, 29}, /*22 */	473	{10, 8, 25, 28, 29}, // 22
513	{8, 7, 23, 26, 36}, /*23 */	474	{ 8, 7, 23, 26, 36}, // 23
514	{6, 6, 20, 22, 46}, /*24 */	475	{ 6, 6, 20, 22, 46}, // 24
515	{4, 5, 17, 18, 56}, /*25 */	476	{ 4, 5, 17, 18, 56}, // 25
516	{2, 4, 12, 14, 68}, /*26 */	477	{ 2, 4, 12, 14, 68}, // 26
517	{0, 3, 7, 10, 80}, /*27 */	478	{ 0, 3, 7, 10, 80}, // 27
518	{0, 0, 3, 7, 90}, /*28 */	479	{ 0, 0, 3, 7, 90}, // 28
519	{0, 0, 0, 3, 97}, /*29 */	480	{ 0, 0, 0, 3, 97}, // 29
520	{0, 0, 0, 0, 100}, /*30 */	481	{ 0, 0, 0, 0, 100}, // 30
521	{0, 0, 0, 0, 100}, /*31 */	482	{ 0, 0, 0, 0, 100}, // 31
522	};	483	};
523
524		484
525	/* calculate the appropriate level for wands staves and scrolls.	485	/* calculate the appropriate level for wands staves and scrolls.
526	* This code presumes that op has had its spell object created (in op->inv)	486	* This code presumes that op has had its spell object created (in op->inv)
527	*	487	*
528	* elmex Wed Aug 9 17:44:59 CEST 2006:	488	* elmex Wed Aug 9 17:44:59 CEST 2006:
529	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	489	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
530	*/	490	*/
531
532	int	491	int
533	level_for_item (const object *op, int difficulty)	492	level_for_item (const object *op, int difficulty)
534	{	493	{
535	int olevel = 0;
536
537	if (!op->inv)	494	if (!op->inv)
538	{	495	{
539	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	496	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
540	return 0;	497	return 0;
541	}	498	}
542		499
543	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	500	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
544		501
545	if (olevel <= 0)	502	if (olevel <= 0)
546	olevel = rndm (1, MIN (op->inv->level, 1));	503	olevel = rndm (1, op->inv->level);
547		504
548	if (olevel > MAXLEVEL)	505	return min (olevel, MAXLEVEL);
549	olevel = MAXLEVEL;
550
551	return olevel;
552	}	506	}
553		507
554	/*	508	/*
555	* Based upon the specified difficulty and upon the difftomagic_list array,	509	* Based upon the specified difficulty and upon the difftomagic_list array,
556	* a random magical bonus is returned. This is used when determine	510	* a random magical bonus is returned. This is used when determine
…		…
559	* elmex Thu Aug 10 18:45:44 CEST 2006:	513	* elmex Thu Aug 10 18:45:44 CEST 2006:
560	* Scaling difficulty by max_level, as difficulty is a level and not some	514	* Scaling difficulty by max_level, as difficulty is a level and not some
561	* weird integer between 1-31.	515	* weird integer between 1-31.
562	*	516	*
563	*/	517	*/
564
565	int	518	int
566	magic_from_difficulty (int difficulty)	519	magic_from_difficulty (int difficulty)
567	{	520	{
568	int percent = 0, magic = 0;	521	int percent = 0, magic = 0;
569	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	522	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
574	scaled_diff = 0;	527	scaled_diff = 0;
575		528
576	if (scaled_diff >= DIFFLEVELS)	529	if (scaled_diff >= DIFFLEVELS)
577	scaled_diff = DIFFLEVELS - 1;	530	scaled_diff = DIFFLEVELS - 1;
578		531
579	percent = RANDOM () % 100;	532	percent = rndm (100);
580		533
581	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	534	for (magic = 0; magic < (MAXMAGIC + 1); magic++)
582	{	535	{
583	percent -= difftomagic_list[scaled_diff][magic];	536	percent -= difftomagic_list[scaled_diff][magic];
584		537
…		…
590	{	543	{
591	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	544	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
592	magic = 0;	545	magic = 0;
593	}	546	}
594		547
595	magic = (RANDOM () % 3) ? magic : -magic;	548	magic = (rndm (3)) ? magic : -magic;
596	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	549	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
597		550
598	return magic;	551	return magic;
599	}	552	}
600		553
…		…
613		566
614	op->magic = magic;	567	op->magic = magic;
615	if (op->arch)	568	if (op->arch)
616	{	569	{
617	if (op->type == ARMOUR)	570	if (op->type == ARMOUR)
618	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	571	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
619		572
620	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	573	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
621	magic = (-magic);	574	magic = (-magic);
622	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	575	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
623	}	576	}
624	else	577	else
625	{	578	{
626	if (op->type == ARMOUR)	579	if (op->type == ARMOUR)
627	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	580	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
628	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	581	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
629	magic = (-magic);	582	magic = (-magic);
630	op->weight = (op->weight * (100 - magic * 10)) / 100;	583	op->weight = (op->weight * (100 - magic * 10)) / 100;
631	}	584	}
632	}	585	}
633		586
…		…
657	* 1) Since rings can have multiple bonuses, if the same bonus	610	* 1) Since rings can have multiple bonuses, if the same bonus
658	* is rolled again, increase it - the bonuses now stack with	611	* is rolled again, increase it - the bonuses now stack with
659	* other bonuses previously rolled and ones the item might natively have.	612	* other bonuses previously rolled and ones the item might natively have.
660	* 2) Add code to deal with new PR method.	613	* 2) Add code to deal with new PR method.
661	*/	614	*/
662
663	void	615	void
664	set_ring_bonus (object *op, int bonus)	616	set_ring_bonus (object *op, int bonus)
665	{	617	{
666		618
667	int r = RANDOM () % (bonus > 0 ? 25 : 11);	619	int r = rndm (bonus > 0 ? 25 : 11);
668		620
669	if (op->type == AMULET)	621	if (op->type == AMULET)
670	{	622	{
671	if (!(RANDOM () % 21))	623	if (!(rndm (21)))
672	r = 20 + RANDOM () % 2;	624	r = 20 + rndm (2);
673	else	625	else
674	{	626	{
675	if (RANDOM () & 2)	627	if (rndm (2))
676	r = 10;	628	r = 10;
677	else	629	else
678	r = 11 + RANDOM () % 9;	630	r = 11 + rndm (9);
679	}	631	}
680	}	632	}
681		633
682	switch (r)	634	switch (r)
683	{	635	{
…		…
690	case 2:	642	case 2:
691	case 3:	643	case 3:
692	case 4:	644	case 4:
693	case 5:	645	case 5:
694	case 6:	646	case 6:
695	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	647	op->stats.stat (r) += bonus;
696	break;	648	break;
697		649
698	case 7:	650	case 7:
699	op->stats.dam += bonus;	651	op->stats.dam += bonus;
700	break;	652	break;
…		…
720	case 16:	672	case 16:
721	case 17:	673	case 17:
722	case 18:	674	case 18:
723	case 19:	675	case 19:
724	{	676	{
725	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	677	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
726		678
727	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	679	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
728	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	680	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
729		681
730	/* Cursed items need to have higher negative values to equal out with	682	/* Cursed items need to have higher negative values to equal out with
731	* positive values for how protections work out. Put another	683	* positive values for how protections work out. Put another
732	* little random element in since that they don't always end up with	684	* little random element in since that they don't always end up with
733	* even values.	685	* even values.
734	*/	686	*/
735	if (bonus < 0)	687	if (bonus < 0)
736	val = 2 * -val - RANDOM () % b;	688	val = 2 * -val - rndm (b);
737	if (val > 35)	689	if (val > 35)
738	val = 35; /* Upper limit */	690	val = 35; /* Upper limit */
739	b = 0;	691	b = 0;
		692
740	while (op->resist[resist_table[resist]] != 0 && b < 4)	693	while (op->resist[resist_table[resist]] != 0 && b < 4)
741	{
742	resist = RANDOM () % num_resist_table;	694	resist = rndm (num_resist_table);
743	}	695
744	if (b == 4)	696	if (b == 4)
745	return; /* Not able to find a free resistance */	697	return; /* Not able to find a free resistance */
		698
746	op->resist[resist_table[resist]] = val;	699	op->resist[resist_table[resist]] = val;
747	/* We should probably do something more clever here to adjust value	700	/* We should probably do something more clever here to adjust value
748	* based on how good a resistance we gave.	701	* based on how good a resistance we gave.
749	*/	702	*/
750	break;	703	break;
…		…
778	case 22:	731	case 22:
779	op->stats.exp += bonus; /* Speed! */	732	op->stats.exp += bonus; /* Speed! */
780	op->value = (op->value * 2) / 3;	733	op->value = (op->value * 2) / 3;
781	break;	734	break;
782	}	735	}
		736
783	if (bonus > 0)	737	if (bonus > 0)
784	op->value *= 2 * bonus;	738	op->value *= 2 * bonus;
785	else	739	else
786	op->value = -(op->value * 2 * bonus) / 3;	740	op->value = -(op->value * 2 * bonus) / 3;
787	}	741	}
…		…
792	* higher is the chance of returning a low number.	746	* higher is the chance of returning a low number.
793	* It is only used in fix_generated_treasure() to set bonuses on	747	* It is only used in fix_generated_treasure() to set bonuses on
794	* rings and amulets.	748	* rings and amulets.
795	* Another scheme is used to calculate the magic of weapons and armours.	749	* Another scheme is used to calculate the magic of weapons and armours.
796	*/	750	*/
797
798	int	751	int
799	get_magic (int diff)	752	get_magic (int diff)
800	{	753	{
801	int i;	754	int i;
802		755
803	if (diff < 3)	756	if (diff < 3)
804	diff = 3;	757	diff = 3;
		758
805	for (i = 0; i < 4; i++)	759	for (i = 0; i < 4; i++)
806	if (RANDOM () % diff)	760	if (rndm (diff))
807	return i;	761	return i;
		762
808	return 4;	763	return 4;
809	}	764	}
810		765
811	#define DICE2 (get_magic(2)==2?2:1)	766	#define DICE2 (get_magic(2)==2?2:1)
812	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	767	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
813		768
814	/*	769	/*
815	* fix_generated_item(): This is called after an item is generated, in	770	* 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	771	* order to set it up right. This produced magical bonuses, puts spells
817	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	772	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
831	* value.	786	* value.
832	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	787	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
833	* a working object - don't change magic, value, etc, but set it material	788	* a working object - don't change magic, value, etc, but set it material
834	* type as appropriate, for objects that need spell objects, set those, etc	789	* type as appropriate, for objects that need spell objects, set those, etc
835	*/	790	*/
836
837	void	791	void
838	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)	792	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
839	{	793	{
840	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	794	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
841		795
…		…
846	save_item_power = op->item_power;	800	save_item_power = op->item_power;
847	op->item_power = 0;	801	op->item_power = 0;
848		802
849	if (op->randomitems && op->type != SPELL)	803	if (op->randomitems && op->type != SPELL)
850	{	804	{
851	create_treasure (op->randomitems, op, flags, difficulty, 0);	805	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
852	if (!op->inv)
853	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
854
855	/* So the treasure doesn't get created again */	806	/* So the treasure doesn't get created again */
856	op->randomitems = NULL;	807	op->randomitems = 0;
857	}	808	}
858		809
859	if (difficulty < 1)	810	if (difficulty < 1)
860	difficulty = 1;	811	difficulty = 1;
861		812
…		…
878	if (!op->magic && max_magic)	829	if (!op->magic && max_magic)
879	set_magic (difficulty, op, max_magic, flags);	830	set_magic (difficulty, op, max_magic, flags);
880		831
881	num_enchantments = calc_item_power (op, 1);	832	num_enchantments = calc_item_power (op, 1);
882		833
883	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact,	834	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
		835	|| op->type == HORN
		836	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,
884	* used for shop_floors or treasures */	837	* used for shop_floors or treasures */
885	generate_artifact (op, difficulty);	838	generate_artifact (op, difficulty);
886	}	839	}
887		840
888	/* Object was made an artifact. Calculate its item_power rating.	841	/* Object was made an artifact. Calculate its item_power rating.
…		…
946	case WEAPON:	899	case WEAPON:
947	case ARMOUR:	900	case ARMOUR:
948	case SHIELD:	901	case SHIELD:
949	case HELMET:	902	case HELMET:
950	case CLOAK:	903	case CLOAK:
951	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	904	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
952	set_ring_bonus (op, -DICE2);	905	set_ring_bonus (op, -DICE2);
953	break;	906	break;
954		907
955	case BRACERS:	908	case BRACERS:
956	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	909	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
957	{	910	{
958	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	911	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
959	if (!QUERY_FLAG (op, FLAG_CURSED))	912	if (!QUERY_FLAG (op, FLAG_CURSED))
960	op->value *= 3;	913	op->value *= 3;
961	}	914	}
…		…
987	*/	940	*/
988	if (op->inv && op->randomitems)	941	if (op->inv && op->randomitems)
989	{	942	{
990	/* value multiplier is same as for scrolls */	943	/* value multiplier is same as for scrolls */
991	op->value = (op->value * op->inv->value);	944	op->value = (op->value * op->inv->value);
992	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	945	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
993	}	946	}
994	else	947	else
995	{	948	{
996	op->name = "potion";	949	op->name = "potion";
997	op->name_pl = "potions";	950	op->name_pl = "potions";
998	}	951	}
999		952
1000	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	953	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1001	SET_FLAG (op, FLAG_CURSED);	954	SET_FLAG (op, FLAG_CURSED);
1002	break;	955	break;
1003	}	956	}
1004		957
1005	case AMULET:	958	case AMULET:
…		…
1015	}	968	}
1016		969
1017	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	970	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1018	break;	971	break;
1019		972
1020	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	973	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1021	SET_FLAG (op, FLAG_CURSED);	974	SET_FLAG (op, FLAG_CURSED);
1022		975
1023	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	976	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1024		977
1025	if (op->type != RING) /* Amulets have only one ability */	978	if (op->type != RING) /* Amulets have only one ability */
1026	break;	979	break;
1027		980
1028	if (!(RANDOM () % 4))	981	if (!(rndm (4)))
1029	{	982	{
1030	int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	983	int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1031		984
1032	if (d > 0)	985	if (d > 0)
1033	op->value *= 3;	986	op->value *= 3;
1034		987
1035	set_ring_bonus (op, d);	988	set_ring_bonus (op, d);
1036		989
1037	if (!(RANDOM () % 4))	990	if (!(rndm (4)))
1038	{	991	{
1039	int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	992	int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1040		993
1041	if (d > 0)	994	if (d > 0)
1042	op->value *= 5;	995	op->value *= 5;
1043	set_ring_bonus (op, d);	996	set_ring_bonus (op, d);
1044	}	997	}
1045	}	998	}
1046		999
1047	if (GET_ANIM_ID (op))	1000	if (GET_ANIM_ID (op))
1048	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	1001	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1049		1002
1050	break;	1003	break;
1051		1004
1052	case BOOK:	1005	case BOOK:
1053	/* Is it an empty book?, if yes lets make a special·	1006	/* Is it an empty book?, if yes lets make a special·
1054	* msg for it, and tailor its properties based on the·	1007	* msg for it, and tailor its properties based on the·
1055	* creator and/or map level we found it on.	1008	* creator and/or map level we found it on.
1056	*/	1009	*/
1057	if (!op->msg && RANDOM () % 10)	1010	if (!op->msg && rndm (10))
1058	{	1011	{
1059	/* set the book level properly */	1012	/* set the book level properly */
1060	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))	1013	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1061	{	1014	{
1062	if (op->map && op->map->difficulty)	1015	if (op->map && op->map->difficulty)
1063	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1016	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1064	else	1017	else
1065	op->level = RANDOM () % 20 + 1;	1018	op->level = rndm (20) + 1;
1066	}	1019	}
1067	else	1020	else
1068	op->level = RANDOM () % creator->level;	1021	op->level = rndm (creator->level);
1069		1022
1070	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1023	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1071	/* books w/ info are worth more! */	1024	/* books w/ info are worth more! */
1072	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));	1025	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1073	/* creator related stuff */	1026	/* creator related stuff */
…		…
1172	*/	1125	*/
1173		1126
1174	/*	1127	/*
1175	* Allocate and return the pointer to an empty artifactlist structure.	1128	* Allocate and return the pointer to an empty artifactlist structure.
1176	*/	1129	*/
1177
1178	static artifactlist *	1130	static artifactlist *
1179	get_empty_artifactlist (void)	1131	get_empty_artifactlist (void)
1180	{	1132	{
1181	artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist));	1133	return salloc0<artifactlist> ();
1182
1183	if (tl == NULL)
1184	fatal (OUT_OF_MEMORY);
1185	tl->next = NULL;
1186	tl->items = NULL;
1187	tl->total_chance = 0;
1188	return tl;
1189	}	1134	}
1190		1135
1191	/*	1136	/*
1192	* Allocate and return the pointer to an empty artifact structure.	1137	* Allocate and return the pointer to an empty artifact structure.
1193	*/	1138	*/
1194
1195	static artifact *	1139	static artifact *
1196	get_empty_artifact (void)	1140	get_empty_artifact (void)
1197	{	1141	{
1198	artifact *t = (artifact *) malloc (sizeof (artifact));	1142	return salloc0<artifact> ();
1199
1200	if (t == NULL)
1201	fatal (OUT_OF_MEMORY);
1202	t->item = NULL;
1203	t->next = NULL;
1204	t->chance = 0;
1205	t->difficulty = 0;
1206	t->allowed = NULL;
1207	return t;
1208	}	1143	}
1209		1144
1210	/*	1145	/*
1211	* Searches the artifact lists and returns one that has the same type	1146	* Searches the artifact lists and returns one that has the same type
1212	* of objects on it.	1147	* of objects on it.
1213	*/	1148	*/
1214
1215	artifactlist *	1149	artifactlist *
1216	find_artifactlist (int type)	1150	find_artifactlist (int type)
1217	{	1151	{
1218	artifactlist *al;
1219
1220	for (al = first_artifactlist; al != NULL; al = al->next)	1152	for (artifactlist *al = first_artifactlist; al; al = al->next)
1221	if (al->type == type)	1153	if (al->type == type)
1222	return al;	1154	return al;
		1155
1223	return NULL;	1156	return 0;
1224	}	1157	}
1225		1158
1226	/*	1159	/*
1227	* For debugging purposes. Dumps all tables.	1160	* For debugging purposes. Dumps all tables.
1228	*/	1161	*/
1229
1230	void	1162	void
1231	dump_artifacts (void)	1163	dump_artifacts (void)
1232	{	1164	{
1233	artifactlist *al;	1165	artifactlist *al;
1234	artifact *art;	1166	artifact *art;
…		…
1241	for (art = al->items; art != NULL; art = art->next)	1173	for (art = al->items; art != NULL; art = art->next)
1242	{	1174	{
1243	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);	1175	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1244	if (art->allowed != NULL)	1176	if (art->allowed != NULL)
1245	{	1177	{
1246	fprintf (logfile, "\tAllowed combinations:");	1178	fprintf (logfile, "\tallowed combinations:");
1247	for (next = art->allowed; next != NULL; next = next->next)	1179	for (next = art->allowed; next != NULL; next = next->next)
1248	fprintf (logfile, "%s,", &next->name);	1180	fprintf (logfile, "%s,", &next->name);
1249	fprintf (logfile, "\n");	1181	fprintf (logfile, "\n");
1250	}	1182	}
1251	}	1183	}
…		…
1262	treasurelist *tl;	1194	treasurelist *tl;
1263	int i;	1195	int i;
1264		1196
1265	if (depth > 100)	1197	if (depth > 100)
1266	return;	1198	return;
1267	while (t != NULL)	1199
		1200	while (t)
1268	{	1201	{
1269	if (t->name != NULL)	1202	if (t->name)
1270	{	1203	{
1271	for (i = 0; i < depth; i++)	1204	for (i = 0; i < depth; i++)
1272	fprintf (logfile, " ");	1205	fprintf (logfile, " ");
		1206
1273	fprintf (logfile, "{ (list: %s)\n", &t->name);	1207	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1208
1274	tl = find_treasurelist (t->name);	1209	tl = treasurelist::find (t->name);
1275	if (tl)	1210	if (tl)
1276	dump_monster_treasure_rec (name, tl->items, depth + 2);	1211	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1212
1277	for (i = 0; i < depth; i++)	1213	for (i = 0; i < depth; i++)
1278	fprintf (logfile, " ");	1214	fprintf (logfile, " ");
		1215
1279	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1216	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1280	}	1217	}
1281	else	1218	else
1282	{	1219	{
1283	for (i = 0; i < depth; i++)	1220	for (i = 0; i < depth; i++)
1284	fprintf (logfile, " ");	1221	fprintf (logfile, " ");
		1222
1285	if (t->item->clone.type == FLESH)	1223	if (t->item && t->item->type == FLESH)
1286	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1224	fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1287	else	1225	else
1288	fprintf (logfile, "%s\n", &t->item->clone.name);	1226	fprintf (logfile, "%s\n", &t->item->object::name);
1289	}	1227	}
		1228
1290	if (t->next_yes != NULL)	1229	if (t->next_yes)
1291	{	1230	{
1292	for (i = 0; i < depth; i++)	1231	for (i = 0; i < depth; i++)
1293	fprintf (logfile, " ");	1232	fprintf (logfile, " ");
		1233
1294	fprintf (logfile, " (if yes)\n");	1234	fprintf (logfile, " (if yes)\n");
1295	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1235	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1296	}	1236	}
		1237
1297	if (t->next_no != NULL)	1238	if (t->next_no)
1298	{	1239	{
1299	for (i = 0; i < depth; i++)	1240	for (i = 0; i < depth; i++)
1300	fprintf (logfile, " ");	1241	fprintf (logfile, " ");
		1242
1301	fprintf (logfile, " (if no)\n");	1243	fprintf (logfile, " (if no)\n");
1302	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1244	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1303	}	1245	}
		1246
1304	t = t->next;	1247	t = t->next;
1305	}	1248	}
1306	}	1249	}
1307		1250
1308	/*	1251	/*
1309	* For debugging purposes. Dumps all treasures for a given monster.	1252	* For debugging purposes. Dumps all treasures for a given monster.
1310	* Created originally by Raphael Quinet for debugging the alchemy code.	1253	* Created originally by Raphael Quinet for debugging the alchemy code.
1311	*/	1254	*/
1312
1313	void	1255	void
1314	dump_monster_treasure (const char *name)	1256	dump_monster_treasure (const char *name)
1315	{	1257	{
1316	archetype *at;	1258	archetype *at;
1317	int found;	1259	int found;
1318		1260
1319	found = 0;	1261	found = 0;
1320	fprintf (logfile, "\n");	1262	fprintf (logfile, "\n");
1321	for (at = first_archetype; at != NULL; at = at->next)	1263
		1264	for_all_archetypes (at)
1322	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)	1265	if (!strcasecmp (at->object::name, name) && at->title == NULL)
1323	{	1266	{
1324	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);	1267	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1325	if (at->clone.randomitems != NULL)	1268	if (at->randomitems != NULL)
1326	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);	1269	dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1327	else	1270	else
1328	fprintf (logfile, "(nothing)\n");	1271	fprintf (logfile, "(nothing)\n");
		1272
1329	fprintf (logfile, "\n");	1273	fprintf (logfile, "\n");
1330	found++;	1274	found++;
1331	}	1275	}
		1276
1332	if (found == 0)	1277	if (found == 0)
1333	fprintf (logfile, "No objects have the name %s!\n\n", name);	1278	fprintf (logfile, "No objects have the name %s!\n\n", name);
1334	}	1279	}
1335		1280
1336	/*	1281	/*
1337	* Builds up the lists of artifacts from the file in the libdir.	1282	* Builds up the lists of artifacts from the file in the libdir.
1338	*/	1283	*/
1339
1340	void	1284	void
1341	init_artifacts (void)	1285	init_artifacts (void)
1342	{	1286	{
1343	static int has_been_inited = 0;	1287	static int has_been_inited = 0;
1344	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;	1288	char filename[MAX_BUF];
1345	artifact *art = NULL;	1289	artifact *art = NULL;
1346	linked_char *tmp;
1347	int value;
1348	artifactlist *al;	1290	artifactlist *al;
1349		1291
1350	if (has_been_inited)	1292	if (has_been_inited)
1351	return;	1293	return;
1352	else	1294	else
1353	has_been_inited = 1;	1295	has_been_inited = 1;
1354		1296
1355	sprintf (filename, "%s/artifacts", settings.datadir);	1297	sprintf (filename, "%s/artifacts", settings.datadir);
1356	object_thawer thawer (filename);	1298	object_thawer f (filename);
1357		1299
1358	if (!thawer)	1300	if (!f)
1359	return;	1301	return;
1360		1302
1361	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1303	for (;;)
1362	{	1304	{
1363	if (*buf == '#')	1305	switch (f.kw)
1364	continue;
1365	if ((cp = strchr (buf, '\n')) != NULL)
1366	*cp = '\0';
1367	cp = buf;
1368	while (*cp == ' ') /* Skip blanks */
1369	cp++;
1370	if (*cp == '\0')
1371	continue;
1372
1373	if (!strncmp (cp, "Allowed", 7))
1374	{	1306	{
		1307	case KW_allowed:
1375	if (art == NULL)	1308	if (!art)
		1309	art = get_empty_artifact ();
		1310
1376	{	1311	{
1377	art = get_empty_artifact ();	1312	if (!strcmp (f.get_str (), "all"))
1378	nrofartifacts++;	1313	break;
		1314
		1315	char *next, *cp = f.get_str ();
		1316
		1317	do
		1318	{
		1319	if ((next = strchr (cp, ',')))
		1320	*next++ = '\0';
		1321
		1322	linked_char *tmp = new linked_char;
		1323
		1324	tmp->name = cp;
		1325	tmp->next = art->allowed;
		1326	art->allowed = tmp;
		1327	}
		1328	while ((cp = next));
1379	}	1329	}
1380	cp = strchr (cp, ' ') + 1;	1330	break;
1381	if (!strcmp (cp, "all"))	1331
		1332	case KW_chance:
		1333	f.get (art->chance);
		1334	break;
		1335
		1336	case KW_difficulty:
		1337	f.get (art->difficulty);
		1338	break;
		1339
		1340	case KW_object:
		1341	{
		1342	art->item = object::create ();
		1343	f.get (art->item->name);
		1344	f.next ();
		1345
		1346	if (!art->item->parse_kv (f))
		1347	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1348
		1349	al = find_artifactlist (art->item->type);
		1350
		1351	if (!al)
		1352	{
		1353	al = get_empty_artifactlist ();
		1354	al->type = art->item->type;
		1355	al->next = first_artifactlist;
		1356	first_artifactlist = al;
		1357	}
		1358
		1359	art->next = al->items;
		1360	al->items = art;
		1361	art = 0;
		1362	}
1382	continue;	1363	continue;
1383		1364
1384	do	1365	case KW_EOF:
		1366	goto done;
		1367
		1368	default:
		1369	if (!f.parse_error ("artifacts file"))
		1370	cleanup ("artifacts file required");
1385	{	1371	break;
1386	nrofallowedstr++;
1387	if ((next = strchr (cp, ',')) != NULL)
1388	*(next++) = '\0';
1389	tmp = new linked_char;
1390
1391	tmp->name = cp;
1392	tmp->next = art->allowed;
1393	art->allowed = tmp;
1394	}
1395	while ((cp = next) != NULL);
1396	}
1397	else if (sscanf (cp, "chance %d", &value))
1398	art->chance = (uint16) value;
1399	else if (sscanf (cp, "difficulty %d", &value))
1400	art->difficulty = (uint8) value;
1401	else if (!strncmp (cp, "Object", 6))
1402	{	1372	}
1403	art->item = object::create ();
1404		1373
1405	if (!load_object (thawer, art->item, 0))	1374	f.next ();
1406	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1407
1408	art->item->name = strchr (cp, ' ') + 1;
1409	al = find_artifactlist (art->item->type);
1410	if (al == NULL)
1411	{
1412	al = get_empty_artifactlist ();
1413	al->type = art->item->type;
1414	al->next = first_artifactlist;
1415	first_artifactlist = al;
1416	}
1417	art->next = al->items;
1418	al->items = art;
1419	art = NULL;
1420	}
1421	else
1422	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1423	}	1375	}
1424		1376
		1377	done:
1425	for (al = first_artifactlist; al != NULL; al = al->next)	1378	for (al = first_artifactlist; al; al = al->next)
1426	{	1379	{
		1380	al->total_chance = 0;
		1381
1427	for (art = al->items; art != NULL; art = art->next)	1382	for (art = al->items; art; art = art->next)
1428	{	1383	{
1429	if (!art->chance)	1384	if (!art->chance)
1430	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1385	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1431	else	1386	else
1432	al->total_chance += art->chance;	1387	al->total_chance += art->chance;
…		…
1437	}	1392	}
1438		1393
1439	LOG (llevDebug, "done.\n");	1394	LOG (llevDebug, "done.\n");
1440	}	1395	}
1441		1396
1442
1443	/*	1397	/*
1444	* Used in artifact generation. The bonuses of the first object	1398	* Used in artifact generation. The bonuses of the first object
1445	* is modified by the bonuses of the second object.	1399	* is modified by the bonuses of the second object.
1446	*/	1400	*/
1447
1448	void	1401	void
1449	add_abilities (object *op, object *change)	1402	add_abilities (object *op, object *change)
1450	{	1403	{
1451	int i, tmp;	1404	int i, tmp;
1452		1405
1453	if (change->face != blank_face)	1406	if (change->face != blank_face)
1454	{	1407	{
1455	#ifdef TREASURE_VERBOSE	1408	#ifdef TREASURE_VERBOSE
1456	LOG (llevDebug, "FACE: %d\n", change->face->number);	1409	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1457	#endif	1410	#endif
1458	op->face = change->face;	1411	op->face = change->face;
1459	}	1412	}
1460		1413
1461	for (i = 0; i < NUM_STATS; i++)	1414	for (i = 0; i < NUM_STATS; i++)
1462	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1415	change_attr_value (&(op->stats), i, change->stats.stat (i));
1463		1416
1464	op->attacktype |= change->attacktype;	1417	op->attacktype |= change->attacktype;
1465	op->path_attuned |= change->path_attuned;	1418	op->path_attuned |= change->path_attuned;
1466	op->path_repelled |= change->path_repelled;	1419	op->path_repelled |= change->path_repelled;
1467	op->path_denied |= change->path_denied;	1420	op->path_denied |= change->path_denied;
…		…
1501		1454
1502	op->set_speed (op->speed);	1455	op->set_speed (op->speed);
1503	}	1456	}
1504		1457
1505	if (change->nrof)	1458	if (change->nrof)
1506	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1459	op->nrof = rndm (change->nrof) + 1;
1507		1460
1508	op->stats.exp += change->stats.exp; /* Speed modifier */	1461	op->stats.exp += change->stats.exp; /* Speed modifier */
1509	op->stats.wc += change->stats.wc;	1462	op->stats.wc += change->stats.wc;
1510	op->stats.ac += change->stats.ac;	1463	op->stats.ac += change->stats.ac;
1511		1464
…		…
1614	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1567	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1615	}	1568	}
1616		1569
1617	op->value *= change->value;	1570	op->value *= change->value;
1618		1571
1619	if (change->material)	1572	if (change->materials)
1620	op->material = change->material;	1573	op->materials = change->materials;
1621		1574
1622	if (change->materialname)	1575	if (change->materialname)
1623	op->materialname = change->materialname;	1576	op->materialname = change->materialname;
1624		1577
1625	if (change->slaying)	1578	if (change->slaying)
…		…
1631	if (change->msg)	1584	if (change->msg)
1632	op->msg = change->msg;	1585	op->msg = change->msg;
1633	}	1586	}
1634		1587
1635	static int	1588	static int
1636	legal_artifact_combination (object *op, artifact * art)	1589	legal_artifact_combination (object *op, artifact *art)
1637	{	1590	{
1638	int neg, success = 0;	1591	int neg, success = 0;
1639	linked_char *tmp;	1592	linked_char *tmp;
1640	const char *name;	1593	const char *name;
1641		1594
1642	if (art->allowed == (linked_char *) NULL)	1595	if (!art->allowed)
1643	return 1; /* Ie, "all" */	1596	return 1; /* Ie, "all" */
		1597
1644	for (tmp = art->allowed; tmp; tmp = tmp->next)	1598	for (tmp = art->allowed; tmp; tmp = tmp->next)
1645	{	1599	{
1646	#ifdef TREASURE_VERBOSE	1600	#ifdef TREASURE_VERBOSE
1647	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1601	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1648	#endif	1602	#endif
1649	if (*tmp->name == '!')	1603	if (*tmp->name == '!')
1650	name = tmp->name + 1, neg = 1;	1604	name = tmp->name + 1, neg = 1;
1651	else	1605	else
1652	name = tmp->name, neg = 0;	1606	name = tmp->name, neg = 0;
1653		1607
1654	/* If we match name, then return the opposite of 'neg' */	1608	/* If we match name, then return the opposite of 'neg' */
1655	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1609	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1656	return !neg;	1610	return !neg;
1657		1611
1658	/* Set success as true, since if the match was an inverse, it means	1612	/* Set success as true, since if the match was an inverse, it means
1659	* everything is allowed except what we match	1613	* everything is allowed except what we match
1660	*/	1614	*/
1661	else if (neg)	1615	else if (neg)
1662	success = 1;	1616	success = 1;
1663	}	1617	}
		1618
1664	return success;	1619	return success;
1665	}	1620	}
1666		1621
1667	/*	1622	/*
1668	* Fixes the given object, giving it the abilities and titles	1623	* Fixes the given object, giving it the abilities and titles
…		…
1719	return;	1674	return;
1720	}	1675	}
1721		1676
1722	for (i = 0; i < ARTIFACT_TRIES; i++)	1677	for (i = 0; i < ARTIFACT_TRIES; i++)
1723	{	1678	{
1724	int roll = RANDOM () % al->total_chance;	1679	int roll = rndm (al->total_chance);
1725		1680
1726	for (art = al->items; art != NULL; art = art->next)	1681	for (art = al->items; art; art = art->next)
1727	{	1682	{
1728	roll -= art->chance;	1683	roll -= art->chance;
1729	if (roll < 0)	1684	if (roll < 0)
1730	break;	1685	break;
1731	}	1686	}
…		…
1747	continue;	1702	continue;
1748		1703
1749	if (!legal_artifact_combination (op, art))	1704	if (!legal_artifact_combination (op, art))
1750	{	1705	{
1751	#ifdef TREASURE_VERBOSE	1706	#ifdef TREASURE_VERBOSE
1752	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1707	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1753	#endif	1708	#endif
1754	continue;	1709	continue;
1755	}	1710	}
		1711
1756	give_artifact_abilities (op, art->item);	1712	give_artifact_abilities (op, art->item);
1757	return;	1713	return;
1758	}	1714	}
1759	}	1715	}
1760		1716
…		…
1804	SET_FLAG (item, FLAG_NO_STEAL);	1760	SET_FLAG (item, FLAG_NO_STEAL);
1805	}	1761	}
1806	}	1762	}
1807		1763
1808	/* special_potion() - so that old potion code is still done right. */	1764	/* special_potion() - so that old potion code is still done right. */
1809
1810	int	1765	int
1811	special_potion (object *op)	1766	special_potion (object *op)
1812	{	1767	{
1813
1814	int i;
1815
1816	if (op->attacktype)	1768	if (op->attacktype)
1817	return 1;	1769	return 1;
1818		1770
1819	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)	1771	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;	1772	return 1;
1821		1773
1822	for (i = 0; i < NROFATTACKS; i++)	1774	for (int i = 0; i < NROFATTACKS; i++)
1823	if (op->resist[i])	1775	if (op->resist[i])
1824	return 1;	1776	return 1;
1825		1777
1826	return 0;	1778	return 0;
1827	}	1779	}
1828		1780
1829	void	1781	void
1830	free_treasurestruct (treasure *t)	1782	free_treasurestruct (treasure *t)
1831	{	1783	{
1832	if (t->next)
1833	free_treasurestruct (t->next);	1784	if (t->next) free_treasurestruct (t->next);
1834	if (t->next_yes)
1835	free_treasurestruct (t->next_yes);	1785	if (t->next_yes) free_treasurestruct (t->next_yes);
1836	if (t->next_no)
1837	free_treasurestruct (t->next_no);	1786	if (t->next_no) free_treasurestruct (t->next_no);
1838		1787
1839	delete t;	1788	delete t;
1840	}	1789	}
1841		1790
1842	void	1791	void
…		…
1847		1796
1848	delete lc;	1797	delete lc;
1849	}	1798	}
1850		1799
1851	void	1800	void
1852	free_artifact (artifact * at)	1801	free_artifact (artifact *at)
1853	{	1802	{
1854	if (at->next)
1855	free_artifact (at->next);	1803	if (at->next) free_artifact (at->next);
1856
1857	if (at->allowed)
1858	free_charlinks (at->allowed);	1804	if (at->allowed) free_charlinks (at->allowed);
1859		1805
1860	at->item->destroy (1);	1806	at->item->destroy (1);
1861		1807
1862	delete at;	1808	sfree (at);
1863	}	1809	}
1864		1810
1865	void	1811	void
1866	free_artifactlist (artifactlist * al)	1812	free_artifactlist (artifactlist *al)
1867	{	1813	{
1868	artifactlist *nextal;	1814	artifactlist *nextal;
1869		1815
1870	for (al = first_artifactlist; al; al = nextal)	1816	for (al = first_artifactlist; al; al = nextal)
1871	{	1817	{
1872	nextal = al->next;	1818	nextal = al->next;
1873		1819
1874	if (al->items)	1820	if (al->items)
1875	free_artifact (al->items);	1821	free_artifact (al->items);
1876		1822
1877	free (al);	1823	sfree (al);
1878	}	1824	}
1879	}	1825	}
1880		1826
1881	void	1827	void
1882	free_all_treasures (void)	1828	free_all_treasures (void)
1883	{	1829	{
1884	treasurelist *tl, *next;	1830	treasurelist *tl, *next;
1885		1831
1886
1887	for (tl = first_treasurelist; tl != NULL; tl = next)	1832	for (tl = first_treasurelist; tl; tl = next)
1888	{	1833	{
		1834	clear (tl);
		1835
1889	next = tl->next;	1836	next = tl->next;
1890	if (tl->items)
1891	free_treasurestruct (tl->items);
1892	delete tl;	1837	delete tl;
1893	}	1838	}
		1839
1894	free_artifactlist (first_artifactlist);	1840	free_artifactlist (first_artifactlist);
1895	}	1841	}

Diff Legend

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