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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.52 by root, Thu Apr 19 19:24:25 2007 UTC vs.
Revision 1.107 by root, Sun Apr 25 07:08:57 2010 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* This program 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 2 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, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26	* It is useful for finding bugs in the treasures file. Since it only	26	* It is useful for finding bugs in the treasures file. Since it only
27	* slows the startup some (and not actual game play), it is by default	27	* slows the startup some (and not actual game play), it is by default
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 <funcpoint.h>
39	#include <loader.h>
40		38
41	extern char *spell_mapping[];	39	extern char *spell_mapping[];
42		40
43	static treasurelist *first_treasurelist;	41	static treasurelist *first_treasurelist;
44		42
…		…
47	typedef std::tr1::unordered_map<	45	typedef std::tr1::unordered_map<
48	const char *,	46	const char *,
49	treasurelist *,	47	treasurelist *,
50	str_hash,	48	str_hash,
51	str_equal,	49	str_equal,
52	slice_allocator< std::pair<const char const, treasurelist > >,	50	slice_allocator< std::pair<const char const, treasurelist > >
53	true
54	> tl_map_t;	51	> tl_map_t;
55		52
56	static tl_map_t tl_map;	53	static tl_map_t tl_map;
		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	}
57		68
58	/*	69	/*
59	* Searches for the given treasurelist	70	* Searches for the given treasurelist
60	*/	71	*/
61	treasurelist *	72	treasurelist *
…		…
93	}	104	}
94		105
95	return tl;	106	return tl;
96	}	107	}
97		108
98	//TODO: class method
99	void
100	clear (treasurelist *tl)
101	{
102	if (tl->items)
103	{
104	free_treasurestruct (tl->items);
105	tl->items = 0;
106	}
107
108	tl->total_chance = 0;
109	}
110
111	#ifdef TREASURE_DEBUG	109	#ifdef TREASURE_DEBUG
112	/* recursived checks the linked list. Treasurelist is passed only	110	/* recursived checks the linked list. Treasurelist is passed only
113	* so that the treasure name can be printed out	111	* so that the treasure name can be printed out
114	*/	112	*/
115	static void	113	static void
…		…
140		138
141	f.next ();	139	f.next ();
142		140
143	for (;;)	141	for (;;)
144	{	142	{
145	coroapi::cede_to_tick_every (10);	143	coroapi::cede_to_tick ();
146		144
147	switch (f.kw)	145	switch (f.kw)
148	{	146	{
149	case KW_arch:	147	case KW_arch:
150	t->item = archetype::get (f.get_str ());	148	t->item = archetype::find (f.get_str ());
		149
		150	if (!t->item)
		151	{
		152	f.parse_warn ("treasure references unknown archetype");
		153	t->item = archetype::empty;
		154	}
		155
151	break;	156	break;
152		157
153	case KW_list: f.get (t->name); break;	158	case KW_list: f.get (t->name); break;
154	case KW_change_name: f.get (t->change_arch.name); break;	159	case KW_change_name: f.get (t->change_arch.name); break;
155	case KW_change_title: f.get (t->change_arch.title); break;	160	case KW_change_title: f.get (t->change_arch.title); break;
…		…
169	t->next = read_treasure (f);	174	t->next = read_treasure (f);
170	return t;	175	return t;
171		176
172	default:	177	default:
173	if (!f.parse_error ("treasurelist", t->name))	178	if (!f.parse_error ("treasurelist", t->name))
174	return 0;	179	goto error;
175		180
176	return t;	181	return t;
177	}	182	}
178		183
179	f.next ();	184	f.next ();
180	}	185	}
		186
		187	// not reached
		188
		189	error:
		190	delete t;
		191	return 0;
