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.19 by root, Thu Sep 14 22:34:00 2006 UTC vs.
Revision 1.73 by root, Sun Apr 20 05:24:55 2008 UTC

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

Diff Legend

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