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.30 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.87 by sf-marcmagus, Thu Oct 15 16:00:37 2009 UTC

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

Diff Legend

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