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

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.37 by root, Thu Feb 8 03:09:31 2007 UTC vs. Revision 1.74 by root, Mon Apr 21 23:35:24 2008 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.37 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.74 by root, Mon Apr 21 23:35:24 2008 UTC