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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.106 by elmex, Wed Apr 21 09:30:07 2010 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 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 it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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 Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26	* It is useful for finding bugs in the treasures file. Since it only	26	* It is useful for finding bugs in the treasures file. Since it only
27	* slows the startup some (and not actual game play), it is by default	27	* slows the startup some (and not actual game play), it is by default
33		33
34	//#define TREASURE_VERBOSE	34	//#define TREASURE_VERBOSE
35		35
36	#include <global.h>	36	#include <global.h>
37	#include <treasure.h>	37	#include <treasure.h>
38	#include <funcpoint.h>
39	#include <loader.h>
40		38
41	extern char *spell_mapping[];	39	extern char *spell_mapping[];
42		40
43	static treasurelist *first_treasurelist;	41	static treasurelist *first_treasurelist;
44		42
…		…
47	typedef std::tr1::unordered_map<	45	typedef std::tr1::unordered_map<
48	const char *,	46	const char *,
49	treasurelist *,	47	treasurelist *,
50	str_hash,	48	str_hash,
51	str_equal,	49	str_equal,
52	slice_allocator< std::pair<const char const, treasurelist > >,	50	slice_allocator< std::pair<const char const, treasurelist > >
53	true
54	> tl_map_t;	51	> tl_map_t;
55		52
56	static tl_map_t tl_map;	53	static tl_map_t tl_map;
57		54
58	/*	55	//TODO: class method
59	* Initialize global archtype pointers:	56	static void free_treasurestruct (treasure *t); // bleh desu
60	*/	57	static void
61	void	58	clear (treasurelist *tl)
62	init_archetype_pointers ()
63	{	59	{
64	int prev_warn = warn_archetypes;	60	if (tl->items)
		61	{
		62	free_treasurestruct (tl->items);
		63	tl->items = 0;
		64	}
65		65
66	warn_archetypes = 1;	66	tl->total_chance = 0;
67
68	if (ring_arch == NULL)
69	ring_arch = archetype::find ("ring");
70	if (amulet_arch == NULL)
71	amulet_arch = archetype::find ("amulet");
72	if (staff_arch == NULL)
73	staff_arch = archetype::find ("staff");
74	if (crown_arch == NULL)
75	crown_arch = archetype::find ("crown");
76
77	warn_archetypes = prev_warn;
78	}	67	}
79		68
80	/*	69	/*
81	* Searches for the given treasurelist in the globally linked list	70	* Searches for the given treasurelist
82	* of treasurelists which has been built by load_treasures().
83	*/	71	*/
84	treasurelist *	72	treasurelist *
85	treasurelist::find (const char *name)	73	treasurelist::find (const char *name)
86	{	74	{
87	if (!name)	75	if (!name)
88	return 0;	76	return 0;
89		77
90	AUTODECL (i, tl_map.find (name));	78	auto (i, tl_map.find (name));
91		79
92	if (i == tl_map.end ())	80	if (i == tl_map.end ())
93	return 0;	81	return 0;
94		82
95	return i->second;	83	return i->second;
…		…
116	}	104	}
117		105
118	return tl;	106	return tl;
119	}	107	}
120		108
121	//TODO: class method	109	#ifdef TREASURE_DEBUG
122	void	110	/* recursived checks the linked list. Treasurelist is passed only
123	clear (treasurelist *tl)	111	* so that the treasure name can be printed out
		112	*/
		113	static void
		114	check_treasurelist (const treasure t, const treasurelist tl)
124	{	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
125	if (tl->items)	122	if (t->next_yes)
126	{	123	check_treasurelist (t->next_yes, tl);
127	free_treasurestruct (tl->items);	124
128	tl->items = 0;	125	if (t->next_no)
129	}	126	check_treasurelist (t->next_no, tl);
130	}	127	}
		128	#endif
