[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.92 by root, Sat Nov 7 18:30:05 2009 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify 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>	38	#include <loader.h>
40		39
41	extern char *spell_mapping[];	40	extern char *spell_mapping[];
42		41
43	static treasurelist *first_treasurelist;	42	static treasurelist *first_treasurelist;
…		…
47	typedef std::tr1::unordered_map<	46	typedef std::tr1::unordered_map<
48	const char *,	47	const char *,
49	treasurelist *,	48	treasurelist *,
50	str_hash,	49	str_hash,
51	str_equal,	50	str_equal,
52	slice_allocator< std::pair<const char const, treasurelist > >,	51	slice_allocator< std::pair<const char const, treasurelist > >
53	true
54	> tl_map_t;	52	> tl_map_t;
55		53
56	static tl_map_t tl_map;	54	static tl_map_t tl_map;
57		55
58	/*	56	//TODO: class method
59	* Initialize global archtype pointers:	57	static void free_treasurestruct (treasure *t); // bleh desu
60	*/	58	static void
61	void	59	clear (treasurelist *tl)
62	init_archetype_pointers ()
63	{	60	{
64	int prev_warn = warn_archetypes;	61	if (tl->items)
		62	{
		63	free_treasurestruct (tl->items);
		64	tl->items = 0;
		65	}
65		66
66	warn_archetypes = 1;	67	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	}	68	}
79		69
80	/*	70	/*
81	* Searches for the given treasurelist in the globally linked list	71	* Searches for the given treasurelist
82	* of treasurelists which has been built by load_treasures().
83	*/	72	*/
84	treasurelist *	73	treasurelist *
85	treasurelist::find (const char *name)	74	treasurelist::find (const char *name)
86	{	75	{
87	if (!name)	76	if (!name)
88	return 0;	77	return 0;
89		78
90	AUTODECL (i, tl_map.find (name));	79	auto (i, tl_map.find (name));
91		80
92	if (i == tl_map.end ())	81	if (i == tl_map.end ())
93	return 0;	82	return 0;
94		83
95	return i->second;	84	return i->second;
…		…
116	}	105	}
117		106
118	return tl;	107	return tl;
119	}	108	}
120		109
121	//TODO: class method	110	#ifdef TREASURE_DEBUG
122	void	111	/* recursived checks the linked list. Treasurelist is passed only
123	clear (treasurelist *tl)	112	* so that the treasure name can be printed out
		113	*/
		114	static void
		115	check_treasurelist (const treasure t, const treasurelist tl)
124	{	116	{
		117	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
		118	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		119
		120	if (t->next)
		121	check_treasurelist (t->next, tl);
		122
125	if (tl->items)	123	if (t->next_yes)
126	{	124	check_treasurelist (t->next_yes, tl);
127	free_treasurestruct (tl->items);	125
128	tl->items = 0;	126	if (t->next_no)
129	}	127	check_treasurelist (t->next_no, tl);
130	}	128	}
		129	#endif
