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

Diff Legend

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