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.37 by root, Thu Feb 8 03:09:31 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 = rndm (t->nrof) + 1;	320	tmp->nrof = rndm (t->nrof) + 1;
354		321
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	322	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	323	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	324	put_treasure (tmp, op, flag);
358	}	325	}
359	}	326	}
360		327
361	if (t->next_yes != NULL)	328	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	329	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	330	}
364	else if (t->next_no != NULL)	331	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	332	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		333
367	if (t->next != NULL)	334	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	335	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	336	}
370		337
371	void	338	static void
372	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)
373	{	340	{
374	int value = rndm (tl->total_chance);	341	int value = rndm (tl->total_chance);
375	treasure *t;	342	treasure *t;
376		343
…		…
378	{	345	{
379	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");
380	return;	347	return;
381	}	348	}
382		349
383	for (t = tl->items; t != NULL; t = t->next)	350	for (t = tl->items; t; t = t->next)
384	{	351	{
385	value -= t->chance;	352	value -= t->chance;
386		353
387	if (value < 0)	354	if (value < 0)
388	break;	355	break;
389	}	356	}
390		357
391	if (!t || value >= 0)	358	if (!t || value >= 0)
392	{
393	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);
394	abort ();
395	return;
396	}
397		360
398	if (t->name)	361	if (t->name)
399	{	362	{
400	if (difficulty >= t->magic)	363	if (difficulty >= t->magic)
401	{	364	{
402	treasurelist *tl = find_treasurelist (t->name);	365	treasurelist *tl = treasurelist::find (t->name);
403	if (tl)	366	if (tl)
404	create_treasure (tl, op, flag, difficulty, tries);	367	create_treasure (tl, op, flag, difficulty, tries);
405	}	368	}
406	else if (t->nrof)	369	else if (t->nrof)
407	create_one_treasure (tl, op, flag, difficulty, tries);	370	create_one_treasure (tl, op, flag, difficulty, tries);
408
409	return;
410	}	371	}
411
412	if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))	372	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
413	{	373	{
414	object *tmp = arch_to_object (t->item);	374	if (object *tmp = t->item->instance ())
415		375	{
416	if (!tmp)
417	return;
418
419	if (t->nrof && tmp->nrof <= 1)	376	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	377	tmp->nrof = rndm (t->nrof) + 1;
421		378
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	379	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	380	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	381	put_treasure (tmp, op, flag);
		382	}
425	}	383	}
		384	}
		385
		386	void
		387	object::create_treasure (treasurelist *tl, int flags)
		388	{
		389	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
426	}	390	}
427		391
428	/* This calls the appropriate treasure creation function. tries is passed	392	/* This calls the appropriate treasure creation function. tries is passed
429	* to determine how many list transitions or attempts to create treasure	393	* to determine how many list transitions or attempts to create treasure
430	* have been made. It is really in place to prevent infinite loops with	394	* have been made. It is really in place to prevent infinite loops with
…		…
433	* to do that.	397	* to do that.
434	*/	398	*/
435	void	399	void
436	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)
437	{	401	{
		402	// empty treasurelists are legal
		403	if (!tl->items)
		404	return;
		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;
		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;
442	}	419	}
443		420
444	if (tl->total_chance)	421	if (tl->total_chance)
445	create_one_treasure (tl, op, flag, difficulty, tries);	422	create_one_treasure (tl, op, flag, difficulty, tries);
446	else	423	else
…		…
455	object *	432	object *
456	generate_treasure (treasurelist *tl, int difficulty)	433	generate_treasure (treasurelist *tl, int difficulty)
457	{	434	{
458	difficulty = clamp (difficulty, 1, settings.max_level);	435	difficulty = clamp (difficulty, 1, settings.max_level);
459		436
460	object *ob = object::create (), *tmp;	437	object *ob = object::create ();
461		438
462	create_treasure (tl, ob, 0, difficulty, 0);	439	create_treasure (tl, ob, 0, difficulty, 0);
463		440
464	/* 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 */
465	tmp = ob->inv;	442	object *tmp = ob->inv;
466	if (tmp != NULL)	443	if (tmp)
467	tmp->remove ();	444	tmp->remove ();
468		445
469	if (ob->inv)	446	if (ob->inv)
470	LOG (llevError, "In generate treasure, created multiple objects.\n");	447	LOG (llevError, "In generate treasure, created multiple objects.\n");
471		448
472	ob->destroy ();	449	ob->destroy ();
		450
473	return tmp;	451	return tmp;
474	}	452	}
475		453
476	/*	454	/*
477	* 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
…		…
479	* 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
480	* magical bonus "wanted".	458	* magical bonus "wanted".
481	*/	459	*/
482		460
483	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	461	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484
485	/*chance of magic difficulty*/	462	// chance of magic difficulty
486
487	/* +0 +1 +2 +3 +4 */	463	// +0 +1 +2 +3 +4
488	{95, 2, 2, 1, 0}, /*1 */	464	{95, 2, 2, 1, 0}, // 1
489	{92, 5, 2, 1, 0}, /*2 */	465	{92, 5, 2, 1, 0}, // 2
490	{85, 10, 4, 1, 0}, /*3 */	466	{85, 10, 4, 1, 0}, // 3
491	{80, 14, 4, 2, 0}, /*4 */	467	{80, 14, 4, 2, 0}, // 4
492	{75, 17, 5, 2, 1}, /*5 */	468	{75, 17, 5, 2, 1}, // 5
493	{70, 18, 8, 3, 1}, /*6 */	469	{70, 18, 8, 3, 1}, // 6
494	{65, 21, 10, 3, 1}, /*7 */	470	{65, 21, 10, 3, 1}, // 7
495	{60, 22, 12, 4, 2}, /*8 */	471	{60, 22, 12, 4, 2}, // 8
496	{55, 25, 14, 4, 2}, /*9 */	472	{55, 25, 14, 4, 2}, // 9
497	{50, 27, 16, 5, 2}, /*10 */	473	{50, 27, 16, 5, 2}, // 10
498	{45, 28, 18, 6, 3}, /*11 */	474	{45, 28, 18, 6, 3}, // 11
499	{42, 28, 20, 7, 3}, /*12 */	475	{42, 28, 20, 7, 3}, // 12
500	{40, 27, 21, 8, 4}, /*13 */	476	{40, 27, 21, 8, 4}, // 13
501	{38, 25, 22, 10, 5}, /*14 */	477	{38, 25, 22, 10, 5}, // 14
502	{36, 23, 23, 12, 6}, /*15 */	478	{36, 23, 23, 12, 6}, // 15
503	{33, 21, 24, 14, 8}, /*16 */	479	{33, 21, 24, 14, 8}, // 16
504	{31, 19, 25, 16, 9}, /*17 */	480	{31, 19, 25, 16, 9}, // 17
505	{27, 15, 30, 18, 10}, /*18 */	481	{27, 15, 30, 18, 10}, // 18
506	{20, 12, 30, 25, 13}, /*19 */	482	{20, 12, 30, 25, 13}, // 19
507	{15, 10, 28, 30, 17}, /*20 */	483	{15, 10, 28, 30, 17}, // 20
508	{13, 9, 27, 28, 23}, /*21 */	484	{13, 9, 27, 28, 23}, // 21
509	{10, 8, 25, 28, 29}, /*22 */	485	{10, 8, 25, 28, 29}, // 22
510	{8, 7, 23, 26, 36}, /*23 */	486	{ 8, 7, 23, 26, 36}, // 23
511	{6, 6, 20, 22, 46}, /*24 */	487	{ 6, 6, 20, 22, 46}, // 24
512	{4, 5, 17, 18, 56}, /*25 */	488	{ 4, 5, 17, 18, 56}, // 25
513	{2, 4, 12, 14, 68}, /*26 */	489	{ 2, 4, 12, 14, 68}, // 26
514	{0, 3, 7, 10, 80}, /*27 */	490	{ 0, 3, 7, 10, 80}, // 27
515	{0, 0, 3, 7, 90}, /*28 */	491	{ 0, 0, 3, 7, 90}, // 28
516	{0, 0, 0, 3, 97}, /*29 */	492	{ 0, 0, 0, 3, 97}, // 29
517	{0, 0, 0, 0, 100}, /*30 */	493	{ 0, 0, 0, 0, 100}, // 30
518	{0, 0, 0, 0, 100}, /*31 */	494	{ 0, 0, 0, 0, 100}, // 31
519	};	495	};
520		496
521
522	/* calculate the appropriate level for wands staves and scrolls.	497	/* calculate the appropriate level for wands staves and scrolls.
523	* 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)
524	*	499	*
525	* elmex Wed Aug 9 17:44:59 CEST 2006:	500	* elmex Wed Aug 9 17:44:59 CEST 2006:
526	* 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.
527	*/	502	*/
528		503	static int
529	int
530	level_for_item (const object *op, int difficulty)	504	level_for_item (const object *op, int difficulty)
531	{	505	{
532	int olevel = 0;
533
534	if (!op->inv)	506	if (!op->inv)
535	{	507	{
536	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);
537	return 0;	509	return 0;
538	}	510	}
539		511
540	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	512	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
541		513
542	if (olevel <= 0)	514	if (olevel <= 0)
543	olevel = rndm (1, MIN (op->inv->level, 1));	515	olevel = rndm (1, op->inv->level);
544		516
545	if (olevel > MAXLEVEL)	517	return min (olevel, MAXLEVEL_TREASURE);
546	olevel = MAXLEVEL;
547
548	return olevel;
549	}	518	}
550		519
551	/*	520	/*
552	* Based upon the specified difficulty and upon the difftomagic_list array,	521	* Based upon the specified difficulty and upon the difftomagic_list array,
553	* a random magical bonus is returned. This is used when determine	522	* a random magical bonus is returned. This is used when determine
…		…
556	* elmex Thu Aug 10 18:45:44 CEST 2006:	525	* elmex Thu Aug 10 18:45:44 CEST 2006:
557	* 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
558	* weird integer between 1-31.	527	* weird integer between 1-31.
559	*	528	*
560	*/	529	*/
561		530	static int
562	int
563	magic_from_difficulty (int difficulty)	531	magic_from_difficulty (int difficulty)
564	{	532	{
565	int percent = 0, magic = 0;
566	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);
567		535
568	scaled_diff--;
569
570	if (scaled_diff < 0)
571	scaled_diff = 0;
572
573	if (scaled_diff >= DIFFLEVELS)
574	scaled_diff = DIFFLEVELS - 1;
575
576	percent = rndm (100);	536	int percent = rndm (100);
		537	int magic;
577		538
578	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	539	for (magic = 0; magic <= MAXMAGIC; magic++)
579	{	540	{
580	percent -= difftomagic_list[scaled_diff][magic];	541	percent -= difftomagic_list[scaled_diff][magic];
581		542
582	if (percent < 0)	543	if (percent < 0)
583	break;	544	break;
584	}	545	}
585		546
586	if (magic == (MAXMAGIC + 1))	547	if (magic > MAXMAGIC)
587	{	548	{
588	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);
589	magic = 0;	550	magic = 0;
590	}	551	}
591		552
…		…
599	* Sets magical bonus in an object, and recalculates the effect on	560	* Sets magical bonus in an object, and recalculates the effect on
600	* the armour variable, and the effect on speed of armour.	561	* the armour variable, and the effect on speed of armour.
601	* This function doesn't work properly, should add use of archetypes	562	* This function doesn't work properly, should add use of archetypes
602	* to make it truly absolute.	563	* to make it truly absolute.
603	*/	564	*/
604
605	void	565	void
606	set_abs_magic (object *op, int magic)	566	set_abs_magic (object *op, int magic)
607	{	567	{
608	if (!magic)	568	if (!magic)
609	return;	569	return;
610		570
611	op->magic = magic;	571	op->magic = magic;
612	if (op->arch)	572	if (op->arch)
613	{	573	{
614	if (op->type == ARMOUR)	574	if (op->type == ARMOUR)
615	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	575	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616		576
617	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 */
618	magic = (-magic);	578	magic = (-magic);
		579
619	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	580	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620	}	581	}
621	else	582	else
622	{	583	{
623	if (op->type == ARMOUR)	584	if (op->type == ARMOUR)
624	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	585	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		586
625	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 */
626	magic = (-magic);	588	magic = (-magic);
		589
627	op->weight = (op->weight * (100 - magic * 10)) / 100;	590	op->weight = (op->weight * (100 - magic * 10)) / 100;
628	}	591	}
629	}	592	}
630		593
631	/*	594	/*
…		…
634	*/	597	*/
635		598
636	static void	599	static void
637	set_magic (int difficulty, object *op, int max_magic, int flags)	600	set_magic (int difficulty, object *op, int max_magic, int flags)
638	{	601	{
639	int i;
640
641	i = magic_from_difficulty (difficulty);	602	int i = magic_from_difficulty (difficulty);
		603
642	if ((flags & GT_ONLY_GOOD) && i < 0)	604	if ((flags & GT_ONLY_GOOD) && i < 0)
643	i = -i;	605	i = -i;
		606
644	if (i > max_magic)	607	i = min (i, max_magic);
645	i = max_magic;	608
646	set_abs_magic (op, i);	609	set_abs_magic (op, i);
647	if (i < 0)	610	if (i < 0)
648	SET_FLAG (op, FLAG_CURSED);	611	op->set_flag (FLAG_CURSED);
649	}	612	}
650		613
651	/*	614	/*
652	* Randomly adds one magical ability to the given object.	615	* Randomly adds one magical ability to the given object.
653	* Modified for Partial Resistance in many ways:	616	* Modified for Partial Resistance in many ways:
654	* 1) Since rings can have multiple bonuses, if the same bonus	617	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	618	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	619	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	620	* 2) Add code to deal with new PR method.
658	*/	621	*/
659		622	static void
660	void
661	set_ring_bonus (object *op, int bonus)	623	set_ring_bonus (object *op, int bonus)
662	{	624	{
663
664	int r = rndm (bonus > 0 ? 25 : 11);	625	int r = rndm (bonus > 0 ? 25 : 11);
665		626
666	if (op->type == AMULET)	627	if (op->type == AMULET)
667	{
668	if (!(rndm (21)))	628	if (!rndm (21))
669	r = 20 + rndm (2);	629	r = 20 + rndm (2);
		630	else if (rndm (2))
		631	r = 10;
670	else	632	else
671	{
672	if (rndm (2))
673	r = 10;
674	else
675	r = 11 + rndm (9);	633	r = 11 + rndm (9);
676	}
677	}
678		634
679	switch (r)	635	switch (r)
680	{	636	{
681	/* 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,
682	* bonuses and penalties will stack and add to existing values.	638	* bonuses and penalties will stack and add to existing values.
683	* of the item.	639	* of the item.
684	*/	640	*/
685	case 0:	641	case 0:
686	case 1:	642	case 1:
687	case 2:	643	case 2:
688	case 3:	644	case 3:
689	case 4:	645	case 4:
690	case 5:	646	case 5:
691	case 6:	647	case 6:
692	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	648	op->stats.stat (r) += bonus;
693	break;	649	break;
694		650
695	case 7:	651	case 7:
696	op->stats.dam += bonus;	652	op->stats.dam += bonus;
697	break;	653	break;
…		…
729	* 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
730	* even values.	686	* even values.
731	*/	687	*/
732	if (bonus < 0)	688	if (bonus < 0)
733	val = 2 * -val - rndm (b);	689	val = 2 * -val - rndm (b);
734	if (val > 35)	690
735	val = 35; /* Upper limit */	691	val = min (35, val); /* Upper limit */
		692
736	b = 0;	693	b = 0;
737		694
738	while (op->resist[resist_table[resist]] != 0 && b < 4)	695	while (op->resist[resist_table[resist]] != 0 && b < 4)
739	resist = rndm (num_resist_table);	696	resist = rndm (num_resist_table);
740		697
…		…
748	break;	705	break;
749	}	706	}
750	case 20:	707	case 20:
751	if (op->type == AMULET)	708	if (op->type == AMULET)
752	{	709	{
753	SET_FLAG (op, FLAG_REFL_SPELL);	710	op->set_flag (FLAG_REFL_SPELL);
754	op->value *= 11;	711	op->value *= 11;
755	}	712	}
756	else	713	else
757	{	714	{
758	op->stats.hp = 1; /* regenerate hit points */	715	op->stats.hp = 1; /* regenerate hit points */
…		…
761	break;	718	break;
762		719
763	case 21:	720	case 21:
764	if (op->type == AMULET)	721	if (op->type == AMULET)
765	{	722	{
766	SET_FLAG (op, FLAG_REFL_MISSILE);	723	op->set_flag (FLAG_REFL_MISSILE);
767	op->value *= 9;	724	op->value *= 9;
768	}	725	}
769	else	726	else
770	{	727	{
771	op->stats.sp = 1; /* regenerate spell points */	728	op->stats.sp = 1; /* regenerate spell points */
…		…
773	}	730	}
774	break;	731	break;
775		732
776	case 22:	733	case 22:
777	op->stats.exp += bonus; /* Speed! */	734	op->stats.exp += bonus; /* Speed! */
778	op->value = (op->value * 2) / 3;	735	op->value = op->value * 2 / 3;
779	break;	736	break;
780	}	737	}
781		738
782	if (bonus > 0)	739	if (bonus > 0)
783	op->value *= 2 * bonus;	740	op->value = 2 * op->value * bonus;
784	else	741	else
785	op->value = -(op->value * 2 * bonus) / 3;	742	op->value = -2 * op->value * bonus / 3;
786	}	743	}
787		744
788	/*	745	/*
789	* 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.
790	* 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
791	* higher is the chance of returning a low number.	748	* higher is the chance of returning a low number.
792	* 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
793	* rings and amulets.	750	* rings and amulets.
794	* 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.
795	*/	752	*/
796	int	753	static int
797	get_magic (int diff)	754	get_magic (int diff)
798	{	755	{
799	int i;	756	diff = min (3, diff);
800		757
801	if (diff < 3)
802	diff = 3;
803
804	for (i = 0; i < 4; i++)	758	for (int i = 0; i < 4; i++)
805	if (rndm (diff))	759	if (rndm (diff))
806	return i;	760	return i;
807		761
808	return 4;	762	return 4;
809	}	763	}
810		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
811	#define DICE2 (get_magic(2)==2?2:1)	805	#define DICE2 (get_magic(2) == 2 ? 2 : 1)
812	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	806	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
813		807
814	/*	808	/*
815	* 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
816	* 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
817	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	811	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
818	*/	812	*/
819		813
820	/* 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
821	* 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
822	* 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
823	* way to do this? b.t. */	817	* way to do this? b.t. */
824		818
825	/*	819	/*
826	* ! (flags & GT_ENVIRONMENT):	820	* ! (flags & GT_ENVIRONMENT):
827	* Automatically calls fix_flesh_item().	821	* Automatically calls fix_flesh_item().
…		…
831	* value.	825	* value.
832	* 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
833	* 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
834	* 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
835	*/	829	*/
836
837	void	830	void
838	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)
839	{	832	{
840	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;
841		834
…		…
846	save_item_power = op->item_power;	839	save_item_power = op->item_power;
847	op->item_power = 0;	840	op->item_power = 0;
848		841
849	if (op->randomitems && op->type != SPELL)	842	if (op->randomitems && op->type != SPELL)
850	{	843	{
851	create_treasure (op->randomitems, op, flags, difficulty, 0);	844	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
852	if (!op->inv)
853	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
854
855	/* So the treasure doesn't get created again */	845	/* So the treasure doesn't get created again */
856	op->randomitems = NULL;	846	op->randomitems = 0;
857	}	847	}
858		848
859	if (difficulty < 1)	849	max_it (difficulty, 1);
860	difficulty = 1;
861		850
862	if (INVOKE_OBJECT (ADD_BONUS, op,	851	if (INVOKE_OBJECT (ADD_BONUS, op,
863	ARG_OBJECT (creator != op ? creator : 0),	852	ARG_OBJECT (creator != op ? creator : 0),
864	ARG_INT (difficulty), ARG_INT (max_magic),	853	ARG_INT (difficulty), ARG_INT (max_magic),
865	ARG_INT (flags)))	854	ARG_INT (flags)))
866	return;	855	return;
867		856
868	if (!(flags & GT_MINIMAL))	857	if (!(flags & GT_MINIMAL))
869	{	858	{
870	if (op->arch == crown_arch)	859	if (IS_ARCH (op->arch, crown))
871	{	860	{
872	set_magic (difficulty, op, max_magic, flags);	861	set_magic (difficulty, op, max_magic, flags);
873	num_enchantments = calc_item_power (op, 1);	862	num_enchantments = calc_item_power (op, 1);
874	generate_artifact (op, difficulty);	863	generate_artifact (op, difficulty);
875	}	864	}
…		…
880		869
881	num_enchantments = calc_item_power (op, 1);	870	num_enchantments = calc_item_power (op, 1);
882		871
883	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	872	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
884	|| op->type == HORN	873	|| op->type == HORN
885	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	874	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
886	* used for shop_floors or treasures */
887	generate_artifact (op, difficulty);	875	generate_artifact (op, difficulty);
888	}	876	}
889		877
890	/* Object was made an artifact. Calculate its item_power rating.	878	/* Object was made an artifact. Calculate its item_power rating.
891	* the item_power in the object is what the artfiact adds.	879	* the item_power in the object is what the artfiact adds.
…		…
925	* again below */	913	* again below */
926	}	914	}
927	}	915	}
928		916
929	/* materialtype modifications. Note we allow this on artifacts. */	917	/* materialtype modifications. Note we allow this on artifacts. */
930	set_materialname (op, difficulty, NULL);	918	select_material (op, difficulty);
931		919
932	if (flags & GT_MINIMAL)	920	if (flags & GT_MINIMAL)
933	{	921	{
934	if (op->type == POTION)	922	if (op->type == POTION)
935	/* Handle healing and magic power potions */	923	/* Handle healing and magic power potions */
936	if (op->stats.sp && !op->randomitems)	924	if (op->stats.sp && !op->randomitems)
937	{	925	{
938	object *tmp;
939
940	tmp = get_archetype (spell_mapping[op->stats.sp]);	926	object *tmp = archetype::get (spell_mapping [op->stats.sp]);
941	insert_ob_in_ob (tmp, op);	927	insert_ob_in_ob (tmp, op);
942	op->stats.sp = 0;	928	op->stats.sp = 0;
943	}	929	}
944	}	930	}
945	else if (!op->title) /* Only modify object if not special */	931	else if (!op->title) /* Only modify object if not special */
…		…
948	case WEAPON:	934	case WEAPON:
949	case ARMOUR:	935	case ARMOUR:
950	case SHIELD:	936	case SHIELD:
951	case HELMET:	937	case HELMET:
952	case CLOAK:	938	case CLOAK:
953	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	939	if (op->flag [FLAG_CURSED] && !(rndm (4)))
954	set_ring_bonus (op, -DICE2);	940	set_ring_bonus (op, -DICE2);
955	break;	941	break;
956		942
957	case BRACERS:	943	case BRACERS:
958	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))	944	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
959	{	945	{
960	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	946	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
961	if (!QUERY_FLAG (op, FLAG_CURSED))	947	if (!op->flag [FLAG_CURSED])
962	op->value *= 3;	948	op->value *= 3;
963	}	949	}
964	break;	950	break;
965		951
966	case POTION:	952	case POTION:
967	{	953	{
968	int too_many_tries = 0, is_special = 0;	954	int too_many_tries = 0;
969		955
970	/* Handle healing and magic power potions */	956	/* Handle healing and magic power potions */
971	if (op->stats.sp && !op->randomitems)	957	if (op->stats.sp && !op->randomitems)
972	{	958	{
973	object *tmp;
974
975	tmp = get_archetype (spell_mapping[op->stats.sp]);	959	object *tmp = archetype::get (spell_mapping[op->stats.sp]);
976	insert_ob_in_ob (tmp, op);	960	insert_ob_in_ob (tmp, op);
977	op->stats.sp = 0;	961	op->stats.sp = 0;
978	}	962	}
979		963
980	while (!(is_special = special_potion (op)) && !op->inv)	964	while (!special_potion (op) && !op->inv)
981	{	965	{
982	generate_artifact (op, difficulty);	966	generate_artifact (op, difficulty);
983	if (too_many_tries++ > 10)	967	if (too_many_tries++ > 10)
984	break;	968	break;
985	}	969	}
…		…
988	* since the value set on those is already correct.	972	* since the value set on those is already correct.
989	*/	973	*/
990	if (op->inv && op->randomitems)	974	if (op->inv && op->randomitems)
991	{	975	{
992	/* value multiplier is same as for scrolls */	976	/* value multiplier is same as for scrolls */
993	op->value = (op->value * op->inv->value);	977	op->value *= op->inv->value;
994	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	978	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
995	}	979	}
996	else	980	else
997	{	981	{
998	op->name = "potion";	982	op->name = shstr_potion;
999	op->name_pl = "potions";	983	op->name_pl = shstr_potions;
1000	}	984	}
1001		985
1002	if (!(flags & GT_ONLY_GOOD) && rndm (2))	986	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1003	SET_FLAG (op, FLAG_CURSED);	987	op->set_flag (FLAG_CURSED);
		988
1004	break;	989	break;
1005	}	990	}
1006		991
1007	case AMULET:	992	case AMULET:
1008	if (op->arch == amulet_arch)	993	if (IS_ARCH (op->arch, amulet))
1009	op->value *= 5; /* Since it's not just decoration */	994	op->value *= 5; /* Since it's not just decoration */
1010		995
1011	case RING:	996	case RING:
1012	if (op->arch == NULL)
1013	{
1014	op->destroy ();
1015	op = 0;
1016	break;
1017	}
1018
1019	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	997	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1020	break;	998	break;
1021		999
1022	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	1000	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1023	SET_FLAG (op, FLAG_CURSED);	1001	op->set_flag (FLAG_CURSED);
1024		1002
1025	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	1003	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1026		1004
1027	if (op->type != RING) /* Amulets have only one ability */	1005	if (op->type != RING) /* Amulets have only one ability */
1028	break;	1006	break;
1029		1007
1030	if (!(rndm (4)))	1008	if (!rndm (4))
1031	{	1009	{
1032	int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1010	int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1033		1011
1034	if (d > 0)	1012	if (d > 0)
1035	op->value *= 3;	1013	op->value *= 3;
1036		1014
1037	set_ring_bonus (op, d);	1015	set_ring_bonus (op, d);
1038		1016
1039	if (!(rndm (4)))	1017	if (!rndm (4))
1040	{	1018	{
1041	int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1019	int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1042		1020
1043	if (d > 0)	1021	if (d > 0)
1044	op->value *= 5;	1022	op->value *= 5;
		1023
1045	set_ring_bonus (op, d);	1024	set_ring_bonus (op, d);
1046	}	1025	}
1047	}	1026	}
1048		1027
1049	if (GET_ANIM_ID (op))	1028	if (op->animation_id)
1050	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1029	op->set_anim_frame (rndm (op->anim_frames ()));
1051		1030
1052	break;	1031	break;
1053		1032
1054	case BOOK:	1033	case BOOK:
1055	/* Is it an empty book?, if yes lets make a special·	1034	/* Is it an empty book?, if yes lets make a special·
…		…
1057	* creator and/or map level we found it on.	1036	* creator and/or map level we found it on.
1058	*/	1037	*/
1059	if (!op->msg && rndm (10))	1038	if (!op->msg && rndm (10))
1060	{	1039	{
1061	/* set the book level properly */	1040	/* set the book level properly */
1062	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))	1041	if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1063	{	1042	{
1064	if (op->map && op->map->difficulty)	1043	if (op->map && op->map->difficulty)
1065	op->level = rndm (op->map->difficulty) + rndm (10) + 1;	1044	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1066	else	1045	else
1067	op->level = rndm (20) + 1;	1046	op->level = rndm (20) + 1;
…		…
1070	op->level = rndm (creator->level);	1049	op->level = rndm (creator->level);
1071		1050
1072	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);
1073	/* books w/ info are worth more! */	1052	/* books w/ info are worth more! */
1074	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));
1075	/* creator related stuff */
1076
1077	/* for library, chained books. Note that some monsters have no_pick
1078	* set - we don't want to set no pick in that case.
1079	*/
1080	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1081	SET_FLAG (op, FLAG_NO_PICK);
1082	if (creator->slaying && !op->slaying) /* for check_inv floors */
1083	op->slaying = creator->slaying;
1084		1054
1085	/* add exp so reading it gives xp (once) */	1055	/* add exp so reading it gives xp (once) */
1086	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;
1087	}	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;
1088	break;	1068	break;
1089		1069
1090	case SPELLBOOK:	1070	case SPELLBOOK:
1091	op->value = op->value * op->inv->value;	1071	op->value *= value_factor_from_spell_item (op->inv, 0);
		1072
