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

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC vs. Revision 1.121 by root, Sat Nov 17 23:40:00 2018 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC vs.
Revision 1.121 by root, Sat Nov 17 23:40:00 2018 UTC