181	}	192	}
182		193
183	/*	194	/*
184	* Each treasure is parsed with the help of load_treasure().	195	* Each treasure is parsed with the help of load_treasure().
185	*/	196	*/
…		…
197		208
198	/* This is a one of the many items on the list should be generated.	209	/* This is a one of the many items on the list should be generated.
199	* Add up the chance total, and check to make sure the yes & no	210	* Add up the chance total, and check to make sure the yes & no
200	* fields of the treasures are not being used.	211	* fields of the treasures are not being used.
201	*/	212	*/
202	tl->total_chance = 0;
203
204	if (one)	213	if (one)
205	{	214	{
206	for (treasure *t = tl->items; t; t = t->next)	215	for (treasure *t = tl->items; t; t = t->next)
207	{	216	{
208	if (t->next_yes \|\| t->next_no)	217	if (t->next_yes \|\| t->next_no)
209	{	218	{
210	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	219	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
211	LOG (llevError, " the next_yes or next_no field is set\n");	220	LOG (llevError, " the next_yes or next_no field is set\n");
212	}	221	}
213		222
214	tl->total_chance += t->chance;	223	tl->total_chance += t->chance;
215	}	224	}
…		…
230	* start with equipment, but only their abilities).	239	* start with equipment, but only their abilities).
231	*/	240	*/
232	static void	241	static void
233	put_treasure (object op, object creator, int flags)	242	put_treasure (object op, object creator, int flags)
234	{	243	{
		244	if (flags & GT_ENVIRONMENT)
		245	{
235	/* Bit of a hack - spells should never be put onto the map. The entire	246	/* Bit of a hack - spells should never be put onto the map. The entire
236	* treasure stuff is a problem - there is no clear idea of knowing	247	* treasure stuff is a problem - there is no clear idea of knowing
237	* this is the original object, or if this is an object that should be created	248	* this is the original object, or if this is an object that should be created
238	* by another object.	249	* by another object.
239	*/	250	*/
240	if (flags & GT_ENVIRONMENT && op->type != SPELL)	251	//TODO: flag such as objects... as such (no drop, anybody?)
241	{	252	if (op->type == SPELL)
		253	{
		254	op->destroy ();
		255	return;
		256	}
		257
		258	op->expand_tail ();
		259
		260	if (!creator->is_on_map ()
242	if (ob_blocked (op, creator->map, creator->x, creator->y))	261	\|\| (op->weight && op->blocked (creator->map, creator->x, creator->y)))
243	op->destroy ();	262	op->destroy ();
244	else	263	else
245	{	264	{
246	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	265	op->flag [FLAG_OBJ_ORIGINAL] = true;
247	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);
248	}	267	}
249	}	268	}
250	else	269	else
251	{	270	{
252	op = creator->insert (op);	271	op = creator->insert (op);
253		272
254	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	273	if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
255	monster_check_apply (creator, op);	274	monster_check_apply (creator, op);
256
257	if (flags & GT_UPDATE_INV)
258	if (object *tmp = creator->in_player ())
259	esrv_send_item (tmp, op);
260	}	275	}
261	}	276	}
262		277
263	/* 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
264	* in the generated object	279	* in the generated object
…		…
293	else	308	else
294	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);	309	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
295	}	310	}
296	else	311	else
297	{	312	{
298	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))	313	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
299	{	314	{
300	object *tmp = arch_to_object (t->item);	315	object *tmp = t->item->instance ();
301		316
302	if (t->nrof && tmp->nrof <= 1)	317	if (t->nrof && tmp->nrof <= 1)
303	tmp->nrof = rndm (t->nrof) + 1;	318	tmp->nrof = rndm (t->nrof) + 1;
304		319
305	fix_generated_item (tmp, op, difficulty, t->magic, flag);	320	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
350	create_treasure (tl, op, flag, difficulty, tries);	365	create_treasure (tl, op, flag, difficulty, tries);
351	}	366	}
352	else if (t->nrof)	367	else if (t->nrof)
353	create_one_treasure (tl, op, flag, difficulty, tries);	368	create_one_treasure (tl, op, flag, difficulty, tries);
354	}	369	}
355	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	370	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
356	{	371	{
357	if (object *tmp = arch_to_object (t->item))	372	if (object *tmp = t->item->instance ())
358	{	373	{
359	if (t->nrof && tmp->nrof <= 1)	374	if (t->nrof && tmp->nrof <= 1)
360	tmp->nrof = rndm (t->nrof) + 1;	375	tmp->nrof = rndm (t->nrof) + 1;
361		376
362	fix_generated_item (tmp, op, difficulty, t->magic, flag);	377	fix_generated_item (tmp, op, difficulty, t->magic, flag);
363	change_treasure (t, tmp);	378	change_treasure (t, tmp);
364	put_treasure (tmp, op, flag);	379	put_treasure (tmp, op, flag);
365	}	380	}
366	}	381	}
		382	}
		383
		384	void
		385	object::create_treasure (treasurelist *tl, int flags)
		386	{
		387	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
367	}	388	}
368		389
369	/* This calls the appropriate treasure creation function. tries is passed	390	/* This calls the appropriate treasure creation function. tries is passed
370	* to determine how many list transitions or attempts to create treasure	391	* to determine how many list transitions or attempts to create treasure
371	* have been made. It is really in place to prevent infinite loops with	392	* have been made. It is really in place to prevent infinite loops with
…		…
384	{	405	{
385	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	406	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
386	return;	407	return;
387	}	408	}
388		409
		410	if (op->flag [FLAG_TREASURE_ENV])
		411	{
		412	// do not generate items when there already is something above the object
		413	if (op->flag [FLAG_IS_FLOOR] && op->above)
		414	return;
		415
		416	flag \|= GT_ENVIRONMENT;
		417	}
		418
389	if (tl->total_chance)	419	if (tl->total_chance)
390	create_one_treasure (tl, op, flag, difficulty, tries);	420	create_one_treasure (tl, op, flag, difficulty, tries);
391	else	421	else
392	create_all_treasures (tl->items, op, flag, difficulty, tries);	422	create_all_treasures (tl->items, op, flag, difficulty, tries);
393	}	423	}
…		…
413		443
414	if (ob->inv)	444	if (ob->inv)
415	LOG (llevError, "In generate treasure, created multiple objects.\n");	445	LOG (llevError, "In generate treasure, created multiple objects.\n");
416		446
417	ob->destroy ();	447	ob->destroy ();
		448
418	return tmp;	449	return tmp;
419	}	450	}
420		451
421	/*	452	/*
422	* 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
…		…
465	* 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)
466	*	497	*
467	* elmex Wed Aug 9 17:44:59 CEST 2006:	498	* elmex Wed Aug 9 17:44:59 CEST 2006:
468	* 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.
469	*/	500	*/
470	int	501	static int
471	level_for_item (const object *op, int difficulty)	502	level_for_item (const object *op, int difficulty)
472	{	503	{
473	int olevel = 0;
474
475	if (!op->inv)	504	if (!op->inv)
476	{	505	{
477	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);
478	return 0;	507	return 0;
479	}	508	}
480		509
481	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	510	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
482		511
483	if (olevel <= 0)	512	if (olevel <= 0)
484	olevel = rndm (1, MIN (op->inv->level, 1));	513	olevel = rndm (1, op->inv->level);
485		514
486	if (olevel > MAXLEVEL)	515	return min (olevel, MAXLEVEL_TREASURE);
487	olevel = MAXLEVEL;
488
489	return olevel;
490	}	516	}
491		517
492	/*	518	/*
493	* Based upon the specified difficulty and upon the difftomagic_list array,	519	* Based upon the specified difficulty and upon the difftomagic_list array,
494	* a random magical bonus is returned. This is used when determine	520	* a random magical bonus is returned. This is used when determine
…		…
497	* elmex Thu Aug 10 18:45:44 CEST 2006:	523	* elmex Thu Aug 10 18:45:44 CEST 2006:
498	* 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
499	* weird integer between 1-31.	525	* weird integer between 1-31.
500	*	526	*
501	*/	527	*/
502	int	528	static int
503	magic_from_difficulty (int difficulty)	529	magic_from_difficulty (int difficulty)
504	{	530	{
505	int percent = 0, magic = 0;
506	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);
507		533
508	scaled_diff--;
509
510	if (scaled_diff < 0)
511	scaled_diff = 0;
512
513	if (scaled_diff >= DIFFLEVELS)
514	scaled_diff = DIFFLEVELS - 1;
515
516	percent = rndm (100);	534	int percent = rndm (100);
		535	int magic;
517		536
518	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	537	for (magic = 0; magic <= MAXMAGIC; magic++)
519	{	538	{
520	percent -= difftomagic_list[scaled_diff][magic];	539	percent -= difftomagic_list[scaled_diff][magic];
521		540
522	if (percent < 0)	541	if (percent < 0)
523	break;	542	break;
524	}	543	}
525		544
526	if (magic == (MAXMAGIC + 1))	545	if (magic > MAXMAGIC)
527	{	546	{
528	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);
529	magic = 0;	548	magic = 0;
530	}	549	}
531		550
…		…
539	* Sets magical bonus in an object, and recalculates the effect on	558	* Sets magical bonus in an object, and recalculates the effect on
540	* the armour variable, and the effect on speed of armour.	559	* the armour variable, and the effect on speed of armour.
541	* This function doesn't work properly, should add use of archetypes	560	* This function doesn't work properly, should add use of archetypes
542	* to make it truly absolute.	561	* to make it truly absolute.
543	*/	562	*/
544
545	void	563	void
546	set_abs_magic (object *op, int magic)	564	set_abs_magic (object *op, int magic)
547	{	565	{
548	if (!magic)	566	if (!magic)
549	return;	567	return;
550		568
551	op->magic = magic;	569	op->magic = magic;
552	if (op->arch)	570	if (op->arch)
553	{	571	{
554	if (op->type == ARMOUR)	572	if (op->type == ARMOUR)
555	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	573	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
556		574
557	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	575	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
558	magic = (-magic);	576	magic = (-magic);
		577
559	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	578	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
560	}	579	}
561	else	580	else
562	{	581	{
563	if (op->type == ARMOUR)	582	if (op->type == ARMOUR)
564	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	583	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		584
565	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	585	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
566	magic = (-magic);	586	magic = (-magic);
		587
567	op->weight = (op->weight * (100 - magic * 10)) / 100;	588	op->weight = (op->weight * (100 - magic * 10)) / 100;
568	}	589	}
569	}	590	}
570		591
571	/*	592	/*
…		…
574	*/	595	*/
575		596
576	static void	597	static void
577	set_magic (int difficulty, object *op, int max_magic, int flags)	598	set_magic (int difficulty, object *op, int max_magic, int flags)
578	{	599	{
579	int i;
580
581	i = magic_from_difficulty (difficulty);	600	int i = magic_from_difficulty (difficulty);
		601
582	if ((flags & GT_ONLY_GOOD) && i < 0)	602	if ((flags & GT_ONLY_GOOD) && i < 0)
583	i = -i;	603	i = -i;
		604
584	if (i > max_magic)	605	i = min (i, max_magic);
585	i = max_magic;	606
586	set_abs_magic (op, i);	607	set_abs_magic (op, i);
587	if (i < 0)	608	if (i < 0)
588	SET_FLAG (op, FLAG_CURSED);	609	op->set_flag (FLAG_CURSED);
589	}	610	}
590		611
591	/*	612	/*
592	* Randomly adds one magical ability to the given object.	613	* Randomly adds one magical ability to the given object.
593	* Modified for Partial Resistance in many ways:	614	* Modified for Partial Resistance in many ways:
594	* 1) Since rings can have multiple bonuses, if the same bonus	615	* 1) Since rings can have multiple bonuses, if the same bonus
595	* is rolled again, increase it - the bonuses now stack with	616	* is rolled again, increase it - the bonuses now stack with
596	* other bonuses previously rolled and ones the item might natively have.	617	* other bonuses previously rolled and ones the item might natively have.
597	* 2) Add code to deal with new PR method.	618	* 2) Add code to deal with new PR method.
598	*/	619	*/
599	void	620	static void
600	set_ring_bonus (object *op, int bonus)	621	set_ring_bonus (object *op, int bonus)
601	{	622	{
602
603	int r = rndm (bonus > 0 ? 25 : 11);	623	int r = rndm (bonus > 0 ? 25 : 11);
604		624
605	if (op->type == AMULET)	625	if (op->type == AMULET)
606	{
607	if (!(rndm (21)))	626	if (!rndm (21))
608	r = 20 + rndm (2);	627	r = 20 + rndm (2);
		628	else if (rndm (2))
		629	r = 10;
609	else	630	else
610	{
611	if (rndm (2))
612	r = 10;
613	else
614	r = 11 + rndm (9);	631	r = 11 + rndm (9);
615	}
616	}
617		632
618	switch (r)	633	switch (r)
619	{	634	{
620	/* 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,
621	* bonuses and penalties will stack and add to existing values.	636	* bonuses and penalties will stack and add to existing values.
622	* of the item.	637	* of the item.
623	*/	638	*/
624	case 0:	639	case 0:
625	case 1:	640	case 1:
626	case 2:	641	case 2:
627	case 3:	642	case 3:
628	case 4:	643	case 4:
629	case 5:	644	case 5:
630	case 6:	645	case 6:
631	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	646	op->stats.stat (r) += bonus;
632	break;	647	break;
633		648
634	case 7:	649	case 7:
635	op->stats.dam += bonus;	650	op->stats.dam += bonus;
636	break;	651	break;
…		…
668	* 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
669	* even values.	684	* even values.
670	*/	685	*/
671	if (bonus < 0)	686	if (bonus < 0)
672	val = 2 * -val - rndm (b);	687	val = 2 * -val - rndm (b);
673	if (val > 35)	688
674	val = 35; /* Upper limit */	689	val = min (35, val); /* Upper limit */
		690
675	b = 0;	691	b = 0;
676		692
677	while (op->resist[resist_table[resist]] != 0 && b < 4)	693	while (op->resist[resist_table[resist]] != 0 && b < 4)
678	resist = rndm (num_resist_table);	694	resist = rndm (num_resist_table);
679		695
…		…
687	break;	703	break;
688	}	704	}
689	case 20:	705	case 20:
690	if (op->type == AMULET)	706	if (op->type == AMULET)
691	{	707	{
692	SET_FLAG (op, FLAG_REFL_SPELL);	708	op->set_flag (FLAG_REFL_SPELL);
693	op->value *= 11;	709	op->value *= 11;
694	}	710	}
695	else	711	else
696	{	712	{
697	op->stats.hp = 1; /* regenerate hit points */	713	op->stats.hp = 1; /* regenerate hit points */
…		…
700	break;	716	break;
701		717
702	case 21:	718	case 21:
703	if (op->type == AMULET)	719	if (op->type == AMULET)
704	{	720	{
705	SET_FLAG (op, FLAG_REFL_MISSILE);	721	op->set_flag (FLAG_REFL_MISSILE);
706	op->value *= 9;	722	op->value *= 9;
707	}	723	}
708	else	724	else
709	{	725	{
710	op->stats.sp = 1; /* regenerate spell points */	726	op->stats.sp = 1; /* regenerate spell points */
…		…
712	}	728	}
713	break;	729	break;
714		730
715	case 22:	731	case 22:
716	op->stats.exp += bonus; /* Speed! */	732	op->stats.exp += bonus; /* Speed! */
717	op->value = (op->value * 2) / 3;	733	op->value = op->value * 2 / 3;
718	break;	734	break;
719	}	735	}
720		736
721	if (bonus > 0)	737	if (bonus > 0)
722	op->value = 2 bonus;	738	op->value = 2 * op->value * bonus;
723	else	739	else
724	op->value = -(op->value * 2 * bonus) / 3;	740	op->value = -2 * op->value * bonus / 3;
725	}	741	}
726		742
727	/*	743	/*
728	* 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.
729	* 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
730	* higher is the chance of returning a low number.	746	* higher is the chance of returning a low number.
731	* 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
732	* rings and amulets.	748	* rings and amulets.
733	* 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.
734	*/	750	*/
735	int	751	static int
736	get_magic (int diff)	752	get_magic (int diff)
737	{	753	{
738	int i;	754	diff = min (3, diff);
739		755
740	if (diff < 3)
741	diff = 3;
742
743	for (i = 0; i < 4; i++)	756	for (int i = 0; i < 4; i++)
744	if (rndm (diff))	757	if (rndm (diff))
745	return i;	758	return i;
746		759
747	return 4;	760	return 4;
748	}	761	}
749		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
750	#define DICE2 (get_magic(2)==2?2:1)	780	#define DICE2 (get_magic(2) == 2 ? 2 : 1)
751	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	781	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
752		782
753	/*	783	/*
754	* fix_generated_item(): This is called after an item is generated, in	784	* fix_generated_item(): This is called after an item is generated, in
755	* order to set it up right. This produced magical bonuses, puts spells	785	* order to set it up right. This produced magical bonuses, puts spells
…		…
789	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);	819	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
790	/* So the treasure doesn't get created again */	820	/* So the treasure doesn't get created again */
791	op->randomitems = 0;	821	op->randomitems = 0;
792	}	822	}
793		823
794	if (difficulty < 1)	824	max_it (difficulty, 1);
795	difficulty = 1;
796		825
797	if (INVOKE_OBJECT (ADD_BONUS, op,	826	if (INVOKE_OBJECT (ADD_BONUS, op,
798	ARG_OBJECT (creator != op ? creator : 0),	827	ARG_OBJECT (creator != op ? creator : 0),
799	ARG_INT (difficulty), ARG_INT (max_magic),	828	ARG_INT (difficulty), ARG_INT (max_magic),
800	ARG_INT (flags)))	829	ARG_INT (flags)))
801	return;	830	return;
802		831
803	if (!(flags & GT_MINIMAL))	832	if (!(flags & GT_MINIMAL))
804	{	833	{
805	if (op->arch == crown_arch)	834	if (IS_ARCH (op->arch, crown))
806	{	835	{
807	set_magic (difficulty, op, max_magic, flags);	836	set_magic (difficulty, op, max_magic, flags);
808	num_enchantments = calc_item_power (op, 1);	837	num_enchantments = calc_item_power (op, 1);
809	generate_artifact (op, difficulty);	838	generate_artifact (op, difficulty);
810	}	839	}
…		…
815		844
816	num_enchantments = calc_item_power (op, 1);	845	num_enchantments = calc_item_power (op, 1);
817		846
818	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	847	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
819	\|\| op->type == HORN	848	\|\| op->type == HORN
820	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	849	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
821	* used for shop_floors or treasures */
822	generate_artifact (op, difficulty);	850	generate_artifact (op, difficulty);
823	}	851	}
824		852
825	/* Object was made an artifact. Calculate its item_power rating.	853	/* Object was made an artifact. Calculate its item_power rating.
826	* the item_power in the object is what the artfiact adds.	854	* the item_power in the object is what the artfiact adds.
…		…
860	* again below */	888	* again below */
861	}	889	}
862	}	890	}
863		891
864	/* materialtype modifications. Note we allow this on artifacts. */	892	/* materialtype modifications. Note we allow this on artifacts. */
865	set_materialname (op, difficulty, NULL);	893	select_material (op, difficulty);
866		894
867	if (flags & GT_MINIMAL)	895	if (flags & GT_MINIMAL)
868	{	896	{
869	if (op->type == POTION)	897	if (op->type == POTION)
870	/* Handle healing and magic power potions */	898	/* Handle healing and magic power potions */
871	if (op->stats.sp && !op->randomitems)	899	if (op->stats.sp && !op->randomitems)
872	{	900	{
873	object *tmp;
874
875	tmp = get_archetype (spell_mapping[op->stats.sp]);	901	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
876	insert_ob_in_ob (tmp, op);	902	insert_ob_in_ob (tmp, op);
877	op->stats.sp = 0;	903	op->stats.sp = 0;
878	}	904	}
879	}	905	}
880	else if (!op->title) /* Only modify object if not special */	906	else if (!op->title) /* Only modify object if not special */
…		…
883	case WEAPON:	909	case WEAPON:
884	case ARMOUR:	910	case ARMOUR:
885	case SHIELD:	911	case SHIELD:
886	case HELMET:	912	case HELMET:
887	case CLOAK:	913	case CLOAK:
888	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	914	if (op->flag [FLAG_CURSED] && !(rndm (4)))
889	set_ring_bonus (op, -DICE2);	915	set_ring_bonus (op, -DICE2);
890	break;	916	break;
891		917
892	case BRACERS:	918	case BRACERS:
893	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))	919	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
894	{	920	{
895	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	921	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
896	if (!QUERY_FLAG (op, FLAG_CURSED))	922	if (!op->flag [FLAG_CURSED])
897	op->value *= 3;	923	op->value *= 3;
898	}	924	}
899	break;	925	break;
900		926
901	case POTION:	927	case POTION:
…		…
903	int too_many_tries = 0, is_special = 0;	929	int too_many_tries = 0, is_special = 0;
904		930
905	/* Handle healing and magic power potions */	931	/* Handle healing and magic power potions */
906	if (op->stats.sp && !op->randomitems)	932	if (op->stats.sp && !op->randomitems)
907	{	933	{
908	object *tmp;
909
910	tmp = get_archetype (spell_mapping[op->stats.sp]);	934	object *tmp = get_archetype (spell_mapping[op->stats.sp]);
911	insert_ob_in_ob (tmp, op);	935	insert_ob_in_ob (tmp, op);
912	op->stats.sp = 0;	936	op->stats.sp = 0;
913	}	937	}
914		938
915	while (!(is_special = special_potion (op)) && !op->inv)	939	while (!(is_special = special_potion (op)) && !op->inv)
…		…
923	* since the value set on those is already correct.	947	* since the value set on those is already correct.
924	*/	948	*/
925	if (op->inv && op->randomitems)	949	if (op->inv && op->randomitems)
926	{	950	{
927	/* value multiplier is same as for scrolls */	951	/* value multiplier is same as for scrolls */
928	op->value = (op->value * op->inv->value);	952	op->value *= op->inv->value;
929	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	953	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
930	}	954	}
931	else	955	else
932	{	956	{
933	op->name = "potion";	957	op->name = shstr_potion;
934	op->name_pl = "potions";	958	op->name_pl = shstr_potions;
935	}	959	}
936		960
937	if (!(flags & GT_ONLY_GOOD) && rndm (2))	961	if (!(flags & GT_ONLY_GOOD) && rndm (2))
938	SET_FLAG (op, FLAG_CURSED);	962	op->set_flag (FLAG_CURSED);
		963
