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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC vs.
Revision 1.48 by root, Tue Apr 17 18:40:31 2007 UTC

…		…
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	21	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	#define ALLOWED_COMBINATION
26
27	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28	* 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
29	* 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
30	* left on	28	* left on
31	*/	29	*/
32	#define TREASURE_DEBUG	30	#define TREASURE_DEBUG
33		31
34	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	32	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35		33
36	/* #define TREASURE_VERBOSE */	34	//#define TREASURE_VERBOSE
37		35
38	#include <global.h>	36	#include <global.h>
39	#include <treasure.h>	37	#include <treasure.h>
40	#include <funcpoint.h>	38	#include <funcpoint.h>
41	#include <loader.h>	39	#include <loader.h>
42		40
		41	extern char *spell_mapping[];
		42
		43	static treasurelist *first_treasurelist;
43		44
44	static void change_treasure (treasure t, object op); /* overrule default values */	45	static void change_treasure (treasure t, object op); /* overrule default values */
45	extern char *spell_mapping[];
46		46
47	/*	47	typedef std::tr1::unordered_map<
48	* Initialize global archtype pointers:	48	const char *,
49	*/	49	treasurelist *,
		50	str_hash,
		51	str_equal,
		52	slice_allocator< std::pair<const char const, treasurelist > >,
		53	true
		54	> tl_map_t;
50		55
		56	static tl_map_t tl_map;
		57
		58	/*
		59	* Searches for the given treasurelist
		60	*/
		61	treasurelist *
		62	treasurelist::find (const char *name)
		63	{
		64	if (!name)
		65	return 0;
		66
		67	auto (i, tl_map.find (name));
		68
		69	if (i == tl_map.end ())
		70	return 0;
		71
		72	return i->second;
		73	}
		74
		75	/*
		76	* Searches for the given treasurelist in the globally linked list
		77	* of treasurelists which has been built by load_treasures().
		78	*/
		79	treasurelist *
		80	treasurelist::get (const char *name)
		81	{
		82	treasurelist *tl = find (name);
		83
		84	if (!tl)
		85	{
		86	tl = new treasurelist;
		87
		88	tl->name = name;
		89	tl->next = first_treasurelist;
		90	first_treasurelist = tl;
		91
		92	tl_map.insert (std::make_pair (tl->name, tl));
		93	}
		94
		95	return tl;
		96	}
		97
		98	//TODO: class method
51	void	99	void
52	init_archetype_pointers ()	100	clear (treasurelist *tl)
53	{	101	{
54	int prev_warn = warn_archetypes;	102	if (tl->items)
		103	{
		104	free_treasurestruct (tl->items);
		105	tl->items = 0;
		106	}
55		107
56	warn_archetypes = 1;
57	if (ring_arch == NULL)
58	ring_arch = archetype::find ("ring");
59	if (amulet_arch == NULL)
60	amulet_arch = archetype::find ("amulet");
61	if (staff_arch == NULL)
62	staff_arch = archetype::find ("staff");
63	if (crown_arch == NULL)
64	crown_arch = archetype::find ("crown");
65	warn_archetypes = prev_warn;
66	}
67
68	/*
69	* Allocate and return the pointer to an empty treasurelist structure.
70	*/
71
72	static treasurelist *
73	get_empty_treasurelist (void)
74	{
75	return new treasurelist;
76	}
77
78	/*
79	* Allocate and return the pointer to an empty treasure structure.
80	*/
81	//TODO: make this a constructor
82	static treasure *
83	get_empty_treasure (void)
84	{
85	treasure *t = new treasure;
86
87	t->chance = 100;	108	tl->total_chance = 0;
88
89	return t;
90	}	109	}
		110
		111	#ifdef TREASURE_DEBUG
		112	/* recursived checks the linked list. Treasurelist is passed only
		113	* so that the treasure name can be printed out
		114	*/
		115	static void
		116	check_treasurelist (const treasure t, const treasurelist tl)
		117	{
		118	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
		119	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		120
		121	if (t->next)
		122	check_treasurelist (t->next, tl);
		123
		124	if (t->next_yes)
		125	check_treasurelist (t->next_yes, tl);
		126
		127	if (t->next_no)
		128	check_treasurelist (t->next_no, tl);
		129	}
		130	#endif
91		131
92	/*	132	/*
93	* Reads the lib/treasure file from disk, and parses the contents	133	* Reads the lib/treasure file from disk, and parses the contents
94	* into an internal treasure structure (very linked lists)	134	* into an internal treasure structure (very linked lists)
95	*/	135	*/
96
97	static treasure *	136	static treasure *
98	load_treasure (FILE * fp, int *line)	137	read_treasure (object_thawer &f)
99	{	138	{
100	char buf[MAX_BUF], *cp, variable[MAX_BUF];
101	treasure *t = get_empty_treasure ();	139	treasure *t = new treasure;
102	int value;
103		140
104	nroftreasures++;	141	f.next ();
105	while (fgets (buf, MAX_BUF, fp) != NULL)
106	{
107	(*line)++;
108		142
109	if (*buf == '#')	143	for (;;)
110	continue;	144	{
111	if ((cp = strchr (buf, '\n')) != NULL)	145	coroapi::cede_to_tick_every (10);
112	*cp = '\0';
113	cp = buf;
114	while (isspace (cp)) / Skip blanks */
115	cp++;
116		146
117	if (sscanf (cp, "arch %s", variable))	147	switch (f.kw)
118	{
119	if ((t->item = archetype::find (variable)) == NULL)
120	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121	}	148	{
122	else if (sscanf (cp, "list %s", variable))	149	case KW_arch:
123	t->name = variable;	150	if (!(t->item = archetype::find (f.get_str ())))
124	else if (sscanf (cp, "change_name %s", variable))	151	LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
125	t->change_arch.name = variable;	152	break;
126	else if (sscanf (cp, "change_title %s", variable))	153
127	t->change_arch.title = variable;	154	case KW_list: f.get (t->name); break;
128	else if (sscanf (cp, "change_slaying %s", variable))	155	case KW_change_name: f.get (t->change_arch.name); break;
129	t->change_arch.slaying = variable;	156	case KW_change_title: f.get (t->change_arch.title); break;
130	else if (sscanf (cp, "chance %d", &value))	157	case KW_change_slaying: f.get (t->change_arch.slaying); break;
131	t->chance = (uint8) value;	158	case KW_chance: f.get (t->chance); break;
132	else if (sscanf (cp, "nrof %d", &value))	159	case KW_nrof: f.get (t->nrof); break;
133	t->nrof = (uint16) value;	160	case KW_magic: f.get (t->magic); break;
134	else if (sscanf (cp, "magic %d", &value))	161
135	t->magic = (uint8) value;	162	case KW_yes: t->next_yes = read_treasure (f); continue;
136	else if (!strcmp (cp, "yes"))	163	case KW_no: t->next_no = read_treasure (f); continue;
137	t->next_yes = load_treasure (fp, line);	164
138	else if (!strcmp (cp, "no"))	165	case KW_end:
139	t->next_no = load_treasure (fp, line);	166	f.next ();
140	else if (!strcmp (cp, "end"))
141	return t;
142	else if (!strcmp (cp, "more"))
143	{
144	t->next = load_treasure (fp, line);
145	return t;	167	return t;
146	}
147	else
148	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
149	}
150	LOG (llevError, "treasure lacks 'end'.\n");
151	return t;
152	}
153		168
154	#ifdef TREASURE_DEBUG	169	case KW_more:
		170	t->next = read_treasure (f);
		171	return t;
155		172
156	/* recursived checks the linked list. Treasurelist is passed only	173	default:
157	* so that the treasure name can be printed out	174	if (!f.parse_error ("treasurelist", t->name))
158	*/	175	return 0;
159	static void
160	check_treasurelist (const treasure t, const treasurelist tl)
161	{
162	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
163	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
164	/* find_treasurelist will print out its own error message */
165	if (t->name && *t->name)
166	find_treasurelist (t->name);
167	if (t->next)
168	check_treasurelist (t->next, tl);
169	if (t->next_yes)
170	check_treasurelist (t->next_yes, tl);
171	if (t->next_no)
172	check_treasurelist (t->next_no, tl);
173	}
174	#endif
175		176
		177	return t;
		178	}
		179
		180	f.next ();
		181	}
		182	}
		183