131		129
132	/*	130	/*
133	* Reads the lib/treasure file from disk, and parses the contents	131	* Reads the lib/treasure file from disk, and parses the contents
134	* into an internal treasure structure (very linked lists)	132	* into an internal treasure structure (very linked lists)
135	*/	133	*/
136	static treasure *	134	static treasure *
137	load_treasure (object_thawer &f)	135	read_treasure (object_thawer &f)
138	{	136	{
139	treasure *t = new treasure;	137	treasure *t = new treasure;
140	int value;
141		138
142	nroftreasures++;	139	f.next ();
143		140
144	for (;;)	141	for (;;)
145	{	142	{
146	coroapi::cede_every (10);	143	coroapi::cede_to_tick ();
147
148	f.next ();
149		144
150	switch (f.kw)	145	switch (f.kw)
151	{	146	{
152	case KW_arch:	147	case KW_arch:
153	if (!(t->item = archetype::find (f.get_str ())))	148	t->item = archetype::find (f.get_str ());
154	LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());	149
		150	if (!t->item)
		151	{
		152	f.parse_warn ("treasure references unknown archetype");
		153	t->item = archetype::empty;
		154	}
		155
155	break;	156	break;
156		157
157	case KW_list: f.get (t->name); break;	158	case KW_list: f.get (t->name); break;
158	case KW_change_name: f.get (t->change_arch.name); break;	159	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_title: f.get (t->change_arch.title); break;
160	case KW_change_slaying: f.get (t->change_arch.slaying); break;	161	case KW_change_slaying: f.get (t->change_arch.slaying); break;
161	case KW_chance: f.get (t->chance); break;	162	case KW_chance: f.get (t->chance); break;
162	case KW_nrof: f.get (t->nrof); break;	163	case KW_nrof: f.get (t->nrof); break;
163	case KW_magic: f.get (t->magic); break;	164	case KW_magic: f.get (t->magic); break;
164		165
165	case KW_yes: t->next_yes = load_treasure (f); break;	166	case KW_yes: t->next_yes = read_treasure (f); continue;
166	case KW_no: t->next_no = load_treasure (f); break;	167	case KW_no: t->next_no = read_treasure (f); continue;
167		168
168	case KW_end:	169	case KW_end:
		170	f.next ();
169	return t;	171	return t;
170		172
171	case KW_more:	173	case KW_more:
172	t->next = load_treasure (f);	174	t->next = read_treasure (f);
173	return t;	175	return t;
174		176
175	default:	177	default:
176	if (!f.parse_error ("treasure list"))	178	if (!f.parse_error ("treasurelist", t->name))
177	return t; // error	179	goto error;
178		180
179	return t;	181	return t;
180	}	182	}
181	}
182	}
183		183
184	#ifdef TREASURE_DEBUG	184	f.next ();
185	/* recursived checks the linked list. Treasurelist is passed only	185	}
186	* so that the treasure name can be printed out
187	*/
188	static void
189	check_treasurelist (const treasure t, const treasurelist tl)
190	{
191	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
192	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
193		186
194	if (t->next)	187	// not reached
195	check_treasurelist (t->next, tl);
196		188
197	if (t->next_yes)	189	error:
198	check_treasurelist (t->next_yes, tl);	190	delete t;
199		191	return 0;
200	if (t->next_no)
201	check_treasurelist (t->next_no, tl);
202	}	192	}
203	#endif
204		193
205	/*	194	/*
206	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
207	* Each treasure is parsed with the help of load_treasure().	195	* Each treasure is parsed with the help of load_treasure().
208	*/	196	*/
209	bool	197	treasurelist *
210	load_treasures ()	198	treasurelist::read (object_thawer &f)
211	{	199	{
212	treasure *t;	200	assert (f.kw == KW_treasure \|\| f.kw == KW_treasureone);
213	int comp, line = 0;
214		201
215	char filename[MAX_BUF];	202	bool one = f.kw == KW_treasureone;
216	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	203	treasurelist *tl = treasurelist::get (f.get_str ());
217		204	clear (tl);
218	object_thawer f (filename);	205	tl->items = read_treasure (f);
219		206	if (!tl->items)
220	if (!f)
221	{
222	LOG (llevError, "Can't open treasure file.\n");
223	return false;	207	return 0;
		208
		209	/* This is a one of the many items on the list should be generated.
		210	* Add up the chance total, and check to make sure the yes & no
		211	* fields of the treasures are not being used.
		212	*/
		213	if (one)
224	}	214	{
225		215	for (treasure *t = tl->items; t; t = t->next)
226	f.next ();
227
228	for (;;)
229	{
230	switch (f.kw)
231	{	216	{
232	case KW_treasure:	217	if (t->next_yes \|\| t->next_no)
233	case KW_treasureone:
234	{	218	{
235	bool one = f.kw == KW_treasureone;
236	treasurelist *tl = treasurelist::get (f.get_str ());
237
238	clear (tl);
239	tl->items = load_treasure (f);
240
241	if (!tl->items)
242	return false;
243
244	/* This is a one of the many items on the list should be generated.
245	* Add up the chance total, and check to make sure the yes & no
246	* fields of the treasures are not being used.
247	*/
248	if (one)
249	{
250	for (t = tl->items; t; t = t->next)
251	{
252	#ifdef TREASURE_DEBUG
253	if (t->next_yes \|\| t->next_no)
254	{
255	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);
256	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");
257	}
258	#endif
259	tl->total_chance += t->chance;
260	}
261	}
262	}	221	}
263	break;
264		222
265	case KW_EOF:	223	tl->total_chance += t->chance;
266	#ifdef TREASURE_DEBUG
267	/* Perform some checks on how valid the treasure data actually is.
268	* verify that list transitions work (ie, the list that it is supposed
269	* to transition to exists). Also, verify that at least the name
270	* or archetype is set for each treasure element.
271	*/
272	for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
273	check_treasurelist (tl->items, tl);
274	#endif
275	return true;
276
277	default:
278	if (!f.parse_error ("treasure lists"))
279	return false;
280
281	break;
282	}	224	}
283
284	f.next ();
285	}	225	}
		226
		227	return tl;
286	}	228	}
287		229
288	/*	230	/*
289	* Generates the objects specified by the given treasure.	231	* Generates the objects specified by the given treasure.
290	* It goes recursively through the rest of the linked list.	232	* It goes recursively through the rest of the linked list.
…		…
297	* start with equipment, but only their abilities).	239	* start with equipment, but only their abilities).
298	*/	240	*/
299	static void	241	static void
300	put_treasure (object op, object creator, int flags)	242	put_treasure (object op, object creator, int flags)
301	{	243	{
302	object *tmp;	244	if (flags & GT_ENVIRONMENT)
303		245	{
304	/* 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
305	* 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
306	* 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
307	* by another object.	249	* by another object.
308	*/	250	*/
309	if (flags & GT_ENVIRONMENT && op->type != SPELL)	251	//TODO: flag such as objects... as such (no drop, anybody?)
310	{	252	if (op->type == SPELL)
311	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	253	{
		254	op->destroy ();
		255	return;
		256	}
		257
		258	op->expand_tail ();
		259
		260	if (!creator->is_on_map ()
		261	\|\| (op->weight && op->blocked (creator->map, creator->x, creator->y)))
		262	op->destroy ();
		263	else
		264	{
		265	op->flag [FLAG_OBJ_ORIGINAL] = true;
312	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);	266	op->insert_at (creator, creator, INS_NO_MERGE \| INS_NO_WALK_ON);
		267	}
313	}	268	}
314	else	269	else
315	{	270	{
316	op = creator->insert (op);	271	op = creator->insert (op);
317		272
318	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	273	if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
319	monster_check_apply (creator, op);	274	monster_check_apply (creator, op);
320
321	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
322	esrv_send_item (tmp, op);
323	}	275	}
324	}	276	}
325		277
326	/* if there are change_xxx commands in the treasure, we include the changes	278	/* if there are change_xxx commands in the treasure, we include the changes
327	* in the generated object	279	* in the generated object
…		…
349	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)	301	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
350	{	302	{
351	if (t->name)	303	if (t->name)
352	{	304	{
353	if (difficulty >= t->magic)	305	if (difficulty >= t->magic)
		306	if (treasurelist *tl = treasurelist::find (t->name))
354	create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);	307	create_treasure (tl, op, flag, difficulty, tries);
		308	else
		309	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
355	}	310	}
356	else	311	else
357	{	312	{
358	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))	313	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
359	{	314	{
360	object *tmp = arch_to_object (t->item);	315	object *tmp = t->item->instance ();
361		316
362	if (t->nrof && tmp->nrof <= 1)	317	if (t->nrof && tmp->nrof <= 1)
363	tmp->nrof = rndm (t->nrof) + 1;	318	tmp->nrof = rndm (t->nrof) + 1;
364		319
365	fix_generated_item (tmp, op, difficulty, t->magic, flag);	320	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
410	create_treasure (tl, op, flag, difficulty, tries);	365	create_treasure (tl, op, flag, difficulty, tries);
411	}	366	}
412	else if (t->nrof)	367	else if (t->nrof)
413	create_one_treasure (tl, op, flag, difficulty, tries);	368	create_one_treasure (tl, op, flag, difficulty, tries);
414	}	369	}
415	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	370	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
416	{	371	{
417	if (object *tmp = arch_to_object (t->item))	372	if (object *tmp = t->item->instance ())
418	{	373	{
419	if (t->nrof && tmp->nrof <= 1)	374	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	375	tmp->nrof = rndm (t->nrof) + 1;
421		376
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	377	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	378	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	379	put_treasure (tmp, op, flag);
425	}	380	}
426	}	381	}
		382	}
		383
		384	void
		385	object::create_treasure (treasurelist *tl, int flags)
		386	{
		387	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
427	}	388	}
428		389
429	/* This calls the appropriate treasure creation function. tries is passed	390	/* This calls the appropriate treasure creation function. tries is passed
430	* to determine how many list transitions or attempts to create treasure	391	* to determine how many list transitions or attempts to create treasure
431	* have been made. It is really in place to prevent infinite loops with	392	* have been made. It is really in place to prevent infinite loops with
…		…
444	{	405	{
445	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	406	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
446	return;	407	return;
447	}	408	}
448		409
		410	if (op->flag [FLAG_TREASURE_ENV])
		411	{
		412	// do not generate items when there already is something above the object
		413	if (op->flag [FLAG_IS_FLOOR] && op->above)
		414	return;
		415
		416	flag \|= GT_ENVIRONMENT;
		417	}
		418
449	if (tl->total_chance)	419	if (tl->total_chance)
450	create_one_treasure (tl, op, flag, difficulty, tries);	420	create_one_treasure (tl, op, flag, difficulty, tries);
451	else	421	else
452	create_all_treasures (tl->items, op, flag, difficulty, tries);	422	create_all_treasures (tl->items, op, flag, difficulty, tries);
453	}	423	}
…		…
460	object *	430	object *
461	generate_treasure (treasurelist *tl, int difficulty)	431	generate_treasure (treasurelist *tl, int difficulty)
462	{	432	{
463	difficulty = clamp (difficulty, 1, settings.max_level);	433	difficulty = clamp (difficulty, 1, settings.max_level);
464		434
465	object ob = object::create (), tmp;	435	object *ob = object::create ();
466		436
467	create_treasure (tl, ob, 0, difficulty, 0);	437	create_treasure (tl, ob, 0, difficulty, 0);
468		438
469	/* Don't want to free the object we are about to return */	439	/* Don't want to free the object we are about to return */
470	tmp = ob->inv;	440	object *tmp = ob->inv;
471	if (tmp != NULL)	441	if (tmp)
472	tmp->remove ();	442	tmp->remove ();
473		443
474	if (ob->inv)	444	if (ob->inv)
475	LOG (llevError, "In generate treasure, created multiple objects.\n");	445	LOG (llevError, "In generate treasure, created multiple objects.\n");
476		446
477	ob->destroy ();	447	ob->destroy ();
		448
