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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.39 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.49 by root, Tue Apr 17 18:59:05 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 = rndm (t->nrof) + 1;	300	tmp->nrof = rndm (t->nrof) + 1;
354		301
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	302	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	303	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	304	put_treasure (tmp, op, flag);
358	}	305	}
359	}	306	}
360		307
361	if (t->next_yes != NULL)	308	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	309	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	310	}
364	else if (t->next_no != NULL)	311	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	312	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		313
367	if (t->next != NULL)	314	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	315	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	316	}
370		317
371	void	318	static void
372	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)
373	{	320	{
374	int value = rndm (tl->total_chance);	321	int value = rndm (tl->total_chance);
375	treasure *t;	322	treasure *t;
376		323
…		…
378	{	325	{
379	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");
380	return;	327	return;
381	}	328	}
382		329
383	for (t = tl->items; t != NULL; t = t->next)	330	for (t = tl->items; t; t = t->next)
384	{	331	{
385	value -= t->chance;	332	value -= t->chance;
386		333
387	if (value < 0)	334	if (value < 0)
388	break;	335	break;
389	}	336	}
390		337
391	if (!t \|\| value >= 0)	338	if (!t \|\| value >= 0)
392	{
393	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);
394	abort ();
395	return;
396	}
397		340
398	if (t->name)	341	if (t->name)
399	{	342	{
400	if (difficulty >= t->magic)	343	if (difficulty >= t->magic)
401	{	344	{
402	treasurelist *tl = find_treasurelist (t->name);	345	treasurelist *tl = treasurelist::find (t->name);
403	if (tl)	346	if (tl)
404	create_treasure (tl, op, flag, difficulty, tries);	347	create_treasure (tl, op, flag, difficulty, tries);
405	}	348	}
406	else if (t->nrof)	349	else if (t->nrof)
407	create_one_treasure (tl, op, flag, difficulty, tries);	350	create_one_treasure (tl, op, flag, difficulty, tries);
408
409	return;
410	}	351	}
411
412	if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))	352	else if (t->item && (t->item->clone.invisible != 0 \|\| flag != GT_INVISIBLE))
413	{	353	{
414	object *tmp = arch_to_object (t->item);	354	if (object *tmp = arch_to_object (t->item))
415		355	{
416	if (!tmp)
417	return;
418
419	if (t->nrof && tmp->nrof <= 1)	356	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	357	tmp->nrof = rndm (t->nrof) + 1;
421		358
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	359	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	360	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	361	put_treasure (tmp, op, flag);
		362	}
425	}	363	}
426	}	364	}
427		365
428	/* This calls the appropriate treasure creation function. tries is passed	366	/* This calls the appropriate treasure creation function. tries is passed
429	* to determine how many list transitions or attempts to create treasure	367	* to determine how many list transitions or attempts to create treasure
…		…
433	* to do that.	371	* to do that.
434	*/	372	*/
435	void	373	void
436	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)
437	{	375	{
		376	// empty treasurelists are legal
		377	if (!tl->items)
		378	return;
		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	}
…		…
480	* magical bonus "wanted".	422	* magical bonus "wanted".
481	*/	423	*/
482		424
483	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	425	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484		426
485	/chance of magic difficulty/	427	// chance of magic difficulty
486
487	/* +0 +1 +2 +3 +4 */	428	// +0 +1 +2 +3 +4
488	{95, 2, 2, 1, 0}, /1 /	429	{95, 2, 2, 1, 0}, // 1
489	{92, 5, 2, 1, 0}, /2 /	430	{92, 5, 2, 1, 0}, // 2
490	{85, 10, 4, 1, 0}, /3 /	431	{85, 10, 4, 1, 0}, // 3
491	{80, 14, 4, 2, 0}, /4 /	432	{80, 14, 4, 2, 0}, // 4
492	{75, 17, 5, 2, 1}, /5 /	433	{75, 17, 5, 2, 1}, // 5
493	{70, 18, 8, 3, 1}, /6 /	434	{70, 18, 8, 3, 1}, // 6
494	{65, 21, 10, 3, 1}, /7 /	435	{65, 21, 10, 3, 1}, // 7
495	{60, 22, 12, 4, 2}, /8 /	436	{60, 22, 12, 4, 2}, // 8
496	{55, 25, 14, 4, 2}, /9 /	437	{55, 25, 14, 4, 2}, // 9
497	{50, 27, 16, 5, 2}, /10 /	438	{50, 27, 16, 5, 2}, // 10
498	{45, 28, 18, 6, 3}, /11 /	439	{45, 28, 18, 6, 3}, // 11
499	{42, 28, 20, 7, 3}, /12 /	440	{42, 28, 20, 7, 3}, // 12
500	{40, 27, 21, 8, 4}, /13 /	441	{40, 27, 21, 8, 4}, // 13
501	{38, 25, 22, 10, 5}, /14 /	442	{38, 25, 22, 10, 5}, // 14
502	{36, 23, 23, 12, 6}, /15 /	443	{36, 23, 23, 12, 6}, // 15
503	{33, 21, 24, 14, 8}, /16 /	444	{33, 21, 24, 14, 8}, // 16
504	{31, 19, 25, 16, 9}, /17 /	445	{31, 19, 25, 16, 9}, // 17
505	{27, 15, 30, 18, 10}, /18 /	446	{27, 15, 30, 18, 10}, // 18
506	{20, 12, 30, 25, 13}, /19 /	447	{20, 12, 30, 25, 13}, // 19
507	{15, 10, 28, 30, 17}, /20 /	448	{15, 10, 28, 30, 17}, // 20
508	{13, 9, 27, 28, 23}, /21 /	449	{13, 9, 27, 28, 23}, // 21
509	{10, 8, 25, 28, 29}, /22 /	450	{10, 8, 25, 28, 29}, // 22
510	{8, 7, 23, 26, 36}, /23 /	451	{ 8, 7, 23, 26, 36}, // 23
511	{6, 6, 20, 22, 46}, /24 /	452	{ 6, 6, 20, 22, 46}, // 24
512	{4, 5, 17, 18, 56}, /25 /	453	{ 4, 5, 17, 18, 56}, // 25
513	{2, 4, 12, 14, 68}, /26 /	454	{ 2, 4, 12, 14, 68}, // 26
514	{0, 3, 7, 10, 80}, /27 /	455	{ 0, 3, 7, 10, 80}, // 27
515	{0, 0, 3, 7, 90}, /28 /	456	{ 0, 0, 3, 7, 90}, // 28
516	{0, 0, 0, 3, 97}, /29 /	457	{ 0, 0, 0, 3, 97}, // 29
517	{0, 0, 0, 0, 100}, /30 /	458	{ 0, 0, 0, 0, 100}, // 30
518	{0, 0, 0, 0, 100}, /31 /	459	{ 0, 0, 0, 0, 100}, // 31
519	};	460	};
520		461
521		462
522	/* calculate the appropriate level for wands staves and scrolls.	463	/* calculate the appropriate level for wands staves and scrolls.
523	* 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)
…		…
556	* elmex Thu Aug 10 18:45:44 CEST 2006:	497	* elmex Thu Aug 10 18:45:44 CEST 2006:
557	* 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
558	* weird integer between 1-31.	499	* weird integer between 1-31.
559	*	500	*
560	*/	501	*/
561
562	int	502	int
563	magic_from_difficulty (int difficulty)	503	magic_from_difficulty (int difficulty)
564	{	504	{
565	int percent = 0, magic = 0;	505	int percent = 0, magic = 0;
566	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	506	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
…		…
654	* 1) Since rings can have multiple bonuses, if the same bonus	594	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	595	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	596	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	597	* 2) Add code to deal with new PR method.
658	*/	598	*/
659
660	void	599	void
661	set_ring_bonus (object *op, int bonus)	600	set_ring_bonus (object *op, int bonus)
662	{	601	{
663		602
664	int r = rndm (bonus > 0 ? 25 : 11);	603	int r = rndm (bonus > 0 ? 25 : 11);
…		…
847		786
848	if (op->randomitems && op->type != SPELL)	787	if (op->randomitems && op->type != SPELL)
849	{	788	{
850	create_treasure (op->randomitems, op, flags, difficulty, 0);	789	create_treasure (op->randomitems, op, flags, difficulty, 0);
851	if (!op->inv)	790	if (!op->inv)
852	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 ());
853		792
854	/* So the treasure doesn't get created again */	793	/* So the treasure doesn't get created again */
855	op->randomitems = NULL;	794	op->randomitems = 0;
856	}	795	}
857		796
858	if (difficulty < 1)	797	if (difficulty < 1)
859	difficulty = 1;	798	difficulty = 1;
860		799
…		…
1176	* Allocate and return the pointer to an empty artifactlist structure.	1115	* Allocate and return the pointer to an empty artifactlist structure.
1177	*/	1116	*/
1178	static artifactlist *	1117	static artifactlist *
1179	get_empty_artifactlist (void)	1118	get_empty_artifactlist (void)
1180	{	1119	{
1181	artifactlist al = (artifactlist ) malloc (sizeof (artifactlist));	1120	return salloc0 <artifactlist> ();
1182
1183	if (al == NULL)
1184	fatal (OUT_OF_MEMORY);
1185	al->next = NULL;
1186	al->items = NULL;
1187	al->total_chance = 0;
1188	return al;
1189	}	1121	}
1190		1122
1191	/*	1123	/*
1192	* Allocate and return the pointer to an empty artifact structure.	1124	* Allocate and return the pointer to an empty artifact structure.
1193	*/	1125	*/
1194	static artifact *	1126	static artifact *
1195	get_empty_artifact (void)	1127	get_empty_artifact (void)
1196	{	1128	{
1197	artifact a = (artifact ) malloc (sizeof (artifact));	1129	return salloc0 <artifact> ();
1198
1199	if (a == NULL)
1200	fatal (OUT_OF_MEMORY);
1201
1202	a->item = NULL;
1203	a->next = NULL;
1204	a->chance = 0;
1205	a->difficulty = 0;
1206	a->allowed = NULL;
1207	return a;
1208	}	1130	}
1209		1131
1210	/*	1132	/*
1211	* 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
1212	* of objects on it.	1134	* of objects on it.
1213	*/	1135	*/
1214	artifactlist *	1136	artifactlist *
1215	find_artifactlist (int type)	1137	find_artifactlist (int type)
1216	{	1138	{
1217	artifactlist *al;
1218
1219	for (al = first_artifactlist; al; al = al->next)	1139	for (artifactlist *al = first_artifactlist; al; al = al->next)
1220	if (al->type == type)	1140	if (al->type == type)
1221	return al;	1141	return al;
1222		1142
1223	return 0;	1143	return 0;
1224	}	1144	}
…		…
1261	treasurelist *tl;	1181	treasurelist *tl;
1262	int i;	1182	int i;
1263		1183
1264	if (depth > 100)	1184	if (depth > 100)
1265	return;	1185	return;
		1186
1266	while (t)	1187	while (t)
1267	{	1188	{
1268	if (t->name)	1189	if (t->name)
1269	{	1190	{
1270	for (i = 0; i < depth; i++)	1191	for (i = 0; i < depth; i++)
1271	fprintf (logfile, " ");	1192	fprintf (logfile, " ");
		1193
1272	fprintf (logfile, "{ (list: %s)\n", &t->name);	1194	fprintf (logfile, "{ (list: %s)\n", &t->name);
		1195
1273	tl = find_treasurelist (t->name);	1196	tl = treasurelist::find (t->name);
1274	if (tl)	1197	if (tl)
1275	dump_monster_treasure_rec (name, tl->items, depth + 2);	1198	dump_monster_treasure_rec (name, tl->items, depth + 2);
		1199
1276	for (i = 0; i < depth; i++)	1200	for (i = 0; i < depth; i++)
1277	fprintf (logfile, " ");	1201	fprintf (logfile, " ");
		1202
1278	fprintf (logfile, "} (end of list: %s)\n", &t->name);	1203	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1279	}	1204	}
1280	else	1205	else
1281	{	1206	{
1282	for (i = 0; i < depth; i++)	1207	for (i = 0; i < depth; i++)
1283	fprintf (logfile, " ");	1208	fprintf (logfile, " ");
		1209
1284	if (t->item && t->item->clone.type == FLESH)	1210	if (t->item && t->item->clone.type == FLESH)
1285	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);	1211	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1286	else	1212	else
1287	fprintf (logfile, "%s\n", &t->item->clone.name);	1213	fprintf (logfile, "%s\n", &t->item->clone.name);
1288	}	1214	}
1289		1215
1290	if (t->next_yes)	1216	if (t->next_yes)
1291	{	1217	{
1292	for (i = 0; i < depth; i++)	1218	for (i = 0; i < depth; i++)
1293	fprintf (logfile, " ");	1219	fprintf (logfile, " ");
		1220
1294	fprintf (logfile, " (if yes)\n");	1221	fprintf (logfile, " (if yes)\n");
1295	dump_monster_treasure_rec (name, t->next_yes, depth + 1);	1222	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1296	}	1223	}
1297		1224
1298	if (t->next_no)	1225	if (t->next_no)
1299	{	1226	{
1300	for (i = 0; i < depth; i++)	1227	for (i = 0; i < depth; i++)
1301	fprintf (logfile, " ");	1228	fprintf (logfile, " ");
		1229
1302	fprintf (logfile, " (if no)\n");	1230	fprintf (logfile, " (if no)\n");
1303	dump_monster_treasure_rec (name, t->next_no, depth + 1);	1231	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1304	}	1232	}
1305		1233
1306	t = t->next;	1234	t = t->next;
…		…
1309		1237
1310	/*	1238	/*
1311	* For debugging purposes. Dumps all treasures for a given monster.	1239	* For debugging purposes. Dumps all treasures for a given monster.
1312	* Created originally by Raphael Quinet for debugging the alchemy code.	1240	* Created originally by Raphael Quinet for debugging the alchemy code.
1313	*/	1241	*/
1314
1315	void	1242	void
1316	dump_monster_treasure (const char *name)	1243	dump_monster_treasure (const char *name)
1317	{	1244	{
1318	archetype *at;	1245	archetype *at;
1319	int found;	1246	int found;
…		…
1366	{	1293	{
1367	switch (f.kw)	1294	switch (f.kw)
1368	{	1295	{
1369	case KW_allowed:	1296	case KW_allowed:
1370	if (!art)	1297	if (!art)
1371	{
1372	art = get_empty_artifact ();	1298	art = get_empty_artifact ();
1373	nrofartifacts++;
1374	}
1375		1299
1376	{	1300	{
1377	if (!strcmp (f.get_str (), "all"))	1301	if (!strcmp (f.get_str (), "all"))
1378	break;	1302	break;
1379		1303
1380	char next, cp = f.get_str ();	1304	char next, cp = f.get_str ();
1381		1305
1382	do	1306	do
1383	{	1307	{
1384	nrofallowedstr++;
1385
1386	if ((next = strchr (cp, ',')))	1308	if ((next = strchr (cp, ',')))
1387	*next++ = '\0';	1309	*next++ = '\0';
1388		1310
1389	linked_char *tmp = new linked_char;	1311	linked_char *tmp = new linked_char;
1390		1312
…		…
1405	break;	1327	break;
1406		1328
1407	case KW_object:	1329	case KW_object:
1408	{	1330	{
1409	art->item = object::create ();	1331	art->item = object::create ();
		1332	f.get (art->item->name);
		1333	f.next ();
1410		1334
1411	if (!art->item->parse_kv (f))	1335	if (!art->item->parse_kv (f))
1412	LOG (llevError, "Init_Artifacts: Could not load object.\n");	1336	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1413		1337
1414	al = find_artifactlist (art->item->type);	1338	al = find_artifactlist (art->item->type);
…		…
1440	}	1364	}
1441		1365
1442	done:	1366	done:
1443	for (al = first_artifactlist; al; al = al->next)	1367	for (al = first_artifactlist; al; al = al->next)
1444	{	1368	{
		1369	al->total_chance = 0;
		1370
1445	for (art = al->items; art; art = art->next)	1371	for (art = al->items; art; art = art->next)
1446	{	1372	{
1447	if (!art->chance)	1373	if (!art->chance)
1448	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1374	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1449	else	1375	else
…		…
1455	}	1381	}
1456		1382
1457	LOG (llevDebug, "done.\n");	1383	LOG (llevDebug, "done.\n");
1458	}	1384	}
1459		1385
1460
1461	/*	1386	/*
1462	* Used in artifact generation. The bonuses of the first object	1387	* Used in artifact generation. The bonuses of the first object
1463	* is modified by the bonuses of the second object.	1388	* is modified by the bonuses of the second object.
1464	*/	1389	*/
1465
1466	void	1390	void
1467	add_abilities (object op, object change)	1391	add_abilities (object op, object change)
1468	{	1392	{
1469	int i, tmp;	1393	int i, tmp;
1470		1394
1471	if (change->face != blank_face)	1395	if (change->face != blank_face)
1472	{	1396	{
1473	#ifdef TREASURE_VERBOSE	1397	#ifdef TREASURE_VERBOSE
1474	LOG (llevDebug, "FACE: %d\n", change->face->number);	1398	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1475	#endif	1399	#endif
1476	op->face = change->face;	1400	op->face = change->face;
1477	}	1401	}
1478		1402
1479	for (i = 0; i < NUM_STATS; i++)	1403	for (i = 0; i < NUM_STATS; i++)
…		…
1660	if (art->allowed == (linked_char *) NULL)	1584	if (art->allowed == (linked_char *) NULL)
1661	return 1; /* Ie, "all" */	1585	return 1; /* Ie, "all" */
1662	for (tmp = art->allowed; tmp; tmp = tmp->next)	1586	for (tmp = art->allowed; tmp; tmp = tmp->next)
1663	{	1587	{
1664	#ifdef TREASURE_VERBOSE	1588	#ifdef TREASURE_VERBOSE
1665	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1589	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1666	#endif	1590	#endif
1667	if (*tmp->name == '!')	1591	if (*tmp->name == '!')
1668	name = tmp->name + 1, neg = 1;	1592	name = tmp->name + 1, neg = 1;
1669	else	1593	else
1670	name = tmp->name, neg = 0;	1594	name = tmp->name, neg = 0;
…		…
1765	continue;	1689	continue;
1766		1690
1767	if (!legal_artifact_combination (op, art))	1691	if (!legal_artifact_combination (op, art))
1768	{	1692	{
1769	#ifdef TREASURE_VERBOSE	1693	#ifdef TREASURE_VERBOSE
1770	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1694	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1771	#endif	1695	#endif
1772	continue;	1696	continue;
1773	}	1697	}
		1698
1774	give_artifact_abilities (op, art->item);	1699	give_artifact_abilities (op, art->item);
1775	return;	1700	return;
1776	}	1701	}
1777	}	1702	}
1778		1703
…		…
1822	SET_FLAG (item, FLAG_NO_STEAL);	1747	SET_FLAG (item, FLAG_NO_STEAL);
1823	}	1748	}
1824	}	1749	}
1825		1750
1826	/* special_potion() - so that old potion code is still done right. */	1751	/* special_potion() - so that old potion code is still done right. */
1827
1828	int	1752	int
1829	special_potion (object *op)	1753	special_potion (object *op)
1830	{	1754	{
1831	if (op->attacktype)	1755	if (op->attacktype)
1832	return 1;	1756	return 1;
…		…
1842	}	1766	}
1843		1767
1844	void	1768	void
1845	free_treasurestruct (treasure *t)	1769	free_treasurestruct (treasure *t)
1846	{	1770	{
1847	if (t->next)
1848	free_treasurestruct (t->next);	1771	if (t->next) free_treasurestruct (t->next);
1849	if (t->next_yes)
1850	free_treasurestruct (t->next_yes);	1772	if (t->next_yes) free_treasurestruct (t->next_yes);
1851	if (t->next_no)
1852	free_treasurestruct (t->next_no);	1773	if (t->next_no) free_treasurestruct (t->next_no);
1853		1774
1854	delete t;	1775	delete t;
1855	}	1776	}
1856		1777
1857	void	1778	void
…		…
1862		1783
1863	delete lc;	1784	delete lc;
1864	}	1785	}
1865		1786
1866	void	1787	void
1867	free_artifact (artifact * at)	1788	free_artifact (artifact *at)
1868	{	1789	{
1869	if (at->next)
1870	free_artifact (at->next);	1790	if (at->next) free_artifact (at->next);
1871
1872	if (at->allowed)
1873	free_charlinks (at->allowed);	1791	if (at->allowed) free_charlinks (at->allowed);
1874		1792
1875	at->item->destroy (1);	1793	at->item->destroy (1);
1876		1794
1877	delete at;	1795	sfree (at);
1878	}	1796	}
1879		1797
1880	void	1798	void
1881	free_artifactlist (artifactlist * al)	1799	free_artifactlist (artifactlist *al)
1882	{	1800	{
1883	artifactlist *nextal;	1801	artifactlist *nextal;
1884		1802
1885	for (al = first_artifactlist; al; al = nextal)	1803	for (al = first_artifactlist; al; al = nextal)
1886	{	1804	{
1887	nextal = al->next;	1805	nextal = al->next;
1888		1806
1889	if (al->items)	1807	if (al->items)
1890	free_artifact (al->items);	1808	free_artifact (al->items);
1891		1809
1892	free (al);	1810	sfree (al);
1893	}	1811	}
1894	}	1812	}
1895		1813
1896	void	1814	void
1897	free_all_treasures (void)	1815	free_all_treasures (void)
1898	{	1816	{
1899	treasurelist tl, next;	1817	treasurelist tl, next;
1900		1818
1901
1902	for (tl = first_treasurelist; tl != NULL; tl = next)	1819	for (tl = first_treasurelist; tl; tl = next)
1903	{	1820	{
		1821	clear (tl);
		1822
1904	next = tl->next;	1823	next = tl->next;
1905	if (tl->items)
1906	free_treasurestruct (tl->items);
1907	delete tl;	1824	delete tl;
1908	}	1825	}
		1826
1909	free_artifactlist (first_artifactlist);	1827	free_artifactlist (first_artifactlist);
1910	}	1828	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.39 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs. Revision 1.49 by root, Tue Apr 17 18:59:05 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.39 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.49 by root, Tue Apr 17 18:59:05 2007 UTC