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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.41 by root, Mon Apr 16 06:23:40 2007 UTC vs.
Revision 1.84 by root, Thu Jan 1 11:41:17 2009 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
43	extern char *spell_mapping[];	39	extern char *spell_mapping[];
44		40
45	static treasurelist *first_treasurelist;	41	static treasurelist *first_treasurelist;
49	typedef std::tr1::unordered_map<	45	typedef std::tr1::unordered_map<
50	const char *,	46	const char *,
51	treasurelist *,	47	treasurelist *,
52	str_hash,	48	str_hash,
53	str_equal,	49	str_equal,
54	slice_allocator< std::pair<const char const, treasurelist > >,	50	slice_allocator< std::pair<const char const, treasurelist > >
55	true
56	> tl_map_t;	51	> tl_map_t;
57		52
58	static tl_map_t tl_map;	53	static tl_map_t tl_map;
59		54
60	/*	55	/*
61	* Initialize global archtype pointers:	56	* Searches for the given treasurelist
62	*/
63	void
64	init_archetype_pointers ()
65	{
66	int prev_warn = warn_archetypes;
67
68	warn_archetypes = 1;
69
70	if (ring_arch == NULL)
71	ring_arch = archetype::find ("ring");
72	if (amulet_arch == NULL)
73	amulet_arch = archetype::find ("amulet");
74	if (staff_arch == NULL)
75	staff_arch = archetype::find ("staff");
76	if (crown_arch == NULL)
77	crown_arch = archetype::find ("crown");
78
79	warn_archetypes = prev_warn;
80	}
81
82	/*
83	* Searches for the given treasurelist in the globally linked list
84	* of treasurelists which has been built by load_treasures().
85	*/	57	*/
86	treasurelist *	58	treasurelist *
87	treasurelist::find (const char *name)	59	treasurelist::find (const char *name)
88	{	60	{
89	if (!name)	61	if (!name)
90	return 0;	62	return 0;
91		63
92	AUTODECL (i, tl_map.find (name));	64	auto (i, tl_map.find (name));
93		65
94	if (i == tl_map.end ())	66	if (i == tl_map.end ())
95	return 0;	67	return 0;
96		68
97	return i->second;	69	return i->second;
…		…
127	if (tl->items)	99	if (tl->items)
128	{	100	{
129	free_treasurestruct (tl->items);	101	free_treasurestruct (tl->items);
130	tl->items = 0;	102	tl->items = 0;
131	}	103	}
		104
		105	tl->total_chance = 0;
132	}	106	}
		107
		108	#ifdef TREASURE_DEBUG
		109	/* recursived checks the linked list. Treasurelist is passed only
		110	* so that the treasure name can be printed out
		111	*/
		112	static void
		113	check_treasurelist (const treasure t, const treasurelist tl)
		114	{
		115	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
		116	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		117
		118	if (t->next)
		119	check_treasurelist (t->next, tl);
		120
		121	if (t->next_yes)
		122	check_treasurelist (t->next_yes, tl);
		123
		124	if (t->next_no)
		125	check_treasurelist (t->next_no, tl);
		126	}
		127	#endif
