ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.13 by root, Tue Sep 5 17:58:11 2006 UTC vs.
Revision 1.47 by root, Tue Apr 17 18:24:30 2007 UTC

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

Diff Legend

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