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

Diff Legend

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