[ViewVC] Diff of: cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.59 by root, Sun Apr 29 00:19:16 2007 UTC vs.
Revision 1.117 by root, Wed Nov 16 23:41:59 2016 UTC

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.59 by root, Sun Apr 29 00:19:16 2007 UTC vs. Revision 1.117 by root, Wed Nov 16 23:41:59 2016 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.59 by root, Sun Apr 29 00:19:16 2007 UTC vs.
Revision 1.117 by root, Wed Nov 16 23:41:59 2016 UTC