ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.37 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.101 by root, Fri Mar 26 00:59:20 2010 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24
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>
41	#include <loader.h>
42		38
		39	extern char *spell_mapping[];
		40
		41	static treasurelist *first_treasurelist;
43		42
44	static void change_treasure (treasure *t, object *op); /* overrule default values */	43	static void change_treasure (treasure *t, object *op); /* overrule default values */
45	extern char *spell_mapping[];
46		44
47	/*	45	typedef std::tr1::unordered_map<
48	* Initialize global archtype pointers:	46	const char *,
49	*/	47	treasurelist *,
		48	str_hash,
		49	str_equal,
		50	slice_allocator< std::pair<const char *const, treasurelist *> >
		51	> tl_map_t;
50		52
51	void	53	static tl_map_t tl_map;
52	init_archetype_pointers ()
53	{
54	int prev_warn = warn_archetypes;
55		54
56	warn_archetypes = 1;	55	//TODO: class method
57	if (ring_arch == NULL)	56	static void free_treasurestruct (treasure *t); // bleh desu
58	ring_arch = archetype::find ("ring");	57	static void
59	if (amulet_arch == NULL)	58	clear (treasurelist *tl)
60	amulet_arch = archetype::find ("amulet");	59	{
61	if (staff_arch == NULL)	60	if (tl->items)
62	staff_arch = archetype::find ("staff");	61	{
63	if (crown_arch == NULL)	62	free_treasurestruct (tl->items);
64	crown_arch = archetype::find ("crown");	63	tl->items = 0;
65	warn_archetypes = prev_warn;	64	}
66	}
67		65
68	/*	66	tl->total_chance = 0;
69	* Allocate and return the pointer to an empty treasurelist structure.	67	}
70	*/
71		68
		69	/*
		70	* Searches for the given treasurelist
		71	*/
72	static treasurelist *	72	treasurelist *
73	get_empty_treasurelist (void)	73	treasurelist::find (const char *name)
74	{	74	{
		75	if (!name)
		76	return 0;
		77
		78	auto (i, tl_map.find (name));
		79
		80	if (i == tl_map.end ())
		81	return 0;
		82
		83	return i->second;
		84	}
		85
		86	/*
		87	* Searches for the given treasurelist in the globally linked list
		88	* of treasurelists which has been built by load_treasures().
		89	*/
		90	treasurelist *
		91	treasurelist::get (const char *name)
		92	{
		93	treasurelist *tl = find (name);
		94
		95	if (!tl)
		96	{
75	return new treasurelist;	97	tl = new treasurelist;
76	}
77		98
78	/*	99	tl->name = name;
79	* Allocate and return the pointer to an empty treasure structure.	100	tl->next = first_treasurelist;
80	*/	101	first_treasurelist = tl;
81	//TODO: make this a constructor
82	static treasure *
83	get_empty_treasure (void)
84	{
85	treasure *t = new treasure;
86		102
87	t->chance = 100;	103	tl_map.insert (std::make_pair (tl->name, tl));
		104	}
88		105
89	return t;	106	return tl;
90	}	107	}
		108
		109	#ifdef TREASURE_DEBUG
		110	/* recursived checks the linked list. Treasurelist is passed only
		111	* so that the treasure name can be printed out
		112	*/
		113	static void
		114	check_treasurelist (const treasure *t, const treasurelist * tl)
		115	{
		116	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
		117	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
		118
		119	if (t->next)
		120	check_treasurelist (t->next, tl);
		121
		122	if (t->next_yes)
		123	check_treasurelist (t->next_yes, tl);
		124
		125	if (t->next_no)
		126	check_treasurelist (t->next_no, tl);
		127	}
		128	#endif
91		129
92	/*	130	/*
93	* Reads the lib/treasure file from disk, and parses the contents	131	* Reads the lib/treasure file from disk, and parses the contents
94	* into an internal treasure structure (very linked lists)	132	* into an internal treasure structure (very linked lists)
95	*/	133	*/
96
97	static treasure *	134	static treasure *
98	load_treasure (FILE * fp, int *line)	135	read_treasure (object_thawer &f)
99	{	136	{
100	char buf[MAX_BUF], *cp, variable[MAX_BUF];
101	treasure *t = get_empty_treasure ();	137	treasure *t = new treasure;
102	int value;
103		138
104	nroftreasures++;	139	f.next ();
105	while (fgets (buf, MAX_BUF, fp) != NULL)
106	{
107	(*line)++;
108		140
109	if (*buf == '#')	141	for (;;)
110	continue;	142	{
111	if ((cp = strchr (buf, '\n')) != NULL)	143	coroapi::cede_to_tick ();
112	*cp = '\0';
113	cp = buf;
114	while (isspace (*cp)) /* Skip blanks */
115	cp++;
116		144
117	if (sscanf (cp, "arch %s", variable))	145	switch (f.kw)
118	{
119	if ((t->item = archetype::find (variable)) == NULL)
120	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121	}	146	{
122	else if (sscanf (cp, "list %s", variable))	147	case KW_arch:
123	t->name = variable;	148	t->item = archetype::find (f.get_str ());
124	else if (sscanf (cp, "change_name %s", variable))	149
125	t->change_arch.name = variable;	150	if (!t->item)
126	else if (sscanf (cp, "change_title %s", variable))
127	t->change_arch.title = variable;
128	else if (sscanf (cp, "change_slaying %s", variable))
129	t->change_arch.slaying = variable;
130	else if (sscanf (cp, "chance %d", &value))
131	t->chance = (uint8) value;
132	else if (sscanf (cp, "nrof %d", &value))
133	t->nrof = (uint16) value;
134	else if (sscanf (cp, "magic %d", &value))
135	t->magic = (uint8) value;
136	else if (!strcmp (cp, "yes"))
137	t->next_yes = load_treasure (fp, line);
138	else if (!strcmp (cp, "no"))
139	t->next_no = load_treasure (fp, line);
140	else if (!strcmp (cp, "end"))
141	return t;
142	else if (!strcmp (cp, "more"))
143	{	151	{
144	t->next = load_treasure (fp, line);	152	f.parse_warn ("treasure references unknown archetype");
		153	t->item = archetype::empty;
		154	}
		155
		156	break;
		157
		158	case KW_list: f.get (t->name); break;
		159	case KW_change_name: f.get (t->change_arch.name); break;
		160	case KW_change_title: f.get (t->change_arch.title); break;
		161	case KW_change_slaying: f.get (t->change_arch.slaying); break;
		162	case KW_chance: f.get (t->chance); break;
		163	case KW_nrof: f.get (t->nrof); break;
		164	case KW_magic: f.get (t->magic); break;
		165
		166	case KW_yes: t->next_yes = read_treasure (f); continue;
		167	case KW_no: t->next_no = read_treasure (f); continue;
		168
		169	case KW_end:
		170	f.next ();
145	return t;	171	return t;
		172
		173	case KW_more:
		174	t->next = read_treasure (f);
		175	return t;
		176
		177	default:
		178	if (!f.parse_error ("treasurelist", t->name))
		179	goto error;
		180
		181	return t;
146	}	182	}
147	else	183
148	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);	184	f.next ();
149	}	185	}
150	LOG (llevError, "treasure lacks 'end'.\n");	186
		187	// not reached
		188
		189	error:
		190	delete t;
151	return t;	191	return 0;
152	}	192	}
153		193
154	#ifdef TREASURE_DEBUG
155
156	/* recursived checks the linked list. Treasurelist is passed only
157	* so that the treasure name can be printed out
158	*/
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	/*	194	/*
177	* Opens LIBDIR/treasure and reads all treasure-declarations from it.
178	* Each treasure is parsed with the help of load_treasure().	195	* Each treasure is parsed with the help of load_treasure().
179	*/	196	*/
180		197	treasurelist *
181	void	198	treasurelist::read (object_thawer &f)
182	load_treasures (void)
183	{	199	{
184	FILE *fp;	200	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		201
190	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	202	bool one = f.kw == KW_treasureone;
191	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	203	treasurelist *tl = treasurelist::get (f.get_str ());
192	{	204	clear (tl);
193	LOG (llevError, "Can't open treasure file.\n");	205	tl->items = read_treasure (f);
		206	if (!tl->items)
194	return;	207	return 0;
195	}
196	while (fgets (buf, MAX_BUF, fp) != NULL)
197	{
198	line++;
199	if (*buf == '#')
200	continue;
201		208
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.	209	/* 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	210	* Add up the chance total, and check to make sure the yes & no
216	* fields of the treasures are not being used.	211	* fields of the treasures are not being used.
217	*/	212	*/
218	if (!strncmp (buf, "treasureone", 11))	213	if (one)
		214	{
		215	for (treasure *t = tl->items; t; t = t->next)
		216	{
		217	if (t->next_yes || t->next_no)
219	{	218	{
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);	219	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
226	LOG (llevError, " the next_yes or next_no field is set\n");	220	LOG (llevError, " the next_yes or next_no field is set\n");
227	}
228	#endif
229	tl->total_chance += t->chance;
230	}
231	}	221	}
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		222
238	#ifdef TREASURE_DEBUG	223	tl->total_chance += t->chance;
239	/* Perform some checks on how valid the treasure data actually is.	224	}
240	* verify that list transitions work (ie, the list that it is supposed	225	}
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		226
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;	227	return tl;
270	}	228	}
271
272		229
273	/*	230	/*
274	* Generates the objects specified by the given treasure.	231	* Generates the objects specified by the given treasure.
275	* It goes recursively through the rest of the linked list.	232	* It goes recursively through the rest of the linked list.
276	* If there is a certain percental chance for a treasure to be generated,	233	* If there is a certain percental chance for a treasure to be generated,
…		…
282	* start with equipment, but only their abilities).	239	* start with equipment, but only their abilities).
283	*/	240	*/
284	static void	241	static void
285	put_treasure (object *op, object *creator, int flags)	242	put_treasure (object *op, object *creator, int flags)
286	{	243	{
287	object *tmp;	244	if (flags & GT_ENVIRONMENT)
288		245	{
289	/* Bit of a hack - spells should never be put onto the map. The entire	246	/* Bit of a hack - spells should never be put onto the map. The entire
290	* treasure stuff is a problem - there is no clear idea of knowing	247	* treasure stuff is a problem - there is no clear idea of knowing
291	* this is the original object, or if this is an object that should be created	248	* this is the original object, or if this is an object that should be created
292	* by another object.	249	* by another object.
293	*/	250	*/
294	if (flags & GT_ENVIRONMENT && op->type != SPELL)	251	//TODO: flag such as objects... as such (no drop, anybody?)
295	{	252	if (op->type == SPELL)
		253	{
		254	op->destroy ();
		255	return;
		256	}
		257
		258	op->expand_tail ();
		259
		260	if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
		261	op->destroy ();
		262	else
		263	{
296	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	264	SET_FLAG (op, FLAG_OBJ_ORIGINAL);
297	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);	265	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
		266	}
298	}	267	}
299	else	268	else
300	{	269	{
301	op = creator->insert (op);	270	op = creator->insert (op);
302		271
303	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	272	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
304	monster_check_apply (creator, op);	273	monster_check_apply (creator, op);
305
306	if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
307	esrv_send_item (tmp, op);
308	}	274	}
309	}	275	}
310		276
311	/* if there are change_xxx commands in the treasure, we include the changes	277	/* if there are change_xxx commands in the treasure, we include the changes
312	* in the generated object	278	* in the generated object
…		…
326		292
327	if (t->change_arch.slaying)	293	if (t->change_arch.slaying)
328	op->slaying = t->change_arch.slaying;	294	op->slaying = t->change_arch.slaying;
329	}	295	}
330		296
331	void	297	static void
332	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)	298	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
333	{	299	{
334	object *tmp;
335
336	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)	300	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
337	{	301	{
338	if (t->name)	302	if (t->name)
339	{	303	{
340	if (difficulty >= t->magic)	304	if (difficulty >= t->magic)
		305	if (treasurelist *tl = treasurelist::find (t->name))
		306	create_treasure (tl, op, flag, difficulty, tries);
		307	else
		308	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
		309	}
		310	else
		311	{
		312	if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
341	{	313	{
342	treasurelist *tl = find_treasurelist (t->name);	314	object *tmp = t->item->instance ();
343	if (tl)	315
344	create_treasure (tl, op, flag, difficulty, tries);
345	}
346	}
347	else
348	{
349	if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350	{
351	tmp = arch_to_object (t->item);
352	if (t->nrof && tmp->nrof <= 1)	316	if (t->nrof && tmp->nrof <= 1)
353	tmp->nrof = rndm (t->nrof) + 1;	317	tmp->nrof = rndm (t->nrof) + 1;
354		318
355	fix_generated_item (tmp, op, difficulty, t->magic, flag);	319	fix_generated_item (tmp, op, difficulty, t->magic, flag);
356	change_treasure (t, tmp);	320	change_treasure (t, tmp);
357	put_treasure (tmp, op, flag);	321	put_treasure (tmp, op, flag);
358	}	322	}
359	}	323	}
360		324
361	if (t->next_yes != NULL)	325	if (t->next_yes)
362	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	326	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363	}	327	}
364	else if (t->next_no != NULL)	328	else if (t->next_no)
365	create_all_treasures (t->next_no, op, flag, difficulty, tries);	329	create_all_treasures (t->next_no, op, flag, difficulty, tries);
366		330
367	if (t->next != NULL)	331	if (t->next)
368	create_all_treasures (t->next, op, flag, difficulty, tries);	332	create_all_treasures (t->next, op, flag, difficulty, tries);
369	}	333	}
370		334
371	void	335	static void
372	create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)	336	create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
373	{	337	{
374	int value = rndm (tl->total_chance);	338	int value = rndm (tl->total_chance);
375	treasure *t;	339	treasure *t;
376		340
…		…
378	{	342	{
379	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	343	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
380	return;	344	return;
381	}	345	}
382		346
383	for (t = tl->items; t != NULL; t = t->next)	347	for (t = tl->items; t; t = t->next)
384	{	348	{
385	value -= t->chance;	349	value -= t->chance;
386		350
387	if (value < 0)	351	if (value < 0)
388	break;	352	break;
389	}	353	}
390		354
391	if (!t || value >= 0)	355	if (!t || value >= 0)
392	{
393	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	356	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
394	abort ();
395	return;
396	}
397		357
398	if (t->name)	358	if (t->name)
399	{	359	{
400	if (difficulty >= t->magic)	360	if (difficulty >= t->magic)
401	{	361	{
402	treasurelist *tl = find_treasurelist (t->name);	362	treasurelist *tl = treasurelist::find (t->name);
403	if (tl)	363	if (tl)
404	create_treasure (tl, op, flag, difficulty, tries);	364	create_treasure (tl, op, flag, difficulty, tries);
405	}	365	}
406	else if (t->nrof)	366	else if (t->nrof)
407	create_one_treasure (tl, op, flag, difficulty, tries);	367	create_one_treasure (tl, op, flag, difficulty, tries);
408
409	return;
410	}	368	}
411
412	if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))	369	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
413	{	370	{
414	object *tmp = arch_to_object (t->item);	371	if (object *tmp = t->item->instance ())
415		372	{
416	if (!tmp)
417	return;
418
419	if (t->nrof && tmp->nrof <= 1)	373	if (t->nrof && tmp->nrof <= 1)
420	tmp->nrof = rndm (t->nrof) + 1;	374	tmp->nrof = rndm (t->nrof) + 1;
421		375
422	fix_generated_item (tmp, op, difficulty, t->magic, flag);	376	fix_generated_item (tmp, op, difficulty, t->magic, flag);
423	change_treasure (t, tmp);	377	change_treasure (t, tmp);
424	put_treasure (tmp, op, flag);	378	put_treasure (tmp, op, flag);
		379	}
425	}	380	}
		381	}
		382
		383	void
		384	object::create_treasure (treasurelist *tl, int flags)
		385	{
		386	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
426	}	387	}
427		388
428	/* This calls the appropriate treasure creation function. tries is passed	389	/* This calls the appropriate treasure creation function. tries is passed
429	* to determine how many list transitions or attempts to create treasure	390	* to determine how many list transitions or attempts to create treasure
430	* have been made. It is really in place to prevent infinite loops with	391	* have been made. It is really in place to prevent infinite loops with
…		…
433	* to do that.	394	* to do that.
434	*/	395	*/
435	void	396	void
436	create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)	397	create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
437	{	398	{
		399	// empty treasurelists are legal
		400	if (!tl->items)
		401	return;
		402
438	if (tries++ > 100)	403	if (tries++ > 100)
439	{	404	{
440	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	405	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441	return;	406	return;
		407	}
		408
		409	if (op->flag [FLAG_TREASURE_ENV])
		410	{
		411	// do not generate items when there already is something above the object
		412	if (op->flag [FLAG_IS_FLOOR] && op->above)
		413	return;
		414
		415	flag |= GT_ENVIRONMENT;
442	}	416	}
443		417
444	if (tl->total_chance)	418	if (tl->total_chance)
445	create_one_treasure (tl, op, flag, difficulty, tries);	419	create_one_treasure (tl, op, flag, difficulty, tries);
446	else	420	else
…		…
455	object *	429	object *
456	generate_treasure (treasurelist *tl, int difficulty)	430	generate_treasure (treasurelist *tl, int difficulty)
457	{	431	{
458	difficulty = clamp (difficulty, 1, settings.max_level);	432	difficulty = clamp (difficulty, 1, settings.max_level);
459		433
460	object *ob = object::create (), *tmp;	434	object *ob = object::create ();
461		435
462	create_treasure (tl, ob, 0, difficulty, 0);	436	create_treasure (tl, ob, 0, difficulty, 0);
463		437
464	/* Don't want to free the object we are about to return */	438	/* Don't want to free the object we are about to return */
465	tmp = ob->inv;	439	object *tmp = ob->inv;
466	if (tmp != NULL)	440	if (tmp)
467	tmp->remove ();	441	tmp->remove ();
468		442
469	if (ob->inv)	443	if (ob->inv)
470	LOG (llevError, "In generate treasure, created multiple objects.\n");	444	LOG (llevError, "In generate treasure, created multiple objects.\n");
471		445
472	ob->destroy ();	446	ob->destroy ();
		447
473	return tmp;	448	return tmp;
474	}	449	}
475		450
476	/*	451	/*
477	* This is a new way of calculating the chance for an item to have	452	* This is a new way of calculating the chance for an item to have
…		…
479	* The array has two arguments, the difficulty of the level, and the	454	* The array has two arguments, the difficulty of the level, and the
480	* magical bonus "wanted".	455	* magical bonus "wanted".
481	*/	456	*/
482		457
483	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	458	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484
485	/*chance of magic difficulty*/	459	// chance of magic difficulty
486
487	/* +0 +1 +2 +3 +4 */	460	// +0 +1 +2 +3 +4
488	{95, 2, 2, 1, 0}, /*1 */	461	{95, 2, 2, 1, 0}, // 1
489	{92, 5, 2, 1, 0}, /*2 */	462	{92, 5, 2, 1, 0}, // 2
490	{85, 10, 4, 1, 0}, /*3 */	463	{85, 10, 4, 1, 0}, // 3
491	{80, 14, 4, 2, 0}, /*4 */	464	{80, 14, 4, 2, 0}, // 4
492	{75, 17, 5, 2, 1}, /*5 */	465	{75, 17, 5, 2, 1}, // 5
493	{70, 18, 8, 3, 1}, /*6 */	466	{70, 18, 8, 3, 1}, // 6
494	{65, 21, 10, 3, 1}, /*7 */	467	{65, 21, 10, 3, 1}, // 7
495	{60, 22, 12, 4, 2}, /*8 */	468	{60, 22, 12, 4, 2}, // 8
496	{55, 25, 14, 4, 2}, /*9 */	469	{55, 25, 14, 4, 2}, // 9
497	{50, 27, 16, 5, 2}, /*10 */	470	{50, 27, 16, 5, 2}, // 10
498	{45, 28, 18, 6, 3}, /*11 */	471	{45, 28, 18, 6, 3}, // 11
499	{42, 28, 20, 7, 3}, /*12 */	472	{42, 28, 20, 7, 3}, // 12
500	{40, 27, 21, 8, 4}, /*13 */	473	{40, 27, 21, 8, 4}, // 13
501	{38, 25, 22, 10, 5}, /*14 */	474	{38, 25, 22, 10, 5}, // 14
502	{36, 23, 23, 12, 6}, /*15 */	475	{36, 23, 23, 12, 6}, // 15
503	{33, 21, 24, 14, 8}, /*16 */	476	{33, 21, 24, 14, 8}, // 16
504	{31, 19, 25, 16, 9}, /*17 */	477	{31, 19, 25, 16, 9}, // 17
505	{27, 15, 30, 18, 10}, /*18 */	478	{27, 15, 30, 18, 10}, // 18
506	{20, 12, 30, 25, 13}, /*19 */	479	{20, 12, 30, 25, 13}, // 19
507	{15, 10, 28, 30, 17}, /*20 */	480	{15, 10, 28, 30, 17}, // 20
508	{13, 9, 27, 28, 23}, /*21 */	481	{13, 9, 27, 28, 23}, // 21
509	{10, 8, 25, 28, 29}, /*22 */	482	{10, 8, 25, 28, 29}, // 22
510	{8, 7, 23, 26, 36}, /*23 */	483	{ 8, 7, 23, 26, 36}, // 23
511	{6, 6, 20, 22, 46}, /*24 */	484	{ 6, 6, 20, 22, 46}, // 24
512	{4, 5, 17, 18, 56}, /*25 */	485	{ 4, 5, 17, 18, 56}, // 25
513	{2, 4, 12, 14, 68}, /*26 */	486	{ 2, 4, 12, 14, 68}, // 26
514	{0, 3, 7, 10, 80}, /*27 */	487	{ 0, 3, 7, 10, 80}, // 27
515	{0, 0, 3, 7, 90}, /*28 */	488	{ 0, 0, 3, 7, 90}, // 28
516	{0, 0, 0, 3, 97}, /*29 */	489	{ 0, 0, 0, 3, 97}, // 29
517	{0, 0, 0, 0, 100}, /*30 */	490	{ 0, 0, 0, 0, 100}, // 30
518	{0, 0, 0, 0, 100}, /*31 */	491	{ 0, 0, 0, 0, 100}, // 31
519	};	492	};
520
521		493
522	/* calculate the appropriate level for wands staves and scrolls.	494	/* calculate the appropriate level for wands staves and scrolls.
523	* This code presumes that op has had its spell object created (in op->inv)	495	* This code presumes that op has had its spell object created (in op->inv)
524	*	496	*
525	* elmex Wed Aug 9 17:44:59 CEST 2006:	497	* elmex Wed Aug 9 17:44:59 CEST 2006:
526	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	498	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
527	*/	499	*/
528		500	static int
529	int
530	level_for_item (const object *op, int difficulty)	501	level_for_item (const object *op, int difficulty)
531	{	502	{
532	int olevel = 0;
533
534	if (!op->inv)	503	if (!op->inv)
535	{	504	{
536	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	505	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
537	return 0;	506	return 0;
538	}	507	}
539		508
540	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	509	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
541		510
542	if (olevel <= 0)	511	if (olevel <= 0)
543	olevel = rndm (1, MIN (op->inv->level, 1));	512	olevel = rndm (1, op->inv->level);
544		513
545	if (olevel > MAXLEVEL)	514	return min (olevel, MAXLEVEL);
546	olevel = MAXLEVEL;
547
548	return olevel;
549	}	515	}
550		516
551	/*	517	/*
552	* Based upon the specified difficulty and upon the difftomagic_list array,	518	* Based upon the specified difficulty and upon the difftomagic_list array,
553	* a random magical bonus is returned. This is used when determine	519	* a random magical bonus is returned. This is used when determine
…		…
556	* elmex Thu Aug 10 18:45:44 CEST 2006:	522	* elmex Thu Aug 10 18:45:44 CEST 2006:
557	* Scaling difficulty by max_level, as difficulty is a level and not some	523	* Scaling difficulty by max_level, as difficulty is a level and not some
558	* weird integer between 1-31.	524	* weird integer between 1-31.
559	*	525	*
560	*/	526	*/
561		527	static int
562	int
563	magic_from_difficulty (int difficulty)	528	magic_from_difficulty (int difficulty)
564	{	529	{
565	int percent = 0, magic = 0;	530	int percent = 0, magic = 0;
566	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	531	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
567		532
…		…
610		575
611	op->magic = magic;	576	op->magic = magic;
612	if (op->arch)	577	if (op->arch)
613	{	578	{
614	if (op->type == ARMOUR)	579	if (op->type == ARMOUR)
615	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	580	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
616		581
617	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	582	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
618	magic = (-magic);	583	magic = (-magic);
		584
619	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	585	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
620	}	586	}
621	else	587	else
622	{	588	{
623	if (op->type == ARMOUR)	589	if (op->type == ARMOUR)
624	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	590	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		591
625	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */	592	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
626	magic = (-magic);	593	magic = (-magic);
		594
627	op->weight = (op->weight * (100 - magic * 10)) / 100;	595	op->weight = (op->weight * (100 - magic * 10)) / 100;
628	}	596	}
629	}	597	}
630		598
631	/*	599	/*
…		…
654	* 1) Since rings can have multiple bonuses, if the same bonus	622	* 1) Since rings can have multiple bonuses, if the same bonus
655	* is rolled again, increase it - the bonuses now stack with	623	* is rolled again, increase it - the bonuses now stack with
656	* other bonuses previously rolled and ones the item might natively have.	624	* other bonuses previously rolled and ones the item might natively have.
657	* 2) Add code to deal with new PR method.	625	* 2) Add code to deal with new PR method.
658	*/	626	*/
659		627	static void
660	void
661	set_ring_bonus (object *op, int bonus)	628	set_ring_bonus (object *op, int bonus)
662	{	629	{
663
664	int r = rndm (bonus > 0 ? 25 : 11);	630	int r = rndm (bonus > 0 ? 25 : 11);
665		631
666	if (op->type == AMULET)	632	if (op->type == AMULET)
667	{	633	{
668	if (!(rndm (21)))	634	if (!(rndm (21)))
…		…
687	case 2:	653	case 2:
688	case 3:	654	case 3:
689	case 4:	655	case 4:
690	case 5:	656	case 5:
691	case 6:	657	case 6:
692	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	658	op->stats.stat (r) += bonus;
693	break;	659	break;
694		660
695	case 7:	661	case 7:
696	op->stats.dam += bonus;	662	op->stats.dam += bonus;
697	break;	663	break;
…		…
791	* higher is the chance of returning a low number.	757	* higher is the chance of returning a low number.
792	* It is only used in fix_generated_treasure() to set bonuses on	758	* It is only used in fix_generated_treasure() to set bonuses on
793	* rings and amulets.	759	* rings and amulets.
794	* Another scheme is used to calculate the magic of weapons and armours.	760	* Another scheme is used to calculate the magic of weapons and armours.
795	*/	761	*/
796	int	762	static int
797	get_magic (int diff)	763	get_magic (int diff)
798	{	764	{
799	int i;	765	int i;
800		766
801	if (diff < 3)	767	if (diff < 3)
…		…
804	for (i = 0; i < 4; i++)	770	for (i = 0; i < 4; i++)
805	if (rndm (diff))	771	if (rndm (diff))
806	return i;	772	return i;
807		773
808	return 4;	774	return 4;
		775	}
		776
		777	/* special_potion() - so that old potion code is still done right. */
		778	static int
		779	special_potion (object *op)
		780	{
		781	if (op->attacktype)
		782	return 1;
		783
		784	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
		785	return 1;
		786
		787	for (int i = 0; i < NROFATTACKS; i++)
		788	if (op->resist[i])
		789	return 1;
		790
		791	return 0;
809	}	792	}
810		793
811	#define DICE2 (get_magic(2)==2?2:1)	794	#define DICE2 (get_magic(2)==2?2:1)
812	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	795	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
813		796
…		…
831	* value.	814	* value.
832	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	815	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
833	* a working object - don't change magic, value, etc, but set it material	816	* a working object - don't change magic, value, etc, but set it material
834	* type as appropriate, for objects that need spell objects, set those, etc	817	* type as appropriate, for objects that need spell objects, set those, etc
835	*/	818	*/
836
837	void	819	void
838	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)	820	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
839	{	821	{
840	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	822	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
841		823
…		…
846	save_item_power = op->item_power;	828	save_item_power = op->item_power;
847	op->item_power = 0;	829	op->item_power = 0;
848		830
849	if (op->randomitems && op->type != SPELL)	831	if (op->randomitems && op->type != SPELL)
850	{	832	{
851	create_treasure (op->randomitems, op, flags, difficulty, 0);	833	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
852	if (!op->inv)
853	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
854
855	/* So the treasure doesn't get created again */	834	/* So the treasure doesn't get created again */
856	op->randomitems = NULL;	835	op->randomitems = 0;
857	}	836	}
858		837
859	if (difficulty < 1)	838	max_it (difficulty, 1);
860	difficulty = 1;
861		839
862	if (INVOKE_OBJECT (ADD_BONUS, op,	840	if (INVOKE_OBJECT (ADD_BONUS, op,
863	ARG_OBJECT (creator != op ? creator : 0),	841	ARG_OBJECT (creator != op ? creator : 0),
864	ARG_INT (difficulty), ARG_INT (max_magic),	842	ARG_INT (difficulty), ARG_INT (max_magic),
865	ARG_INT (flags)))	843	ARG_INT (flags)))
866	return;	844	return;
867		845
868	if (!(flags & GT_MINIMAL))	846	if (!(flags & GT_MINIMAL))
869	{	847	{
870	if (op->arch == crown_arch)	848	if (IS_ARCH (op->arch, crown))
871	{	849	{
872	set_magic (difficulty, op, max_magic, flags);	850	set_magic (difficulty, op, max_magic, flags);
873	num_enchantments = calc_item_power (op, 1);	851	num_enchantments = calc_item_power (op, 1);
874	generate_artifact (op, difficulty);	852	generate_artifact (op, difficulty);
875	}	853	}
…		…
880		858
881	num_enchantments = calc_item_power (op, 1);	859	num_enchantments = calc_item_power (op, 1);
882		860
883	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))	861	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
884	|| op->type == HORN	862	|| op->type == HORN
885	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact,	863	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
886	* used for shop_floors or treasures */
887	generate_artifact (op, difficulty);	864	generate_artifact (op, difficulty);
888	}	865	}
889		866
890	/* Object was made an artifact. Calculate its item_power rating.	867	/* Object was made an artifact. Calculate its item_power rating.
891	* the item_power in the object is what the artfiact adds.	868	* the item_power in the object is what the artfiact adds.
…		…
925	* again below */	902	* again below */
926	}	903	}
927	}	904	}
928		905
929	/* materialtype modifications. Note we allow this on artifacts. */	906	/* materialtype modifications. Note we allow this on artifacts. */
930	set_materialname (op, difficulty, NULL);	907	select_material (op, difficulty);
931		908
932	if (flags & GT_MINIMAL)	909	if (flags & GT_MINIMAL)
933	{	910	{
934	if (op->type == POTION)	911	if (op->type == POTION)
935	/* Handle healing and magic power potions */	912	/* Handle healing and magic power potions */
936	if (op->stats.sp && !op->randomitems)	913	if (op->stats.sp && !op->randomitems)
937	{	914	{
938	object *tmp;
939
940	tmp = get_archetype (spell_mapping[op->stats.sp]);	915	object *tmp = get_archetype (spell_mapping [op->stats.sp]);
941	insert_ob_in_ob (tmp, op);	916	insert_ob_in_ob (tmp, op);
942	op->stats.sp = 0;	917	op->stats.sp = 0;
943	}	918	}
944	}	919	}
945	else if (!op->title) /* Only modify object if not special */	920	else if (!op->title) /* Only modify object if not special */
…		…
968	int too_many_tries = 0, is_special = 0;	943	int too_many_tries = 0, is_special = 0;
969		944
970	/* Handle healing and magic power potions */	945	/* Handle healing and magic power potions */
971	if (op->stats.sp && !op->randomitems)	946	if (op->stats.sp && !op->randomitems)
972	{	947	{
973	object *tmp;
974
975	tmp = get_archetype (spell_mapping[op->stats.sp]);	948	object *tmp = get_archetype (spell_mapping[op->stats.sp]);
976	insert_ob_in_ob (tmp, op);	949	insert_ob_in_ob (tmp, op);
977	op->stats.sp = 0;	950	op->stats.sp = 0;
978	}	951	}
979		952
980	while (!(is_special = special_potion (op)) && !op->inv)	953	while (!(is_special = special_potion (op)) && !op->inv)
…		…
988	* since the value set on those is already correct.	961	* since the value set on those is already correct.
989	*/	962	*/
990	if (op->inv && op->randomitems)	963	if (op->inv && op->randomitems)
991	{	964	{
992	/* value multiplier is same as for scrolls */	965	/* value multiplier is same as for scrolls */
993	op->value = (op->value * op->inv->value);	966	op->value *= op->inv->value;
994	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	967	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
995	}	968	}
996	else	969	else
997	{	970	{
998	op->name = "potion";	971	op->name = "potion";
999	op->name_pl = "potions";	972	op->name_pl = "potions";
1000	}	973	}
1001		974
1002	if (!(flags & GT_ONLY_GOOD) && rndm (2))	975	if (!(flags & GT_ONLY_GOOD) && rndm (2))
1003	SET_FLAG (op, FLAG_CURSED);	976	SET_FLAG (op, FLAG_CURSED);
		977