478	return tmp;	449	return tmp;
479	}	450	}
480		451
481	/*	452	/*
482	* This is a new way of calculating the chance for an item to have	453	* This is a new way of calculating the chance for an item to have
…		…
484	* The array has two arguments, the difficulty of the level, and the	455	* The array has two arguments, the difficulty of the level, and the
485	* magical bonus "wanted".	456	* magical bonus "wanted".
486	*/	457	*/
487		458
488	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	459	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
489
490	// chance of magic difficulty	460	// chance of magic difficulty
491	// +0 +1 +2 +3 +4	461	// +0 +1 +2 +3 +4
492	{95, 2, 2, 1, 0}, // 1	462	{95, 2, 2, 1, 0}, // 1
493	{92, 5, 2, 1, 0}, // 2	463	{92, 5, 2, 1, 0}, // 2
494	{85, 10, 4, 1, 0}, // 3	464	{85, 10, 4, 1, 0}, // 3
…		…
520	{ 0, 0, 0, 3, 97}, // 29	490	{ 0, 0, 0, 3, 97}, // 29
521	{ 0, 0, 0, 0, 100}, // 30	491	{ 0, 0, 0, 0, 100}, // 30
522	{ 0, 0, 0, 0, 100}, // 31	492	{ 0, 0, 0, 0, 100}, // 31
523	};	493	};
524		494
525
526	/* calculate the appropriate level for wands staves and scrolls.	495	/* calculate the appropriate level for wands staves and scrolls.
527	* This code presumes that op has had its spell object created (in op->inv)	496	* This code presumes that op has had its spell object created (in op->inv)
528	*	497	*
529	* elmex Wed Aug 9 17:44:59 CEST 2006:	498	* elmex Wed Aug 9 17:44:59 CEST 2006:
530	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	499	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
531	*/	500	*/
532		501	static int
533	int
534	level_for_item (const object *op, int difficulty)	502	level_for_item (const object *op, int difficulty)
535	{	503	{
536	int olevel = 0;
537
538	if (!op->inv)	504	if (!op->inv)
539	{	505	{
540	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	506	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
541	return 0;	507	return 0;
542	}	508	}
543		509
544	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	510	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
545		511
546	if (olevel <= 0)	512	if (olevel <= 0)
547	olevel = rndm (1, MIN (op->inv->level, 1));	513	olevel = rndm (1, op->inv->level);
548		514
549	if (olevel > MAXLEVEL)	515	return min (olevel, MAXLEVEL_TREASURE);
550	olevel = MAXLEVEL;
551
552	return olevel;
553	}	516	}
554		517
555	/*	518	/*
556	* Based upon the specified difficulty and upon the difftomagic_list array,	519	* Based upon the specified difficulty and upon the difftomagic_list array,
557	* a random magical bonus is returned. This is used when determine	520	* a random magical bonus is returned. This is used when determine
…		…
560	* elmex Thu Aug 10 18:45:44 CEST 2006:	523	* elmex Thu Aug 10 18:45:44 CEST 2006:
561	* Scaling difficulty by max_level, as difficulty is a level and not some	524	* Scaling difficulty by max_level, as difficulty is a level and not some
562	* weird integer between 1-31.	525	* weird integer between 1-31.
563	*	526	*
564	*/	527	*/
565	int	528	static int
566	magic_from_difficulty (int difficulty)	529	magic_from_difficulty (int difficulty)
567	{	530	{
568	int percent = 0, magic = 0;	531	int percent = 0, magic = 0;
569	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	532	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
570		533
…		…
613		576
614	op->magic = magic;	577	op->magic = magic;
615	if (op->arch)	578	if (op->arch)
616	{	579	{
617	if (op->type == ARMOUR)	580	if (op->type == ARMOUR)
618	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	581	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
619		582
620	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	583	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
621	magic = (-magic);	584	magic = (-magic);
		585
622	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	586	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
623	}	587	}
624	else	588	else
625	{	589	{
626	if (op->type == ARMOUR)	590	if (op->type == ARMOUR)
627	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	591	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		592
628	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	593	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
629	magic = (-magic);	594	magic = (-magic);
		595
630	op->weight = (op->weight * (100 - magic * 10)) / 100;	596	op->weight = (op->weight * (100 - magic * 10)) / 100;
631	}	597	}
632	}	598	}
633		599
634	/*	600	/*
…		…
646	i = -i;	612	i = -i;
647	if (i > max_magic)	613	if (i > max_magic)
648	i = max_magic;	614	i = max_magic;
649	set_abs_magic (op, i);	615	set_abs_magic (op, i);
650	if (i < 0)	616	if (i < 0)
651	SET_FLAG (op, FLAG_CURSED);	617	op->set_flag (FLAG_CURSED);
652	}	618	}
653		619
654	/*	620	/*
655	* Randomly adds one magical ability to the given object.	621	* Randomly adds one magical ability to the given object.
656	* Modified for Partial Resistance in many ways:	622	* Modified for Partial Resistance in many ways:
657	* 1) Since rings can have multiple bonuses, if the same bonus	623	* 1) Since rings can have multiple bonuses, if the same bonus
658	* is rolled again, increase it - the bonuses now stack with	624	* is rolled again, increase it - the bonuses now stack with
659	* other bonuses previously rolled and ones the item might natively have.	625	* other bonuses previously rolled and ones the item might natively have.
660	* 2) Add code to deal with new PR method.	626	* 2) Add code to deal with new PR method.
661	*/	627	*/
662	void	628	static void
663	set_ring_bonus (object *op, int bonus)	629	set_ring_bonus (object *op, int bonus)
664	{	630	{
665
666	int r = rndm (bonus > 0 ? 25 : 11);	631	int r = rndm (bonus > 0 ? 25 : 11);
667		632
668	if (op->type == AMULET)	633	if (op->type == AMULET)
669	{	634	{
670	if (!(rndm (21)))	635	if (!(rndm (21)))
…		…
689	case 2:	654	case 2:
690	case 3:	655	case 3:
691	case 4:	656	case 4:
692	case 5:	657	case 5:
693	case 6:	658	case 6:
694	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	659	op->stats.stat (r) += bonus;
695	break;	660	break;
696		661
697	case 7:	662	case 7:
698	op->stats.dam += bonus;	663	op->stats.dam += bonus;
699	break;	664	break;
…		…
750	break;	715	break;
751	}	716	}
752	case 20:	717	case 20:
753	if (op->type == AMULET)	718	if (op->type == AMULET)
754	{	719	{
755	SET_FLAG (op, FLAG_REFL_SPELL);	720	op->set_flag (FLAG_REFL_SPELL);
756	op->value *= 11;	721	op->value *= 11;
757	}	722	}
758	else	723	else
759	{	724	{
760	op->stats.hp = 1; /* regenerate hit points */	725	op->stats.hp = 1; /* regenerate hit points */
…		…
763	break;	728	break;
764		729
765	case 21:	730	case 21:
766	if (op->type == AMULET)	731	if (op->type == AMULET)
767	{	732	{
768	SET_FLAG (op, FLAG_REFL_MISSILE);	733	op->set_flag (FLAG_REFL_MISSILE);
769	op->value *= 9;	734	op->value *= 9;
770	}	735	}
771	else	736	else
772	{	737	{
773	op->stats.sp = 1; /* regenerate spell points */	738	op->stats.sp = 1; /* regenerate spell points */
…		…
793	* higher is the chance of returning a low number.	758	* higher is the chance of returning a low number.
794	* It is only used in fix_generated_treasure() to set bonuses on	759	* It is only used in fix_generated_treasure() to set bonuses on
795	* rings and amulets.	760	* rings and amulets.
796	* Another scheme is used to calculate the magic of weapons and armours.	761	* Another scheme is used to calculate the magic of weapons and armours.
797	*/	762	*/
798	int	763	static int
799	get_magic (int diff)	764	get_magic (int diff)
800	{	765	{
801	int i;	766	int i;
802		767
803	if (diff < 3)	768	if (diff < 3)
…		…
806	for (i = 0; i < 4; i++)	771	for (i = 0; i < 4; i++)
807	if (rndm (diff))	772	if (rndm (diff))
808	return i;	773	return i;
809		774
810	return 4;	775	return 4;
		776	}
		777
		778	/* special_potion() - so that old potion code is still done right. */
		779	static int
		780	special_potion (object *op)
		781	{
		782	if (op->attacktype)
		783	return 1;
		784
		785	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
		786	return 1;
		787
		788	for (int i = 0; i < NROFATTACKS; i++)
		789	if (op->resist[i])
		790	return 1;
		791
		792	return 0;
811	}	793	}
812		794
813	#define DICE2 (get_magic(2)==2?2:1)	795	#define DICE2 (get_magic(2)==2?2:1)
814	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	796	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
815		797
…		…
847	save_item_power = op->item_power;	829	save_item_power = op->item_power;
848	op->item_power = 0;	830	op->item_power = 0;
849		831
850	if (op->randomitems && op->type != SPELL)	832	if (op->randomitems && op->type != SPELL)
851	{	833	{
852	create_treasure (op->randomitems, op, flags, difficulty, 0);	834	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
853	if (!op->inv)
854	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
855
856	/* So the treasure doesn't get created again */	835	/* So the treasure doesn't get created again */
857	op->randomitems = 0;	836	op->randomitems = 0;
858	}	837	}
859		838
860	if (difficulty < 1)	839	max_it (difficulty, 1);
861	difficulty = 1;
862		840
863	if (INVOKE_OBJECT (ADD_BONUS, op,	841	if (INVOKE_OBJECT (ADD_BONUS, op,
864	ARG_OBJECT (creator != op ? creator : 0),	842	ARG_OBJECT (creator != op ? creator : 0),
865	ARG_INT (difficulty), ARG_INT (max_magic),	843	ARG_INT (difficulty), ARG_INT (max_magic),
866	ARG_INT (flags)))	844	ARG_INT (flags)))
867	return;	845	return;
868		846
869	if (!(flags & GT_MINIMAL))	847	if (!(flags & GT_MINIMAL))
870	{	848	{
871	if (op->arch == crown_arch)	849	if (IS_ARCH (op->arch, crown))
872	{	850	{
873	set_magic (difficulty, op, max_magic, flags);	851	set_magic (difficulty, op, max_magic, flags);
874	num_enchantments = calc_item_power (op, 1);	852	num_enchantments = calc_item_power (op, 1);
875	generate_artifact (op, difficulty);	853	generate_artifact (op, difficulty);
876	}	854	}
…		…
881		859
882	num_enchantments = calc_item_power (op, 1);	860	num_enchantments = calc_item_power (op, 1);
883		861
884	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	862	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
885	\|\| op->type == HORN	863	\|\| op->type == HORN
886	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	864	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
887	* used for shop_floors or treasures */
888	generate_artifact (op, difficulty);	865	generate_artifact (op, difficulty);
889	}	866	}
890		867
891	/* Object was made an artifact. Calculate its item_power rating.	868	/* Object was made an artifact. Calculate its item_power rating.
892	* the item_power in the object is what the artfiact adds.	869	* the item_power in the object is what the artfiact adds.
…		…
926	* again below */	903	* again below */
927	}	904	}
928	}	905	}
929		906
930	/* materialtype modifications. Note we allow this on artifacts. */	907	/* materialtype modifications. Note we allow this on artifacts. */
931	set_materialname (op, difficulty, NULL);	908	select_material (op, difficulty);
932		909
933	if (flags & GT_MINIMAL)	910	if (flags & GT_MINIMAL)
934	{	911	{
935	if (op->type == POTION)	912	if (op->type == POTION)
936	/* Handle healing and magic power potions */	913	/* Handle healing and magic power potions */
937	if (op->stats.sp && !op->randomitems)	914	if (op->stats.sp && !op->randomitems)
938	{	915	{
939	object *tmp;
940
941	tmp = get_archetype (spell_mapping[op->stats.sp]);	916	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
942	insert_ob_in_ob (tmp, op);	917	insert_ob_in_ob (tmp, op);
943	op->stats.sp = 0;	918	op->stats.sp = 0;
944	}	919	}
945	}	920	}
946	else if (!op->title) /* Only modify object if not special */	921	else if (!op->title) /* Only modify object if not special */
…		…
949	case WEAPON:	924	case WEAPON:
950	case ARMOUR:	925	case ARMOUR:
951	case SHIELD:	926	case SHIELD:
952	case HELMET:	927	case HELMET:
953	case CLOAK:	928	case CLOAK:
954	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	929	if (op->flag [FLAG_CURSED] && !(rndm (4)))
955	set_ring_bonus (op, -DICE2);	930	set_ring_bonus (op, -DICE2);
956	break;	931	break;
957		932
958	case BRACERS:	933	case BRACERS:
959	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))	934	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
960	{	935	{
961	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	936	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
962	if (!QUERY_FLAG (op, FLAG_CURSED))	937	if (!op->flag [FLAG_CURSED])
963	op->value *= 3;	938	op->value *= 3;
964	}	939	}
965	break;	940	break;
966		941
967	case POTION:	942	case POTION:
…		…
969	int too_many_tries = 0, is_special = 0;	944	int too_many_tries = 0, is_special = 0;
970		945
971	/* Handle healing and magic power potions */	946	/* Handle healing and magic power potions */
972	if (op->stats.sp && !op->randomitems)	947	if (op->stats.sp && !op->randomitems)
973	{	948	{
974	object *tmp;
975
976	tmp = get_archetype (spell_mapping[op->stats.sp]);	949	object *tmp = get_archetype (spell_mapping[op->stats.sp]);
977	insert_ob_in_ob (tmp, op);	950	insert_ob_in_ob (tmp, op);
978	op->stats.sp = 0;	951	op->stats.sp = 0;
979	}	952	}
980		953
981	while (!(is_special = special_potion (op)) && !op->inv)	954	while (!(is_special = special_potion (op)) && !op->inv)
…		…
989	* since the value set on those is already correct.	962	* since the value set on those is already correct.
990	*/	963	*/
991	if (op->inv && op->randomitems)	964	if (op->inv && op->randomitems)
992	{	965	{
993	/* value multiplier is same as for scrolls */	966	/* value multiplier is same as for scrolls */
994	op->value = (op->value * op->inv->value);	967	op->value *= op->inv->value;
995	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	968	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
996	}	969	}
997	else	970	else
998	{	971	{
999	op->name = "potion";	972	op->name = "potion";
1000	op->name_pl = "potions";	973	op->name_pl = "potions";
1001	}	974	}
1002		975
1003	if (!(flags & GT_ONLY_GOOD) && rndm (2))	976	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1004	SET_FLAG (op, FLAG_CURSED);	977	op->set_flag (FLAG_CURSED);
		978
