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.10 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC

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

Diff Legend

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