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.26 by elmex, Thu Dec 14 00:08:52 2006 UTC vs.
Revision 1.66 by root, Wed Sep 12 11:10:10 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT 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 at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <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_every (10);
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,
…		…
280	* being generated.	224	* being generated.
281	* If flag is GT_INVISIBLE, only invisible objects are generated (ie, only	225	* If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
282	* abilities. This is used by summon spells, thus no summoned monsters	226	* abilities. This is used by summon spells, thus no summoned monsters
283	* start with equipment, but only their abilities).	227	* start with equipment, but only their abilities).
284	*/	228	*/
285
286
287	static void	229	static void
288	put_treasure (object *op, object *creator, int flags)	230	put_treasure (object *op, object *creator, int flags)
289	{	231	{
290	object *tmp;	232	if (flags & GT_ENVIRONMENT)
291		233	{
292	/* 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
293	* 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
294	* 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
295	* by another object.	237	* by another object.
296	*/	238	*/
297	if (flags & GT_ENVIRONMENT && op->type != SPELL)	239	//TODO: flag such as objects... as such (no drop, anybody?)
298	{	240	if (op->type == SPELL)
299	op->x = creator->x;	241	{
300	op->y = creator->y;	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	{
301	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	252	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
302	insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON);	253	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
		254	}
303	}	255	}
304	else	256	else
305	{	257	{
306	op = insert_ob_in_ob (op, creator);	258	op = creator->insert (op);
		259
307	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	260	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
308	monster_check_apply (creator, op);	261	monster_check_apply (creator, op);
309	if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL)	262
		263	if (flags & GT_UPDATE_INV)
		264	if (object *tmp = creator->in_player ())
310	esrv_send_item (tmp, op);	265	esrv_send_item (tmp, op);
311	}	266	}
312	}	267	}
313		268
314	/* 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
315	* in the generated object	270	* in the generated object
…		…
329		284
330	if (t->change_arch.slaying)	285	if (t->change_arch.slaying)
331	op->slaying = t->change_arch.slaying;	286	op->slaying = t->change_arch.slaying;
332	}	287	}
333		288
334	void	289	static void
335	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)
336	{	291	{
337	object *tmp;
338
339	if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance)	292	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
340	{	293	{
341	if (t->name)	294	if (t->name)
342	{	295	{
343	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)))
344	{	305	{
345	treasurelist *tl = find_treasurelist (t->name);
346	if (tl)
347	create_treasure (tl, op, flag, difficulty, tries);
348	}
349	}
350	else
351	{
352	if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))
353	{
354	tmp = arch_to_object (t->item);	306	object *tmp = arch_to_object (t->item);
		307
355	if (t->nrof && tmp->nrof <= 1)	308	if (t->nrof && tmp->nrof <= 1)
356	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	309	tmp->nrof = rndm (t->nrof) + 1;
		310
357	fix_generated_item (tmp, op, difficulty, t->magic, flag);	311	fix_generated_item (tmp, op, difficulty, t->magic, flag);
358	change_treasure (t, tmp);	312	change_treasure (t, tmp);
359	put_treasure (tmp, op, flag);	313	put_treasure (tmp, op, flag);
360	}	314	}
361	}	315	}
362		316
363	if (t->next_yes != NULL)	317	if (t->next_yes)
364	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	318	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
365	}	319	}
366	else if (t->next_no != NULL)	320	else if (t->next_no)
367	create_all_treasures (t->next_no, op, flag, difficulty, tries);	321	create_all_treasures (t->next_no, op, flag, difficulty, tries);
368		322
369	if (t->next != NULL)	323	if (t->next)
370	create_all_treasures (t->next, op, flag, difficulty, tries);	324	create_all_treasures (t->next, op, flag, difficulty, tries);
371	}	325	}
372		326
373	void	327	static void
374	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)
375	{	329	{
376	int value = RANDOM () % tl->total_chance;	330	int value = rndm (tl->total_chance);
377	treasure *t;	331	treasure *t;
378		332
379	if (tries++ > 100)	333	if (tries++ > 100)
380	{	334	{
381	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");
382	return;	336	return;
383	}	337	}
384		338
385	for (t = tl->items; t != NULL; t = t->next)	339	for (t = tl->items; t; t = t->next)
386	{	340	{
387	value -= t->chance;	341	value -= t->chance;
388		342
389	if (value < 0)	343	if (value < 0)
390	break;	344	break;
391	}	345	}
392		346
393	if (!t || value >= 0)	347	if (!t || value >= 0)
394	{
395	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);
396	abort ();
397	return;
398	}
399		349
400	if (t->name)	350	if (t->name)
401	{	351	{
402	if (!strcmp (t->name, "NONE"))
403	return;
404
405	if (difficulty >= t->magic)	352	if (difficulty >= t->magic)
406	{	353	{
407	treasurelist *tl = find_treasurelist (t->name);	354	treasurelist *tl = treasurelist::find (t->name);
408	if (tl)	355	if (tl)
409	create_treasure (tl, op, flag, difficulty, tries);	356	create_treasure (tl, op, flag, difficulty, tries);
410	}	357	}
411	else if (t->nrof)	358	else if (t->nrof)
412	create_one_treasure (tl, op, flag, difficulty, tries);	359	create_one_treasure (tl, op, flag, difficulty, tries);
413
414	return;
415	}	360	}
416
417	if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE)	361	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
418	{	362	{
419	object *tmp = arch_to_object (t->item);	363	if (object *tmp = arch_to_object (t->item))
420		364	{
421	if (!tmp)
422	return;
423
424	if (t->nrof && tmp->nrof <= 1)	365	if (t->nrof && tmp->nrof <= 1)
425	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	366	tmp->nrof = rndm (t->nrof) + 1;
426		367
427	fix_generated_item (tmp, op, difficulty, t->magic, flag);	368	fix_generated_item (tmp, op, difficulty, t->magic, flag);
428	change_treasure (t, tmp);	369	change_treasure (t, tmp);
429	put_treasure (tmp, op, flag);	370	put_treasure (tmp, op, flag);
		371	}
430	}	372	}
		373	}
		374
		375	void
		376	object::create_treasure (treasurelist *tl, int flags)
		377	{
		378	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
431	}	379	}
432		380
433	/* This calls the appropriate treasure creation function. tries is passed	381	/* This calls the appropriate treasure creation function. tries is passed
434	* to determine how many list transitions or attempts to create treasure	382	* to determine how many list transitions or attempts to create treasure
435	* 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
436	* list transitions, or so that excessively good treasure will not be	384	* list transitions, or so that excessively good treasure will not be
437	* 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
438	* to do that.	386	* to do that.
439	*/	387	*/
440	void	388	void
441	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)
442	{	390	{
		391	// empty treasurelists are legal
		392	if (!tl->items)
		393	return;
443		394
444	if (tries++ > 100)	395	if (tries++ > 100)
445	{	396	{
446	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	397	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
447	return;	398	return;
448	}	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
449	if (t->total_chance)	410	if (tl->total_chance)
450	create_one_treasure (t, op, flag, difficulty, tries);	411	create_one_treasure (tl, op, flag, difficulty, tries);
451	else	412	else
452	create_all_treasures (t->items, op, flag, difficulty, tries);	413	create_all_treasures (tl->items, op, flag, difficulty, tries);
453	}	414	}
454		415
455	/* This is similar to the old generate treasure function. However,	416	/* This is similar to the old generate treasure function. However,
456	* 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
457	* create_treasure. We create a dummy object that the treasure gets	418	* create_treasure. We create a dummy object that the treasure gets
458	* inserted into, and then return that treausre	419	* inserted into, and then return that treausre
459	*/	420	*/
460	object *	421	object *
461	generate_treasure (treasurelist *t, int difficulty)	422	generate_treasure (treasurelist *tl, int difficulty)
462	{	423	{
463	difficulty = clamp (difficulty, 1, settings.max_level);	424	difficulty = clamp (difficulty, 1, settings.max_level);
464		425
465	object *ob = object::create (), *tmp;	426	object *ob = object::create ();
466		427
467	create_treasure (t, ob, 0, difficulty, 0);	428	create_treasure (tl, ob, 0, difficulty, 0);
468		429
469	/* 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 */
470	tmp = ob->inv;	431	object *tmp = ob->inv;
471	if (tmp != NULL)	432	if (tmp)
472	tmp->remove ();	433	tmp->remove ();
473		434
474	if (ob->inv)	435	if (ob->inv)
475	LOG (llevError, "In generate treasure, created multiple objects.\n");	436	LOG (llevError, "In generate treasure, created multiple objects.\n");
476		437
…		…
484	* 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
485	* magical bonus "wanted".	446	* magical bonus "wanted".
486	*/	447	*/
487		448
488	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	449	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
489
490	/*chance of magic difficulty*/	450	// chance of magic difficulty
491
492	/* +0 +1 +2 +3 +4 */	451	// +0 +1 +2 +3 +4
493	{95, 2, 2, 1, 0}, /*1 */	452	{95, 2, 2, 1, 0}, // 1
494	{92, 5, 2, 1, 0}, /*2 */	453	{92, 5, 2, 1, 0}, // 2
495	{85, 10, 4, 1, 0}, /*3 */	454	{85, 10, 4, 1, 0}, // 3
496	{80, 14, 4, 2, 0}, /*4 */	455	{80, 14, 4, 2, 0}, // 4
497	{75, 17, 5, 2, 1}, /*5 */	456	{75, 17, 5, 2, 1}, // 5
498	{70, 18, 8, 3, 1}, /*6 */	457	{70, 18, 8, 3, 1}, // 6
499	{65, 21, 10, 3, 1}, /*7 */	458	{65, 21, 10, 3, 1}, // 7
500	{60, 22, 12, 4, 2}, /*8 */	459	{60, 22, 12, 4, 2}, // 8
501	{55, 25, 14, 4, 2}, /*9 */	460	{55, 25, 14, 4, 2}, // 9
502	{50, 27, 16, 5, 2}, /*10 */	461	{50, 27, 16, 5, 2}, // 10
503	{45, 28, 18, 6, 3}, /*11 */	462	{45, 28, 18, 6, 3}, // 11
504	{42, 28, 20, 7, 3}, /*12 */	463	{42, 28, 20, 7, 3}, // 12
505	{40, 27, 21, 8, 4}, /*13 */	464	{40, 27, 21, 8, 4}, // 13
506	{38, 25, 22, 10, 5}, /*14 */	465	{38, 25, 22, 10, 5}, // 14
507	{36, 23, 23, 12, 6}, /*15 */	466	{36, 23, 23, 12, 6}, // 15
508	{33, 21, 24, 14, 8}, /*16 */	467	{33, 21, 24, 14, 8}, // 16
509	{31, 19, 25, 16, 9}, /*17 */	468	{31, 19, 25, 16, 9}, // 17
510	{27, 15, 30, 18, 10}, /*18 */	469	{27, 15, 30, 18, 10}, // 18
511	{20, 12, 30, 25, 13}, /*19 */	470	{20, 12, 30, 25, 13}, // 19
512	{15, 10, 28, 30, 17}, /*20 */	471	{15, 10, 28, 30, 17}, // 20
513	{13, 9, 27, 28, 23}, /*21 */	472	{13, 9, 27, 28, 23}, // 21
514	{10, 8, 25, 28, 29}, /*22 */	473	{10, 8, 25, 28, 29}, // 22
515	{8, 7, 23, 26, 36}, /*23 */	474	{ 8, 7, 23, 26, 36}, // 23
516	{6, 6, 20, 22, 46}, /*24 */	475	{ 6, 6, 20, 22, 46}, // 24
517	{4, 5, 17, 18, 56}, /*25 */	476	{ 4, 5, 17, 18, 56}, // 25
518	{2, 4, 12, 14, 68}, /*26 */	477	{ 2, 4, 12, 14, 68}, // 26
519	{0, 3, 7, 10, 80}, /*27 */	478	{ 0, 3, 7, 10, 80}, // 27
520	{0, 0, 3, 7, 90}, /*28 */	479	{ 0, 0, 3, 7, 90}, // 28
521	{0, 0, 0, 3, 97}, /*29 */	480	{ 0, 0, 0, 3, 97}, // 29
522	{0, 0, 0, 0, 100}, /*30 */	481	{ 0, 0, 0, 0, 100}, // 30
523	{0, 0, 0, 0, 100}, /*31 */	482	{ 0, 0, 0, 0, 100}, // 31
524	};	483	};
525
526		484
527	/* calculate the appropriate level for wands staves and scrolls.	485	/* calculate the appropriate level for wands staves and scrolls.
528	* 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)
529	*	487	*
530	* elmex Wed Aug 9 17:44:59 CEST 2006:	488	* elmex Wed Aug 9 17:44:59 CEST 2006:
531	* 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.
532	*/	490	*/
533
534	int	491	int
535	level_for_item (const object *op, int difficulty)	492	level_for_item (const object *op, int difficulty)
536	{	493	{
537	int olevel = 0;	494	int olevel = 0;
538		495
…		…
561	* elmex Thu Aug 10 18:45:44 CEST 2006:	518	* elmex Thu Aug 10 18:45:44 CEST 2006:
562	* Scaling difficulty by max_level, as difficulty is a level and not some	519	* Scaling difficulty by max_level, as difficulty is a level and not some
563	* weird integer between 1-31.	520	* weird integer between 1-31.
564	*	521	*
565	*/	522	*/
566
567	int	523	int
568	magic_from_difficulty (int difficulty)	524	magic_from_difficulty (int difficulty)
569	{	525	{
570	int percent = 0, magic = 0;	526	int percent = 0, magic = 0;
571	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	527	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
576	scaled_diff = 0;	532	scaled_diff = 0;
577		533
578	if (scaled_diff >= DIFFLEVELS)	534	if (scaled_diff >= DIFFLEVELS)
579	scaled_diff = DIFFLEVELS - 1;	535	scaled_diff = DIFFLEVELS - 1;
580		536
581	percent = RANDOM () % 100;	537	percent = rndm (100);
582		538
583	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	539	for (magic = 0; magic < (MAXMAGIC + 1); magic++)
584	{	540	{
585	percent -= difftomagic_list[scaled_diff][magic];	541	percent -= difftomagic_list[scaled_diff][magic];
586		542
…		…
592	{	548	{
593	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	549	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
594	magic = 0;	550	magic = 0;
595	}	551	}
596		552
597	magic = (RANDOM () % 3) ? magic : -magic;	553	magic = (rndm (3)) ? magic : -magic;
598	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	554	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
599		555
600	return magic;	556	return magic;
601	}	557	}
602		558
…		…
615		571
616	op->magic = magic;	572	op->magic = magic;
617	if (op->arch)	573	if (op->arch)
618	{	574	{
619	if (op->type == ARMOUR)	575	if (op->type == ARMOUR)
620	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	576	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
621		577
622	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	578	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
623	magic = (-magic);	579	magic = (-magic);
624	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	580	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
625	}	581	}
626	else	582	else
627	{	583	{
628	if (op->type == ARMOUR)	584	if (op->type == ARMOUR)
629	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	585	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
630	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	586	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
631	magic = (-magic);	587	magic = (-magic);
632	op->weight = (op->weight * (100 - magic * 10)) / 100;	588	op->weight = (op->weight * (100 - magic * 10)) / 100;
633	}	589	}
634	}	590	}
635		591
…		…
659	* 1) Since rings can have multiple bonuses, if the same bonus	615	* 1) Since rings can have multiple bonuses, if the same bonus
660	* is rolled again, increase it - the bonuses now stack with	616	* is rolled again, increase it - the bonuses now stack with
661	* other bonuses previously rolled and ones the item might natively have.	617	* other bonuses previously rolled and ones the item might natively have.
662	* 2) Add code to deal with new PR method.	618	* 2) Add code to deal with new PR method.
663	*/	619	*/
664
665	void	620	void
666	set_ring_bonus (object *op, int bonus)	621	set_ring_bonus (object *op, int bonus)
667	{	622	{
668		623
669	int r = RANDOM () % (bonus > 0 ? 25 : 11);	624	int r = rndm (bonus > 0 ? 25 : 11);
670		625
671	if (op->type == AMULET)	626	if (op->type == AMULET)
672	{	627	{
673	if (!(RANDOM () % 21))	628	if (!(rndm (21)))
674	r = 20 + RANDOM () % 2;	629	r = 20 + rndm (2);
675	else	630	else
676	{	631	{
677	if (RANDOM () & 2)	632	if (rndm (2))
678	r = 10;	633	r = 10;
679	else	634	else
680	r = 11 + RANDOM () % 9;	635	r = 11 + rndm (9);
681	}	636	}
682	}	637	}
683		638
684	switch (r)	639	switch (r)
685	{	640	{
…		…
692	case 2:	647	case 2:
693	case 3:	648	case 3:
694	case 4:	649	case 4:
695	case 5:	650	case 5:
696	case 6:	651	case 6:
697	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	652	op->stats.stat (r) += bonus;
698	break;	653	break;
699		654
700	case 7:	655	case 7:
701	op->stats.dam += bonus;	656	op->stats.dam += bonus;
702	break;	657	break;
…		…
722	case 16:	677	case 16:
723	case 17:	678	case 17:
724	case 18:	679	case 18:
725	case 19:	680	case 19:
726	{	681	{
727	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	682	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
728		683
729	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	684	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
730	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	685	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
731		686
732	/* Cursed items need to have higher negative values to equal out with	687	/* Cursed items need to have higher negative values to equal out with
733	* positive values for how protections work out. Put another	688	* positive values for how protections work out. Put another
734	* little random element in since that they don't always end up with	689	* little random element in since that they don't always end up with
735	* even values.	690	* even values.
736	*/	691	*/
737	if (bonus < 0)	692	if (bonus < 0)
738	val = 2 * -val - RANDOM () % b;	693	val = 2 * -val - rndm (b);
739	if (val > 35)	694	if (val > 35)
740	val = 35; /* Upper limit */	695	val = 35; /* Upper limit */
741	b = 0;	696	b = 0;
		697
742	while (op->resist[resist_table[resist]] != 0 && b < 4)	698	while (op->resist[resist_table[resist]] != 0 && b < 4)
743	{
744	resist = RANDOM () % num_resist_table;	699	resist = rndm (num_resist_table);
745	}	700
746	if (b == 4)	701	if (b == 4)
747	return; /* Not able to find a free resistance */	702	return; /* Not able to find a free resistance */
		703
748	op->resist[resist_table[resist]] = val;	704	op->resist[resist_table[resist]] = val;
749	/* We should probably do something more clever here to adjust value	705	/* We should probably do something more clever here to adjust value
750	* based on how good a resistance we gave.	706	* based on how good a resistance we gave.
751	*/	707	*/
752	break;	708	break;
…		…
780	case 22:	736	case 22:
781	op->stats.exp += bonus; /* Speed! */	737	op->stats.exp += bonus; /* Speed! */
782	op->value = (op->value * 2) / 3;	738	op->value = (op->value * 2) / 3;
783	break;	739	break;
784	}	740	}
		741
785	if (bonus > 0)	742	if (bonus > 0)
786	op->value *= 2 * bonus;	743	op->value *= 2 * bonus;
787	else	744	else
788	op->value = -(op->value * 2 * bonus) / 3;	745	op->value = -(op->value * 2 * bonus) / 3;
789	}	746	}
…		…
794	* higher is the chance of returning a low number.	751	* higher is the chance of returning a low number.
795	* It is only used in fix_generated_treasure() to set bonuses on	752	* It is only used in fix_generated_treasure() to set bonuses on
796	* rings and amulets.	753	* rings and amulets.
797	* Another scheme is used to calculate the magic of weapons and armours.	754	* Another scheme is used to calculate the magic of weapons and armours.
798	*/	755	*/
799
800	int	756	int
801	get_magic (int diff)	757	get_magic (int diff)
802	{	758	{
803	int i;	759	int i;
804		760
805	if (diff < 3)	761	if (diff < 3)
806	diff = 3;	762	diff = 3;
		763
807	for (i = 0; i < 4; i++)	764	for (i = 0; i < 4; i++)
808	if (RANDOM () % diff)	765	if (rndm (diff))
809	return i;	766	return i;
		767
810	return 4;	768	return 4;
811	}	769	}
812		770
813	#define DICE2 (get_magic(2)==2?2:1)	771	#define DICE2 (get_magic(2)==2?2:1)
814	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	772	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
815		773
816	/*	774	/*
817	* fix_generated_item(): This is called after an item is generated, in	775	* fix_generated_item(): This is called after an item is generated, in
818	* order to set it up right. This produced magical bonuses, puts spells	776	* order to set it up right. This produced magical bonuses, puts spells
819	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	777	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
833	* value.	791	* value.
834	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	792	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
835	* a working object - don't change magic, value, etc, but set it material	793	* a working object - don't change magic, value, etc, but set it material
836	* type as appropriate, for objects that need spell objects, set those, etc	794	* type as appropriate, for objects that need spell objects, set those, etc
837	*/	795	*/
838
839	void	796	void
840	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)	797	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
841	{	798	{
842	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	799	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
843		800
…		…
848	save_item_power = op->item_power;	805	save_item_power = op->item_power;
849	op->item_power = 0;	806	op->item_power = 0;
850		807
851	if (op->randomitems && op->type != SPELL)	808	if (op->randomitems && op->type != SPELL)
852	{	809	{
853	create_treasure (op->randomitems, op, flags, difficulty, 0);	810	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
854	if (!op->inv)
855	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
856
857	/* So the treasure doesn't get created again */	811	/* So the treasure doesn't get created again */
858	op->randomitems = NULL;	812	op->randomitems = 0;
859	}	813	}
860		814
861	if (difficulty < 1)	815	if (difficulty < 1)
862	difficulty = 1;	816	difficulty = 1;
863		817
…		…
880	if (!op->magic && max_magic)	834	if (!op->magic && max_magic)
881	set_magic (difficulty, op, max_magic, flags);	835	set_magic (difficulty, op, max_magic, flags);
882		836
883	num_enchantments = calc_item_power (op, 1);	837	num_enchantments = calc_item_power (op, 1);
884		838
885	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact,	839	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
		840	|| op->type == HORN
		841	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,
886	* used for shop_floors or treasures */	842	* used for shop_floors or treasures */
887	generate_artifact (op, difficulty);	843	generate_artifact (op, difficulty);
888	}	844	}
889		845
890	/* Object was made an artifact. Calculate its item_power rating.	846	/* Object was made an artifact. Calculate its item_power rating.
…		…
948	case WEAPON:	904	case WEAPON:
949	case ARMOUR:	905	case ARMOUR:
950	case SHIELD:	906	case SHIELD:
951	case HELMET:	907	case HELMET:
952	case CLOAK:	908	case CLOAK:
953	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	909	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
954	set_ring_bonus (op, -DICE2);	910	set_ring_bonus (op, -DICE2);
955	break;	911	break;
956		912
957	case BRACERS:	913	case BRACERS:
958	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	914	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
959	{	915	{
960	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	916	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
961	if (!QUERY_FLAG (op, FLAG_CURSED))	917	if (!QUERY_FLAG (op, FLAG_CURSED))
962	op->value *= 3;	918	op->value *= 3;
963	}	919	}
…		…
989	*/	945	*/
990	if (op->inv && op->randomitems)	946	if (op->inv && op->randomitems)
991	{	947	{
992	/* value multiplier is same as for scrolls */	948	/* value multiplier is same as for scrolls */
993	op->value = (op->value * op->inv->value);	949	op->value = (op->value * op->inv->value);
994	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	950	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
995	}	951	}
996	else	952	else
997	{	953	{
998	op->name = "potion";	954	op->name = "potion";
999	op->name_pl = "potions";	955	op->name_pl = "potions";
1000	}	956	}
1001		957
1002	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	958	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1003	SET_FLAG (op, FLAG_CURSED);	959	SET_FLAG (op, FLAG_CURSED);
1004	break;	960	break;
1005	}	961	}
1006		962
1007	case AMULET:	963	case AMULET:
…		…
1017	}	973	}
1018		974
1019	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	975	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1020	break;	976	break;
1021		977
1022	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	978	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1023	SET_FLAG (op, FLAG_CURSED);	979	SET_FLAG (op, FLAG_CURSED);
1024		980
1025	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	981	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1026		982
1027	if (op->type != RING) /* Amulets have only one ability */	983	if (op->type != RING) /* Amulets have only one ability */
1028	break;	984	break;
1029		985
1030	if (!(RANDOM () % 4))	986	if (!(rndm (4)))
1031	{	987	{
1032	int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	988	int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1033		989
1034	if (d > 0)	990	if (d > 0)
1035	op->value *= 3;	991	op->value *= 3;
1036		992
1037	set_ring_bonus (op, d);	993	set_ring_bonus (op, d);
1038		994
1039	if (!(RANDOM () % 4))	995	if (!(rndm (4)))
1040	{	996	{
1041	int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	997	int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1042		998
1043	if (d > 0)	999	if (d > 0)
1044	op->value *= 5;	1000	op->value *= 5;
1045	set_ring_bonus (op, d);	1001	set_ring_bonus (op, d);
1046	}	1002	}
1047	}	1003	}
1048		1004
1049	if (GET_ANIM_ID (op))	1005	if (GET_ANIM_ID (op))
1050	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	1006	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1051		1007
1052	break;	1008	break;
1053		1009
1054	case BOOK:	1010	case BOOK:
1055	/* Is it an empty book?, if yes lets make a special·	1011	/* Is it an empty book?, if yes lets make a special·
1056	* msg for it, and tailor its properties based on the·	1012	* msg for it, and tailor its properties based on the·
1057	* creator and/or map level we found it on.	1013	* creator and/or map level we found it on.
1058	*/	1014	*/
1059	if (!op->msg && RANDOM () % 10)	1015	if (!op->msg && rndm (10))
1060	{	1016	{
1061	/* set the book level properly */	1017	/* set the book level properly */
1062	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))	1018	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1063	{	1019	{
1064	if (op->map && op->map->difficulty)	1020	if (op->map && op->map->difficulty)
1065	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1021	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1066	else	1022	else
1067	op->level = RANDOM () % 20 + 1;	1023	op->level = rndm (20) + 1;
1068	}	1024	}
1069	else	1025	else
1070	op->level = RANDOM () % creator->level;	1026	op->level = rndm (creator->level);
1071		1027
1072	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);
1073	/* books w/ info are worth more! */	1029	/* books w/ info are worth more! */
1074	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));
1075	/* creator related stuff */	1031	/* creator related stuff */
…		…
1174	*/	1130	*/
1175		1131
1176	/*	1132	/*
1177	* Allocate and return the pointer to an empty artifactlist structure.	1133	* Allocate and return the pointer to an empty artifactlist structure.
1178	*/	1134	*/
1179
1180	static artifactlist *	1135	static artifactlist *
1181	get_empty_artifactlist (void)	1136	get_empty_artifactlist (void)
1182	{	1137	{
1183	artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist));	1138	return salloc0 <artifactlist> ();
1184
1185	if (tl == NULL)
1186	fatal (OUT_OF_MEMORY);
1187	tl->next = NULL;
1188	tl->items = NULL;
1189	tl->total_chance = 0;
1190	return tl;
1191	}	1139	}
1192		1140
1193	/*	1141	/*
1194	* Allocate and return the pointer to an empty artifact structure.	1142	* Allocate and return the pointer to an empty artifact structure.
1195	*/	1143	*/
1196
1197	static artifact *	1144	static artifact *
1198	get_empty_artifact (void)	1145	get_empty_artifact (void)
1199	{	1146	{
1200	artifact *t = (artifact *) malloc (sizeof (artifact));	1147	return salloc0 <artifact> ();
1201
1202	if (t == NULL)
1203	fatal (OUT_OF_MEMORY);
1204	t->item = NULL;
1205	t->next = NULL;
1206	t->chance = 0;
1207	t->difficulty = 0;
1208	t->allowed = NULL;
1209	return t;
1210	}	1148	}
1211		1149
1212	/*	1150	/*
1213	* 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
1214	* of objects on it.	1152	* of objects on it.
1215	*/	1153	*/
1216
1217	artifactlist *	1154	artifactlist *
1218	find_artifactlist (int type)	1155	find_artifactlist (int type)
1219	{	1156	{
1220	artifactlist *al;
1221
1222	for (al = first_artifactlist; al != NULL; al = al->next)	1157	for (artifactlist *al = first_artifactlist; al; al = al->next)
1223	if (al->type == type)	1158	if (al->type == type)
1224	return al;	1159	return al;
		1160
1225	return NULL;	1161	return 0;
1226	}	1162	}
1227		1163
1228	/*	1164	/*
1229	* For debugging purposes. Dumps all tables.	1165	* For debugging purposes. Dumps all tables.
1230	*/	1166	*/
1231
1232	void	1167	void
1233	dump_artifacts (void)	1168	dump_artifacts (void)
1234	{	1169	{
1235	artifactlist *al;	1170	artifactlist *al;
1236	artifact *art;	1171	artifact *art;
…		…
1243	for (art = al->items; art != NULL; art = art->next)	1178	for (art = al->items; art != NULL; art = art->next)
1244	{	1179	{
1245	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);	1180	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246	if (art->allowed != NULL)	1181	if (art->allowed != NULL)
1247	{	1182	{
1248	fprintf (logfile, "\tAllowed combinations:");	1183	fprintf (logfile, "\tallowed combinations:");
1249	for (next = art->allowed; next != NULL; next = next->next)	1184	for (next = art->allowed; next != NULL; next = next->next)
1250	fprintf (logfile, "%s,", &next->name);	1185	fprintf (logfile, "%s,", &next->name);
1251	fprintf (logfile, "\n");	1186	fprintf (logfile, "\n");
1252	}	1187	}
1253	}	1188	}
…		…
1264	treasurelist *tl;	1199	treasurelist *tl;
1265	int i;	1200	int i;
1266		1201
1267	if (depth > 100)	1202	if (depth > 100)
1268	return;	1203	return;
1269	while (t != NULL)	1204
		1205	while (t)
1270	{	1206	{
1271	if (t->name != NULL)	1207	if (t->name)
1272	{	1208	{
1273	for (i = 0; i < depth; i++)	1209	for (i = 0; i < depth; i++)
1274	fprintf (logfile, " ");	1210	fprintf (logfile, " ");
		1211
1275	fprintf (logfile, "{ (list: %s)\n", &t->name);	1212	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1213
1276	tl = find_treasurelist (t->name);	1214	tl = treasurelist::find (t->name);
1277	if (tl)	1215	if (tl)
1278	dump_monster_treasure_rec (name, tl->items, depth + 2);	1216	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1217
1279	for (i = 0; i < depth; i++)	1218	for (i = 0; i < depth; i++)
1280	fprintf (logfile, " ");	1219	fprintf (logfile, " ");
		1220
1281	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1221	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282	}	1222	}
1283	else	1223	else
1284	{	1224	{
1285	for (i = 0; i < depth; i++)	1225	for (i = 0; i < depth; i++)
1286	fprintf (logfile, " ");	1226	fprintf (logfile, " ");
		1227
1287	if (t->item->clone.type == FLESH)	1228	if (t->item && t->item->type == FLESH)
1288	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1229	fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1289	else	1230	else
1290	fprintf (logfile, "%s\n", &t->item->clone.name);	1231	fprintf (logfile, "%s\n", &t->item->object::name);
1291	}	1232	}
		1233
1292	if (t->next_yes != NULL)	1234	if (t->next_yes)
1293	{	1235	{
1294	for (i = 0; i < depth; i++)	1236	for (i = 0; i < depth; i++)
1295	fprintf (logfile, " ");	1237	fprintf (logfile, " ");
		1238
1296	fprintf (logfile, " (if yes)\n");	1239	fprintf (logfile, " (if yes)\n");
1297	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1240	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1298	}	1241	}
		1242
1299	if (t->next_no != NULL)	1243	if (t->next_no)
1300	{	1244	{
1301	for (i = 0; i < depth; i++)	1245	for (i = 0; i < depth; i++)
1302	fprintf (logfile, " ");	1246	fprintf (logfile, " ");
		1247
1303	fprintf (logfile, " (if no)\n");	1248	fprintf (logfile, " (if no)\n");
1304	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1249	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1305	}	1250	}
		1251
1306	t = t->next;	1252	t = t->next;
1307	}	1253	}
1308	}	1254	}
1309		1255
1310	/*	1256	/*
1311	* For debugging purposes. Dumps all treasures for a given monster.	1257	* For debugging purposes. Dumps all treasures for a given monster.
1312	* Created originally by Raphael Quinet for debugging the alchemy code.	1258	* Created originally by Raphael Quinet for debugging the alchemy code.
1313	*/	1259	*/
1314
1315	void	1260	void
1316	dump_monster_treasure (const char *name)	1261	dump_monster_treasure (const char *name)
1317	{	1262	{
1318	archetype *at;	1263	archetype *at;
1319	int found;	1264	int found;
1320		1265
1321	found = 0;	1266	found = 0;
1322	fprintf (logfile, "\n");	1267	fprintf (logfile, "\n");
1323	for (at = first_archetype; at != NULL; at = at->next)	1268
		1269	for_all_archetypes (at)
1324	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)	1270	if (!strcasecmp (at->object::name, name) && at->title == NULL)
1325	{	1271	{
1326	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);	1272	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1327	if (at->clone.randomitems != NULL)	1273	if (at->randomitems != NULL)
1328	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);	1274	dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1329	else	1275	else
1330	fprintf (logfile, "(nothing)\n");	1276	fprintf (logfile, "(nothing)\n");
		1277
1331	fprintf (logfile, "\n");	1278	fprintf (logfile, "\n");
1332	found++;	1279	found++;
1333	}	1280	}
		1281