133		128
134	/*	129	/*
135	* Reads the lib/treasure file from disk, and parses the contents	130	* Reads the lib/treasure file from disk, and parses the contents
136	* into an internal treasure structure (very linked lists)	131	* into an internal treasure structure (very linked lists)
137	*/	132	*/
138
139	static treasure *	133	static treasure *
140	load_treasure (FILE * fp, int *line)	134	read_treasure (object_thawer &f)
141	{	135	{
142	char buf[MAX_BUF], *cp, variable[MAX_BUF];
143	treasure *t = new treasure;	136	treasure *t = new treasure;
144	int value;
145		137
146	nroftreasures++;	138	f.next ();
147	while (fgets (buf, MAX_BUF, fp) != NULL)
148	{
149	(*line)++;
150		139
151	if (*buf == '#')	140	for (;;)
152	continue;	141	{
153	if ((cp = strchr (buf, '\n')) != NULL)	142	coroapi::cede_to_tick ();
154	*cp = '\0';
155	cp = buf;
156	while (isspace (cp)) / Skip blanks */
157	cp++;
158		143
159	if (sscanf (cp, "arch %s", variable))	144	switch (f.kw)
160	{
161	if ((t->item = archetype::find (variable)) == NULL)
162	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
163	}	145	{
164	else if (sscanf (cp, "list %s", variable))	146	case KW_arch:
165	t->name = variable;	147	t->item = archetype::find (f.get_str ());
166	else if (sscanf (cp, "change_name %s", variable))	148
167	t->change_arch.name = variable;	149	if (!t->item)
168	else if (sscanf (cp, "change_title %s", variable))
169	t->change_arch.title = variable;
170	else if (sscanf (cp, "change_slaying %s", variable))
171	t->change_arch.slaying = variable;
172	else if (sscanf (cp, "chance %d", &value))
173	t->chance = (uint8) value;
174	else if (sscanf (cp, "nrof %d", &value))
175	t->nrof = (uint16) value;
176	else if (sscanf (cp, "magic %d", &value))
177	t->magic = (uint8) value;
178	else if (!strcmp (cp, "yes"))
179	t->next_yes = load_treasure (fp, line);
180	else if (!strcmp (cp, "no"))
181	t->next_no = load_treasure (fp, line);
182	else if (!strcmp (cp, "end"))
183	return t;
184	else if (!strcmp (cp, "more"))
185	{	150	{
186	t->next = load_treasure (fp, line);	151	f.parse_warn ("treasure references unknown archetype");
		152	t->item = archetype::empty;
		153	}
		154
		155	break;
		156
		157	case KW_list: f.get (t->name); break;
		158	case KW_change_name: f.get (t->change_arch.name); break;
		159	case KW_change_title: f.get (t->change_arch.title); break;
		160	case KW_change_slaying: f.get (t->change_arch.slaying); break;
		161	case KW_chance: f.get (t->chance); break;
		162	case KW_nrof: f.get (t->nrof); break;
		163	case KW_magic: f.get (t->magic); break;
		164
		165	case KW_yes: t->next_yes = read_treasure (f); continue;
		166	case KW_no: t->next_no = read_treasure (f); continue;
		167
		168	case KW_end:
		169	f.next ();
187	return t;	170	return t;
		171
		172	case KW_more:
		173	t->next = read_treasure (f);
		174	return t;
		175
		176	default:
		177	if (!f.parse_error ("treasurelist", t->name))
		178	goto error;
		179
		180	return t;
188	}	181	}
189	else	182
190	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);	183	f.next ();
191	}	184	}
192	LOG (llevError, "treasure lacks 'end'.\n");	185
		186	// not reached
		187
		188	error:
		189	delete t;
193	return t;	190	return 0;
194	}	191	}
195		192
196	#ifdef TREASURE_DEBUG
197
198	/* recursived checks the linked list. Treasurelist is passed only
199	* so that the treasure name can be printed out
200	*/
201	static void
202	check_treasurelist (const treasure t, const treasurelist tl)
203	{
204	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
205	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
206
207	if (t->next)
208	check_treasurelist (t->next, tl);
209
210	if (t->next_yes)
211	check_treasurelist (t->next_yes, tl);
212
213	if (t->next_no)
214	check_treasurelist (t->next_no, tl);
215	}
216	#endif
217
218	/*	193	/*
219	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
220	* Each treasure is parsed with the help of load_treasure().	194	* Each treasure is parsed with the help of load_treasure().
221	*/	195	*/
222		196	treasurelist *
223	void	197	treasurelist::read (object_thawer &f)
224	load_treasures (void)
225	{	198	{
226	FILE *fp;	199	assert (f.kw == KW_treasure \|\| f.kw == KW_treasureone);
227	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
228	treasure *t;
229	int comp, line = 0;
230		200
231	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	201	bool one = f.kw == KW_treasureone;
232	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	202	treasurelist *tl = treasurelist::get (f.get_str ());
233	{	203	clear (tl);
234	LOG (llevError, "Can't open treasure file.\n");	204	tl->items = read_treasure (f);
		205	if (!tl->items)
235	return;	206	return 0;
236	}
237	while (fgets (buf, MAX_BUF, fp) != NULL)
238	{
239	line++;
240	if (buf == '#' \|\| buf == '\n')
241	; // ignore
242	else if (sscanf (buf, "treasureone %s\n", name) \|\| sscanf (buf, "treasure %s\n", name))
243	{
244	treasurelist *tl = treasurelist::get (name);
245		207
246	clear (tl);
247	tl->items = load_treasure (fp, &line);
248
249	/* This is a one of the many items on the list should be generated.	208	/* This is a one of the many items on the list should be generated.
250	* Add up the chance total, and check to make sure the yes & no	209	* Add up the chance total, and check to make sure the yes & no
251	* fields of the treasures are not being used.	210	* fields of the treasures are not being used.
252	*/	211	*/
253	if (!strncmp (buf, "treasureone", 11))	212	if (one)
		213	{
		214	for (treasure *t = tl->items; t; t = t->next)
		215	{
		216	if (t->next_yes \|\| t->next_no)
254	{	217	{
255	for (t = tl->items; t; t = t->next)
256	{
257	#ifdef TREASURE_DEBUG
258	if (t->next_yes \|\| t->next_no)
259	{
260	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	218	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
261	LOG (llevError, " the next_yes or next_no field is set\n");	219	LOG (llevError, " the next_yes or next_no field is set\n");
262	}
263	#endif
264	tl->total_chance += t->chance;
265	}
266	}	220	}
267	}
268	else
269	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
270	}
271		221
272	close_and_delete (fp, comp);	222	tl->total_chance += t->chance;
		223	}
		224	}
273		225
274	#ifdef TREASURE_DEBUG	226	return tl;
275	/* Perform some checks on how valid the treasure data actually is.
276	* verify that list transitions work (ie, the list that it is supposed
277	* to transition to exists). Also, verify that at least the name
278	* or archetype is set for each treasure element.
279	*/
280	for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
281	check_treasurelist (tl->items, tl);
282	#endif
283	}	227	}
284		228
285	/*	229	/*
286	* Generates the objects specified by the given treasure.	230	* Generates the objects specified by the given treasure.
287	* It goes recursively through the rest of the linked list.	231	* It goes recursively through the rest of the linked list.
…		…
294	* start with equipment, but only their abilities).	238	* start with equipment, but only their abilities).
295	*/	239	*/
296	static void	240	static void
297	put_treasure (object op, object creator, int flags)	241	put_treasure (object op, object creator, int flags)
298	{	242	{
299	object *tmp;	243	if (flags & GT_ENVIRONMENT)
300		244	{
301	/* Bit of a hack - spells should never be put onto the map. The entire	245	/* Bit of a hack - spells should never be put onto the map. The entire
302	* treasure stuff is a problem - there is no clear idea of knowing	246	* treasure stuff is a problem - there is no clear idea of knowing
303	* this is the original object, or if this is an object that should be created	247	* this is the original object, or if this is an object that should be created
304	* by another object.	248	* by another object.
305	*/	249	*/
306	if (flags & GT_ENVIRONMENT && op->type != SPELL)	250	//TODO: flag such as objects... as such (no drop, anybody?)
307	{	251	if (op->type == SPELL)
		252	{
		253	op->destroy ();
		254	return;
		255	}
		256
		257	op->expand_tail ();
		258
		259	if (!creator->is_on_map () \|\| op->blocked (creator->map, creator->x, creator->y))
		260	op->destroy ();
		261	else
		262	{
308	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	263	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
309	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);	264	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);
		265	}
310	}	266	}
311	else	267	else
312	{	268	{
313	op = creator->insert (op);	269	op = creator->insert (op);
314		270
315	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	271	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
316	monster_check_apply (creator, op);	272	monster_check_apply (creator, op);
317
318	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
319	esrv_send_item (tmp, op);
320	}	273	}
321	}	274	}
322		275
323	/* if there are change_xxx commands in the treasure, we include the changes	276	/* if there are change_xxx commands in the treasure, we include the changes
324	* in the generated object	277	* in the generated object
…		…
346	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)	299	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
347	{	300	{
348	if (t->name)	301	if (t->name)
349	{	302	{
350	if (difficulty >= t->magic)	303	if (difficulty >= t->magic)
		304	if (treasurelist *tl = treasurelist::find (t->name))
351	create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);	305	create_treasure (tl, op, flag, difficulty, tries);
		306	else
		307	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
352	}	308	}
353	else	309	else
354	{	310	{
355	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))	311	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
356	{	312	{
357	object *tmp = arch_to_object (t->item);	313	object *tmp = arch_to_object (t->item);
358		314
359	if (t->nrof && tmp->nrof <= 1)	315	if (t->nrof && tmp->nrof <= 1)
360	tmp->nrof = rndm (t->nrof) + 1;	316	tmp->nrof = rndm (t->nrof) + 1;
…		…
407	create_treasure (tl, op, flag, difficulty, tries);	363	create_treasure (tl, op, flag, difficulty, tries);
408	}	364	}
409	else if (t->nrof)	365	else if (t->nrof)
410	create_one_treasure (tl, op, flag, difficulty, tries);	366	create_one_treasure (tl, op, flag, difficulty, tries);
411	}	367	}
412	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	368	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
413	{	369	{
414	if (object *tmp = arch_to_object (t->item))	370	if (object *tmp = arch_to_object (t->item))
415	{	371	{
416	if (t->nrof && tmp->nrof <= 1)	372	if (t->nrof && tmp->nrof <= 1)
417	tmp->nrof = rndm (t->nrof) + 1;	373	tmp->nrof = rndm (t->nrof) + 1;
…		…
419	fix_generated_item (tmp, op, difficulty, t->magic, flag);	375	fix_generated_item (tmp, op, difficulty, t->magic, flag);
420	change_treasure (t, tmp);	376	change_treasure (t, tmp);
421	put_treasure (tmp, op, flag);	377	put_treasure (tmp, op, flag);
422	}	378	}
423	}	379	}
		380	}
		381
		382	void
		383	object::create_treasure (treasurelist *tl, int flags)
		384	{
		385	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
424	}	386	}
425		387
426	/* This calls the appropriate treasure creation function. tries is passed	388	/* This calls the appropriate treasure creation function. tries is passed
427	* to determine how many list transitions or attempts to create treasure	389	* to determine how many list transitions or attempts to create treasure
428	* have been made. It is really in place to prevent infinite loops with	390	* have been made. It is really in place to prevent infinite loops with
…		…
441	{	403	{
442	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	404	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
443	return;	405	return;
444	}	406	}
445		407
		408	if (op->flag [FLAG_TREASURE_ENV])
		409	{
		410	// do not generate items when there already is something above the object
		411	if (op->flag [FLAG_IS_FLOOR] && op->above)
		412	return;
		413
		414	flag \|= GT_ENVIRONMENT;
		415	}
		416
446	if (tl->total_chance)	417	if (tl->total_chance)
447	create_one_treasure (tl, op, flag, difficulty, tries);	418	create_one_treasure (tl, op, flag, difficulty, tries);
448	else	419	else
449	create_all_treasures (tl->items, op, flag, difficulty, tries);	420	create_all_treasures (tl->items, op, flag, difficulty, tries);
450	}	421	}
…		…
457	object *	428	object *
458	generate_treasure (treasurelist *tl, int difficulty)	429	generate_treasure (treasurelist *tl, int difficulty)
459	{	430	{
460	difficulty = clamp (difficulty, 1, settings.max_level);	431	difficulty = clamp (difficulty, 1, settings.max_level);
461		432
462	object ob = object::create (), tmp;	433	object *ob = object::create ();
463		434
464	create_treasure (tl, ob, 0, difficulty, 0);	435	create_treasure (tl, ob, 0, difficulty, 0);
465		436
466	/* Don't want to free the object we are about to return */	437	/* Don't want to free the object we are about to return */
467	tmp = ob->inv;	438	object *tmp = ob->inv;
468	if (tmp != NULL)	439	if (tmp)
469	tmp->remove ();	440	tmp->remove ();
470		441
471	if (ob->inv)	442	if (ob->inv)
472	LOG (llevError, "In generate treasure, created multiple objects.\n");	443	LOG (llevError, "In generate treasure, created multiple objects.\n");
473		444
474	ob->destroy ();	445	ob->destroy ();
		446
475	return tmp;	447	return tmp;
476	}	448	}
477		449
478	/*	450	/*
479	* This is a new way of calculating the chance for an item to have	451	* This is a new way of calculating the chance for an item to have
…		…
481	* The array has two arguments, the difficulty of the level, and the	453	* The array has two arguments, the difficulty of the level, and the
482	* magical bonus "wanted".	454	* magical bonus "wanted".
483	*/	455	*/
484		456
485	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	457	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
486
487	/chance of magic difficulty/	458	// chance of magic difficulty
488
489	/* +0 +1 +2 +3 +4 */	459	// +0 +1 +2 +3 +4
490	{95, 2, 2, 1, 0}, /1 /	460	{95, 2, 2, 1, 0}, // 1
491	{92, 5, 2, 1, 0}, /2 /	461	{92, 5, 2, 1, 0}, // 2
492	{85, 10, 4, 1, 0}, /3 /	462	{85, 10, 4, 1, 0}, // 3
493	{80, 14, 4, 2, 0}, /4 /	463	{80, 14, 4, 2, 0}, // 4
494	{75, 17, 5, 2, 1}, /5 /	464	{75, 17, 5, 2, 1}, // 5
495	{70, 18, 8, 3, 1}, /6 /	465	{70, 18, 8, 3, 1}, // 6
496	{65, 21, 10, 3, 1}, /7 /	466	{65, 21, 10, 3, 1}, // 7
497	{60, 22, 12, 4, 2}, /8 /	467	{60, 22, 12, 4, 2}, // 8
498	{55, 25, 14, 4, 2}, /9 /	468	{55, 25, 14, 4, 2}, // 9
499	{50, 27, 16, 5, 2}, /10 /	469	{50, 27, 16, 5, 2}, // 10
500	{45, 28, 18, 6, 3}, /11 /	470	{45, 28, 18, 6, 3}, // 11
501	{42, 28, 20, 7, 3}, /12 /	471	{42, 28, 20, 7, 3}, // 12
502	{40, 27, 21, 8, 4}, /13 /	472	{40, 27, 21, 8, 4}, // 13
503	{38, 25, 22, 10, 5}, /14 /	473	{38, 25, 22, 10, 5}, // 14
504	{36, 23, 23, 12, 6}, /15 /	474	{36, 23, 23, 12, 6}, // 15
505	{33, 21, 24, 14, 8}, /16 /	475	{33, 21, 24, 14, 8}, // 16
506	{31, 19, 25, 16, 9}, /17 /	476	{31, 19, 25, 16, 9}, // 17
507	{27, 15, 30, 18, 10}, /18 /	477	{27, 15, 30, 18, 10}, // 18
508	{20, 12, 30, 25, 13}, /19 /	478	{20, 12, 30, 25, 13}, // 19
509	{15, 10, 28, 30, 17}, /20 /	479	{15, 10, 28, 30, 17}, // 20
510	{13, 9, 27, 28, 23}, /21 /	480	{13, 9, 27, 28, 23}, // 21
511	{10, 8, 25, 28, 29}, /22 /	481	{10, 8, 25, 28, 29}, // 22
512	{8, 7, 23, 26, 36}, /23 /	482	{ 8, 7, 23, 26, 36}, // 23
513	{6, 6, 20, 22, 46}, /24 /	483	{ 6, 6, 20, 22, 46}, // 24
514	{4, 5, 17, 18, 56}, /25 /	484	{ 4, 5, 17, 18, 56}, // 25
515	{2, 4, 12, 14, 68}, /26 /	485	{ 2, 4, 12, 14, 68}, // 26
516	{0, 3, 7, 10, 80}, /27 /	486	{ 0, 3, 7, 10, 80}, // 27
517	{0, 0, 3, 7, 90}, /28 /	487	{ 0, 0, 3, 7, 90}, // 28
518	{0, 0, 0, 3, 97}, /29 /	488	{ 0, 0, 0, 3, 97}, // 29
519	{0, 0, 0, 0, 100}, /30 /	489	{ 0, 0, 0, 0, 100}, // 30
520	{0, 0, 0, 0, 100}, /31 /	490	{ 0, 0, 0, 0, 100}, // 31
521	};	491	};
522
523		492
524	/* calculate the appropriate level for wands staves and scrolls.	493	/* calculate the appropriate level for wands staves and scrolls.
525	* This code presumes that op has had its spell object created (in op->inv)	494	* This code presumes that op has had its spell object created (in op->inv)
526	*	495	*
527	* elmex Wed Aug 9 17:44:59 CEST 2006:	496	* elmex Wed Aug 9 17:44:59 CEST 2006:
528	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	497	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
529	*/	498	*/
530
531	int	499	int
532	level_for_item (const object *op, int difficulty)	500	level_for_item (const object *op, int difficulty)
533	{	501	{
534	int olevel = 0;
535
536	if (!op->inv)	502	if (!op->inv)
537	{	503	{
538	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	504	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
539	return 0;	505	return 0;
540	}	506	}
541		507
542	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	508	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
543		509
544	if (olevel <= 0)	510	if (olevel <= 0)
545	olevel = rndm (1, MIN (op->inv->level, 1));	511	olevel = rndm (1, op->inv->level);
546		512
547	if (olevel > MAXLEVEL)	513	return min (olevel, MAXLEVEL);
548	olevel = MAXLEVEL;
549
550	return olevel;
551	}	514	}
552		515
553	/*	516	/*
554	* Based upon the specified difficulty and upon the difftomagic_list array,	517	* Based upon the specified difficulty and upon the difftomagic_list array,
555	* a random magical bonus is returned. This is used when determine	518	* a random magical bonus is returned. This is used when determine
…		…
611		574
612	op->magic = magic;	575	op->magic = magic;
613	if (op->arch)	576	if (op->arch)
614	{	577	{
615	if (op->type == ARMOUR)	578	if (op->type == ARMOUR)
616	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	579	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
617		580
618	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	581	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
619	magic = (-magic);	582	magic = (-magic);
		583
620	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	584	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
621	}	585	}
622	else	586	else
623	{	587	{
624	if (op->type == ARMOUR)	588	if (op->type == ARMOUR)
625	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	589	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		590
626	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	591	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
627	magic = (-magic);	592	magic = (-magic);
		593
628	op->weight = (op->weight * (100 - magic * 10)) / 100;	594	op->weight = (op->weight * (100 - magic * 10)) / 100;
629	}	595	}
630	}	596	}
631		597
632	/*	598	/*
…		…
687	case 2:	653	case 2:
688	case 3:	654	case 3:
689	case 4:	655	case 4:
690	case 5:	656	case 5:
691	case 6:	657	case 6:
692	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	658	op->stats.stat (r) += bonus;
693	break;	659	break;
694		660
695	case 7:	661	case 7:
696	op->stats.dam += bonus;	662	op->stats.dam += bonus;
697	break;	663	break;
…		…
845	save_item_power = op->item_power;	811	save_item_power = op->item_power;
846	op->item_power = 0;	812	op->item_power = 0;
847		813
848	if (op->randomitems && op->type != SPELL)	814	if (op->randomitems && op->type != SPELL)
849	{	815	{
850	create_treasure (op->randomitems, op, flags, difficulty, 0);	816	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 */	817	/* So the treasure doesn't get created again */
855	op->randomitems = NULL;	818	op->randomitems = 0;
856	}	819	}
857		820
858	if (difficulty < 1)	821	if (difficulty < 1)
859	difficulty = 1;	822	difficulty = 1;
860		823
…		…
864	ARG_INT (flags)))	827	ARG_INT (flags)))
865	return;	828	return;
866		829
867	if (!(flags & GT_MINIMAL))	830	if (!(flags & GT_MINIMAL))
868	{	831	{
869	if (op->arch == crown_arch)	832	if (IS_ARCH (op->arch, crown))
870	{	833	{
871	set_magic (difficulty, op, max_magic, flags);	834	set_magic (difficulty, op, max_magic, flags);
872	num_enchantments = calc_item_power (op, 1);	835	num_enchantments = calc_item_power (op, 1);
873	generate_artifact (op, difficulty);	836	generate_artifact (op, difficulty);
874	}	837	}
…		…
879		842
880	num_enchantments = calc_item_power (op, 1);	843	num_enchantments = calc_item_power (op, 1);
881		844
882	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	845	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
883	\|\| op->type == HORN	846	\|\| op->type == HORN
884	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	847	\|\| 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);	848	generate_artifact (op, difficulty);
887	}	849	}
888		850
889	/* Object was made an artifact. Calculate its item_power rating.	851	/* Object was made an artifact. Calculate its item_power rating.
890	* the item_power in the object is what the artfiact adds.	852	* the item_power in the object is what the artfiact adds.
…		…
932	{	894	{
933	if (op->type == POTION)	895	if (op->type == POTION)
934	/* Handle healing and magic power potions */	896	/* Handle healing and magic power potions */
935	if (op->stats.sp && !op->randomitems)	897	if (op->stats.sp && !op->randomitems)
936	{	898	{
937	object *tmp;
938
939	tmp = get_archetype (spell_mapping[op->stats.sp]);	899	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
940	insert_ob_in_ob (tmp, op);	900	insert_ob_in_ob (tmp, op);
941	op->stats.sp = 0;	901	op->stats.sp = 0;
942	}	902	}
943	}	903	}
944	else if (!op->title) /* Only modify object if not special */	904	else if (!op->title) /* Only modify object if not special */
…		…
1002	SET_FLAG (op, FLAG_CURSED);	962	SET_FLAG (op, FLAG_CURSED);
1003	break;	963	break;
1004	}	964	}
1005		965
1006	case AMULET:	966	case AMULET:
1007	if (op->arch == amulet_arch)	967	if (IS_ARCH (op->arch, amulet))
1008	op->value = 5; / Since it's not just decoration */	968	op->value = 5; / Since it's not just decoration */
1009		969
1010	case RING:	970	case RING:
1011	if (op->arch == NULL)
1012	{
1013	op->destroy ();
1014	op = 0;
1015	break;
1016	}
1017
1018	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	971	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1019	break;	972	break;
1020		973
1021	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	974	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1022	SET_FLAG (op, FLAG_CURSED);	975	SET_FLAG (op, FLAG_CURSED);
1023		976
…		…
1176	* Allocate and return the pointer to an empty artifactlist structure.	1129	* Allocate and return the pointer to an empty artifactlist structure.
1177	*/	1130	*/
1178	static artifactlist *	1131	static artifactlist *
1179	get_empty_artifactlist (void)	1132	get_empty_artifactlist (void)
1180	{	1133	{
1181	return salloc0 <artifactlist> ();	1134	return salloc0<artifactlist> ();
1182	}	1135	}
1183		1136
1184	/*	1137	/*
1185	* Allocate and return the pointer to an empty artifact structure.	1138	* Allocate and return the pointer to an empty artifact structure.
1186	*/	1139	*/
1187	static artifact *	1140	static artifact *
1188	get_empty_artifact (void)	1141	get_empty_artifact (void)
1189	{	1142	{
1190	return salloc0 <artifact> ();	1143	return salloc0<artifact> ();
1191	}	1144	}
1192		1145
1193	/*	1146	/*
1194	* Searches the artifact lists and returns one that has the same type	1147	* Searches the artifact lists and returns one that has the same type
1195	* of objects on it.	1148	* of objects on it.
…		…
1200	for (artifactlist *al = first_artifactlist; al; al = al->next)	1153	for (artifactlist *al = first_artifactlist; al; al = al->next)
1201	if (al->type == type)	1154	if (al->type == type)
1202	return al;	1155	return al;
1203		1156
1204	return 0;	1157	return 0;
1205	}
1206
1207	/*
1208	* For debugging purposes. Dumps all tables.
1209	*/
1210	void
1211	dump_artifacts (void)
1212	{
1213	artifactlist *al;
1214	artifact *art;
1215	linked_char *next;
1216
1217	fprintf (logfile, "\n");
1218	for (al = first_artifactlist; al != NULL; al = al->next)
1219	{
1220	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1221	for (art = al->items; art != NULL; art = art->next)
1222	{
1223	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1224	if (art->allowed != NULL)
1225	{
1226	fprintf (logfile, "\tallowed combinations:");
1227	for (next = art->allowed; next != NULL; next = next->next)
1228	fprintf (logfile, "%s,", &next->name);
1229	fprintf (logfile, "\n");
1230	}
1231	}
1232	}
1233	fprintf (logfile, "\n");
1234	}
1235
1236	/*
1237	* For debugging purposes. Dumps all treasures recursively (see below).
1238	*/
1239	void
1240	dump_monster_treasure_rec (const char name, treasure t, int depth)
1241	{
1242	treasurelist *tl;
1243	int i;
1244
1245	if (depth > 100)
1246	return;
1247
1248	while (t)
1249	{
1250	if (t->name)
1251	{
1252	for (i = 0; i < depth; i++)
1253	fprintf (logfile, " ");
1254
1255	fprintf (logfile, "{ (list: %s)\n", &t->name);
1256
1257	tl = treasurelist::find (t->name);
1258	if (tl)
1259	dump_monster_treasure_rec (name, tl->items, depth + 2);
1260
1261	for (i = 0; i < depth; i++)
1262	fprintf (logfile, " ");
1263
1264	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1265	}
1266	else
1267	{
1268	for (i = 0; i < depth; i++)
1269	fprintf (logfile, " ");
1270
1271	if (t->item && t->item->clone.type == FLESH)
1272	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1273	else
1274	fprintf (logfile, "%s\n", &t->item->clone.name);
1275	}
1276
1277	if (t->next_yes)
1278	{
1279	for (i = 0; i < depth; i++)
1280	fprintf (logfile, " ");
1281
1282	fprintf (logfile, " (if yes)\n");
1283	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1284	}
1285
1286	if (t->next_no)
1287	{
1288	for (i = 0; i < depth; i++)
1289	fprintf (logfile, " ");
1290
1291	fprintf (logfile, " (if no)\n");
1292	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1293	}
1294
1295	t = t->next;
1296	}
1297	}
1298
1299	/*
1300	* For debugging purposes. Dumps all treasures for a given monster.
1301	* Created originally by Raphael Quinet for debugging the alchemy code.
1302	*/
1303	void
1304	dump_monster_treasure (const char *name)
1305	{
1306	archetype *at;
1307	int found;
1308
1309	found = 0;
1310	fprintf (logfile, "\n");
1311
1312	for (at = first_archetype; at != NULL; at = at->next)
1313	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1314	{
1315	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1316	if (at->clone.randomitems != NULL)
1317	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1318	else
1319	fprintf (logfile, "(nothing)\n");
1320
1321	fprintf (logfile, "\n");
1322	found++;
1323	}
1324
1325	if (found == 0)
1326	fprintf (logfile, "No objects have the name %s!\n\n", name);
1327	}	1158	}
1328		1159
1329	/*	1160	/*
1330	* Builds up the lists of artifacts from the file in the libdir.	1161	* Builds up the lists of artifacts from the file in the libdir.
1331	*/	1162	*/
…		…
1346	object_thawer f (filename);	1177	object_thawer f (filename);
1347		1178
1348	if (!f)	1179	if (!f)
1349	return;	1180	return;
1350		1181
1351	f.next ();
1352
1353	for (;;)	1182	for (;;)
1354	{	1183	{
1355	switch (f.kw)	1184	switch (f.kw)
1356	{	1185	{
1357	case KW_allowed:	1186	case KW_allowed:
1358	if (!art)	1187	if (!art)
1359	{
1360	art = get_empty_artifact ();	1188	art = get_empty_artifact ();
1361	nrofartifacts++;
1362	}
1363		1189
1364	{	1190	{
1365	if (!strcmp (f.get_str (), "all"))	1191	if (!strcmp (f.get_str (), "all"))
1366	break;	1192	break;
1367		1193
1368	char next, cp = f.get_str ();	1194	char next, cp = f.get_str ();
1369		1195
1370	do	1196	do
1371	{	1197	{
1372	nrofallowedstr++;
1373
1374	if ((next = strchr (cp, ',')))	1198	if ((next = strchr (cp, ',')))
1375	*next++ = '\0';	1199	*next++ = '\0';
1376		1200
1377	linked_char *tmp = new linked_char;	1201	linked_char *tmp = new linked_char;
1378		1202
…		…
1393	break;	1217	break;
1394		1218
1395	case KW_object:	1219	case KW_object:
1396	{	1220	{
1397	art->item = object::create ();	1221	art->item = object::create ();
		1222	f.get (art->item->name);
		1223	f.next ();
1398		1224
1399	if (!art->item->parse_kv (f))	1225	if (!art->item->parse_kv (f))
1400	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1226	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1401		1227
1402	al = find_artifactlist (art->item->type);	1228	al = find_artifactlist (art->item->type);
…		…
1428	}	1254	}
1429		1255
1430	done:	1256	done:
1431	for (al = first_artifactlist; al; al = al->next)	1257	for (al = first_artifactlist; al; al = al->next)
1432	{	1258	{
		1259	al->total_chance = 0;
		1260
1433	for (art = al->items; art; art = art->next)	1261	for (art = al->items; art; art = art->next)
1434	{	1262	{
1435	if (!art->chance)	1263	if (!art->chance)
1436	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1264	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1437	else	1265	else
…		…
1443	}	1271	}
1444		1272
1445	LOG (llevDebug, "done.\n");	1273	LOG (llevDebug, "done.\n");
1446	}	1274	}
1447		1275
1448
1449	/*	1276	/*
1450	* Used in artifact generation. The bonuses of the first object	1277	* Used in artifact generation. The bonuses of the first object
1451	* is modified by the bonuses of the second object.	1278	* is modified by the bonuses of the second object.
1452	*/	1279	*/
1453
1454	void	1280	void
1455	add_abilities (object op, object change)	1281	add_abilities (object op, object change)
1456	{	1282	{
1457	int i, tmp;	1283	int i, tmp;
1458		1284
1459	if (change->face != blank_face)	1285	if (change->face != blank_face)
1460	{	1286	{
1461	#ifdef TREASURE_VERBOSE	1287	#ifdef TREASURE_VERBOSE
1462	LOG (llevDebug, "FACE: %d\n", change->face->number);	1288	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1463	#endif	1289	#endif
1464	op->face = change->face;	1290	op->face = change->face;
1465	}	1291	}
1466		1292
1467	for (i = 0; i < NUM_STATS; i++)	1293	for (i = 0; i < NUM_STATS; i++)
1468	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1294	change_attr_value (&(op->stats), i, change->stats.stat (i));
1469		1295
1470	op->attacktype \|= change->attacktype;	1296	op->attacktype \|= change->attacktype;
1471	op->path_attuned \|= change->path_attuned;	1297	op->path_attuned \|= change->path_attuned;
1472	op->path_repelled \|= change->path_repelled;	1298	op->path_repelled \|= change->path_repelled;
1473	op->path_denied \|= change->path_denied;	1299	op->path_denied \|= change->path_denied;
…		…
1521	* to cast. So convert that to into a spell and put it into	1347	* to cast. So convert that to into a spell and put it into
1522	* this object.	1348	* this object.
1523	*/	1349	*/
1524	if (op->type == HORN \|\| op->type == POTION)	1350	if (op->type == HORN \|\| op->type == POTION)
1525	{	1351	{
1526	object *tmp_obj;
1527
1528	/* Remove any spells this object currently has in it */	1352	/* Remove any spells this object currently has in it */
1529	while (op->inv)
1530	op->inv->destroy ();	1353	op->destroy_inv (false);
1531		1354
1532	tmp_obj = arch_to_object (change->other_arch);	1355	object *tmp = arch_to_object (change->other_arch);
1533	insert_ob_in_ob (tmp_obj, op);	1356	insert_ob_in_ob (tmp, op);
1534	}	1357	}
1535	/* No harm setting this for potions/horns */	1358	/* No harm setting this for potions/horns */
1536	op->other_arch = change->other_arch;	1359	op->other_arch = change->other_arch;
1537	}	1360	}
1538		1361
…		…
1637	if (change->msg)	1460	if (change->msg)
1638	op->msg = change->msg;	1461	op->msg = change->msg;
1639	}	1462	}
1640		1463
1641	static int	1464	static int
1642	legal_artifact_combination (object op, artifact art)	1465	legal_artifact_combination (object op, artifact art)
1643	{	1466	{
1644	int neg, success = 0;	1467	int neg, success = 0;
1645	linked_char *tmp;	1468	linked_char *tmp;
1646	const char *name;	1469	const char *name;
1647		1470
1648	if (art->allowed == (linked_char *) NULL)	1471	if (!art->allowed)
1649	return 1; /* Ie, "all" */	1472	return 1; /* Ie, "all" */
		1473
1650	for (tmp = art->allowed; tmp; tmp = tmp->next)	1474	for (tmp = art->allowed; tmp; tmp = tmp->next)
1651	{	1475	{
1652	#ifdef TREASURE_VERBOSE	1476	#ifdef TREASURE_VERBOSE
1653	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1477	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1654	#endif	1478	#endif
1655	if (*tmp->name == '!')	1479	if (*tmp->name == '!')
1656	name = tmp->name + 1, neg = 1;	1480	name = tmp->name + 1, neg = 1;
1657	else	1481	else
1658	name = tmp->name, neg = 0;	1482	name = tmp->name, neg = 0;
1659		1483
1660	/* If we match name, then return the opposite of 'neg' */	1484	/* If we match name, then return the opposite of 'neg' */
1661	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->name)))	1485	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->archname)))
1662	return !neg;	1486	return !neg;
1663		1487
1664	/* Set success as true, since if the match was an inverse, it means	1488	/* Set success as true, since if the match was an inverse, it means
1665	* everything is allowed except what we match	1489	* everything is allowed except what we match
1666	*/	1490	*/
1667	else if (neg)	1491	else if (neg)
1668	success = 1;	1492	success = 1;
1669	}	1493	}
		1494
1670	return success;	1495	return success;
1671	}	1496	}
1672		1497
1673	/*	1498	/*
1674	* Fixes the given object, giving it the abilities and titles	1499	* Fixes the given object, giving it the abilities and titles
…		…
1741	#if 1	1566	#if 1
1742	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1567	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1743	#endif	1568	#endif
1744	return;	1569	return;
1745	}	1570	}
1746	if (!strcmp (art->item->name, "NONE"))	1571
		1572	if (art->item->name == shstr_NONE)
1747	return;	1573	return;
		1574
1748	if (FABS (op->magic) < art->item->magic)	1575	if (fabs (op->magic) < art->item->magic)
1749	continue; /* Not magic enough to be this item */	1576	continue; /* Not magic enough to be this item */
1750		1577
1751	/* Map difficulty not high enough */	1578	/* Map difficulty not high enough */
1752	if (difficulty < art->difficulty)	1579	if (difficulty < art->difficulty)
1753	continue;	1580	continue;
1754		1581
1755	if (!legal_artifact_combination (op, art))	1582	if (!legal_artifact_combination (op, art))
1756	{	1583	{
1757	#ifdef TREASURE_VERBOSE	1584	#ifdef TREASURE_VERBOSE
1758	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1585	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1759	#endif	1586	#endif
1760	continue;	1587	continue;
1761	}	1588	}
		1589