131		130
132	/*	131	/*
133	* Reads the lib/treasure file from disk, and parses the contents	132	* Reads the lib/treasure file from disk, and parses the contents
134	* into an internal treasure structure (very linked lists)	133	* into an internal treasure structure (very linked lists)
135	*/	134	*/
136	static treasure *	135	static treasure *
137	load_treasure (object_thawer &f)	136	read_treasure (object_thawer &f)
138	{	137	{
139	treasure *t = new treasure;	138	treasure *t = new treasure;
140	int value;
141		139
142	nroftreasures++;	140	f.next ();
143		141
144	for (;;)	142	for (;;)
145	{	143	{
146	coroapi::cede_every (10);	144	coroapi::cede_to_tick ();
147
148	f.next ();
149		145
150	switch (f.kw)	146	switch (f.kw)
151	{	147	{
152	case KW_arch:	148	case KW_arch:
153	if (!(t->item = archetype::find (f.get_str ())))	149	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 ());	150
		151	if (!t->item)
		152	{
		153	f.parse_warn ("treasure references unknown archetype");
		154	t->item = archetype::empty;
		155	}
		156
155	break;	157	break;
156		158
157	case KW_list: f.get (t->name); break;	159	case KW_list: f.get (t->name); break;
158	case KW_change_name: f.get (t->change_arch.name); break;	160	case KW_change_name: f.get (t->change_arch.name); break;
159	case KW_change_title: f.get (t->change_arch.title); break;	161	case KW_change_title: f.get (t->change_arch.title); break;
160	case KW_change_slaying: f.get (t->change_arch.slaying); break;	162	case KW_change_slaying: f.get (t->change_arch.slaying); break;
161	case KW_chance: f.get (t->chance); break;	163	case KW_chance: f.get (t->chance); break;
162	case KW_nrof: f.get (t->nrof); break;	164	case KW_nrof: f.get (t->nrof); break;
163	case KW_magic: f.get (t->magic); break;	165	case KW_magic: f.get (t->magic); break;
164		166
165	case KW_yes: t->next_yes = load_treasure (f); break;	167	case KW_yes: t->next_yes = read_treasure (f); continue;
166	case KW_no: t->next_no = load_treasure (f); break;	168	case KW_no: t->next_no = read_treasure (f); continue;
167		169
168	case KW_end:	170	case KW_end:
		171	f.next ();
169	return t;	172	return t;
170		173
171	case KW_more:	174	case KW_more:
172	t->next = load_treasure (f);	175	t->next = read_treasure (f);
173	return t;	176	return t;
174		177
175	default:	178	default:
176	if (!f.parse_error ("treasure list"))	179	if (!f.parse_error ("treasurelist", t->name))
177	return t; // error	180	goto error;
178		181
179	return t;	182	return t;
180	}	183	}
181	}
182	}
183		184
184	#ifdef TREASURE_DEBUG	185	f.next ();
185	/* recursived checks the linked list. Treasurelist is passed only	186	}
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		187
194	if (t->next)	188	// not reached
195	check_treasurelist (t->next, tl);
196		189
197	if (t->next_yes)	190	error:
198	check_treasurelist (t->next_yes, tl);	191	delete t;
199		192	return 0;
200	if (t->next_no)
201	check_treasurelist (t->next_no, tl);
202	}	193	}
203	#endif
204		194
205	/*	195	/*
206	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
207	* Each treasure is parsed with the help of load_treasure().	196	* Each treasure is parsed with the help of load_treasure().
208	*/	197	*/
209	bool	198	treasurelist *
210	load_treasures ()	199	treasurelist::read (object_thawer &f)
211	{	200	{
212	treasure *t;	201	assert (f.kw == KW_treasure \|\| f.kw == KW_treasureone);
213	int comp, line = 0;
214		202
215	char filename[MAX_BUF];	203	bool one = f.kw == KW_treasureone;
216	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	204	treasurelist *tl = treasurelist::get (f.get_str ());
217		205	clear (tl);
218	object_thawer f (filename);	206	tl->items = read_treasure (f);
219		207	if (!tl->items)
220	if (!f)
221	{
222	LOG (llevError, "Can't open treasure file.\n");
223	return false;	208	return 0;
		209
		210	/* This is a one of the many items on the list should be generated.
		211	* Add up the chance total, and check to make sure the yes & no
		212	* fields of the treasures are not being used.
		213	*/
		214	if (one)
224	}	215	{
225		216	for (treasure *t = tl->items; t; t = t->next)
226	f.next ();
227
228	for (;;)
229	{
230	switch (f.kw)
231	{	217	{
232	case KW_treasure:	218	if (t->next_yes \|\| t->next_no)
233	case KW_treasureone:
234	{	219	{
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);	220	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");	221	LOG (llevError, " the next_yes or next_no field is set\n");
257	}
258	#endif
259	tl->total_chance += t->chance;
260	}
261	}
262	}	222	}
263	break;
264		223
265	case KW_EOF:	224	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	}	225	}
283
284	f.next ();
285	}	226	}
		227
		228	return tl;