1334	if (found == 0)	1282	if (found == 0)
1335	fprintf (logfile, "No objects have the name %s!\n\n", name);	1283	fprintf (logfile, "No objects have the name %s!\n\n", name);
1336	}	1284	}
1337		1285
1338	/*	1286	/*
1339	* Builds up the lists of artifacts from the file in the libdir.	1287	* Builds up the lists of artifacts from the file in the libdir.
1340	*/	1288	*/
1341
1342	void	1289	void
1343	init_artifacts (void)	1290	init_artifacts (void)
1344	{	1291	{
1345	static int has_been_inited = 0;	1292	static int has_been_inited = 0;
1346	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;	1293	char filename[MAX_BUF];
1347	artifact *art = NULL;	1294	artifact *art = NULL;
1348	linked_char *tmp;
1349	int value;
1350	artifactlist *al;	1295	artifactlist *al;
1351		1296
1352	if (has_been_inited)	1297	if (has_been_inited)
1353	return;	1298	return;
1354	else	1299	else
1355	has_been_inited = 1;	1300	has_been_inited = 1;
1356		1301
1357	sprintf (filename, "%s/artifacts", settings.datadir);	1302	sprintf (filename, "%s/artifacts", settings.datadir);
1358	object_thawer thawer (filename);	1303	object_thawer f (filename);
1359		1304
1360	if (!thawer)	1305	if (!f)
1361	return;	1306	return;
1362		1307
1363	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1308	for (;;)
1364	{	1309	{
1365	if (*buf == '#')	1310	switch (f.kw)
1366	continue;
1367	if ((cp = strchr (buf, '\n')) != NULL)
1368	*cp = '\0';
1369	cp = buf;
1370	while (*cp == ' ') /* Skip blanks */
1371	cp++;
1372	if (*cp == '\0')
1373	continue;
1374
1375	if (!strncmp (cp, "Allowed", 7))
1376	{	1311	{
		1312	case KW_allowed:
1377	if (art == NULL)	1313	if (!art)
		1314	art = get_empty_artifact ();
		1315
1378	{	1316	{
1379	art = get_empty_artifact ();	1317	if (!strcmp (f.get_str (), "all"))
1380	nrofartifacts++;	1318	break;
		1319
		1320	char *next, *cp = f.get_str ();
		1321
		1322	do
		1323	{
		1324	if ((next = strchr (cp, ',')))
		1325	*next++ = '\0';
		1326
		1327	linked_char *tmp = new linked_char;
		1328
		1329	tmp->name = cp;
		1330	tmp->next = art->allowed;
		1331	art->allowed = tmp;
		1332	}
		1333	while ((cp = next));
1381	}	1334	}
1382	cp = strchr (cp, ' ') + 1;	1335	break;
1383	if (!strcmp (cp, "all"))	1336
		1337	case KW_chance:
		1338	f.get (art->chance);
		1339	break;
		1340
		1341	case KW_difficulty:
		1342	f.get (art->difficulty);
		1343	break;
		1344
		1345	case KW_object:
		1346	{
		1347	art->item = object::create ();
		1348	f.get (art->item->name);
		1349	f.next ();
		1350
		1351	if (!art->item->parse_kv (f))
		1352	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1353
		1354	al = find_artifactlist (art->item->type);
		1355
		1356	if (!al)
		1357	{
		1358	al = get_empty_artifactlist ();
		1359	al->type = art->item->type;
		1360	al->next = first_artifactlist;
		1361	first_artifactlist = al;
		1362	}
		1363
		1364	art->next = al->items;
		1365	al->items = art;
		1366	art = 0;
		1367	}
1384	continue;	1368	continue;
1385		1369
1386	do	1370	case KW_EOF:
		1371	goto done;
		1372
		1373	default:
		1374	if (!f.parse_error ("artifacts file"))
		1375	cleanup ("artifacts file required");
1387	{	1376	break;
1388	nrofallowedstr++;
1389	if ((next = strchr (cp, ',')) != NULL)
1390	*(next++) = '\0';
1391	tmp = new linked_char;
1392
1393	tmp->name = cp;
1394	tmp->next = art->allowed;
1395	art->allowed = tmp;
1396	}
1397	while ((cp = next) != NULL);
1398	}
1399	else if (sscanf (cp, "chance %d", &value))
1400	art->chance = (uint16) value;
1401	else if (sscanf (cp, "difficulty %d", &value))
1402	art->difficulty = (uint8) value;
1403	else if (!strncmp (cp, "Object", 6))
1404	{	1377	}
1405	art->item = object::create ();
1406		1378
1407	if (!load_object (thawer, art->item, 0))	1379	f.next ();
1408	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1409
1410	art->item->name = strchr (cp, ' ') + 1;
1411	al = find_artifactlist (art->item->type);
1412	if (al == NULL)
1413	{
1414	al = get_empty_artifactlist ();
1415	al->type = art->item->type;
1416	al->next = first_artifactlist;
1417	first_artifactlist = al;
1418	}
1419	art->next = al->items;
1420	al->items = art;
1421	art = NULL;
1422	}
1423	else
1424	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1425	}	1380	}
1426		1381
		1382	done:
1427	for (al = first_artifactlist; al != NULL; al = al->next)	1383	for (al = first_artifactlist; al; al = al->next)
1428	{	1384	{
		1385	al->total_chance = 0;
		1386
1429	for (art = al->items; art != NULL; art = art->next)	1387	for (art = al->items; art; art = art->next)
1430	{	1388	{
1431	if (!art->chance)	1389	if (!art->chance)
1432	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1390	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1433	else	1391	else
1434	al->total_chance += art->chance;	1392	al->total_chance += art->chance;
…		…
1439	}	1397	}
1440		1398
1441	LOG (llevDebug, "done.\n");	1399	LOG (llevDebug, "done.\n");
1442	}	1400	}
1443		1401
1444
1445	/*	1402	/*
1446	* Used in artifact generation. The bonuses of the first object	1403	* Used in artifact generation. The bonuses of the first object
1447	* is modified by the bonuses of the second object.	1404	* is modified by the bonuses of the second object.
1448	*/	1405	*/
1449
1450	void	1406	void
1451	add_abilities (object *op, object *change)	1407	add_abilities (object *op, object *change)
1452	{	1408	{
1453	int i, tmp;	1409	int i, tmp;
1454		1410
1455	if (change->face != blank_face)	1411	if (change->face != blank_face)
1456	{	1412	{
1457	#ifdef TREASURE_VERBOSE	1413	#ifdef TREASURE_VERBOSE
1458	LOG (llevDebug, "FACE: %d\n", change->face->number);	1414	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1459	#endif	1415	#endif
1460	op->face = change->face;	1416	op->face = change->face;
1461	}	1417	}
1462		1418
1463	for (i = 0; i < NUM_STATS; i++)	1419	for (i = 0; i < NUM_STATS; i++)
1464	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1420	change_attr_value (&(op->stats), i, change->stats.stat (i));
1465		1421
1466	op->attacktype |= change->attacktype;	1422	op->attacktype |= change->attacktype;
1467	op->path_attuned |= change->path_attuned;	1423	op->path_attuned |= change->path_attuned;
1468	op->path_repelled |= change->path_repelled;	1424	op->path_repelled |= change->path_repelled;
1469	op->path_denied |= change->path_denied;	1425	op->path_denied |= change->path_denied;
…		…
1499	CLEAR_FLAG (op, FLAG_ANIMATE);	1455	CLEAR_FLAG (op, FLAG_ANIMATE);
1500	/* so artifacts will join */	1456	/* so artifacts will join */
1501	if (!QUERY_FLAG (op, FLAG_ALIVE))	1457	if (!QUERY_FLAG (op, FLAG_ALIVE))
1502	op->speed = 0.0;	1458	op->speed = 0.0;
1503		1459
1504	update_ob_speed (op);	1460	op->set_speed (op->speed);
1505	}	1461	}
1506		1462
1507	if (change->nrof)	1463	if (change->nrof)
1508	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1464	op->nrof = rndm (change->nrof) + 1;
1509		1465
1510	op->stats.exp += change->stats.exp; /* Speed modifier */	1466	op->stats.exp += change->stats.exp; /* Speed modifier */
1511	op->stats.wc += change->stats.wc;	1467	op->stats.wc += change->stats.wc;
1512	op->stats.ac += change->stats.ac;	1468	op->stats.ac += change->stats.ac;
1513		1469
…		…
1616	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1572	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1617	}	1573	}
1618		1574
1619	op->value *= change->value;	1575	op->value *= change->value;
1620		1576
1621	if (change->material)	1577	if (change->materials)
1622	op->material = change->material;	1578	op->materials = change->materials;
1623		1579
1624	if (change->materialname)	1580	if (change->materialname)
1625	op->materialname = change->materialname;	1581	op->materialname = change->materialname;
1626		1582
1627	if (change->slaying)	1583	if (change->slaying)
…		…
1633	if (change->msg)	1589	if (change->msg)
1634	op->msg = change->msg;	1590	op->msg = change->msg;
1635	}	1591	}
1636		1592
1637	static int	1593	static int
1638	legal_artifact_combination (object *op, artifact * art)	1594	legal_artifact_combination (object *op, artifact *art)
1639	{	1595	{
1640	int neg, success = 0;	1596	int neg, success = 0;
1641	linked_char *tmp;	1597	linked_char *tmp;
1642	const char *name;	1598	const char *name;
1643		1599
1644	if (art->allowed == (linked_char *) NULL)	1600	if (!art->allowed)
1645	return 1; /* Ie, "all" */	1601	return 1; /* Ie, "all" */
		1602
1646	for (tmp = art->allowed; tmp; tmp = tmp->next)	1603	for (tmp = art->allowed; tmp; tmp = tmp->next)
1647	{	1604	{
1648	#ifdef TREASURE_VERBOSE	1605	#ifdef TREASURE_VERBOSE
1649	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1606	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1650	#endif	1607	#endif
1651	if (*tmp->name == '!')	1608	if (*tmp->name == '!')
1652	name = tmp->name + 1, neg = 1;	1609	name = tmp->name + 1, neg = 1;
1653	else	1610	else
1654	name = tmp->name, neg = 0;	1611	name = tmp->name, neg = 0;
1655		1612
1656	/* If we match name, then return the opposite of 'neg' */	1613	/* If we match name, then return the opposite of 'neg' */
1657	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1614	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1658	return !neg;	1615	return !neg;
1659		1616
1660	/* Set success as true, since if the match was an inverse, it means	1617	/* Set success as true, since if the match was an inverse, it means
1661	* everything is allowed except what we match	1618	* everything is allowed except what we match
1662	*/	1619	*/
1663	else if (neg)	1620	else if (neg)
1664	success = 1;	1621	success = 1;
1665	}	1622	}
		1623
1666	return success;	1624	return success;
1667	}	1625	}
1668		1626
1669	/*	1627	/*
1670	* Fixes the given object, giving it the abilities and titles	1628	* Fixes the given object, giving it the abilities and titles
…		…
1721	return;	1679	return;
1722	}	1680	}
1723		1681
1724	for (i = 0; i < ARTIFACT_TRIES; i++)	1682	for (i = 0; i < ARTIFACT_TRIES; i++)
1725	{	1683	{
1726	int roll = RANDOM () % al->total_chance;	1684	int roll = rndm (al->total_chance);
1727		1685
1728	for (art = al->items; art != NULL; art = art->next)	1686	for (art = al->items; art; art = art->next)
1729	{	1687	{
1730	roll -= art->chance;	1688	roll -= art->chance;
1731	if (roll < 0)	1689	if (roll < 0)
1732	break;	1690	break;
1733	}	1691	}
…		…
1749	continue;	1707	continue;
1750		1708
1751	if (!legal_artifact_combination (op, art))	1709	if (!legal_artifact_combination (op, art))
1752	{	1710	{
1753	#ifdef TREASURE_VERBOSE	1711	#ifdef TREASURE_VERBOSE
1754	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1712	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1755	#endif	1713	#endif
1756	continue;	1714	continue;
1757	}	1715	}
		1716
1758	give_artifact_abilities (op, art->item);	1717	give_artifact_abilities (op, art->item);
1759	return;	1718	return;
1760	}	1719	}
1761	}	1720	}
1762		1721
…		…
1806	SET_FLAG (item, FLAG_NO_STEAL);	1765	SET_FLAG (item, FLAG_NO_STEAL);
1807	}	1766	}
1808	}	1767	}
1809		1768
1810	/* special_potion() - so that old potion code is still done right. */	1769	/* special_potion() - so that old potion code is still done right. */
1811
1812	int	1770	int
1813	special_potion (object *op)	1771	special_potion (object *op)
1814	{	1772	{
1815
1816	int i;
1817
1818	if (op->attacktype)	1773	if (op->attacktype)
1819	return 1;	1774	return 1;
1820		1775
1821	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)	1776	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1822	return 1;	1777	return 1;
1823		1778
1824	for (i = 0; i < NROFATTACKS; i++)	1779	for (int i = 0; i < NROFATTACKS; i++)
1825	if (op->resist[i])	1780	if (op->resist[i])
1826	return 1;	1781	return 1;
1827		1782
1828	return 0;	1783	return 0;
1829	}	1784	}
1830		1785
1831	void	1786	void
1832	free_treasurestruct (treasure *t)	1787	free_treasurestruct (treasure *t)
1833	{	1788	{
1834	if (t->next)
1835	free_treasurestruct (t->next);	1789	if (t->next) free_treasurestruct (t->next);
1836	if (t->next_yes)
1837	free_treasurestruct (t->next_yes);	1790	if (t->next_yes) free_treasurestruct (t->next_yes);
1838	if (t->next_no)
1839	free_treasurestruct (t->next_no);	1791	if (t->next_no) free_treasurestruct (t->next_no);
1840		1792
1841	delete t;	1793	delete t;
1842	}	1794	}
1843		1795
1844	void	1796	void
…		…
1849		1801
1850	delete lc;	1802	delete lc;
1851	}	1803	}
1852		1804
1853	void	1805	void
1854	free_artifact (artifact * at)	1806	free_artifact (artifact *at)
1855	{	1807	{
1856	if (at->next)
1857	free_artifact (at->next);	1808	if (at->next) free_artifact (at->next);
1858
1859	if (at->allowed)
1860	free_charlinks (at->allowed);	1809	if (at->allowed) free_charlinks (at->allowed);
1861		1810
1862	at->item->destroy (1);	1811	at->item->destroy (1);
1863		1812
1864	delete at;	1813	sfree (at);
1865	}	1814	}
1866		1815
1867	void	1816	void
1868	free_artifactlist (artifactlist * al)	1817	free_artifactlist (artifactlist *al)
1869	{	1818	{
1870	artifactlist *nextal;	1819	artifactlist *nextal;
1871		1820
1872	for (al = first_artifactlist; al; al = nextal)	1821	for (al = first_artifactlist; al; al = nextal)
1873	{	1822	{
1874	nextal = al->next;	1823	nextal = al->next;
1875		1824
1876	if (al->items)	1825	if (al->items)
1877	free_artifact (al->items);	1826	free_artifact (al->items);
1878		1827
1879	free (al);	1828	sfree (al);
1880	}	1829	}
1881	}	1830	}
1882		1831
1883	void	1832	void
1884	free_all_treasures (void)	1833	free_all_treasures (void)
1885	{	1834	{
1886	treasurelist *tl, *next;	1835	treasurelist *tl, *next;
1887		1836
1888
1889	for (tl = first_treasurelist; tl != NULL; tl = next)	1837	for (tl = first_treasurelist; tl; tl = next)
1890	{	1838	{
		1839	clear (tl);
		1840
1891	next = tl->next;	1841	next = tl->next;
1892	if (tl->items)
1893	free_treasurestruct (tl->items);
1894	delete tl;	1842	delete tl;
1895	}	1843	}
		1844
1896	free_artifactlist (first_artifactlist);	1845	free_artifactlist (first_artifactlist);
1897	}	1846	}

Diff Legend

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