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

Diff Legend

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