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

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.75 by root, Tue Apr 22 07:01:46 2008 UTC vs. Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.75 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC