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.12 by root, Mon Sep 4 13:55:54 2006 UTC vs.
Revision 1.64 by root, Sun Jul 1 05:00:18 2007 UTC

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

Diff Legend

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