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

Diff Legend

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