1004	break;	978	break;
1005	}	979	}
1006		980
1007	case AMULET:	981	case AMULET:
1008	if (op->arch == amulet_arch)	982	if (IS_ARCH (op->arch, amulet))
1009	op->value *= 5; /* Since it's not just decoration */	983	op->value *= 5; /* Since it's not just decoration */
1010		984
1011	case RING:	985	case RING:
1012	if (op->arch == NULL)
1013	{
1014	op->destroy ();
1015	op = 0;
1016	break;
1017	}
1018
1019	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	986	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
1020	break;	987	break;
1021		988
1022	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	989	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1023	SET_FLAG (op, FLAG_CURSED);	990	SET_FLAG (op, FLAG_CURSED);
1024		991
…		…
1044	op->value *= 5;	1011	op->value *= 5;
1045	set_ring_bonus (op, d);	1012	set_ring_bonus (op, d);
1046	}	1013	}
1047	}	1014	}
1048		1015
1049	if (GET_ANIM_ID (op))	1016	if (op->animation_id)
1050	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1017	op->set_anim_frame (rndm (op->anim_frames ()));
1051		1018
1052	break;	1019	break;
1053		1020
1054	case BOOK:	1021	case BOOK:
1055	/* Is it an empty book?, if yes lets make a special·	1022	/* Is it an empty book?, if yes lets make a special·
…		…
1070	op->level = rndm (creator->level);	1037	op->level = rndm (creator->level);
1071		1038
1072	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1039	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1073	/* books w/ info are worth more! */	1040	/* books w/ info are worth more! */
1074	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));	1041	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1075	/* creator related stuff */
1076
1077	/* for library, chained books. Note that some monsters have no_pick
1078	* set - we don't want to set no pick in that case.
1079	*/
1080	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1081	SET_FLAG (op, FLAG_NO_PICK);
1082	if (creator->slaying && !op->slaying) /* for check_inv floors */
1083	op->slaying = creator->slaying;
1084		1042
1085	/* add exp so reading it gives xp (once) */	1043	/* add exp so reading it gives xp (once) */
1086	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1044	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1087	}	1045	}
		1046
		1047	/* creator related stuff */
		1048
		1049	/* for library, chained books. Note that some monsters have no_pick
		1050	* set - we don't want to set no pick in that case.
		1051	*/
		1052	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
		1053	SET_FLAG (op, FLAG_NO_PICK);
		1054	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1055	op->slaying = creator->slaying;