286	}	229	}
287		230
288	/*	231	/*
289	* Generates the objects specified by the given treasure.	232	* Generates the objects specified by the given treasure.
290	* It goes recursively through the rest of the linked list.	233	* It goes recursively through the rest of the linked list.
…		…
297	* start with equipment, but only their abilities).	240	* start with equipment, but only their abilities).
298	*/	241	*/
299	static void	242	static void
300	put_treasure (object op, object creator, int flags)	243	put_treasure (object op, object creator, int flags)
301	{	244	{
302	object *tmp;	245	if (flags & GT_ENVIRONMENT)
303		246	{
304	/* Bit of a hack - spells should never be put onto the map. The entire	247	/* Bit of a hack - spells should never be put onto the map. The entire
305	* treasure stuff is a problem - there is no clear idea of knowing	248	* treasure stuff is a problem - there is no clear idea of knowing
306	* this is the original object, or if this is an object that should be created	249	* this is the original object, or if this is an object that should be created
307	* by another object.	250	* by another object.
308	*/	251	*/
309	if (flags & GT_ENVIRONMENT && op->type != SPELL)	252	//TODO: flag such as objects... as such (no drop, anybody?)
310	{	253	if (op->type == SPELL)
		254	{
		255	op->destroy ();
		256	return;
		257	}
		258
		259	op->expand_tail ();
		260
		261	if (!creator->is_on_map () \|\| op->blocked (creator->map, creator->x, creator->y))
		262	op->destroy ();
		263	else
		264	{
311	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	265	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
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) && QUERY_FLAG (creator, 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 = arch_to_object (t->item);
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;
…		…
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 = arch_to_object (t->item))
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;
…		…
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);
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	/*
…		…
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;
…		…
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	if (difficulty < 1)
…		…
866	ARG_INT (flags)))	845	ARG_INT (flags)))
867	return;	846	return;
868		847
869	if (!(flags & GT_MINIMAL))	848	if (!(flags & GT_MINIMAL))
870	{	849	{
871	if (op->arch == crown_arch)	850	if (IS_ARCH (op->arch, crown))
872	{	851	{
873	set_magic (difficulty, op, max_magic, flags);	852	set_magic (difficulty, op, max_magic, flags);
874	num_enchantments = calc_item_power (op, 1);	853	num_enchantments = calc_item_power (op, 1);
875	generate_artifact (op, difficulty);	854	generate_artifact (op, difficulty);
876	}	855	}
…		…
881		860
882	num_enchantments = calc_item_power (op, 1);	861	num_enchantments = calc_item_power (op, 1);
883		862
884	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	863	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
885	\|\| op->type == HORN	864	\|\| op->type == HORN
886	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	865	\|\| 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);	866	generate_artifact (op, difficulty);
889	}	867	}
890		868
891	/* Object was made an artifact. Calculate its item_power rating.	869	/* Object was made an artifact. Calculate its item_power rating.
892	* the item_power in the object is what the artfiact adds.	870	* the item_power in the object is what the artfiact adds.
…		…
934	{	912	{
935	if (op->type == POTION)	913	if (op->type == POTION)
936	/* Handle healing and magic power potions */	914	/* Handle healing and magic power potions */
937	if (op->stats.sp && !op->randomitems)	915	if (op->stats.sp && !op->randomitems)
938	{	916	{
939	object *tmp;
940
941	tmp = get_archetype (spell_mapping[op->stats.sp]);	917	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
942	insert_ob_in_ob (tmp, op);	918	insert_ob_in_ob (tmp, op);
943	op->stats.sp = 0;	919	op->stats.sp = 0;
944	}	920	}
945	}	921	}
946	else if (!op->title) /* Only modify object if not special */	922	else if (!op->title) /* Only modify object if not special */
…		…
1004	SET_FLAG (op, FLAG_CURSED);	980	SET_FLAG (op, FLAG_CURSED);
1005	break;	981	break;
1006	}	982	}
1007		983
1008	case AMULET:	984	case AMULET:
1009	if (op->arch == amulet_arch)	985	if (IS_ARCH (op->arch, amulet))
1010	op->value = 5; / Since it's not just decoration */	986	op->value = 5; / Since it's not just decoration */
1011		987
1012	case RING:	988	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! */	989	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1021	break;	990	break;
1022		991
1023	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	992	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1024	SET_FLAG (op, FLAG_CURSED);	993	SET_FLAG (op, FLAG_CURSED);
1025		994
…		…
1045	op->value *= 5;	1014	op->value *= 5;
1046	set_ring_bonus (op, d);	1015	set_ring_bonus (op, d);
1047	}	1016	}
1048	}	1017	}
1049		1018
1050	if (GET_ANIM_ID (op))	1019	if (op->animation_id)
1051	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1020	op->set_anim_frame (rndm (op->anim_frames ()));
1052		1021
1053	break;	1022	break;
1054		1023
1055	case BOOK:	1024	case BOOK:
1056	/* Is it an empty book?, if yes lets make a special·	1025	/* Is it an empty book?, if yes lets make a special·
…		…
1071	op->level = rndm (creator->level);	1040	op->level = rndm (creator->level);
1072		1041
1073	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1042	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1074	/* books w/ info are worth more! */	1043	/* books w/ info are worth more! */
1075	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1044	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		1045
1086	/* add exp so reading it gives xp (once) */	1046	/* add exp so reading it gives xp (once) */
1087	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1047	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1088	}	1048	}
		1049
		1050	/* creator related stuff */
		1051
		1052	/* for library, chained books. Note that some monsters have no_pick
		1053	* set - we don't want to set no pick in that case.
		1054	*/
		1055	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
		1056	SET_FLAG (op, FLAG_NO_PICK);
		1057	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1058	op->slaying = creator->slaying;
