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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.86 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.104 by root, Sun Apr 11 00:34:05 2010 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 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
33		33
34	//#define TREASURE_VERBOSE	34	//#define TREASURE_VERBOSE
35		35
36	#include <global.h>	36	#include <global.h>
37	#include <treasure.h>	37	#include <treasure.h>
38	#include <loader.h>
39		38
40	extern char *spell_mapping[];	39	extern char *spell_mapping[];
41		40
42	static treasurelist *first_treasurelist;	41	static treasurelist *first_treasurelist;
43		42
…		…
51	slice_allocator< std::pair<const char const, treasurelist > >	50	slice_allocator< std::pair<const char const, treasurelist > >
52	> tl_map_t;	51	> tl_map_t;
53		52
54	static tl_map_t tl_map;	53	static tl_map_t tl_map;
55		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
56	/*	69	/*
57	* Searches for the given treasurelist	70	* Searches for the given treasurelist
58	*/	71	*/
59	treasurelist *	72	treasurelist *
60	treasurelist::find (const char *name)	73	treasurelist::find (const char *name)
…		…
89		102
90	tl_map.insert (std::make_pair (tl->name, tl));	103	tl_map.insert (std::make_pair (tl->name, tl));
91	}	104	}
92		105
93	return tl;	106	return tl;
94	}
95
96	//TODO: class method
97	void
98	clear (treasurelist *tl)
99	{
100	if (tl->items)
101	{
102	free_treasurestruct (tl->items);
103	tl->items = 0;
104	}
105
106	tl->total_chance = 0;
107	}	107	}
108		108
109	#ifdef TREASURE_DEBUG	109	#ifdef TREASURE_DEBUG
110	/* recursived checks the linked list. Treasurelist is passed only	110	/* recursived checks the linked list. Treasurelist is passed only
111	* so that the treasure name can be printed out	111	* so that the treasure name can be printed out
…		…
255	return;	255	return;
256	}	256	}
257		257
258	op->expand_tail ();	258	op->expand_tail ();
259		259
		260	if (!creator->is_on_map ()
260	if (!creator->is_on_map () \|\| op->blocked (creator->map, creator->x, creator->y))	261	\|\| (op->weight && op->blocked (creator->map, creator->x, creator->y)))
261	op->destroy ();	262	op->destroy ();
262	else	263	else
263	{	264	{
264	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	265	op->flag [FLAG_OBJ_ORIGINAL] = true;
265	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);
266	}	267	}
267	}	268	}
268	else	269	else
269	{	270	{
270	op = creator->insert (op);	271	op = creator->insert (op);
271		272
272	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	273	if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
273	monster_check_apply (creator, op);	274	monster_check_apply (creator, op);
274	}	275	}
275	}	276	}
276		277
277	/* 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
…		…
309	}	310	}
310	else	311	else
311	{	312	{
312	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))	313	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
313	{	314	{
314	object *tmp = arch_to_object (t->item);	315	object *tmp = t->item->instance ();
315		316
316	if (t->nrof && tmp->nrof <= 1)	317	if (t->nrof && tmp->nrof <= 1)
317	tmp->nrof = rndm (t->nrof) + 1;	318	tmp->nrof = rndm (t->nrof) + 1;
318		319
319	fix_generated_item (tmp, op, difficulty, t->magic, flag);	320	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
366	else if (t->nrof)	367	else if (t->nrof)
367	create_one_treasure (tl, op, flag, difficulty, tries);	368	create_one_treasure (tl, op, flag, difficulty, tries);
368	}	369	}
369	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))	370	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
370	{	371	{
371	if (object *tmp = arch_to_object (t->item))	372	if (object *tmp = t->item->instance ())
372	{	373	{
373	if (t->nrof && tmp->nrof <= 1)	374	if (t->nrof && tmp->nrof <= 1)
374	tmp->nrof = rndm (t->nrof) + 1;	375	tmp->nrof = rndm (t->nrof) + 1;
375		376
376	fix_generated_item (tmp, op, difficulty, t->magic, flag);	377	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
495	* 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)
496	*	497	*
497	* elmex Wed Aug 9 17:44:59 CEST 2006:	498	* elmex Wed Aug 9 17:44:59 CEST 2006:
498	* 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.
499	*/	500	*/
500	int	501	static int
501	level_for_item (const object *op, int difficulty)	502	level_for_item (const object *op, int difficulty)
502	{	503	{
503	if (!op->inv)	504	if (!op->inv)
504	{	505	{
505	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);
…		…
522	* elmex Thu Aug 10 18:45:44 CEST 2006:	523	* elmex Thu Aug 10 18:45:44 CEST 2006:
523	* 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
524	* weird integer between 1-31.	525	* weird integer between 1-31.
525	*	526	*
526	*/	527	*/
527	int	528	static int
528	magic_from_difficulty (int difficulty)	529	magic_from_difficulty (int difficulty)
529	{	530	{
530	int percent = 0, magic = 0;	531	int percent = 0, magic = 0;
531	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	532	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
532		533
…		…
611	i = -i;	612	i = -i;
612	if (i > max_magic)	613	if (i > max_magic)
613	i = max_magic;	614	i = max_magic;
614	set_abs_magic (op, i);	615	set_abs_magic (op, i);
615	if (i < 0)	616	if (i < 0)
616	SET_FLAG (op, FLAG_CURSED);	617	op->set_flag (FLAG_CURSED);
617	}	618	}
618		619
619	/*	620	/*
620	* Randomly adds one magical ability to the given object.	621	* Randomly adds one magical ability to the given object.
621	* Modified for Partial Resistance in many ways:	622	* Modified for Partial Resistance in many ways:
622	* 1) Since rings can have multiple bonuses, if the same bonus	623	* 1) Since rings can have multiple bonuses, if the same bonus
623	* is rolled again, increase it - the bonuses now stack with	624	* is rolled again, increase it - the bonuses now stack with
624	* other bonuses previously rolled and ones the item might natively have.	625	* other bonuses previously rolled and ones the item might natively have.
625	* 2) Add code to deal with new PR method.	626	* 2) Add code to deal with new PR method.
626	*/	627	*/
627	void	628	static void
628	set_ring_bonus (object *op, int bonus)	629	set_ring_bonus (object *op, int bonus)
629	{	630	{
630
631	int r = rndm (bonus > 0 ? 25 : 11);	631	int r = rndm (bonus > 0 ? 25 : 11);
632		632
633	if (op->type == AMULET)	633	if (op->type == AMULET)
634	{	634	{
635	if (!(rndm (21)))	635	if (!(rndm (21)))
…		…
715	break;	715	break;
716	}	716	}
717	case 20:	717	case 20:
718	if (op->type == AMULET)	718	if (op->type == AMULET)
719	{	719	{
720	SET_FLAG (op, FLAG_REFL_SPELL);	720	op->set_flag (FLAG_REFL_SPELL);
721	op->value *= 11;	721	op->value *= 11;
722	}	722	}
723	else	723	else
724	{	724	{
725	op->stats.hp = 1; /* regenerate hit points */	725	op->stats.hp = 1; /* regenerate hit points */
…		…
728	break;	728	break;
729		729
730	case 21:	730	case 21:
731	if (op->type == AMULET)	731	if (op->type == AMULET)
732	{	732	{
733	SET_FLAG (op, FLAG_REFL_MISSILE);	733	op->set_flag (FLAG_REFL_MISSILE);
734	op->value *= 9;	734	op->value *= 9;
735	}	735	}
736	else	736	else
737	{	737	{
738	op->stats.sp = 1; /* regenerate spell points */	738	op->stats.sp = 1; /* regenerate spell points */
…		…
758	* higher is the chance of returning a low number.	758	* higher is the chance of returning a low number.
759	* It is only used in fix_generated_treasure() to set bonuses on	759	* It is only used in fix_generated_treasure() to set bonuses on
760	* rings and amulets.	760	* rings and amulets.
761	* Another scheme is used to calculate the magic of weapons and armours.	761	* Another scheme is used to calculate the magic of weapons and armours.
762	*/	762	*/
763	int	763	static int
764	get_magic (int diff)	764	get_magic (int diff)
765	{	765	{
766	int i;	766	int i;
767		767
768	if (diff < 3)	768	if (diff < 3)
…		…
771	for (i = 0; i < 4; i++)	771	for (i = 0; i < 4; i++)
772	if (rndm (diff))	772	if (rndm (diff))
773	return i;	773	return i;
774		774
775	return 4;	775	return 4;
		776	}
		777
		778	/* special_potion() - so that old potion code is still done right. */
		779	static int
		780	special_potion (object *op)
		781	{
		782	if (op->attacktype)
		783	return 1;
		784
		785	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
		786	return 1;
		787
		788	for (int i = 0; i < NROFATTACKS; i++)
		789	if (op->resist[i])
		790	return 1;
		791
		792	return 0;
776	}	793	}
777		794
778	#define DICE2 (get_magic(2)==2?2:1)	795	#define DICE2 (get_magic(2)==2?2:1)
779	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	796	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
780		797
…		…
817	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);	834	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
818	/* So the treasure doesn't get created again */	835	/* So the treasure doesn't get created again */
819	op->randomitems = 0;	836	op->randomitems = 0;
820	}	837	}
821		838
822	if (difficulty < 1)	839	max_it (difficulty, 1);
823	difficulty = 1;
824		840
825	if (INVOKE_OBJECT (ADD_BONUS, op,	841	if (INVOKE_OBJECT (ADD_BONUS, op,
826	ARG_OBJECT (creator != op ? creator : 0),	842	ARG_OBJECT (creator != op ? creator : 0),
827	ARG_INT (difficulty), ARG_INT (max_magic),	843	ARG_INT (difficulty), ARG_INT (max_magic),
828	ARG_INT (flags)))	844	ARG_INT (flags)))
…		…
887	* again below */	903	* again below */
888	}	904	}
889	}	905	}
890		906
891	/* materialtype modifications. Note we allow this on artifacts. */	907	/* materialtype modifications. Note we allow this on artifacts. */
892	set_materialname (op, difficulty, NULL);	908	select_material (op, difficulty);
893		909
894	if (flags & GT_MINIMAL)	910	if (flags & GT_MINIMAL)
895	{	911	{
896	if (op->type == POTION)	912	if (op->type == POTION)
897	/* Handle healing and magic power potions */	913	/* Handle healing and magic power potions */
…		…
908	case WEAPON:	924	case WEAPON:
909	case ARMOUR:	925	case ARMOUR:
910	case SHIELD:	926	case SHIELD:
911	case HELMET:	927	case HELMET:
912	case CLOAK:	928	case CLOAK:
913	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	929	if (op->flag [FLAG_CURSED] && !(rndm (4)))
914	set_ring_bonus (op, -DICE2);	930	set_ring_bonus (op, -DICE2);
915	break;	931	break;
916		932
917	case BRACERS:	933	case BRACERS:
918	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))	934	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
919	{	935	{
920	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	936	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
921	if (!QUERY_FLAG (op, FLAG_CURSED))	937	if (!op->flag [FLAG_CURSED])
922	op->value *= 3;	938	op->value *= 3;
923	}	939	}
924	break;	940	break;
925		941
926	case POTION:	942	case POTION:
…		…
928	int too_many_tries = 0, is_special = 0;	944	int too_many_tries = 0, is_special = 0;
929		945
930	/* Handle healing and magic power potions */	946	/* Handle healing and magic power potions */
931	if (op->stats.sp && !op->randomitems)	947	if (op->stats.sp && !op->randomitems)
932	{	948	{
933	object *tmp;
934
935	tmp = get_archetype (spell_mapping[op->stats.sp]);	949	object *tmp = get_archetype (spell_mapping[op->stats.sp]);
936	insert_ob_in_ob (tmp, op);	950	insert_ob_in_ob (tmp, op);
937	op->stats.sp = 0;	951	op->stats.sp = 0;
938	}	952	}
939		953
940	while (!(is_special = special_potion (op)) && !op->inv)	954	while (!(is_special = special_potion (op)) && !op->inv)
…		…
948	* since the value set on those is already correct.	962	* since the value set on those is already correct.
949	*/	963	*/
950	if (op->inv && op->randomitems)	964	if (op->inv && op->randomitems)
951	{	965	{
952	/* value multiplier is same as for scrolls */	966	/* value multiplier is same as for scrolls */
953	op->value = (op->value * op->inv->value);	967	op->value *= op->inv->value;
954	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	968	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
955	}	969	}
956	else	970	else
957	{	971	{
958	op->name = "potion";	972	op->name = "potion";
959	op->name_pl = "potions";	973	op->name_pl = "potions";
960	}	974	}
961		975
962	if (!(flags & GT_ONLY_GOOD) && rndm (2))	976	if (!(flags & GT_ONLY_GOOD) && rndm (2))
963	SET_FLAG (op, FLAG_CURSED);	977	op->set_flag (FLAG_CURSED);
		978
964	break;	979	break;
965	}	980	}
966		981
967	case AMULET:	982	case AMULET:
968	if (IS_ARCH (op->arch, amulet))	983	if (IS_ARCH (op->arch, amulet))
…		…
971	case RING:	986	case RING:
972	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */	987	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
973	break;	988	break;
974		989
975	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	990	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
976	SET_FLAG (op, FLAG_CURSED);	991	op->set_flag (FLAG_CURSED);
977		992
978	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	993	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
979		994
980	if (op->type != RING) /* Amulets have only one ability */	995	if (op->type != RING) /* Amulets have only one ability */
981	break;	996	break;
982		997
983	if (!(rndm (4)))	998	if (!(rndm (4)))
984	{	999	{
985	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1000	int d = (rndm (2) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
986		1001
987	if (d > 0)	1002	if (d > 0)
988	op->value *= 3;	1003	op->value *= 3;
989		1004
990	set_ring_bonus (op, d);	1005	set_ring_bonus (op, d);
991		1006
992	if (!(rndm (4)))	1007	if (!(rndm (4)))
993	{	1008	{
994	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1009	int d = (rndm (3) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
995		1010
996	if (d > 0)	1011	if (d > 0)
997	op->value *= 5;	1012	op->value *= 5;
998	set_ring_bonus (op, d);	1013	set_ring_bonus (op, d);
999	}	1014	}
…		…
1010	* creator and/or map level we found it on.	1025	* creator and/or map level we found it on.
1011	*/	1026	*/
1012	if (!op->msg && rndm (10))	1027	if (!op->msg && rndm (10))
1013	{	1028	{
1014	/* set the book level properly */	1029	/* set the book level properly */
1015	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1030	if (creator->level == 0 \|\| creator->flag [FLAG_ALIVE])
1016	{	1031	{
1017	if (op->map && op->map->difficulty)	1032	if (op->map && op->map->difficulty)
1018	op->level = rndm (op->map->difficulty) + rndm (10) + 1;	1033	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1019	else	1034	else
1020	op->level = rndm (20) + 1;	1035	op->level = rndm (20) + 1;
…		…
1023	op->level = rndm (creator->level);	1038	op->level = rndm (creator->level);
1024		1039
1025	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1040	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1026	/* books w/ info are worth more! */	1041	/* books w/ info are worth more! */
1027	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1042	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1028	/* creator related stuff */
1029
1030	/* for library, chained books. Note that some monsters have no_pick
1031	* set - we don't want to set no pick in that case.
1032	*/
1033	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1034	SET_FLAG (op, FLAG_NO_PICK);
1035	if (creator->slaying && !op->slaying) /* for check_inv floors */
1036	op->slaying = creator->slaying;
1037		1043
1038	/* add exp so reading it gives xp (once) */	1044	/* add exp so reading it gives xp (once) */
1039	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1045	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1040	}	1046	}
		1047
		1048	/* creator related stuff */
		1049
		1050	/* for library, chained books. Note that some monsters have no_pick
		1051	* set - we don't want to set no pick in that case.
		1052	*/
		1053	if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
		1054	op->set_flag (FLAG_NO_PICK);
		1055	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1056	op->slaying = creator->slaying;
1041	break;	1057	break;
1042		1058
1043	case SPELLBOOK:	1059	case SPELLBOOK:
1044	op->value = op->value * op->inv->value;	1060	op->value = op->value * op->inv->value;
1045	/* add exp so learning gives xp */	1061	/* add exp so learning gives xp */
…		…
1079	* 10 time multiplier). This way, the value are a bit more reasonable.	1095	* 10 time multiplier). This way, the value are a bit more reasonable.
1080	*/	1096	*/
1081	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1097	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1082	/* maxhp is used to denote how many 'charges' the rod holds before */	1098	/* maxhp is used to denote how many 'charges' the rod holds before */
1083	if (op->stats.maxhp)	1099	if (op->stats.maxhp)
1084	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1100	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1085	else	1101	else
1086	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1102	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1087		1103
1088	op->stats.hp = op->stats.maxhp;	1104	op->stats.hp = op->stats.maxhp;
1089	break;	1105	break;
1090		1106
1091	case SCROLL:	1107	case SCROLL:
…		…
1106	break;	1122	break;
1107	} /* switch type */	1123	} /* switch type */
1108		1124
1109	if (flags & GT_STARTEQUIP)	1125	if (flags & GT_STARTEQUIP)
1110	{	1126	{
1111	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN))	1127	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1112	SET_FLAG (op, FLAG_STARTEQUIP);	1128	op->set_flag (FLAG_STARTEQUIP);
1113	else if (op->type != MONEY)	1129	else if (op->type != MONEY)
1114	op->value = 0;	1130	op->value = 0;
1115	}	1131	}
1116		1132
1117	if (!(flags & GT_ENVIRONMENT))	1133	if (!(flags & GT_ENVIRONMENT))
…		…
1128		1144
1129	/*	1145	/*
1130	* Allocate and return the pointer to an empty artifactlist structure.	1146	* Allocate and return the pointer to an empty artifactlist structure.
1131	*/	1147	*/
1132	static artifactlist *	1148	static artifactlist *
1133	get_empty_artifactlist (void)	1149	get_empty_artifactlist ()
1134	{	1150	{
1135	return salloc0<artifactlist> ();	1151	return salloc0<artifactlist> ();
1136	}	1152	}
1137		1153
1138	/*	1154	/*
1139	* Allocate and return the pointer to an empty artifact structure.	1155	* Allocate and return the pointer to an empty artifact structure.
1140	*/	1156	*/
1141	static artifact *	1157	static artifact *
1142	get_empty_artifact (void)	1158	get_empty_artifact ()
1143	{	1159	{
1144	return salloc0<artifact> ();	1160	return salloc0<artifact> ();
1145	}	1161	}
1146		1162
1147	/*	1163	/*
…		…
1160		1176
1161	/*	1177	/*
1162	* Builds up the lists of artifacts from the file in the libdir.	1178	* Builds up the lists of artifacts from the file in the libdir.
1163	*/	1179	*/
1164	void	1180	void
1165	init_artifacts (void)	1181	init_artifacts ()
1166	{	1182	{
1167	static int has_been_inited = 0;	1183	static int has_been_inited = 0;
1168	char filename[MAX_BUF];	1184	char filename[MAX_BUF];
1169	artifact *art = NULL;	1185	artifact *art = NULL;
1170	artifactlist *al;	1186	artifactlist *al;
…		…
1190		1206
1191	{	1207	{
1192	if (!strcmp (f.get_str (), "all"))	1208	if (!strcmp (f.get_str (), "all"))
1193	break;	1209	break;
1194		1210
1195	char next, cp = f.get_str ();	1211	const char *cp = f.get_str ();
1196		1212	char *next;
1197	do	1213	do
1198	{	1214	{
1199	if ((next = strchr (cp, ',')))	1215	if ((next = (char *)strchr (cp, ',')))
1200	*next++ = '\0';	1216	*next++ = '\0';
1201		1217
1202	linked_char *tmp = new linked_char;	1218	linked_char *tmp = new linked_char;
1203		1219
1204	tmp->name = cp;	1220	tmp->name = cp;
…		…
1299	op->path_repelled \|= change->path_repelled;	1315	op->path_repelled \|= change->path_repelled;
1300	op->path_denied \|= change->path_denied;	1316	op->path_denied \|= change->path_denied;
1301	op->move_type \|= change->move_type;	1317	op->move_type \|= change->move_type;
1302	op->stats.luck += change->stats.luck;	1318	op->stats.luck += change->stats.luck;
1303		1319
1304	if (QUERY_FLAG (change, FLAG_CURSED))	1320	if (change->flag [FLAG_CURSED])
1305	SET_FLAG (op, FLAG_CURSED);	1321	op->set_flag (FLAG_CURSED);
1306	if (QUERY_FLAG (change, FLAG_DAMNED))	1322	if (change->flag [FLAG_DAMNED])
1307	SET_FLAG (op, FLAG_DAMNED);	1323	op->set_flag (FLAG_DAMNED);
1308	if ((QUERY_FLAG (change, FLAG_CURSED) \|\| QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0)	1324	if ((change->flag [FLAG_CURSED] \|\| change->flag [FLAG_DAMNED]) && op->magic > 0)
1309	set_abs_magic (op, -op->magic);	1325	set_abs_magic (op, -op->magic);
1310		1326
1311	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1327	if (change->flag [FLAG_LIFESAVE])
1312	SET_FLAG (op, FLAG_LIFESAVE);	1328	op->set_flag (FLAG_LIFESAVE);
1313	if (QUERY_FLAG (change, FLAG_REFL_SPELL))	1329	if (change->flag [FLAG_REFL_SPELL])
1314	SET_FLAG (op, FLAG_REFL_SPELL);	1330	op->set_flag (FLAG_REFL_SPELL);
1315	if (QUERY_FLAG (change, FLAG_STEALTH))	1331	if (change->flag [FLAG_STEALTH])
1316	SET_FLAG (op, FLAG_STEALTH);	1332	op->set_flag (FLAG_STEALTH);
1317	if (QUERY_FLAG (change, FLAG_XRAYS))	1333	if (change->flag [FLAG_XRAYS])
1318	SET_FLAG (op, FLAG_XRAYS);	1334	op->set_flag (FLAG_XRAYS);
1319	if (QUERY_FLAG (change, FLAG_BLIND))	1335	if (change->flag [FLAG_BLIND])
1320	SET_FLAG (op, FLAG_BLIND);	1336	op->set_flag (FLAG_BLIND);
1321	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))	1337	if (change->flag [FLAG_SEE_IN_DARK])
1322	SET_FLAG (op, FLAG_SEE_IN_DARK);	1338	op->set_flag (FLAG_SEE_IN_DARK);
1323	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))	1339	if (change->flag [FLAG_REFL_MISSILE])
1324	SET_FLAG (op, FLAG_REFL_MISSILE);	1340	op->set_flag (FLAG_REFL_MISSILE);
1325	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))	1341	if (change->flag [FLAG_MAKE_INVIS])
1326	SET_FLAG (op, FLAG_MAKE_INVIS);	1342	op->set_flag (FLAG_MAKE_INVIS);
1327		1343
1328	if (QUERY_FLAG (change, FLAG_STAND_STILL))	1344	if (change->flag [FLAG_STAND_STILL])
1329	{	1345	{
1330	CLEAR_FLAG (op, FLAG_ANIMATE);	1346	op->clr_flag (FLAG_ANIMATE);
1331	/* so artifacts will join */	1347	/* so artifacts will join */
1332	if (!QUERY_FLAG (op, FLAG_ALIVE))	1348	if (!op->flag [FLAG_ALIVE])
1333	op->speed = 0.0;	1349	op->speed = 0.0;
1334		1350
1335	op->set_speed (op->speed);	1351	op->set_speed (op->speed);
1336	}	1352	}
1337		1353
…		…
1351	if (op->type == HORN \|\| op->type == POTION)	1367	if (op->type == HORN \|\| op->type == POTION)
1352	{	1368	{
1353	/* Remove any spells this object currently has in it */	1369	/* Remove any spells this object currently has in it */
1354	op->destroy_inv (false);	1370	op->destroy_inv (false);
1355		1371
1356	object *tmp = arch_to_object (change->other_arch);	1372	object *tmp = change->other_arch->instance ();
1357	insert_ob_in_ob (tmp, op);	1373	insert_ob_in_ob (tmp, op);
1358	}	1374	}
		1375
1359	/* No harm setting this for potions/horns */	1376	/* No harm setting this for potions/horns */
1360	op->other_arch = change->other_arch;	1377	op->other_arch = change->other_arch;
1361	}	1378	}
1362		1379
1363	if (change->stats.hp < 0)	1380	if (change->stats.hp < 0)
…		…
1447	op->value *= change->value;	1464	op->value *= change->value;
1448		1465
1449	if (change->materials)	1466	if (change->materials)
1450	op->materials = change->materials;	1467	op->materials = change->materials;
1451		1468
1452	if (change->materialname)	1469	if (change->material != MATERIAL_NULL)
1453	op->materialname = change->materialname;	1470	op->material = change->material;
1454		1471
1455	if (change->slaying)	1472	if (change->slaying)
1456	op->slaying = change->slaying;	1473	op->slaying = change->slaying;
1457		1474
1458	if (change->race)	1475	if (change->race)
…		…
1510	op->title = new_name;	1527	op->title = new_name;
1511	add_abilities (op, artifct); /* Give out the bonuses */	1528	add_abilities (op, artifct); /* Give out the bonuses */
1512		1529
1513	#if 0 /* Bit verbose, but keep it here until next time I need it... */	1530	#if 0 /* Bit verbose, but keep it here until next time I need it... */
1514	{	1531	{
1515	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1532	char identified = op->flag [FLAG_IDENTIFIED];
1516		1533
1517	SET_FLAG (op, FLAG_IDENTIFIED);	1534	op->set_flag (FLAG_IDENTIFIED);
1518	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));	1535	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1519	if (!identified)	1536	if (!identified)
1520	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1537	op->clr_flag (FLAG_IDENTIFIED);
1521	}	1538	}
1522	#endif	1539	#endif
1523	return;	1540	return;
1524	}	1541	}
1525		1542
…		…
1636	item->type = POISON;	1653	item->type = POISON;
1637		1654
1638	if (donor->attacktype & AT_ACID)	1655	if (donor->attacktype & AT_ACID)
1639	item->stats.hp = -1 * item->stats.food;	1656	item->stats.hp = -1 * item->stats.food;
1640		1657
1641	SET_FLAG (item, FLAG_NO_STEAL);	1658	item->set_flag (FLAG_NO_STEAL);
1642	}	1659	}
1643	}	1660	}
1644		1661
1645	/* special_potion() - so that old potion code is still done right. */	1662	static void
1646	int
1647	special_potion (object *op)
1648	{
1649	if (op->attacktype)
1650	return 1;
1651
1652	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1653	return 1;
1654
1655	for (int i = 0; i < NROFATTACKS; i++)
1656	if (op->resist[i])
1657	return 1;
1658
1659	return 0;
1660	}
1661
1662	void
1663	free_treasurestruct (treasure *t)	1663	free_treasurestruct (treasure *t)
1664	{	1664	{
1665	if (t->next) free_treasurestruct (t->next);	1665	if (t->next) free_treasurestruct (t->next);
1666	if (t->next_yes) free_treasurestruct (t->next_yes);	1666	if (t->next_yes) free_treasurestruct (t->next_yes);
1667	if (t->next_no) free_treasurestruct (t->next_no);	1667	if (t->next_no) free_treasurestruct (t->next_no);
1668		1668
1669	delete t;	1669	delete t;
1670	}	1670	}
1671		1671
1672	void	1672	static void
1673	free_charlinks (linked_char *lc)	1673	free_charlinks (linked_char *lc)
1674	{	1674	{
1675	if (lc->next)	1675	if (lc->next)
1676	free_charlinks (lc->next);	1676	free_charlinks (lc->next);
1677		1677
1678	delete lc;	1678	delete lc;
1679	}	1679	}
1680		1680
1681	void	1681	static void
1682	free_artifact (artifact *at)	1682	free_artifact (artifact *at)
1683	{	1683	{
1684	if (at->next) free_artifact (at->next);	1684	if (at->next) free_artifact (at->next);
1685	if (at->allowed) free_charlinks (at->allowed);	1685	if (at->allowed) free_charlinks (at->allowed);
1686		1686
1687	at->item->destroy ();	1687	at->item->destroy ();
1688		1688
1689	sfree (at);	1689	sfree (at);
1690	}	1690	}
1691		1691
1692	void
1693	free_artifactlist (artifactlist *al)
1694	{
1695	artifactlist *nextal;
1696
1697	for (al = first_artifactlist; al; al = nextal)
1698	{
1699	nextal = al->next;
1700
1701	if (al->items)
1702	free_artifact (al->items);
1703
1704	sfree (al);
1705	}
1706	}
1707
1708	void
1709	free_all_treasures (void)
1710	{
1711	treasurelist tl, next;
1712
1713	for (tl = first_treasurelist; tl; tl = next)
1714	{
1715	clear (tl);
1716
1717	next = tl->next;
1718	delete tl;
1719	}
1720
1721	free_artifactlist (first_artifactlist);
1722	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.86 by root, Mon Oct 12 14:00:57 2009 UTC vs. Revision 1.104 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.86 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.104 by root, Sun Apr 11 00:34:05 2010 UTC