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.10 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.73 by root, Sun Apr 20 05:24:55 2008 UTC

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

Diff Legend

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