1005	break;	979	break;
1006	}	980	}
1007		981
1008	case AMULET:	982	case AMULET:
1009	if (op->arch == amulet_arch)	983	if (IS_ARCH (op->arch, amulet))
1010	op->value = 5; / Since it's not just decoration */	984	op->value = 5; / Since it's not just decoration */
1011		985
1012	case RING:	986	case RING:
1013	if (op->arch == NULL)
1014	{
1015	op->destroy ();
1016	op = 0;
1017	break;
1018	}
1019
1020	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	987	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1021	break;	988	break;
1022		989
1023	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	990	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1024	SET_FLAG (op, FLAG_CURSED);	991	op->set_flag (FLAG_CURSED);
1025		992
1026	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	993	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1027		994
1028	if (op->type != RING) /* Amulets have only one ability */	995	if (op->type != RING) /* Amulets have only one ability */
1029	break;	996	break;
1030		997
1031	if (!(rndm (4)))	998	if (!(rndm (4)))
1032	{	999	{
1033	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1000	int d = (rndm (2) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1034		1001
1035	if (d > 0)	1002	if (d > 0)
1036	op->value *= 3;	1003	op->value *= 3;
1037		1004
1038	set_ring_bonus (op, d);	1005	set_ring_bonus (op, d);
1039		1006
1040	if (!(rndm (4)))	1007	if (!(rndm (4)))
1041	{	1008	{
1042	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1009	int d = (rndm (3) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1043		1010
1044	if (d > 0)	1011	if (d > 0)
1045	op->value *= 5;	1012	op->value *= 5;
1046	set_ring_bonus (op, d);	1013	set_ring_bonus (op, d);
1047	}	1014	}
1048	}	1015	}
1049		1016
1050	if (GET_ANIM_ID (op))	1017	if (op->animation_id)
1051	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1018	op->set_anim_frame (rndm (op->anim_frames ()));
1052		1019
1053	break;	1020	break;
1054		1021
1055	case BOOK:	1022	case BOOK:
1056	/* Is it an empty book?, if yes lets make a special·	1023	/* Is it an empty book?, if yes lets make a special·
…		…
1058	* creator and/or map level we found it on.	1025	* creator and/or map level we found it on.
1059	*/	1026	*/
1060	if (!op->msg && rndm (10))	1027	if (!op->msg && rndm (10))
1061	{	1028	{
1062	/* set the book level properly */	1029	/* set the book level properly */
1063	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1030	if (creator->level == 0 \|\| creator->flag [FLAG_ALIVE])
1064	{	1031	{
1065	if (op->map && op->map->difficulty)	1032	if (op->map && op->map->difficulty)
1066	op->level = rndm (op->map->difficulty) + rndm (10) + 1;	1033	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1067	else	1034	else
1068	op->level = rndm (20) + 1;	1035	op->level = rndm (20) + 1;
…		…
1071	op->level = rndm (creator->level);	1038	op->level = rndm (creator->level);
1072		1039
1073	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1040	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1074	/* books w/ info are worth more! */	1041	/* books w/ info are worth more! */
1075	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1042	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1076	/* creator related stuff */
1077
1078	/* for library, chained books. Note that some monsters have no_pick
1079	* set - we don't want to set no pick in that case.
1080	*/
1081	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1082	SET_FLAG (op, FLAG_NO_PICK);
1083	if (creator->slaying && !op->slaying) /* for check_inv floors */
1084	op->slaying = creator->slaying;
1085		1043
1086	/* add exp so reading it gives xp (once) */	1044	/* add exp so reading it gives xp (once) */
1087	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1045	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1088	}	1046	}
		1047
		1048	/* creator related stuff */
		1049
		1050	/* for library, chained books. Note that some monsters have no_pick
		1051	* set - we don't want to set no pick in that case.
		1052	*/
		1053	if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
		1054	op->set_flag (FLAG_NO_PICK);
		1055	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1056	op->slaying = creator->slaying;
1089	break;	1057	break;
1090		1058
1091	case SPELLBOOK:	1059	case SPELLBOOK:
1092	op->value = op->value * op->inv->value;	1060	op->value *=
		1061	pow ((op->inv->value > 0 ? op->inv->value : 1)
		1062	* op->inv->level,
		1063	1.5);
1093	/* add exp so learning gives xp */	1064	/* add exp so learning gives xp */
1094	op->level = op->inv->level;	1065	op->level = op->inv->level;
1095	op->stats.exp = op->value;	1066	op->stats.exp = op->value;
1096	break;	1067	break;
1097		1068
…		…
1127	* 10 time multiplier). This way, the value are a bit more reasonable.	1098	* 10 time multiplier). This way, the value are a bit more reasonable.
1128	*/	1099	*/
1129	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1100	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1130	/* maxhp is used to denote how many 'charges' the rod holds before */	1101	/* maxhp is used to denote how many 'charges' the rod holds before */
1131	if (op->stats.maxhp)	1102	if (op->stats.maxhp)
1132	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1103	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1133	else	1104	else
1134	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1105	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1135		1106
1136	op->stats.hp = op->stats.maxhp;	1107	op->stats.hp = op->stats.maxhp;
1137	break;	1108	break;
1138		1109
1139	case SCROLL:	1110	case SCROLL:
…		…
1154	break;	1125	break;
1155	} /* switch type */	1126	} /* switch type */
1156		1127
1157	if (flags & GT_STARTEQUIP)	1128	if (flags & GT_STARTEQUIP)
1158	{	1129	{
1159	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN))	1130	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1160	SET_FLAG (op, FLAG_STARTEQUIP);	1131	op->set_flag (FLAG_STARTEQUIP);
1161	else if (op->type != MONEY)	1132	else if (op->type != MONEY)
1162	op->value = 0;	1133	op->value = 0;
1163	}	1134	}
1164		1135
1165	if (!(flags & GT_ENVIRONMENT))	1136	if (!(flags & GT_ENVIRONMENT))
…		…
1176		1147
1177	/*	1148	/*
1178	* Allocate and return the pointer to an empty artifactlist structure.	1149	* Allocate and return the pointer to an empty artifactlist structure.
1179	*/	1150	*/
1180	static artifactlist *	1151	static artifactlist *
1181	get_empty_artifactlist (void)	1152	get_empty_artifactlist ()
1182	{	1153	{
1183	return salloc0 <artifactlist> ();	1154	return salloc0<artifactlist> ();
1184	}	1155	}
1185		1156
1186	/*	1157	/*
1187	* Allocate and return the pointer to an empty artifact structure.	1158	* Allocate and return the pointer to an empty artifact structure.
1188	*/	1159	*/
1189	static artifact *	1160	static artifact *
1190	get_empty_artifact (void)	1161	get_empty_artifact ()
1191	{	1162	{
1192	return salloc0 <artifact> ();	1163	return salloc0<artifact> ();
1193	}	1164	}
1194		1165
1195	/*	1166	/*
1196	* Searches the artifact lists and returns one that has the same type	1167	* Searches the artifact lists and returns one that has the same type
1197	* of objects on it.	1168	* of objects on it.
…		…
1205		1176
1206	return 0;	1177	return 0;
1207	}	1178	}
1208		1179
1209	/*	1180	/*
1210	* For debugging purposes. Dumps all tables.	1181	* Builds up the lists of artifacts from the file in the libdir.
1211	*/	1182	*/
1212	void	1183	void
1213	dump_artifacts (void)
1214	{
1215	artifactlist *al;
1216	artifact *art;
1217	linked_char *next;
1218
1219	fprintf (logfile, "\n");
1220	for (al = first_artifactlist; al != NULL; al = al->next)
1221	{
1222	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1223	for (art = al->items; art != NULL; art = art->next)
1224	{
1225	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1226	if (art->allowed != NULL)
1227	{
1228	fprintf (logfile, "\tallowed combinations:");
1229	for (next = art->allowed; next != NULL; next = next->next)
1230	fprintf (logfile, "%s,", &next->name);
1231	fprintf (logfile, "\n");
1232	}
1233	}
1234	}
1235	fprintf (logfile, "\n");
1236	}
1237
1238	/*
1239	* For debugging purposes. Dumps all treasures recursively (see below).
1240	*/
1241	void
1242	dump_monster_treasure_rec (const char name, treasure t, int depth)
1243	{
1244	treasurelist *tl;
1245	int i;
1246
1247	if (depth > 100)
1248	return;
1249
1250	while (t)
1251	{
1252	if (t->name)
1253	{
1254	for (i = 0; i < depth; i++)
1255	fprintf (logfile, " ");
1256
1257	fprintf (logfile, "{ (list: %s)\n", &t->name);
1258
1259	tl = treasurelist::find (t->name);
1260	if (tl)
1261	dump_monster_treasure_rec (name, tl->items, depth + 2);
1262
1263	for (i = 0; i < depth; i++)
1264	fprintf (logfile, " ");
1265
1266	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1267	}
1268	else
1269	{
1270	for (i = 0; i < depth; i++)
1271	fprintf (logfile, " ");
1272
1273	if (t->item && t->item->clone.type == FLESH)
1274	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1275	else
1276	fprintf (logfile, "%s\n", &t->item->clone.name);
1277	}
1278
1279	if (t->next_yes)
1280	{
1281	for (i = 0; i < depth; i++)
1282	fprintf (logfile, " ");
1283
1284	fprintf (logfile, " (if yes)\n");
1285	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1286	}
1287
1288	if (t->next_no)
1289	{
1290	for (i = 0; i < depth; i++)
1291	fprintf (logfile, " ");
1292
1293	fprintf (logfile, " (if no)\n");
1294	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1295	}
1296
1297	t = t->next;
1298	}
1299	}
1300
1301	/*
1302	* For debugging purposes. Dumps all treasures for a given monster.
1303	* Created originally by Raphael Quinet for debugging the alchemy code.
1304	*/
1305	void
1306	dump_monster_treasure (const char *name)
1307	{
1308	archetype *at;
1309	int found;
1310
1311	found = 0;
1312	fprintf (logfile, "\n");
1313
1314	for (at = first_archetype; at != NULL; at = at->next)
1315	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1316	{
1317	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1318	if (at->clone.randomitems != NULL)
1319	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1320	else
1321	fprintf (logfile, "(nothing)\n");
1322
1323	fprintf (logfile, "\n");
1324	found++;
1325	}
1326
1327	if (found == 0)
1328	fprintf (logfile, "No objects have the name %s!\n\n", name);
1329	}
1330
1331	/*
1332	* Builds up the lists of artifacts from the file in the libdir.
1333	*/
1334	void
1335	init_artifacts (void)	1184	init_artifacts ()
1336	{	1185	{
1337	static int has_been_inited = 0;	1186	static int has_been_inited = 0;
1338	char filename[MAX_BUF];	1187	char filename[MAX_BUF];
1339	artifact *art = NULL;	1188	artifact *art = NULL;
1340	artifactlist *al;	1189	artifactlist *al;
…		…
1348	object_thawer f (filename);	1197	object_thawer f (filename);
1349		1198
1350	if (!f)	1199	if (!f)
1351	return;	1200	return;
1352		1201
1353	f.next ();
1354
1355	for (;;)	1202	for (;;)
1356	{	1203	{
1357	switch (f.kw)	1204	switch (f.kw)
1358	{	1205	{
1359	case KW_allowed:	1206	case KW_allowed:
1360	if (!art)	1207	if (!art)
1361	{
1362	art = get_empty_artifact ();	1208	art = get_empty_artifact ();
1363	nrofartifacts++;
1364	}
1365		1209
1366	{	1210	{
1367	if (!strcmp (f.get_str (), "all"))	1211	if (!strcmp (f.get_str (), "all"))
1368	break;	1212	break;
1369		1213
1370	char next, cp = f.get_str ();	1214	const char *cp = f.get_str ();
1371		1215	char *next;
1372	do	1216	do
1373	{	1217	{
1374	nrofallowedstr++;
1375
1376	if ((next = strchr (cp, ',')))	1218	if ((next = (char *)strchr (cp, ',')))
1377	*next++ = '\0';	1219	*next++ = '\0';
1378		1220
1379	linked_char *tmp = new linked_char;	1221	linked_char *tmp = new linked_char;
1380		1222
1381	tmp->name = cp;	1223	tmp->name = cp;
…		…
1395	break;	1237	break;
1396		1238
1397	case KW_object:	1239	case KW_object:
1398	{	1240	{
1399	art->item = object::create ();	1241	art->item = object::create ();
		1242	f.get (art->item->name);
		1243	f.next ();
1400		1244
1401	if (!art->item->parse_kv (f))	1245	if (!art->item->parse_kv (f))
1402	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1246	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1403		1247
1404	al = find_artifactlist (art->item->type);	1248	al = find_artifactlist (art->item->type);
…		…
1430	}	1274	}
1431		1275
1432	done:	1276	done:
1433	for (al = first_artifactlist; al; al = al->next)	1277	for (al = first_artifactlist; al; al = al->next)
1434	{	1278	{
		1279	al->total_chance = 0;
		1280
1435	for (art = al->items; art; art = art->next)	1281	for (art = al->items; art; art = art->next)
1436	{	1282	{
1437	if (!art->chance)	1283	if (!art->chance)
1438	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1284	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1439	else	1285	else
…		…
1445	}	1291	}
1446		1292
1447	LOG (llevDebug, "done.\n");	1293	LOG (llevDebug, "done.\n");
1448	}	1294	}
1449		1295
1450
1451	/*	1296	/*
1452	* Used in artifact generation. The bonuses of the first object	1297	* Used in artifact generation. The bonuses of the first object
1453	* is modified by the bonuses of the second object.	1298	* is modified by the bonuses of the second object.
1454	*/	1299	*/
1455
1456	void	1300	void
1457	add_abilities (object op, object change)	1301	add_abilities (object op, object change)
1458	{	1302	{
1459	int i, tmp;	1303	int i, tmp;
1460		1304
…		…
1465	#endif	1309	#endif
1466	op->face = change->face;	1310	op->face = change->face;
1467	}	1311	}
1468		1312
1469	for (i = 0; i < NUM_STATS; i++)	1313	for (i = 0; i < NUM_STATS; i++)
1470	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1314	change_attr_value (&(op->stats), i, change->stats.stat (i));
1471		1315
1472	op->attacktype \|= change->attacktype;	1316	op->attacktype \|= change->attacktype;
1473	op->path_attuned \|= change->path_attuned;	1317	op->path_attuned \|= change->path_attuned;
1474	op->path_repelled \|= change->path_repelled;	1318	op->path_repelled \|= change->path_repelled;
1475	op->path_denied \|= change->path_denied;	1319	op->path_denied \|= change->path_denied;
1476	op->move_type \|= change->move_type;	1320	op->move_type \|= change->move_type;
1477	op->stats.luck += change->stats.luck;	1321	op->stats.luck += change->stats.luck;
1478		1322
1479	if (QUERY_FLAG (change, FLAG_CURSED))	1323	if (change->flag [FLAG_CURSED])
1480	SET_FLAG (op, FLAG_CURSED);	1324	op->set_flag (FLAG_CURSED);
1481	if (QUERY_FLAG (change, FLAG_DAMNED))	1325	if (change->flag [FLAG_DAMNED])
1482	SET_FLAG (op, FLAG_DAMNED);	1326	op->set_flag (FLAG_DAMNED);
1483	if ((QUERY_FLAG (change, FLAG_CURSED) \|\| QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0)	1327	if ((change->flag [FLAG_CURSED] \|\| change->flag [FLAG_DAMNED]) && op->magic > 0)
1484	set_abs_magic (op, -op->magic);	1328	set_abs_magic (op, -op->magic);
1485		1329
1486	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1330	if (change->flag [FLAG_LIFESAVE])
1487	SET_FLAG (op, FLAG_LIFESAVE);	1331	op->set_flag (FLAG_LIFESAVE);
1488	if (QUERY_FLAG (change, FLAG_REFL_SPELL))	1332	if (change->flag [FLAG_REFL_SPELL])
1489	SET_FLAG (op, FLAG_REFL_SPELL);	1333	op->set_flag (FLAG_REFL_SPELL);
1490	if (QUERY_FLAG (change, FLAG_STEALTH))	1334	if (change->flag [FLAG_STEALTH])
1491	SET_FLAG (op, FLAG_STEALTH);	1335	op->set_flag (FLAG_STEALTH);
1492	if (QUERY_FLAG (change, FLAG_XRAYS))	1336	if (change->flag [FLAG_XRAYS])
1493	SET_FLAG (op, FLAG_XRAYS);	1337	op->set_flag (FLAG_XRAYS);
1494	if (QUERY_FLAG (change, FLAG_BLIND))	1338	if (change->flag [FLAG_BLIND])
1495	SET_FLAG (op, FLAG_BLIND);	1339	op->set_flag (FLAG_BLIND);
1496	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))	1340	if (change->flag [FLAG_SEE_IN_DARK])
1497	SET_FLAG (op, FLAG_SEE_IN_DARK);	1341	op->set_flag (FLAG_SEE_IN_DARK);
1498	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))	1342	if (change->flag [FLAG_REFL_MISSILE])
1499	SET_FLAG (op, FLAG_REFL_MISSILE);	1343	op->set_flag (FLAG_REFL_MISSILE);
1500	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))	1344	if (change->flag [FLAG_MAKE_INVIS])
1501	SET_FLAG (op, FLAG_MAKE_INVIS);	1345	op->set_flag (FLAG_MAKE_INVIS);
1502		1346
1503	if (QUERY_FLAG (change, FLAG_STAND_STILL))	1347	if (change->flag [FLAG_STAND_STILL])
1504	{	1348	{
1505	CLEAR_FLAG (op, FLAG_ANIMATE);	1349	op->clr_flag (FLAG_ANIMATE);
1506	/* so artifacts will join */	1350	/* so artifacts will join */
1507	if (!QUERY_FLAG (op, FLAG_ALIVE))	1351	if (!op->flag [FLAG_ALIVE])
1508	op->speed = 0.0;	1352	op->speed = 0.0;
1509		1353
1510	op->set_speed (op->speed);	1354	op->set_speed (op->speed);
1511	}	1355	}
1512		1356
…		…
1523	* to cast. So convert that to into a spell and put it into	1367	* to cast. So convert that to into a spell and put it into
1524	* this object.	1368	* this object.
1525	*/	1369	*/
1526	if (op->type == HORN \|\| op->type == POTION)	1370	if (op->type == HORN \|\| op->type == POTION)
1527	{	1371	{
1528	object *tmp_obj;
1529
1530	/* Remove any spells this object currently has in it */	1372	/* Remove any spells this object currently has in it */
1531	while (op->inv)
1532	op->inv->destroy ();	1373	op->destroy_inv (false);
1533		1374
1534	tmp_obj = arch_to_object (change->other_arch);	1375	object *tmp = change->other_arch->instance ();
1535	insert_ob_in_ob (tmp_obj, op);	1376	insert_ob_in_ob (tmp, op);
1536	}	1377	}
		1378
1537	/* No harm setting this for potions/horns */	1379	/* No harm setting this for potions/horns */
1538	op->other_arch = change->other_arch;	1380	op->other_arch = change->other_arch;
1539	}	1381	}
1540		1382
1541	if (change->stats.hp < 0)	1383	if (change->stats.hp < 0)
…		…
1625	op->value *= change->value;	1467	op->value *= change->value;
1626		1468
1627	if (change->materials)	1469	if (change->materials)
1628	op->materials = change->materials;	1470	op->materials = change->materials;
1629		1471
1630	if (change->materialname)	1472	if (change->material != MATERIAL_NULL)
1631	op->materialname = change->materialname;	1473	op->material = change->material;
1632		1474
1633	if (change->slaying)	1475	if (change->slaying)
1634	op->slaying = change->slaying;	1476	op->slaying = change->slaying;
1635		1477
1636	if (change->race)	1478	if (change->race)
…		…
1639	if (change->msg)	1481	if (change->msg)
1640	op->msg = change->msg;	1482	op->msg = change->msg;
1641	}	1483	}
1642		1484
1643	static int	1485	static int
1644	legal_artifact_combination (object op, artifact art)	1486	legal_artifact_combination (object op, artifact art)
1645	{	1487	{
1646	int neg, success = 0;	1488	int neg, success = 0;
1647	linked_char *tmp;	1489	linked_char *tmp;
1648	const char *name;	1490	const char *name;
1649		1491
1650	if (art->allowed == (linked_char *) NULL)	1492	if (!art->allowed)
1651	return 1; /* Ie, "all" */	1493	return 1; /* Ie, "all" */
		1494
1652	for (tmp = art->allowed; tmp; tmp = tmp->next)	1495	for (tmp = art->allowed; tmp; tmp = tmp->next)
1653	{	1496	{
1654	#ifdef TREASURE_VERBOSE	1497	#ifdef TREASURE_VERBOSE
1655	LOG (llevDebug, "legal_art: %s\n", &tmp->name);	1498	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1656	#endif	1499	#endif
…		…
1658	name = tmp->name + 1, neg = 1;	1501	name = tmp->name + 1, neg = 1;
1659	else	1502	else
1660	name = tmp->name, neg = 0;	1503	name = tmp->name, neg = 0;
1661		1504
1662	/* If we match name, then return the opposite of 'neg' */	1505	/* If we match name, then return the opposite of 'neg' */
1663	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->name)))	1506	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->archname)))
1664	return !neg;	1507	return !neg;
1665		1508
1666	/* Set success as true, since if the match was an inverse, it means	1509	/* Set success as true, since if the match was an inverse, it means
1667	* everything is allowed except what we match	1510	* everything is allowed except what we match
1668	*/	1511	*/
1669	else if (neg)	1512	else if (neg)
1670	success = 1;	1513	success = 1;
1671	}	1514	}
		1515
