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

Diff Legend

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