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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.43 by root, Mon Apr 16 11:09:30 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_treasure_file (const char *filename)	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	object_thawer f (filename);	202	bool one = f.kw == KW_treasureone;
216		203	treasurelist *tl = treasurelist::get (f.get_str ());
217	if (!f)	204	clear (tl);
218	{	205	tl->items = read_treasure (f);
219	LOG (llevError, "Can't open treasure file.\n");	206	if (!tl->items)
220	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)
221	}	214	{
222		215	for (treasure *t = tl->items; t; t = t->next)
223	f.next ();
224
225	for (;;)
226	{
227	switch (f.kw)
228	{	216	{
229	case KW_treasure:	217	if (t->next_yes \|\| t->next_no)
230	case KW_treasureone:
231	{	218	{
232	bool one = f.kw == KW_treasureone;
233	treasurelist *tl = treasurelist::get (f.get_str ());
234
235	clear (tl);
236	tl->items = load_treasure (f);
237
238	if (!tl->items)
239	return false;
240
241	/* This is a one of the many items on the list should be generated.
242	* Add up the chance total, and check to make sure the yes & no
243	* fields of the treasures are not being used.
244	*/
245	if (one)
246	{
247	for (t = tl->items; t; t = t->next)
248	{
249	#ifdef TREASURE_DEBUG
250	if (t->next_yes \|\| t->next_no)
251	{
252	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);
253	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");
254	}
255	#endif
256	tl->total_chance += t->chance;
257	}
258	}
259	}	221	}
260	break;
261		222
262	case KW_EOF:	223	tl->total_chance += t->chance;
263	#ifdef TREASURE_DEBUG
264	/* Perform some checks on how valid the treasure data actually is.
265	* verify that list transitions work (ie, the list that it is supposed
266	* to transition to exists). Also, verify that at least the name
267	* or archetype is set for each treasure element.
268	*/
269	for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
270	check_treasurelist (tl->items, tl);
271	#endif
272	return true;
273
274	default:
275	if (!f.parse_error ("treasure lists"))
276	return false;
277
278	break;
279	}	224	}
280
281	f.next ();
282	}	225	}
		226
		227	return tl;
283	}	228	}
284		229
285	/*	230	/*
286	* Generates the objects specified by the given treasure.	231	* Generates the objects specified by the given treasure.
287	* It goes recursively through the rest of the linked list.	232	* It goes recursively through the rest of the linked list.
…		…
294	* start with equipment, but only their abilities).	239	* start with equipment, but only their abilities).
295	*/	240	*/
296	static void	241	static void
297	put_treasure (object op, object creator, int flags)	242	put_treasure (object op, object creator, int flags)
298	{	243	{
299	object *tmp;	244	if (flags & GT_ENVIRONMENT)
300		245	{
301	/* 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
302	* 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
303	* 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
304	* by another object.	249	* by another object.
305	*/	250	*/
306	if (flags & GT_ENVIRONMENT && op->type != SPELL)	251	//TODO: flag such as objects... as such (no drop, anybody?)
307	{	252	if (op->type == SPELL)
308	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;
309	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	}
310	}	268	}
311	else	269	else
312	{	270	{
313	op = creator->insert (op);	271	op = creator->insert (op);
314		272
315	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	273	if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
316	monster_check_apply (creator, op);	274	monster_check_apply (creator, op);
317
318	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
319	esrv_send_item (tmp, op);
320	}	275	}
321	}	276	}
322		277
323	/* 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
324	* in the generated object	279	* in the generated object
…		…
346	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)	301	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
347	{	302	{
348	if (t->name)	303	if (t->name)
349	{	304	{
350	if (difficulty >= t->magic)	305	if (difficulty >= t->magic)
		306	if (treasurelist *tl = treasurelist::find (t->name))
351	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);
352	}	310	}
353	else	311	else
354	{	312	{
355	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))	313	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
356	{	314	{
357	object *tmp = arch_to_object (t->item);	315	object *tmp = t->item->instance ();
358		316
359	if (t->nrof && tmp->nrof <= 1)	317	if (t->nrof && tmp->nrof <= 1)
360	tmp->nrof = rndm (t->nrof) + 1;	318	tmp->nrof = rndm (t->nrof) + 1;
361		319
362	fix_generated_item (tmp, op, difficulty, t->magic, flag);	320	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
407	create_treasure (tl, op, flag, difficulty, tries);	365	create_treasure (tl, op, flag, difficulty, tries);
408	}	366	}
409	else if (t->nrof)	367	else if (t->nrof)
410	create_one_treasure (tl, op, flag, difficulty, tries);	368	create_one_treasure (tl, op, flag, difficulty, tries);
411	}	369	}
412	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	370	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
413	{	371	{
414	if (object *tmp = arch_to_object (t->item))	372	if (object *tmp = t->item->instance ())
415	{	373	{
416	if (t->nrof && tmp->nrof <= 1)	374	if (t->nrof && tmp->nrof <= 1)
417	tmp->nrof = rndm (t->nrof) + 1;	375	tmp->nrof = rndm (t->nrof) + 1;
418		376
419	fix_generated_item (tmp, op, difficulty, t->magic, flag);	377	fix_generated_item (tmp, op, difficulty, t->magic, flag);
420	change_treasure (t, tmp);	378	change_treasure (t, tmp);
421	put_treasure (tmp, op, flag);	379	put_treasure (tmp, op, flag);
422	}	380	}
423	}	381	}
		382	}
		383
		384	void
		385	object::create_treasure (treasurelist *tl, int flags)
		386	{
		387	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
424	}	388	}
425		389
426	/* This calls the appropriate treasure creation function. tries is passed	390	/* This calls the appropriate treasure creation function. tries is passed
427	* to determine how many list transitions or attempts to create treasure	391	* 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	392	* have been made. It is really in place to prevent infinite loops with
…		…
441	{	405	{
442	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	406	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
443	return;	407	return;
444	}	408	}
445		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
446	if (tl->total_chance)	419	if (tl->total_chance)
447	create_one_treasure (tl, op, flag, difficulty, tries);	420	create_one_treasure (tl, op, flag, difficulty, tries);
448	else	421	else
449	create_all_treasures (tl->items, op, flag, difficulty, tries);	422	create_all_treasures (tl->items, op, flag, difficulty, tries);
450	}	423	}
…		…
457	object *	430	object *
458	generate_treasure (treasurelist *tl, int difficulty)	431	generate_treasure (treasurelist *tl, int difficulty)
459	{	432	{
460	difficulty = clamp (difficulty, 1, settings.max_level);	433	difficulty = clamp (difficulty, 1, settings.max_level);
461		434
462	object ob = object::create (), tmp;	435	object *ob = object::create ();
463		436
464	create_treasure (tl, ob, 0, difficulty, 0);	437	create_treasure (tl, ob, 0, difficulty, 0);
465		438
466	/* 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 */
467	tmp = ob->inv;	440	object *tmp = ob->inv;
468	if (tmp != NULL)	441	if (tmp)
469	tmp->remove ();	442	tmp->remove ();
470		443
471	if (ob->inv)	444	if (ob->inv)
472	LOG (llevError, "In generate treasure, created multiple objects.\n");	445	LOG (llevError, "In generate treasure, created multiple objects.\n");
473		446
474	ob->destroy ();	447	ob->destroy ();
		448