1089	break;	1059	break;
1090		1060
1091	case SPELLBOOK:	1061	case SPELLBOOK:
1092	op->value = op->value * op->inv->value;	1062	op->value = op->value * op->inv->value;
1093	/* add exp so learning gives xp */	1063	/* add exp so learning gives xp */
…		…
1127	* 10 time multiplier). This way, the value are a bit more reasonable.	1097	* 10 time multiplier). This way, the value are a bit more reasonable.
1128	*/	1098	*/
1129	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1099	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 */	1100	/* maxhp is used to denote how many 'charges' the rod holds before */
1131	if (op->stats.maxhp)	1101	if (op->stats.maxhp)
1132	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1102	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1133	else	1103	else
1134	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1104	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1135		1105
1136	op->stats.hp = op->stats.maxhp;	1106	op->stats.hp = op->stats.maxhp;
1137	break;	1107	break;
1138		1108
1139	case SCROLL:	1109	case SCROLL:
…		…
1178	* Allocate and return the pointer to an empty artifactlist structure.	1148	* Allocate and return the pointer to an empty artifactlist structure.
1179	*/	1149	*/
1180	static artifactlist *	1150	static artifactlist *
1181	get_empty_artifactlist (void)	1151	get_empty_artifactlist (void)
1182	{	1152	{
1183	return salloc0 <artifactlist> ();	1153	return salloc0<artifactlist> ();
1184	}	1154	}
1185		1155
1186	/*	1156	/*
1187	* Allocate and return the pointer to an empty artifact structure.	1157	* Allocate and return the pointer to an empty artifact structure.
1188	*/	1158	*/
1189	static artifact *	1159	static artifact *
1190	get_empty_artifact (void)	1160	get_empty_artifact (void)
1191	{	1161	{
1192	return salloc0 <artifact> ();	1162	return salloc0<artifact> ();
1193	}	1163	}
1194		1164
1195	/*	1165	/*
1196	* Searches the artifact lists and returns one that has the same type	1166	* Searches the artifact lists and returns one that has the same type
1197	* of objects on it.	1167	* of objects on it.
…		…
1202	for (artifactlist *al = first_artifactlist; al; al = al->next)	1172	for (artifactlist *al = first_artifactlist; al; al = al->next)
1203	if (al->type == type)	1173	if (al->type == type)
1204	return al;	1174	return al;
1205		1175
1206	return 0;	1176	return 0;
1207	}
1208
1209	/*
1210	* For debugging purposes. Dumps all tables.
1211	*/
1212	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	}	1177	}
1330		1178
1331	/*	1179	/*
1332	* Builds up the lists of artifacts from the file in the libdir.	1180	* Builds up the lists of artifacts from the file in the libdir.
1333	*/	1181	*/
…		…
1348	object_thawer f (filename);	1196	object_thawer f (filename);
1349		1197
1350	if (!f)	1198	if (!f)
1351	return;	1199	return;
1352		1200
1353	f.next ();
1354
1355	for (;;)	1201	for (;;)
1356	{	1202	{
1357	switch (f.kw)	1203	switch (f.kw)
1358	{	1204	{
1359	case KW_allowed:	1205	case KW_allowed:
1360	if (!art)	1206	if (!art)
1361	{
1362	art = get_empty_artifact ();	1207	art = get_empty_artifact ();
1363	nrofartifacts++;
1364	}
1365		1208
1366	{	1209	{
1367	if (!strcmp (f.get_str (), "all"))	1210	if (!strcmp (f.get_str (), "all"))
1368	break;	1211	break;
1369		1212
1370	char next, cp = f.get_str ();	1213	char next, cp = f.get_str ();
1371		1214
1372	do	1215	do
1373	{	1216	{
1374	nrofallowedstr++;
1375
1376	if ((next = strchr (cp, ',')))	1217	if ((next = strchr (cp, ',')))
1377	*next++ = '\0';	1218	*next++ = '\0';
1378		1219
1379	linked_char *tmp = new linked_char;	1220	linked_char *tmp = new linked_char;
1380		1221
…		…
1395	break;	1236	break;
1396		1237
1397	case KW_object:	1238	case KW_object:
1398	{	1239	{
1399	art->item = object::create ();	1240	art->item = object::create ();
		1241	f.get (art->item->name);
		1242	f.next ();
1400		1243
1401	if (!art->item->parse_kv (f))	1244	if (!art->item->parse_kv (f))
1402	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1245	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1403		1246
1404	al = find_artifactlist (art->item->type);	1247	al = find_artifactlist (art->item->type);
…		…
1430	}	1273	}
1431		1274
1432	done:	1275	done:
1433	for (al = first_artifactlist; al; al = al->next)	1276	for (al = first_artifactlist; al; al = al->next)
1434	{	1277	{
		1278	al->total_chance = 0;
		1279
1435	for (art = al->items; art; art = art->next)	1280	for (art = al->items; art; art = art->next)
1436	{	1281	{
1437	if (!art->chance)	1282	if (!art->chance)
1438	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1283	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1439	else	1284	else
…		…
1445	}	1290	}
1446		1291
1447	LOG (llevDebug, "done.\n");	1292	LOG (llevDebug, "done.\n");
1448	}	1293	}
1449		1294
1450
1451	/*	1295	/*
1452	* Used in artifact generation. The bonuses of the first object	1296	* Used in artifact generation. The bonuses of the first object
1453	* is modified by the bonuses of the second object.	1297	* is modified by the bonuses of the second object.
1454	*/	1298	*/
1455
1456	void	1299	void
1457	add_abilities (object op, object change)	1300	add_abilities (object op, object change)
1458	{	1301	{
1459	int i, tmp;	1302	int i, tmp;
1460		1303
…		…
1465	#endif	1308	#endif
1466	op->face = change->face;	1309	op->face = change->face;
1467	}	1310	}
1468		1311
1469	for (i = 0; i < NUM_STATS; i++)	1312	for (i = 0; i < NUM_STATS; i++)
1470	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1313	change_attr_value (&(op->stats), i, change->stats.stat (i));
1471		1314
1472	op->attacktype \|= change->attacktype;	1315	op->attacktype \|= change->attacktype;
1473	op->path_attuned \|= change->path_attuned;	1316	op->path_attuned \|= change->path_attuned;
1474	op->path_repelled \|= change->path_repelled;	1317	op->path_repelled \|= change->path_repelled;
1475	op->path_denied \|= change->path_denied;	1318	op->path_denied \|= change->path_denied;
…		…
1523	* to cast. So convert that to into a spell and put it into	1366	* to cast. So convert that to into a spell and put it into
1524	* this object.	1367	* this object.
1525	*/	1368	*/
1526	if (op->type == HORN \|\| op->type == POTION)	1369	if (op->type == HORN \|\| op->type == POTION)
1527	{	1370	{
1528	object *tmp_obj;
1529
1530	/* Remove any spells this object currently has in it */	1371	/* Remove any spells this object currently has in it */
1531	while (op->inv)
1532	op->inv->destroy ();	1372	op->destroy_inv (false);
1533		1373
1534	tmp_obj = arch_to_object (change->other_arch);	1374	object *tmp = arch_to_object (change->other_arch);
1535	insert_ob_in_ob (tmp_obj, op);	1375	insert_ob_in_ob (tmp, op);
1536	}	1376	}
1537	/* No harm setting this for potions/horns */	1377	/* No harm setting this for potions/horns */
1538	op->other_arch = change->other_arch;	1378	op->other_arch = change->other_arch;
1539	}	1379	}
1540		1380
…		…
1639	if (change->msg)	1479	if (change->msg)
1640	op->msg = change->msg;	1480	op->msg = change->msg;
1641	}	1481	}
1642		1482
1643	static int	1483	static int
1644	legal_artifact_combination (object op, artifact art)	1484	legal_artifact_combination (object op, artifact art)
1645	{	1485	{
1646	int neg, success = 0;	1486	int neg, success = 0;
1647	linked_char *tmp;	1487	linked_char *tmp;
1648	const char *name;	1488	const char *name;
1649		1489
1650	if (art->allowed == (linked_char *) NULL)	1490	if (!art->allowed)
1651	return 1; /* Ie, "all" */	1491	return 1; /* Ie, "all" */
		1492
1652	for (tmp = art->allowed; tmp; tmp = tmp->next)	1493	for (tmp = art->allowed; tmp; tmp = tmp->next)
1653	{	1494	{
1654	#ifdef TREASURE_VERBOSE	1495	#ifdef TREASURE_VERBOSE
1655	LOG (llevDebug, "legal_art: %s\n", &tmp->name);	1496	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1656	#endif	1497	#endif
…		…
1658	name = tmp->name + 1, neg = 1;	1499	name = tmp->name + 1, neg = 1;
1659	else	1500	else
1660	name = tmp->name, neg = 0;	1501	name = tmp->name, neg = 0;
1661		1502
1662	/* If we match name, then return the opposite of 'neg' */	1503	/* If we match name, then return the opposite of 'neg' */
1663	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->name)))	1504	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->archname)))
1664	return !neg;	1505	return !neg;
1665		1506
1666	/* Set success as true, since if the match was an inverse, it means	1507	/* Set success as true, since if the match was an inverse, it means
1667	* everything is allowed except what we match	1508	* everything is allowed except what we match
1668	*/	1509	*/
1669	else if (neg)	1510	else if (neg)
1670	success = 1;	1511	success = 1;
1671	}	1512	}
		1513
