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.35 by root, Sat Jan 27 02:19:36 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* 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
9	* 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
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* 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
19	* 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
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* 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>
23	*/	23	*/
24
25	#define ALLOWED_COMBINATION
26		24
27	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28	* 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
29	* 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
30	* left on	28	* left on
31	*/	29	*/
32	#define TREASURE_DEBUG	30	#define TREASURE_DEBUG
33		31
34	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	32	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35		33
36	/* #define TREASURE_VERBOSE */	34	//#define TREASURE_VERBOSE
37		35
38	#include <global.h>	36	#include <global.h>
39	#include <treasure.h>	37	#include <treasure.h>
40	#include <funcpoint.h>
41	#include <loader.h>	38	#include <loader.h>
42		39
		40	extern char *spell_mapping[];
		41
		42	static treasurelist *first_treasurelist;
43		43
44	static void change_treasure (treasure *t, object *op); /* overrule default values */	44	static void change_treasure (treasure *t, object *op); /* overrule default values */
45	extern char *spell_mapping[];
46		45
47	/*	46	typedef std::tr1::unordered_map<
48	* Initialize global archtype pointers:	47	const char *,
49	*/	48	treasurelist *,
		49	str_hash,
		50	str_equal,
		51	slice_allocator< std::pair<const char *const, treasurelist *> >
		52	> tl_map_t;
50		53
51	void	54	static tl_map_t tl_map;
52	init_archetype_pointers ()
53	{
54	int prev_warn = warn_archetypes;
55		55
56	warn_archetypes = 1;	56	//TODO: class method
57	if (ring_arch == NULL)	57	static void
58	ring_arch = archetype::find ("ring");	58	clear (treasurelist *tl)
59	if (amulet_arch == NULL)	59	{
60	amulet_arch = archetype::find ("amulet");	60	void free_treasurestruct (treasure *t);
61	if (staff_arch == NULL)
62	staff_arch = archetype::find ("staff");
63	if (crown_arch == NULL)
64	crown_arch = archetype::find ("crown");
65	warn_archetypes = prev_warn;
66	}
67		61
68	/*	62	if (tl->items)
69	* Allocate and return the pointer to an empty treasurelist structure.	63	{
70	*/	64	free_treasurestruct (tl->items);
		65	tl->items = 0;
		66	}
71		67
		68	tl->total_chance = 0;
		69	}
		70
		71	/*
		72	* Searches for the given treasurelist
		73	*/