475	return tmp;	449	return tmp;
476	}	450	}
477		451
478	/*	452	/*
479	* 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
…		…
481	* 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
482	* magical bonus "wanted".	456	* magical bonus "wanted".
483	*/	457	*/
484		458
485	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	459	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
486
487	// chance of magic difficulty	460	// chance of magic difficulty
488	// +0 +1 +2 +3 +4	461	// +0 +1 +2 +3 +4
489	{95, 2, 2, 1, 0}, // 1	462	{95, 2, 2, 1, 0}, // 1
490	{92, 5, 2, 1, 0}, // 2	463	{92, 5, 2, 1, 0}, // 2
491	{85, 10, 4, 1, 0}, // 3	464	{85, 10, 4, 1, 0}, // 3
…		…
517	{ 0, 0, 0, 3, 97}, // 29	490	{ 0, 0, 0, 3, 97}, // 29
518	{ 0, 0, 0, 0, 100}, // 30	491	{ 0, 0, 0, 0, 100}, // 30
519	{ 0, 0, 0, 0, 100}, // 31	492	{ 0, 0, 0, 0, 100}, // 31
520	};	493	};
521		494
522
523	/* calculate the appropriate level for wands staves and scrolls.	495	/* calculate the appropriate level for wands staves and scrolls.
524	* 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)
525	*	497	*
526	* elmex Wed Aug 9 17:44:59 CEST 2006:	498	* elmex Wed Aug 9 17:44:59 CEST 2006:
527	* 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.
528	*/	500	*/
529		501	static int
530	int
531	level_for_item (const object *op, int difficulty)	502	level_for_item (const object *op, int difficulty)
532	{	503	{
533	int olevel = 0;
534
535	if (!op->inv)	504	if (!op->inv)
536	{	505	{
537	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);
538	return 0;	507	return 0;
539	}	508	}
540		509
541	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	510	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
542		511
543	if (olevel <= 0)	512	if (olevel <= 0)
544	olevel = rndm (1, MIN (op->inv->level, 1));	513	olevel = rndm (1, op->inv->level);
545		514
546	if (olevel > MAXLEVEL)	515	return min (olevel, MAXLEVEL_TREASURE);
547	olevel = MAXLEVEL;
548
549	return olevel;
550	}	516	}
551		517
552	/*	518	/*
553	* Based upon the specified difficulty and upon the difftomagic_list array,	519	* Based upon the specified difficulty and upon the difftomagic_list array,
554	* a random magical bonus is returned. This is used when determine	520	* a random magical bonus is returned. This is used when determine
…		…
557	* elmex Thu Aug 10 18:45:44 CEST 2006:	523	* elmex Thu Aug 10 18:45:44 CEST 2006:
558	* 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
559	* weird integer between 1-31.	525	* weird integer between 1-31.
560	*	526	*
561	*/	527	*/
562	int	528	static int
563	magic_from_difficulty (int difficulty)	529	magic_from_difficulty (int difficulty)
564	{	530	{
565	int percent = 0, magic = 0;	531	int percent = 0, magic = 0;
566	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	532	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
567		533
…		…
610		576
611	op->magic = magic;	577	op->magic = magic;
612	if (op->arch)	578	if (op->arch)
613	{	579	{
614	if (op->type == ARMOUR)	580	if (op->type == ARMOUR)
615	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	581	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616		582
617	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 */
618	magic = (-magic);	584	magic = (-magic);
		585
619	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	586	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620	}	587	}
621	else	588	else
622	{	589	{
623	if (op->type == ARMOUR)	590	if (op->type == ARMOUR)
624	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	591	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		592
625	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 */
626	magic = (-magic);	594	magic = (-magic);
		595
627	op->weight = (op->weight * (100 - magic * 10)) / 100;	596	op->weight = (op->weight * (100 - magic * 10)) / 100;
628	}	597	}
629	}	598	}
630		599
631	/*	600	/*
…		…
643	i = -i;	612	i = -i;
644	if (i > max_magic)	613	if (i > max_magic)
645	i = max_magic;	614	i = max_magic;
646	set_abs_magic (op, i);	615	set_abs_magic (op, i);
647	if (i < 0)	616	if (i < 0)
648	SET_FLAG (op, FLAG_CURSED);	617	op->set_flag (FLAG_CURSED);
649	}	618	}
650		619
651	/*	620	/*
652	* Randomly adds one magical ability to the given object.	621	* Randomly adds one magical ability to the given object.
653	* Modified for Partial Resistance in many ways:	622	* Modified for Partial Resistance in many ways:
654	* 1) Since rings can have multiple bonuses, if the same bonus	623	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	624	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	625	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	626	* 2) Add code to deal with new PR method.
658	*/	627	*/
659	void	628	static void
660	set_ring_bonus (object *op, int bonus)	629	set_ring_bonus (object *op, int bonus)
661	{	630	{
662
663	int r = rndm (bonus > 0 ? 25 : 11);	631	int r = rndm (bonus > 0 ? 25 : 11);
664		632
665	if (op->type == AMULET)	633	if (op->type == AMULET)
666	{	634	{
667	if (!(rndm (21)))	635	if (!(rndm (21)))
…		…
686	case 2:	654	case 2:
687	case 3:	655	case 3:
688	case 4:	656	case 4:
689	case 5:	657	case 5:
690	case 6:	658	case 6:
691	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	659	op->stats.stat (r) += bonus;
692	break;	660	break;
693		661
694	case 7:	662	case 7:
695	op->stats.dam += bonus;	663	op->stats.dam += bonus;
696	break;	664	break;
…		…
747	break;	715	break;
748	}	716	}
749	case 20:	717	case 20:
750	if (op->type == AMULET)	718	if (op->type == AMULET)
751	{	719	{
752	SET_FLAG (op, FLAG_REFL_SPELL);	720	op->set_flag (FLAG_REFL_SPELL);
753	op->value *= 11;	721	op->value *= 11;
754	}	722	}
755	else	723	else
756	{	724	{
757	op->stats.hp = 1; /* regenerate hit points */	725	op->stats.hp = 1; /* regenerate hit points */
…		…
760	break;	728	break;
761		729
762	case 21:	730	case 21:
763	if (op->type == AMULET)	731	if (op->type == AMULET)
764	{	732	{
765	SET_FLAG (op, FLAG_REFL_MISSILE);	733	op->set_flag (FLAG_REFL_MISSILE);
766	op->value *= 9;	734	op->value *= 9;
767	}	735	}
768	else	736	else
769	{	737	{
770	op->stats.sp = 1; /* regenerate spell points */	738	op->stats.sp = 1; /* regenerate spell points */
…		…
790	* higher is the chance of returning a low number.	758	* higher is the chance of returning a low number.
791	* 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
792	* rings and amulets.	760	* rings and amulets.
793	* 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.
794	*/	762	*/
795	int	763	static int
796	get_magic (int diff)	764	get_magic (int diff)
797	{	765	{
798	int i;	766	int i;
799		767
800	if (diff < 3)	768	if (diff < 3)
…		…
803	for (i = 0; i < 4; i++)	771	for (i = 0; i < 4; i++)
804	if (rndm (diff))	772	if (rndm (diff))
805	return i;	773	return i;
806		774
807	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;
808	}	793	}
809		794
810	#define DICE2 (get_magic(2)==2?2:1)	795	#define DICE2 (get_magic(2)==2?2:1)
811	#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))
812		797
…		…
844	save_item_power = op->item_power;	829	save_item_power = op->item_power;
845	op->item_power = 0;	830	op->item_power = 0;
846		831
847	if (op->randomitems && op->type != SPELL)	832	if (op->randomitems && op->type != SPELL)
848	{	833	{
849	create_treasure (op->randomitems, op, flags, difficulty, 0);	834	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
850	if (!op->inv)
851	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
852
853	/* So the treasure doesn't get created again */	835	/* So the treasure doesn't get created again */
854	op->randomitems = 0;	836	op->randomitems = 0;
855	}	837	}
856		838
857	if (difficulty < 1)	839	max_it (difficulty, 1);
858	difficulty = 1;
859		840
860	if (INVOKE_OBJECT (ADD_BONUS, op,	841	if (INVOKE_OBJECT (ADD_BONUS, op,
861	ARG_OBJECT (creator != op ? creator : 0),	842	ARG_OBJECT (creator != op ? creator : 0),
862	ARG_INT (difficulty), ARG_INT (max_magic),	843	ARG_INT (difficulty), ARG_INT (max_magic),
863	ARG_INT (flags)))	844	ARG_INT (flags)))
864	return;	845	return;
865		846
866	if (!(flags & GT_MINIMAL))	847	if (!(flags & GT_MINIMAL))
867	{	848	{
868	if (op->arch == crown_arch)	849	if (IS_ARCH (op->arch, crown))
869	{	850	{
870	set_magic (difficulty, op, max_magic, flags);	851	set_magic (difficulty, op, max_magic, flags);
871	num_enchantments = calc_item_power (op, 1);	852	num_enchantments = calc_item_power (op, 1);
872	generate_artifact (op, difficulty);	853	generate_artifact (op, difficulty);
873	}	854	}
…		…
878		859
879	num_enchantments = calc_item_power (op, 1);	860	num_enchantments = calc_item_power (op, 1);
880		861
881	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	862	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
882	\|\| op->type == HORN	863	\|\| op->type == HORN
883	\|\| 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 */
884	* used for shop_floors or treasures */
885	generate_artifact (op, difficulty);	865	generate_artifact (op, difficulty);
886	}	866	}
887		867
888	/* Object was made an artifact. Calculate its item_power rating.	868	/* Object was made an artifact. Calculate its item_power rating.
889	* the item_power in the object is what the artfiact adds.	869	* the item_power in the object is what the artfiact adds.
…		…
923	* again below */	903	* again below */
924	}	904	}
925	}	905	}
926		906
927	/* materialtype modifications. Note we allow this on artifacts. */	907	/* materialtype modifications. Note we allow this on artifacts. */
928	set_materialname (op, difficulty, NULL);	908	select_material (op, difficulty);
929		909
930	if (flags & GT_MINIMAL)	910	if (flags & GT_MINIMAL)
931	{	911	{
932	if (op->type == POTION)	912	if (op->type == POTION)
933	/* Handle healing and magic power potions */	913	/* Handle healing and magic power potions */
934	if (op->stats.sp && !op->randomitems)	914	if (op->stats.sp && !op->randomitems)
935	{	915	{
936	object *tmp;
937
938	tmp = get_archetype (spell_mapping[op->stats.sp]);	916	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
939	insert_ob_in_ob (tmp, op);	917	insert_ob_in_ob (tmp, op);
940	op->stats.sp = 0;	918	op->stats.sp = 0;
941	}	919	}
942	}	920	}
943	else if (!op->title) /* Only modify object if not special */	921	else if (!op->title) /* Only modify object if not special */
…		…
946	case WEAPON:	924	case WEAPON:
947	case ARMOUR:	925	case ARMOUR:
948	case SHIELD:	926	case SHIELD:
949	case HELMET:	927	case HELMET:
950	case CLOAK:	928	case CLOAK:
951	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	929	if (op->flag [FLAG_CURSED] && !(rndm (4)))
952	set_ring_bonus (op, -DICE2);	930	set_ring_bonus (op, -DICE2);
953	break;	931	break;
954		932
955	case BRACERS:	933	case BRACERS:
956	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))	934	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
957	{	935	{
958	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	936	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
959	if (!QUERY_FLAG (op, FLAG_CURSED))	937	if (!op->flag [FLAG_CURSED])
960	op->value *= 3;	938	op->value *= 3;
961	}	939	}
962	break;	940	break;
963		941
964	case POTION:	942	case POTION:
…		…
966	int too_many_tries = 0, is_special = 0;	944	int too_many_tries = 0, is_special = 0;
967		945
968	/* Handle healing and magic power potions */	946	/* Handle healing and magic power potions */
969	if (op->stats.sp && !op->randomitems)	947	if (op->stats.sp && !op->randomitems)
970	{	948	{
971	object *tmp;
972
973	tmp = get_archetype (spell_mapping[op->stats.sp]);	949	object *tmp = get_archetype (spell_mapping[op->stats.sp]);
974	insert_ob_in_ob (tmp, op);	950	insert_ob_in_ob (tmp, op);
975	op->stats.sp = 0;	951	op->stats.sp = 0;
976	}	952	}
977		953
978	while (!(is_special = special_potion (op)) && !op->inv)	954	while (!(is_special = special_potion (op)) && !op->inv)
…		…
986	* since the value set on those is already correct.	962	* since the value set on those is already correct.
987	*/	963	*/
988	if (op->inv && op->randomitems)	964	if (op->inv && op->randomitems)
989	{	965	{
990	/* value multiplier is same as for scrolls */	966	/* value multiplier is same as for scrolls */
991	op->value = (op->value * op->inv->value);	967	op->value *= op->inv->value;
992	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	968	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
993	}	969	}
994	else	970	else
995	{	971	{
996	op->name = "potion";	972	op->name = "potion";
997	op->name_pl = "potions";	973	op->name_pl = "potions";
998	}	974	}
999		975
1000	if (!(flags & GT_ONLY_GOOD) && rndm (2))	976	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1001	SET_FLAG (op, FLAG_CURSED);	977	op->set_flag (FLAG_CURSED);
		978
