ViewVC Help

View File | Revision Log | Show Annotations | Download File

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