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.11 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.54 by root, Sat Apr 21 17:34:23 2007 UTC

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

Diff Legend

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