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.33 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.120 by root, Sat Nov 17 23:33:17 2018 UTC

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

Diff Legend

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