1088	break;	1056	break;
1089		1057
1090	case SPELLBOOK:	1058	case SPELLBOOK:
1091	op->value = op->value * op->inv->value;	1059	op->value = op->value * op->inv->value;
1092	/* add exp so learning gives xp */	1060	/* add exp so learning gives xp */
…		…
1126	* 10 time multiplier). This way, the value are a bit more reasonable.	1094	* 10 time multiplier). This way, the value are a bit more reasonable.
1127	*/	1095	*/
1128	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1096	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1129	/* maxhp is used to denote how many 'charges' the rod holds before */	1097	/* maxhp is used to denote how many 'charges' the rod holds before */
1130	if (op->stats.maxhp)	1098	if (op->stats.maxhp)
1131	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1099	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1132	else	1100	else
1133	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1101	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1134		1102
1135	op->stats.hp = op->stats.maxhp;	1103	op->stats.hp = op->stats.maxhp;
1136	break;	1104	break;
1137		1105
1138	case SCROLL:	1106	case SCROLL:
…		…
1174	*/	1142	*/
1175		1143
1176	/*	1144	/*
1177	* Allocate and return the pointer to an empty artifactlist structure.	1145	* Allocate and return the pointer to an empty artifactlist structure.
1178	*/	1146	*/
1179
1180	static artifactlist *	1147	static artifactlist *
1181	get_empty_artifactlist (void)	1148	get_empty_artifactlist ()
1182	{	1149	{
1183	artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist));	1150	return salloc0<artifactlist> ();
1184
1185	if (al == NULL)
1186	fatal (OUT_OF_MEMORY);
1187	al->next = NULL;
1188	al->items = NULL;
1189	al->total_chance = 0;
1190	return al;
1191	}	1151	}
1192		1152
1193	/*	1153	/*
1194	* Allocate and return the pointer to an empty artifact structure.	1154	* Allocate and return the pointer to an empty artifact structure.
1195	*/	1155	*/
1196
1197	static artifact *	1156	static artifact *
1198	get_empty_artifact (void)	1157	get_empty_artifact ()
1199	{	1158	{
1200	artifact *a = (artifact *) malloc (sizeof (artifact));	1159	return salloc0<artifact> ();
1201
1202	if (a == NULL)
1203	fatal (OUT_OF_MEMORY);
1204	a->item = NULL;
1205	a->next = NULL;
1206	a->chance = 0;
1207	a->difficulty = 0;
1208	a->allowed = NULL;
1209	return a;
1210	}	1160	}
1211		1161
1212	/*	1162	/*
1213	* Searches the artifact lists and returns one that has the same type	1163	* Searches the artifact lists and returns one that has the same type
1214	* of objects on it.	1164	* of objects on it.
1215	*/	1165	*/
1216
1217	artifactlist *	1166	artifactlist *
1218	find_artifactlist (int type)	1167	find_artifactlist (int type)
1219	{	1168	{
1220	artifactlist *al;
1221
1222	for (al = first_artifactlist; al != NULL; al = al->next)	1169	for (artifactlist *al = first_artifactlist; al; al = al->next)
1223	if (al->type == type)	1170	if (al->type == type)
1224	return al;	1171	return al;
		1172
1225	return NULL;	1173	return 0;
1226	}	1174	}
1227		1175
1228	/*	1176	/*
1229	* For debugging purposes. Dumps all tables.	1177	* Builds up the lists of artifacts from the file in the libdir.
1230	*/	1178	*/
1231
1232	void	1179	void
1233	dump_artifacts (void)
1234	{
1235	artifactlist *al;
1236	artifact *art;
1237	linked_char *next;
1238
1239	fprintf (logfile, "\n");
1240	for (al = first_artifactlist; al != NULL; al = al->next)
1241	{
1242	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1243	for (art = al->items; art != NULL; art = art->next)
1244	{
1245	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246	if (art->allowed != NULL)
1247	{
1248	fprintf (logfile, "\tAllowed combinations:");
1249	for (next = art->allowed; next != NULL; next = next->next)
1250	fprintf (logfile, "%s,", &next->name);
1251	fprintf (logfile, "\n");
1252	}
1253	}
1254	}
1255	fprintf (logfile, "\n");
1256	}
1257
1258	/*
1259	* For debugging purposes. Dumps all treasures recursively (see below).
1260	*/
1261	void
1262	dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1263	{
1264	treasurelist *tl;
1265	int i;
1266
1267	if (depth > 100)
1268	return;
1269	while (t)
1270	{
1271	if (t->name)
1272	{
1273	for (i = 0; i < depth; i++)
1274	fprintf (logfile, " ");
1275	fprintf (logfile, "{ (list: %s)\n", &t->name);
1276	tl = find_treasurelist (t->name);
1277	if (tl)
1278	dump_monster_treasure_rec (name, tl->items, depth + 2);
1279	for (i = 0; i < depth; i++)
1280	fprintf (logfile, " ");
1281	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282	}
1283	else
1284	{
1285	for (i = 0; i < depth; i++)
1286	fprintf (logfile, " ");
1287	if (t->item && t->item->clone.type == FLESH)
1288	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1289	else
1290	fprintf (logfile, "%s\n", &t->item->clone.name);
1291	}
1292
1293	if (t->next_yes)
1294	{
1295	for (i = 0; i < depth; i++)
1296	fprintf (logfile, " ");
1297	fprintf (logfile, " (if yes)\n");
1298	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1299	}
1300
1301	if (t->next_no)
1302	{
1303	for (i = 0; i < depth; i++)
1304	fprintf (logfile, " ");
1305	fprintf (logfile, " (if no)\n");
1306	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1307	}
1308
1309	t = t->next;
1310	}
1311	}
1312
1313	/*
1314	* For debugging purposes. Dumps all treasures for a given monster.
1315	* Created originally by Raphael Quinet for debugging the alchemy code.
1316	*/
1317
1318	void
1319	dump_monster_treasure (const char *name)
1320	{
1321	archetype *at;
1322	int found;
1323
1324	found = 0;
1325	fprintf (logfile, "\n");
1326	for (at = first_archetype; at != NULL; at = at->next)
1327	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1328	{
1329	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1330	if (at->clone.randomitems != NULL)
1331	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1332	else
1333	fprintf (logfile, "(nothing)\n");
1334	fprintf (logfile, "\n");
1335	found++;
1336	}
1337	if (found == 0)
1338	fprintf (logfile, "No objects have the name %s!\n\n", name);
1339	}
1340
1341	/*
1342	* Builds up the lists of artifacts from the file in the libdir.
1343	*/
1344
1345	void
1346	init_artifacts (void)	1180	init_artifacts ()
1347	{	1181	{
1348	static int has_been_inited = 0;	1182	static int has_been_inited = 0;
1349	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;	1183	char filename[MAX_BUF];
1350	artifact *art = NULL;	1184	artifact *art = NULL;
1351	linked_char *tmp;
1352	int value;
1353	artifactlist *al;	1185	artifactlist *al;
1354		1186
1355	if (has_been_inited)	1187	if (has_been_inited)
1356	return;	1188	return;
1357	else	1189	else
1358	has_been_inited = 1;	1190	has_been_inited = 1;
1359		1191
1360	sprintf (filename, "%s/artifacts", settings.datadir);	1192	sprintf (filename, "%s/artifacts", settings.datadir);
1361	object_thawer thawer (filename);	1193	object_thawer f (filename);
1362		1194
1363	if (!thawer)	1195	if (!f)
1364	return;	1196	return;
1365		1197
1366	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1198	for (;;)
1367	{	1199	{
1368	if (*buf == '#')	1200	switch (f.kw)
1369	continue;
1370	if ((cp = strchr (buf, '\n')) != NULL)
1371	*cp = '\0';
1372	cp = buf;
1373	while (*cp == ' ') /* Skip blanks */
1374	cp++;
1375	if (*cp == '\0')
1376	continue;
1377
1378	if (!strncmp (cp, "Allowed", 7))
1379	{	1201	{
		1202	case KW_allowed:
1380	if (art == NULL)	1203	if (!art)
		1204	art = get_empty_artifact ();
		1205
1381	{	1206	{
1382	art = get_empty_artifact ();	1207	if (!strcmp (f.get_str (), "all"))
1383	nrofartifacts++;	1208	break;
		1209
		1210	const char *cp = f.get_str ();
		1211	char *next;
		1212	do
		1213	{
		1214	if ((next = (char *)strchr (cp, ',')))
		1215	*next++ = '\0';
		1216
		1217	linked_char *tmp = new linked_char;
		1218
		1219	tmp->name = cp;
		1220	tmp->next = art->allowed;
		1221	art->allowed = tmp;
		1222	}
		1223	while ((cp = next));
1384	}	1224	}
1385	cp = strchr (cp, ' ') + 1;	1225	break;
1386	if (!strcmp (cp, "all"))	1226
		1227	case KW_chance:
		1228	f.get (art->chance);
		1229	break;
		1230
		1231	case KW_difficulty:
		1232	f.get (art->difficulty);
		1233	break;
		1234
		1235	case KW_object:
		1236	{
		1237	art->item = object::create ();
		1238	f.get (art->item->name);
		1239	f.next ();
		1240
		1241	if (!art->item->parse_kv (f))
		1242	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1243
		1244	al = find_artifactlist (art->item->type);
		1245
		1246	if (!al)
		1247	{
		1248	al = get_empty_artifactlist ();
		1249	al->type = art->item->type;
		1250	al->next = first_artifactlist;
		1251	first_artifactlist = al;
		1252	}
		1253
		1254	art->next = al->items;
		1255	al->items = art;
		1256	art = 0;
		1257	}
1387	continue;	1258	continue;
1388		1259
1389	do	1260	case KW_EOF:
		1261	goto done;
		1262
		1263	default:
		1264	if (!f.parse_error ("artifacts file"))
		1265	cleanup ("artifacts file required");
1390	{	1266	break;
1391	nrofallowedstr++;
1392	if ((next = strchr (cp, ',')) != NULL)
1393	*(next++) = '\0';
1394	tmp = new linked_char;
1395
1396	tmp->name = cp;
1397	tmp->next = art->allowed;
1398	art->allowed = tmp;
1399	}
1400	while ((cp = next) != NULL);
1401	}
1402	else if (sscanf (cp, "chance %d", &value))
1403	art->chance = (uint16) value;
1404	else if (sscanf (cp, "difficulty %d", &value))
1405	art->difficulty = (uint8) value;
1406	else if (!strncmp (cp, "Object", 6) || !strncmp (cp, "object", 6))
1407	{	1267	}
1408	art->item = object::create ();
1409		1268
1410	if (!load_object (thawer, art->item, 0))	1269	f.next ();
1411	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1412
1413	art->item->name = strchr (cp, ' ') + 1;
1414	al = find_artifactlist (art->item->type);
1415	if (al == NULL)
1416	{
1417	al = get_empty_artifactlist ();
1418	al->type = art->item->type;
1419	al->next = first_artifactlist;
1420	first_artifactlist = al;
1421	}
1422	art->next = al->items;
1423	al->items = art;
1424	art = NULL;
1425	}
1426	else
1427	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1428	}	1270	}
1429		1271
		1272	done:
1430	for (al = first_artifactlist; al != NULL; al = al->next)	1273	for (al = first_artifactlist; al; al = al->next)
1431	{	1274	{
		1275	al->total_chance = 0;
		1276
1432	for (art = al->items; art != NULL; art = art->next)	1277	for (art = al->items; art; art = art->next)
1433	{	1278	{
1434	if (!art->chance)	1279	if (!art->chance)
1435	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1280	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1436	else	1281	else
1437	al->total_chance += art->chance;	1282	al->total_chance += art->chance;
…		…
1442	}	1287	}
1443		1288
1444	LOG (llevDebug, "done.\n");	1289	LOG (llevDebug, "done.\n");
1445	}	1290	}
1446		1291
1447
1448	/*	1292	/*
1449	* Used in artifact generation. The bonuses of the first object	1293	* Used in artifact generation. The bonuses of the first object
1450	* is modified by the bonuses of the second object.	1294	* is modified by the bonuses of the second object.
1451	*/	1295	*/
1452
1453	void	1296	void
1454	add_abilities (object *op, object *change)	1297	add_abilities (object *op, object *change)
1455	{	1298	{
1456	int i, tmp;	1299	int i, tmp;
1457		1300
1458	if (change->face != blank_face)	1301	if (change->face != blank_face)
1459	{	1302	{
1460	#ifdef TREASURE_VERBOSE	1303	#ifdef TREASURE_VERBOSE
1461	LOG (llevDebug, "FACE: %d\n", change->face->number);	1304	LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1462	#endif	1305	#endif
1463	op->face = change->face;	1306	op->face = change->face;
1464	}	1307	}
1465		1308
1466	for (i = 0; i < NUM_STATS; i++)	1309	for (i = 0; i < NUM_STATS; i++)
1467	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1310	change_attr_value (&(op->stats), i, change->stats.stat (i));
1468		1311
1469	op->attacktype |= change->attacktype;	1312	op->attacktype |= change->attacktype;
1470	op->path_attuned |= change->path_attuned;	1313	op->path_attuned |= change->path_attuned;
1471	op->path_repelled |= change->path_repelled;	1314	op->path_repelled |= change->path_repelled;
1472	op->path_denied |= change->path_denied;	1315	op->path_denied |= change->path_denied;
…		…
1520	* to cast. So convert that to into a spell and put it into	1363	* to cast. So convert that to into a spell and put it into
1521	* this object.	1364	* this object.
1522	*/	1365	*/
1523	if (op->type == HORN || op->type == POTION)	1366	if (op->type == HORN || op->type == POTION)
1524	{	1367	{
1525	object *tmp_obj;
1526
1527	/* Remove any spells this object currently has in it */	1368	/* Remove any spells this object currently has in it */
1528	while (op->inv)
1529	op->inv->destroy ();	1369	op->destroy_inv (false);
1530		1370
1531	tmp_obj = arch_to_object (change->other_arch);	1371	object *tmp = change->other_arch->instance ();
1532	insert_ob_in_ob (tmp_obj, op);	1372	insert_ob_in_ob (tmp, op);
1533	}	1373	}
1534	/* No harm setting this for potions/horns */	1374	/* No harm setting this for potions/horns */
1535	op->other_arch = change->other_arch;	1375	op->other_arch = change->other_arch;
1536	}	1376	}
1537		1377
…		…
1622	op->value *= change->value;	1462	op->value *= change->value;
1623		1463
1624	if (change->materials)	1464	if (change->materials)
1625	op->materials = change->materials;	1465	op->materials = change->materials;
1626		1466
1627	if (change->materialname)	1467	if (change->material != MATERIAL_NULL)
1628	op->materialname = change->materialname;	1468	op->material = change->material;
1629		1469
1630	if (change->slaying)	1470	if (change->slaying)
1631	op->slaying = change->slaying;	1471	op->slaying = change->slaying;
1632		1472
1633	if (change->race)	1473	if (change->race)
…		…
1636	if (change->msg)	1476	if (change->msg)
1637	op->msg = change->msg;	1477	op->msg = change->msg;
1638	}	1478	}
1639		1479
1640	static int	1480	static int
1641	legal_artifact_combination (object *op, artifact * art)	1481	legal_artifact_combination (object *op, artifact *art)
1642	{	1482	{
1643	int neg, success = 0;	1483	int neg, success = 0;
1644	linked_char *tmp;	1484	linked_char *tmp;
1645	const char *name;	1485	const char *name;
1646		1486
1647	if (art->allowed == (linked_char *) NULL)	1487	if (!art->allowed)
1648	return 1; /* Ie, "all" */	1488	return 1; /* Ie, "all" */
		1489
1649	for (tmp = art->allowed; tmp; tmp = tmp->next)	1490	for (tmp = art->allowed; tmp; tmp = tmp->next)
1650	{	1491	{
1651	#ifdef TREASURE_VERBOSE	1492	#ifdef TREASURE_VERBOSE
1652	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1493	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1653	#endif	1494	#endif
1654	if (*tmp->name == '!')	1495	if (*tmp->name == '!')
1655	name = tmp->name + 1, neg = 1;	1496	name = tmp->name + 1, neg = 1;
1656	else	1497	else
1657	name = tmp->name, neg = 0;	1498	name = tmp->name, neg = 0;
1658		1499
1659	/* If we match name, then return the opposite of 'neg' */	1500	/* If we match name, then return the opposite of 'neg' */
1660	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1501	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1661	return !neg;	1502	return !neg;
1662		1503
1663	/* Set success as true, since if the match was an inverse, it means	1504	/* Set success as true, since if the match was an inverse, it means
1664	* everything is allowed except what we match	1505	* everything is allowed except what we match
1665	*/	1506	*/
1666	else if (neg)	1507	else if (neg)
1667	success = 1;	1508	success = 1;
1668	}	1509	}
		1510
1669	return success;	1511	return success;
1670	}	1512	}
1671		1513
1672	/*	1514	/*
1673	* Fixes the given object, giving it the abilities and titles	1515	* Fixes the given object, giving it the abilities and titles
…		…
1740	#if 1	1582	#if 1
1741	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1583	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1742	#endif	1584	#endif
1743	return;	1585	return;
1744	}	1586	}
1745	if (!strcmp (art->item->name, "NONE"))	1587
		1588	if (art->item->name == shstr_NONE)
1746	return;	1589	return;
		1590
1747	if (FABS (op->magic) < art->item->magic)	1591	if (fabs (op->magic) < art->item->magic)
1748	continue; /* Not magic enough to be this item */	1592	continue; /* Not magic enough to be this item */
1749		1593
1750	/* Map difficulty not high enough */	1594	/* Map difficulty not high enough */
1751	if (difficulty < art->difficulty)	1595	if (difficulty < art->difficulty)
1752	continue;	1596	continue;
1753		1597
1754	if (!legal_artifact_combination (op, art))	1598	if (!legal_artifact_combination (op, art))
1755	{	1599	{
1756	#ifdef TREASURE_VERBOSE	1600	#ifdef TREASURE_VERBOSE
1757	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1601	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1758	#endif	1602	#endif
1759	continue;	1603	continue;
1760	}	1604	}
		1605
