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

Diff Legend

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