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

Diff Legend

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