939	break;	964	break;
940	}	965	}
941		966
942	case AMULET:	967	case AMULET:
943	if (op->arch == amulet_arch)	968	if (IS_ARCH (op->arch, amulet))
944	op->value = 5; / Since it's not just decoration */	969	op->value = 5; / Since it's not just decoration */
945		970
946	case RING:	971	case RING:
947	if (op->arch == NULL)
948	{
949	op->destroy ();
950	op = 0;
951	break;
952	}
953
954	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	972	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
955	break;	973	break;
956		974
957	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	975	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
958	SET_FLAG (op, FLAG_CURSED);	976	op->set_flag (FLAG_CURSED);
959		977
960	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	978	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
961		979
962	if (op->type != RING) /* Amulets have only one ability */	980	if (op->type != RING) /* Amulets have only one ability */
963	break;	981	break;
964		982
965	if (!(rndm (4)))	983	if (!rndm (4))
966	{	984	{
967	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	985	int d = (rndm (2) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
968		986
969	if (d > 0)	987	if (d > 0)
970	op->value *= 3;	988	op->value *= 3;
971		989
972	set_ring_bonus (op, d);	990	set_ring_bonus (op, d);
973		991
974	if (!(rndm (4)))	992	if (!rndm (4))
975	{	993	{
976	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	994	int d = (rndm (3) \|\| op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
977		995
978	if (d > 0)	996	if (d > 0)
979	op->value *= 5;	997	op->value *= 5;
		998
980	set_ring_bonus (op, d);	999	set_ring_bonus (op, d);
981	}	1000	}
982	}	1001	}
983		1002
984	if (GET_ANIM_ID (op))	1003	if (op->animation_id)
985	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1004	op->set_anim_frame (rndm (op->anim_frames ()));
986		1005
987	break;	1006	break;
988		1007
989	case BOOK:	1008	case BOOK:
990	/* Is it an empty book?, if yes lets make a special·	1009	/* Is it an empty book?, if yes lets make a special·
…		…
992	* creator and/or map level we found it on.	1011	* creator and/or map level we found it on.
993	*/	1012	*/
994	if (!op->msg && rndm (10))	1013	if (!op->msg && rndm (10))
995	{	1014	{
996	/* set the book level properly */	1015	/* set the book level properly */
997	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1016	if (creator->level == 0 \|\| creator->flag [FLAG_ALIVE])
998	{	1017	{
999	if (op->map && op->map->difficulty)	1018	if (op->map && op->map->difficulty)
1000	op->level = rndm (op->map->difficulty) + rndm (10) + 1;	1019	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1001	else	1020	else
1002	op->level = rndm (20) + 1;	1021	op->level = rndm (20) + 1;
…		…
1005	op->level = rndm (creator->level);	1024	op->level = rndm (creator->level);
1006		1025
1007	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1026	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1008	/* books w/ info are worth more! */	1027	/* books w/ info are worth more! */
1009	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1028	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1010	/* creator related stuff */
1011
1012	/* for library, chained books. Note that some monsters have no_pick
1013	* set - we don't want to set no pick in that case.
1014	*/
1015	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1016	SET_FLAG (op, FLAG_NO_PICK);
1017	if (creator->slaying && !op->slaying) /* for check_inv floors */
1018	op->slaying = creator->slaying;
1019		1029
1020	/* add exp so reading it gives xp (once) */	1030	/* add exp so reading it gives xp (once) */
1021	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1031	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1022	}	1032	}
		1033
		1034	/* creator related stuff */
		1035
		1036	/* for library, chained books. Note that some monsters have no_pick
		1037	* set - we don't want to set no pick in that case.
		1038	*/
		1039	if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
		1040	op->set_flag (FLAG_NO_PICK);
		1041	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1042	op->slaying = creator->slaying;
1023	break;	1043	break;
1024		1044
1025	case SPELLBOOK:	1045	case SPELLBOOK:
1026	op->value = op->value * op->inv->value;	1046	op->value *= pow ((op->inv->value > 0 ? op->inv->value : 1)
		1047	* op->inv->level,
		1048	1.5);
		1049
1027	/* add exp so learning gives xp */	1050	/* add exp so learning gives xp */
1028	op->level = op->inv->level;	1051	op->level = op->inv->level;
1029	op->stats.exp = op->value;	1052	op->stats.exp = op->value;
1030	break;	1053	break;
1031		1054
…		…
1059	* reasonable. Otherwise, a high level version of a low level	1082	* reasonable. Otherwise, a high level version of a low level
1060	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =	1083	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1061	* 10 time multiplier). This way, the value are a bit more reasonable.	1084	* 10 time multiplier). This way, the value are a bit more reasonable.
1062	*/	1085	*/
1063	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1086	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
		1087
1064	/* maxhp is used to denote how many 'charges' the rod holds before */	1088	/* maxhp is used to denote how many 'charges' the rod holds before */
1065	if (op->stats.maxhp)	1089	if (op->stats.maxhp)
1066	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1090	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1067	else	1091	else
1068	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1092	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1069		1093
1070	op->stats.hp = op->stats.maxhp;	1094	op->stats.hp = op->stats.maxhp;
1071	break;	1095	break;
1072		1096
1073	case SCROLL:	1097	case SCROLL:
…		…
1088	break;	1112	break;
1089	} /* switch type */	1113	} /* switch type */
1090		1114
1091	if (flags & GT_STARTEQUIP)	1115	if (flags & GT_STARTEQUIP)
1092	{	1116	{
1093	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN))	1117	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1094	SET_FLAG (op, FLAG_STARTEQUIP);	1118	op->set_flag (FLAG_STARTEQUIP);
1095	else if (op->type != MONEY)	1119	else if (op->type != MONEY)
1096	op->value = 0;	1120	op->value = 0;
1097	}	1121	}
1098		1122
1099	if (!(flags & GT_ENVIRONMENT))	1123	if (!(flags & GT_ENVIRONMENT))
…		…
1110		1134
1111	/*	1135	/*
1112	* Allocate and return the pointer to an empty artifactlist structure.	1136	* Allocate and return the pointer to an empty artifactlist structure.
1113	*/	1137	*/
1114	static artifactlist *	1138	static artifactlist *
1115	get_empty_artifactlist (void)	1139	get_empty_artifactlist ()
1116	{	1140	{
1117	return salloc0 <artifactlist> ();	1141	return salloc0<artifactlist> ();
1118	}	1142	}
1119		1143
1120	/*	1144	/*
1121	* Allocate and return the pointer to an empty artifact structure.	1145	* Allocate and return the pointer to an empty artifact structure.
1122	*/	1146	*/
1123	static artifact *	1147	static artifact *
1124	get_empty_artifact (void)	1148	get_empty_artifact ()
1125	{	1149	{
1126	return salloc0 <artifact> ();	1150	return salloc0<artifact> ();
1127	}	1151	}
1128		1152
1129	/*	1153	/*
1130	* Searches the artifact lists and returns one that has the same type	1154	* Searches the artifact lists and returns one that has the same type
1131	* of objects on it.	1155	* of objects on it.
…		…
1139		1163
1140	return 0;	1164	return 0;
1141	}	1165	}
1142		1166
1143	/*	1167	/*
1144	* For debugging purposes. Dumps all tables.	1168	* Builds up the lists of artifacts from the file in the libdir.
1145	*/	1169	*/
1146	void	1170	void
1147	dump_artifacts (void)
1148	{
1149	artifactlist *al;
1150	artifact *art;
1151	linked_char *next;
1152
1153	fprintf (logfile, "\n");
1154	for (al = first_artifactlist; al != NULL; al = al->next)
1155	{
1156	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1157	for (art = al->items; art != NULL; art = art->next)
1158	{
1159	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1160	if (art->allowed != NULL)
1161	{
1162	fprintf (logfile, "\tallowed combinations:");
1163	for (next = art->allowed; next != NULL; next = next->next)
1164	fprintf (logfile, "%s,", &next->name);
1165	fprintf (logfile, "\n");
1166	}
1167	}
1168	}
1169	fprintf (logfile, "\n");
1170	}
1171
1172	/*
1173	* For debugging purposes. Dumps all treasures recursively (see below).
1174	*/
1175	void
1176	dump_monster_treasure_rec (const char name, treasure t, int depth)
1177	{
1178	treasurelist *tl;
1179	int i;
1180
1181	if (depth > 100)
1182	return;
1183
1184	while (t)
1185	{
1186	if (t->name)
1187	{
1188	for (i = 0; i < depth; i++)
1189	fprintf (logfile, " ");
1190
1191	fprintf (logfile, "{ (list: %s)\n", &t->name);
1192
1193	tl = treasurelist::find (t->name);
1194	if (tl)
1195	dump_monster_treasure_rec (name, tl->items, depth + 2);
1196
1197	for (i = 0; i < depth; i++)
1198	fprintf (logfile, " ");
1199
1200	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1201	}
1202	else
1203	{
1204	for (i = 0; i < depth; i++)
1205	fprintf (logfile, " ");
1206
1207	if (t->item && t->item->clone.type == FLESH)
1208	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1209	else
1210	fprintf (logfile, "%s\n", &t->item->clone.name);
1211	}
1212
1213	if (t->next_yes)
1214	{
1215	for (i = 0; i < depth; i++)
1216	fprintf (logfile, " ");
1217
1218	fprintf (logfile, " (if yes)\n");
1219	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1220	}
1221
1222	if (t->next_no)
1223	{
1224	for (i = 0; i < depth; i++)
1225	fprintf (logfile, " ");
1226
1227	fprintf (logfile, " (if no)\n");
1228	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1229	}
1230
1231	t = t->next;
1232	}
1233	}
1234
1235	/*
1236	* For debugging purposes. Dumps all treasures for a given monster.
1237	* Created originally by Raphael Quinet for debugging the alchemy code.
1238	*/
1239	void
1240	dump_monster_treasure (const char *name)
1241	{
1242	archetype *at;
1243	int found;
1244
1245	found = 0;
1246	fprintf (logfile, "\n");
1247
1248	for (at = first_archetype; at != NULL; at = at->next)
1249	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1250	{
1251	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1252	if (at->clone.randomitems != NULL)
1253	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1254	else
1255	fprintf (logfile, "(nothing)\n");
1256
1257	fprintf (logfile, "\n");
1258	found++;
1259	}
1260
1261	if (found == 0)
1262	fprintf (logfile, "No objects have the name %s!\n\n", name);
1263	}
1264
1265	/*
1266	* Builds up the lists of artifacts from the file in the libdir.
1267	*/
1268	void
1269	init_artifacts (void)	1171	init_artifacts ()
1270	{	1172	{
1271	static int has_been_inited = 0;	1173	static int has_been_inited = 0;
1272	char filename[MAX_BUF];	1174	char filename[MAX_BUF];
1273	artifact *art = NULL;	1175	artifact *art = NULL;
1274	artifactlist *al;	1176	artifactlist *al;
…		…
1282	object_thawer f (filename);	1184	object_thawer f (filename);
1283		1185
1284	if (!f)	1186	if (!f)
1285	return;	1187	return;
1286		1188
1287	f.next ();
1288
1289	for (;;)	1189	for (;;)
1290	{	1190	{
1291	switch (f.kw)	1191	switch (f.kw)
1292	{	1192	{
1293	case KW_allowed:	1193	case KW_allowed:
…		…
1296		1196
1297	{	1197	{
1298	if (!strcmp (f.get_str (), "all"))	1198	if (!strcmp (f.get_str (), "all"))
1299	break;	1199	break;
1300		1200
1301	char next, cp = f.get_str ();	1201	const char *cp = f.get_str ();
1302		1202	char *next;
1303	do	1203	do
1304	{	1204	{
1305	if ((next = strchr (cp, ',')))	1205	if ((next = (char *)strchr (cp, ',')))
1306	*next++ = '\0';	1206	*next++ = '\0';
1307		1207
1308	linked_char *tmp = new linked_char;	1208	linked_char *tmp = new linked_char;
1309		1209
1310	tmp->name = cp;	1210	tmp->name = cp;
…		…
1385	* is modified by the bonuses of the second object.	1285	* is modified by the bonuses of the second object.
1386	*/	1286	*/
1387	void	1287	void
1388	add_abilities (object op, object change)	1288	add_abilities (object op, object change)
1389	{	1289	{
1390	int i, tmp;
1391
1392	if (change->face != blank_face)	1290	if (change->face != blank_face)
1393	{	1291	{
1394	#ifdef TREASURE_VERBOSE	1292	#ifdef TREASURE_VERBOSE
1395	LOG (llevDebug, "add_abilities change face: %d\n", change->face);	1293	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1396	#endif	1294	#endif
1397	op->face = change->face;	1295	op->face = change->face;
1398	}	1296	}
1399		1297
1400	for (i = 0; i < NUM_STATS; i++)	1298	for (int i = 0; i < NUM_STATS; i++)
1401	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1299	change_attr_value (&(op->stats), i, change->stats.stat (i));
1402		1300
1403	op->attacktype \|= change->attacktype;	1301	op->attacktype \|= change->attacktype;
1404	op->path_attuned \|= change->path_attuned;	1302	op->path_attuned \|= change->path_attuned;
1405	op->path_repelled \|= change->path_repelled;	1303	op->path_repelled \|= change->path_repelled;
1406	op->path_denied \|= change->path_denied;	1304	op->path_denied \|= change->path_denied;
1407	op->move_type \|= change->move_type;	1305	op->move_type \|= change->move_type;
1408	op->stats.luck += change->stats.luck;	1306	op->stats.luck += change->stats.luck;
1409		1307
1410	if (QUERY_FLAG (change, FLAG_CURSED))	1308	static const struct copyflags : object::flags_t
1411	SET_FLAG (op, FLAG_CURSED);	1309	{
1412	if (QUERY_FLAG (change, FLAG_DAMNED))	1310	copyflags ()
1413	SET_FLAG (op, FLAG_DAMNED);	1311	{
1414	if ((QUERY_FLAG (change, FLAG_CURSED) \|\| QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0)	1312	set (FLAG_CURSED);
		1313	set (FLAG_DAMNED);
		1314	set (FLAG_LIFESAVE);
		1315	set (FLAG_REFL_SPELL);
		1316	set (FLAG_STEALTH);
		1317	set (FLAG_XRAYS);
		1318	set (FLAG_BLIND);
		1319	set (FLAG_SEE_IN_DARK);
		1320	set (FLAG_REFL_MISSILE);
		1321	set (FLAG_MAKE_INVIS);
		1322	}
		1323	} copyflags;
		1324
		1325	// we might want to just copy, but or'ing is what the original code did
		1326	op->flag \|= change->flag & copyflags;
		1327
		1328	if ((change->flag [FLAG_CURSED] \|\| change->flag [FLAG_DAMNED]) && op->magic > 0)
1415	set_abs_magic (op, -op->magic);	1329	set_abs_magic (op, -op->magic);
1416		1330
1417	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1331	if (change->flag [FLAG_STAND_STILL])
1418	SET_FLAG (op, FLAG_LIFESAVE);
1419	if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1420	SET_FLAG (op, FLAG_REFL_SPELL);
1421	if (QUERY_FLAG (change, FLAG_STEALTH))
1422	SET_FLAG (op, FLAG_STEALTH);
1423	if (QUERY_FLAG (change, FLAG_XRAYS))
1424	SET_FLAG (op, FLAG_XRAYS);
1425	if (QUERY_FLAG (change, FLAG_BLIND))
1426	SET_FLAG (op, FLAG_BLIND);
1427	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1428	SET_FLAG (op, FLAG_SEE_IN_DARK);
1429	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1430	SET_FLAG (op, FLAG_REFL_MISSILE);
1431	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1432	SET_FLAG (op, FLAG_MAKE_INVIS);
1433
1434	if (QUERY_FLAG (change, FLAG_STAND_STILL))
1435	{	1332	{
1436	CLEAR_FLAG (op, FLAG_ANIMATE);	1333	op->clr_flag (FLAG_ANIMATE);
		1334
1437	/* so artifacts will join */	1335	/* so artifacts will join */
1438	if (!QUERY_FLAG (op, FLAG_ALIVE))	1336	if (!op->flag [FLAG_ALIVE])
1439	op->speed = 0.0;	1337	op->speed = 0.;
1440		1338
1441	op->set_speed (op->speed);	1339	op->set_speed (op->speed);
1442	}	1340	}
1443		1341
1444	if (change->nrof)	1342	if (change->nrof)
1445	op->nrof = rndm (change->nrof) + 1;	1343	op->nrof = rndm (change->nrof) + 1;
1446		1344
1447	op->stats.exp += change->stats.exp; /* Speed modifier */	1345	op->stats.exp += change->stats.exp; /* Speed modifier */
1448	op->stats.wc += change->stats.wc;	1346	op->stats.wc += change->stats.wc;
1449	op->stats.ac += change->stats.ac;	1347	op->stats.ac += change->stats.ac;
1450		1348
1451	if (change->other_arch)	1349	if (change->other_arch)
1452	{	1350	{
1453	/* Basically, for horns & potions, the other_arch field is the spell	1351	/* Basically, for horns & potions, the other_arch field is the spell
1454	* to cast. So convert that to into a spell and put it into	1352	* to cast. So convert that to into a spell and put it into
1455	* this object.	1353	* this object.
1456	*/	1354	*/
1457	if (op->type == HORN \|\| op->type == POTION)	1355	if (op->type == HORN \|\| op->type == POTION)
1458	{	1356	{
1459	object *tmp_obj;
1460
1461	/* Remove any spells this object currently has in it */	1357	/* Remove any spells this object currently has in it */
1462	while (op->inv)
1463	op->inv->destroy ();	1358	op->destroy_inv (false);
1464		1359
1465	tmp_obj = arch_to_object (change->other_arch);	1360	object *tmp = change->other_arch->instance ();
1466	insert_ob_in_ob (tmp_obj, op);	1361	insert_ob_in_ob (tmp, op);
1467	}	1362	}
		1363
1468	/* No harm setting this for potions/horns */	1364	/* No harm setting this for potions/horns */
1469	op->other_arch = change->other_arch;	1365	op->other_arch = change->other_arch;
1470	}	1366	}
1471		1367
1472	if (change->stats.hp < 0)	1368	if (change->stats.hp < 0)
…		…
1488	op->stats.maxsp = -change->stats.maxsp;	1384	op->stats.maxsp = -change->stats.maxsp;
1489	else	1385	else
1490	op->stats.maxsp += change->stats.maxsp;	1386	op->stats.maxsp += change->stats.maxsp;
1491		1387
1492	if (change->stats.food < 0)	1388	if (change->stats.food < 0)
1493	op->stats.food = -(change->stats.food);	1389	op->stats.food = -change->stats.food;
1494	else	1390	else
1495	op->stats.food += change->stats.food;	1391	op->stats.food += change->stats.food;
1496		1392
1497	if (change->level < 0)	1393	if (change->level < 0)
1498	op->level = -(change->level);	1394	op->level = -change->level;
1499	else	1395	else
1500	op->level += change->level;	1396	op->level += change->level;
1501		1397
1502	if (change->gen_sp_armour < 0)	1398	if (change->gen_sp_armour < 0)
1503	op->gen_sp_armour = -(change->gen_sp_armour);	1399	op->gen_sp_armour = -change->gen_sp_armour;
1504	else	1400	else
1505	op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;	1401	op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1506		1402
1507	op->item_power = change->item_power;	1403	op->item_power = change->item_power;
1508		1404
1509	for (i = 0; i < NROFATTACKS; i++)	1405	for (int i = 0; i < NROFATTACKS; i++)
1510	if (change->resist[i])
1511	op->resist[i] += change->resist[i];	1406	op->resist[i] += change->resist[i];
1512		1407
1513	if (change->stats.dam)	1408	if (change->stats.dam)
1514	{	1409	{
1515	if (change->stats.dam < 0)	1410	if (change->stats.dam < 0)
1516	op->stats.dam = (-change->stats.dam);	1411	op->stats.dam = -change->stats.dam;
1517	else if (op->stats.dam)	1412	else if (op->stats.dam)
1518	{	1413	{
1519	tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10);	1414	int tmp = op->stats.dam * change->stats.dam / 10;
		1415
1520	if (tmp == op->stats.dam)	1416	if (tmp == op->stats.dam)
1521	{	1417	{
1522	if (change->stats.dam < 10)	1418	if (change->stats.dam < 10)
1523	op->stats.dam--;	1419	op->stats.dam--;
1524	else	1420	else
…		…
1530	}	1426	}
1531		1427
1532	if (change->weight)	1428	if (change->weight)
1533	{	1429	{
1534	if (change->weight < 0)	1430	if (change->weight < 0)
1535	op->weight = (-change->weight);	1431	op->weight = -change->weight;
1536	else	1432	else
1537	op->weight = (op->weight * (change->weight)) / 100;	1433	op->weight = op->weight * change->weight / 100;
1538	}	1434	}
1539		1435
1540	if (change->last_sp)	1436	if (change->last_sp)
1541	{	1437	{
1542	if (change->last_sp < 0)	1438	if (change->last_sp < 0)
1543	op->last_sp = (-change->last_sp);	1439	op->last_sp = -change->last_sp;
1544	else	1440	else
1545	op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100);	1441	op->last_sp = op->last_sp * (int)change->last_sp / 100;
1546	}	1442	}
1547		1443
1548	if (change->gen_sp_armour)	1444	if (change->gen_sp_armour)
1549	{	1445	{
1550	if (change->gen_sp_armour < 0)	1446	if (change->gen_sp_armour < 0)
1551	op->gen_sp_armour = (-change->gen_sp_armour);	1447	op->gen_sp_armour = -change->gen_sp_armour;
1552	else	1448	else
1553	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1449	op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1554	}	1450	}
1555		1451
1556	op->value *= change->value;	1452	op->value *= change->value;
1557		1453
1558	if (change->materials)	1454	if (change->materials)
1559	op->materials = change->materials;	1455	op->materials = change->materials;
1560		1456
1561	if (change->materialname)	1457	if (change->material != MATERIAL_NULL)
1562	op->materialname = change->materialname;	1458	op->material = change->material;
1563		1459
1564	if (change->slaying)	1460	if (change->slaying)
1565	op->slaying = change->slaying;	1461	op->slaying = change->slaying;
1566		1462
1567	if (change->race)	1463	if (change->race)
…		…
1590	name = tmp->name + 1, neg = 1;	1486	name = tmp->name + 1, neg = 1;
1591	else	1487	else
1592	name = tmp->name, neg = 0;	1488	name = tmp->name, neg = 0;
1593		1489
1594	/* If we match name, then return the opposite of 'neg' */	1490	/* If we match name, then return the opposite of 'neg' */
1595	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->name)))	1491	if (!strcmp (name, op->name) \|\| (op->arch && !strcmp (name, op->arch->archname)))
1596	return !neg;	1492	return !neg;
1597		1493
1598	/* Set success as true, since if the match was an inverse, it means	1494	/* Set success as true, since if the match was an inverse, it means
1599	* everything is allowed except what we match	1495	* everything is allowed except what we match
1600	*/	1496	*/
…		…
1611	*/	1507	*/
1612		1508
1613	void	1509	void
1614	give_artifact_abilities (object op, object artifct)	1510	give_artifact_abilities (object op, object artifct)
1615	{	1511	{
1616	char new_name[MAX_BUF];	1512	op->title = format ("of %s", &artifct->name);
1617		1513
1618	sprintf (new_name, "of %s", &artifct->name);
1619	op->title = new_name;
1620	add_abilities (op, artifct); /* Give out the bonuses */	1514	add_abilities (op, artifct); /* Give out the bonuses */
1621		1515
1622	#if 0 /* Bit verbose, but keep it here until next time I need it... */	1516	#if 0 /* Bit verbose, but keep it here until next time I need it... */
1623	{	1517	{
1624	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1518	char identified = op->flag [FLAG_IDENTIFIED];
1625		1519
1626	SET_FLAG (op, FLAG_IDENTIFIED);	1520	op->set_flag (FLAG_IDENTIFIED);
1627	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));	1521	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1628	if (!identified)	1522	if (!identified)
1629	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1523	op->clr_flag (FLAG_IDENTIFIED);
1630	}	1524	}
1631	#endif	1525	#endif
1632	return;	1526	return;
1633	}	1527	}
1634		1528
…		…
1644	#define ARTIFACT_TRIES 2	1538	#define ARTIFACT_TRIES 2
1645		1539
1646	void	1540	void
1647	generate_artifact (object *op, int difficulty)	1541	generate_artifact (object *op, int difficulty)
1648	{	1542	{
1649	artifactlist *al;
1650	artifact *art;	1543	artifact *art;
1651	int i;
1652		1544
1653	al = find_artifactlist (op->type);	1545	artifactlist *al = find_artifactlist (op->type);
1654		1546
1655	if (al == NULL)	1547	if (al == NULL)
1656	{	1548	{
1657	#if 0 /* This is too verbose, usually */	1549	#if 0 /* This is too verbose, usually */
1658	LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);	1550	LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1659	#endif	1551	#endif
1660	return;	1552	return;
1661	}	1553	}
1662		1554
1663	for (i = 0; i < ARTIFACT_TRIES; i++)	1555	for (int i = 0; i < ARTIFACT_TRIES; i++)
1664	{	1556	{
1665	int roll = rndm (al->total_chance);	1557	int roll = rndm (al->total_chance);
1666		1558
1667	for (art = al->items; art; art = art->next)	1559	for (art = al->items; art; art = art->next)
1668	{	1560	{
…		…
1676	#if 1	1568	#if 1
1677	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1569	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1678	#endif	1570	#endif
1679	return;	1571	return;
1680	}	1572	}
1681	if (!strcmp (art->item->name, "NONE"))	1573
		1574	if (art->item->name == shstr_NONE)
1682	return;	1575	return;
		1576
1683	if (FABS (op->magic) < art->item->magic)	1577	if (fabs (op->magic) < art->item->magic)
1684	continue; /* Not magic enough to be this item */	1578	continue; /* Not magic enough to be this item */
1685		1579
1686	/* Map difficulty not high enough */	1580	/* Map difficulty not high enough */
1687	if (difficulty < art->difficulty)	1581	if (difficulty < art->difficulty)
1688	continue;	1582	continue;
…		…
1706	*/	1600	*/
1707		1601
1708	void	1602	void
1709	fix_flesh_item (object item, object donor)	1603	fix_flesh_item (object item, object donor)
1710	{	1604	{
1711	char tmpbuf[MAX_BUF];
1712	int i;
1713
1714	if (item->type == FLESH && donor)	1605	if (item->type == FLESH && donor)
1715	{	1606	{
1716	/* change the name */	1607	/* change the name */
1717	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name);	1608	item->name = format ("%s's %s", &donor->name, &item->name);
1718	item->name = tmpbuf;
1719	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl);	1609	item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1720	item->name_pl = tmpbuf;
1721		1610
1722	/* weight is FLESH weight/100 * donor */	1611	/* weight is FLESH weight/100 * donor */
1723	if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0)	1612	item->weight = max (1, item->weight * donor->weight / 100);
1724	item->weight = 1;
1725		1613
1726	/* value is multiplied by level of donor */	1614	/* value is multiplied by level of donor */
1727	item->value = isqrt (donor->level 2);	1615	item->value = isqrt (donor->level 2);
1728		1616
1729	/* food value */	1617	/* food value */
1730	item->stats.food += (donor->stats.hp / 100) + donor->stats.Con;	1618	item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1731		1619
1732	/* flesh items inherit some abilities of donor, but not	1620	/* flesh items inherit some abilities of donor, but not
1733	* full effect.	1621	* full effect.
1734	*/	1622	*/
1735	for (i = 0; i < NROFATTACKS; i++)	1623	for (int i = 0; i < NROFATTACKS; i++)
1736	item->resist[i] = donor->resist[i] / 2;	1624	item->resist[i] = donor->resist[i] / 2;
1737		1625
1738	/* item inherits donor's level (important for quezals) */	1626	/* item inherits donor's level (important for quezals) */
1739	item->level = donor->level;	1627	item->level = donor->level;
1740		1628
1741	/* if donor has some attacktypes, the flesh is poisonous */	1629	/* if donor has some attacktypes, the flesh is poisonous */
1742	if (donor->attacktype & AT_POISON)	1630	if (donor->attacktype & AT_POISON)
1743	item->type = POISON;	1631	item->type = POISON;
		1632
1744	if (donor->attacktype & AT_ACID)	1633	if (donor->attacktype & AT_ACID)
1745	item->stats.hp = -1 * item->stats.food;	1634	item->stats.hp = -item->stats.food;
1746	SET_FLAG (item, FLAG_NO_STEAL);
1747	}
1748	}
1749		1635
1750	/* special_potion() - so that old potion code is still done right. */	1636	item->set_flag (FLAG_NO_STEAL);
1751	int	1637	}
1752	special_potion (object *op)
1753	{
1754	if (op->attacktype)
1755	return 1;
1756
1757	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1758	return 1;
1759
1760	for (int i = 0; i < NROFATTACKS; i++)
1761	if (op->resist[i])
1762	return 1;
1763
1764	return 0;
1765	}	1638	}
1766		1639
1767	void	1640	static void
1768	free_treasurestruct (treasure *t)	1641	free_treasurestruct (treasure *t)
1769	{	1642	{
1770	if (t->next) free_treasurestruct (t->next);	1643	if (t->next) free_treasurestruct (t->next);
1771	if (t->next_yes) free_treasurestruct (t->next_yes);	1644	if (t->next_yes) free_treasurestruct (t->next_yes);
1772	if (t->next_no) free_treasurestruct (t->next_no);	1645	if (t->next_no) free_treasurestruct (t->next_no);
1773		1646
1774	delete t;	1647	delete t;
1775	}	1648	}
1776		1649
1777	void	1650	static void
1778	free_charlinks (linked_char *lc)	1651	free_charlinks (linked_char *lc)
1779	{	1652	{
1780	if (lc->next)	1653	if (lc->next)
1781	free_charlinks (lc->next);	1654	free_charlinks (lc->next);
1782		1655
1783	delete lc;	1656	delete lc;
1784	}	1657	}
1785		1658
1786	void	1659	static void
1787	free_artifact (artifact *at)	1660	free_artifact (artifact *at)
1788	{	1661	{
1789	if (at->next) free_artifact (at->next);	1662	if (at->next) free_artifact (at->next);
1790	if (at->allowed) free_charlinks (at->allowed);	1663	if (at->allowed) free_charlinks (at->allowed);
1791		1664
1792	at->item->destroy (1);	1665	at->item->destroy ();
1793		1666
1794	sfree (at);	1667	sfree (at);
1795	}	1668	}
1796		1669
1797	void
1798	free_artifactlist (artifactlist *al)
1799	{
1800	artifactlist *nextal;
1801
1802	for (al = first_artifactlist; al; al = nextal)
1803	{
1804	nextal = al->next;
1805
1806	if (al->items)
1807	free_artifact (al->items);
1808
1809	sfree (al);
1810	}
1811	}
1812
1813	void
1814	free_all_treasures (void)
1815	{
1816	treasurelist tl, next;
1817
1818	for (tl = first_treasurelist; tl; tl = next)
1819	{
1820	clear (tl);
1821
1822	next = tl->next;
1823	delete tl;
1824	}
1825
1826	free_artifactlist (first_artifactlist);
1827	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.52 by root, Thu Apr 19 19:24:25 2007 UTC vs. Revision 1.107 by root, Sun Apr 25 07:08:57 2010 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.52 by root, Thu Apr 19 19:24:25 2007 UTC vs.
Revision 1.107 by root, Sun Apr 25 07:08:57 2010 UTC