1002	break;	979	break;
1003	}	980	}
1004		981
1005	case AMULET:	982	case AMULET:
1006	if (op->arch == amulet_arch)	983	if (IS_ARCH (op->arch, amulet))
1007	op->value = 5; / Since it's not just decoration */	984	op->value = 5; / Since it's not just decoration */
1008		985
1009	case RING:	986	case RING:
1010	if (op->arch == NULL)
1011	{
1012	op->destroy ();
1013	op = 0;
1014	break;
1015	}
1016
1017	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! */
1018	break;	988	break;
1019		989
1020	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	990	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1021	SET_FLAG (op, FLAG_CURSED);	991	op->set_flag (FLAG_CURSED);
1022		992
1023	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	993	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1024		994
1025	if (op->type != RING) /* Amulets have only one ability */	995	if (op->type != RING) /* Amulets have only one ability */
1026	break;	996	break;
1027		997
1028	if (!(rndm (4)))	998	if (!(rndm (4)))
1029	{	999	{
1030	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1000	int d = (rndm (2) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1031		1001
1032	if (d > 0)	1002	if (d > 0)
1033	op->value *= 3;	1003	op->value *= 3;
1034		1004
1035	set_ring_bonus (op, d);	1005	set_ring_bonus (op, d);
1036		1006
1037	if (!(rndm (4)))	1007	if (!(rndm (4)))
1038	{	1008	{
1039	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1009	int d = (rndm (3) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1040		1010
1041	if (d > 0)	1011	if (d > 0)
1042	op->value *= 5;	1012	op->value *= 5;
1043	set_ring_bonus (op, d);	1013	set_ring_bonus (op, d);
1044	}	1014	}
1045	}	1015	}
1046		1016
1047	if (GET_ANIM_ID (op))	1017	if (op->animation_id)
1048	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1018	op->set_anim_frame (rndm (op->anim_frames ()));
1049		1019
1050	break;	1020	break;
1051		1021
1052	case BOOK:	1022	case BOOK:
1053	/* Is it an empty book?, if yes lets make a special·	1023	/* Is it an empty book?, if yes lets make a special·
…		…
1055	* creator and/or map level we found it on.	1025	* creator and/or map level we found it on.
1056	*/	1026	*/
1057	if (!op->msg && rndm (10))	1027	if (!op->msg && rndm (10))
1058	{	1028	{
1059	/* set the book level properly */	1029	/* set the book level properly */
1060	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1030	if (creator->level == 0 \|\| creator->flag [FLAG_ALIVE])
1061	{	1031	{
1062	if (op->map && op->map->difficulty)	1032	if (op->map && op->map->difficulty)
1063	op->level = rndm (op->map->difficulty) + rndm (10) + 1;	1033	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1064	else	1034	else
1065	op->level = rndm (20) + 1;	1035	op->level = rndm (20) + 1;
…		…
1068	op->level = rndm (creator->level);	1038	op->level = rndm (creator->level);
1069		1039
1070	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);
1071	/* books w/ info are worth more! */	1041	/* books w/ info are worth more! */
1072	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));
1073	/* creator related stuff */
1074
1075	/* for library, chained books. Note that some monsters have no_pick
1076	* set - we don't want to set no pick in that case.
1077	*/
1078	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1079	SET_FLAG (op, FLAG_NO_PICK);
1080	if (creator->slaying && !op->slaying) /* for check_inv floors */
1081	op->slaying = creator->slaying;
1082		1043
1083	/* add exp so reading it gives xp (once) */	1044	/* add exp so reading it gives xp (once) */
1084	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;
1085	}	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;
1086	break;	1057	break;
1087		1058
1088	case SPELLBOOK:	1059	case SPELLBOOK:
1089	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);
1090	/* add exp so learning gives xp */	1064	/* add exp so learning gives xp */
1091	op->level = op->inv->level;	1065	op->level = op->inv->level;
1092	op->stats.exp = op->value;	1066	op->stats.exp = op->value;
1093	break;	1067	break;
1094		1068
…		…
1124	* 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.
1125	*/	1099	*/
1126	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);
1127	/* 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 */
1128	if (op->stats.maxhp)	1102	if (op->stats.maxhp)
1129	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);
1130	else	1104	else
1131	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);
1132		1106
1133	op->stats.hp = op->stats.maxhp;	1107	op->stats.hp = op->stats.maxhp;
1134	break;	1108	break;
1135		1109
1136	case SCROLL:	1110	case SCROLL:
…		…
1151	break;	1125	break;
1152	} /* switch type */	1126	} /* switch type */
1153		1127
1154	if (flags & GT_STARTEQUIP)	1128	if (flags & GT_STARTEQUIP)
1155	{	1129	{
1156	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])
1157	SET_FLAG (op, FLAG_STARTEQUIP);	1131	op->set_flag (FLAG_STARTEQUIP);
1158	else if (op->type != MONEY)	1132	else if (op->type != MONEY)
1159	op->value = 0;	1133	op->value = 0;
1160	}	1134	}
1161		1135
1162	if (!(flags & GT_ENVIRONMENT))	1136	if (!(flags & GT_ENVIRONMENT))
…		…
1173		1147
1174	/*	1148	/*
1175	* Allocate and return the pointer to an empty artifactlist structure.	1149	* Allocate and return the pointer to an empty artifactlist structure.
1176	*/	1150	*/
1177	static artifactlist *	1151	static artifactlist *
1178	get_empty_artifactlist (void)	1152	get_empty_artifactlist ()
1179	{	1153	{
1180	return salloc0 <artifactlist> ();	1154	return salloc0<artifactlist> ();
1181	}	1155	}
1182		1156
1183	/*	1157	/*
1184	* Allocate and return the pointer to an empty artifact structure.	1158	* Allocate and return the pointer to an empty artifact structure.
1185	*/	1159	*/
1186	static artifact *	1160	static artifact *
1187	get_empty_artifact (void)	1161	get_empty_artifact ()
1188	{	1162	{
1189	return salloc0 <artifact> ();	1163	return salloc0<artifact> ();
1190	}	1164	}
1191		1165
1192	/*	1166	/*
1193	* 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
1194	* of objects on it.	1168	* of objects on it.
…		…
1202		1176
1203	return 0;	1177	return 0;
1204	}	1178	}
1205		1179
1206	/*	1180	/*
1207	* For debugging purposes. Dumps all tables.	1181	* Builds up the lists of artifacts from the file in the libdir.
1208	*/	1182	*/
1209	void	1183	void
1210	dump_artifacts (void)
1211	{
1212	artifactlist *al;
1213	artifact *art;
1214	linked_char *next;
1215
1216	fprintf (logfile, "\n");
1217	for (al = first_artifactlist; al != NULL; al = al->next)
1218	{
1219	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1220	for (art = al->items; art != NULL; art = art->next)
1221	{
1222	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1223	if (art->allowed != NULL)
1224	{
1225	fprintf (logfile, "\tallowed combinations:");
1226	for (next = art->allowed; next != NULL; next = next->next)
1227	fprintf (logfile, "%s,", &next->name);
1228	fprintf (logfile, "\n");
1229	}
1230	}
1231	}
1232	fprintf (logfile, "\n");
1233	}
1234
1235	/*
1236	* For debugging purposes. Dumps all treasures recursively (see below).
1237	*/
1238	void
1239	dump_monster_treasure_rec (const char name, treasure t, int depth)
1240	{
1241	treasurelist *tl;
1242	int i;
1243
1244	if (depth > 100)
1245	return;
1246
1247	while (t)
1248	{
1249	if (t->name)
1250	{
1251	for (i = 0; i < depth; i++)
1252	fprintf (logfile, " ");
1253
1254	fprintf (logfile, "{ (list: %s)\n", &t->name);
1255
1256	tl = treasurelist::find (t->name);
1257	if (tl)
1258	dump_monster_treasure_rec (name, tl->items, depth + 2);
1259
1260	for (i = 0; i < depth; i++)
1261	fprintf (logfile, " ");
1262
1263	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1264	}
1265	else
1266	{
1267	for (i = 0; i < depth; i++)
1268	fprintf (logfile, " ");
1269
1270	if (t->item && t->item->clone.type == FLESH)
1271	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1272	else
1273	fprintf (logfile, "%s\n", &t->item->clone.name);
1274	}
1275
1276	if (t->next_yes)
1277	{
1278	for (i = 0; i < depth; i++)
1279	fprintf (logfile, " ");
1280
1281	fprintf (logfile, " (if yes)\n");
1282	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1283	}
1284
1285	if (t->next_no)
1286	{
1287	for (i = 0; i < depth; i++)
1288	fprintf (logfile, " ");
1289
1290	fprintf (logfile, " (if no)\n");
1291	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1292	}
1293
1294	t = t->next;
1295	}
1296	}
1297
1298	/*
1299	* For debugging purposes. Dumps all treasures for a given monster.
1300	* Created originally by Raphael Quinet for debugging the alchemy code.
1301	*/
1302	void
1303	dump_monster_treasure (const char *name)
1304	{
1305	archetype *at;
1306	int found;
1307
1308	found = 0;
1309	fprintf (logfile, "\n");
1310
1311	for (at = first_archetype; at != NULL; at = at->next)
1312	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1313	{
1314	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1315	if (at->clone.randomitems != NULL)
1316	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1317	else
1318	fprintf (logfile, "(nothing)\n");
1319
1320	fprintf (logfile, "\n");
1321	found++;
1322	}
1323
1324	if (found == 0)
1325	fprintf (logfile, "No objects have the name %s!\n\n", name);
1326	}
1327
1328	/*
1329	* Builds up the lists of artifacts from the file in the libdir.
1330	*/
1331	void
1332	init_artifacts (void)	1184	init_artifacts ()
1333	{	1185	{
1334	static int has_been_inited = 0;	1186	static int has_been_inited = 0;
1335	char filename[MAX_BUF];	1187	char filename[MAX_BUF];
1336	artifact *art = NULL;	1188	artifact *art = NULL;
1337	artifactlist *al;	1189	artifactlist *al;
…		…
1345	object_thawer f (filename);	1197	object_thawer f (filename);
1346		1198
1347	if (!f)	1199	if (!f)
1348	return;	1200	return;
1349		1201
1350	f.next ();
1351
1352	for (;;)	1202	for (;;)
1353	{	1203	{
1354	switch (f.kw)	1204	switch (f.kw)
1355	{	1205	{
1356	case KW_allowed:	1206	case KW_allowed:
1357	if (!art)	1207	if (!art)
1358	{
1359	art = get_empty_artifact ();	1208	art = get_empty_artifact ();
1360	nrofartifacts++;
1361	}
1362		1209
1363	{	1210	{
1364	if (!strcmp (f.get_str (), "all"))	1211	if (!strcmp (f.get_str (), "all"))
1365	break;	1212	break;
1366		1213
1367	char next, cp = f.get_str ();	1214	const char *cp = f.get_str ();
1368		1215	char *next;
1369	do	1216	do
1370	{	1217	{
1371	nrofallowedstr++;
1372
1373	if ((next = strchr (cp, ',')))	1218	if ((next = (char *)strchr (cp, ',')))
1374	*next++ = '\0';	1219	*next++ = '\0';
1375		1220
1376	linked_char *tmp = new linked_char;	1221	linked_char *tmp = new linked_char;
1377		1222
1378	tmp->name = cp;	1223	tmp->name = cp;
…		…
1392	break;	1237	break;
1393		1238
1394	case KW_object:	1239	case KW_object:
1395	{	1240	{
1396	art->item = object::create ();	1241	art->item = object::create ();
		1242	f.get (art->item->name);
		1243	f.next ();
1397		1244
1398	if (!art->item->parse_kv (f))	1245	if (!art->item->parse_kv (f))
1399	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1246	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1400		1247
1401	al = find_artifactlist (art->item->type);	1248	al = find_artifactlist (art->item->type);
…		…
1427	}	1274	}
1428		1275
1429	done:	1276	done:
1430	for (al = first_artifactlist; al; al = al->next)	1277	for (al = first_artifactlist; al; al = al->next)
1431	{	1278	{
		1279	al->total_chance = 0;
		1280
1432	for (art = al->items; art; art = art->next)	1281	for (art = al->items; art; art = art->next)
1433	{	1282	{
1434	if (!art->chance)	1283	if (!art->chance)
1435	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);
1436	else	1285	else
…		…
1442	}	1291	}
1443		1292
1444	LOG (llevDebug, "done.\n");	1293	LOG (llevDebug, "done.\n");
1445	}	1294	}
1446		1295
1447
1448	/*	1296	/*
1449	* Used in artifact generation. The bonuses of the first object	1297	* Used in artifact generation. The bonuses of the first object
1450	* is modified by the bonuses of the second object.	1298	* is modified by the bonuses of the second object.
1451	*/	1299	*/
1452
1453	void	1300	void
1454	add_abilities (object op, object change)	1301	add_abilities (object op, object change)
1455	{	1302	{
1456	int i, tmp;	1303	int i, tmp;
1457		1304
…		…
1462	#endif	1309	#endif
1463	op->face = change->face;	1310	op->face = change->face;
1464	}	1311	}
1465		1312
1466	for (i = 0; i < NUM_STATS; i++)	1313	for (i = 0; i < NUM_STATS; i++)
1467	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1314	change_attr_value (&(op->stats), i, change->stats.stat (i));
1468		1315
1469	op->attacktype \|= change->attacktype;	1316	op->attacktype \|= change->attacktype;
1470	op->path_attuned \|= change->path_attuned;	1317	op->path_attuned \|= change->path_attuned;
1471	op->path_repelled \|= change->path_repelled;	1318	op->path_repelled \|= change->path_repelled;
1472	op->path_denied \|= change->path_denied;	1319	op->path_denied \|= change->path_denied;
1473	op->move_type \|= change->move_type;	1320	op->move_type \|= change->move_type;
1474	op->stats.luck += change->stats.luck;	1321	op->stats.luck += change->stats.luck;
1475		1322
1476	if (QUERY_FLAG (change, FLAG_CURSED))	1323	if (change->flag [FLAG_CURSED])
1477	SET_FLAG (op, FLAG_CURSED);	1324	op->set_flag (FLAG_CURSED);
1478	if (QUERY_FLAG (change, FLAG_DAMNED))	1325	if (change->flag [FLAG_DAMNED])
1479	SET_FLAG (op, FLAG_DAMNED);	1326	op->set_flag (FLAG_DAMNED);
1480	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)
1481	set_abs_magic (op, -op->magic);	1328	set_abs_magic (op, -op->magic);
1482		1329
1483	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1330	if (change->flag [FLAG_LIFESAVE])
1484	SET_FLAG (op, FLAG_LIFESAVE);	1331	op->set_flag (FLAG_LIFESAVE);
1485	if (QUERY_FLAG (change, FLAG_REFL_SPELL))	1332	if (change->flag [FLAG_REFL_SPELL])
1486	SET_FLAG (op, FLAG_REFL_SPELL);	1333	op->set_flag (FLAG_REFL_SPELL);
1487	if (QUERY_FLAG (change, FLAG_STEALTH))	1334	if (change->flag [FLAG_STEALTH])
1488	SET_FLAG (op, FLAG_STEALTH);	1335	op->set_flag (FLAG_STEALTH);
1489	if (QUERY_FLAG (change, FLAG_XRAYS))	1336	if (change->flag [FLAG_XRAYS])
1490	SET_FLAG (op, FLAG_XRAYS);	1337	op->set_flag (FLAG_XRAYS);
1491	if (QUERY_FLAG (change, FLAG_BLIND))	1338	if (change->flag [FLAG_BLIND])
1492	SET_FLAG (op, FLAG_BLIND);	1339	op->set_flag (FLAG_BLIND);
1493	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))	1340	if (change->flag [FLAG_SEE_IN_DARK])
1494	SET_FLAG (op, FLAG_SEE_IN_DARK);	1341	op->set_flag (FLAG_SEE_IN_DARK);
1495	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))	1342	if (change->flag [FLAG_REFL_MISSILE])
1496	SET_FLAG (op, FLAG_REFL_MISSILE);	1343	op->set_flag (FLAG_REFL_MISSILE);
1497	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))	1344	if (change->flag [FLAG_MAKE_INVIS])
1498	SET_FLAG (op, FLAG_MAKE_INVIS);	1345	op->set_flag (FLAG_MAKE_INVIS);
1499		1346
1500	if (QUERY_FLAG (change, FLAG_STAND_STILL))	1347	if (change->flag [FLAG_STAND_STILL])
1501	{	1348	{
1502	CLEAR_FLAG (op, FLAG_ANIMATE);	1349	op->clr_flag (FLAG_ANIMATE);
1503	/* so artifacts will join */	1350	/* so artifacts will join */
1504	if (!QUERY_FLAG (op, FLAG_ALIVE))	1351	if (!op->flag [FLAG_ALIVE])
1505	op->speed = 0.0;	1352	op->speed = 0.0;
1506		1353
1507	op->set_speed (op->speed);	1354	op->set_speed (op->speed);
1508	}	1355	}
1509		1356
…		…
1520	* 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
1521	* this object.	1368	* this object.
1522	*/	1369	*/
1523	if (op->type == HORN \|\| op->type == POTION)	1370	if (op->type == HORN \|\| op->type == POTION)
1524	{	1371	{
1525	object *tmp_obj;
1526
1527	/* Remove any spells this object currently has in it */	1372	/* Remove any spells this object currently has in it */
1528	while (op->inv)
1529	op->inv->destroy ();	1373	op->destroy_inv (false);
1530		1374
1531	tmp_obj = arch_to_object (change->other_arch);	1375	object *tmp = change->other_arch->instance ();
1532	insert_ob_in_ob (tmp_obj, op);	1376	insert_ob_in_ob (tmp, op);
1533	}	1377	}
		1378
1534	/* No harm setting this for potions/horns */	1379	/* No harm setting this for potions/horns */
1535	op->other_arch = change->other_arch;	1380	op->other_arch = change->other_arch;
1536	}	1381	}
1537		1382
1538	if (change->stats.hp < 0)	1383	if (change->stats.hp < 0)
…		…
1622	op->value *= change->value;	1467	op->value *= change->value;
1623		1468
1624	if (change->materials)	1469	if (change->materials)
1625	op->materials = change->materials;	1470	op->materials = change->materials;
1626		1471
1627	if (change->materialname)	1472	if (change->material != MATERIAL_NULL)
1628	op->materialname = change->materialname;	1473	op->material = change->material;
1629		1474
1630	if (change->slaying)	1475	if (change->slaying)
1631	op->slaying = change->slaying;	1476	op->slaying = change->slaying;
1632		1477
1633	if (change->race)	1478	if (change->race)
…		…
1636	if (change->msg)	1481	if (change->msg)
1637	op->msg = change->msg;	1482	op->msg = change->msg;
1638	}	1483	}
1639		1484
1640	static int	1485	static int
1641	legal_artifact_combination (object op, artifact art)	1486	legal_artifact_combination (object op, artifact art)
1642	{	1487	{
1643	int neg, success = 0;	1488	int neg, success = 0;
1644	linked_char *tmp;	1489	linked_char *tmp;
1645	const char *name;	1490	const char *name;
1646		1491
1647	if (art->allowed == (linked_char *) NULL)	1492	if (!art->allowed)
1648	return 1; /* Ie, "all" */	1493	return 1; /* Ie, "all" */
		1494
1649	for (tmp = art->allowed; tmp; tmp = tmp->next)	1495	for (tmp = art->allowed; tmp; tmp = tmp->next)
1650	{	1496	{
1651	#ifdef TREASURE_VERBOSE	1497	#ifdef TREASURE_VERBOSE
1652	LOG (llevDebug, "legal_art: %s\n", &tmp->name);	1498	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1653	#endif	1499	#endif
…		…
1655	name = tmp->name + 1, neg = 1;	1501	name = tmp->name + 1, neg = 1;
1656	else	1502	else
1657	name = tmp->name, neg = 0;	1503	name = tmp->name, neg = 0;
1658		1504
1659	/* If we match name, then return the opposite of 'neg' */	1505	/* If we match name, then return the opposite of 'neg' */
1660	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)))
1661	return !neg;	1507	return !neg;
1662		1508
1663	/* 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
1664	* everything is allowed except what we match	1510	* everything is allowed except what we match
1665	*/	1511	*/
1666	else if (neg)	1512	else if (neg)
1667	success = 1;	1513	success = 1;
1668	}	1514	}
		1515