72	static treasurelist *	74	treasurelist *
73	get_empty_treasurelist (void)	75	treasurelist::find (const char *name)
74	{	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	{
75	return new treasurelist;	99	tl = new treasurelist;
76	}
77		100
78	/*	101	tl->name = name;
79	* Allocate and return the pointer to an empty treasure structure.	102	tl->next = first_treasurelist;
80	*/	103	first_treasurelist = tl;
81	//TODO: make this a constructor
82	static treasure *
83	get_empty_treasure (void)
84	{
85	treasure *t = new treasure;
86		104
87	t->chance = 100;	105	tl_map.insert (std::make_pair (tl->name, tl));
		106	}
88		107
89	return t;	108	return tl;
90	}	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
91		131
92	/*	132	/*
93	* Reads the lib/treasure file from disk, and parses the contents	133	* Reads the lib/treasure file from disk, and parses the contents
94	* into an internal treasure structure (very linked lists)	134	* into an internal treasure structure (very linked lists)
95	*/	135	*/
96
97	static treasure *	136	static treasure *
98	load_treasure (FILE * fp, int *line)	137	read_treasure (object_thawer &f)
99	{	138	{
100	char buf[MAX_BUF], *cp, variable[MAX_BUF];
101	treasure *t = get_empty_treasure ();	139	treasure *t = new treasure;
102	int value;
103		140
104	nroftreasures++;	141	f.next ();
105	while (fgets (buf, MAX_BUF, fp) != NULL)
106	{
107	(*line)++;
108		142
109	if (*buf == '#')	143	for (;;)
110	continue;	144	{
111	if ((cp = strchr (buf, '\n')) != NULL)	145	coroapi::cede_to_tick ();
112	*cp = '\0';
113	cp = buf;
114	while (isspace (*cp)) /* Skip blanks */
115	cp++;
116		146
117	if (sscanf (cp, "arch %s", variable))	147	switch (f.kw)
118	{
119	if ((t->item = archetype::find (variable)) == NULL)
120	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121	}	148	{
122	else if (sscanf (cp, "list %s", variable))	149	case KW_arch:
123	t->name = variable;	150	t->item = archetype::find (f.get_str ());
124	else if (sscanf (cp, "change_name %s", variable))	151
125	t->change_arch.name = variable;	152	if (!t->item)
126	else if (sscanf (cp, "change_title %s", variable))
127	t->change_arch.title = variable;
128	else if (sscanf (cp, "change_slaying %s", variable))
129	t->change_arch.slaying = variable;
130	else if (sscanf (cp, "chance %d", &value))
131	t->chance = (uint8) value;
132	else if (sscanf (cp, "nrof %d", &value))
133	t->nrof = (uint16) value;
134	else if (sscanf (cp, "magic %d", &value))
135	t->magic = (uint8) value;
136	else if (!strcmp (cp, "yes"))
137	t->next_yes = load_treasure (fp, line);
138	else if (!strcmp (cp, "no"))
139	t->next_no = load_treasure (fp, line);
140	else if (!strcmp (cp, "end"))
141	return t;
142	else if (!strcmp (cp, "more"))
143	{	153	{
144	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 ();
145	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;
146	}	184	}
147	else	185
148	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);	186	f.next ();
149	}	187	}
150	LOG (llevError, "treasure lacks 'end'.\n");	188
		189	// not reached
		190
		191	error:
		192	delete t;
151	return t;	193	return 0;
152	}	194	}
153		195
154	#ifdef TREASURE_DEBUG
155
156	/* recursived checks the linked list. Treasurelist is passed only
157	* so that the treasure name can be printed out
158	*/
159	static void
160	check_treasurelist (const treasure *t, const treasurelist * tl)
161	{
162	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
163	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
164	/* find_treasurelist will print out its own error message */
165	if (t->name && *t->name)
166	find_treasurelist (t->name);
167	if (t->next)
168	check_treasurelist (t->next, tl);
169	if (t->next_yes)
170	check_treasurelist (t->next_yes, tl);
171	if (t->next_no)
172	check_treasurelist (t->next_no, tl);
173	}
174	#endif
175
176	/*	196	/*
177	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
178	* Each treasure is parsed with the help of load_treasure().	197	* Each treasure is parsed with the help of load_treasure().
179	*/	198	*/
180		199	treasurelist *
181	void	200	treasurelist::read (object_thawer &f)
182	load_treasures (void)
183	{	201	{
184	FILE *fp;	202	assert (f.kw == KW_treasure || f.kw == KW_treasureone);
185	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186	treasurelist *previous = NULL;
187	treasure *t;
188	int comp, line = 0;
189		203
190	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	204	bool one = f.kw == KW_treasureone;
191	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	205	treasurelist *tl = treasurelist::get (f.get_str ());
192	{	206	clear (tl);
193	LOG (llevError, "Can't open treasure file.\n");	207	tl->items = read_treasure (f);
		208	if (!tl->items)
194	return;	209	return 0;
195	}
196	while (fgets (buf, MAX_BUF, fp) != NULL)
197	{
198	line++;
199	if (*buf == '#')
200	continue;
201		210
202	if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
203	{
204	treasurelist *tl = get_empty_treasurelist ();
205
206	tl->name = name;
207	if (previous == NULL)
208	first_treasurelist = tl;
209	else
210	previous->next = tl;
211	previous = tl;
212	tl->items = load_treasure (fp, &line);
213
214	/* 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.
215	* 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
216	* fields of the treasures are not being used.	213	* fields of the treasures are not being used.
217	*/	214	*/
218	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)
219	{	220	{
220	for (t = tl->items; t != NULL; t = t->next)
221	{
222	#ifdef TREASURE_DEBUG
223	if (t->next_yes || t->next_no)
224	{
225	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);
226	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");
227	}
228	#endif
229	tl->total_chance += t->chance;
230	}
231	}	223	}
232	}
233	else
234	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
235	}
236	close_and_delete (fp, comp);
237		224
238	#ifdef TREASURE_DEBUG	225	tl->total_chance += t->chance;
239	/* Perform some checks on how valid the treasure data actually is.	226	}
240	* verify that list transitions work (ie, the list that it is supposed	227	}
241	* to transition to exists). Also, verify that at least the name
242	* or archetype is set for each treasure element.
243	*/
244	for (previous = first_treasurelist; previous != NULL; previous = previous->next)
245	check_treasurelist (previous->items, previous);
246	#endif
247	}
248		228
249	/*
250	* Searches for the given treasurelist in the globally linked list
251	* of treasurelists which has been built by load_treasures().
252	*/
253
254	treasurelist *
255	find_treasurelist (const char *name)
256	{
257	shstr_cmp name_ (name);
258
259	if (!name_)
260	return 0;
261
262	for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
263	if (name_ == tl->name)
264	return tl;
265
266	if (first_treasurelist)
267	LOG (llevError, "Couldn't find treasurelist %s\n", name);
268
269	return 0;	229	return tl;
270	}	230	}
271
272		231
273	/*	232	/*
274	* Generates the objects specified by the given treasure.	233	* Generates the objects specified by the given treasure.
275	* It goes recursively through the rest of the linked list.	234	* It goes recursively through the rest of the linked list.
276	* 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,
…		…
282	* start with equipment, but only their abilities).	241	* start with equipment, but only their abilities).
283	*/	242	*/
284	static void	243	static void
285	put_treasure (object *op, object *creator, int flags)	244	put_treasure (object *op, object *creator, int flags)
286	{	245	{
287	object *tmp;	246	if (flags & GT_ENVIRONMENT)
288		247	{
289	/* 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
290	* 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
291	* 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
292	* by another object.	251	* by another object.
293	*/	252	*/
294	if (flags & GT_ENVIRONMENT && op->type != SPELL)	253	//TODO: flag such as objects... as such (no drop, anybody?)
295	{	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	{
296	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	266	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
297	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	}
298	}	269	}
299	else	270	else
300	{	271	{
301	op = creator->insert (op);	272	op = creator->insert (op);
302		273
303	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	274	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
304	monster_check_apply (creator, op);	275	monster_check_apply (creator, op);
305
306	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
307	esrv_send_item (tmp, op);
308	}	276	}
309	}	277	}
310		278
311	/* 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
312	* in the generated object	280	* in the generated object
…		…
326		294
327	if (t->change_arch.slaying)	295	if (t->change_arch.slaying)
328	op->slaying = t->change_arch.slaying;	296	op->slaying = t->change_arch.slaying;
329	}	297	}
330		298
331	void	299	static void
332	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)
333	{	301	{
334	object *tmp;
335
336	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)	302	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
337	{	303	{
338	if (t->name)	304	if (t->name)
339	{	305	{
340	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)))
341	{	315	{
342	treasurelist *tl = find_treasurelist (t->name);
343	if (tl)
344	create_treasure (tl, op, flag, difficulty, tries);
345	}
346	}
347	else
348	{
349	if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350	{
351	tmp = arch_to_object (t->item);	316	object *tmp = arch_to_object (t->item);
		317
352	if (t->nrof && tmp->nrof <= 1)	318	if (t->nrof && tmp->nrof <= 1)
353	tmp->nrof = rndm (t->nrof) + 1;	319	tmp->nrof = rndm (t->nrof) + 1;
354		320
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	321	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	322	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	323	put_treasure (tmp, op, flag);
358	}	324	}
359	}	325	}
360		326
361	if (t->next_yes != NULL)	327	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	328	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	329	}
364	else if (t->next_no != NULL)	330	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	331	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		332
367	if (t->next != NULL)	333	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	334	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	335	}
370		336
371	void	337	static void
372	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)
373	{	339	{
374	int value = rndm (tl->total_chance);	340	int value = rndm (tl->total_chance);
375	treasure *t;	341	treasure *t;
376		342
…		…
378	{	344	{
379	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");
380	return;	346	return;
381	}	347	}
382		348
383	for (t = tl->items; t != NULL; t = t->next)	349	for (t = tl->items; t; t = t->next)
384	{	350	{
385	value -= t->chance;	351	value -= t->chance;
386		352
387	if (value < 0)	353	if (value < 0)
388	break;	354	break;
389	}	355	}
390		356
391	if (!t || value >= 0)	357	if (!t || value >= 0)
392	{
393	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);
394	abort ();
395	return;
396	}
397		359
398	if (t->name)	360	if (t->name)
399	{	361	{
400	if (difficulty >= t->magic)	362	if (difficulty >= t->magic)
401	{	363	{
402	treasurelist *tl = find_treasurelist (t->name);	364	treasurelist *tl = treasurelist::find (t->name);
403	if (tl)	365	if (tl)
404	create_treasure (tl, op, flag, difficulty, tries);	366	create_treasure (tl, op, flag, difficulty, tries);
405	}	367	}
406	else if (t->nrof)	368	else if (t->nrof)
407	create_one_treasure (tl, op, flag, difficulty, tries);	369	create_one_treasure (tl, op, flag, difficulty, tries);
408
409	return;
410	}	370	}
411
412	if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))	371	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
413	{	372	{
414	object *tmp = arch_to_object (t->item);	373	if (object *tmp = arch_to_object (t->item))
415		374	{
416	if (!tmp)
417	return;
418
419	if (t->nrof && tmp->nrof <= 1)	375	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	376	tmp->nrof = rndm (t->nrof) + 1;
421		377
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	378	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	379	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	380	put_treasure (tmp, op, flag);
		381	}
425	}	382	}
		383	}
		384
		385	void
		386	object::create_treasure (treasurelist *tl, int flags)
		387	{
		388	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
426	}	389	}
427		390
428	/* This calls the appropriate treasure creation function. tries is passed	391	/* This calls the appropriate treasure creation function. tries is passed
429	* to determine how many list transitions or attempts to create treasure	392	* to determine how many list transitions or attempts to create treasure
430	* 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
…		…
433	* to do that.	396	* to do that.
434	*/	397	*/
435	void	398	void
436	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)
437	{	400	{
		401	// empty treasurelists are legal
		402	if (!tl->items)
		403	return;
438		404
439	if (tries++ > 100)	405	if (tries++ > 100)
440	{	406	{
441	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	407	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
442	return;	408	return;
443	}	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
444	if (tl->total_chance)	420	if (tl->total_chance)
445	create_one_treasure (tl, op, flag, difficulty, tries);	421	create_one_treasure (tl, op, flag, difficulty, tries);
446	else	422	else
447	create_all_treasures (tl->items, op, flag, difficulty, tries);	423	create_all_treasures (tl->items, op, flag, difficulty, tries);
448	}	424	}
…		…
455	object *	431	object *
456	generate_treasure (treasurelist *tl, int difficulty)	432	generate_treasure (treasurelist *tl, int difficulty)
457	{	433	{
458	difficulty = clamp (difficulty, 1, settings.max_level);	434	difficulty = clamp (difficulty, 1, settings.max_level);
459		435
460	object *ob = object::create (), *tmp;	436	object *ob = object::create ();
461		437
462	create_treasure (tl, ob, 0, difficulty, 0);	438	create_treasure (tl, ob, 0, difficulty, 0);
463		439
464	/* 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 */
465	tmp = ob->inv;	441	object *tmp = ob->inv;
466	if (tmp != NULL)	442	if (tmp)
467	tmp->remove ();	443	tmp->remove ();
468		444
469	if (ob->inv)	445	if (ob->inv)
470	LOG (llevError, "In generate treasure, created multiple objects.\n");	446	LOG (llevError, "In generate treasure, created multiple objects.\n");
471		447
472	ob->destroy ();	448	ob->destroy ();
		449
473	return tmp;	450	return tmp;
474	}	451	}
475		452
476	/*	453	/*
477	* 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
…		…
479	* 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
480	* magical bonus "wanted".	457	* magical bonus "wanted".
481	*/	458	*/
482		459
483	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	460	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484
485	/*chance of magic difficulty*/	461	// chance of magic difficulty
486
487	/* +0 +1 +2 +3 +4 */	462	// +0 +1 +2 +3 +4
488	{95, 2, 2, 1, 0}, /*1 */	463	{95, 2, 2, 1, 0}, // 1
489	{92, 5, 2, 1, 0}, /*2 */	464	{92, 5, 2, 1, 0}, // 2
490	{85, 10, 4, 1, 0}, /*3 */	465	{85, 10, 4, 1, 0}, // 3
491	{80, 14, 4, 2, 0}, /*4 */	466	{80, 14, 4, 2, 0}, // 4
492	{75, 17, 5, 2, 1}, /*5 */	467	{75, 17, 5, 2, 1}, // 5
493	{70, 18, 8, 3, 1}, /*6 */	468	{70, 18, 8, 3, 1}, // 6
494	{65, 21, 10, 3, 1}, /*7 */	469	{65, 21, 10, 3, 1}, // 7
495	{60, 22, 12, 4, 2}, /*8 */	470	{60, 22, 12, 4, 2}, // 8
496	{55, 25, 14, 4, 2}, /*9 */	471	{55, 25, 14, 4, 2}, // 9
497	{50, 27, 16, 5, 2}, /*10 */	472	{50, 27, 16, 5, 2}, // 10
498	{45, 28, 18, 6, 3}, /*11 */	473	{45, 28, 18, 6, 3}, // 11
499	{42, 28, 20, 7, 3}, /*12 */	474	{42, 28, 20, 7, 3}, // 12
500	{40, 27, 21, 8, 4}, /*13 */	475	{40, 27, 21, 8, 4}, // 13
501	{38, 25, 22, 10, 5}, /*14 */	476	{38, 25, 22, 10, 5}, // 14
502	{36, 23, 23, 12, 6}, /*15 */	477	{36, 23, 23, 12, 6}, // 15
503	{33, 21, 24, 14, 8}, /*16 */	478	{33, 21, 24, 14, 8}, // 16
504	{31, 19, 25, 16, 9}, /*17 */	479	{31, 19, 25, 16, 9}, // 17
505	{27, 15, 30, 18, 10}, /*18 */	480	{27, 15, 30, 18, 10}, // 18
506	{20, 12, 30, 25, 13}, /*19 */	481	{20, 12, 30, 25, 13}, // 19
507	{15, 10, 28, 30, 17}, /*20 */	482	{15, 10, 28, 30, 17}, // 20
508	{13, 9, 27, 28, 23}, /*21 */	483	{13, 9, 27, 28, 23}, // 21
509	{10, 8, 25, 28, 29}, /*22 */	484	{10, 8, 25, 28, 29}, // 22
510	{8, 7, 23, 26, 36}, /*23 */	485	{ 8, 7, 23, 26, 36}, // 23
511	{6, 6, 20, 22, 46}, /*24 */	486	{ 6, 6, 20, 22, 46}, // 24
512	{4, 5, 17, 18, 56}, /*25 */	487	{ 4, 5, 17, 18, 56}, // 25
513	{2, 4, 12, 14, 68}, /*26 */	488	{ 2, 4, 12, 14, 68}, // 26
514	{0, 3, 7, 10, 80}, /*27 */	489	{ 0, 3, 7, 10, 80}, // 27
515	{0, 0, 3, 7, 90}, /*28 */	490	{ 0, 0, 3, 7, 90}, // 28
516	{0, 0, 0, 3, 97}, /*29 */	491	{ 0, 0, 0, 3, 97}, // 29
517	{0, 0, 0, 0, 100}, /*30 */	492	{ 0, 0, 0, 0, 100}, // 30
518	{0, 0, 0, 0, 100}, /*31 */	493	{ 0, 0, 0, 0, 100}, // 31
519	};	494	};
520
521		495
522	/* calculate the appropriate level for wands staves and scrolls.	496	/* calculate the appropriate level for wands staves and scrolls.
523	* 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)
524	*	498	*
525	* elmex Wed Aug 9 17:44:59 CEST 2006:	499	* elmex Wed Aug 9 17:44:59 CEST 2006:
526	* 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.
527	*/	501	*/
528
529	int	502	int
530	level_for_item (const object *op, int difficulty)	503	level_for_item (const object *op, int difficulty)
531	{	504	{
532	int olevel = 0;
533
534	if (!op->inv)	505	if (!op->inv)
535	{	506	{
536	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);
537	return 0;	508	return 0;
538	}	509	}
539		510
540	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	511	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
541		512
542	if (olevel <= 0)	513	if (olevel <= 0)
543	olevel = rndm (1, MIN (op->inv->level, 1));	514	olevel = rndm (1, op->inv->level);
544		515
545	if (olevel > MAXLEVEL)	516	return min (olevel, MAXLEVEL);
546	olevel = MAXLEVEL;
547
548	return olevel;
549	}	517	}
550		518
551	/*	519	/*
552	* Based upon the specified difficulty and upon the difftomagic_list array,	520	* Based upon the specified difficulty and upon the difftomagic_list array,
553	* a random magical bonus is returned. This is used when determine	521	* a random magical bonus is returned. This is used when determine
…		…
556	* elmex Thu Aug 10 18:45:44 CEST 2006:	524	* elmex Thu Aug 10 18:45:44 CEST 2006:
557	* 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
558	* weird integer between 1-31.	526	* weird integer between 1-31.
559	*	527	*
560	*/	528	*/
561
562	int	529	int
563	magic_from_difficulty (int difficulty)	530	magic_from_difficulty (int difficulty)
564	{	531	{
565	int percent = 0, magic = 0;	532	int percent = 0, magic = 0;
566	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	533	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
610		577
611	op->magic = magic;	578	op->magic = magic;
612	if (op->arch)	579	if (op->arch)
613	{	580	{
614	if (op->type == ARMOUR)	581	if (op->type == ARMOUR)
615	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	582	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616		583
617	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	584	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
618	magic = (-magic);	585	magic = (-magic);
		586
619	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	587	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620	}	588	}
621	else	589	else
622	{	590	{
623	if (op->type == ARMOUR)	591	if (op->type == ARMOUR)
624	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	592	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		593
625	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	594	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
626	magic = (-magic);	595	magic = (-magic);
		596
627	op->weight = (op->weight * (100 - magic * 10)) / 100;	597	op->weight = (op->weight * (100 - magic * 10)) / 100;
628	}	598	}
629	}	599	}
630		600
631	/*	601	/*
…		…
654	* 1) Since rings can have multiple bonuses, if the same bonus	624	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	625	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	626	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	627	* 2) Add code to deal with new PR method.
658	*/	628	*/
659
660	void	629	void
661	set_ring_bonus (object *op, int bonus)	630	set_ring_bonus (object *op, int bonus)
662	{	631	{
663		632
664	int r = rndm (bonus > 0 ? 25 : 11);	633	int r = rndm (bonus > 0 ? 25 : 11);
…		…
687	case 2:	656	case 2:
688	case 3:	657	case 3:
689	case 4:	658	case 4:
690	case 5:	659	case 5:
691	case 6:	660	case 6:
692	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	661	op->stats.stat (r) += bonus;
693	break;	662	break;
694		663
695	case 7:	664	case 7:
696	op->stats.dam += bonus;	665	op->stats.dam += bonus;
697	break;	666	break;
…		…
806	return i;	775	return i;
807		776
808	return 4;	777	return 4;
809	}	778	}
810		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
811	#define DICE2 (get_magic(2)==2?2:1)	797	#define DICE2 (get_magic(2)==2?2:1)
812	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	798	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
813		799
814	/*	800	/*
815	* 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
…		…
831	* value.	817	* value.
832	* 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
833	* 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
834	* 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
835	*/	821	*/
836
837	void	822	void
838	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)
839	{	824	{
840	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;
841		826
…		…
846	save_item_power = op->item_power;	831	save_item_power = op->item_power;
847	op->item_power = 0;	832	op->item_power = 0;
848		833
849	if (op->randomitems && op->type != SPELL)	834	if (op->randomitems && op->type != SPELL)
850	{	835	{
851	create_treasure (op->randomitems, op, flags, difficulty, 0);	836	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 */	837	/* So the treasure doesn't get created again */
856	op->randomitems = NULL;	838	op->randomitems = 0;
857	}	839	}
858		840
859	if (difficulty < 1)	841	if (difficulty < 1)
860	difficulty = 1;	842	difficulty = 1;
861		843
…		…
865	ARG_INT (flags)))	847	ARG_INT (flags)))
866	return;	848	return;
867		849
868	if (!(flags & GT_MINIMAL))	850	if (!(flags & GT_MINIMAL))
869	{	851	{
870	if (op->arch == crown_arch)	852	if (IS_ARCH (op->arch, crown))
871	{	853	{
872	set_magic (difficulty, op, max_magic, flags);	854	set_magic (difficulty, op, max_magic, flags);
873	num_enchantments = calc_item_power (op, 1);	855	num_enchantments = calc_item_power (op, 1);
874	generate_artifact (op, difficulty);	856	generate_artifact (op, difficulty);
875	}	857	}
…		…
880		862
881	num_enchantments = calc_item_power (op, 1);	863	num_enchantments = calc_item_power (op, 1);
882		864
883	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	865	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
884	|| op->type == HORN	866	|| op->type == HORN
885	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	867	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
886	* used for shop_floors or treasures */
887	generate_artifact (op, difficulty);	868	generate_artifact (op, difficulty);
888	}	869	}
889		870
890	/* Object was made an artifact. Calculate its item_power rating.	871	/* Object was made an artifact. Calculate its item_power rating.
891	* the item_power in the object is what the artfiact adds.	872	* the item_power in the object is what the artfiact adds.
…		…
933	{	914	{
934	if (op->type == POTION)	915	if (op->type == POTION)
935	/* Handle healing and magic power potions */	916	/* Handle healing and magic power potions */
936	if (op->stats.sp && !op->randomitems)	917	if (op->stats.sp && !op->randomitems)
937	{	918	{
938	object *tmp;
939
940	tmp = get_archetype (spell_mapping[op->stats.sp]);	919	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
941	insert_ob_in_ob (tmp, op);	920	insert_ob_in_ob (tmp, op);
942	op->stats.sp = 0;	921	op->stats.sp = 0;
943	}	922	}
944	}	923	}
945	else if (!op->title) /* Only modify object if not special */	924	else if (!op->title) /* Only modify object if not special */
…		…
1003	SET_FLAG (op, FLAG_CURSED);	982	SET_FLAG (op, FLAG_CURSED);
1004	break;	983	break;
1005	}	984	}
1006		985
1007	case AMULET:	986	case AMULET:
1008	if (op->arch == amulet_arch)	987	if (IS_ARCH (op->arch, amulet))
1009	op->value *= 5; /* Since it's not just decoration */	988	op->value *= 5; /* Since it's not just decoration */
1010		989
1011	case RING:	990	case RING:
1012	if (op->arch == NULL)
1013	{
1014	op->destroy ();
1015	op = 0;
1016	break;
1017	}
1018
1019	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! */
1020	break;	992	break;
1021		993
1022	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	994	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1023	SET_FLAG (op, FLAG_CURSED);	995	SET_FLAG (op, FLAG_CURSED);
1024		996
…		…
1044	op->value *= 5;	1016	op->value *= 5;
1045	set_ring_bonus (op, d);	1017	set_ring_bonus (op, d);
1046	}	1018	}
1047	}	1019	}
1048		1020
1049	if (GET_ANIM_ID (op))	1021	if (op->animation_id)
1050	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1022	op->set_anim_frame (rndm (op->anim_frames ()));
1051		1023
1052	break;	1024	break;
1053		1025
1054	case BOOK:	1026	case BOOK:
1055	/* Is it an empty book?, if yes lets make a special·	1027	/* Is it an empty book?, if yes lets make a special·
…		…
1070	op->level = rndm (creator->level);	1042	op->level = rndm (creator->level);
1071		1043
1072	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);
1073	/* books w/ info are worth more! */	1045	/* books w/ info are worth more! */
1074	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));
1075	/* creator related stuff */
1076
1077	/* for library, chained books. Note that some monsters have no_pick
1078	* set - we don't want to set no pick in that case.
1079	*/
1080	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1081	SET_FLAG (op, FLAG_NO_PICK);
1082	if (creator->slaying && !op->slaying) /* for check_inv floors */
1083	op->slaying = creator->slaying;
1084		1047
1085	/* add exp so reading it gives xp (once) */	1048	/* add exp so reading it gives xp (once) */
1086	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;
1087	}	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;
1088	break;	1061	break;
1089		1062
1090	case SPELLBOOK:	1063	case SPELLBOOK:
1091	op->value = op->value * op->inv->value;	1064	op->value = op->value * op->inv->value;
1092	/* add exp so learning gives xp */	1065	/* add exp so learning gives xp */
…		…
1174	*/	1147	*/
1175		1148
1176	/*	1149	/*
1177	* Allocate and return the pointer to an empty artifactlist structure.	1150	* Allocate and return the pointer to an empty artifactlist structure.
1178	*/	1151	*/
1179
1180	static artifactlist *	1152	static artifactlist *
1181	get_empty_artifactlist (void)	1153	get_empty_artifactlist (void)
1182	{	1154	{
1183	artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist));	1155	return salloc0<artifactlist> ();
1184
1185	if (al == NULL)
1186	fatal (OUT_OF_MEMORY);
1187	al->next = NULL;
1188	al->items = NULL;
1189	al->total_chance = 0;
1190	return al;
1191	}	1156	}
1192		1157
1193	/*	1158	/*
1194	* Allocate and return the pointer to an empty artifact structure.	1159	* Allocate and return the pointer to an empty artifact structure.
1195	*/	1160	*/
1196
1197	static artifact *	1161	static artifact *
1198	get_empty_artifact (void)	1162	get_empty_artifact (void)
1199	{	1163	{
1200	artifact *a = (artifact *) malloc (sizeof (artifact));	1164	return salloc0<artifact> ();
1201
1202	if (a == NULL)
1203	fatal (OUT_OF_MEMORY);
1204	a->item = NULL;
1205	a->next = NULL;
1206	a->chance = 0;
1207	a->difficulty = 0;
1208	a->allowed = NULL;
1209	return a;
1210	}	1165	}
1211		1166
1212	/*	1167	/*
1213	* 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
1214	* of objects on it.	1169	* of objects on it.
1215	*/	1170	*/
1216
1217	artifactlist *	1171	artifactlist *
1218	find_artifactlist (int type)	1172	find_artifactlist (int type)
1219	{	1173	{
1220	artifactlist *al;
1221
1222	for (al = first_artifactlist; al != NULL; al = al->next)	1174	for (artifactlist *al = first_artifactlist; al; al = al->next)
1223	if (al->type == type)	1175	if (al->type == type)
1224	return al;	1176	return al;
1225	return NULL;
1226	}
1227		1177
1228	/*
1229	* For debugging purposes. Dumps all tables.
1230	*/
1231
1232	void
1233	dump_artifacts (void)
1234	{
1235	artifactlist *al;
1236	artifact *art;
1237	linked_char *next;
1238
1239	fprintf (logfile, "\n");
1240	for (al = first_artifactlist; al != NULL; al = al->next)
1241	{
1242	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1243	for (art = al->items; art != NULL; art = art->next)
1244	{
1245	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246	if (art->allowed != NULL)
1247	{
1248	fprintf (logfile, "\tAllowed combinations:");
1249	for (next = art->allowed; next != NULL; next = next->next)
1250	fprintf (logfile, "%s,", &next->name);
1251	fprintf (logfile, "\n");
1252	}
1253	}
1254	}
1255	fprintf (logfile, "\n");
1256	}
1257
1258	/*
1259	* For debugging purposes. Dumps all treasures recursively (see below).
1260	*/
1261	void
1262	dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1263	{
1264	treasurelist *tl;
1265	int i;
1266
1267	if (depth > 100)
1268	return;	1178	return 0;
1269	while (t)
1270	{
1271	if (t->name)
1272	{
1273	for (i = 0; i < depth; i++)
1274	fprintf (logfile, " ");
1275	fprintf (logfile, "{ (list: %s)\n", &t->name);
1276	tl = find_treasurelist (t->name);
1277	if (tl)
1278	dump_monster_treasure_rec (name, tl->items, depth + 2);
1279	for (i = 0; i < depth; i++)
1280	fprintf (logfile, " ");
1281	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282	}
1283	else
1284	{
1285	for (i = 0; i < depth; i++)
1286	fprintf (logfile, " ");
1287	if (t->item && t->item->clone.type == FLESH)
1288	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1289	else
1290	fprintf (logfile, "%s\n", &t->item->clone.name);
1291	}
1292
1293	if (t->next_yes)
1294	{
1295	for (i = 0; i < depth; i++)
1296	fprintf (logfile, " ");
1297	fprintf (logfile, " (if yes)\n");
1298	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1299	}
1300
1301	if (t->next_no)
1302	{
1303	for (i = 0; i < depth; i++)
1304	fprintf (logfile, " ");
1305	fprintf (logfile, " (if no)\n");
1306	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1307	}
1308
1309	t = t->next;
1310	}
1311	}
1312
1313	/*
1314	* For debugging purposes. Dumps all treasures for a given monster.
1315	* Created originally by Raphael Quinet for debugging the alchemy code.
1316	*/
1317
1318	void
1319	dump_monster_treasure (const char *name)
1320	{
1321	archetype *at;
1322	int found;
1323
1324	found = 0;
1325	fprintf (logfile, "\n");
1326	for (at = first_archetype; at != NULL; at = at->next)
1327	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1328	{
1329	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1330	if (at->clone.randomitems != NULL)
1331	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1332	else
1333	fprintf (logfile, "(nothing)\n");
1334	fprintf (logfile, "\n");
1335	found++;
1336	}
1337	if (found == 0)
1338	fprintf (logfile, "No objects have the name %s!\n\n", name);
1339	}	1179	}
1340		1180
1341	/*	1181	/*
1342	* 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.
1343	*/	1183	*/
1344
1345	void	1184	void
1346	init_artifacts (void)	1185	init_artifacts (void)
1347	{	1186	{
1348	static int has_been_inited = 0;	1187	static int has_been_inited = 0;
1349	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;	1188	char filename[MAX_BUF];
1350	artifact *art = NULL;	1189	artifact *art = NULL;
1351	linked_char *tmp;
1352	int value;
1353	artifactlist *al;	1190	artifactlist *al;
1354		1191
1355	if (has_been_inited)	1192	if (has_been_inited)
1356	return;	1193	return;
1357	else	1194	else
1358	has_been_inited = 1;	1195	has_been_inited = 1;
1359		1196
1360	sprintf (filename, "%s/artifacts", settings.datadir);	1197	sprintf (filename, "%s/artifacts", settings.datadir);
1361	object_thawer thawer (filename);	1198	object_thawer f (filename);
1362		1199
1363	if (!thawer)	1200	if (!f)
1364	return;	1201	return;
1365		1202
1366	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1203	for (;;)
1367	{	1204	{
1368	if (*buf == '#')	1205	switch (f.kw)
1369	continue;
1370	if ((cp = strchr (buf, '\n')) != NULL)
1371	*cp = '\0';
1372	cp = buf;
1373	while (*cp == ' ') /* Skip blanks */
1374	cp++;
1375	if (*cp == '\0')
1376	continue;
1377
1378	if (!strncmp (cp, "Allowed", 7))
1379	{	1206	{
		1207	case KW_allowed:
1380	if (art == NULL)	1208	if (!art)
		1209	art = get_empty_artifact ();
		1210
1381	{	1211	{
1382	art = get_empty_artifact ();	1212	if (!strcmp (f.get_str (), "all"))
1383	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));
1384	}	1229	}
1385	cp = strchr (cp, ' ') + 1;	1230	break;
1386	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	}
1387	continue;	1263	continue;
1388		1264
1389	do	1265	case KW_EOF:
		1266	goto done;
		1267
		1268	default:
		1269	if (!f.parse_error ("artifacts file"))
		1270	cleanup ("artifacts file required");
1390	{	1271	break;
1391	nrofallowedstr++;
1392	if ((next = strchr (cp, ',')) != NULL)
1393	*(next++) = '\0';
1394	tmp = new linked_char;
1395
1396	tmp->name = cp;
1397	tmp->next = art->allowed;
1398	art->allowed = tmp;
1399	}
1400	while ((cp = next) != NULL);
1401	}
1402	else if (sscanf (cp, "chance %d", &value))
1403	art->chance = (uint16) value;
1404	else if (sscanf (cp, "difficulty %d", &value))
1405	art->difficulty = (uint8) value;
1406	else if (!strncmp (cp, "Object", 6))
1407	{	1272	}
1408	art->item = object::create ();
1409		1273
1410	if (!load_object (thawer, art->item, 0))	1274	f.next ();
1411	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1412
1413	art->item->name = strchr (cp, ' ') + 1;
1414	al = find_artifactlist (art->item->type);
1415	if (al == NULL)
1416	{
1417	al = get_empty_artifactlist ();
1418	al->type = art->item->type;
1419	al->next = first_artifactlist;
1420	first_artifactlist = al;
1421	}
1422	art->next = al->items;
1423	al->items = art;
1424	art = NULL;
1425	}
1426	else
1427	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1428	}	1275	}
1429		1276
		1277	done:
