[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.114 by root, Tue Jan 3 11:25:31 2012 UTC

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