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.81 by root, Mon Sep 29 10:31:32 2008 UTC

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

Diff Legend

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