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

Diff Legend

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