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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.71 by root, Tue Apr 15 03:16:02 2008 UTC vs.
Revision 1.125 by root, Sat Oct 8 21:54:05 2022 UTC

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.71 by root, Tue Apr 15 03:16:02 2008 UTC vs. Revision 1.125 by root, Sat Oct 8 21:54:05 2022 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.71 by root, Tue Apr 15 03:16:02 2008 UTC vs.
Revision 1.125 by root, Sat Oct 8 21:54:05 2022 UTC