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

Diff Legend

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