1672	return success;	1514	return success;
1673	}	1515	}
1674		1516
1675	/*	1517	/*
1676	* Fixes the given object, giving it the abilities and titles	1518	* Fixes the given object, giving it the abilities and titles
…		…
1743	#if 1	1585	#if 1
1744	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1586	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1745	#endif	1587	#endif
1746	return;	1588	return;
1747	}	1589	}
1748	if (!strcmp (art->item->name, "NONE"))	1590
		1591	if (art->item->name == shstr_NONE)
1749	return;	1592	return;
		1593
1750	if (FABS (op->magic) < art->item->magic)	1594	if (fabs (op->magic) < art->item->magic)
1751	continue; /* Not magic enough to be this item */	1595	continue; /* Not magic enough to be this item */
1752		1596
1753	/* Map difficulty not high enough */	1597	/* Map difficulty not high enough */
1754	if (difficulty < art->difficulty)	1598	if (difficulty < art->difficulty)
1755	continue;	1599	continue;
…		…
1806	item->level = donor->level;	1650	item->level = donor->level;
1807		1651
1808	/* if donor has some attacktypes, the flesh is poisonous */	1652	/* if donor has some attacktypes, the flesh is poisonous */
1809	if (donor->attacktype & AT_POISON)	1653	if (donor->attacktype & AT_POISON)
1810	item->type = POISON;	1654	item->type = POISON;
		1655
