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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.47 by root, Tue Apr 17 18:24:30 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your 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 GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
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
25	#define ALLOWED_COMBINATION
26		24
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
		47	typedef std::tr1::unordered_map<
		48	const char *,
		49	treasurelist *,
		50	str_hash,
		51	str_equal,
		52	slice_allocator< std::pair<const char const, treasurelist > >,
		53	true
		54	> tl_map_t;
		55
		56	static tl_map_t tl_map;
46		57
47	/*	58	/*
48	* Initialize global archtype pointers:	59	* Initialize global archtype pointers:
49	*/	60	*/
50
51	void	61	void
52	init_archetype_pointers ()	62	init_archetype_pointers ()
53	{	63	{
54	int prev_warn = warn_archetypes;	64	int prev_warn = warn_archetypes;
55		65
56	warn_archetypes = 1;	66	warn_archetypes = 1;
		67
57	if (ring_arch == NULL)	68	if (ring_arch == NULL)
58	ring_arch = archetype::find ("ring");	69	ring_arch = archetype::find ("ring");
59	if (amulet_arch == NULL)	70	if (amulet_arch == NULL)
60	amulet_arch = archetype::find ("amulet");	71	amulet_arch = archetype::find ("amulet");
61	if (staff_arch == NULL)	72	if (staff_arch == NULL)
62	staff_arch = archetype::find ("staff");	73	staff_arch = archetype::find ("staff");
63	if (crown_arch == NULL)	74	if (crown_arch == NULL)
64	crown_arch = archetype::find ("crown");	75	crown_arch = archetype::find ("crown");
		76
65	warn_archetypes = prev_warn;	77	warn_archetypes = prev_warn;
66	}	78	}
67		79
68	/*	80	/*
69	* Allocate and return the pointer to an empty treasurelist structure.	81	* Searches for the given treasurelist
70	*/	82	*/
71
72	static treasurelist *	83	treasurelist *
73	get_empty_treasurelist (void)	84	treasurelist::find (const char *name)
74	{	85	{
		86	if (!name)
		87	return 0;
		88
		89	auto (i, tl_map.find (name));
		90
		91	if (i == tl_map.end ())
		92	return 0;
		93
		94	return i->second;
		95	}
		96
		97	/*
		98	* Searches for the given treasurelist in the globally linked list
		99	* of treasurelists which has been built by load_treasures().
		100	*/
		101	treasurelist *
		102	treasurelist::get (const char *name)
		103	{
		104	treasurelist *tl = find (name);
		105
		106	if (!tl)
		107	{
75	return new treasurelist;	108	tl = new treasurelist;
76	}
77		109
78	/*	110	tl->name = name;
79	* Allocate and return the pointer to an empty treasure structure.	111	tl->next = first_treasurelist;
80	*/	112	first_treasurelist = tl;
81	//TODO: make this a constructor
82	static treasure *
83	get_empty_treasure (void)
84	{
85	treasure *t = new treasure;
86		113
87	t->chance = 100;	114	tl_map.insert (std::make_pair (tl->name, tl));
		115	}
88		116
89	return t;	117	return tl;
90	}	118	}
		119
		120	//TODO: class method
		121	void
		122	clear (treasurelist *tl)
		123	{
		124	if (tl->items)
		125	{
		126	free_treasurestruct (tl->items);
		127	tl->items = 0;
		128	}
		129
		130	tl->total_chance = 0;
		131	}
		132
		133	#ifdef TREASURE_DEBUG
		134	/* recursived checks the linked list. Treasurelist is passed only
		135	* so that the treasure name can be printed out
		136	*/
		137	static void
		138	check_treasurelist (const treasure t, const treasurelist tl)
		139	{
		140	if (t->chance >= 100 && t->next_yes && (t->next \|\| t->next_no))
		141	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		142
		143	if (t->next)
		144	check_treasurelist (t->next, tl);
		145
		146	if (t->next_yes)
		147	check_treasurelist (t->next_yes, tl);
		148
		149	if (t->next_no)
		150	check_treasurelist (t->next_no, tl);
		151	}
		152	#endif
91		153
92	/*	154	/*
93	* Reads the lib/treasure file from disk, and parses the contents	155	* Reads the lib/treasure file from disk, and parses the contents
94	* into an internal treasure structure (very linked lists)	156	* into an internal treasure structure (very linked lists)
95	*/	157	*/
96
97	static treasure *	158	static treasure *
98	load_treasure (FILE * fp, int *line)	159	read_treasure (object_thawer &f)
99	{	160	{
100	char buf[MAX_BUF], *cp, variable[MAX_BUF];
101	treasure *t = get_empty_treasure ();	161	treasure *t = new treasure;
102	int value;
103		162
104	nroftreasures++;	163	f.next ();
105	while (fgets (buf, MAX_BUF, fp) != NULL)
106	{
107	(*line)++;
108		164
109	if (*buf == '#')	165	for (;;)
110	continue;	166	{
111	if ((cp = strchr (buf, '\n')) != NULL)	167	coroapi::cede_to_tick_every (10);
112	*cp = '\0';
113	cp = buf;
114	while (isspace (cp)) / Skip blanks */
115	cp++;
116		168
117	if (sscanf (cp, "arch %s", variable))	169	switch (f.kw)
118	{
119	if ((t->item = archetype::find (variable)) == NULL)
120	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121	}	170	{
122	else if (sscanf (cp, "list %s", variable))	171	case KW_arch:
123	t->name = variable;	172	if (!(t->item = archetype::find (f.get_str ())))
124	else if (sscanf (cp, "change_name %s", variable))	173	LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
125	t->change_arch.name = variable;	174	break;
126	else if (sscanf (cp, "change_title %s", variable))	175
127	t->change_arch.title = variable;	176	case KW_list: f.get (t->name); break;
128	else if (sscanf (cp, "change_slaying %s", variable))	177	case KW_change_name: f.get (t->change_arch.name); break;
129	t->change_arch.slaying = variable;	178	case KW_change_title: f.get (t->change_arch.title); break;
130	else if (sscanf (cp, "chance %d", &value))	179	case KW_change_slaying: f.get (t->change_arch.slaying); break;
131	t->chance = (uint8) value;	180	case KW_chance: f.get (t->chance); break;
132	else if (sscanf (cp, "nrof %d", &value))	181	case KW_nrof: f.get (t->nrof); break;
133	t->nrof = (uint16) value;	182	case KW_magic: f.get (t->magic); break;
134	else if (sscanf (cp, "magic %d", &value))	183
135	t->magic = (uint8) value;	184	case KW_yes: t->next_yes = read_treasure (f); continue;
136	else if (!strcmp (cp, "yes"))	185	case KW_no: t->next_no = read_treasure (f); continue;
137	t->next_yes = load_treasure (fp, line);	186
138	else if (!strcmp (cp, "no"))	187	case KW_end:
139	t->next_no = load_treasure (fp, line);	188	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;	189	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		190
154	#ifdef TREASURE_DEBUG	191	case KW_more:
		192	t->next = read_treasure (f);
		193	return t;
155		194
156	/* recursived checks the linked list. Treasurelist is passed only	195	default:
157	* so that the treasure name can be printed out	196	if (!f.parse_error ("treasurelist", t->name))
158	*/	197	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		198
		199	return t;
		200	}
		201
		202	f.next ();
		203	}
		204	}
		205
176	/*	206	/*
177	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
178	* Each treasure is parsed with the help of load_treasure().	207	* Each treasure is parsed with the help of load_treasure().
179	*/	208	*/
180		209	treasurelist *
181	void	210	treasurelist::read (object_thawer &f)
182	load_treasures (void)
183	{	211	{
184	FILE *fp;	212	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		213
190	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	214	bool one = f.kw == KW_treasureone;
191	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	215	treasurelist *tl = treasurelist::get (f.get_str ());
192	{	216	clear (tl);
193	LOG (llevError, "Can't open treasure file.\n");	217	tl->items = read_treasure (f);
		218	if (!tl->items)
194	return;	219	return 0;
195	}
196	while (fgets (buf, MAX_BUF, fp) != NULL)
197	{
198	line++;
199	if (*buf == '#')
200	continue;
201		220
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.	221	/* 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	222	* Add up the chance total, and check to make sure the yes & no
216	* fields of the treasures are not being used.	223	* fields of the treasures are not being used.
217	*/	224	*/
218	if (!strncmp (buf, "treasureone", 11))	225	tl->total_chance = 0;
		226
		227	if (one)
		228	{
		229	for (treasure *t = tl->items; t; t = t->next)
		230	{
		231	if (t->next_yes \|\| t->next_no)
219	{	232	{
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);	233	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");	234	LOG (llevError, " the next_yes or next_no field is set\n");
227	}
228	#endif
229	tl->total_chance += t->chance;
230	}
231	}	235	}
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		236
238	#ifdef TREASURE_DEBUG	237	tl->total_chance += t->chance;
239	/* Perform some checks on how valid the treasure data actually is.	238	}
240	* verify that list transitions work (ie, the list that it is supposed	239	}
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		240
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;	241	return tl;
270	}	242	}
271
272		243
273	/*	244	/*
274	* Generates the objects specified by the given treasure.	245	* Generates the objects specified by the given treasure.
275	* It goes recursively through the rest of the linked list.	246	* It goes recursively through the rest of the linked list.
276	* If there is a certain percental chance for a treasure to be generated,	247	* If there is a certain percental chance for a treasure to be generated,
326		297
327	if (t->change_arch.slaying)	298	if (t->change_arch.slaying)
328	op->slaying = t->change_arch.slaying;	299	op->slaying = t->change_arch.slaying;
329	}	300	}
330		301
331	void	302	static void
332	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)	303	create_all_treasures (treasure t, object op, int flag, int difficulty, int tries)
333	{	304	{
334	object *tmp;
335
336	if ((int) t->chance >= 100 \|\| (RANDOM () % 100 + 1) < (int) t->chance)	305	if ((int) t->chance >= 100 \|\| (rndm (100) + 1) < (int) t->chance)
337	{	306	{
338	if (t->name)	307	if (t->name)
339	{	308	{
340	if (difficulty >= t->magic)	309	if (difficulty >= t->magic)
341	{
342	treasurelist *tl = find_treasurelist (t->name);	310	if (treasurelist *tl = treasurelist::find (t->name))
343	if (tl)
344	create_treasure (tl, op, flag, difficulty, tries);	311	create_treasure (tl, op, flag, difficulty, tries);
345	}	312	else
		313	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
346	}	314	}
347	else	315	else
348	{	316	{
349	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))	317	if (t->item && (t->item->clone.invisible != 0 \|\| !(flag & GT_INVISIBLE)))
350	{	318	{
351	tmp = arch_to_object (t->item);	319	object *tmp = arch_to_object (t->item);
		320
352	if (t->nrof && tmp->nrof <= 1)	321	if (t->nrof && tmp->nrof <= 1)
353	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	322	tmp->nrof = rndm (t->nrof) + 1;
		323
354	fix_generated_item (tmp, op, difficulty, t->magic, flag);	324	fix_generated_item (tmp, op, difficulty, t->magic, flag);
355	change_treasure (t, tmp);	325	change_treasure (t, tmp);
356	put_treasure (tmp, op, flag);	326	put_treasure (tmp, op, flag);
357	}	327	}
358	}	328	}
359		329
360	if (t->next_yes != NULL)	330	if (t->next_yes)
361	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	331	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
362	}	332	}
363	else if (t->next_no != NULL)	333	else if (t->next_no)
364	create_all_treasures (t->next_no, op, flag, difficulty, tries);	334	create_all_treasures (t->next_no, op, flag, difficulty, tries);
365		335
366	if (t->next != NULL)	336	if (t->next)
367	create_all_treasures (t->next, op, flag, difficulty, tries);	337	create_all_treasures (t->next, op, flag, difficulty, tries);
368	}	338	}
369		339
370	void	340	static void
371	create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries)	341	create_one_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
372	{	342	{
373	int value = RANDOM () % tl->total_chance;	343	int value = rndm (tl->total_chance);
374	treasure *t;	344	treasure *t;
375		345
376	if (tries++ > 100)	346	if (tries++ > 100)
377	{	347	{
378	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	348	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
379	return;	349	return;
380	}	350	}
381		351
382	for (t = tl->items; t != NULL; t = t->next)	352	for (t = tl->items; t; t = t->next)
383	{	353	{
384	value -= t->chance;	354	value -= t->chance;
385		355
386	if (value < 0)	356	if (value < 0)
387	break;	357	break;
388	}	358	}
389		359
390	if (!t \|\| value >= 0)	360	if (!t \|\| value >= 0)
391	{
392	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	361	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
393	abort ();
394	return;
395	}
396		362
397	if (t->name)	363	if (t->name)
398	{	364	{
399	if (difficulty >= t->magic)	365	if (difficulty >= t->magic)
400	{	366	{
401	treasurelist *tl = find_treasurelist (t->name);	367	treasurelist *tl = treasurelist::find (t->name);
402	if (tl)	368	if (tl)
403	create_treasure (tl, op, flag, difficulty, tries);	369	create_treasure (tl, op, flag, difficulty, tries);
404	}	370	}
405	else if (t->nrof)	371	else if (t->nrof)
406	create_one_treasure (tl, op, flag, difficulty, tries);	372	create_one_treasure (tl, op, flag, difficulty, tries);
407
408	return;
409	}	373	}
410
411	if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	374	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))
412	{	375	{
413	object *tmp = arch_to_object (t->item);	376	if (object *tmp = arch_to_object (t->item))
414		377	{
415	if (!tmp)
416	return;
417
418	if (t->nrof && tmp->nrof <= 1)	378	if (t->nrof && tmp->nrof <= 1)
419	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	379	tmp->nrof = rndm (t->nrof) + 1;
420		380
421	fix_generated_item (tmp, op, difficulty, t->magic, flag);	381	fix_generated_item (tmp, op, difficulty, t->magic, flag);
422	change_treasure (t, tmp);	382	change_treasure (t, tmp);
423	put_treasure (tmp, op, flag);	383	put_treasure (tmp, op, flag);
		384	}
424	}	385	}
425	}	386	}
426		387
427	/* This calls the appropriate treasure creation function. tries is passed	388	/* This calls the appropriate treasure creation function. tries is passed
428	* to determine how many list transitions or attempts to create treasure	389	* to determine how many list transitions or attempts to create treasure
…		…
432	* to do that.	393	* to do that.
433	*/	394	*/
434	void	395	void
435	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)	396	create_treasure (treasurelist tl, object op, int flag, int difficulty, int tries)
436	{	397	{
		398	// empty treasurelists are legal
		399	if (!tl->items)
		400	return;
437		401
438	if (tries++ > 100)	402	if (tries++ > 100)
439	{	403	{
440	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	404	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441	return;	405	return;
442	}	406	}
		407
443	if (tl->total_chance)	408	if (tl->total_chance)
444	create_one_treasure (tl, op, flag, difficulty, tries);	409	create_one_treasure (tl, op, flag, difficulty, tries);
445	else	410	else
446	create_all_treasures (tl->items, op, flag, difficulty, tries);	411	create_all_treasures (tl->items, op, flag, difficulty, tries);
447	}	412	}
…		…
479	* magical bonus "wanted".	444	* magical bonus "wanted".
480	*/	445	*/
481		446
482	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	447	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
483		448
484	/chance of magic difficulty/	449	// chance of magic difficulty
485
486	/* +0 +1 +2 +3 +4 */	450	// +0 +1 +2 +3 +4
487	{95, 2, 2, 1, 0}, /1 /	451	{95, 2, 2, 1, 0}, // 1
488	{92, 5, 2, 1, 0}, /2 /	452	{92, 5, 2, 1, 0}, // 2
489	{85, 10, 4, 1, 0}, /3 /	453	{85, 10, 4, 1, 0}, // 3
490	{80, 14, 4, 2, 0}, /4 /	454	{80, 14, 4, 2, 0}, // 4
491	{75, 17, 5, 2, 1}, /5 /	455	{75, 17, 5, 2, 1}, // 5
492	{70, 18, 8, 3, 1}, /6 /	456	{70, 18, 8, 3, 1}, // 6
493	{65, 21, 10, 3, 1}, /7 /	457	{65, 21, 10, 3, 1}, // 7
494	{60, 22, 12, 4, 2}, /8 /	458	{60, 22, 12, 4, 2}, // 8
495	{55, 25, 14, 4, 2}, /9 /	459	{55, 25, 14, 4, 2}, // 9
496	{50, 27, 16, 5, 2}, /10 /	460	{50, 27, 16, 5, 2}, // 10
497	{45, 28, 18, 6, 3}, /11 /	461	{45, 28, 18, 6, 3}, // 11
498	{42, 28, 20, 7, 3}, /12 /	462	{42, 28, 20, 7, 3}, // 12
499	{40, 27, 21, 8, 4}, /13 /	463	{40, 27, 21, 8, 4}, // 13
500	{38, 25, 22, 10, 5}, /14 /	464	{38, 25, 22, 10, 5}, // 14
501	{36, 23, 23, 12, 6}, /15 /	465	{36, 23, 23, 12, 6}, // 15
502	{33, 21, 24, 14, 8}, /16 /	466	{33, 21, 24, 14, 8}, // 16
503	{31, 19, 25, 16, 9}, /17 /	467	{31, 19, 25, 16, 9}, // 17
504	{27, 15, 30, 18, 10}, /18 /	468	{27, 15, 30, 18, 10}, // 18
505	{20, 12, 30, 25, 13}, /19 /	469	{20, 12, 30, 25, 13}, // 19
506	{15, 10, 28, 30, 17}, /20 /	470	{15, 10, 28, 30, 17}, // 20
507	{13, 9, 27, 28, 23}, /21 /	471	{13, 9, 27, 28, 23}, // 21
508	{10, 8, 25, 28, 29}, /22 /	472	{10, 8, 25, 28, 29}, // 22
509	{8, 7, 23, 26, 36}, /23 /	473	{ 8, 7, 23, 26, 36}, // 23
510	{6, 6, 20, 22, 46}, /24 /	474	{ 6, 6, 20, 22, 46}, // 24
511	{4, 5, 17, 18, 56}, /25 /	475	{ 4, 5, 17, 18, 56}, // 25
512	{2, 4, 12, 14, 68}, /26 /	476	{ 2, 4, 12, 14, 68}, // 26
513	{0, 3, 7, 10, 80}, /27 /	477	{ 0, 3, 7, 10, 80}, // 27
514	{0, 0, 3, 7, 90}, /28 /	478	{ 0, 0, 3, 7, 90}, // 28
515	{0, 0, 0, 3, 97}, /29 /	479	{ 0, 0, 0, 3, 97}, // 29
516	{0, 0, 0, 0, 100}, /30 /	480	{ 0, 0, 0, 0, 100}, // 30
517	{0, 0, 0, 0, 100}, /31 /	481	{ 0, 0, 0, 0, 100}, // 31
518	};	482	};
519		483
520		484
521	/* calculate the appropriate level for wands staves and scrolls.	485	/* calculate the appropriate level for wands staves and scrolls.
522	* This code presumes that op has had its spell object created (in op->inv)	486	* This code presumes that op has had its spell object created (in op->inv)
…		…
555	* elmex Thu Aug 10 18:45:44 CEST 2006:	519	* elmex Thu Aug 10 18:45:44 CEST 2006:
556	* Scaling difficulty by max_level, as difficulty is a level and not some	520	* Scaling difficulty by max_level, as difficulty is a level and not some
557	* weird integer between 1-31.	521	* weird integer between 1-31.
558	*	522	*
559	*/	523	*/
560
561	int	524	int
562	magic_from_difficulty (int difficulty)	525	magic_from_difficulty (int difficulty)
563	{	526	{
564	int percent = 0, magic = 0;	527	int percent = 0, magic = 0;
565	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	528	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
570	scaled_diff = 0;	533	scaled_diff = 0;
571		534
572	if (scaled_diff >= DIFFLEVELS)	535	if (scaled_diff >= DIFFLEVELS)
573	scaled_diff = DIFFLEVELS - 1;	536	scaled_diff = DIFFLEVELS - 1;
574		537
575	percent = RANDOM () % 100;	538	percent = rndm (100);
576		539
577	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	540	for (magic = 0; magic < (MAXMAGIC + 1); magic++)
578	{	541	{
579	percent -= difftomagic_list[scaled_diff][magic];	542	percent -= difftomagic_list[scaled_diff][magic];
580		543
…		…
586	{	549	{
587	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	550	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
588	magic = 0;	551	magic = 0;
589	}	552	}
590		553
591	magic = (RANDOM () % 3) ? magic : -magic;	554	magic = (rndm (3)) ? magic : -magic;
592	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	555	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
593		556
594	return magic;	557	return magic;
595	}	558	}
596		559
…		…
611	if (op->arch)	574	if (op->arch)
612	{	575	{
613	if (op->type == ARMOUR)	576	if (op->type == ARMOUR)
614	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	577	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
615		578
616	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	579	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
617	magic = (-magic);	580	magic = (-magic);
618	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	581	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
619	}	582	}
620	else	583	else
621	{	584	{
622	if (op->type == ARMOUR)	585	if (op->type == ARMOUR)
623	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	586	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
624	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	587	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
625	magic = (-magic);	588	magic = (-magic);
626	op->weight = (op->weight * (100 - magic * 10)) / 100;	589	op->weight = (op->weight * (100 - magic * 10)) / 100;
627	}	590	}
628	}	591	}
629		592
…		…
653	* 1) Since rings can have multiple bonuses, if the same bonus	616	* 1) Since rings can have multiple bonuses, if the same bonus
654	* is rolled again, increase it - the bonuses now stack with	617	* is rolled again, increase it - the bonuses now stack with
655	* other bonuses previously rolled and ones the item might natively have.	618	* other bonuses previously rolled and ones the item might natively have.
656	* 2) Add code to deal with new PR method.	619	* 2) Add code to deal with new PR method.
657	*/	620	*/
658
659	void	621	void
660	set_ring_bonus (object *op, int bonus)	622	set_ring_bonus (object *op, int bonus)
661	{	623	{
662		624
663	int r = RANDOM () % (bonus > 0 ? 25 : 11);	625	int r = rndm (bonus > 0 ? 25 : 11);
664		626
665	if (op->type == AMULET)	627	if (op->type == AMULET)
666	{	628	{
667	if (!(RANDOM () % 21))	629	if (!(rndm (21)))
668	r = 20 + RANDOM () % 2;	630	r = 20 + rndm (2);
669	else	631	else
670	{	632	{
671	if (RANDOM () & 2)	633	if (rndm (2))
672	r = 10;	634	r = 10;
673	else	635	else
674	r = 11 + RANDOM () % 9;	636	r = 11 + rndm (9);
675	}	637	}
676	}	638	}
677		639
678	switch (r)	640	switch (r)
679	{	641	{
…		…
716	case 16:	678	case 16:
717	case 17:	679	case 17:
718	case 18:	680	case 18:
719	case 19:	681	case 19:
720	{	682	{
721	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	683	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
722		684
723	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	685	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
724	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	686	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
725		687
726	/* Cursed items need to have higher negative values to equal out with	688	/* Cursed items need to have higher negative values to equal out with
727	* positive values for how protections work out. Put another	689	* positive values for how protections work out. Put another
728	* little random element in since that they don't always end up with	690	* little random element in since that they don't always end up with
729	* even values.	691	* even values.
730	*/	692	*/
731	if (bonus < 0)	693	if (bonus < 0)
732	val = 2 * -val - RANDOM () % b;	694	val = 2 * -val - rndm (b);
733	if (val > 35)	695	if (val > 35)
734	val = 35; /* Upper limit */	696	val = 35; /* Upper limit */
735	b = 0;	697	b = 0;
		698
736	while (op->resist[resist_table[resist]] != 0 && b < 4)	699	while (op->resist[resist_table[resist]] != 0 && b < 4)
737	{
738	resist = RANDOM () % num_resist_table;	700	resist = rndm (num_resist_table);
739	}	701
740	if (b == 4)	702	if (b == 4)
741	return; /* Not able to find a free resistance */	703	return; /* Not able to find a free resistance */
		704
742	op->resist[resist_table[resist]] = val;	705	op->resist[resist_table[resist]] = val;
743	/* We should probably do something more clever here to adjust value	706	/* We should probably do something more clever here to adjust value
744	* based on how good a resistance we gave.	707	* based on how good a resistance we gave.
745	*/	708	*/
746	break;	709	break;
…		…
774	case 22:	737	case 22:
775	op->stats.exp += bonus; /* Speed! */	738	op->stats.exp += bonus; /* Speed! */
776	op->value = (op->value * 2) / 3;	739	op->value = (op->value * 2) / 3;
777	break;	740	break;
778	}	741	}
		742
779	if (bonus > 0)	743	if (bonus > 0)
780	op->value = 2 bonus;	744	op->value = 2 bonus;
781	else	745	else
782	op->value = -(op->value * 2 * bonus) / 3;	746	op->value = -(op->value * 2 * bonus) / 3;
783	}	747	}
…		…
788	* higher is the chance of returning a low number.	752	* higher is the chance of returning a low number.
789	* It is only used in fix_generated_treasure() to set bonuses on	753	* It is only used in fix_generated_treasure() to set bonuses on
790	* rings and amulets.	754	* rings and amulets.
791	* Another scheme is used to calculate the magic of weapons and armours.	755	* Another scheme is used to calculate the magic of weapons and armours.
792	*/	756	*/
793
794	int	757	int
795	get_magic (int diff)	758	get_magic (int diff)
796	{	759	{
797	int i;	760	int i;
798		761
799	if (diff < 3)	762	if (diff < 3)
800	diff = 3;	763	diff = 3;
		764
801	for (i = 0; i < 4; i++)	765	for (i = 0; i < 4; i++)
802	if (RANDOM () % diff)	766	if (rndm (diff))
803	return i;	767	return i;
		768
804	return 4;	769	return 4;
805	}	770	}
806		771
807	#define DICE2 (get_magic(2)==2?2:1)	772	#define DICE2 (get_magic(2)==2?2:1)
808	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	773	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
809		774
810	/*	775	/*
811	* fix_generated_item(): This is called after an item is generated, in	776	* fix_generated_item(): This is called after an item is generated, in
812	* order to set it up right. This produced magical bonuses, puts spells	777	* order to set it up right. This produced magical bonuses, puts spells
813	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	778	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
…		…
827	* value.	792	* value.
828	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	793	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
829	* a working object - don't change magic, value, etc, but set it material	794	* a working object - don't change magic, value, etc, but set it material
830	* type as appropriate, for objects that need spell objects, set those, etc	795	* type as appropriate, for objects that need spell objects, set those, etc
831	*/	796	*/
832
833	void	797	void
834	fix_generated_item (object op, object creator, int difficulty, int max_magic, int flags)	798	fix_generated_item (object op, object creator, int difficulty, int max_magic, int flags)
835	{	799	{
836	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	800	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
837		801
…		…
844		808
845	if (op->randomitems && op->type != SPELL)	809	if (op->randomitems && op->type != SPELL)
846	{	810	{
847	create_treasure (op->randomitems, op, flags, difficulty, 0);	811	create_treasure (op->randomitems, op, flags, difficulty, 0);
848	if (!op->inv)	812	if (!op->inv)
849	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);	813	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
850		814
851	/* So the treasure doesn't get created again */	815	/* So the treasure doesn't get created again */
852	op->randomitems = NULL;	816	op->randomitems = 0;
853	}	817	}
854		818
855	if (difficulty < 1)	819	if (difficulty < 1)
856	difficulty = 1;	820	difficulty = 1;
857		821
…		…
874	if (!op->magic && max_magic)	838	if (!op->magic && max_magic)
875	set_magic (difficulty, op, max_magic, flags);	839	set_magic (difficulty, op, max_magic, flags);
876		840
877	num_enchantments = calc_item_power (op, 1);	841	num_enchantments = calc_item_power (op, 1);
878		842
879	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) \|\| op->type == HORN \|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	843	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
		844	\|\| op->type == HORN
		845	\|\| difficulty >= settings.max_level) /* high difficulties always generate an artifact,
880	* used for shop_floors or treasures */	846	* used for shop_floors or treasures */
881	generate_artifact (op, difficulty);	847	generate_artifact (op, difficulty);
882	}	848	}
883		849
884	/* Object was made an artifact. Calculate its item_power rating.	850	/* Object was made an artifact. Calculate its item_power rating.
…		…
942	case WEAPON:	908	case WEAPON:
943	case ARMOUR:	909	case ARMOUR:
944	case SHIELD:	910	case SHIELD:
945	case HELMET:	911	case HELMET:
946	case CLOAK:	912	case CLOAK:
947	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	913	if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
948	set_ring_bonus (op, -DICE2);	914	set_ring_bonus (op, -DICE2);
949	break;	915	break;
950		916
951	case BRACERS:	917	case BRACERS:
952	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	918	if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
953	{	919	{
954	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	920	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
955	if (!QUERY_FLAG (op, FLAG_CURSED))	921	if (!QUERY_FLAG (op, FLAG_CURSED))
956	op->value *= 3;	922	op->value *= 3;
957	}	923	}
…		…
983	*/	949	*/
984	if (op->inv && op->randomitems)	950	if (op->inv && op->randomitems)
985	{	951	{
986	/* value multiplier is same as for scrolls */	952	/* value multiplier is same as for scrolls */
987	op->value = (op->value * op->inv->value);	953	op->value = (op->value * op->inv->value);
988	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	954	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
989	}	955	}
990	else	956	else
991	{	957	{
992	op->name = "potion";	958	op->name = "potion";
993	op->name_pl = "potions";	959	op->name_pl = "potions";
994	}	960	}
995		961
996	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	962	if (!(flags & GT_ONLY_GOOD) && rndm (2))
997	SET_FLAG (op, FLAG_CURSED);	963	SET_FLAG (op, FLAG_CURSED);
998	break;	964	break;
999	}	965	}
1000		966
1001	case AMULET:	967	case AMULET:
…		…
1011	}	977	}
1012		978
1013	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	979	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1014	break;	980	break;
1015		981
1016	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	982	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1017	SET_FLAG (op, FLAG_CURSED);	983	SET_FLAG (op, FLAG_CURSED);
1018		984
1019	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	985	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1020		986
1021	if (op->type != RING) /* Amulets have only one ability */	987	if (op->type != RING) /* Amulets have only one ability */
1022	break;	988	break;
1023		989
1024	if (!(RANDOM () % 4))	990	if (!(rndm (4)))
1025	{	991	{
1026	int d = (RANDOM () % 2 \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	992	int d = (rndm (2) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1027		993
1028	if (d > 0)	994	if (d > 0)
1029	op->value *= 3;	995	op->value *= 3;
1030		996
1031	set_ring_bonus (op, d);	997	set_ring_bonus (op, d);
1032		998
1033	if (!(RANDOM () % 4))	999	if (!(rndm (4)))
1034	{	1000	{
1035	int d = (RANDOM () % 3 \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1001	int d = (rndm (3) \|\| QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1036		1002
1037	if (d > 0)	1003	if (d > 0)
1038	op->value *= 5;	1004	op->value *= 5;
1039	set_ring_bonus (op, d);	1005	set_ring_bonus (op, d);
1040	}	1006	}
1041	}	1007	}
1042		1008
1043	if (GET_ANIM_ID (op))	1009	if (GET_ANIM_ID (op))
1044	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	1010	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1045		1011
1046	break;	1012	break;
1047		1013
1048	case BOOK:	1014	case BOOK:
1049	/* Is it an empty book?, if yes lets make a special·	1015	/* Is it an empty book?, if yes lets make a special·
1050	* msg for it, and tailor its properties based on the·	1016	* msg for it, and tailor its properties based on the·
1051	* creator and/or map level we found it on.	1017	* creator and/or map level we found it on.
1052	*/	1018	*/
1053	if (!op->msg && RANDOM () % 10)	1019	if (!op->msg && rndm (10))
1054	{	1020	{
1055	/* set the book level properly */	1021	/* set the book level properly */
1056	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))	1022	if (creator->level == 0 \|\| QUERY_FLAG (creator, FLAG_ALIVE))
1057	{	1023	{
1058	if (op->map && op->map->difficulty)	1024	if (op->map && op->map->difficulty)
1059	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1025	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1060	else	1026	else
1061	op->level = RANDOM () % 20 + 1;	1027	op->level = rndm (20) + 1;
1062	}	1028	}
1063	else	1029	else
1064	op->level = RANDOM () % creator->level;	1030	op->level = rndm (creator->level);
1065		1031
1066	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1032	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1067	/* books w/ info are worth more! */	1033	/* books w/ info are worth more! */
1068	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1034	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1069	/* creator related stuff */	1035	/* creator related stuff */
…		…
1168	*/	1134	*/
1169		1135
1170	/*	1136	/*
1171	* Allocate and return the pointer to an empty artifactlist structure.	1137	* Allocate and return the pointer to an empty artifactlist structure.
1172	*/	1138	*/
1173
1174	static artifactlist *	1139	static artifactlist *
1175	get_empty_artifactlist (void)	1140	get_empty_artifactlist (void)
1176	{	1141	{
1177	artifactlist al = (artifactlist ) malloc (sizeof (artifactlist));	1142	return salloc0 <artifactlist> ();
1178
1179	if (al == NULL)
1180	fatal (OUT_OF_MEMORY);
1181	al->next = NULL;
1182	al->items = NULL;
1183	al->total_chance = 0;
1184	return al;
1185	}	1143	}
1186		1144
1187	/*	1145	/*
1188	* Allocate and return the pointer to an empty artifact structure.	1146	* Allocate and return the pointer to an empty artifact structure.
1189	*/	1147	*/
1190
1191	static artifact *	1148	static artifact *
1192	get_empty_artifact (void)	1149	get_empty_artifact (void)
1193	{	1150	{
1194	artifact a = (artifact ) malloc (sizeof (artifact));	1151	return salloc0 <artifact> ();
1195
1196	if (a == NULL)
1197	fatal (OUT_OF_MEMORY);
1198	a->item = NULL;
1199	a->next = NULL;
1200	a->chance = 0;
1201	a->difficulty = 0;
1202	a->allowed = NULL;
1203	return a;
1204	}	1152	}
1205		1153
1206	/*	1154	/*
1207	* Searches the artifact lists and returns one that has the same type	1155	* Searches the artifact lists and returns one that has the same type
1208	* of objects on it.	1156	* of objects on it.
1209	*/	1157	*/
1210
1211	artifactlist *	1158	artifactlist *
1212	find_artifactlist (int type)	1159	find_artifactlist (int type)
1213	{	1160	{
1214	artifactlist *al;
1215
1216	for (al = first_artifactlist; al != NULL; al = al->next)	1161	for (artifactlist *al = first_artifactlist; al; al = al->next)
1217	if (al->type == type)	1162	if (al->type == type)
1218	return al;	1163	return al;
		1164
1219	return NULL;	1165	return 0;
1220	}	1166	}
1221		1167
1222	/*	1168	/*
1223	* For debugging purposes. Dumps all tables.	1169	* For debugging purposes. Dumps all tables.
1224	*/	1170	*/
1225
1226	void	1171	void
1227	dump_artifacts (void)	1172	dump_artifacts (void)
1228	{	1173	{
1229	artifactlist *al;	1174	artifactlist *al;
1230	artifact *art;	1175	artifact *art;
…		…
1237	for (art = al->items; art != NULL; art = art->next)	1182	for (art = al->items; art != NULL; art = art->next)
1238	{	1183	{
1239	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);	1184	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1240	if (art->allowed != NULL)	1185	if (art->allowed != NULL)
1241	{	1186	{
1242	fprintf (logfile, "\tAllowed combinations:");	1187	fprintf (logfile, "\tallowed combinations:");
1243	for (next = art->allowed; next != NULL; next = next->next)	1188	for (next = art->allowed; next != NULL; next = next->next)
1244	fprintf (logfile, "%s,", &next->name);	1189	fprintf (logfile, "%s,", &next->name);
1245	fprintf (logfile, "\n");	1190	fprintf (logfile, "\n");
1246	}	1191	}
1247	}	1192	}
…		…
1258	treasurelist *tl;	1203	treasurelist *tl;
1259	int i;	1204	int i;
1260		1205
1261	if (depth > 100)	1206	if (depth > 100)
1262	return;	1207	return;
		1208
1263	while (t)	1209	while (t)
1264	{	1210	{
1265	if (t->name)	1211	if (t->name)
1266	{	1212	{
1267	for (i = 0; i < depth; i++)	1213	for (i = 0; i < depth; i++)
1268	fprintf (logfile, " ");	1214	fprintf (logfile, " ");
		1215
1269	fprintf (logfile, "{ (list: %s)\n", &t->name);	1216	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1217
1270	tl = find_treasurelist (t->name);	1218	tl = treasurelist::find (t->name);
1271	if (tl)	1219	if (tl)
1272	dump_monster_treasure_rec (name, tl->items, depth + 2);	1220	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1221
1273	for (i = 0; i < depth; i++)	1222	for (i = 0; i < depth; i++)
1274	fprintf (logfile, " ");	1223	fprintf (logfile, " ");
		1224
1275	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1225	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1276	}	1226	}
1277	else	1227	else
1278	{	1228	{
1279	for (i = 0; i < depth; i++)	1229	for (i = 0; i < depth; i++)
1280	fprintf (logfile, " ");	1230	fprintf (logfile, " ");
		1231
1281	if (t->item && t->item->clone.type == FLESH)	1232	if (t->item && t->item->clone.type == FLESH)
1282	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1233	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1283	else	1234	else
1284	fprintf (logfile, "%s\n", &t->item->clone.name);	1235	fprintf (logfile, "%s\n", &t->item->clone.name);
1285	}	1236	}
1286		1237
1287	if (t->next_yes)	1238	if (t->next_yes)
1288	{	1239	{
1289	for (i = 0; i < depth; i++)	1240	for (i = 0; i < depth; i++)
1290	fprintf (logfile, " ");	1241	fprintf (logfile, " ");
		1242
1291	fprintf (logfile, " (if yes)\n");	1243	fprintf (logfile, " (if yes)\n");
1292	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1244	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1293	}	1245	}
1294		1246
1295	if (t->next_no)	1247	if (t->next_no)
1296	{	1248	{
1297	for (i = 0; i < depth; i++)	1249	for (i = 0; i < depth; i++)
1298	fprintf (logfile, " ");	1250	fprintf (logfile, " ");
		1251
1299	fprintf (logfile, " (if no)\n");	1252	fprintf (logfile, " (if no)\n");
1300	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1253	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1301	}	1254	}
1302		1255
1303	t = t->next;	1256	t = t->next;
…		…
1306		1259
1307	/*	1260	/*
1308	* For debugging purposes. Dumps all treasures for a given monster.	1261	* For debugging purposes. Dumps all treasures for a given monster.
1309	* Created originally by Raphael Quinet for debugging the alchemy code.	1262	* Created originally by Raphael Quinet for debugging the alchemy code.
1310	*/	1263	*/
1311
1312	void	1264	void
1313	dump_monster_treasure (const char *name)	1265	dump_monster_treasure (const char *name)
1314	{	1266	{
1315	archetype *at;	1267	archetype *at;
1316	int found;	1268	int found;
1317		1269
1318	found = 0;	1270	found = 0;
1319	fprintf (logfile, "\n");	1271	fprintf (logfile, "\n");
		1272
1320	for (at = first_archetype; at != NULL; at = at->next)	1273	for (at = first_archetype; at != NULL; at = at->next)
1321	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)	1274	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1322	{	1275	{
1323	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);	1276	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1324	if (at->clone.randomitems != NULL)	1277	if (at->clone.randomitems != NULL)
1325	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);	1278	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1326	else	1279	else
1327	fprintf (logfile, "(nothing)\n");	1280	fprintf (logfile, "(nothing)\n");
		1281
1328	fprintf (logfile, "\n");	1282	fprintf (logfile, "\n");
1329	found++;	1283	found++;
1330	}	1284	}
		1285
1331	if (found == 0)	1286	if (found == 0)
1332	fprintf (logfile, "No objects have the name %s!\n\n", name);	1287	fprintf (logfile, "No objects have the name %s!\n\n", name);
1333	}	1288	}
1334		1289
1335	/*	1290	/*
1336	* Builds up the lists of artifacts from the file in the libdir.	1291	* Builds up the lists of artifacts from the file in the libdir.
1337	*/	1292	*/
1338
1339	void	1293	void
1340	init_artifacts (void)	1294	init_artifacts (void)
1341	{	1295	{
1342	static int has_been_inited = 0;	1296	static int has_been_inited = 0;
1343	char filename[MAX_BUF], buf[HUGE_BUF], cp, next;	1297	char filename[MAX_BUF];
1344	artifact *art = NULL;	1298	artifact *art = NULL;
1345	linked_char *tmp;
1346	int value;
1347	artifactlist *al;	1299	artifactlist *al;
1348		1300
1349	if (has_been_inited)	1301	if (has_been_inited)
1350	return;	1302	return;
1351	else	1303	else
1352	has_been_inited = 1;	1304	has_been_inited = 1;
1353		1305
1354	sprintf (filename, "%s/artifacts", settings.datadir);	1306	sprintf (filename, "%s/artifacts", settings.datadir);
1355	object_thawer thawer (filename);	1307	object_thawer f (filename);
1356		1308
1357	if (!thawer)	1309	if (!f)
1358	return;	1310	return;
1359		1311
1360	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1312	f.next ();
1361	{
1362	if (*buf == '#')
1363	continue;
1364	if ((cp = strchr (buf, '\n')) != NULL)
1365	*cp = '\0';
1366	cp = buf;
1367	while (cp == ' ') / Skip blanks */
1368	cp++;
1369	if (*cp == '\0')
1370	continue;
1371		1313
1372	if (!strncmp (cp, "Allowed", 7))	1314	for (;;)
		1315	{
		1316	switch (f.kw)
1373	{	1317	{
		1318	case KW_allowed:
1374	if (art == NULL)	1319	if (!art)
		1320	art = get_empty_artifact ();
		1321
1375	{	1322	{
1376	art = get_empty_artifact ();	1323	if (!strcmp (f.get_str (), "all"))
1377	nrofartifacts++;	1324	break;
		1325
		1326	char next, cp = f.get_str ();
		1327
		1328	do
		1329	{
		1330	if ((next = strchr (cp, ',')))
		1331	*next++ = '\0';
		1332
		1333	linked_char *tmp = new linked_char;
		1334
		1335	tmp->name = cp;
		1336	tmp->next = art->allowed;
		1337	art->allowed = tmp;
		1338	}
		1339	while ((cp = next));
1378	}	1340	}
1379	cp = strchr (cp, ' ') + 1;	1341	break;
1380	if (!strcmp (cp, "all"))	1342
		1343	case KW_chance:
		1344	f.get (art->chance);
		1345	break;
		1346
		1347	case KW_difficulty:
		1348	f.get (art->difficulty);
		1349	break;
		1350
		1351	case KW_object:
		1352	{
		1353	art->item = object::create ();
		1354
		1355	if (!art->item->parse_kv (f))
		1356	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1357
		1358	al = find_artifactlist (art->item->type);
		1359
		1360	if (!al)
		1361	{
		1362	al = get_empty_artifactlist ();
		1363	al->type = art->item->type;
		1364	al->next = first_artifactlist;
		1365	first_artifactlist = al;
		1366	}
		1367
		1368	art->next = al->items;
		1369	al->items = art;
		1370	art = 0;
		1371	}
1381	continue;	1372	continue;
1382		1373
1383	do	1374	case KW_EOF:
		1375	goto done;
		1376
		1377	default:
		1378	if (!f.parse_error ("artifacts file"))
		1379	cleanup ("artifacts file required");
1384	{	1380	break;
1385	nrofallowedstr++;
1386	if ((next = strchr (cp, ',')) != NULL)
1387	*(next++) = '\0';
1388	tmp = new linked_char;
1389
1390	tmp->name = cp;
1391	tmp->next = art->allowed;
1392	art->allowed = tmp;
1393	}
1394	while ((cp = next) != NULL);
1395	}
1396	else if (sscanf (cp, "chance %d", &value))
1397	art->chance = (uint16) value;
1398	else if (sscanf (cp, "difficulty %d", &value))
1399	art->difficulty = (uint8) value;
1400	else if (!strncmp (cp, "Object", 6))
1401	{	1381	}
1402	art->item = object::create ();
1403		1382
1404	if (!load_object (thawer, art->item, 0))	1383	f.next ();
1405	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1406
1407	art->item->name = strchr (cp, ' ') + 1;
1408	al = find_artifactlist (art->item->type);
1409	if (al == NULL)
1410	{
1411	al = get_empty_artifactlist ();
1412	al->type = art->item->type;
1413	al->next = first_artifactlist;
1414	first_artifactlist = al;
1415	}
1416	art->next = al->items;
1417	al->items = art;
1418	art = NULL;
1419	}
1420	else
1421	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1422	}	1384	}
1423		1385
		1386	done:
1424	for (al = first_artifactlist; al != NULL; al = al->next)	1387	for (al = first_artifactlist; al; al = al->next)
1425	{	1388	{
		1389	al->total_chance = 0;
		1390
1426	for (art = al->items; art != NULL; art = art->next)	1391	for (art = al->items; art; art = art->next)
1427	{	1392	{
1428	if (!art->chance)	1393	if (!art->chance)
1429	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1394	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1430	else	1395	else
1431	al->total_chance += art->chance;	1396	al->total_chance += art->chance;
…		…
1436	}	1401	}
1437		1402
1438	LOG (llevDebug, "done.\n");	1403	LOG (llevDebug, "done.\n");
1439	}	1404	}
1440		1405
1441
1442	/*	1406	/*
1443	* Used in artifact generation. The bonuses of the first object	1407	* Used in artifact generation. The bonuses of the first object
1444	* is modified by the bonuses of the second object.	1408	* is modified by the bonuses of the second object.
1445	*/	1409	*/
1446
1447	void	1410	void
1448	add_abilities (object op, object change)	1411	add_abilities (object op, object change)
1449	{	1412	{
1450	int i, tmp;	1413	int i, tmp;
1451		1414
1452	if (change->face != blank_face)	1415	if (change->face != blank_face)
1453	{	1416	{
1454	#ifdef TREASURE_VERBOSE	1417	#ifdef TREASURE_VERBOSE
1455	LOG (llevDebug, "FACE: %d\n", change->face->number);	1418	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1456	#endif	1419	#endif
1457	op->face = change->face;	1420	op->face = change->face;
1458	}	1421	}
1459		1422
1460	for (i = 0; i < NUM_STATS; i++)	1423	for (i = 0; i < NUM_STATS; i++)
…		…
1500		1463
1501	op->set_speed (op->speed);	1464	op->set_speed (op->speed);
1502	}	1465	}
1503		1466
1504	if (change->nrof)	1467	if (change->nrof)
1505	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1468	op->nrof = rndm (change->nrof) + 1;
1506		1469
1507	op->stats.exp += change->stats.exp; /* Speed modifier */	1470	op->stats.exp += change->stats.exp; /* Speed modifier */
1508	op->stats.wc += change->stats.wc;	1471	op->stats.wc += change->stats.wc;
1509	op->stats.ac += change->stats.ac;	1472	op->stats.ac += change->stats.ac;
1510		1473
…		…
1613	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1576	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1614	}	1577	}
1615		1578
1616	op->value *= change->value;	1579	op->value *= change->value;
1617		1580
1618	if (change->material)	1581	if (change->materials)
1619	op->material = change->material;	1582	op->materials = change->materials;
1620		1583
1621	if (change->materialname)	1584	if (change->materialname)
1622	op->materialname = change->materialname;	1585	op->materialname = change->materialname;
1623		1586
1624	if (change->slaying)	1587	if (change->slaying)
…		…
1641	if (art->allowed == (linked_char *) NULL)	1604	if (art->allowed == (linked_char *) NULL)
1642	return 1; /* Ie, "all" */	1605	return 1; /* Ie, "all" */
1643	for (tmp = art->allowed; tmp; tmp = tmp->next)	1606	for (tmp = art->allowed; tmp; tmp = tmp->next)
1644	{	1607	{
1645	#ifdef TREASURE_VERBOSE	1608	#ifdef TREASURE_VERBOSE
1646	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1609	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1647	#endif	1610	#endif
1648	if (*tmp->name == '!')	1611	if (*tmp->name == '!')
1649	name = tmp->name + 1, neg = 1;	1612	name = tmp->name + 1, neg = 1;
1650	else	1613	else
1651	name = tmp->name, neg = 0;	1614	name = tmp->name, neg = 0;
…		…
1718	return;	1681	return;
1719	}	1682	}
1720		1683
1721	for (i = 0; i < ARTIFACT_TRIES; i++)	1684	for (i = 0; i < ARTIFACT_TRIES; i++)
1722	{	1685	{
1723	int roll = RANDOM () % al->total_chance;	1686	int roll = rndm (al->total_chance);
1724		1687
1725	for (art = al->items; art != NULL; art = art->next)	1688	for (art = al->items; art; art = art->next)
1726	{	1689	{
1727	roll -= art->chance;	1690	roll -= art->chance;
1728	if (roll < 0)	1691	if (roll < 0)
1729	break;	1692	break;
1730	}	1693	}
…		…
1746	continue;	1709	continue;
1747		1710
1748	if (!legal_artifact_combination (op, art))	1711	if (!legal_artifact_combination (op, art))
1749	{	1712	{
1750	#ifdef TREASURE_VERBOSE	1713	#ifdef TREASURE_VERBOSE
1751	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1714	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1752	#endif	1715	#endif
1753	continue;	1716	continue;
1754	}	1717	}
		1718
1755	give_artifact_abilities (op, art->item);	1719	give_artifact_abilities (op, art->item);
1756	return;	1720	return;
1757	}	1721	}
1758	}	1722	}
1759		1723
…		…
1803	SET_FLAG (item, FLAG_NO_STEAL);	1767	SET_FLAG (item, FLAG_NO_STEAL);
1804	}	1768	}
1805	}	1769	}
1806		1770
1807	/* special_potion() - so that old potion code is still done right. */	1771	/* special_potion() - so that old potion code is still done right. */
1808
1809	int	1772	int
1810	special_potion (object *op)	1773	special_potion (object *op)
1811	{	1774	{
1812	if (op->attacktype)	1775	if (op->attacktype)
1813	return 1;	1776	return 1;
…		…
1823	}	1786	}
1824		1787
1825	void	1788	void
1826	free_treasurestruct (treasure *t)	1789	free_treasurestruct (treasure *t)
1827	{	1790	{
1828	if (t->next)
1829	free_treasurestruct (t->next);	1791	if (t->next) free_treasurestruct (t->next);
1830	if (t->next_yes)
1831	free_treasurestruct (t->next_yes);	1792	if (t->next_yes) free_treasurestruct (t->next_yes);
1832	if (t->next_no)
1833	free_treasurestruct (t->next_no);	1793	if (t->next_no) free_treasurestruct (t->next_no);
1834		1794
1835	delete t;	1795	delete t;
1836	}	1796	}
1837		1797
1838	void	1798	void
…		…
1843		1803
1844	delete lc;	1804	delete lc;
1845	}	1805	}
1846		1806
1847	void	1807	void
1848	free_artifact (artifact * at)	1808	free_artifact (artifact *at)
1849	{	1809	{
1850	if (at->next)
1851	free_artifact (at->next);	1810	if (at->next) free_artifact (at->next);
1852
1853	if (at->allowed)
1854	free_charlinks (at->allowed);	1811	if (at->allowed) free_charlinks (at->allowed);
1855		1812
1856	at->item->destroy (1);	1813	at->item->destroy (1);
1857		1814
1858	delete at;	1815	sfree (at);
1859	}	1816	}
1860		1817
1861	void	1818	void
1862	free_artifactlist (artifactlist * al)	1819	free_artifactlist (artifactlist *al)
1863	{	1820	{
1864	artifactlist *nextal;	1821	artifactlist *nextal;
1865		1822
1866	for (al = first_artifactlist; al; al = nextal)	1823	for (al = first_artifactlist; al; al = nextal)
1867	{	1824	{
1868	nextal = al->next;	1825	nextal = al->next;
1869		1826
1870	if (al->items)	1827	if (al->items)
1871	free_artifact (al->items);	1828	free_artifact (al->items);
1872		1829
1873	free (al);	1830	sfree (al);
1874	}	1831	}
1875	}	1832	}
1876		1833
1877	void	1834	void
1878	free_all_treasures (void)	1835	free_all_treasures (void)
1879	{	1836	{
1880	treasurelist tl, next;	1837	treasurelist tl, next;
1881		1838
1882
1883	for (tl = first_treasurelist; tl != NULL; tl = next)	1839	for (tl = first_treasurelist; tl; tl = next)
1884	{	1840	{
		1841	clear (tl);
		1842
1885	next = tl->next;	1843	next = tl->next;
1886	if (tl->items)
1887	free_treasurestruct (tl->items);
1888	delete tl;	1844	delete tl;
1889	}	1845	}
		1846
1890	free_artifactlist (first_artifactlist);	1847	free_artifactlist (first_artifactlist);
1891	}	1848	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs. Revision 1.47 by root, Tue Apr 17 18:24:30 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.47 by root, Tue Apr 17 18:24:30 2007 UTC