1669	return success;	1516	return success;
1670	}	1517	}
1671		1518
1672	/*	1519	/*
1673	* Fixes the given object, giving it the abilities and titles	1520	* Fixes the given object, giving it the abilities and titles
…		…
1683	op->title = new_name;	1530	op->title = new_name;
1684	add_abilities (op, artifct); /* Give out the bonuses */	1531	add_abilities (op, artifct); /* Give out the bonuses */
1685		1532
1686	#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... */
1687	{	1534	{
1688	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1535	char identified = op->flag [FLAG_IDENTIFIED];
1689		1536
1690	SET_FLAG (op, FLAG_IDENTIFIED);	1537	op->set_flag (FLAG_IDENTIFIED);
1691	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));
1692	if (!identified)	1539	if (!identified)
1693	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1540	op->clr_flag (FLAG_IDENTIFIED);
1694	}	1541	}
1695	#endif	1542	#endif
1696	return;	1543	return;
1697	}	1544	}
1698		1545
…		…
1740	#if 1	1587	#if 1
1741	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);
1742	#endif	1589	#endif
1743	return;	1590	return;
1744	}	1591	}
1745	if (!strcmp (art->item->name, "NONE"))	1592
		1593	if (art->item->name == shstr_NONE)
1746	return;	1594	return;
		1595
