ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.68 by root, Thu Nov 8 19:43:23 2007 UTC

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

Diff Legend

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