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

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

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.79 by root, Tue Jul 29 02:00:55 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.79 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 UTC