1672	return success;	1516	return success;
1673	}	1517	}
1674		1518
1675	/*	1519	/*
1676	* Fixes the given object, giving it the abilities and titles	1520	* Fixes the given object, giving it the abilities and titles
…		…
1686	op->title = new_name;	1530	op->title = new_name;
1687	add_abilities (op, artifct); /* Give out the bonuses */	1531	add_abilities (op, artifct); /* Give out the bonuses */
1688		1532
1689	#if 0 /* Bit verbose, but keep it here until next time I need it... */	1533	#if 0 /* Bit verbose, but keep it here until next time I need it... */
1690	{	1534	{
1691	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1535	char identified = op->flag [FLAG_IDENTIFIED];
1692		1536
1693	SET_FLAG (op, FLAG_IDENTIFIED);	1537	op->set_flag (FLAG_IDENTIFIED);
1694	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));	1538	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1695	if (!identified)	1539	if (!identified)
1696	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1540	op->clr_flag (FLAG_IDENTIFIED);
1697	}	1541	}
1698	#endif	1542	#endif
1699	return;	1543	return;
1700	}	1544	}
1701		1545
…		…
1743	#if 1	1587	#if 1
1744	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1588	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1745	#endif	1589	#endif
1746	return;	1590	return;
1747	}	1591	}
1748	if (!strcmp (art->item->name, "NONE"))	1592
		1593	if (art->item->name == shstr_NONE)