1761	give_artifact_abilities (op, art->item);	1606	give_artifact_abilities (op, art->item);
1762	return;	1607	return;
1763	}	1608	}
1764	}	1609	}
1765		1610
…		…
1802	item->level = donor->level;	1647	item->level = donor->level;
1803		1648
1804	/* if donor has some attacktypes, the flesh is poisonous */	1649	/* if donor has some attacktypes, the flesh is poisonous */
1805	if (donor->attacktype & AT_POISON)	1650	if (donor->attacktype & AT_POISON)
1806	item->type = POISON;	1651	item->type = POISON;
		1652
1807	if (donor->attacktype & AT_ACID)	1653	if (donor->attacktype & AT_ACID)
1808	item->stats.hp = -1 * item->stats.food;	1654	item->stats.hp = -1 * item->stats.food;
		1655
1809	SET_FLAG (item, FLAG_NO_STEAL);	1656	SET_FLAG (item, FLAG_NO_STEAL);
1810	}	1657	}
1811	}	1658	}
1812		1659
1813	/* special_potion() - so that old potion code is still done right. */	1660	static void
1814
1815	int
1816	special_potion (object *op)
1817	{
1818	if (op->attacktype)
1819	return 1;
1820
1821	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1822	return 1;
1823
1824	for (int i = 0; i < NROFATTACKS; i++)
1825	if (op->resist[i])
1826	return 1;
1827
1828	return 0;
1829	}
1830
1831	void
1832	free_treasurestruct (treasure *t)	1661	free_treasurestruct (treasure *t)
1833	{	1662	{
1834	if (t->next)
1835	free_treasurestruct (t->next);	1663	if (t->next) free_treasurestruct (t->next);
1836	if (t->next_yes)
1837	free_treasurestruct (t->next_yes);	1664	if (t->next_yes) free_treasurestruct (t->next_yes);
1838	if (t->next_no)
1839	free_treasurestruct (t->next_no);	1665	if (t->next_no) free_treasurestruct (t->next_no);
1840		1666
1841	delete t;	1667	delete t;
1842	}	1668	}
1843		1669
1844	void	1670	static void
1845	free_charlinks (linked_char *lc)	1671	free_charlinks (linked_char *lc)
1846	{	1672	{
1847	if (lc->next)	1673	if (lc->next)
1848	free_charlinks (lc->next);	1674	free_charlinks (lc->next);
1849		1675
1850	delete lc;	1676	delete lc;
1851	}	1677	}
1852		1678
1853	void	1679	static void
1854	free_artifact (artifact * at)	1680	free_artifact (artifact *at)
1855	{	1681	{
1856	if (at->next)
1857	free_artifact (at->next);	1682	if (at->next) free_artifact (at->next);
1858
1859	if (at->allowed)
1860	free_charlinks (at->allowed);	1683	if (at->allowed) free_charlinks (at->allowed);
1861		1684
1862	at->item->destroy (1);	1685	at->item->destroy ();
1863		1686
1864	delete at;
1865	}
1866
1867	void
1868	free_artifactlist (artifactlist * al)
1869	{
1870	artifactlist *nextal;
1871
1872	for (al = first_artifactlist; al; al = nextal)
1873	{
1874	nextal = al->next;
1875
1876	if (al->items)
1877	free_artifact (al->items);
1878
1879	free (al);	1687	sfree (at);
1880	}
1881	}	1688	}
1882		1689
1883	void
1884	free_all_treasures (void)
1885	{
1886	treasurelist *tl, *next;
1887
1888
1889	for (tl = first_treasurelist; tl != NULL; tl = next)
1890	{
1891	next = tl->next;
1892	if (tl->items)
1893	free_treasurestruct (tl->items);
1894	delete tl;
1895	}
1896	free_artifactlist (first_artifactlist);
1897	}

Diff Legend

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