1430	for (al = first_artifactlist; al != NULL; al = al->next)	1278	for (al = first_artifactlist; al; al = al->next)
1431	{	1279	{
		1280	al->total_chance = 0;
		1281
1432	for (art = al->items; art != NULL; art = art->next)	1282	for (art = al->items; art; art = art->next)
1433	{	1283	{
1434	if (!art->chance)	1284	if (!art->chance)
1435	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);
1436	else	1286	else
1437	al->total_chance += art->chance;	1287	al->total_chance += art->chance;
…		…
1442	}	1292	}
1443		1293
1444	LOG (llevDebug, "done.\n");	1294	LOG (llevDebug, "done.\n");
1445	}	1295	}
1446		1296
1447
1448	/*	1297	/*
1449	* Used in artifact generation. The bonuses of the first object	1298	* Used in artifact generation. The bonuses of the first object
1450	* is modified by the bonuses of the second object.	1299	* is modified by the bonuses of the second object.
1451	*/	1300	*/
1452
1453	void	1301	void
1454	add_abilities (object *op, object *change)	1302	add_abilities (object *op, object *change)
1455	{	1303	{
1456	int i, tmp;	1304	int i, tmp;
1457		1305
1458	if (change->face != blank_face)	1306	if (change->face != blank_face)
1459	{	1307	{
1460	#ifdef TREASURE_VERBOSE	1308	#ifdef TREASURE_VERBOSE
1461	LOG (llevDebug, "FACE: %d\n", change->face->number);	1309	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1462	#endif	1310	#endif
1463	op->face = change->face;	1311	op->face = change->face;
1464	}	1312	}
1465		1313
1466	for (i = 0; i < NUM_STATS; i++)	1314	for (i = 0; i < NUM_STATS; i++)
1467	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1315	change_attr_value (&(op->stats), i, change->stats.stat (i));
1468		1316
1469	op->attacktype |= change->attacktype;	1317	op->attacktype |= change->attacktype;
1470	op->path_attuned |= change->path_attuned;	1318	op->path_attuned |= change->path_attuned;
1471	op->path_repelled |= change->path_repelled;	1319	op->path_repelled |= change->path_repelled;
1472	op->path_denied |= change->path_denied;	1320	op->path_denied |= change->path_denied;
…		…
1520	* 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
1521	* this object.	1369	* this object.
1522	*/	1370	*/
1523	if (op->type == HORN || op->type == POTION)	1371	if (op->type == HORN || op->type == POTION)
1524	{	1372	{
1525	object *tmp_obj;
1526
1527	/* Remove any spells this object currently has in it */	1373	/* Remove any spells this object currently has in it */
1528	while (op->inv)
1529	op->inv->destroy ();	1374	op->destroy_inv (false);
1530		1375
1531	tmp_obj = arch_to_object (change->other_arch);	1376	object *tmp = arch_to_object (change->other_arch);
1532	insert_ob_in_ob (tmp_obj, op);	1377	insert_ob_in_ob (tmp, op);
1533	}	1378	}
1534	/* No harm setting this for potions/horns */	1379	/* No harm setting this for potions/horns */
1535	op->other_arch = change->other_arch;	1380	op->other_arch = change->other_arch;
1536	}	1381	}
1537		1382
…		…
1619	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);
1620	}	1465	}
1621		1466
1622	op->value *= change->value;	1467	op->value *= change->value;
1623		1468
1624	if (change->material)	1469	if (change->materials)
1625	op->material = change->material;	1470	op->materials = change->materials;
1626		1471
1627	if (change->materialname)	1472	if (change->materialname)
1628	op->materialname = change->materialname;	1473	op->materialname = change->materialname;
1629		1474
1630	if (change->slaying)	1475	if (change->slaying)
…		…
1636	if (change->msg)	1481	if (change->msg)
1637	op->msg = change->msg;	1482	op->msg = change->msg;
1638	}	1483	}
1639		1484
1640	static int	1485	static int
1641	legal_artifact_combination (object *op, artifact * art)	1486	legal_artifact_combination (object *op, artifact *art)
1642	{	1487	{
1643	int neg, success = 0;	1488	int neg, success = 0;
1644	linked_char *tmp;	1489	linked_char *tmp;
1645	const char *name;	1490	const char *name;
1646		1491
1647	if (art->allowed == (linked_char *) NULL)	1492	if (!art->allowed)
1648	return 1; /* Ie, "all" */	1493	return 1; /* Ie, "all" */
		1494
1649	for (tmp = art->allowed; tmp; tmp = tmp->next)	1495	for (tmp = art->allowed; tmp; tmp = tmp->next)
1650	{	1496	{
1651	#ifdef TREASURE_VERBOSE	1497	#ifdef TREASURE_VERBOSE
1652	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1498	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1653	#endif	1499	#endif
1654	if (*tmp->name == '!')	1500	if (*tmp->name == '!')
1655	name = tmp->name + 1, neg = 1;	1501	name = tmp->name + 1, neg = 1;
1656	else	1502	else
1657	name = tmp->name, neg = 0;	1503	name = tmp->name, neg = 0;
1658		1504
1659	/* If we match name, then return the opposite of 'neg' */	1505	/* If we match name, then return the opposite of 'neg' */
1660	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)))
1661	return !neg;	1507	return !neg;
1662		1508
1663	/* 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
1664	* everything is allowed except what we match	1510	* everything is allowed except what we match
1665	*/	1511	*/
1666	else if (neg)	1512	else if (neg)
1667	success = 1;	1513	success = 1;
1668	}	1514	}
		1515
1669	return success;	1516	return success;
1670	}	1517	}
1671		1518
1672	/*	1519	/*
1673	* Fixes the given object, giving it the abilities and titles	1520	* Fixes the given object, giving it the abilities and titles
…		…
1740	#if 1	1587	#if 1
1741	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);
1742	#endif	1589	#endif
1743	return;	1590	return;
1744	}	1591	}
1745	if (!strcmp (art->item->name, "NONE"))	1592
		1593	if (art->item->name == shstr_NONE)
1746	return;	1594	return;
		1595
1747	if (FABS (op->magic) < art->item->magic)	1596	if (fabs (op->magic) < art->item->magic)
1748	continue; /* Not magic enough to be this item */	1597	continue; /* Not magic enough to be this item */
1749		1598
1750	/* Map difficulty not high enough */	1599	/* Map difficulty not high enough */
1751	if (difficulty < art->difficulty)	1600	if (difficulty < art->difficulty)
1752	continue;	1601	continue;
1753		1602
1754	if (!legal_artifact_combination (op, art))	1603	if (!legal_artifact_combination (op, art))
1755	{	1604	{
1756	#ifdef TREASURE_VERBOSE	1605	#ifdef TREASURE_VERBOSE
1757	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);
1758	#endif	1607	#endif
1759	continue;	1608	continue;
1760	}	1609	}
		1610
1761	give_artifact_abilities (op, art->item);	1611	give_artifact_abilities (op, art->item);
1762	return;	1612	return;
1763	}	1613	}
1764	}	1614	}
1765		1615
…		…
1802	item->level = donor->level;	1652	item->level = donor->level;
1803		1653
1804	/* if donor has some attacktypes, the flesh is poisonous */	1654	/* if donor has some attacktypes, the flesh is poisonous */
1805	if (donor->attacktype & AT_POISON)	1655	if (donor->attacktype & AT_POISON)
1806	item->type = POISON;	1656	item->type = POISON;
		1657
1807	if (donor->attacktype & AT_ACID)	1658	if (donor->attacktype & AT_ACID)
1808	item->stats.hp = -1 * item->stats.food;	1659	item->stats.hp = -1 * item->stats.food;
		1660
1809	SET_FLAG (item, FLAG_NO_STEAL);	1661	SET_FLAG (item, FLAG_NO_STEAL);
1810	}	1662	}
1811	}
1812
1813	/* special_potion() - so that old potion code is still done right. */
1814
1815	int
1816	special_potion (object *op)
1817	{
1818	if (op->attacktype)
1819	return 1;
1820
1821	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1822	return 1;
1823
1824	for (int i = 0; i < NROFATTACKS; i++)
1825	if (op->resist[i])
1826	return 1;
1827
1828	return 0;
1829	}	1663	}
1830		1664
1831	void	1665	void
1832	free_treasurestruct (treasure *t)	1666	free_treasurestruct (treasure *t)
1833	{	1667	{
1834	if (t->next)
1835	free_treasurestruct (t->next);	1668	if (t->next) free_treasurestruct (t->next);
1836	if (t->next_yes)
1837	free_treasurestruct (t->next_yes);	1669	if (t->next_yes) free_treasurestruct (t->next_yes);
1838	if (t->next_no)
1839	free_treasurestruct (t->next_no);	1670	if (t->next_no) free_treasurestruct (t->next_no);
1840		1671
1841	delete t;	1672	delete t;
1842	}	1673	}
1843		1674
1844	void	1675	void
…		…
1849		1680
1850	delete lc;	1681	delete lc;
1851	}	1682	}
1852		1683
1853	void	1684	void
1854	free_artifact (artifact * at)	1685	free_artifact (artifact *at)
1855	{	1686	{
1856	if (at->next)
1857	free_artifact (at->next);	1687	if (at->next) free_artifact (at->next);
1858
1859	if (at->allowed)
1860	free_charlinks (at->allowed);	1688	if (at->allowed) free_charlinks (at->allowed);
1861		1689
1862	at->item->destroy (1);	1690	at->item->destroy ();
1863		1691
1864	delete at;	1692	sfree (at);
1865	}	1693	}
1866		1694
1867	void	1695	void
1868	free_artifactlist (artifactlist * al)	1696	free_artifactlist (artifactlist *al)
1869	{	1697	{
1870	artifactlist *nextal;	1698	artifactlist *nextal;
1871		1699
1872	for (al = first_artifactlist; al; al = nextal)	1700	for (al = first_artifactlist; al; al = nextal)
1873	{	1701	{
1874	nextal = al->next;	1702	nextal = al->next;
1875		1703
1876	if (al->items)	1704	if (al->items)
1877	free_artifact (al->items);	1705	free_artifact (al->items);
1878		1706
1879	free (al);	1707	sfree (al);
1880	}	1708	}
1881	}	1709	}
1882		1710
1883	void	1711	void
1884	free_all_treasures (void)	1712	free_all_treasures (void)
1885	{	1713	{
1886	treasurelist *tl, *next;	1714	treasurelist *tl, *next;
1887		1715
1888
1889	for (tl = first_treasurelist; tl != NULL; tl = next)	1716	for (tl = first_treasurelist; tl; tl = next)
1890	{	1717	{
		1718	clear (tl);
		1719
1891	next = tl->next;	1720	next = tl->next;
1892	if (tl->items)
1893	free_treasurestruct (tl->items);
1894	delete tl;	1721	delete tl;
1895	}	1722	}
		1723
1896	free_artifactlist (first_artifactlist);	1724	free_artifactlist (first_artifactlist);
1897	}	1725	}

Diff Legend

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