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.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC

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

Diff Legend

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