1092	/* add exp so learning gives xp */	1073	/* add exp so learning gives xp */
1093	op->level = op->inv->level;	1074	op->level = op->inv->level;
1094	op->stats.exp = op->value;	1075	op->stats.exp = op->value;
1095	break;	1076	break;
1096		1077
…		…
1100	* and reset nrof.	1081	* and reset nrof.
1101	*/	1082	*/
1102	op->stats.food = op->inv->nrof;	1083	op->stats.food = op->inv->nrof;
1103	op->nrof = 1;	1084	op->nrof = 1;
1104	/* If the spell changes by level, choose a random level	1085	/* If the spell changes by level, choose a random level
1105	* for it, and adjust price. If the spell doesn't	1086	* for it.
1106	* change by level, just set the wand to the level of
1107	* the spell, and value calculation is simpler.
1108	*/	1087	*/
1109	if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier)	1088	if (op->inv->duration_modifier
1110	{	1089	|| op->inv->dam_modifier
		1090	|| op->inv->range_modifier)
1111	op->level = level_for_item (op, difficulty);	1091	op->level = level_for_item (op, difficulty);
1112	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1113	}
1114	else	1092	else
1115	{
1116	op->level = op->inv->level;	1093	op->level = op->inv->level;
1117	op->value = op->value * op->inv->value;	1094
1118	}	1095	op->value *= value_factor_from_spell_item (op->inv, op);
1119	break;	1096	break;
1120		1097
1121	case ROD:	1098	case ROD:
1122	op->level = level_for_item (op, difficulty);	1099	op->level = level_for_item (op, difficulty);
1123	/* Add 50 to both level an divisor to keep prices a little more	1100	op->value *= value_factor_from_spell_item (op->inv, op);
1124	* reasonable. Otherwise, a high level version of a low level	1101
1125	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1126	* 10 time multiplier). This way, the value are a bit more reasonable.
1127	*/
1128	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1129	/* 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 */
1130	if (op->stats.maxhp)	1103	if (op->stats.maxhp)
1131	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);
1132	else	1105	else
1133	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);
1134		1107
1135	op->stats.hp = op->stats.maxhp;	1108	op->stats.hp = op->stats.maxhp;
1136	break;	1109	break;
1137		1110
1138	case SCROLL:	1111	case SCROLL:
1139	op->level = level_for_item (op, difficulty);	1112	op->level = level_for_item (op, difficulty);
1140	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);
1141		1114
1142	/* add exp so reading them properly gives xp */	1115	/* add exp so reading them properly gives xp */
1143	op->stats.exp = op->value / 5;	1116	op->stats.exp = op->value / 5;
1144	op->nrof = op->inv->nrof;	1117	op->nrof = op->inv->nrof;
1145	break;	1118	break;
…		…
1153	break;	1126	break;
1154	} /* switch type */	1127	} /* switch type */
1155		1128
1156	if (flags & GT_STARTEQUIP)	1129	if (flags & GT_STARTEQUIP)
1157	{	1130	{
1158	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])
1159	SET_FLAG (op, FLAG_STARTEQUIP);	1132	op->set_flag (FLAG_STARTEQUIP);
1160	else if (op->type != MONEY)	1133	else if (op->type != MONEY)
1161	op->value = 0;	1134	op->value = 0;
1162	}	1135	}
1163		1136
1164	if (!(flags & GT_ENVIRONMENT))	1137	if (!(flags & GT_ENVIRONMENT))
…		…
1174	*/	1147	*/
1175		1148
1176	/*	1149	/*
1177	* Allocate and return the pointer to an empty artifactlist structure.	1150	* Allocate and return the pointer to an empty artifactlist structure.
1178	*/	1151	*/
1179
1180	static artifactlist *	1152	static artifactlist *
1181	get_empty_artifactlist (void)	1153	get_empty_artifactlist ()
1182	{	1154	{
1183	artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist));	1155	return salloc0<artifactlist> ();
1184
1185	if (al == NULL)
1186	fatal (OUT_OF_MEMORY);
1187	al->next = NULL;
1188	al->items = NULL;
1189	al->total_chance = 0;
1190	return al;
1191	}	1156	}
1192		1157
1193	/*	1158	/*
1194	* Allocate and return the pointer to an empty artifact structure.	1159	* Allocate and return the pointer to an empty artifact structure.
1195	*/	1160	*/
1196
1197	static artifact *	1161	static artifact *
1198	get_empty_artifact (void)	1162	get_empty_artifact ()
1199	{	1163	{
1200	artifact *a = (artifact *) malloc (sizeof (artifact));	1164	return salloc0<artifact> ();
1201
1202	if (a == NULL)
1203	fatal (OUT_OF_MEMORY);
1204	a->item = NULL;
1205	a->next = NULL;
1206	a->chance = 0;
1207	a->difficulty = 0;
1208	a->allowed = NULL;
1209	return a;
1210	}	1165	}
1211		1166
1212	/*	1167	/*
1213	* Searches the artifact lists and returns one that has the same type	1168	* Searches the artifact lists and returns one that has the same type
1214	* of objects on it.	1169	* of objects on it.
1215	*/	1170	*/
1216
1217	artifactlist *	1171	artifactlist *
1218	find_artifactlist (int type)	1172	find_artifactlist (int type)
1219	{	1173	{
1220	artifactlist *al;
1221
1222	for (al = first_artifactlist; al != NULL; al = al->next)	1174	for (artifactlist *al = first_artifactlist; al; al = al->next)
1223	if (al->type == type)	1175	if (al->type == type)
1224	return al;	1176	return al;
		1177
1225	return NULL;	1178	return 0;
1226	}	1179	}
1227		1180
1228	/*	1181	/*
1229	* For debugging purposes. Dumps all tables.	1182	* Builds up the lists of artifacts from the file in the libdir.
1230	*/	1183	*/
1231
1232	void	1184	void
1233	dump_artifacts (void)
1234	{
1235	artifactlist *al;
1236	artifact *art;
1237	linked_char *next;
1238
1239	fprintf (logfile, "\n");
1240	for (al = first_artifactlist; al != NULL; al = al->next)
1241	{
1242	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1243	for (art = al->items; art != NULL; art = art->next)
1244	{
1245	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246	if (art->allowed != NULL)
1247	{
1248	fprintf (logfile, "\tAllowed combinations:");
1249	for (next = art->allowed; next != NULL; next = next->next)
1250	fprintf (logfile, "%s,", &next->name);
1251	fprintf (logfile, "\n");
1252	}
1253	}
1254	}
1255	fprintf (logfile, "\n");
1256	}
1257
1258	/*
1259	* For debugging purposes. Dumps all treasures recursively (see below).
1260	*/
1261	void
1262	dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1263	{
1264	treasurelist *tl;
1265	int i;
1266
1267	if (depth > 100)
1268	return;
1269	while (t)
1270	{
1271	if (t->name)
1272	{
1273	for (i = 0; i < depth; i++)
1274	fprintf (logfile, " ");
1275	fprintf (logfile, "{ (list: %s)\n", &t->name);
1276	tl = find_treasurelist (t->name);
1277	if (tl)
1278	dump_monster_treasure_rec (name, tl->items, depth + 2);
1279	for (i = 0; i < depth; i++)
1280	fprintf (logfile, " ");
1281	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282	}
1283	else
1284	{
1285	for (i = 0; i < depth; i++)
1286	fprintf (logfile, " ");
1287	if (t->item && t->item->clone.type == FLESH)
1288	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1289	else
1290	fprintf (logfile, "%s\n", &t->item->clone.name);
1291	}
1292
1293	if (t->next_yes)
1294	{
1295	for (i = 0; i < depth; i++)
1296	fprintf (logfile, " ");
1297	fprintf (logfile, " (if yes)\n");
1298	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1299	}
1300
1301	if (t->next_no)
1302	{
1303	for (i = 0; i < depth; i++)
1304	fprintf (logfile, " ");
1305	fprintf (logfile, " (if no)\n");
1306	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1307	}
1308
1309	t = t->next;
1310	}
1311	}
1312
1313	/*
1314	* For debugging purposes. Dumps all treasures for a given monster.
1315	* Created originally by Raphael Quinet for debugging the alchemy code.
1316	*/
1317
1318	void
1319	dump_monster_treasure (const char *name)
1320	{
1321	archetype *at;
1322	int found;
1323
1324	found = 0;
1325	fprintf (logfile, "\n");
1326	for (at = first_archetype; at != NULL; at = at->next)
1327	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1328	{
1329	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1330	if (at->clone.randomitems != NULL)
1331	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1332	else
1333	fprintf (logfile, "(nothing)\n");
1334	fprintf (logfile, "\n");
1335	found++;
1336	}
1337	if (found == 0)
1338	fprintf (logfile, "No objects have the name %s!\n\n", name);
1339	}
1340
1341	/*
1342	* Builds up the lists of artifacts from the file in the libdir.
1343	*/
1344
1345	void
1346	init_artifacts (void)	1185	init_artifacts ()
1347	{	1186	{
1348	static int has_been_inited = 0;	1187	static int has_been_inited = 0;
1349	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;
1350	artifact *art = NULL;	1188	artifact *art = NULL;
1351	linked_char *tmp;
1352	int value;
1353	artifactlist *al;	1189	artifactlist *al;
1354		1190
1355	if (has_been_inited)	1191	if (has_been_inited)
1356	return;	1192	return;
1357	else	1193	else
1358	has_been_inited = 1;	1194	has_been_inited = 1;
1359		1195
1360	sprintf (filename, "%s/artifacts", settings.datadir);	1196	object_thawer f (settings.datadir, "artifacts");
1361	object_thawer thawer (filename);
1362		1197
1363	if (!thawer)	1198	if (!f)
1364	return;	1199	return;
1365		1200
1366	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1201	for (;;)
1367	{	1202	{
1368	if (*buf == '#')	1203	switch (f.kw)
1369	continue;
1370	if ((cp = strchr (buf, '\n')) != NULL)
1371	*cp = '\0';
1372	cp = buf;
1373	while (*cp == ' ') /* Skip blanks */
1374	cp++;
1375	if (*cp == '\0')
1376	continue;
1377
1378	if (!strncmp (cp, "Allowed", 7))
1379	{	1204	{
		1205	case KW_allowed:
1380	if (art == NULL)	1206	if (!art)
		1207	art = get_empty_artifact ();
		1208
1381	{	1209	{
1382	art = get_empty_artifact ();	1210	if (!strcmp (f.get_str (), "all"))
1383	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));
1384	}	1227	}
1385	cp = strchr (cp, ' ') + 1;	1228	break;
1386	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	}
1387	continue;	1261	continue;
1388		1262
1389	do	1263	case KW_EOF:
		1264	goto done;
		1265
		1266	default:
		1267	if (!f.parse_error ("artifacts file"))
		1268	cleanup ("artifacts file required");
1390	{	1269	break;
1391	nrofallowedstr++;
1392	if ((next = strchr (cp, ',')) != NULL)
1393	*(next++) = '\0';
1394	tmp = new linked_char;
1395
1396	tmp->name = cp;
1397	tmp->next = art->allowed;
1398	art->allowed = tmp;
1399	}
1400	while ((cp = next) != NULL);
1401	}
1402	else if (sscanf (cp, "chance %d", &value))
1403	art->chance = (uint16) value;
1404	else if (sscanf (cp, "difficulty %d", &value))
1405	art->difficulty = (uint8) value;
1406	else if (!strncmp (cp, "Object", 6) || !strncmp (cp, "object", 6))
1407	{	1270	}
1408	art->item = object::create ();
1409		1271
1410	if (!load_object (thawer, art->item, 0))	1272	f.next ();
1411	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1412
1413	art->item->name = strchr (cp, ' ') + 1;
1414	al = find_artifactlist (art->item->type);
1415	if (al == NULL)
1416	{
1417	al = get_empty_artifactlist ();
1418	al->type = art->item->type;
1419	al->next = first_artifactlist;
1420	first_artifactlist = al;
1421	}
1422	art->next = al->items;
1423	al->items = art;
1424	art = NULL;
1425	}
1426	else
1427	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1428	}	1273	}
1429		1274
		1275	done:
