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

Diff Legend

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