1811	if (donor->attacktype & AT_ACID)	1656	if (donor->attacktype & AT_ACID)
1812	item->stats.hp = -1 * item->stats.food;	1657	item->stats.hp = -1 * item->stats.food;
		1658
1813	SET_FLAG (item, FLAG_NO_STEAL);	1659	SET_FLAG (item, FLAG_NO_STEAL);
1814	}	1660	}
1815	}	1661	}
1816		1662
1817	/* special_potion() - so that old potion code is still done right. */	1663	static void
1818
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	}
1834
1835	void
1836	free_treasurestruct (treasure *t)	1664	free_treasurestruct (treasure *t)
1837	{	1665	{
1838	if (t->next) free_treasurestruct (t->next);	1666	if (t->next) free_treasurestruct (t->next);
1839	if (t->next_yes) free_treasurestruct (t->next_yes);	1667	if (t->next_yes) free_treasurestruct (t->next_yes);
1840	if (t->next_no) free_treasurestruct (t->next_no);	1668	if (t->next_no) free_treasurestruct (t->next_no);
1841		1669
1842	delete t;	1670	delete t;
1843	}	1671	}
1844		1672
1845	void	1673	static void
1846	free_charlinks (linked_char *lc)	1674	free_charlinks (linked_char *lc)
1847	{	1675	{
1848	if (lc->next)	1676	if (lc->next)
1849	free_charlinks (lc->next);	1677	free_charlinks (lc->next);
1850		1678
1851	delete lc;	1679	delete lc;
1852	}	1680	}
1853		1681
1854	void	1682	static void
1855	free_artifact (artifact *at)	1683	free_artifact (artifact *at)
1856	{	1684	{
1857	if (at->next) free_artifact (at->next);	1685	if (at->next) free_artifact (at->next);
1858	if (at->allowed) free_charlinks (at->allowed);	1686	if (at->allowed) free_charlinks (at->allowed);
1859		1687
1860	at->item->destroy (1);	1688	at->item->destroy ();
1861		1689
1862	sfree (at);	1690	sfree (at);
1863	}	1691	}
1864		1692
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.92 by root, Sat Nov 7 18:30:05 2009 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.92 by root, Sat Nov 7 18:30:05 2009 UTC