[ViewVC] Diff of: cvs/deliantra/server/common/treasure.C

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.29 by root, Tue Dec 26 20:04:09 2006 UTC vs. Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.29 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC