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

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.19 by root, Thu Sep 14 22:34:00 2006 UTC vs. Revision 1.105 by root, Thu Apr 15 04:56:47 2010 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.19 by root, Thu Sep 14 22:34:00 2006 UTC vs.
Revision 1.105 by root, Thu Apr 15 04:56:47 2010 UTC