1430	for (al = first_artifactlist; al != NULL; al = al->next)	1276	for (al = first_artifactlist; al; al = al->next)
1431	{	1277	{
		1278	al->total_chance = 0;
		1279
1432	for (art = al->items; art != NULL; art = art->next)	1280	for (art = al->items; art; art = art->next)
1433	{	1281	{
1434	if (!art->chance)	1282	if (!art->chance)
1435	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);
1436	else	1284	else
1437	al->total_chance += art->chance;	1285	al->total_chance += art->chance;
1438	}	1286	}
1439	#if 0	1287	#if 0
1440	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);
1441	#endif	1289	#endif
1442	}	1290	}
1443
1444	LOG (llevDebug, "done.\n");
1445	}	1291	}
1446
1447		1292
1448	/*	1293	/*
1449	* Used in artifact generation. The bonuses of the first object	1294	* Used in artifact generation. The bonuses of the first object
1450	* is modified by the bonuses of the second object.	1295	* is modified by the bonuses of the second object.
1451	*/	1296	*/
1452
1453	void	1297	void
1454	add_abilities (object *op, object *change)	1298	add_abilities (object *op, object *change)
1455	{	1299	{
1456	int i, tmp;
1457
1458	if (change->face != blank_face)	1300	if (change->face != blank_face)
1459	{
1460	#ifdef TREASURE_VERBOSE
1461	LOG (llevDebug, "FACE: %d\n", change->face->number);
1462	#endif
1463	op->face = change->face;	1301	op->face = change->face;
1464	}
1465		1302
1466	for (i = 0; i < NUM_STATS; i++)	1303	for (int i = 0; i < NUM_STATS; i++)
1467	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1304	change_attr_value (&(op->stats), i, change->stats.stat (i));
1468		1305
1469	op->attacktype |= change->attacktype;	1306	op->attacktype |= change->attacktype;
1470	op->path_attuned |= change->path_attuned;	1307	op->path_attuned |= change->path_attuned;
1471	op->path_repelled |= change->path_repelled;	1308	op->path_repelled |= change->path_repelled;
1472	op->path_denied |= change->path_denied;	1309	op->path_denied |= change->path_denied;
1473	op->move_type |= change->move_type;	1310	op->move_type |= change->move_type;
1474	op->stats.luck += change->stats.luck;	1311	op->stats.luck += change->stats.luck;
1475		1312
1476	if (QUERY_FLAG (change, FLAG_CURSED))	1313	static const struct copyflags : object::flags_t
1477	SET_FLAG (op, FLAG_CURSED);	1314	{
1478	if (QUERY_FLAG (change, FLAG_DAMNED))	1315	copyflags ()
1479	SET_FLAG (op, FLAG_DAMNED);	1316	{
1480	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)
1481	set_abs_magic (op, -op->magic);	1334	set_abs_magic (op, -op->magic);
1482		1335
1483	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1336	if (change->flag [FLAG_STAND_STILL])
1484	SET_FLAG (op, FLAG_LIFESAVE);
1485	if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1486	SET_FLAG (op, FLAG_REFL_SPELL);
1487	if (QUERY_FLAG (change, FLAG_STEALTH))
1488	SET_FLAG (op, FLAG_STEALTH);
1489	if (QUERY_FLAG (change, FLAG_XRAYS))
1490	SET_FLAG (op, FLAG_XRAYS);
1491	if (QUERY_FLAG (change, FLAG_BLIND))
1492	SET_FLAG (op, FLAG_BLIND);
1493	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1494	SET_FLAG (op, FLAG_SEE_IN_DARK);
1495	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1496	SET_FLAG (op, FLAG_REFL_MISSILE);
1497	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1498	SET_FLAG (op, FLAG_MAKE_INVIS);
1499
1500	if (QUERY_FLAG (change, FLAG_STAND_STILL))
1501	{	1337	{
1502	CLEAR_FLAG (op, FLAG_ANIMATE);	1338	op->clr_flag (FLAG_ANIMATE);
		1339
1503	/* so artifacts will join */	1340	/* so artifacts will join */
1504	if (!QUERY_FLAG (op, FLAG_ALIVE))	1341	if (!op->flag [FLAG_ALIVE])
1505	op->speed = 0.0;	1342	op->speed = 0.;
1506		1343
1507	op->set_speed (op->speed);	1344	op->set_speed (op->speed);
1508	}	1345	}
1509		1346
1510	if (change->nrof)	1347	if (change->nrof)
1511	op->nrof = rndm (change->nrof) + 1;	1348	op->nrof = rndm (change->nrof) + 1;
1512		1349
1513	op->stats.exp += change->stats.exp; /* Speed modifier */	1350	op->stats.exp += change->stats.exp; /* Speed modifier */
1514	op->stats.wc += change->stats.wc;	1351	op->stats.wc += change->stats.wc;
1515	op->stats.ac += change->stats.ac;	1352	op->stats.ac += change->stats.ac;
1516		1353
1517	if (change->other_arch)	1354	if (change->other_arch)
1518	{	1355	{
1519	/* Basically, for horns & potions, the other_arch field is the spell	1356	/* Basically, for horns & potions, the other_arch field is the spell
1520	* 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
1521	* this object.	1358	* this object.
1522	*/	1359	*/
1523	if (op->type == HORN || op->type == POTION)	1360	if (op->type == HORN || op->type == POTION)
1524	{	1361	{
1525	object *tmp_obj;
1526
1527	/* Remove any spells this object currently has in it */	1362	/* Remove any spells this object currently has in it */
1528	while (op->inv)
1529	op->inv->destroy ();	1363	op->destroy_inv (false);
1530		1364
1531	tmp_obj = arch_to_object (change->other_arch);	1365	object *tmp = change->other_arch->instance ();
1532	insert_ob_in_ob (tmp_obj, op);	1366	insert_ob_in_ob (tmp, op);
1533	}	1367	}
		1368
1534	/* No harm setting this for potions/horns */	1369	/* No harm setting this for potions/horns */
1535	op->other_arch = change->other_arch;	1370	op->other_arch = change->other_arch;
1536	}	1371	}
1537		1372
1538	if (change->stats.hp < 0)	1373	if (change->stats.hp < 0)
…		…
1554	op->stats.maxsp = -change->stats.maxsp;	1389	op->stats.maxsp = -change->stats.maxsp;
1555	else	1390	else
1556	op->stats.maxsp += change->stats.maxsp;	1391	op->stats.maxsp += change->stats.maxsp;
1557		1392
1558	if (change->stats.food < 0)	1393	if (change->stats.food < 0)
1559	op->stats.food = -(change->stats.food);	1394	op->stats.food = -change->stats.food;
1560	else	1395	else
1561	op->stats.food += change->stats.food;	1396	op->stats.food += change->stats.food;
1562		1397
1563	if (change->level < 0)	1398	if (change->level < 0)
1564	op->level = -(change->level);	1399	op->level = -change->level;
1565	else	1400	else
1566	op->level += change->level;	1401	op->level += change->level;
1567		1402
1568	if (change->gen_sp_armour < 0)	1403	if (change->gen_sp_armour < 0)
1569	op->gen_sp_armour = -(change->gen_sp_armour);	1404	op->gen_sp_armour = -change->gen_sp_armour;
1570	else	1405	else
1571	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;
1572		1407
1573	op->item_power = change->item_power;	1408	op->item_power = change->item_power;
1574		1409
1575	for (i = 0; i < NROFATTACKS; i++)	1410	for (int i = 0; i < NROFATTACKS; i++)
1576	if (change->resist[i])
1577	op->resist[i] += change->resist[i];	1411	op->resist[i] += change->resist[i];
1578		1412
1579	if (change->stats.dam)	1413	if (change->stats.dam)
1580	{	1414	{
1581	if (change->stats.dam < 0)	1415	if (change->stats.dam < 0)
1582	op->stats.dam = (-change->stats.dam);	1416	op->stats.dam = -change->stats.dam;
1583	else if (op->stats.dam)	1417	else if (op->stats.dam)
1584	{	1418	{
1585	tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10);	1419	int tmp = op->stats.dam * change->stats.dam / 10;
		1420
1586	if (tmp == op->stats.dam)	1421	if (tmp == op->stats.dam)
1587	{	1422	{
1588	if (change->stats.dam < 10)	1423	if (change->stats.dam < 10)
1589	op->stats.dam--;	1424	op->stats.dam--;
1590	else	1425	else
…		…
1596	}	1431	}
1597		1432
1598	if (change->weight)	1433	if (change->weight)
1599	{	1434	{
1600	if (change->weight < 0)	1435	if (change->weight < 0)
1601	op->weight = (-change->weight);	1436	op->weight = -change->weight;
1602	else	1437	else
1603	op->weight = (op->weight * (change->weight)) / 100;	1438	op->weight = op->weight * change->weight / 100;
1604	}	1439	}
1605		1440
1606	if (change->last_sp)	1441	if (change->last_sp)
1607	{	1442	{
1608	if (change->last_sp < 0)	1443	if (change->last_sp < 0)
1609	op->last_sp = (-change->last_sp);	1444	op->last_sp = -change->last_sp;
1610	else	1445	else
1611	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;
1612	}	1447	}
1613		1448
1614	if (change->gen_sp_armour)	1449	if (change->gen_sp_armour)
1615	{	1450	{
1616	if (change->gen_sp_armour < 0)	1451	if (change->gen_sp_armour < 0)
1617	op->gen_sp_armour = (-change->gen_sp_armour);	1452	op->gen_sp_armour = -change->gen_sp_armour;
1618	else	1453	else
1619	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;
1620	}	1455	}
1621		1456
1622	op->value *= change->value;	1457	op->value *= change->value;
1623		1458
1624	if (change->materials)	1459	if (change->materials)
1625	op->materials = change->materials;	1460	op->materials = change->materials;
1626		1461
1627	if (change->materialname)	1462	if (change->material != MATERIAL_NULL)
1628	op->materialname = change->materialname;	1463	op->material = change->material;
1629		1464
1630	if (change->slaying)	1465	if (change->slaying)
1631	op->slaying = change->slaying;	1466	op->slaying = change->slaying;
1632		1467
1633	if (change->race)	1468	if (change->race)
…		…
1636	if (change->msg)	1471	if (change->msg)
1637	op->msg = change->msg;	1472	op->msg = change->msg;
1638	}	1473	}
1639		1474
1640	static int	1475	static int
1641	legal_artifact_combination (object *op, artifact * art)	1476	legal_artifact_combination (object *op, artifact *art)
1642	{	1477	{
1643	int neg, success = 0;	1478	int neg, success = 0;
1644	linked_char *tmp;	1479	linked_char *tmp;
1645	const char *name;	1480	const char *name;
1646		1481
1647	if (art->allowed == (linked_char *) NULL)	1482	if (!art->allowed)
1648	return 1; /* Ie, "all" */	1483	return 1; /* Ie, "all" */
		1484
1649	for (tmp = art->allowed; tmp; tmp = tmp->next)	1485	for (tmp = art->allowed; tmp; tmp = tmp->next)
1650	{	1486	{
1651	#ifdef TREASURE_VERBOSE	1487	#ifdef TREASURE_VERBOSE
1652	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1488	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1653	#endif	1489	#endif
1654	if (*tmp->name == '!')	1490	if (*tmp->name == '!')
1655	name = tmp->name + 1, neg = 1;	1491	name = tmp->name + 1, neg = 1;
1656	else	1492	else
1657	name = tmp->name, neg = 0;	1493	name = tmp->name, neg = 0;
1658		1494
1659	/* If we match name, then return the opposite of 'neg' */	1495	/* If we match name, then return the opposite of 'neg' */
1660	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1496	if (!strcmp (name, op->arch->archname))
1661	return !neg;	1497	return !neg;
1662		1498
1663	/* 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
1664	* everything is allowed except what we match	1500	* everything is allowed except what we match
1665	*/	1501	*/
1666	else if (neg)	1502	else if (neg)
1667	success = 1;	1503	success = 1;
1668	}	1504	}
		1505
1669	return success;	1506	return success;
1670	}	1507	}
1671		1508
1672	/*	1509	/*
1673	* Fixes the given object, giving it the abilities and titles	1510	* Fixes the given object, giving it the abilities and titles
…		…
1675	*/	1512	*/
1676		1513
1677	void	1514	void
1678	give_artifact_abilities (object *op, object *artifct)	1515	give_artifact_abilities (object *op, object *artifct)
1679	{	1516	{
1680	char new_name[MAX_BUF];	1517	op->title = format ("of %s", &artifct->name);
1681		1518
1682	sprintf (new_name, "of %s", &artifct->name);
1683	op->title = new_name;
1684	add_abilities (op, artifct); /* Give out the bonuses */	1519	add_abilities (op, artifct); /* Give out the bonuses */
1685		1520
1686	#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... */
1687	{	1522	{
1688	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1523	char identified = op->flag [FLAG_IDENTIFIED];
1689		1524
1690	SET_FLAG (op, FLAG_IDENTIFIED);	1525	op->set_flag (FLAG_IDENTIFIED);
1691	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));
1692	if (!identified)	1527	if (!identified)
1693	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1528	op->clr_flag (FLAG_IDENTIFIED);
1694	}	1529	}
1695	#endif	1530	#endif
1696	return;	1531	return;
1697	}	1532	}
1698		1533
…		…
1708	#define ARTIFACT_TRIES 2	1543	#define ARTIFACT_TRIES 2
1709		1544
1710	void	1545	void
1711	generate_artifact (object *op, int difficulty)	1546	generate_artifact (object *op, int difficulty)
1712	{	1547	{
1713	artifactlist *al;
1714	artifact *art;	1548	artifact *art;
1715	int i;
1716		1549
1717	al = find_artifactlist (op->type);	1550	artifactlist *al = find_artifactlist (op->type);
1718		1551
1719	if (al == NULL)	1552	if (al == NULL)
1720	{	1553	{
1721	#if 0 /* This is too verbose, usually */	1554	#if 0 /* This is too verbose, usually */
1722	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);
1723	#endif	1556	#endif
1724	return;	1557	return;
1725	}	1558	}
1726		1559
1727	for (i = 0; i < ARTIFACT_TRIES; i++)	1560	for (int i = 0; i < ARTIFACT_TRIES; i++)
1728	{	1561	{
1729	int roll = rndm (al->total_chance);	1562	int roll = rndm (al->total_chance);
1730		1563
1731	for (art = al->items; art; art = art->next)	1564	for (art = al->items; art; art = art->next)
1732	{	1565	{
…		…
1740	#if 1	1573	#if 1
1741	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);
1742	#endif	1575	#endif
1743	return;	1576	return;
1744	}	1577	}
1745	if (!strcmp (art->item->name, "NONE"))	1578
		1579	if (art->item->name == shstr_NONE)
1746	return;	1580	return;
		1581
1747	if (FABS (op->magic) < art->item->magic)	1582	if (fabs (op->magic) < art->item->magic)
1748	continue; /* Not magic enough to be this item */	1583	continue; /* Not magic enough to be this item */
1749		1584
1750	/* Map difficulty not high enough */	1585	/* Map difficulty not high enough */
1751	if (difficulty < art->difficulty)	1586	if (difficulty < art->difficulty)
1752	continue;	1587	continue;
1753		1588
1754	if (!legal_artifact_combination (op, art))	1589	if (!legal_artifact_combination (op, art))
1755	{	1590	{
1756	#ifdef TREASURE_VERBOSE	1591	#ifdef TREASURE_VERBOSE
1757	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);
1758	#endif	1593	#endif
1759	continue;	1594	continue;
1760	}	1595	}
		1596
1761	give_artifact_abilities (op, art->item);	1597	give_artifact_abilities (op, art->item);
1762	return;	1598	return;
1763	}	1599	}
1764	}	1600	}
1765		1601
…		…
1769	*/	1605	*/
1770		1606
1771	void	1607	void
1772	fix_flesh_item (object *item, object *donor)	1608	fix_flesh_item (object *item, object *donor)
1773	{	1609	{
1774	char tmpbuf[MAX_BUF];
1775	int i;
1776
1777	if (item->type == FLESH && donor)	1610	if (item->type == FLESH && donor)
1778	{	1611	{
1779	/* change the name */	1612	/* change the name */
1780	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name);	1613	item->name = format ("%s's %s", &donor->name, &item->name);
1781	item->name = tmpbuf;
1782	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl);	1614	item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1783	item->name_pl = tmpbuf;
1784		1615
1785	/* weight is FLESH weight/100 * donor */	1616	/* weight is FLESH weight/100 * donor */
1786	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);
1787	item->weight = 1;
1788		1618
1789	/* value is multiplied by level of donor */	1619	/* value is multiplied by level of donor */
1790	item->value *= isqrt (donor->level * 2);	1620	item->value *= isqrt (donor->level * 2);
1791		1621
1792	/* food value */	1622	/* food value */
1793	item->stats.food += (donor->stats.hp / 100) + donor->stats.Con;	1623	item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1794		1624
1795	/* flesh items inherit some abilities of donor, but not	1625	/* flesh items inherit some abilities of donor, but not
1796	* full effect.	1626	* full effect.
1797	*/	1627	*/
1798	for (i = 0; i < NROFATTACKS; i++)	1628	for (int i = 0; i < NROFATTACKS; i++)
1799	item->resist[i] = donor->resist[i] / 2;	1629	item->resist[i] = donor->resist[i] / 2;
1800		1630
1801	/* item inherits donor's level (important for quezals) */	1631	/* item inherits donor's level (important for quezals) */
1802	item->level = donor->level;	1632	item->level = donor->level;
1803		1633
1804	/* if donor has some attacktypes, the flesh is poisonous */	1634	/* if donor has some attacktypes, the flesh is poisonous */
1805	if (donor->attacktype & AT_POISON)	1635	if (donor->attacktype & AT_POISON)
1806	item->type = POISON;	1636	item->type = POISON;
		1637
1807	if (donor->attacktype & AT_ACID)	1638	if (donor->attacktype & AT_ACID)
1808	item->stats.hp = -1 * item->stats.food;	1639	item->stats.hp = -item->stats.food;
1809	SET_FLAG (item, FLAG_NO_STEAL);
1810	}
1811	}
1812		1640
1813	/* special_potion() - so that old potion code is still done right. */	1641	item->set_flag (FLAG_NO_STEAL);
1814		1642	}
1815	int
1816	special_potion (object *op)
1817	{
1818	if (op->attacktype)
1819	return 1;
1820
1821	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1822	return 1;
1823
1824	for (int i = 0; i < NROFATTACKS; i++)
1825	if (op->resist[i])
1826	return 1;
1827
1828	return 0;
1829	}	1643	}
1830		1644
1831	void	1645	static void
1832	free_treasurestruct (treasure *t)	1646	free_treasurestruct (treasure *t)
1833	{	1647	{
1834	if (t->next)
1835	free_treasurestruct (t->next);	1648	if (t->next) free_treasurestruct (t->next);
1836	if (t->next_yes)
1837	free_treasurestruct (t->next_yes);	1649	if (t->next_yes) free_treasurestruct (t->next_yes);
1838	if (t->next_no)
1839	free_treasurestruct (t->next_no);	1650	if (t->next_no) free_treasurestruct (t->next_no);
1840		1651
1841	delete t;	1652	delete t;
1842	}	1653	}
1843		1654
1844	void	1655	static void
1845	free_charlinks (linked_char *lc)	1656	free_charlinks (linked_char *lc)
1846	{	1657	{
1847	if (lc->next)	1658	if (lc->next)
1848	free_charlinks (lc->next);	1659	free_charlinks (lc->next);
1849		1660
1850	delete lc;	1661	delete lc;
1851	}	1662	}
1852		1663
1853	void	1664	static void
1854	free_artifact (artifact * at)	1665	free_artifact (artifact *at)
1855	{	1666	{
1856	if (at->next)
1857	free_artifact (at->next);	1667	if (at->next) free_artifact (at->next);
1858
1859	if (at->allowed)
1860	free_charlinks (at->allowed);	1668	if (at->allowed) free_charlinks (at->allowed);
1861		1669
1862	at->item->destroy (1);	1670	at->item->destroy ();
1863		1671
1864	delete at;
1865	}
1866
1867	void
1868	free_artifactlist (artifactlist * al)
1869	{
1870	artifactlist *nextal;
1871
1872	for (al = first_artifactlist; al; al = nextal)
1873	{
1874	nextal = al->next;
1875
1876	if (al->items)
1877	free_artifact (al->items);
1878
1879	free (al);	1672	sfree (at);
1880	}
1881	}	1673	}
1882		1674
1883	void
1884	free_all_treasures (void)
1885	{
1886	treasurelist *tl, *next;
1887
1888
1889	for (tl = first_treasurelist; tl != NULL; tl = next)
1890	{
1891	next = tl->next;
1892	if (tl->items)
1893	free_treasurestruct (tl->items);
1894	delete tl;
1895	}
1896	free_artifactlist (first_artifactlist);
1897	}

Diff Legend

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