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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.40 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 05:24:55 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* 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
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24
25	#define ALLOWED_COMBINATION
26		23
27	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	24	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28	* 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
29	* 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
30	* left on	27	* left on
31	*/	28	*/
32	#define TREASURE_DEBUG	29	#define TREASURE_DEBUG
33		30
34	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	31	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35		32
36	/* #define TREASURE_VERBOSE */	33	//#define TREASURE_VERBOSE
37		34
38	#include <global.h>	35	#include <global.h>
39	#include <treasure.h>	36	#include <treasure.h>
40	#include <funcpoint.h>	37	#include <funcpoint.h>
41	#include <loader.h>	38	#include <loader.h>
42		39
		40	extern char *spell_mapping[];
		41
		42	static treasurelist *first_treasurelist;
43		43
44	static void change_treasure (treasure t, object op); /* overrule default values */	44	static void change_treasure (treasure t, object op); /* overrule default values */
45	extern char *spell_mapping[];
46		45
47	/*	46	typedef std::tr1::unordered_map<
48	* Initialize global archtype pointers:	47	const char *,
49	*/	48	treasurelist *,
		49	str_hash,
		50	str_equal,
		51	slice_allocator< std::pair<const char const, treasurelist > >,
		52	true
		53	> tl_map_t;
50		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
51	void	98	void
52	init_archetype_pointers ()	99	clear (treasurelist *tl)
53	{	100	{
54	int prev_warn = warn_archetypes;	101	if (tl->items)
		102	{
		103	free_treasurestruct (tl->items);
		104	tl->items = 0;
		105	}
55		106
56	warn_archetypes = 1;
57	if (ring_arch == NULL)
58	ring_arch = archetype::find ("ring");
59	if (amulet_arch == NULL)
60	amulet_arch = archetype::find ("amulet");
61	if (staff_arch == NULL)
62	staff_arch = archetype::find ("staff");
63	if (crown_arch == NULL)
64	crown_arch = archetype::find ("crown");
65	warn_archetypes = prev_warn;
66	}
67
68	/*
69	* Allocate and return the pointer to an empty treasurelist structure.
70	*/
71
72	static treasurelist *
73	get_empty_treasurelist (void)
74	{
75	return new treasurelist;
76	}
77
78	/*
79	* Allocate and return the pointer to an empty treasure structure.
80	*/
81	//TODO: make this a constructor
82	static treasure *
83	get_empty_treasure (void)
84	{
85	treasure *t = new treasure;
86
87	t->chance = 100;	107	tl->total_chance = 0;
88
89	return t;
90	}	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
91		130
92	/*	131	/*
93	* Reads the lib/treasure file from disk, and parses the contents	132	* Reads the lib/treasure file from disk, and parses the contents
94	* into an internal treasure structure (very linked lists)	133	* into an internal treasure structure (very linked lists)
95	*/	134	*/
96
97	static treasure *	135	static treasure *
98	load_treasure (FILE * fp, int *line)	136	read_treasure (object_thawer &f)
99	{	137	{
100	char buf[MAX_BUF], *cp, variable[MAX_BUF];
101	treasure *t = get_empty_treasure ();	138	treasure *t = new treasure;
102	int value;
103		139
104	nroftreasures++;	140	f.next ();
105	while (fgets (buf, MAX_BUF, fp) != NULL)
106	{
107	(*line)++;
108		141
109	if (*buf == '#')	142	for (;;)
110	continue;	143	{
111	if ((cp = strchr (buf, '\n')) != NULL)	144	coroapi::cede_to_tick ();
112	*cp = '\0';
113	cp = buf;
114	while (isspace (cp)) / Skip blanks */
115	cp++;
116		145
117	if (sscanf (cp, "arch %s", variable))	146	switch (f.kw)
118	{
119	if ((t->item = archetype::find (variable)) == NULL)
120	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121	}	147	{
122	else if (sscanf (cp, "list %s", variable))	148	case KW_arch:
123	t->name = variable;	149	t->item = archetype::find (f.get_str ());
124	else if (sscanf (cp, "change_name %s", variable))	150
125	t->change_arch.name = variable;	151	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	{	152	{
144	t->next = load_treasure (fp, line);	153	f.parse_warn ("treasure references unknown archetype");
		154	t->item = archetype::empty;
		155	}
		156
		157	break;
		158
		159	case KW_list: f.get (t->name); break;
		160	case KW_change_name: f.get (t->change_arch.name); break;
		161	case KW_change_title: f.get (t->change_arch.title); break;
		162	case KW_change_slaying: f.get (t->change_arch.slaying); break;
		163	case KW_chance: f.get (t->chance); break;
		164	case KW_nrof: f.get (t->nrof); break;
		165	case KW_magic: f.get (t->magic); break;
		166
		167	case KW_yes: t->next_yes = read_treasure (f); continue;
		168	case KW_no: t->next_no = read_treasure (f); continue;
		169
		170	case KW_end:
		171	f.next ();
145	return t;	172	return t;
		173
		174	case KW_more:
		175	t->next = read_treasure (f);
		176	return t;
		177
		178	default:
		179	if (!f.parse_error ("treasurelist", t->name))
		180	goto error;
		181
		182	return t;
146	}	183	}
147	else	184
148	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);	185	f.next ();
149	}	186	}
150	LOG (llevError, "treasure lacks 'end'.\n");	187
		188	// not reached
		189
		190	error:
		191	delete t;
151	return t;	192	return 0;
152	}	193	}
153		194
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	/*	195	/*
177	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
178	* Each treasure is parsed with the help of load_treasure().	196	* Each treasure is parsed with the help of load_treasure().
179	*/	197	*/
180		198	treasurelist *
181	void	199	treasurelist::read (object_thawer &f)
182	load_treasures (void)
183	{	200	{
184	FILE *fp;	201	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		202
190	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	203	bool one = f.kw == KW_treasureone;
191	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	204	treasurelist *tl = treasurelist::get (f.get_str ());
192	{	205	clear (tl);
193	LOG (llevError, "Can't open treasure file.\n");	206	tl->items = read_treasure (f);
		207	if (!tl->items)
194	return;	208	return 0;
195	}
196	while (fgets (buf, MAX_BUF, fp) != NULL)
197	{
198	line++;
199	if (buf == '#' \|\| buf == '\n')
200	; // ignore
201	else if (sscanf (buf, "treasureone %s\n", name) \|\| sscanf (buf, "treasure %s\n", name))
202	{
203	treasurelist *tl = get_empty_treasurelist ();
204		209
205	tl->name = name;
206	if (previous == NULL)
207	first_treasurelist = tl;
208	else
209	previous->next = tl;
210
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.	210	/* 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	211	* Add up the chance total, and check to make sure the yes & no
216	* fields of the treasures are not being used.	212	* fields of the treasures are not being used.
217	*/	213	*/
218	if (!strncmp (buf, "treasureone", 11))	214	if (one)
		215	{
		216	for (treasure *t = tl->items; t; t = t->next)
		217	{
		218	if (t->next_yes \|\| t->next_no)
219	{	219	{
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);	220	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");	221	LOG (llevError, " the next_yes or next_no field is set\n");
227	}
228	#endif
229	tl->total_chance += t->chance;
230	}
231	}	222	}
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		223
238	#ifdef TREASURE_DEBUG	224	tl->total_chance += t->chance;
239	/* Perform some checks on how valid the treasure data actually is.	225	}
240	* verify that list transitions work (ie, the list that it is supposed	226	}
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		227
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;	228	return tl;
270	}	229	}
271
272		230
273	/*	231	/*
274	* Generates the objects specified by the given treasure.	232	* Generates the objects specified by the given treasure.
275	* It goes recursively through the rest of the linked list.	233	* It goes recursively through the rest of the linked list.
276	* If there is a certain percental chance for a treasure to be generated,	234	* If there is a certain percental chance for a treasure to be generated,
282	* start with equipment, but only their abilities).	240	* start with equipment, but only their abilities).
283	*/	241	*/
284	static void	242	static void
285	put_treasure (object op, object creator, int flags)	243	put_treasure (object op, object creator, int flags)
286	{	244	{
287	object *tmp;	245	if (flags & GT_ENVIRONMENT)
288		246	{
289	/* Bit of a hack - spells should never be put onto the map. The entire	247	/* 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	248	* 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	249	* this is the original object, or if this is an object that should be created
292	* by another object.	250	* by another object.
293	*/	251	*/
294	if (flags & GT_ENVIRONMENT && op->type != SPELL)	252	//TODO: flag such as objects... as such (no drop, anybody?)
295	{	253	if (op->type == SPELL)
		254	{
		255	op->destroy ();
		256	return;
		257	}
		258
		259	op->expand_tail ();
		260
		261	if (op->blocked (creator->map, creator->x, creator->y))
		262	op->destroy ();
		263	else
		264	{
296	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	265	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
297	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);	266	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);
		267	}
298	}	268	}
299	else	269	else
300	{	270	{
301	op = creator->insert (op);	271	op = creator->insert (op);
302		272
303	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	273	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
304	monster_check_apply (creator, op);	274	monster_check_apply (creator, op);
305		275
306	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))	276	if (flags & GT_UPDATE_INV)
		277	if (object *tmp = creator->in_player ())
307	esrv_send_item (tmp, op);	278	esrv_send_item (tmp, op);
308	}	279	}
309	}	280	}
310		281
311	/* if there are change_xxx commands in the treasure, we include the changes	282	/* if there are change_xxx commands in the treasure, we include the changes
312	* in the generated object	283	* in the generated object
…		…
326		297
327	if (t->change_arch.slaying)	298	if (t->change_arch.slaying)
328	op->slaying = t->change_arch.slaying;	299	op->slaying = t->change_arch.slaying;
329	}	300	}
330		301
331	void	302	static void
332	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)	303	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)
333	{	304	{
334	object *tmp;
335
336	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)	305	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
337	{	306	{
338	if (t->name)	307	if (t->name)
339	{	308	{
340	if (difficulty >= t->magic)	309	if (difficulty >= t->magic)
		310	if (treasurelist *tl = treasurelist::find (t->name))
		311	create_treasure (tl, op, flag, difficulty, tries);
		312	else
		313	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
		314	}
		315	else
		316	{
		317	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
341	{	318	{
342	treasurelist *tl = find_treasurelist (t->name);
343	if (tl)
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);	319	object *tmp = arch_to_object (t->item);
		320
352	if (t->nrof && tmp->nrof <= 1)	321	if (t->nrof && tmp->nrof <= 1)
353	tmp->nrof = rndm (t->nrof) + 1;	322	tmp->nrof = rndm (t->nrof) + 1;
354		323
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	324	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	325	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	326	put_treasure (tmp, op, flag);
358	}	327	}
359	}	328	}
360		329
361	if (t->next_yes != NULL)	330	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	331	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	332	}
364	else if (t->next_no != NULL)	333	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	334	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		335
367	if (t->next != NULL)	336	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	337	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	338	}
370		339
371	void	340	static void
372	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)	341	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
373	{	342	{
374	int value = rndm (tl->total_chance);	343	int value = rndm (tl->total_chance);
375	treasure *t;	344	treasure *t;
376		345
…		…
378	{	347	{
379	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	348	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
380	return;	349	return;
381	}	350	}
382		351
383	for (t = tl->items; t != NULL; t = t->next)	352	for (t = tl->items; t; t = t->next)
384	{	353	{
385	value -= t->chance;	354	value -= t->chance;
386		355
387	if (value < 0)	356	if (value < 0)
388	break;	357	break;
389	}	358	}
390		359
391	if (!t \|\| value >= 0)	360	if (!t \|\| value >= 0)
392	{
393	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	361	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
394	abort ();
395	return;
396	}
397		362
398	if (t->name)	363	if (t->name)
399	{	364	{
400	if (difficulty >= t->magic)	365	if (difficulty >= t->magic)
401	{	366	{
402	treasurelist *tl = find_treasurelist (t->name);	367	treasurelist *tl = treasurelist::find (t->name);
403	if (tl)	368	if (tl)
404	create_treasure (tl, op, flag, difficulty, tries);	369	create_treasure (tl, op, flag, difficulty, tries);
405	}	370	}
406	else if (t->nrof)	371	else if (t->nrof)
407	create_one_treasure (tl, op, flag, difficulty, tries);	372	create_one_treasure (tl, op, flag, difficulty, tries);
408
409	return;
410	}	373	}
411
412	if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	374	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
413	{	375	{
414	object *tmp = arch_to_object (t->item);	376	if (object *tmp = arch_to_object (t->item))
415		377	{
416	if (!tmp)
417	return;
418
419	if (t->nrof && tmp->nrof <= 1)	378	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	379	tmp->nrof = rndm (t->nrof) + 1;
421		380
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	381	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	382	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	383	put_treasure (tmp, op, flag);
		384	}
425	}	385	}
		386	}
		387
		388	void
		389	object::create_treasure (treasurelist *tl, int flags)
		390	{
		391	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
426	}	392	}
427		393
428	/* This calls the appropriate treasure creation function. tries is passed	394	/* This calls the appropriate treasure creation function. tries is passed
429	* to determine how many list transitions or attempts to create treasure	395	* to determine how many list transitions or attempts to create treasure
430	* have been made. It is really in place to prevent infinite loops with	396	* have been made. It is really in place to prevent infinite loops with
…		…
433	* to do that.	399	* to do that.
434	*/	400	*/
435	void	401	void
436	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)	402	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
437	{	403	{
		404	// empty treasurelists are legal
		405	if (!tl->items)
		406	return;
		407
438	if (tries++ > 100)	408	if (tries++ > 100)
439	{	409	{
440	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	410	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441	return;	411	return;
		412	}
		413
		414	if (op->flag [FLAG_TREASURE_ENV])
		415	{
		416	// do not generate items when there already is something above the object
		417	if (op->flag [FLAG_IS_FLOOR] && op->above)
		418	return;
		419
		420	flag \|= GT_ENVIRONMENT;
442	}	421	}
443		422
444	if (tl->total_chance)	423	if (tl->total_chance)
445	create_one_treasure (tl, op, flag, difficulty, tries);	424	create_one_treasure (tl, op, flag, difficulty, tries);
446	else	425	else
…		…
455	object *	434	object *
456	generate_treasure (treasurelist *tl, int difficulty)	435	generate_treasure (treasurelist *tl, int difficulty)
457	{	436	{
458	difficulty = clamp (difficulty, 1, settings.max_level);	437	difficulty = clamp (difficulty, 1, settings.max_level);
459		438
460	object ob = object::create (), tmp;	439	object *ob = object::create ();
461		440
462	create_treasure (tl, ob, 0, difficulty, 0);	441	create_treasure (tl, ob, 0, difficulty, 0);
463		442
464	/* Don't want to free the object we are about to return */	443	/* Don't want to free the object we are about to return */
465	tmp = ob->inv;	444	object *tmp = ob->inv;
466	if (tmp != NULL)	445	if (tmp)
467	tmp->remove ();	446	tmp->remove ();
468		447
469	if (ob->inv)	448	if (ob->inv)
470	LOG (llevError, "In generate treasure, created multiple objects.\n");	449	LOG (llevError, "In generate treasure, created multiple objects.\n");
471		450
…		…
479	* 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
480	* magical bonus "wanted".	459	* magical bonus "wanted".
481	*/	460	*/
482		461
483	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	462	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484
485	/chance of magic difficulty/	463	// chance of magic difficulty
486
487	/* +0 +1 +2 +3 +4 */	464	// +0 +1 +2 +3 +4
488	{95, 2, 2, 1, 0}, /1 /	465	{95, 2, 2, 1, 0}, // 1
489	{92, 5, 2, 1, 0}, /2 /	466	{92, 5, 2, 1, 0}, // 2
490	{85, 10, 4, 1, 0}, /3 /	467	{85, 10, 4, 1, 0}, // 3
491	{80, 14, 4, 2, 0}, /4 /	468	{80, 14, 4, 2, 0}, // 4
492	{75, 17, 5, 2, 1}, /5 /	469	{75, 17, 5, 2, 1}, // 5
493	{70, 18, 8, 3, 1}, /6 /	470	{70, 18, 8, 3, 1}, // 6
494	{65, 21, 10, 3, 1}, /7 /	471	{65, 21, 10, 3, 1}, // 7
495	{60, 22, 12, 4, 2}, /8 /	472	{60, 22, 12, 4, 2}, // 8
496	{55, 25, 14, 4, 2}, /9 /	473	{55, 25, 14, 4, 2}, // 9
497	{50, 27, 16, 5, 2}, /10 /	474	{50, 27, 16, 5, 2}, // 10
498	{45, 28, 18, 6, 3}, /11 /	475	{45, 28, 18, 6, 3}, // 11
499	{42, 28, 20, 7, 3}, /12 /	476	{42, 28, 20, 7, 3}, // 12
500	{40, 27, 21, 8, 4}, /13 /	477	{40, 27, 21, 8, 4}, // 13
501	{38, 25, 22, 10, 5}, /14 /	478	{38, 25, 22, 10, 5}, // 14
502	{36, 23, 23, 12, 6}, /15 /	479	{36, 23, 23, 12, 6}, // 15
503	{33, 21, 24, 14, 8}, /16 /	480	{33, 21, 24, 14, 8}, // 16
504	{31, 19, 25, 16, 9}, /17 /	481	{31, 19, 25, 16, 9}, // 17
505	{27, 15, 30, 18, 10}, /18 /	482	{27, 15, 30, 18, 10}, // 18
506	{20, 12, 30, 25, 13}, /19 /	483	{20, 12, 30, 25, 13}, // 19
507	{15, 10, 28, 30, 17}, /20 /	484	{15, 10, 28, 30, 17}, // 20
508	{13, 9, 27, 28, 23}, /21 /	485	{13, 9, 27, 28, 23}, // 21
509	{10, 8, 25, 28, 29}, /22 /	486	{10, 8, 25, 28, 29}, // 22
510	{8, 7, 23, 26, 36}, /23 /	487	{ 8, 7, 23, 26, 36}, // 23
511	{6, 6, 20, 22, 46}, /24 /	488	{ 6, 6, 20, 22, 46}, // 24
512	{4, 5, 17, 18, 56}, /25 /	489	{ 4, 5, 17, 18, 56}, // 25
513	{2, 4, 12, 14, 68}, /26 /	490	{ 2, 4, 12, 14, 68}, // 26
514	{0, 3, 7, 10, 80}, /27 /	491	{ 0, 3, 7, 10, 80}, // 27
515	{0, 0, 3, 7, 90}, /28 /	492	{ 0, 0, 3, 7, 90}, // 28
516	{0, 0, 0, 3, 97}, /29 /	493	{ 0, 0, 0, 3, 97}, // 29
517	{0, 0, 0, 0, 100}, /30 /	494	{ 0, 0, 0, 0, 100}, // 30
518	{0, 0, 0, 0, 100}, /31 /	495	{ 0, 0, 0, 0, 100}, // 31
519	};	496	};
520
521		497
522	/* calculate the appropriate level for wands staves and scrolls.	498	/* calculate the appropriate level for wands staves and scrolls.
523	* 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)
524	*	500	*
525	* elmex Wed Aug 9 17:44:59 CEST 2006:	501	* elmex Wed Aug 9 17:44:59 CEST 2006:
526	* 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.
527	*/	503	*/
528
529	int	504	int
530	level_for_item (const object *op, int difficulty)	505	level_for_item (const object *op, int difficulty)
531	{	506	{
532	int olevel = 0;
533
534	if (!op->inv)	507	if (!op->inv)
535	{	508	{
536	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);
537	return 0;	510	return 0;
538	}	511	}
539		512
540	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	513	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
541		514
542	if (olevel <= 0)	515	if (olevel <= 0)
543	olevel = rndm (1, MIN (op->inv->level, 1));	516	olevel = rndm (1, op->inv->level);
544		517
545	if (olevel > MAXLEVEL)	518	return min (olevel, MAXLEVEL);
546	olevel = MAXLEVEL;
547
548	return olevel;
549	}	519	}
550		520
551	/*	521	/*
552	* Based upon the specified difficulty and upon the difftomagic_list array,	522	* Based upon the specified difficulty and upon the difftomagic_list array,
553	* a random magical bonus is returned. This is used when determine	523	* a random magical bonus is returned. This is used when determine
…		…
556	* elmex Thu Aug 10 18:45:44 CEST 2006:	526	* elmex Thu Aug 10 18:45:44 CEST 2006:
557	* 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
558	* weird integer between 1-31.	528	* weird integer between 1-31.
559	*	529	*
560	*/	530	*/
561
562	int	531	int
563	magic_from_difficulty (int difficulty)	532	magic_from_difficulty (int difficulty)
564	{	533	{
565	int percent = 0, magic = 0;	534	int percent = 0, magic = 0;
566	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	535	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
610		579
611	op->magic = magic;	580	op->magic = magic;
612	if (op->arch)	581	if (op->arch)
613	{	582	{
614	if (op->type == ARMOUR)	583	if (op->type == ARMOUR)
615	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	584	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616		585
617	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	586	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
618	magic = (-magic);	587	magic = (-magic);
619	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	588	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620	}	589	}
621	else	590	else
622	{	591	{
623	if (op->type == ARMOUR)	592	if (op->type == ARMOUR)
624	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	593	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
…		…
654	* 1) Since rings can have multiple bonuses, if the same bonus	623	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	624	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	625	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	626	* 2) Add code to deal with new PR method.
658	*/	627	*/
659
660	void	628	void
661	set_ring_bonus (object *op, int bonus)	629	set_ring_bonus (object *op, int bonus)
662	{	630	{
663		631
664	int r = rndm (bonus > 0 ? 25 : 11);	632	int r = rndm (bonus > 0 ? 25 : 11);
…		…
687	case 2:	655	case 2:
688	case 3:	656	case 3:
689	case 4:	657	case 4:
690	case 5:	658	case 5:
691	case 6:	659	case 6:
692	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	660	op->stats.stat (r) += bonus;
693	break;	661	break;
694		662
695	case 7:	663	case 7:
696	op->stats.dam += bonus;	664	op->stats.dam += bonus;
697	break;	665	break;
…		…
845	save_item_power = op->item_power;	813	save_item_power = op->item_power;
846	op->item_power = 0;	814	op->item_power = 0;
847		815
848	if (op->randomitems && op->type != SPELL)	816	if (op->randomitems && op->type != SPELL)
849	{	817	{
850	create_treasure (op->randomitems, op, flags, difficulty, 0);	818	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
851	if (!op->inv)
852	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
853
854	/* So the treasure doesn't get created again */	819	/* So the treasure doesn't get created again */
855	op->randomitems = NULL;	820	op->randomitems = 0;
856	}	821	}
857		822
858	if (difficulty < 1)	823	if (difficulty < 1)
859	difficulty = 1;	824	difficulty = 1;
860		825
…		…
864	ARG_INT (flags)))	829	ARG_INT (flags)))
865	return;	830	return;
866		831
867	if (!(flags & GT_MINIMAL))	832	if (!(flags & GT_MINIMAL))
868	{	833	{
869	if (op->arch == crown_arch)	834	if (IS_ARCH (op->arch, crown))
870	{	835	{
871	set_magic (difficulty, op, max_magic, flags);	836	set_magic (difficulty, op, max_magic, flags);
872	num_enchantments = calc_item_power (op, 1);	837	num_enchantments = calc_item_power (op, 1);
873	generate_artifact (op, difficulty);	838	generate_artifact (op, difficulty);
874	}	839	}
…		…
879		844
880	num_enchantments = calc_item_power (op, 1);	845	num_enchantments = calc_item_power (op, 1);
881		846
882	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	847	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
883	\|\| op->type == HORN	848	\|\| op->type == HORN
884	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	849	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
885	* used for shop_floors or treasures */
886	generate_artifact (op, difficulty);	850	generate_artifact (op, difficulty);
887	}	851	}
888		852
889	/* Object was made an artifact. Calculate its item_power rating.	853	/* Object was made an artifact. Calculate its item_power rating.
890	* the item_power in the object is what the artfiact adds.	854	* the item_power in the object is what the artfiact adds.
…		…
932	{	896	{
933	if (op->type == POTION)	897	if (op->type == POTION)
934	/* Handle healing and magic power potions */	898	/* Handle healing and magic power potions */
935	if (op->stats.sp && !op->randomitems)	899	if (op->stats.sp && !op->randomitems)
936	{	900	{
937	object *tmp;
938
939	tmp = get_archetype (spell_mapping[op->stats.sp]);	901	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
940	insert_ob_in_ob (tmp, op);	902	insert_ob_in_ob (tmp, op);
941	op->stats.sp = 0;	903	op->stats.sp = 0;
942	}	904	}
943	}	905	}
944	else if (!op->title) /* Only modify object if not special */	906	else if (!op->title) /* Only modify object if not special */
…		…
1002	SET_FLAG (op, FLAG_CURSED);	964	SET_FLAG (op, FLAG_CURSED);
1003	break;	965	break;
1004	}	966	}
1005		967
1006	case AMULET:	968	case AMULET:
1007	if (op->arch == amulet_arch)	969	if (IS_ARCH (op->arch, amulet))
1008	op->value = 5; / Since it's not just decoration */	970	op->value = 5; / Since it's not just decoration */
1009		971
1010	case RING:	972	case RING:
1011	if (op->arch == NULL)	973	if (!op->arch) // wtf? schmorp
1012	{	974	{
1013	op->destroy ();	975	op->destroy ();
1014	op = 0;	976	op = 0;
1015	break;	977	break;
1016	}	978	}
1017		979
1018	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	980	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1019	break;	981	break;
1020		982
1021	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	983	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1022	SET_FLAG (op, FLAG_CURSED);	984	SET_FLAG (op, FLAG_CURSED);
1023		985
…		…
1176	* Allocate and return the pointer to an empty artifactlist structure.	1138	* Allocate and return the pointer to an empty artifactlist structure.
1177	*/	1139	*/
1178	static artifactlist *	1140	static artifactlist *
1179	get_empty_artifactlist (void)	1141	get_empty_artifactlist (void)
1180	{	1142	{
1181	artifactlist al = (artifactlist ) malloc (sizeof (artifactlist));	1143	return salloc0<artifactlist> ();
1182
1183	if (al == NULL)
1184	fatal (OUT_OF_MEMORY);
1185	al->next = NULL;
1186	al->items = NULL;
1187	al->total_chance = 0;
1188	return al;
1189	}	1144	}
1190		1145
1191	/*	1146	/*
1192	* Allocate and return the pointer to an empty artifact structure.	1147	* Allocate and return the pointer to an empty artifact structure.
1193	*/	1148	*/
1194	static artifact *	1149	static artifact *
1195	get_empty_artifact (void)	1150	get_empty_artifact (void)
1196	{	1151	{
1197	artifact a = (artifact ) malloc (sizeof (artifact));	1152	return salloc0<artifact> ();
1198
1199	if (a == NULL)
1200	fatal (OUT_OF_MEMORY);
1201
1202	a->item = NULL;
1203	a->next = NULL;
1204	a->chance = 0;
1205	a->difficulty = 0;
1206	a->allowed = NULL;
1207	return a;
1208	}	1153	}
1209		1154
1210	/*	1155	/*
1211	* Searches the artifact lists and returns one that has the same type	1156	* Searches the artifact lists and returns one that has the same type
1212	* of objects on it.	1157	* of objects on it.
1213	*/	1158	*/
1214	artifactlist *	1159	artifactlist *
1215	find_artifactlist (int type)	1160	find_artifactlist (int type)
1216	{	1161	{
1217	artifactlist *al;
1218
1219	for (al = first_artifactlist; al; al = al->next)	1162	for (artifactlist *al = first_artifactlist; al; al = al->next)
1220	if (al->type == type)	1163	if (al->type == type)
1221	return al;	1164	return al;
1222		1165
1223	return 0;	1166	return 0;
1224	}
1225
1226	/*
1227	* For debugging purposes. Dumps all tables.
1228	*/
1229	void
1230	dump_artifacts (void)
1231	{
1232	artifactlist *al;
1233	artifact *art;
1234	linked_char *next;
1235
1236	fprintf (logfile, "\n");
1237	for (al = first_artifactlist; al != NULL; al = al->next)
1238	{
1239	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1240	for (art = al->items; art != NULL; art = art->next)
1241	{
1242	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1243	if (art->allowed != NULL)
1244	{
1245	fprintf (logfile, "\tallowed combinations:");
1246	for (next = art->allowed; next != NULL; next = next->next)
1247	fprintf (logfile, "%s,", &next->name);
1248	fprintf (logfile, "\n");
1249	}
1250	}
1251	}
1252	fprintf (logfile, "\n");
1253	}
1254
1255	/*
1256	* For debugging purposes. Dumps all treasures recursively (see below).
1257	*/
1258	void
1259	dump_monster_treasure_rec (const char name, treasure t, int depth)
1260	{
1261	treasurelist *tl;
1262	int i;
1263
1264	if (depth > 100)
1265	return;
1266	while (t)
1267	{
1268	if (t->name)
1269	{
1270	for (i = 0; i < depth; i++)
1271	fprintf (logfile, " ");
1272	fprintf (logfile, "{ (list: %s)\n", &t->name);
1273	tl = find_treasurelist (t->name);
1274	if (tl)
1275	dump_monster_treasure_rec (name, tl->items, depth + 2);
1276	for (i = 0; i < depth; i++)
1277	fprintf (logfile, " ");
1278	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1279	}
1280	else
1281	{
1282	for (i = 0; i < depth; i++)
1283	fprintf (logfile, " ");
1284	if (t->item && t->item->clone.type == FLESH)
1285	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1286	else
1287	fprintf (logfile, "%s\n", &t->item->clone.name);
1288	}
1289
1290	if (t->next_yes)
1291	{
1292	for (i = 0; i < depth; i++)
1293	fprintf (logfile, " ");
1294	fprintf (logfile, " (if yes)\n");
1295	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1296	}
1297
1298	if (t->next_no)
1299	{
1300	for (i = 0; i < depth; i++)
1301	fprintf (logfile, " ");
1302	fprintf (logfile, " (if no)\n");
1303	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1304	}
1305
1306	t = t->next;
1307	}
1308	}
1309
1310	/*
1311	* For debugging purposes. Dumps all treasures for a given monster.
1312	* Created originally by Raphael Quinet for debugging the alchemy code.
1313	*/
1314
1315	void
1316	dump_monster_treasure (const char *name)
1317	{
1318	archetype *at;
1319	int found;
1320
1321	found = 0;
1322	fprintf (logfile, "\n");
1323
1324	for (at = first_archetype; at != NULL; at = at->next)
1325	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1326	{
1327	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1328	if (at->clone.randomitems != NULL)
1329	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1330	else
1331	fprintf (logfile, "(nothing)\n");
1332
1333	fprintf (logfile, "\n");
1334	found++;
1335	}
1336
1337	if (found == 0)
1338	fprintf (logfile, "No objects have the name %s!\n\n", name);
1339	}	1167	}
1340		1168
1341	/*	1169	/*
1342	* Builds up the lists of artifacts from the file in the libdir.	1170	* Builds up the lists of artifacts from the file in the libdir.
1343	*/	1171	*/
…		…
1358	object_thawer f (filename);	1186	object_thawer f (filename);
1359		1187
1360	if (!f)	1188	if (!f)
1361	return;	1189	return;
1362		1190
1363	f.next ();
1364
1365	for (;;)	1191	for (;;)
1366	{	1192	{
1367	switch (f.kw)	1193	switch (f.kw)
1368	{	1194	{
1369	case KW_allowed:	1195	case KW_allowed:
1370	if (!art)	1196	if (!art)
1371	{
1372	art = get_empty_artifact ();	1197	art = get_empty_artifact ();
1373	nrofartifacts++;
1374	}
1375		1198
1376	{	1199	{
1377	if (!strcmp (f.get_str (), "all"))	1200	if (!strcmp (f.get_str (), "all"))
1378	break;	1201	break;
1379		1202
1380	char next, cp = f.get_str ();	1203	char next, cp = f.get_str ();
1381		1204
1382	do	1205	do
1383	{	1206	{
1384	nrofallowedstr++;
1385
1386	if ((next = strchr (cp, ',')))	1207	if ((next = strchr (cp, ',')))
1387	*next++ = '\0';	1208	*next++ = '\0';
1388		1209
1389	linked_char *tmp = new linked_char;	1210	linked_char *tmp = new linked_char;
1390		1211
…		…
1405	break;	1226	break;
1406		1227
1407	case KW_object:	1228	case KW_object:
1408	{	1229	{
1409	art->item = object::create ();	1230	art->item = object::create ();
		1231	f.get (art->item->name);
		1232	f.next ();
1410		1233
1411	if (!art->item->parse_kv (f))	1234	if (!art->item->parse_kv (f))
1412	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1235	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1413		1236
1414	al = find_artifactlist (art->item->type);	1237	al = find_artifactlist (art->item->type);
…		…
1440	}	1263	}
1441		1264
1442	done:	1265	done:
1443	for (al = first_artifactlist; al; al = al->next)	1266	for (al = first_artifactlist; al; al = al->next)
1444	{	1267	{
		1268	al->total_chance = 0;
		1269
1445	for (art = al->items; art; art = art->next)	1270	for (art = al->items; art; art = art->next)
1446	{	1271	{
1447	if (!art->chance)	1272	if (!art->chance)
1448	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1273	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1449	else	1274	else
…		…
1455	}	1280	}
1456		1281
1457	LOG (llevDebug, "done.\n");	1282	LOG (llevDebug, "done.\n");
1458	}	1283	}
1459		1284
1460
1461	/*	1285	/*
1462	* Used in artifact generation. The bonuses of the first object	1286	* Used in artifact generation. The bonuses of the first object
1463	* is modified by the bonuses of the second object.	1287	* is modified by the bonuses of the second object.
1464	*/	1288	*/
1465
1466	void	1289	void
1467	add_abilities (object op, object change)	1290	add_abilities (object op, object change)
1468	{	1291	{
1469	int i, tmp;	1292	int i, tmp;
1470		1293
1471	if (change->face != blank_face)	1294	if (change->face != blank_face)
1472	{	1295	{
1473	#ifdef TREASURE_VERBOSE	1296	#ifdef TREASURE_VERBOSE
1474	LOG (llevDebug, "FACE: %d\n", change->face->number);	1297	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1475	#endif	1298	#endif
1476	op->face = change->face;	1299	op->face = change->face;
1477	}	1300	}
1478		1301
1479	for (i = 0; i < NUM_STATS; i++)	1302	for (i = 0; i < NUM_STATS; i++)
1480	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1303	change_attr_value (&(op->stats), i, change->stats.stat (i));
1481		1304
1482	op->attacktype \|= change->attacktype;	1305	op->attacktype \|= change->attacktype;
1483	op->path_attuned \|= change->path_attuned;	1306	op->path_attuned \|= change->path_attuned;
1484	op->path_repelled \|= change->path_repelled;	1307	op->path_repelled \|= change->path_repelled;
1485	op->path_denied \|= change->path_denied;	1308	op->path_denied \|= change->path_denied;
…		…
1649	if (change->msg)	1472	if (change->msg)
1650	op->msg = change->msg;	1473	op->msg = change->msg;
1651	}	1474	}
1652		1475
1653	static int	1476	static int
1654	legal_artifact_combination (object op, artifact art)	1477	legal_artifact_combination (object op, artifact art)
1655	{	1478	{
1656	int neg, success = 0;	1479	int neg, success = 0;
1657	linked_char *tmp;	1480	linked_char *tmp;
1658	const char *name;	1481	const char *name;
1659		1482
1660	if (art->allowed == (linked_char *) NULL)	1483	if (!art->allowed)
1661	return 1; /* Ie, "all" */	1484	return 1; /* Ie, "all" */
		1485
1662	for (tmp = art->allowed; tmp; tmp = tmp->next)	1486	for (tmp = art->allowed; tmp; tmp = tmp->next)
1663	{	1487	{
1664	#ifdef TREASURE_VERBOSE	1488	#ifdef TREASURE_VERBOSE
1665	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1489	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1666	#endif	1490	#endif
1667	if (*tmp->name == '!')	1491	if (*tmp->name == '!')
1668	name = tmp->name + 1, neg = 1;	1492	name = tmp->name + 1, neg = 1;
1669	else	1493	else
1670	name = tmp->name, neg = 0;	1494	name = tmp->name, neg = 0;
1671		1495
1672	/* If we match name, then return the opposite of 'neg' */	1496	/* If we match name, then return the opposite of 'neg' */
1673	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->name)))	1497	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->archname)))
1674	return !neg;	1498	return !neg;
1675		1499
1676	/* 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
1677	* everything is allowed except what we match	1501	* everything is allowed except what we match
1678	*/	1502	*/
1679	else if (neg)	1503	else if (neg)
1680	success = 1;	1504	success = 1;
1681	}	1505	}
		1506
1682	return success;	1507	return success;
1683	}	1508	}
1684		1509
1685	/*	1510	/*
1686	* Fixes the given object, giving it the abilities and titles	1511	* Fixes the given object, giving it the abilities and titles
…		…
1765	continue;	1590	continue;
1766		1591
1767	if (!legal_artifact_combination (op, art))	1592	if (!legal_artifact_combination (op, art))
1768	{	1593	{
1769	#ifdef TREASURE_VERBOSE	1594	#ifdef TREASURE_VERBOSE
1770	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1595	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1771	#endif	1596	#endif
1772	continue;	1597	continue;
1773	}	1598	}
		1599
1774	give_artifact_abilities (op, art->item);	1600	give_artifact_abilities (op, art->item);
1775	return;	1601	return;
1776	}	1602	}
1777	}	1603	}
1778		1604
…		…
1822	SET_FLAG (item, FLAG_NO_STEAL);	1648	SET_FLAG (item, FLAG_NO_STEAL);
1823	}	1649	}
1824	}	1650	}
1825		1651
1826	/* special_potion() - so that old potion code is still done right. */	1652	/* special_potion() - so that old potion code is still done right. */
1827
1828	int	1653	int
1829	special_potion (object *op)	1654	special_potion (object *op)
1830	{	1655	{
1831	if (op->attacktype)	1656	if (op->attacktype)
1832	return 1;	1657	return 1;
…		…
1842	}	1667	}
1843		1668
1844	void	1669	void
1845	free_treasurestruct (treasure *t)	1670	free_treasurestruct (treasure *t)
1846	{	1671	{
1847	if (t->next)
1848	free_treasurestruct (t->next);	1672	if (t->next) free_treasurestruct (t->next);
1849	if (t->next_yes)
1850	free_treasurestruct (t->next_yes);	1673	if (t->next_yes) free_treasurestruct (t->next_yes);
1851	if (t->next_no)
1852	free_treasurestruct (t->next_no);	1674	if (t->next_no) free_treasurestruct (t->next_no);
1853		1675
1854	delete t;	1676	delete t;
1855	}	1677	}
1856		1678
1857	void	1679	void
…		…
1862		1684
1863	delete lc;	1685	delete lc;
1864	}	1686	}
1865		1687
1866	void	1688	void
1867	free_artifact (artifact * at)	1689	free_artifact (artifact *at)
1868	{	1690	{
1869	if (at->next)
1870	free_artifact (at->next);	1691	if (at->next) free_artifact (at->next);
1871
1872	if (at->allowed)
1873	free_charlinks (at->allowed);	1692	if (at->allowed) free_charlinks (at->allowed);
1874		1693
1875	at->item->destroy (1);	1694	at->item->destroy (1);
1876		1695
1877	delete at;	1696	sfree (at);
1878	}	1697	}
1879		1698
1880	void	1699	void
1881	free_artifactlist (artifactlist * al)	1700	free_artifactlist (artifactlist *al)
1882	{	1701	{
1883	artifactlist *nextal;	1702	artifactlist *nextal;
1884		1703
1885	for (al = first_artifactlist; al; al = nextal)	1704	for (al = first_artifactlist; al; al = nextal)
1886	{	1705	{
1887	nextal = al->next;	1706	nextal = al->next;
1888		1707
1889	if (al->items)	1708	if (al->items)
1890	free_artifact (al->items);	1709	free_artifact (al->items);
1891		1710
1892	free (al);	1711	sfree (al);
1893	}	1712	}
1894	}	1713	}
1895		1714
1896	void	1715	void
1897	free_all_treasures (void)	1716	free_all_treasures (void)
1898	{	1717	{
1899	treasurelist tl, next;	1718	treasurelist tl, next;
1900		1719
1901
1902	for (tl = first_treasurelist; tl != NULL; tl = next)	1720	for (tl = first_treasurelist; tl; tl = next)
1903	{	1721	{
		1722	clear (tl);
		1723
1904	next = tl->next;	1724	next = tl->next;
1905	if (tl->items)
1906	free_treasurestruct (tl->items);
1907	delete tl;	1725	delete tl;
1908	}	1726	}
		1727
1909	free_artifactlist (first_artifactlist);	1728	free_artifactlist (first_artifactlist);
1910	}	1729	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.40 by root, Wed Mar 14 00:04:58 2007 UTC vs. Revision 1.73 by root, Sun Apr 20 05:24:55 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.40 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 05:24:55 2008 UTC