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.20 by root, Tue Sep 26 17:19:38 2006 UTC vs.
Revision 1.64 by root, Sun Jul 1 05:00:18 2007 UTC

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

Diff Legend

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