176	/*	184	/*
177	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
178	* Each treasure is parsed with the help of load_treasure().	185	* Each treasure is parsed with the help of load_treasure().
179	*/	186	*/
180		187	treasurelist *
181	void	188	treasurelist::read (object_thawer &f)
182	load_treasures (void)
183	{	189	{
184	FILE *fp;	190	assert (f.kw == KW_treasure \|\| f.kw == KW_treasureone);
185	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186	treasurelist *previous = NULL;
187	treasure *t;
188	int comp, line = 0;
189		191
190	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	192	bool one = f.kw == KW_treasureone;
191	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	193	treasurelist *tl = treasurelist::get (f.get_str ());
192	{	194	clear (tl);
193	LOG (llevError, "Can't open treasure file.\n");	195	tl->items = read_treasure (f);
		196	if (!tl->items)
194	return;	197	return 0;
195	}
196	while (fgets (buf, MAX_BUF, fp) != NULL)
197	{
198	line++;
199	if (*buf == '#')
200	continue;
201		198
202	if (sscanf (buf, "treasureone %s\n", name) \|\| sscanf (buf, "treasure %s\n", name))
203	{
204	treasurelist *tl = get_empty_treasurelist ();
205
206	tl->name = name;
207	if (previous == NULL)
208	first_treasurelist = tl;
209	else
210	previous->next = tl;
211	previous = tl;
212	tl->items = load_treasure (fp, &line);
213
214	/* This is a one of the many items on the list should be generated.	199	/* This is a one of the many items on the list should be generated.
215	* Add up the chance total, and check to make sure the yes & no	200	* Add up the chance total, and check to make sure the yes & no
216	* fields of the treasures are not being used.	201	* fields of the treasures are not being used.
217	*/	202	*/
218	if (!strncmp (buf, "treasureone", 11))	203	tl->total_chance = 0;
		204
		205	if (one)
		206	{
		207	for (treasure *t = tl->items; t; t = t->next)
		208	{
		209	if (t->next_yes \|\| t->next_no)
219	{	210	{
220	for (t = tl->items; t != NULL; t = t->next)
221	{
222	#ifdef TREASURE_DEBUG
223	if (t->next_yes \|\| t->next_no)
224	{
225	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);	211	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
226	LOG (llevError, " the next_yes or next_no field is set\n");	212	LOG (llevError, " the next_yes or next_no field is set\n");
227	}
228	#endif
229	tl->total_chance += t->chance;
230	}
231	}	213	}
232	}
233	else
234	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
235	}
236	close_and_delete (fp, comp);
237		214
238	#ifdef TREASURE_DEBUG	215	tl->total_chance += t->chance;
239	/* Perform some checks on how valid the treasure data actually is.	216	}
240	* verify that list transitions work (ie, the list that it is supposed	217	}
241	* to transition to exists). Also, verify that at least the name
242	* or archetype is set for each treasure element.
243	*/
244	for (previous = first_treasurelist; previous != NULL; previous = previous->next)
245	check_treasurelist (previous->items, previous);
246	#endif
247	}
248		218
249	/*
250	* Searches for the given treasurelist in the globally linked list
251	* of treasurelists which has been built by load_treasures().
252	*/
253
254	treasurelist *
255	find_treasurelist (const char *name)
256	{
257	shstr_cmp name_ (name);
258
259	if (!name_)
260	return 0;
261
262	for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
263	if (name_ == tl->name)
264	return tl;
265
266	if (first_treasurelist)
267	LOG (llevError, "Couldn't find treasurelist %s\n", name);
268
269	return 0;	219	return tl;
270	}	220	}
271
272		221
273	/*	222	/*
274	* Generates the objects specified by the given treasure.	223	* Generates the objects specified by the given treasure.
275	* It goes recursively through the rest of the linked list.	224	* It goes recursively through the rest of the linked list.
276	* If there is a certain percental chance for a treasure to be generated,	225	* If there is a certain percental chance for a treasure to be generated,
…		…
326		275
327	if (t->change_arch.slaying)	276	if (t->change_arch.slaying)
328	op->slaying = t->change_arch.slaying;	277	op->slaying = t->change_arch.slaying;
329	}	278	}
330		279
331	void	280	static void
332	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)	281	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)
333	{	282	{
334	object *tmp;
335
336	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)	283	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
337	{	284	{
338	if (t->name)	285	if (t->name)
339	{	286	{
340	if (difficulty >= t->magic)	287	if (difficulty >= t->magic)
341	{
342	treasurelist *tl = find_treasurelist (t->name);	288	if (treasurelist *tl = treasurelist::find (t->name))
343	if (tl)
344	create_treasure (tl, op, flag, difficulty, tries);	289	create_treasure (tl, op, flag, difficulty, tries);
345	}	290	else
		291	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
346	}	292	}
347	else	293	else
348	{	294	{
349	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))	295	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))
350	{	296	{
351	tmp = arch_to_object (t->item);	297	object *tmp = arch_to_object (t->item);
		298
352	if (t->nrof && tmp->nrof <= 1)	299	if (t->nrof && tmp->nrof <= 1)
353	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	300	tmp->nrof = rndm (t->nrof) + 1;
		301
354	fix_generated_item (tmp, op, difficulty, t->magic, flag);	302	fix_generated_item (tmp, op, difficulty, t->magic, flag);
355	change_treasure (t, tmp);	303	change_treasure (t, tmp);
356	put_treasure (tmp, op, flag);	304	put_treasure (tmp, op, flag);
357	}	305	}
358	}	306	}
359		307
360	if (t->next_yes != NULL)	308	if (t->next_yes)
361	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	309	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
362	}	310	}
363	else if (t->next_no != NULL)	311	else if (t->next_no)
364	create_all_treasures (t->next_no, op, flag, difficulty, tries);	312	create_all_treasures (t->next_no, op, flag, difficulty, tries);
365		313
366	if (t->next != NULL)	314	if (t->next)
367	create_all_treasures (t->next, op, flag, difficulty, tries);	315	create_all_treasures (t->next, op, flag, difficulty, tries);
368	}	316	}
369		317
370	void	318	static void
371	create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries)	319	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
372	{	320	{
373	int value = RANDOM () % tl->total_chance;	321	int value = rndm (tl->total_chance);
374	treasure *t;	322	treasure *t;
375		323
376	if (tries++ > 100)	324	if (tries++ > 100)
377	{	325	{
378	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	326	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
379	return;	327	return;
380	}	328	}
381		329
382	for (t = tl->items; t != NULL; t = t->next)	330	for (t = tl->items; t; t = t->next)
383	{	331	{
384	value -= t->chance;	332	value -= t->chance;
385		333
386	if (value < 0)	334	if (value < 0)
387	break;	335	break;
388	}	336	}
389		337
390	if (!t \|\| value >= 0)	338	if (!t \|\| value >= 0)
391	{
392	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	339	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
393	abort ();
394	return;
395	}
396		340
397	if (t->name)	341	if (t->name)
398	{	342	{
399	if (difficulty >= t->magic)	343	if (difficulty >= t->magic)
400	{	344	{
401	treasurelist *tl = find_treasurelist (t->name);	345	treasurelist *tl = treasurelist::find (t->name);
402	if (tl)	346	if (tl)
403	create_treasure (tl, op, flag, difficulty, tries);	347	create_treasure (tl, op, flag, difficulty, tries);
404	}	348	}
405	else if (t->nrof)	349	else if (t->nrof)
406	create_one_treasure (tl, op, flag, difficulty, tries);	350	create_one_treasure (tl, op, flag, difficulty, tries);
407
408	return;
409	}	351	}
410
411	if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	352	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))
412	{	353	{
413	object *tmp = arch_to_object (t->item);	354	if (object *tmp = arch_to_object (t->item))
414		355	{
415	if (!tmp)
416	return;
417
418	if (t->nrof && tmp->nrof <= 1)	356	if (t->nrof && tmp->nrof <= 1)
419	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	357	tmp->nrof = rndm (t->nrof) + 1;
420		358
421	fix_generated_item (tmp, op, difficulty, t->magic, flag);	359	fix_generated_item (tmp, op, difficulty, t->magic, flag);
422	change_treasure (t, tmp);	360	change_treasure (t, tmp);
423	put_treasure (tmp, op, flag);	361	put_treasure (tmp, op, flag);
		362	}
424	}	363	}
425	}	364	}
426		365
427	/* This calls the appropriate treasure creation function. tries is passed	366	/* This calls the appropriate treasure creation function. tries is passed
428	* to determine how many list transitions or attempts to create treasure	367	* to determine how many list transitions or attempts to create treasure
…		…
432	* to do that.	371	* to do that.
433	*/	372	*/
434	void	373	void
435	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)	374	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
436	{	375	{
		376	// empty treasurelists are legal
		377	if (!tl->items)
		378	return;
437		379
438	if (tries++ > 100)	380	if (tries++ > 100)
439	{	381	{
440	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	382	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441	return;	383	return;
442	}	384	}
		385
443	if (tl->total_chance)	386	if (tl->total_chance)
444	create_one_treasure (tl, op, flag, difficulty, tries);	387	create_one_treasure (tl, op, flag, difficulty, tries);
445	else	388	else
446	create_all_treasures (tl->items, op, flag, difficulty, tries);	389	create_all_treasures (tl->items, op, flag, difficulty, tries);
447	}	390	}
…		…
479	* magical bonus "wanted".	422	* magical bonus "wanted".
480	*/	423	*/
481		424
482	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	425	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
483		426
484	/chance of magic difficulty/	427	// chance of magic difficulty
485
486	/* +0 +1 +2 +3 +4 */	428	// +0 +1 +2 +3 +4
487	{95, 2, 2, 1, 0}, /1 /	429	{95, 2, 2, 1, 0}, // 1
488	{92, 5, 2, 1, 0}, /2 /	430	{92, 5, 2, 1, 0}, // 2
489	{85, 10, 4, 1, 0}, /3 /	431	{85, 10, 4, 1, 0}, // 3
490	{80, 14, 4, 2, 0}, /4 /	432	{80, 14, 4, 2, 0}, // 4
491	{75, 17, 5, 2, 1}, /5 /	433	{75, 17, 5, 2, 1}, // 5
492	{70, 18, 8, 3, 1}, /6 /	434	{70, 18, 8, 3, 1}, // 6
493	{65, 21, 10, 3, 1}, /7 /	435	{65, 21, 10, 3, 1}, // 7
494	{60, 22, 12, 4, 2}, /8 /	436	{60, 22, 12, 4, 2}, // 8
495	{55, 25, 14, 4, 2}, /9 /	437	{55, 25, 14, 4, 2}, // 9
496	{50, 27, 16, 5, 2}, /10 /	438	{50, 27, 16, 5, 2}, // 10
497	{45, 28, 18, 6, 3}, /11 /	439	{45, 28, 18, 6, 3}, // 11
498	{42, 28, 20, 7, 3}, /12 /	440	{42, 28, 20, 7, 3}, // 12
499	{40, 27, 21, 8, 4}, /13 /	441	{40, 27, 21, 8, 4}, // 13
500	{38, 25, 22, 10, 5}, /14 /	442	{38, 25, 22, 10, 5}, // 14
501	{36, 23, 23, 12, 6}, /15 /	443	{36, 23, 23, 12, 6}, // 15
502	{33, 21, 24, 14, 8}, /16 /	444	{33, 21, 24, 14, 8}, // 16
503	{31, 19, 25, 16, 9}, /17 /	445	{31, 19, 25, 16, 9}, // 17
504	{27, 15, 30, 18, 10}, /18 /	446	{27, 15, 30, 18, 10}, // 18
505	{20, 12, 30, 25, 13}, /19 /	447	{20, 12, 30, 25, 13}, // 19
506	{15, 10, 28, 30, 17}, /20 /	448	{15, 10, 28, 30, 17}, // 20
507	{13, 9, 27, 28, 23}, /21 /	449	{13, 9, 27, 28, 23}, // 21
508	{10, 8, 25, 28, 29}, /22 /	450	{10, 8, 25, 28, 29}, // 22
509	{8, 7, 23, 26, 36}, /23 /	451	{ 8, 7, 23, 26, 36}, // 23
510	{6, 6, 20, 22, 46}, /24 /	452	{ 6, 6, 20, 22, 46}, // 24
511	{4, 5, 17, 18, 56}, /25 /	453	{ 4, 5, 17, 18, 56}, // 25
512	{2, 4, 12, 14, 68}, /26 /	454	{ 2, 4, 12, 14, 68}, // 26
513	{0, 3, 7, 10, 80}, /27 /	455	{ 0, 3, 7, 10, 80}, // 27
514	{0, 0, 3, 7, 90}, /28 /	456	{ 0, 0, 3, 7, 90}, // 28
515	{0, 0, 0, 3, 97}, /29 /	457	{ 0, 0, 0, 3, 97}, // 29
516	{0, 0, 0, 0, 100}, /30 /	458	{ 0, 0, 0, 0, 100}, // 30
517	{0, 0, 0, 0, 100}, /31 /	459	{ 0, 0, 0, 0, 100}, // 31
518	};	460	};
519		461
520		462
521	/* calculate the appropriate level for wands staves and scrolls.	463	/* calculate the appropriate level for wands staves and scrolls.
522	* This code presumes that op has had its spell object created (in op->inv)	464	* This code presumes that op has had its spell object created (in op->inv)
…		…
555	* elmex Thu Aug 10 18:45:44 CEST 2006:	497	* elmex Thu Aug 10 18:45:44 CEST 2006:
556	* Scaling difficulty by max_level, as difficulty is a level and not some	498	* Scaling difficulty by max_level, as difficulty is a level and not some
557	* weird integer between 1-31.	499	* weird integer between 1-31.
558	*	500	*
559	*/	501	*/
560
561	int	502	int
562	magic_from_difficulty (int difficulty)	503	magic_from_difficulty (int difficulty)
563	{	504	{
564	int percent = 0, magic = 0;	505	int percent = 0, magic = 0;
565	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	506	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
653	* 1) Since rings can have multiple bonuses, if the same bonus	594	* 1) Since rings can have multiple bonuses, if the same bonus
654	* is rolled again, increase it - the bonuses now stack with	595	* is rolled again, increase it - the bonuses now stack with
655	* other bonuses previously rolled and ones the item might natively have.	596	* other bonuses previously rolled and ones the item might natively have.
656	* 2) Add code to deal with new PR method.	597	* 2) Add code to deal with new PR method.
657	*/	598	*/
658
659	void	599	void
660	set_ring_bonus (object *op, int bonus)	600	set_ring_bonus (object *op, int bonus)
661	{	601	{
662		602
663	int r = RANDOM () % (bonus > 0 ? 25 : 11);	603	int r = rndm (bonus > 0 ? 25 : 11);
664		604
665	if (op->type == AMULET)	605	if (op->type == AMULET)
666	{	606	{
667	if (!(rndm (21)))	607	if (!(rndm (21)))
668	r = 20 + rndm (2);	608	r = 20 + rndm (2);
669	else	609	else
670	{	610	{
671	if (RANDOM () & 2)	611	if (rndm (2))
672	r = 10;	612	r = 10;
673	else	613	else
674	r = 11 + rndm (9);	614	r = 11 + rndm (9);
675	}	615	}
676	}	616	}
…		…
727	* positive values for how protections work out. Put another	667	* positive values for how protections work out. Put another
728	* little random element in since that they don't always end up with	668	* little random element in since that they don't always end up with
729	* even values.	669	* even values.
730	*/	670	*/
731	if (bonus < 0)	671	if (bonus < 0)
732	val = 2 * -val - RANDOM () % b;	672	val = 2 * -val - rndm (b);
733	if (val > 35)	673	if (val > 35)
734	val = 35; /* Upper limit */	674	val = 35; /* Upper limit */
735	b = 0;	675	b = 0;
736		676
737	while (op->resist[resist_table[resist]] != 0 && b < 4)	677	while (op->resist[resist_table[resist]] != 0 && b < 4)
…		…
790	* higher is the chance of returning a low number.	730	* higher is the chance of returning a low number.
791	* It is only used in fix_generated_treasure() to set bonuses on	731	* It is only used in fix_generated_treasure() to set bonuses on
792	* rings and amulets.	732	* rings and amulets.
793	* Another scheme is used to calculate the magic of weapons and armours.	733	* Another scheme is used to calculate the magic of weapons and armours.
794	*/	734	*/
795
796	int	735	int
797	get_magic (int diff)	736	get_magic (int diff)
798	{	737	{
799	int i;	738	int i;
800		739
801	if (diff < 3)	740	if (diff < 3)
802	diff = 3;	741	diff = 3;
		742
803	for (i = 0; i < 4; i++)	743	for (i = 0; i < 4; i++)
804	if (RANDOM () % diff)	744	if (rndm (diff))
805	return i;	745	return i;
		746
806	return 4;	747	return 4;
807	}	748	}
808		749
809	#define DICE2 (get_magic(2)==2?2:1)	750	#define DICE2 (get_magic(2)==2?2:1)
810	#define DICESPELL (rndm (3)+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	751	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
811		752
812	/*	753	/*
813	* fix_generated_item(): This is called after an item is generated, in	754	* fix_generated_item(): This is called after an item is generated, in
814	* order to set it up right. This produced magical bonuses, puts spells	755	* order to set it up right. This produced magical bonuses, puts spells
815	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	756	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
829	* value.	770	* value.
830	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	771	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
831	* a working object - don't change magic, value, etc, but set it material	772	* a working object - don't change magic, value, etc, but set it material
832	* type as appropriate, for objects that need spell objects, set those, etc	773	* type as appropriate, for objects that need spell objects, set those, etc
833	*/	774	*/
834
835	void	775	void
836	fix_generated_item (object op, object creator, int difficulty, int max_magic, int flags)	776	fix_generated_item (object op, object creator, int difficulty, int max_magic, int flags)
837	{	777	{
838	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	778	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
839		779
…		…
846		786
847	if (op->randomitems && op->type != SPELL)	787	if (op->randomitems && op->type != SPELL)
848	{	788	{
849	create_treasure (op->randomitems, op, flags, difficulty, 0);	789	create_treasure (op->randomitems, op, flags, difficulty, 0);
850	if (!op->inv)	790	if (!op->inv)
851	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);	791	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
852		792
853	/* So the treasure doesn't get created again */	793	/* So the treasure doesn't get created again */
854	op->randomitems = NULL;	794	op->randomitems = 0;
855	}	795	}
856		796
857	if (difficulty < 1)	797	if (difficulty < 1)
858	difficulty = 1;	798	difficulty = 1;
859		799
…		…
876	if (!op->magic && max_magic)	816	if (!op->magic && max_magic)
877	set_magic (difficulty, op, max_magic, flags);	817	set_magic (difficulty, op, max_magic, flags);
878		818
879	num_enchantments = calc_item_power (op, 1);	819	num_enchantments = calc_item_power (op, 1);
880		820
881	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) \|\| op->type == HORN \|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	821	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
		822	\|\| op->type == HORN
		823	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,
882	* used for shop_floors or treasures */	824	* used for shop_floors or treasures */
883	generate_artifact (op, difficulty);	825	generate_artifact (op, difficulty);
884	}	826	}
885		827
886	/* Object was made an artifact. Calculate its item_power rating.	828	/* Object was made an artifact. Calculate its item_power rating.
…		…
949	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))	891	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
950	set_ring_bonus (op, -DICE2);	892	set_ring_bonus (op, -DICE2);
951	break;	893	break;
952		894
953	case BRACERS:	895	case BRACERS:
954	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	896	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
955	{	897	{
956	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	898	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
957	if (!QUERY_FLAG (op, FLAG_CURSED))	899	if (!QUERY_FLAG (op, FLAG_CURSED))
958	op->value *= 3;	900	op->value *= 3;
959	}	901	}
…		…
985	*/	927	*/
986	if (op->inv && op->randomitems)	928	if (op->inv && op->randomitems)
987	{	929	{
988	/* value multiplier is same as for scrolls */	930	/* value multiplier is same as for scrolls */
989	op->value = (op->value * op->inv->value);	931	op->value = (op->value * op->inv->value);
990	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	932	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
991	}	933	}
992	else	934	else
993	{	935	{
994	op->name = "potion";	936	op->name = "potion";
995	op->name_pl = "potions";	937	op->name_pl = "potions";
…		…
1041	set_ring_bonus (op, d);	983	set_ring_bonus (op, d);
1042	}	984	}
1043	}	985	}
1044		986
1045	if (GET_ANIM_ID (op))	987	if (GET_ANIM_ID (op))
1046	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	988	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1047		989
1048	break;	990	break;
1049		991
1050	case BOOK:	992	case BOOK:
1051	/* Is it an empty book?, if yes lets make a special·	993	/* Is it an empty book?, if yes lets make a special·
…		…
1056	{	998	{
1057	/* set the book level properly */	999	/* set the book level properly */
1058	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1000	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))
1059	{	1001	{
1060	if (op->map && op->map->difficulty)	1002	if (op->map && op->map->difficulty)
1061	op->level = RANDOM () % (op->map->difficulty) + rndm (10) + 1;	1003	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1062	else	1004	else
1063	op->level = rndm (20) + 1;	1005	op->level = rndm (20) + 1;
1064	}	1006	}
1065	else	1007	else
1066	op->level = RANDOM () % creator->level;	1008	op->level = rndm (creator->level);
1067		1009
1068	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1010	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1069	/* books w/ info are worth more! */	1011	/* books w/ info are worth more! */
1070	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1012	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1071	/* creator related stuff */	1013	/* creator related stuff */
…		…
1170	*/	1112	*/
1171		1113
1172	/*	1114	/*
1173	* Allocate and return the pointer to an empty artifactlist structure.	1115	* Allocate and return the pointer to an empty artifactlist structure.
1174	*/	1116	*/
1175
1176	static artifactlist *	1117	static artifactlist *
1177	get_empty_artifactlist (void)	1118	get_empty_artifactlist (void)
1178	{	1119	{
1179	artifactlist al = (artifactlist ) malloc (sizeof (artifactlist));	1120	return salloc0 <artifactlist> ();
1180
1181	if (al == NULL)
1182	fatal (OUT_OF_MEMORY);
1183	al->next = NULL;
1184	al->items = NULL;
1185	al->total_chance = 0;
1186	return al;
1187	}	1121	}
1188		1122
1189	/*	1123	/*
1190	* Allocate and return the pointer to an empty artifact structure.	1124	* Allocate and return the pointer to an empty artifact structure.
1191	*/	1125	*/
1192
1193	static artifact *	1126	static artifact *
1194	get_empty_artifact (void)	1127	get_empty_artifact (void)
1195	{	1128	{
1196	artifact a = (artifact ) malloc (sizeof (artifact));	1129	return salloc0 <artifact> ();
1197
1198	if (a == NULL)
1199	fatal (OUT_OF_MEMORY);
1200	a->item = NULL;
1201	a->next = NULL;
1202	a->chance = 0;
1203	a->difficulty = 0;
1204	a->allowed = NULL;
1205	return a;
1206	}	1130	}
1207		1131
1208	/*	1132	/*
1209	* Searches the artifact lists and returns one that has the same type	1133	* Searches the artifact lists and returns one that has the same type
1210	* of objects on it.	1134	* of objects on it.
1211	*/	1135	*/
1212
1213	artifactlist *	1136	artifactlist *
1214	find_artifactlist (int type)	1137	find_artifactlist (int type)
1215	{	1138	{
1216	artifactlist *al;
1217
1218	for (al = first_artifactlist; al != NULL; al = al->next)	1139	for (artifactlist *al = first_artifactlist; al; al = al->next)
1219	if (al->type == type)	1140	if (al->type == type)
1220	return al;	1141	return al;
		1142
1221	return NULL;	1143	return 0;
1222	}	1144	}
1223		1145
1224	/*	1146	/*
1225	* For debugging purposes. Dumps all tables.	1147	* For debugging purposes. Dumps all tables.
1226	*/	1148	*/
1227
1228	void	1149	void
1229	dump_artifacts (void)	1150	dump_artifacts (void)
1230	{	1151	{
1231	artifactlist *al;	1152	artifactlist *al;
1232	artifact *art;	1153	artifact *art;
…		…
1239	for (art = al->items; art != NULL; art = art->next)	1160	for (art = al->items; art != NULL; art = art->next)
1240	{	1161	{
1241	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);	1162	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1242	if (art->allowed != NULL)	1163	if (art->allowed != NULL)
1243	{	1164	{
1244	fprintf (logfile, "\tAllowed combinations:");	1165	fprintf (logfile, "\tallowed combinations:");
1245	for (next = art->allowed; next != NULL; next = next->next)	1166	for (next = art->allowed; next != NULL; next = next->next)
1246	fprintf (logfile, "%s,", &next->name);	1167	fprintf (logfile, "%s,", &next->name);
1247	fprintf (logfile, "\n");	1168	fprintf (logfile, "\n");
1248	}	1169	}
1249	}	1170	}
…		…
1260	treasurelist *tl;	1181	treasurelist *tl;
1261	int i;	1182	int i;
1262		1183
1263	if (depth > 100)	1184	if (depth > 100)
1264	return;	1185	return;
		1186
1265	while (t)	1187	while (t)
1266	{	1188	{
1267	if (t->name)	1189	if (t->name)
1268	{	1190	{
1269	for (i = 0; i < depth; i++)	1191	for (i = 0; i < depth; i++)
1270	fprintf (logfile, " ");	1192	fprintf (logfile, " ");
		1193
1271	fprintf (logfile, "{ (list: %s)\n", &t->name);	1194	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1195
1272	tl = find_treasurelist (t->name);	1196	tl = treasurelist::find (t->name);
1273	if (tl)	1197	if (tl)
1274	dump_monster_treasure_rec (name, tl->items, depth + 2);	1198	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1199
1275	for (i = 0; i < depth; i++)	1200	for (i = 0; i < depth; i++)
1276	fprintf (logfile, " ");	1201	fprintf (logfile, " ");
		1202
1277	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1203	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1278	}	1204	}
1279	else	1205	else
1280	{	1206	{
1281	for (i = 0; i < depth; i++)	1207	for (i = 0; i < depth; i++)
1282	fprintf (logfile, " ");	1208	fprintf (logfile, " ");
		1209
1283	if (t->item && t->item->clone.type == FLESH)	1210	if (t->item && t->item->clone.type == FLESH)
1284	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1211	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1285	else	1212	else
1286	fprintf (logfile, "%s\n", &t->item->clone.name);	1213	fprintf (logfile, "%s\n", &t->item->clone.name);
1287	}	1214	}
1288		1215
1289	if (t->next_yes)	1216	if (t->next_yes)
1290	{	1217	{
1291	for (i = 0; i < depth; i++)	1218	for (i = 0; i < depth; i++)
1292	fprintf (logfile, " ");	1219	fprintf (logfile, " ");
		1220
1293	fprintf (logfile, " (if yes)\n");	1221	fprintf (logfile, " (if yes)\n");
1294	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1222	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1295	}	1223	}
1296		1224
1297	if (t->next_no)	1225	if (t->next_no)
1298	{	1226	{
1299	for (i = 0; i < depth; i++)	1227	for (i = 0; i < depth; i++)
1300	fprintf (logfile, " ");	1228	fprintf (logfile, " ");
		1229
1301	fprintf (logfile, " (if no)\n");	1230	fprintf (logfile, " (if no)\n");
1302	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1231	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1303	}	1232	}
1304		1233
1305	t = t->next;	1234	t = t->next;
…		…
1308		1237
1309	/*	1238	/*
1310	* For debugging purposes. Dumps all treasures for a given monster.	1239	* For debugging purposes. Dumps all treasures for a given monster.
1311	* Created originally by Raphael Quinet for debugging the alchemy code.	1240	* Created originally by Raphael Quinet for debugging the alchemy code.
1312	*/	1241	*/
1313
1314	void	1242	void
1315	dump_monster_treasure (const char *name)	1243	dump_monster_treasure (const char *name)
1316	{	1244	{
1317	archetype *at;	1245	archetype *at;
1318	int found;	1246	int found;
1319		1247
1320	found = 0;	1248	found = 0;
1321	fprintf (logfile, "\n");	1249	fprintf (logfile, "\n");
		1250
1322	for (at = first_archetype; at != NULL; at = at->next)	1251	for (at = first_archetype; at != NULL; at = at->next)
1323	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)	1252	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1324	{	1253	{
1325	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);	1254	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1326	if (at->clone.randomitems != NULL)	1255	if (at->clone.randomitems != NULL)
1327	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);	1256	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1328	else	1257	else
1329	fprintf (logfile, "(nothing)\n");	1258	fprintf (logfile, "(nothing)\n");
		1259
1330	fprintf (logfile, "\n");	1260	fprintf (logfile, "\n");
1331	found++;	1261	found++;
1332	}	1262	}
		1263
1333	if (found == 0)	1264	if (found == 0)
1334	fprintf (logfile, "No objects have the name %s!\n\n", name);	1265	fprintf (logfile, "No objects have the name %s!\n\n", name);
1335	}	1266	}
1336		1267
1337	/*	1268	/*
1338	* Builds up the lists of artifacts from the file in the libdir.	1269	* Builds up the lists of artifacts from the file in the libdir.
1339	*/	1270	*/
1340
1341	void	1271	void
1342	init_artifacts (void)	1272	init_artifacts (void)
1343	{	1273	{
1344	static int has_been_inited = 0;	1274	static int has_been_inited = 0;
1345	char filename[MAX_BUF], buf[HUGE_BUF], cp, next;	1275	char filename[MAX_BUF];
1346	artifact *art = NULL;	1276	artifact *art = NULL;
1347	linked_char *tmp;
1348	int value;
1349	artifactlist *al;	1277	artifactlist *al;
1350		1278
1351	if (has_been_inited)	1279	if (has_been_inited)
1352	return;	1280	return;
1353	else	1281	else
1354	has_been_inited = 1;	1282	has_been_inited = 1;
1355		1283
1356	sprintf (filename, "%s/artifacts", settings.datadir);	1284	sprintf (filename, "%s/artifacts", settings.datadir);
1357	object_thawer thawer (filename);	1285	object_thawer f (filename);
1358		1286
1359	if (!thawer)	1287	if (!f)
1360	return;	1288	return;
1361		1289
1362	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1290	f.next ();
1363	{
1364	if (*buf == '#')
1365	continue;
1366	if ((cp = strchr (buf, '\n')) != NULL)
1367	*cp = '\0';
1368	cp = buf;
1369	while (cp == ' ') / Skip blanks */
1370	cp++;
1371	if (*cp == '\0')
1372	continue;
1373		1291
1374	if (!strncmp (cp, "Allowed", 7))	1292	for (;;)
		1293	{
		1294	switch (f.kw)
1375	{	1295	{
		1296	case KW_allowed:
1376	if (art == NULL)	1297	if (!art)
		1298	art = get_empty_artifact ();
		1299
1377	{	1300	{
1378	art = get_empty_artifact ();	1301	if (!strcmp (f.get_str (), "all"))
1379	nrofartifacts++;	1302	break;
		1303
		1304	char next, cp = f.get_str ();
		1305
		1306	do
		1307	{
		1308	if ((next = strchr (cp, ',')))
		1309	*next++ = '\0';
		1310
		1311	linked_char *tmp = new linked_char;
		1312
		1313	tmp->name = cp;
		1314	tmp->next = art->allowed;
		1315	art->allowed = tmp;
		1316	}
		1317	while ((cp = next));
1380	}	1318	}
1381	cp = strchr (cp, ' ') + 1;	1319	break;
1382	if (!strcmp (cp, "all"))	1320
		1321	case KW_chance:
		1322	f.get (art->chance);
		1323	break;
		1324
		1325	case KW_difficulty:
		1326	f.get (art->difficulty);
		1327	break;
		1328
		1329	case KW_object:
		1330	{
		1331	art->item = object::create ();
		1332
		1333	if (!art->item->parse_kv (f))
		1334	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1335
		1336	al = find_artifactlist (art->item->type);
		1337
		1338	if (!al)
		1339	{
		1340	al = get_empty_artifactlist ();
		1341	al->type = art->item->type;
		1342	al->next = first_artifactlist;
		1343	first_artifactlist = al;
		1344	}
		1345
		1346	art->next = al->items;
		1347	al->items = art;
		1348	art = 0;
		1349	}
1383	continue;	1350	continue;
1384		1351
1385	do	1352	case KW_EOF:
		1353	goto done;
		1354
		1355	default:
		1356	if (!f.parse_error ("artifacts file"))
		1357	cleanup ("artifacts file required");
1386	{	1358	break;
1387	nrofallowedstr++;
1388	if ((next = strchr (cp, ',')) != NULL)
1389	*(next++) = '\0';
1390	tmp = new linked_char;
1391
1392	tmp->name = cp;
1393	tmp->next = art->allowed;
1394	art->allowed = tmp;
1395	}
1396	while ((cp = next) != NULL);
1397	}
1398	else if (sscanf (cp, "chance %d", &value))
1399	art->chance = (uint16) value;
1400	else if (sscanf (cp, "difficulty %d", &value))
1401	art->difficulty = (uint8) value;
1402	else if (!strncmp (cp, "Object", 6))
1403	{	1359	}
1404	art->item = object::create ();
1405		1360
1406	if (!load_object (thawer, art->item, 0))	1361	f.next ();
1407	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1408
1409	art->item->name = strchr (cp, ' ') + 1;
1410	al = find_artifactlist (art->item->type);
1411	if (al == NULL)
1412	{
1413	al = get_empty_artifactlist ();
1414	al->type = art->item->type;
1415	al->next = first_artifactlist;
1416	first_artifactlist = al;
1417	}
1418	art->next = al->items;
1419	al->items = art;
1420	art = NULL;
1421	}
1422	else
1423	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1424	}	1362	}
1425		1363
		1364	done:
1426	for (al = first_artifactlist; al != NULL; al = al->next)	1365	for (al = first_artifactlist; al; al = al->next)
1427	{	1366	{
		1367	al->total_chance = 0;
		1368
1428	for (art = al->items; art != NULL; art = art->next)	1369	for (art = al->items; art; art = art->next)
1429	{	1370	{
1430	if (!art->chance)	1371	if (!art->chance)
1431	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1372	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1432	else	1373	else
1433	al->total_chance += art->chance;	1374	al->total_chance += art->chance;
…		…
1438	}	1379	}
1439		1380
1440	LOG (llevDebug, "done.\n");	1381	LOG (llevDebug, "done.\n");
1441	}	1382	}
1442		1383
1443
1444	/*	1384	/*
1445	* Used in artifact generation. The bonuses of the first object	1385	* Used in artifact generation. The bonuses of the first object
1446	* is modified by the bonuses of the second object.	1386	* is modified by the bonuses of the second object.
1447	*/	1387	*/
1448
1449	void	1388	void
1450	add_abilities (object op, object change)	1389	add_abilities (object op, object change)
1451	{	1390	{
1452	int i, tmp;	1391	int i, tmp;
1453		1392
1454	if (change->face != blank_face)	1393	if (change->face != blank_face)
1455	{	1394	{
1456	#ifdef TREASURE_VERBOSE	1395	#ifdef TREASURE_VERBOSE
1457	LOG (llevDebug, "FACE: %d\n", change->face->number);	1396	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1458	#endif	1397	#endif
1459	op->face = change->face;	1398	op->face = change->face;
1460	}	1399	}
1461		1400
1462	for (i = 0; i < NUM_STATS; i++)	1401	for (i = 0; i < NUM_STATS; i++)
…		…
1502		1441
1503	op->set_speed (op->speed);	1442	op->set_speed (op->speed);
1504	}	1443	}
1505		1444
1506	if (change->nrof)	1445	if (change->nrof)
1507	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1446	op->nrof = rndm (change->nrof) + 1;
1508		1447
1509	op->stats.exp += change->stats.exp; /* Speed modifier */	1448	op->stats.exp += change->stats.exp; /* Speed modifier */
1510	op->stats.wc += change->stats.wc;	1449	op->stats.wc += change->stats.wc;
1511	op->stats.ac += change->stats.ac;	1450	op->stats.ac += change->stats.ac;
1512		1451
…		…
1615	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1554	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1616	}	1555	}
1617		1556
1618	op->value *= change->value;	1557	op->value *= change->value;
1619		1558
1620	if (change->material)	1559	if (change->materials)
1621	op->material = change->material;	1560	op->materials = change->materials;
1622		1561
1623	if (change->materialname)	1562	if (change->materialname)
1624	op->materialname = change->materialname;	1563	op->materialname = change->materialname;
1625		1564
1626	if (change->slaying)	1565	if (change->slaying)
…		…
1643	if (art->allowed == (linked_char *) NULL)	1582	if (art->allowed == (linked_char *) NULL)
1644	return 1; /* Ie, "all" */	1583	return 1; /* Ie, "all" */
1645	for (tmp = art->allowed; tmp; tmp = tmp->next)	1584	for (tmp = art->allowed; tmp; tmp = tmp->next)
1646	{	1585	{
1647	#ifdef TREASURE_VERBOSE	1586	#ifdef TREASURE_VERBOSE
1648	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1587	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1649	#endif	1588	#endif
1650	if (*tmp->name == '!')	1589	if (*tmp->name == '!')
1651	name = tmp->name + 1, neg = 1;	1590	name = tmp->name + 1, neg = 1;
1652	else	1591	else
1653	name = tmp->name, neg = 0;	1592	name = tmp->name, neg = 0;
…		…
1720	return;	1659	return;
1721	}	1660	}
1722		1661
1723	for (i = 0; i < ARTIFACT_TRIES; i++)	1662	for (i = 0; i < ARTIFACT_TRIES; i++)
1724	{	1663	{
1725	int roll = RANDOM () % al->total_chance;	1664	int roll = rndm (al->total_chance);
1726		1665
1727	for (art = al->items; art != NULL; art = art->next)	1666	for (art = al->items; art; art = art->next)
1728	{	1667	{
1729	roll -= art->chance;	1668	roll -= art->chance;
1730	if (roll < 0)	1669	if (roll < 0)
1731	break;	1670	break;
1732	}	1671	}
…		…
1748	continue;	1687	continue;
1749		1688
1750	if (!legal_artifact_combination (op, art))	1689	if (!legal_artifact_combination (op, art))
1751	{	1690	{
1752	#ifdef TREASURE_VERBOSE	1691	#ifdef TREASURE_VERBOSE
1753	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1692	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1754	#endif	1693	#endif
1755	continue;	1694	continue;
1756	}	1695	}
		1696
1757	give_artifact_abilities (op, art->item);	1697	give_artifact_abilities (op, art->item);
1758	return;	1698	return;
1759	}	1699	}
1760	}	1700	}
1761		1701
…		…
1805	SET_FLAG (item, FLAG_NO_STEAL);	1745	SET_FLAG (item, FLAG_NO_STEAL);
1806	}	1746	}
1807	}	1747	}
1808		1748
1809	/* special_potion() - so that old potion code is still done right. */	1749	/* special_potion() - so that old potion code is still done right. */
1810
1811	int	1750	int
1812	special_potion (object *op)	1751	special_potion (object *op)
1813	{	1752	{
1814	if (op->attacktype)	1753	if (op->attacktype)
1815	return 1;	1754	return 1;
…		…
1825	}	1764	}
1826		1765
1827	void	1766	void
1828	free_treasurestruct (treasure *t)	1767	free_treasurestruct (treasure *t)
1829	{	1768	{
1830	if (t->next)
1831	free_treasurestruct (t->next);	1769	if (t->next) free_treasurestruct (t->next);
1832	if (t->next_yes)
1833	free_treasurestruct (t->next_yes);	1770	if (t->next_yes) free_treasurestruct (t->next_yes);
1834	if (t->next_no)
1835	free_treasurestruct (t->next_no);	1771	if (t->next_no) free_treasurestruct (t->next_no);
1836		1772
1837	delete t;	1773	delete t;
1838	}	1774	}
1839		1775
1840	void	1776	void
…		…
1845		1781
1846	delete lc;	1782	delete lc;
1847	}	1783	}
1848		1784
1849	void	1785	void
1850	free_artifact (artifact * at)	1786	free_artifact (artifact *at)
1851	{	1787	{
1852	if (at->next)
1853	free_artifact (at->next);	1788	if (at->next) free_artifact (at->next);
1854
1855	if (at->allowed)
1856	free_charlinks (at->allowed);	1789	if (at->allowed) free_charlinks (at->allowed);
1857		1790
1858	at->item->destroy (1);	1791	at->item->destroy (1);
1859		1792
1860	delete at;	1793	sfree (at);
1861	}	1794	}
1862		1795
1863	void	1796	void
1864	free_artifactlist (artifactlist * al)	1797	free_artifactlist (artifactlist *al)
1865	{	1798	{
1866	artifactlist *nextal;	1799	artifactlist *nextal;
1867		1800
1868	for (al = first_artifactlist; al; al = nextal)	1801	for (al = first_artifactlist; al; al = nextal)
1869	{	1802	{
1870	nextal = al->next;	1803	nextal = al->next;
1871		1804
1872	if (al->items)	1805	if (al->items)
1873	free_artifact (al->items);	1806	free_artifact (al->items);
1874		1807
1875	free (al);	1808	sfree (al);
1876	}	1809	}
1877	}	1810	}
1878		1811
1879	void	1812	void
1880	free_all_treasures (void)	1813	free_all_treasures (void)
1881	{	1814	{
1882	treasurelist tl, next;	1815	treasurelist tl, next;
1883		1816
1884
1885	for (tl = first_treasurelist; tl != NULL; tl = next)	1817	for (tl = first_treasurelist; tl; tl = next)
1886	{	1818	{
		1819	clear (tl);
		1820
1887	next = tl->next;	1821	next = tl->next;
1888	if (tl->items)
1889	free_treasurestruct (tl->items);
1890	delete tl;	1822	delete tl;
1891	}	1823	}
		1824
1892	free_artifactlist (first_artifactlist);	1825	free_artifactlist (first_artifactlist);
1893	}	1826	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC vs. Revision 1.48 by root, Tue Apr 17 18:40:31 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.34 by root, Sat Jan 20 22:09:51 2007 UTC vs.
Revision 1.48 by root, Tue Apr 17 18:40:31 2007 UTC