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.7 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC

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

Diff Legend

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