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.13 by root, Tue Sep 5 17:58:11 2006 UTC vs.
Revision 1.88 by root, Fri Nov 6 12:27:05 2009 UTC

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

Diff Legend

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