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

Diff Legend

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