1762	give_artifact_abilities (op, art->item);	1590	give_artifact_abilities (op, art->item);
1763	return;	1591	return;
1764	}	1592	}
1765	}	1593	}
1766		1594
…		…
1803	item->level = donor->level;	1631	item->level = donor->level;
1804		1632
1805	/* if donor has some attacktypes, the flesh is poisonous */	1633	/* if donor has some attacktypes, the flesh is poisonous */
1806	if (donor->attacktype & AT_POISON)	1634	if (donor->attacktype & AT_POISON)
1807	item->type = POISON;	1635	item->type = POISON;
		1636
1808	if (donor->attacktype & AT_ACID)	1637	if (donor->attacktype & AT_ACID)
1809	item->stats.hp = -1 * item->stats.food;	1638	item->stats.hp = -1 * item->stats.food;
		1639
1810	SET_FLAG (item, FLAG_NO_STEAL);	1640	SET_FLAG (item, FLAG_NO_STEAL);
1811	}	1641	}
1812	}	1642	}
1813		1643
1814	/* special_potion() - so that old potion code is still done right. */	1644	/* special_potion() - so that old potion code is still done right. */
1815
1816	int	1645	int
1817	special_potion (object *op)	1646	special_potion (object *op)
1818	{	1647	{
1819	if (op->attacktype)	1648	if (op->attacktype)
1820	return 1;	1649	return 1;
…		…
1852	free_artifact (artifact *at)	1681	free_artifact (artifact *at)
1853	{	1682	{
1854	if (at->next) free_artifact (at->next);	1683	if (at->next) free_artifact (at->next);
1855	if (at->allowed) free_charlinks (at->allowed);	1684	if (at->allowed) free_charlinks (at->allowed);
1856		1685
1857	at->item->destroy (1);	1686	at->item->destroy ();
1858		1687
1859	sfree (at);	1688	sfree (at);
1860	}	1689	}
1861		1690
1862	void	1691	void

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.41 by root, Mon Apr 16 06:23:40 2007 UTC vs. Revision 1.84 by root, Thu Jan 1 11:41:17 2009 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.41 by root, Mon Apr 16 06:23:40 2007 UTC vs.
Revision 1.84 by root, Thu Jan 1 11:41:17 2009 UTC