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

Diff Legend

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