1747	if (FABS (op->magic) < art->item->magic)	1596	if (fabs (op->magic) < art->item->magic)
1748	continue; /* Not magic enough to be this item */	1597	continue; /* Not magic enough to be this item */
1749		1598
1750	/* Map difficulty not high enough */	1599	/* Map difficulty not high enough */
1751	if (difficulty < art->difficulty)	1600	if (difficulty < art->difficulty)
1752	continue;	1601	continue;
…		…
1803	item->level = donor->level;	1652	item->level = donor->level;
1804		1653
1805	/* if donor has some attacktypes, the flesh is poisonous */	1654	/* if donor has some attacktypes, the flesh is poisonous */
1806	if (donor->attacktype & AT_POISON)	1655	if (donor->attacktype & AT_POISON)
1807	item->type = POISON;	1656	item->type = POISON;
		1657
1808	if (donor->attacktype & AT_ACID)	1658	if (donor->attacktype & AT_ACID)
1809	item->stats.hp = -1 * item->stats.food;	1659	item->stats.hp = -1 * item->stats.food;
1810	SET_FLAG (item, FLAG_NO_STEAL);
1811	}
1812	}
1813		1660
1814	/* special_potion() - so that old potion code is still done right. */	1661	item->set_flag (FLAG_NO_STEAL);
1815		1662	}
1816	int
1817	special_potion (object *op)
1818	{
1819	if (op->attacktype)
1820	return 1;
1821
1822	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1823	return 1;
1824
1825	for (int i = 0; i < NROFATTACKS; i++)
1826	if (op->resist[i])
1827	return 1;
1828
1829	return 0;
1830	}	1663	}
1831		1664
1832	void	1665	static void
1833	free_treasurestruct (treasure *t)	1666	free_treasurestruct (treasure *t)
1834	{	1667	{
1835	if (t->next) free_treasurestruct (t->next);	1668	if (t->next) free_treasurestruct (t->next);
1836	if (t->next_yes) free_treasurestruct (t->next_yes);	1669	if (t->next_yes) free_treasurestruct (t->next_yes);
1837	if (t->next_no) free_treasurestruct (t->next_no);	1670	if (t->next_no) free_treasurestruct (t->next_no);
1838		1671
1839	delete t;	1672	delete t;
1840	}	1673	}
1841		1674
1842	void	1675	static void
1843	free_charlinks (linked_char *lc)	1676	free_charlinks (linked_char *lc)
1844	{	1677	{
1845	if (lc->next)	1678	if (lc->next)
1846	free_charlinks (lc->next);	1679	free_charlinks (lc->next);
1847		1680
1848	delete lc;	1681	delete lc;
1849	}	1682	}
1850		1683
1851	void	1684	static void
1852	free_artifact (artifact *at)	1685	free_artifact (artifact *at)
1853	{	1686	{
1854	if (at->next) free_artifact (at->next);	1687	if (at->next) free_artifact (at->next);
1855	if (at->allowed) free_charlinks (at->allowed);	1688	if (at->allowed) free_charlinks (at->allowed);
1856		1689
1857	at->item->destroy (1);	1690	at->item->destroy ();
1858		1691
1859	sfree (at);	1692	sfree (at);
1860	}	1693	}
1861		1694
1862	void
1863	free_artifactlist (artifactlist *al)
1864	{
1865	artifactlist *nextal;
1866
1867	for (al = first_artifactlist; al; al = nextal)
1868	{
1869	nextal = al->next;
1870
1871	if (al->items)
1872	free_artifact (al->items);
1873
1874	sfree (al);
1875	}
1876	}
1877
1878	void
1879	free_all_treasures (void)
1880	{
1881	treasurelist tl, next;
1882
1883	for (tl = first_treasurelist; tl; tl = next)
1884	{
1885	clear (tl);
1886
1887	next = tl->next;
1888	delete tl;
1889	}
1890
1891	free_artifactlist (first_artifactlist);
1892	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.43 by root, Mon Apr 16 11:09:30 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.43 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.106 by elmex, Wed Apr 21 09:30:07 2010 UTC