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

Diff Legend

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