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.25 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.116 by root, Mon Oct 29 23:55:52 2012 UTC

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

Diff Legend

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