1749	return;	1594	return;
		1595
1750	if (FABS (op->magic) < art->item->magic)	1596	if (fabs (op->magic) < art->item->magic)
1751	continue; /* Not magic enough to be this item */	1597	continue; /* Not magic enough to be this item */
1752		1598
1753	/* Map difficulty not high enough */	1599	/* Map difficulty not high enough */
1754	if (difficulty < art->difficulty)	1600	if (difficulty < art->difficulty)
1755	continue;	1601	continue;
…		…
1806	item->level = donor->level;	1652	item->level = donor->level;
1807		1653
1808	/* if donor has some attacktypes, the flesh is poisonous */	1654	/* if donor has some attacktypes, the flesh is poisonous */
1809	if (donor->attacktype & AT_POISON)	1655	if (donor->attacktype & AT_POISON)
1810	item->type = POISON;	1656	item->type = POISON;
		1657
1811	if (donor->attacktype & AT_ACID)	1658	if (donor->attacktype & AT_ACID)
1812	item->stats.hp = -1 * item->stats.food;	1659	item->stats.hp = -1 * item->stats.food;
1813	SET_FLAG (item, FLAG_NO_STEAL);
1814	}
1815	}
1816		1660
1817	/* special_potion() - so that old potion code is still done right. */	1661	item->set_flag (FLAG_NO_STEAL);
1818		1662	}
1819	int
1820	special_potion (object *op)
1821	{
1822	if (op->attacktype)
1823	return 1;
1824
1825	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1826	return 1;
1827
1828	for (int i = 0; i < NROFATTACKS; i++)
1829	if (op->resist[i])
1830	return 1;
1831
1832	return 0;
1833	}	1663	}
1834		1664
1835	void	1665	static void
1836	free_treasurestruct (treasure *t)	1666	free_treasurestruct (treasure *t)
1837	{	1667	{
1838	if (t->next) free_treasurestruct (t->next);	1668	if (t->next) free_treasurestruct (t->next);
1839	if (t->next_yes) free_treasurestruct (t->next_yes);	1669	if (t->next_yes) free_treasurestruct (t->next_yes);
1840	if (t->next_no) free_treasurestruct (t->next_no);	1670	if (t->next_no) free_treasurestruct (t->next_no);
1841		1671
1842	delete t;	1672	delete t;
1843	}	1673	}
1844		1674
1845	void	1675	static void
1846	free_charlinks (linked_char *lc)	1676	free_charlinks (linked_char *lc)
1847	{	1677	{
1848	if (lc->next)	1678	if (lc->next)
1849	free_charlinks (lc->next);	1679	free_charlinks (lc->next);
1850		1680
1851	delete lc;	1681	delete lc;
1852	}	1682	}
1853		1683
1854	void	1684	static void
1855	free_artifact (artifact *at)	1685	free_artifact (artifact *at)
1856	{	1686	{
1857	if (at->next) free_artifact (at->next);	1687	if (at->next) free_artifact (at->next);
1858	if (at->allowed) free_charlinks (at->allowed);	1688	if (at->allowed) free_charlinks (at->allowed);
1859		1689
1860	at->item->destroy (1);	1690	at->item->destroy ();
1861		1691
1862	sfree (at);	1692	sfree (at);
1863	}	1693	}
1864		1694
1865	void
1866	free_artifactlist (artifactlist *al)
1867	{
1868	artifactlist *nextal;
1869
1870	for (al = first_artifactlist; al; al = nextal)
1871	{
1872	nextal = al->next;
1873
1874	if (al->items)
1875	free_artifact (al->items);
1876
1877	sfree (al);
1878	}
1879	}
1880
1881	void
1882	free_all_treasures (void)
1883	{
1884	treasurelist tl, next;
1885
1886	for (tl = first_treasurelist; tl; tl = next)
1887	{
1888	clear (tl);
1889
1890	next = tl->next;
1891	delete tl;
1892	}
1893
1894	free_artifactlist (first_artifactlist);
1895	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC vs. Revision 1.106 by elmex, Wed Apr 21 09:30:07 2010 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.42 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.106 by elmex, Wed Apr 21 09:30:07 2010 UTC