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.9 by elmex, Sun Sep 3 14:33:48 2006 UTC vs.
Revision 1.125 by root, Sat Oct 8 21:54:05 2022 UTC

1
2	/*	1	/*
3	* static char *rcs_treasure_c =	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4	* "$Id: treasure.C,v 1.9 2006/09/03 14:33:48 elmex Exp $";
5	*/	3	*
6		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
7	/*	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
8	CrossFire, A Multiplayer game for X-windows
9
10	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
12		8	*
13	This program is free software; you can redistribute it and/or modify	9	* Deliantra is free software: you can redistribute it and/or modify it under
14	it under the terms of the GNU General Public License as published by	10	* the terms of the Affero GNU General Public License as published by the
15	the Free Software Foundation; either version 2 of the License, or	11	* Free Software Foundation, either version 3 of the License, or (at your
16	(at your option) any later version.	12	* option) any later version.
17		13	*
18	This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
19	but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
20	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21	GNU General Public License for more details.	17	* GNU General Public License for more details.
22		18	*
23	You should have received a copy of the GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
24	along with this program; if not, write to the Free Software	20	* and the GNU General Public License along with this program. If not, see
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	21	* <http://www.gnu.org/licenses/>.
26		22	*
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	23	* The authors can be reached via e-mail to <support@deliantra.net>
28	*/	24	*/
29
30	#define ALLOWED_COMBINATION
31		25
32	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	26	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
33	* It is useful for finding bugs in the treasures file. Since it only	27	* It is useful for finding bugs in the treasures file. Since it only
34	* slows the startup some (and not actual game play), it is by default	28	* slows the startup some (and not actual game play), it is by default
35	* left on	29	* left on
36	*/	30	*/
37	#define TREASURE_DEBUG	31	#define TREASURE_DEBUG
38		32
39	/* TREASURE_VERBOSE enables copious output concerning artifact generation */	33	/* TREASURE_VERBOSE enables copious output concerning artifact generation */
		34
40	/* #define TREASURE_VERBOSE */	35	//#define TREASURE_VERBOSE
41		36
42	#include <global.h>	37	#include <global.h>
43	#include <treasure.h>	38	#include <treasure.h>
44	#include <funcpoint.h>
45	#include <loader.h>
46		39
		40	#include <flat_hash_map.hpp>
47		41
48	static void change_treasure (treasure * t, object * op); /* overrule default values */	42	// used only by treasure.C, does not handle null arch ptrs
		43	#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
		44
49	extern char *spell_mapping[];	45	extern char *spell_mapping[];
50		46
51	/*	47	static treasurelist *first_treasurelist;
52	* Initialize global archtype pointers:
53	*/
54		48
55	void	49	static void change_treasure (treasure *t, object *op); /* overrule default values */
56	init_archetype_pointers ()
57	{
58	int prev_warn = warn_archetypes;
59	warn_archetypes = 1;
60	if (ring_arch == NULL)
61	ring_arch = find_archetype ("ring");
62	if (amulet_arch == NULL)
63	amulet_arch = find_archetype ("amulet");
64	if (staff_arch == NULL)
65	staff_arch = find_archetype ("staff");
66	if (crown_arch == NULL)
67	crown_arch = find_archetype ("crown");
68	warn_archetypes = prev_warn;
69	}
70		50
71	/*	51	typedef ska::flat_hash_map
72	* Allocate and return the pointer to an empty treasurelist structure.	52	<
73	*/	53	const char *,
		54	treasurelist *,
		55	str_hash,
		56	str_equal,
		57	slice_allocator< std::pair<const char *const, treasurelist *> >
		58	> tl_map_t;
74		59
		60	static tl_map_t tl_map;
		61
		62	//TODO: class method
		63	static void free_treasurestruct (treasure *t); // bleh desu
		64	static void
		65	clear (treasurelist *tl)
		66	{
		67	if (tl->items)
		68	{
		69	free_treasurestruct (tl->items);
		70	tl->items = 0;
		71	}
		72
		73	tl->total_chance = 0;
		74	}
		75
		76	/*
		77	* Searches for the given treasurelist
		78	*/
75	static treasurelist *	79	treasurelist *
76	get_empty_treasurelist (void)	80	treasurelist::find (const char *name)
77	{	81	{
		82	if (!name)
		83	return 0;
		84
		85	auto i = tl_map.find (name);
		86
		87	if (i == tl_map.end ())
		88	return 0;
		89
		90	return i->second;
		91	}
		92
		93	/*
		94	* Searches for the given treasurelist in the globally linked list
		95	* of treasurelists which has been built by load_treasures().
		96	*/
		97	treasurelist *
		98	treasurelist::get (const char *name)
		99	{
		100	treasurelist *tl = find (name);
		101
		102	if (!tl)
		103	{
78	return new treasurelist;	104	tl = new treasurelist;
79	}
80		105
81	/*	106	tl->name = name;
82	* Allocate and return the pointer to an empty treasure structure.	107	tl->next = first_treasurelist;
83	*/	108	first_treasurelist = tl;
84	//TODO: make this a constructor
85	static treasure *
86	get_empty_treasure (void)
87	{
88	treasure *t = new treasure;
89		109
90	t->chance = 100;	110	tl_map.insert (std::make_pair (tl->name, tl));
		111	}
91		112
92	return t;	113	return tl;
93	}
94
95	/*
96	* Reads the lib/treasure file from disk, and parses the contents
97	* into an internal treasure structure (very linked lists)
98	*/
99
100	static treasure *
101	load_treasure (FILE * fp, int *line)
102	{
103	char buf[MAX_BUF], *cp, variable[MAX_BUF];
104	treasure *t = get_empty_treasure ();
105	int value;
106
107	nroftreasures++;
108	while (fgets (buf, MAX_BUF, fp) != NULL)
109	{
110	(*line)++;
111
112	if (*buf == '#')
113	continue;
114	if ((cp = strchr (buf, '\n')) != NULL)
115	*cp = '\0';
116	cp = buf;
117	while (isspace (*cp)) /* Skip blanks */
118	cp++;
119
120	if (sscanf (cp, "arch %s", variable))
121	{
122	if ((t->item = find_archetype (variable)) == NULL)
123	LOG (llevError, "Treasure lacks archetype: %s\n", variable);
124	}
125	else if (sscanf (cp, "list %s", variable))
126	t->name = variable;
127	else if (sscanf (cp, "change_name %s", variable))
128	t->change_arch.name = variable;
129	else if (sscanf (cp, "change_title %s", variable))
130	t->change_arch.title = variable;
131	else if (sscanf (cp, "change_slaying %s", variable))
132	t->change_arch.slaying = variable;
133	else if (sscanf (cp, "chance %d", &value))
134	t->chance = (uint8) value;
135	else if (sscanf (cp, "nrof %d", &value))
136	t->nrof = (uint16) value;
137	else if (sscanf (cp, "magic %d", &value))
138	t->magic = (uint8) value;
139	else if (!strcmp (cp, "yes"))
140	t->next_yes = load_treasure (fp, line);
141	else if (!strcmp (cp, "no"))
142	t->next_no = load_treasure (fp, line);
143	else if (!strcmp (cp, "end"))
144	return t;
145	else if (!strcmp (cp, "more"))
146	{
147	t->next = load_treasure (fp, line);
148	return t;
149	}
150	else
151	LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
152	}
153	LOG (llevError, "treasure lacks 'end'.\n");
154	return t;
155	}	114	}
156		115
157	#ifdef TREASURE_DEBUG	116	#ifdef TREASURE_DEBUG
158	/* recursived checks the linked list. Treasurelist is passed only	117	/* recursived checks the linked list. Treasurelist is passed only
159	* so that the treasure name can be printed out	118	* so that the treasure name can be printed out
160	*/	119	*/
161	static void	120	static void
162	check_treasurelist (const treasure * t, const treasurelist * tl)	121	check_treasurelist (const treasure *t, const treasurelist * tl)
163	{	122	{
164	if (t->item == NULL && t->name == NULL)
165	LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name);
166	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))	123	if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
167	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);	124	LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
168	/* find_treasurelist will print out its own error message */	125
169	if (t->name && *t->name)
170	(void) find_treasurelist (t->name);
171	if (t->next)	126	if (t->next)
172	check_treasurelist (t->next, tl);	127	check_treasurelist (t->next, tl);
		128
173	if (t->next_yes)	129	if (t->next_yes)
174	check_treasurelist (t->next_yes, tl);	130	check_treasurelist (t->next_yes, tl);
		131
175	if (t->next_no)	132	if (t->next_no)
176	check_treasurelist (t->next_no, tl);	133	check_treasurelist (t->next_no, tl);
177	}	134	}
178	#endif	135	#endif
179		136
180	/*	137	/*
181	* Opens LIBDIR/treasure and reads all treasure-declarations from it.	138	* Reads the lib/treasure file from disk, and parses the contents
		139	* into an internal treasure structure (very linked lists)
		140	*/
		141	static treasure *
		142	read_treasure (object_thawer &f)
		143	{
		144	treasure *t = new treasure;
		145
		146	f.next ();
		147
		148	for (;;)
		149	{
		150	coroapi::cede_to_tick ();
		151
		152	switch (f.kw)
		153	{
		154	case KW_arch:
		155	t->item = archetype::find (f.get_str ());
		156
		157	if (!t->item)
		158	{
		159	f.parse_warn ("treasure references unknown archetype");
		160	t->item = archetype::empty;
		161	}
		162
		163	break;
		164
		165	case KW_list: f.get (t->name); break;
		166	case KW_change_name: f.get (t->change_arch.name); break;
		167	case KW_change_title: f.get (t->change_arch.title); break;
		168	case KW_change_slaying: f.get (t->change_arch.slaying); break;
		169	case KW_chance: f.get (t->chance); break;
		170	case KW_nrof: f.get (t->nrof); break;
		171	case KW_magic: f.get (t->magic); break;
		172
		173	case KW_yes: t->next_yes = read_treasure (f); continue;
		174	case KW_no: t->next_no = read_treasure (f); continue;
		175
		176	case KW_end:
		177	f.next ();
		178	return t;
		179
		180	case KW_more:
		181	t->next = read_treasure (f);
		182	return t;
		183
		184	default:
		185	if (!f.parse_error ("treasurelist", t->name))
		186	goto error;
		187
		188	return t;
		189	}
		190
		191	f.next ();
		192	}
		193
		194	// not reached
		195
		196	error:
		197	delete t;
		198	return 0;
		199	}
		200
		201	/*
182	* Each treasure is parsed with the help of load_treasure().	202	* Each treasure is parsed with the help of load_treasure().
183	*/	203	*/
184		204	treasurelist *
185	void	205	treasurelist::read (object_thawer &f)
186	load_treasures (void)
187	{	206	{
188	FILE *fp;	207	assert (f.kw == KW_treasure || f.kw == KW_treasureone);
189	char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
190	treasurelist *previous = NULL;
191	treasure *t;
192	int comp, line = 0;
193		208
194	sprintf (filename, "%s/%s", settings.datadir, settings.treasures);	209	bool one = f.kw == KW_treasureone;
195	if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)	210	treasurelist *tl = treasurelist::get (f.get_str ());
196	{	211	clear (tl);
197	LOG (llevError, "Can't open treasure file.\n");	212	tl->items = read_treasure (f);
		213	if (!tl->items)
198	return;	214	return 0;
199	}
200	while (fgets (buf, MAX_BUF, fp) != NULL)
201	{
202	line++;
203	if (*buf == '#')
204	continue;
205		215
206	if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
207	{
208	treasurelist *tl = get_empty_treasurelist ();
209	tl->name = name;
210	if (previous == NULL)
211	first_treasurelist = tl;
212	else
213	previous->next = tl;
214	previous = tl;
215	tl->items = load_treasure (fp, &line);
216
217	/* This is a one of the many items on the list should be generated.	216	/* This is a one of the many items on the list should be generated.
218	* Add up the chance total, and check to make sure the yes & no	217	* Add up the chance total, and check to make sure the yes & no
219	* fields of the treasures are not being used.	218	* fields of the treasures are not being used.
220	*/
221	if (!strncmp (buf, "treasureone", 11))
222	{
223	for (t = tl->items; t != NULL; t = t->next)
224	{
225	#ifdef TREASURE_DEBUG
226	if (t->next_yes || t->next_no)
227	{
228	LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
229	LOG (llevError, " the next_yes or next_no field is set\n");
230	}
231	#endif
232	tl->total_chance += t->chance;
233	}
234	}
235	}
236	else
237	LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
238	}
239	close_and_delete (fp, comp);
240
241	#ifdef TREASURE_DEBUG
242	/* Perform some checks on how valid the treasure data actually is.
243	* verify that list transitions work (ie, the list that it is supposed
244	* to transition to exists). Also, verify that at least the name
245	* or archetype is set for each treasure element.
246	*/	219	*/
247	for (previous = first_treasurelist; previous != NULL; previous = previous->next)	220	if (one)
248	check_treasurelist (previous->items, previous);	221	{
249	#endif	222	for (treasure *t = tl->items; t; t = t->next)
250	}
251
252	/*
253	* Searches for the given treasurelist in the globally linked list
254	* of treasurelists which has been built by load_treasures().
255	*/
256
257	treasurelist *
258	find_treasurelist (const char *name)
259	{
260	const char *tmp = shstr::find (name);
261	treasurelist *tl;
262
263	/* Special cases - randomitems of none is to override default. If
264	* first_treasurelist is null, it means we are on the first pass of
265	* of loading archetyps, so for now, just return - second pass will
266	* init these values.
267	*/
268	if (!name || !*name)
269	return NULL;
270
271	if (tmp != NULL)
272	for (tl = first_treasurelist; tl != NULL; tl = tl->next)
273	{	223	{
274	if (tmp == tl->name)	224	if (t->next_yes || t->next_no)
275	return tl;	225	{
		226	LOG (llevError, "Treasure %s is one item, but on treasure %s%s\n",
		227	&tl->name,
		228	t->item ? "item " : "",
		229	t->item ? &t->item->archname : &t->name);
		230	LOG (llevError, " the next_yes or next_no field is set\n");
		231	}
		232
		233	tl->total_chance += t->chance;
276	}	234	}
		235	}
277		236
278	if (first_treasurelist)
279	LOG (llevError, "Couldn't find treasurelist %s(%s)\n", name, tmp);
280
281	return NULL;	237	return tl;
282	}	238	}
283
284		239
285	/*	240	/*
286	* Generates the objects specified by the given treasure.	241	* Generates the objects specified by the given treasure.
287	* It goes recursively through the rest of the linked list.	242	* It goes recursively through the rest of the linked list.
288	* If there is a certain percental chance for a treasure to be generated,	243	* If there is a certain percental chance for a treasure to be generated,
…		…
291	* being generated.	246	* being generated.
292	* If flag is GT_INVISIBLE, only invisible objects are generated (ie, only	247	* If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
293	* abilities. This is used by summon spells, thus no summoned monsters	248	* abilities. This is used by summon spells, thus no summoned monsters
294	* start with equipment, but only their abilities).	249	* start with equipment, but only their abilities).
295	*/	250	*/
296
297
298	static void	251	static void
299	put_treasure (object * op, object * creator, int flags)	252	put_treasure (object *op, object *creator, int flags)
300	{	253	{
301	object *tmp;	254	if (flags & GT_ENVIRONMENT)
302		255	{
303	/* Bit of a hack - spells should never be put onto the map. The entire	256	/* Bit of a hack - spells should never be put onto the map. The entire
304	* treasure stuff is a problem - there is no clear idea of knowing	257	* treasure stuff is a problem - there is no clear idea of knowing
305	* this is the original object, or if this is an object that should be created	258	* this is the original object, or if this is an object that should be created
306	* by another object.	259	* by another object.
307	*/	260	*/
308	if (flags & GT_ENVIRONMENT && op->type != SPELL)	261	//TODO: flag such as objects... as such (no drop, anybody?)
309	{	262	if (op->type == SPELL)
310	op->x = creator->x;	263	{
311	op->y = creator->y;	264	op->destroy ();
312	SET_FLAG (op, FLAG_OBJ_ORIGINAL);	265	return;
		266	}
		267
		268	op->expand_tail ();
		269
		270	if (!creator->is_on_map ()
		271	|| (op->weight && op->blocked (creator->map, creator->x, creator->y)))
		272	op->destroy ();
		273	else
		274	{
		275	op->flag [FLAG_OBJ_ORIGINAL] = true;
313	insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON);	276	op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
		277	}
314	}	278	}
315	else	279	else
316	{	280	{
317	op = insert_ob_in_ob (op, creator);	281	op = creator->insert (op);
		282
318	if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))	283	if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
319	monster_check_apply (creator, op);	284	monster_check_apply (creator, op);
320	if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL)
321	esrv_send_item (tmp, op);
322	}	285	}
323	}	286	}
324		287
325	/* if there are change_xxx commands in the treasure, we include the changes	288	/* if there are change_xxx commands in the treasure, we include the changes
326	* in the generated object	289	* in the generated object
327	*/	290	*/
328	static void	291	static void
329	change_treasure (treasure * t, object * op)	292	change_treasure (treasure *t, object *op)
330	{	293	{
331	/* CMD: change_name xxxx */	294	/* CMD: change_name xxxx */
332	if (t->change_arch.name)	295	if (t->change_arch.name)
333	{	296	{
334	op->name = t->change_arch.name;	297	op->name = t->change_arch.name;
…		…
340		303
341	if (t->change_arch.slaying)	304	if (t->change_arch.slaying)
342	op->slaying = t->change_arch.slaying;	305	op->slaying = t->change_arch.slaying;
343	}	306	}
344		307
345	void	308	static void
346	create_all_treasures (treasure * t, object * op, int flag, int difficulty, int tries)	309	create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
347	{	310	{
348	object *tmp;
349
350
351	if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance)	311	if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
352	{	312	{
353	if (t->name)	313	if (t->name)
354	{	314	{
355	if (strcmp (t->name, "NONE") && difficulty >= t->magic)	315	if (difficulty >= t->magic)
356	create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);	316	if (treasurelist *tl = treasurelist::find (t->name))
357	}	317	create_treasure (tl, op, flag, difficulty, tries);
		318	else
		319	LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
		320	}
358	else	321	else
359	{	322	{
360	if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))	323	if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
361	{	324	{
362	tmp = arch_to_object (t->item);	325	object *tmp = t->item->instance ();
		326
363	if (t->nrof && tmp->nrof <= 1)	327	if (t->nrof && tmp->nrof <= 1)
364	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	328	tmp->nrof = rndm (t->nrof) + 1;
		329
365	fix_generated_item (tmp, op, difficulty, t->magic, flag);	330	fix_generated_item (tmp, op, difficulty, t->magic, flag);
366	change_treasure (t, tmp);	331	change_treasure (t, tmp);
367	put_treasure (tmp, op, flag);	332	put_treasure (tmp, op, flag);
368	}	333	}
369	}	334	}
		335
370	if (t->next_yes != NULL)	336	if (t->next_yes)
371	create_all_treasures (t->next_yes, op, flag, difficulty, tries);	337	create_all_treasures (t->next_yes, op, flag, difficulty, tries);
372	}	338	}
373	else if (t->next_no != NULL)	339	else if (t->next_no)
374	create_all_treasures (t->next_no, op, flag, difficulty, tries);	340	create_all_treasures (t->next_no, op, flag, difficulty, tries);
		341
375	if (t->next != NULL)	342	if (t->next)
376	create_all_treasures (t->next, op, flag, difficulty, tries);	343	create_all_treasures (t->next, op, flag, difficulty, tries);
377	}	344	}
378		345
379	void	346	static void
380	create_one_treasure (treasurelist * tl, object * op, int flag, int difficulty, int tries)	347	create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
381	{	348	{
382	int value = RANDOM () % tl->total_chance;	349	int value = rndm (tl->total_chance);
383	treasure *t;	350	treasure *t;
384		351
385	if (tries++ > 100)	352	if (tries++ > 100)
386	{	353	{
387	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");	354	LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
388	return;	355	return;
389	}	356	}
		357
390	for (t = tl->items; t != NULL; t = t->next)	358	for (t = tl->items; t; t = t->next)
391	{	359	{
392	value -= t->chance;	360	value -= t->chance;
		361
393	if (value < 0)	362	if (value < 0)
394	break;	363	break;
395	}	364	}
396		365
397	if (!t || value >= 0)	366	if (!t || value >= 0)
398	{
399	LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n");	367	cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
400	abort ();	368
401	return;
402	}
403	if (t->name)	369	if (t->name)
404	{	370	{
405	if (!strcmp (t->name, "NONE"))
406	return;
407	if (difficulty >= t->magic)	371	if (difficulty >= t->magic)
408	create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);	372	{
		373	treasurelist *tl = treasurelist::find (t->name);
		374	if (tl)
		375	create_treasure (tl, op, flag, difficulty, tries);
		376	}
409	else if (t->nrof)	377	else if (t->nrof)
410	create_one_treasure (tl, op, flag, difficulty, tries);	378	create_one_treasure (tl, op, flag, difficulty, tries);
411	return;
412	}	379	}
413	if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE)	380	else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
414	{	381	{
415	object *tmp = arch_to_object (t->item);	382	if (object *tmp = t->item->instance ())
416	if (!tmp)	383	{
417	return;
418	if (t->nrof && tmp->nrof <= 1)	384	if (t->nrof && tmp->nrof <= 1)
419	tmp->nrof = RANDOM () % ((int) t->nrof) + 1;	385	tmp->nrof = rndm (t->nrof) + 1;
		386
420	fix_generated_item (tmp, op, difficulty, t->magic, flag);	387	fix_generated_item (tmp, op, difficulty, t->magic, flag);
421	change_treasure (t, tmp);	388	change_treasure (t, tmp);
422	put_treasure (tmp, op, flag);	389	put_treasure (tmp, op, flag);
		390	}
423	}	391	}
		392	}
		393
		394	void
		395	object::create_treasure (treasurelist *tl, int flags)
		396	{
		397	::create_treasure (tl, this, flags, map ? map->difficulty : 0);
424	}	398	}
425		399
426	/* This calls the appropriate treasure creation function. tries is passed	400	/* This calls the appropriate treasure creation function. tries is passed
427	* to determine how many list transitions or attempts to create treasure	401	* to determine how many list transitions or attempts to create treasure
428	* have been made. It is really in place to prevent infinite loops with	402	* have been made. It is really in place to prevent infinite loops with
429	* list transitions, or so that excessively good treasure will not be	403	* list transitions, or so that excessively good treasure will not be
430	* created on weak maps, because it will exceed the number of allowed tries	404	* created on weak maps, because it will exceed the number of allowed tries
431	* to do that.	405	* to do that.
432	*/	406	*/
433	void	407	void
434	create_treasure (treasurelist * t, object * op, int flag, int difficulty, int tries)	408	create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
435	{	409	{
		410	// empty treasurelists are legal
		411	if (!tl->items)
		412	return;
436		413
437	if (tries++ > 100)	414	if (tries++ > 100)
438	{	415	{
439	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");	416	LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
440	return;	417	return;
441	}	418	}
		419
		420	if (op->flag [FLAG_TREASURE_ENV])
		421	{
		422	// do not generate items when there already is something above the object
		423	if (op->flag [FLAG_IS_FLOOR] && op->above)
		424	return;
		425
		426	flag |= GT_ENVIRONMENT;
		427	}
		428
442	if (t->total_chance)	429	if (tl->total_chance)
443	create_one_treasure (t, op, flag, difficulty, tries);	430	create_one_treasure (tl, op, flag, difficulty, tries);
444	else	431	else
445	create_all_treasures (t->items, op, flag, difficulty, tries);	432	create_all_treasures (tl->items, op, flag, difficulty, tries);
446	}	433	}
447		434
448	/* This is similar to the old generate treasure function. However,	435	/* This is similar to the old generate treasure function. However,
449	* it instead takes a treasurelist. It is really just a wrapper around	436	* it instead takes a treasurelist. It is really just a wrapper around
450	* create_treasure. We create a dummy object that the treasure gets	437	* create_treasure. We create a dummy object that the treasure gets
451	* inserted into, and then return that treausre	438	* inserted into, and then return that treausre
452	*/	439	*/
453	object *	440	object *
454	generate_treasure (treasurelist * t, int difficulty)	441	generate_treasure (treasurelist *tl, int difficulty)
455	{	442	{
456	object *ob = get_object (), *tmp;	443	difficulty = clamp (difficulty, 1, settings.max_level);
457		444
		445	object *ob = object::create ();
		446
458	create_treasure (t, ob, 0, difficulty, 0);	447	create_treasure (tl, ob, 0, difficulty, 0);
459		448
460	/* Don't want to free the object we are about to return */	449	/* Don't want to free the object we are about to return */
461	tmp = ob->inv;	450	object *tmp = ob->inv;
462	if (tmp != NULL)	451	if (tmp)
463	remove_ob (tmp);	452	tmp->remove ();
		453
464	if (ob->inv)	454	if (ob->inv)
465	{
466	LOG (llevError, "In generate treasure, created multiple objects.\n");	455	LOG (llevError, "In generate treasure, created multiple objects.\n");
467	}	456
468	free_object (ob);	457	ob->destroy ();
		458
469	return tmp;	459	return tmp;
470	}	460	}
471		461
472	/*	462	/*
473	* This is a new way of calculating the chance for an item to have	463	* This is a new way of calculating the chance for an item to have
…		…
475	* The array has two arguments, the difficulty of the level, and the	465	* The array has two arguments, the difficulty of the level, and the
476	* magical bonus "wanted".	466	* magical bonus "wanted".
477	*/	467	*/
478		468
479	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {	469	static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
480	/*chance of magic difficulty*/	470	// chance of magic difficulty
481	/* +0 +1 +2 +3 +4 */	471	// +0 +1 +2 +3 +4
482	{95, 2, 2, 1, 0}, /*1 */	472	{95, 2, 2, 1, 0}, // 1
483	{92, 5, 2, 1, 0}, /*2 */	473	{92, 5, 2, 1, 0}, // 2
484	{85, 10, 4, 1, 0}, /*3 */	474	{85, 10, 4, 1, 0}, // 3
485	{80, 14, 4, 2, 0}, /*4 */	475	{80, 14, 4, 2, 0}, // 4
486	{75, 17, 5, 2, 1}, /*5 */	476	{75, 17, 5, 2, 1}, // 5
487	{70, 18, 8, 3, 1}, /*6 */	477	{70, 18, 8, 3, 1}, // 6
488	{65, 21, 10, 3, 1}, /*7 */	478	{65, 21, 10, 3, 1}, // 7
489	{60, 22, 12, 4, 2}, /*8 */	479	{60, 22, 12, 4, 2}, // 8
490	{55, 25, 14, 4, 2}, /*9 */	480	{55, 25, 14, 4, 2}, // 9
491	{50, 27, 16, 5, 2}, /*10 */	481	{50, 27, 16, 5, 2}, // 10
492	{45, 28, 18, 6, 3}, /*11 */	482	{45, 28, 18, 6, 3}, // 11
493	{42, 28, 20, 7, 3}, /*12 */	483	{42, 28, 20, 7, 3}, // 12
494	{40, 27, 21, 8, 4}, /*13 */	484	{40, 27, 21, 8, 4}, // 13
495	{38, 25, 22, 10, 5}, /*14 */	485	{38, 25, 22, 10, 5}, // 14
496	{36, 23, 23, 12, 6}, /*15 */	486	{36, 23, 23, 12, 6}, // 15
497	{33, 21, 24, 14, 8}, /*16 */	487	{33, 21, 24, 14, 8}, // 16
498	{31, 19, 25, 16, 9}, /*17 */	488	{31, 19, 25, 16, 9}, // 17
499	{27, 15, 30, 18, 10}, /*18 */	489	{27, 15, 30, 18, 10}, // 18
500	{20, 12, 30, 25, 13}, /*19 */	490	{20, 12, 30, 25, 13}, // 19
501	{15, 10, 28, 30, 17}, /*20 */	491	{15, 10, 28, 30, 17}, // 20
502	{13, 9, 27, 28, 23}, /*21 */	492	{13, 9, 27, 28, 23}, // 21
503	{10, 8, 25, 28, 29}, /*22 */	493	{10, 8, 25, 28, 29}, // 22
504	{8, 7, 23, 26, 36}, /*23 */	494	{ 8, 7, 23, 26, 36}, // 23
505	{6, 6, 20, 22, 46}, /*24 */	495	{ 6, 6, 20, 22, 46}, // 24
506	{4, 5, 17, 18, 56}, /*25 */	496	{ 4, 5, 17, 18, 56}, // 25
507	{2, 4, 12, 14, 68}, /*26 */	497	{ 2, 4, 12, 14, 68}, // 26
508	{0, 3, 7, 10, 80}, /*27 */	498	{ 0, 3, 7, 10, 80}, // 27
509	{0, 0, 3, 7, 90}, /*28 */	499	{ 0, 0, 3, 7, 90}, // 28
510	{0, 0, 0, 3, 97}, /*29 */	500	{ 0, 0, 0, 3, 97}, // 29
511	{0, 0, 0, 0, 100}, /*30 */	501	{ 0, 0, 0, 0, 100}, // 30
512	{0, 0, 0, 0, 100}, /*31 */	502	{ 0, 0, 0, 0, 100}, // 31
513	};	503	};
514		504
515
516	/* calculate the appropriate level for wands staves and scrolls.	505	/* calculate the appropriate level for wands staves and scrolls.
517	* This code presumes that op has had its spell object created (in op->inv)	506	* This code presumes that op has had its spell object created (in op->inv)
518	*	507	*
519	* elmex Wed Aug 9 17:44:59 CEST 2006:	508	* elmex Wed Aug 9 17:44:59 CEST 2006:
520	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	509	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
521	*/	510	*/
522		511	static int
523	int
524	level_for_item (const object * op, int difficulty)	512	level_for_item (const object *op, int difficulty)
525	{	513	{
526	int mult = 0, olevel = 0;
527
528	if (!op->inv)	514	if (!op->inv)
529	{	515	{
530	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	516	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
531	return 0;	517	return 0;
532	}	518	}
533		519
534	olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2));	520	int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
535		521
536	if (olevel <= 0)	522	if (olevel <= 0)
537	olevel = rndm (1, MIN (op->inv->level, 1));	523	olevel = rndm (1, op->inv->level);
538		524
539	if (olevel > MAXLEVEL)	525	return min (olevel, MAXLEVEL_TREASURE);
540	olevel = MAXLEVEL;
541
542	return olevel;
543	}	526	}
544		527
545	/*	528	/*
546	* Based upon the specified difficulty and upon the difftomagic_list array,	529	* Based upon the specified difficulty and upon the difftomagic_list array,
547	* a random magical bonus is returned. This is used when determine	530	* a random magical bonus is returned. This is used when determine
…		…
550	* elmex Thu Aug 10 18:45:44 CEST 2006:	533	* elmex Thu Aug 10 18:45:44 CEST 2006:
551	* Scaling difficulty by max_level, as difficulty is a level and not some	534	* Scaling difficulty by max_level, as difficulty is a level and not some
552	* weird integer between 1-31.	535	* weird integer between 1-31.
553	*	536	*
554	*/	537	*/
555		538	static int
556	int
557	magic_from_difficulty (int difficulty)	539	magic_from_difficulty (int difficulty)
558	{	540	{
559	int percent = 0, magic = 0;
560	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	541	int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
		542	scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
561		543
562	scaled_diff--;	544	int percent = rndm (100);
		545	int magic;
563		546
564	if (scaled_diff < 0)
565	scaled_diff = 0;
566
567	if (scaled_diff >= DIFFLEVELS)
568	scaled_diff = DIFFLEVELS - 1;
569
570	percent = RANDOM () % 100;
571
572	for (magic = 0; magic < (MAXMAGIC + 1); magic++)	547	for (magic = 0; magic <= MAXMAGIC; magic++)
573	{	548	{
574	percent -= difftomagic_list[scaled_diff][magic];	549	percent -= difftomagic_list[scaled_diff][magic];
575		550
576	if (percent < 0)	551	if (percent < 0)
577	break;	552	break;
578	}	553	}
579		554
580	if (magic == (MAXMAGIC + 1))	555	if (magic > MAXMAGIC)
581	{	556	{
582	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);	557	LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
583	magic = 0;	558	magic = 0;
584	}	559	}
585		560
586	magic = (RANDOM () % 3) ? magic : -magic;	561	magic = (rndm (3)) ? magic : -magic;
587	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */	562	/* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
588		563
589	return magic;	564	return magic;
590	}	565	}
591		566
…		…
593	* Sets magical bonus in an object, and recalculates the effect on	568	* Sets magical bonus in an object, and recalculates the effect on
594	* the armour variable, and the effect on speed of armour.	569	* the armour variable, and the effect on speed of armour.
595	* This function doesn't work properly, should add use of archetypes	570	* This function doesn't work properly, should add use of archetypes
596	* to make it truly absolute.	571	* to make it truly absolute.
597	*/	572	*/
598
599	void	573	void
600	set_abs_magic (object * op, int magic)	574	set_abs_magic (object *op, int magic)
601	{	575	{
602	if (!magic)	576	if (!magic)
603	return;	577	return;
604		578
605	op->magic = magic;	579	op->magic = magic;
606	if (op->arch)	580	if (op->arch)
607	{	581	{
608	if (op->type == ARMOUR)	582	if (op->type == ARMOUR)
609	ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;	583	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
610		584
611	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	585	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
612	magic = (-magic);	586	magic = (-magic);
		587
613	op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;	588	op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
614	}	589	}
615	else	590	else
616	{	591	{
617	if (op->type == ARMOUR)	592	if (op->type == ARMOUR)
618	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;	593	ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
		594
619	if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */	595	if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
620	magic = (-magic);	596	magic = (-magic);
		597
621	op->weight = (op->weight * (100 - magic * 10)) / 100;	598	op->weight = (op->weight * (100 - magic * 10)) / 100;
622	}	599	}
623	}	600	}
624		601
625	/*	602	/*
626	* Sets a random magical bonus in the given object based upon	603	* Sets a random magical bonus in the given object based upon
627	* the given difficulty, and the given max possible bonus.	604	* the given difficulty, and the given max possible bonus.
628	*/	605	*/
629		606
630	static void	607	static void
631	set_magic (int difficulty, object * op, int max_magic, int flags)	608	set_magic (int difficulty, object *op, int max_magic, int flags)
632	{	609	{
633	int i;
634	i = magic_from_difficulty (difficulty);	610	int i = magic_from_difficulty (difficulty);
		611
635	if ((flags & GT_ONLY_GOOD) && i < 0)	612	if ((flags & GT_ONLY_GOOD) && i < 0)
636	i = -i;	613	i = -i;
		614
637	if (i > max_magic)	615	i = min (i, max_magic);
638	i = max_magic;	616
639	set_abs_magic (op, i);	617	set_abs_magic (op, i);
640	if (i < 0)	618	if (i < 0)
641	SET_FLAG (op, FLAG_CURSED);	619	op->set_flag (FLAG_CURSED);
642	}	620	}
643		621
644	/*	622	/*
645	* Randomly adds one magical ability to the given object.	623	* Randomly adds one magical ability to the given object.
646	* Modified for Partial Resistance in many ways:	624	* Modified for Partial Resistance in many ways:
647	* 1) Since rings can have multiple bonuses, if the same bonus	625	* 1) Since rings can have multiple bonuses, if the same bonus
648	* is rolled again, increase it - the bonuses now stack with	626	* is rolled again, increase it - the bonuses now stack with
649	* other bonuses previously rolled and ones the item might natively have.	627	* other bonuses previously rolled and ones the item might natively have.
650	* 2) Add code to deal with new PR method.	628	* 2) Add code to deal with new PR method.
651	*/	629	*/
652		630	static void
653	void
654	set_ring_bonus (object * op, int bonus)	631	set_ring_bonus (object *op, int bonus)
655	{	632	{
656
657	int r = RANDOM () % (bonus > 0 ? 25 : 11);	633	int r = rndm (bonus > 0 ? 25 : 11);
658		634
659	if (op->type == AMULET)	635	if (op->type == AMULET)
660	{	636	if (!rndm (21))
661	if (!(RANDOM () % 21))	637	r = 20 + rndm (2);
662	r = 20 + RANDOM () % 2;	638	else if (rndm (2))
		639	r = 10;
663	else	640	else
664	{	641	r = 11 + rndm (9);
665	if (RANDOM () & 2)
666	r = 10;
667	else
668	r = 11 + RANDOM () % 9;
669	}
670	}
671		642
672	switch (r)	643	switch (r)
673	{	644	{
674	/* Redone by MSW 2000-11-26 to have much less code. Also,	645	/* Redone by MSW 2000-11-26 to have much less code. Also,
675	* bonuses and penalties will stack and add to existing values.	646	* bonuses and penalties will stack and add to existing values.
676	* of the item.	647	* of the item.
677	*/	648	*/
678	case 0:	649	case 0:
679	case 1:	650	case 1:
680	case 2:	651	case 2:
681	case 3:	652	case 3:
682	case 4:	653	case 4:
683	case 5:	654	case 5:
684	case 6:	655	case 6:
685	set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));	656	op->stats.stat (r) += bonus;
686	break;	657	break;
687		658
688	case 7:	659	case 7:
689	op->stats.dam += bonus;	660	op->stats.dam += bonus;
690	break;	661	break;
691		662
692	case 8:	663	case 8:
693	op->stats.wc += bonus;	664	op->stats.wc += bonus;
694	break;	665	break;
695		666
696	case 9:	667	case 9:
697	op->stats.food += bonus; /* hunger/sustenance */	668	op->stats.food += bonus; /* hunger/sustenance */
698	break;	669	break;
699		670
700	case 10:	671	case 10:
701	op->stats.ac += bonus;	672	op->stats.ac += bonus;
702	break;	673	break;
703		674
704	/* Item that gives protections/vulnerabilities */	675	/* Item that gives protections/vulnerabilities */
705	case 11:	676	case 11:
706	case 12:	677	case 12:
707	case 13:	678	case 13:
708	case 14:	679	case 14:
709	case 15:	680	case 15:
710	case 16:	681	case 16:
711	case 17:	682	case 17:
712	case 18:	683	case 18:
713	case 19:	684	case 19:
714	{	685	{
715	int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table;	686	int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
716		687
717	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */	688	/* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
718	val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b;	689	val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
719		690
720	/* Cursed items need to have higher negative values to equal out with	691	/* Cursed items need to have higher negative values to equal out with
721	* positive values for how protections work out. Put another	692	* positive values for how protections work out. Put another
722	* little random element in since that they don't always end up with	693	* little random element in since that they don't always end up with
723	* even values.	694	* even values.
724	*/	695	*/
725	if (bonus < 0)	696	if (bonus < 0)
726	val = 2 * -val - RANDOM () % b;	697	val = 2 * -val - rndm (b);
727	if (val > 35)	698
728	val = 35; /* Upper limit */	699	val = min (35, val); /* Upper limit */
729	b = 0;	700
		701	b = 0;
		702
730	while (op->resist[resist_table[resist]] != 0 && b < 4)	703	while (op->resist[resist_table[resist]] != 0 && b < 4)
731	{	704	resist = rndm (num_resist_table);
732	resist = RANDOM () % num_resist_table;	705
733	}	706	if (b == 4)
734	if (b == 4)
735	return; /* Not able to find a free resistance */	707	return; /* Not able to find a free resistance */
		708
736	op->resist[resist_table[resist]] = val;	709	op->resist[resist_table[resist]] = val;
737	/* We should probably do something more clever here to adjust value	710	/* We should probably do something more clever here to adjust value
738	* based on how good a resistance we gave.	711	* based on how good a resistance we gave.
739	*/	712	*/
740	break;	713	break;
741	}	714	}
742	case 20:	715	case 20:
743	if (op->type == AMULET)	716	if (op->type == AMULET)
744	{	717	{
745	SET_FLAG (op, FLAG_REFL_SPELL);	718	op->set_flag (FLAG_REFL_SPELL);
746	op->value *= 11;	719	op->value *= 11;
747	}	720	}
748	else	721	else
749	{	722	{
750	op->stats.hp = 1; /* regenerate hit points */	723	op->stats.hp = 1; /* regenerate hit points */
751	op->value *= 4;	724	op->value *= 4;
752	}	725	}
753	break;	726	break;
754		727
755	case 21:	728	case 21:
756	if (op->type == AMULET)	729	if (op->type == AMULET)
757	{	730	{
758	SET_FLAG (op, FLAG_REFL_MISSILE);	731	op->set_flag (FLAG_REFL_MISSILE);
759	op->value *= 9;	732	op->value *= 9;
760	}	733	}
761	else	734	else
762	{	735	{
763	op->stats.sp = 1; /* regenerate spell points */	736	op->stats.sp = 1; /* regenerate spell points */
764	op->value *= 3;	737	op->value *= 3;
765	}	738	}
766	break;	739	break;
767		740
768	case 22:	741	case 22:
769	op->stats.exp += bonus; /* Speed! */	742	op->stats.exp += bonus; /* Speed! */
770	op->value = (op->value * 2) / 3;	743	op->value = op->value * 2 / 3;
771	break;	744	break;
772	}	745	}
		746
773	if (bonus > 0)	747	if (bonus > 0)
774	op->value *= 2 * bonus;	748	op->value = 2 * op->value * bonus;
775	else	749	else
776	op->value = -(op->value * 2 * bonus) / 3;	750	op->value = -2 * op->value * bonus / 3;
777	}	751	}
778		752
779	/*	753	/*
780	* get_magic(diff) will return a random number between 0 and 4.	754	* get_magic(diff) will return a random number between 0 and 4.
781	* diff can be any value above 2. The higher the diff-variable, the	755	* diff can be any value above 2. The higher the diff-variable, the
782	* higher is the chance of returning a low number.	756	* higher is the chance of returning a low number.
783	* It is only used in fix_generated_treasure() to set bonuses on	757	* It is only used in fix_generated_treasure() to set bonuses on
784	* rings and amulets.	758	* rings and amulets.
785	* Another scheme is used to calculate the magic of weapons and armours.	759	* Another scheme is used to calculate the magic of weapons and armours.
786	*/	760	*/
787		761	static int
788	int
789	get_magic (int diff)	762	get_magic (int diff)
790	{	763	{
791	int i;	764	diff = min (3, diff);
792	if (diff < 3)	765
793	diff = 3;
794	for (i = 0; i < 4; i++)	766	for (int i = 0; i < 4; i++)
795	if (RANDOM () % diff)	767	if (rndm (diff))
796	return i;	768	return i;
		769
797	return 4;	770	return 4;
798	}	771	}
799		772
		773	/* special_potion() - so that old potion code is still done right. */
		774	static int
		775	special_potion (object *op)
		776	{
		777	if (op->attacktype)
		778	return 1;
		779
		780	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
		781	return 1;
		782
		783	for (int i = 0; i < NROFATTACKS; i++)
		784	if (op->resist[i])
		785	return 1;
		786
		787	return 0;
		788	}
		789
		790	static double
		791	value_factor_from_spell_item (object *spell, object *item)
		792	{
		793	double factor =
		794	pow ((spell->value > 0 ? spell->value : 1)
		795	* spell->level, 1.5);
		796
		797	if (item) // this if for: wands/staffs/rods:
		798	{
		799	/* Old crossfire comment ahead:
		800	* Add 50 to both level an divisor to keep prices a little more
		801	* reasonable. Otherwise, a high level version of a low level
		802	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =
		803	* 10 time multiplier). This way, the value are a bit more reasonable.
		804	*/
		805
		806	factor *= item->level + 50;
		807	factor /= item->inv->level + 50;
		808	}
		809
		810	return factor;
		811	}
		812
800	#define DICE2 (get_magic(2)==2?2:1)	813	#define DICE2 (get_magic(2) == 2 ? 2 : 1)
801	#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3)	814	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
802		815
803	/*	816	/*
804	* fix_generated_item(): This is called after an item is generated, in	817	* fix_generated_item(): This is called after an item is generated, in
805	* order to set it up right. This produced magical bonuses, puts spells	818	* order to set it up right. This produced magical bonuses, puts spells
806	* into scrolls/books/wands, makes it unidentified, hides the value, etc.	819	* into scrolls/books/wands, makes it unidentified, hides the value, etc.
807	*/	820	*/
		821
808	/* 4/28/96 added creator object from which op may now inherit properties based on	822	/* 4/28/96 added creator object from which op may now inherit properties based on
809	* op->type. Right now, which stuff the creator passes on is object type	823	* op->type. Right now, which stuff the creator passes on is object type
810	* dependant. I know this is a spagetti manuever, but is there a cleaner	824	* dependant. I know this is a spagetti manuever, but is there a cleaner
811	* way to do this? b.t. */	825	* way to do this? b.t. */
		826
812	/*	827	/*
813	* ! (flags & GT_ENVIRONMENT):	828	* ! (flags & GT_ENVIRONMENT):
814	* Automatically calls fix_flesh_item().	829	* Automatically calls fix_flesh_item().
815	*	830	*
816	* flags:	831	* flags:
…		…
818	* value.	833	* value.
819	* GT_MINIMAL: Does minimal processing on the object - just enough to make it	834	* GT_MINIMAL: Does minimal processing on the object - just enough to make it
820	* a working object - don't change magic, value, etc, but set it material	835	* a working object - don't change magic, value, etc, but set it material
821	* type as appropriate, for objects that need spell objects, set those, etc	836	* type as appropriate, for objects that need spell objects, set those, etc
822	*/	837	*/
823
824	void	838	void
825	fix_generated_item (object * op, object * creator, int difficulty, int max_magic, int flags)	839	fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
826	{	840	{
827	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;	841	int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
828		842
829	if (!creator || creator->type == op->type)	843	if (!creator || creator->type == op->type)
830	creator = op; /*safety & to prevent polymorphed objects giving attributes */	844	creator = op; /*safety & to prevent polymorphed objects giving attributes */
831		845
832	/* If we make an artifact, this information will be destroyed */	846	/* If we make an artifact, this information will be destroyed */
833	save_item_power = op->item_power;	847	save_item_power = op->item_power;
834	op->item_power = 0;	848	op->item_power = 0;
835		849
836	if (op->randomitems && op->type != SPELL)	850	if (op->randomitems && op->type != SPELL)
837	{	851	{
838	create_treasure (op->randomitems, op, flags, difficulty, 0);	852	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
839	if (!op->inv)
840	LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
841
842	/* So the treasure doesn't get created again */	853	/* So the treasure doesn't get created again */
843	op->randomitems = NULL;	854	op->randomitems = 0;
844	}	855	}
845		856
846	if (difficulty < 1)	857	max_it (difficulty, 1);
847	difficulty = 1;	858
		859	if (INVOKE_OBJECT (ADD_BONUS, op,
		860	ARG_OBJECT (creator != op ? creator : 0),
		861	ARG_INT (difficulty), ARG_INT (max_magic),
		862	ARG_INT (flags)))
		863	return;
848		864
849	if (!(flags & GT_MINIMAL))	865	if (!(flags & GT_MINIMAL))
850	{	866	{
851	if (op->arch == crown_arch)	867	if (IS_ARCH (op->arch, crown))
852	{	868	{
853	set_magic (difficulty, op, max_magic, flags);	869	set_magic (difficulty, op, max_magic, flags);
854	num_enchantments = calc_item_power (op, 1);	870	num_enchantments = calc_item_power (op, 1);
855	generate_artifact (op, difficulty);	871	generate_artifact (op, difficulty);
856	}	872	}
857	else	873	else
858	{	874	{
859	if (!op->magic && max_magic)	875	if (!op->magic && max_magic)
860	set_magic (difficulty, op, max_magic, flags);	876	set_magic (difficulty, op, max_magic, flags);
861		877
862	num_enchantments = calc_item_power (op, 1);	878	num_enchantments = calc_item_power (op, 1);
863		879
864	if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact,	880	if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
865	* used for shop_floors or treasures */	881	|| op->type == HORN
		882	|| difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
866	generate_artifact (op, difficulty);	883	generate_artifact (op, difficulty);
867	}	884	}
868		885
869	/* Object was made an artifact. Calculate its item_power rating.	886	/* Object was made an artifact. Calculate its item_power rating.
870	* the item_power in the object is what the artfiact adds.	887	* the item_power in the object is what the artfiact adds.
871	*/	888	*/
872	if (op->title)	889	if (op->title)
873	{	890	{
874	/* if save_item_power is set, then most likely we started with an	891	/* if save_item_power is set, then most likely we started with an
875	* artifact and have added new abilities to it - this is rare, but	892	* artifact and have added new abilities to it - this is rare, but
876	* but I have seen things like 'strange rings of fire'. So just figure	893	* but I have seen things like 'strange rings of fire'. So just figure
877	* out the power from the base power plus what this one adds. Note	894	* out the power from the base power plus what this one adds. Note
878	* that since item_power is not quite linear, this actually ends up	895	* that since item_power is not quite linear, this actually ends up
879	* being somewhat of a bonus	896	* being somewhat of a bonus
880	*/	897	*/
881	if (save_item_power)	898	if (save_item_power)
882	op->item_power = save_item_power + get_power_from_ench (op->item_power);	899	op->item_power = save_item_power + get_power_from_ench (op->item_power);
883	else	900	else
884	op->item_power = get_power_from_ench (op->item_power + num_enchantments);	901	op->item_power = get_power_from_ench (op->item_power + num_enchantments);
885	}	902	}
886	else if (save_item_power)	903	else if (save_item_power)
887	{	904	{
888	/* restore the item_power field to the object if we haven't changed it.	905	/* restore the item_power field to the object if we haven't changed it.
889	* we don't care about num_enchantments - that will basically just	906	* we don't care about num_enchantments - that will basically just
890	* have calculated some value from the base attributes of the archetype.	907	* have calculated some value from the base attributes of the archetype.
891	*/	908	*/
892	op->item_power = save_item_power;	909	op->item_power = save_item_power;
893	}	910	}
894	else	911	else
895	{	912	{
896	/* item_power was zero. This is suspicious, as it may be because it	913	/* item_power was zero. This is suspicious, as it may be because it
897	* was never previously calculated. Let's compute a value and see if	914	* was never previously calculated. Let's compute a value and see if
898	* it is non-zero. If it indeed is, then assign it as the new	915	* it is non-zero. If it indeed is, then assign it as the new
899	* item_power value.	916	* item_power value.
900	* - gros, 21th of July 2006.	917	* - gros, 21th of July 2006.
901	*/	918	*/
902	op->item_power = calc_item_power (op, 0);	919	op->item_power = calc_item_power (op, 0);
903	save_item_power = op->item_power; /* Just in case it would get used	920	save_item_power = op->item_power; /* Just in case it would get used
904	* again below */	921	* again below */
905	}	922	}
906	}	923	}
907		924
908	/* materialtype modifications. Note we allow this on artifacts. */	925	/* materialtype modifications. Note we allow this on artifacts. */
909	set_materialname (op, difficulty, NULL);	926	select_material (op, difficulty);
910		927
911	if (flags & GT_MINIMAL)	928	if (flags & GT_MINIMAL)
912	{	929	{
913	if (op->type == POTION)	930	if (op->type == POTION)
914	/* Handle healing and magic power potions */	931	/* Handle healing and magic power potions */
915	if (op->stats.sp && !op->randomitems)	932	if (op->stats.sp && !op->randomitems)
916	{	933	{
917	object *tmp;	934	object *tmp = archetype::get (spell_mapping [op->stats.sp]);
918
919	tmp = get_archetype (spell_mapping[op->stats.sp]);
920	insert_ob_in_ob (tmp, op);	935	insert_ob_in_ob (tmp, op);
921	op->stats.sp = 0;	936	op->stats.sp = 0;
922	}	937	}
923	}	938	}
924	else if (!op->title) /* Only modify object if not special */	939	else if (!op->title) /* Only modify object if not special */
925	switch (op->type)	940	switch (op->type)
926	{	941	{
927	case WEAPON:	942	case WEAPON:
928	case ARMOUR:	943	case ARMOUR:
929	case SHIELD:	944	case SHIELD:
930	case HELMET:	945	case HELMET:
931	case CLOAK:	946	case CLOAK:
932	if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4))	947	if (op->flag [FLAG_CURSED] && !(rndm (4)))
933	set_ring_bonus (op, -DICE2);	948	set_ring_bonus (op, -DICE2);
934	break;	949	break;
935		950
936	case BRACERS:	951	case BRACERS:
937	if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)))	952	if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
938	{	953	{
939	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);	954	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
940	if (!QUERY_FLAG (op, FLAG_CURSED))	955	if (!op->flag [FLAG_CURSED])
941	op->value *= 3;	956	op->value *= 3;
942	}	957	}
943	break;	958	break;
944		959
945	case POTION:	960	case POTION:
946	{	961	{
947	int too_many_tries = 0, is_special = 0;	962	int too_many_tries = 0;
948		963
949	/* Handle healing and magic power potions */	964	/* Handle healing and magic power potions */
950	if (op->stats.sp && !op->randomitems)	965	if (op->stats.sp && !op->randomitems)
951	{	966	{
952	object *tmp;	967	object *tmp = archetype::get (spell_mapping[op->stats.sp]);
953
954	tmp = get_archetype (spell_mapping[op->stats.sp]);
955	insert_ob_in_ob (tmp, op);	968	insert_ob_in_ob (tmp, op);
956	op->stats.sp = 0;	969	op->stats.sp = 0;
957	}	970	}
958		971
959	while (!(is_special = special_potion (op)) && !op->inv)	972	while (!special_potion (op) && !op->inv)
960	{	973	{
961	generate_artifact (op, difficulty);	974	generate_artifact (op, difficulty);
962	if (too_many_tries++ > 10)	975	if (too_many_tries++ > 10)
963	break;	976	break;
964	}	977	}
965		978
966	/* don't want to change value for healing/magic power potions,	979	/* don't want to change value for healing/magic power potions,
967	* since the value set on those is already correct.	980	* since the value set on those is already correct.
968	*/	981	*/
969	if (op->inv && op->randomitems)	982	if (op->inv && op->randomitems)
970	{	983	{
971	/* value multiplier is same as for scrolls */	984	/* value multiplier is same as for scrolls */
972	op->value = (op->value * op->inv->value);	985	op->value *= op->inv->value;
973	op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty;	986	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
974	}	987	}
975	else	988	else
976	{	989	{
977	op->name = "potion";	990	op->name = shstr_potion;
978	op->name_pl = "potions";	991	op->name_pl = shstr_potions;
979	}	992	}
980		993
981	if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2)	994	if (!(flags & GT_ONLY_GOOD) && rndm (2))
982	SET_FLAG (op, FLAG_CURSED);	995	op->set_flag (FLAG_CURSED);
983	break;
984	}
985		996
		997	break;
		998	}
		999
986	case AMULET:	1000	case AMULET:
987	if (op->arch == amulet_arch)	1001	if (IS_ARCH (op->arch, amulet))
988	op->value *= 5; /* Since it's not just decoration */	1002	op->value *= 5; /* Since it's not just decoration */
989		1003
990	case RING:	1004	case RING:
991	if (op->arch == NULL)	1005	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
992	{	1006	break;
993	remove_ob (op);
994	free_object (op);
995	op = NULL;
996	break;
997	}
998		1007
999	if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */	1008	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1000	break;	1009	op->set_flag (FLAG_CURSED);
1001		1010
1002	if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3))	1011	set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
1003	SET_FLAG (op, FLAG_CURSED);
1004		1012
1005	set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1006
1007	if (op->type != RING) /* Amulets have only one ability */	1013	if (op->type != RING) /* Amulets have only one ability */
1008	break;	1014	break;
1009		1015
1010	if (!(RANDOM () % 4))	1016	if (!rndm (4))
1011	{	1017	{
1012	int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1018	int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1013		1019
1014	if (d > 0)	1020	if (d > 0)
1015	op->value *= 3;	1021	op->value *= 3;
1016		1022
1017	set_ring_bonus (op, d);	1023	set_ring_bonus (op, d);
1018		1024
1019	if (!(RANDOM () % 4))	1025	if (!rndm (4))
1020	{	1026	{
1021	int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;	1027	int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1022	if (d > 0)
1023	op->value *= 5;
1024	set_ring_bonus (op, d);
1025	}
1026	}
1027		1028
1028	if (GET_ANIM_ID (op))	1029	if (d > 0)
1029	SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op)));	1030	op->value *= 5;
1030		1031
1031	break;	1032	set_ring_bonus (op, d);
		1033	}
		1034	}
1032		1035
		1036	if (op->animation_id)
		1037	op->set_anim_frame (rndm (op->anim_frames ()));
		1038
		1039	break;
		1040
1033	case BOOK:	1041	case BOOK:
1034	/* Is it an empty book?, if yes lets make a special·	1042	/* Is it an empty book?, if yes lets make a special·
1035	* msg for it, and tailor its properties based on the·	1043	* msg for it, and tailor its properties based on the·
1036	* creator and/or map level we found it on.	1044	* creator and/or map level we found it on.
1037	*/	1045	*/
1038	if (!op->msg && RANDOM () % 10)	1046	if (!op->msg && rndm (10))
1039	{	1047	{
1040	/* set the book level properly */	1048	/* set the book level properly */
1041	if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))	1049	if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1042	{	1050	{
1043	if (op->map && op->map->difficulty)	1051	if (op->map && op->map->difficulty)
1044	op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1;	1052	op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1045	else	1053	else
1046	op->level = RANDOM () % 20 + 1;	1054	op->level = rndm (20) + 1;
1047	}	1055	}
1048	else	1056	else
1049	op->level = RANDOM () % creator->level;	1057	op->level = rndm (creator->level);
1050		1058
1051	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1059	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1052	/* books w/ info are worth more! */	1060	/* books w/ info are worth more! */
1053	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));	1061	op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
		1062
		1063	/* add exp so reading it gives xp (once) */
		1064	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
		1065	}
		1066
1054	/* creator related stuff */	1067	/* creator related stuff */
1055		1068
1056	/* for library, chained books. Note that some monsters have no_pick	1069	/* for library, chained books. Note that some monsters have no_pick
1057	* set - we don't want to set no pick in that case.	1070	* set - we don't want to set no pick in that case.
1058	*/	1071	*/
1059	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))	1072	if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1060	SET_FLAG (op, FLAG_NO_PICK);	1073	op->set_flag (FLAG_NO_PICK);
1061	if (creator->slaying && !op->slaying) /* for check_inv floors */	1074	if (creator->slaying && !op->slaying) /* for check_inv floors */
1062	op->slaying = creator->slaying;	1075	op->slaying = creator->slaying;
		1076	break;
1063		1077
1064	/* add exp so reading it gives xp (once) */
1065	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1066	}
1067	break;
1068
1069	case SPELLBOOK:	1078	case SPELLBOOK:
1070	op->value = op->value * op->inv->value;	1079	op->value *= value_factor_from_spell_item (op->inv, 0);
		1080
1071	/* add exp so learning gives xp */	1081	/* add exp so learning gives xp */
1072	op->level = op->inv->level;	1082	op->level = op->inv->level;
1073	op->stats.exp = op->value;	1083	op->stats.exp = op->value;
1074	break;	1084	break;
1075		1085
1076	case WAND:	1086	case WAND:
1077	/* nrof in the treasure list is number of charges,	1087	/* nrof in the treasure list is number of charges,
1078	* not number of wands. So copy that into food (charges),	1088	* not number of wands. So copy that into food (charges),
1079	* and reset nrof.	1089	* and reset nrof.
1080	*/	1090	*/
1081	op->stats.food = op->inv->nrof;	1091	op->stats.food = op->inv->nrof;
1082	op->nrof = 1;	1092	op->nrof = 1;
1083	/* If the spell changes by level, choose a random level	1093	/* If the spell changes by level, choose a random level
1084	* for it, and adjust price. If the spell doesn't	1094	* for it.
1085	* change by level, just set the wand to the level of	1095	*/
1086	* the spell, and value calculation is simpler.	1096	if (op->inv->duration_modifier
1087	*/	1097	|| op->inv->dam_modifier
1088	if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier)	1098	|| op->inv->range_modifier)
1089	{	1099	op->level = level_for_item (op, difficulty);
		1100	else
		1101	op->level = op->inv->level;
		1102
		1103	op->value *= value_factor_from_spell_item (op->inv, op);
		1104	break;
		1105
		1106	case ROD:
1090	op->level = level_for_item (op, difficulty);	1107	op->level = level_for_item (op, difficulty);
1091	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1108	op->value *= value_factor_from_spell_item (op->inv, op);
1092	}
1093	else
1094	{
1095	op->level = op->inv->level;
1096	op->value = op->value * op->inv->value;
1097	}
1098	break;
1099		1109
1100	case ROD:
1101	op->level = level_for_item (op, difficulty);
1102	/* Add 50 to both level an divisor to keep prices a little more
1103	* reasonable. Otherwise, a high level version of a low level
1104	* spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1105	* 10 time multiplier). This way, the value are a bit more reasonable.
1106	*/
1107	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1108	/* maxhp is used to denote how many 'charges' the rod holds before */	1110	/* maxhp is used to denote how many 'charges' the rod holds before */
1109	if (op->stats.maxhp)	1111	if (op->stats.maxhp)
1110	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1112	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1111	else	1113	else
1112	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1114	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1113		1115
1114	op->stats.hp = op->stats.maxhp;	1116	op->stats.hp = op->stats.maxhp;
1115	break;	1117	break;
1116		1118
1117	case SCROLL:	1119	case SCROLL:
1118	op->level = level_for_item (op, difficulty);	1120	op->level = level_for_item (op, difficulty);
1119	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1121	op->value *= value_factor_from_spell_item (op->inv, op);
1120		1122
1121	/* add exp so reading them properly gives xp */	1123	/* add exp so reading them properly gives xp */
1122	op->stats.exp = op->value / 5;	1124	op->stats.exp = op->value / 5;
1123	op->nrof = op->inv->nrof;	1125	op->nrof = op->inv->nrof;
1124	break;	1126	break;
1125		1127
1126	case RUNE:	1128	case RUNE:
1127	trap_adjust (op, difficulty);	1129	trap_adjust (op, difficulty);
1128	break;	1130	break;
1129		1131
1130	case TRAP:	1132	case TRAP:
1131	trap_adjust (op, difficulty);	1133	trap_adjust (op, difficulty);
1132	break;	1134	break;
1133	} /* switch type */	1135	} /* switch type */
1134		1136
1135	if (flags & GT_STARTEQUIP)	1137	if (flags & GT_STARTEQUIP)
1136	{	1138	{
1137	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN))	1139	if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1138	SET_FLAG (op, FLAG_STARTEQUIP);	1140	op->set_flag (FLAG_STARTEQUIP);
1139	else if (op->type != MONEY)	1141	else if (op->type != MONEY)
1140	op->value = 0;	1142	op->value = 0;
1141	}	1143	}
1142		1144
1143	if (!(flags & GT_ENVIRONMENT))	1145	if (!(flags & GT_ENVIRONMENT))
1144	fix_flesh_item (op, creator);	1146	fix_flesh_item (op, creator);
1145	}	1147	}
…		…
1153	*/	1155	*/
1154		1156
1155	/*	1157	/*
1156	* Allocate and return the pointer to an empty artifactlist structure.	1158	* Allocate and return the pointer to an empty artifactlist structure.
1157	*/	1159	*/
1158
1159	static artifactlist *	1160	static artifactlist *
1160	get_empty_artifactlist (void)	1161	get_empty_artifactlist ()
1161	{	1162	{
1162	artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist));	1163	return salloc0<artifactlist> ();
1163	if (tl == NULL)
1164	fatal (OUT_OF_MEMORY);
1165	tl->next = NULL;
1166	tl->items = NULL;
1167	tl->total_chance = 0;
1168	return tl;
1169	}	1164	}
1170		1165
1171	/*	1166	/*
1172	* Allocate and return the pointer to an empty artifact structure.	1167	* Allocate and return the pointer to an empty artifact structure.
1173	*/	1168	*/
1174
1175	static artifact *	1169	static artifact *
1176	get_empty_artifact (void)	1170	get_empty_artifact ()
1177	{	1171	{
1178	artifact *t = (artifact *) malloc (sizeof (artifact));	1172	return salloc0<artifact> ();
1179	if (t == NULL)
1180	fatal (OUT_OF_MEMORY);
1181	t->item = NULL;
1182	t->next = NULL;
1183	t->chance = 0;
1184	t->difficulty = 0;
1185	t->allowed = NULL;
1186	return t;
1187	}	1173	}
1188		1174
1189	/*	1175	/*
1190	* Searches the artifact lists and returns one that has the same type	1176	* Searches the artifact lists and returns one that has the same type
1191	* of objects on it.	1177	* of objects on it.
1192	*/	1178	*/
1193
1194	artifactlist *	1179	artifactlist *
1195	find_artifactlist (int type)	1180	find_artifactlist (int type)
1196	{	1181	{
1197	artifactlist *al;
1198
1199	for (al = first_artifactlist; al != NULL; al = al->next)	1182	for (artifactlist *al = first_artifactlist; al; al = al->next)
1200	if (al->type == type)	1183	if (al->type == type)
1201	return al;	1184	return al;
		1185
1202	return NULL;	1186	return 0;
1203	}	1187	}
1204		1188
1205	/*	1189	/*
1206	* For debugging purposes. Dumps all tables.	1190	* Builds up the lists of artifacts from the file in the libdir.
1207	*/	1191	*/
1208
1209	void	1192	void
1210	dump_artifacts (void)
1211	{
1212	artifactlist *al;
1213	artifact *art;
1214	linked_char *next;
1215
1216	fprintf (logfile, "\n");
1217	for (al = first_artifactlist; al != NULL; al = al->next)
1218	{
1219	fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1220	for (art = al->items; art != NULL; art = art->next)
1221	{
1222	fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1223	if (art->allowed != NULL)
1224	{
1225	fprintf (logfile, "\tAllowed combinations:");
1226	for (next = art->allowed; next != NULL; next = next->next)
1227	fprintf (logfile, "%s,", &next->name);
1228	fprintf (logfile, "\n");
1229	}
1230	}
1231	}
1232	fprintf (logfile, "\n");
1233	}
1234
1235	/*
1236	* For debugging purposes. Dumps all treasures recursively (see below).
1237	*/
1238	void
1239	dump_monster_treasure_rec (const char *name, treasure * t, int depth)
1240	{
1241	treasurelist *tl;
1242	int i;
1243
1244	if (depth > 100)
1245	return;
1246	while (t != NULL)
1247	{
1248	if (t->name != NULL)
1249	{
1250	for (i = 0; i < depth; i++)
1251	fprintf (logfile, " ");
1252	fprintf (logfile, "{ (list: %s)\n", &t->name);
1253	tl = find_treasurelist (t->name);
1254	dump_monster_treasure_rec (name, tl->items, depth + 2);
1255	for (i = 0; i < depth; i++)
1256	fprintf (logfile, " ");
1257	fprintf (logfile, "} (end of list: %s)\n", &t->name);
1258	}
1259	else
1260	{
1261	for (i = 0; i < depth; i++)
1262	fprintf (logfile, " ");
1263	if (t->item->clone.type == FLESH)
1264	fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1265	else
1266	fprintf (logfile, "%s\n", &t->item->clone.name);
1267	}
1268	if (t->next_yes != NULL)
1269	{
1270	for (i = 0; i < depth; i++)
1271	fprintf (logfile, " ");
1272	fprintf (logfile, " (if yes)\n");
1273	dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1274	}
1275	if (t->next_no != NULL)
1276	{
1277	for (i = 0; i < depth; i++)
1278	fprintf (logfile, " ");
1279	fprintf (logfile, " (if no)\n");
1280	dump_monster_treasure_rec (name, t->next_no, depth + 1);
1281	}
1282	t = t->next;
1283	}
1284	}
1285
1286	/*
1287	* For debugging purposes. Dumps all treasures for a given monster.
1288	* Created originally by Raphael Quinet for debugging the alchemy code.
1289	*/
1290
1291	void
1292	dump_monster_treasure (const char *name)
1293	{
1294	archetype *at;
1295	int found;
1296
1297	found = 0;
1298	fprintf (logfile, "\n");
1299	for (at = first_archetype; at != NULL; at = at->next)
1300	if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1301	{
1302	fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1303	if (at->clone.randomitems != NULL)
1304	dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1305	else
1306	fprintf (logfile, "(nothing)\n");
1307	fprintf (logfile, "\n");
1308	found++;
1309	}
1310	if (found == 0)
1311	fprintf (logfile, "No objects have the name %s!\n\n", name);
1312	}
1313
1314	/*
1315	* Builds up the lists of artifacts from the file in the libdir.
1316	*/
1317
1318	void
1319	init_artifacts (void)	1193	init_artifacts ()
1320	{	1194	{
1321	static int has_been_inited = 0;	1195	static int has_been_inited = 0;
1322	char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next;
1323	artifact *art = NULL;	1196	artifact *art = NULL;
1324	linked_char *tmp;
1325	int value, comp;
1326	artifactlist *al;	1197	artifactlist *al;
1327		1198
1328	if (has_been_inited)	1199	if (has_been_inited)
1329	return;	1200	return;
1330	else	1201	else
1331	has_been_inited = 1;	1202	has_been_inited = 1;
1332		1203
1333	sprintf (filename, "%s/artifacts", settings.datadir);	1204	object_thawer f (settings.datadir, "artifacts");
1334	object_thawer thawer (filename);
1335		1205
1336	if (!thawer)	1206	if (!f)
1337	return;	1207	return;
1338		1208
1339	while (fgets (buf, HUGE_BUF, thawer) != NULL)	1209	for (;;)
1340	{
1341	if (*buf == '#')
1342	continue;
1343	if ((cp = strchr (buf, '\n')) != NULL)
1344	*cp = '\0';
1345	cp = buf;
1346	while (*cp == ' ') /* Skip blanks */
1347	cp++;
1348	if (*cp == '\0')
1349	continue;
1350
1351	if (!strncmp (cp, "Allowed", 7))
1352	{
1353	if (art == NULL)
1354	{	1210	{
		1211	switch (f.kw)
		1212	{
		1213	case KW_allowed:
		1214	if (!art)
1355	art = get_empty_artifact ();	1215	art = get_empty_artifact ();
1356	nrofartifacts++;	1216
		1217	{
		1218	if (!strcmp (f.get_str (), "all"))
		1219	break;
		1220
		1221	const char *cp = f.get_str ();
		1222	char *next;
		1223	do
		1224	{
		1225	if ((next = (char *)strchr (cp, ',')))
		1226	*next++ = '\0';
		1227
		1228	linked_char *tmp = new linked_char;
		1229
		1230	tmp->name = cp;
		1231	tmp->next = art->allowed;
		1232	art->allowed = tmp;
		1233	}
		1234	while ((cp = next));
		1235	}
		1236	break;
		1237
		1238	case KW_chance:
		1239	f.get (art->chance);
		1240	break;
		1241
		1242	case KW_difficulty:
		1243	f.get (art->difficulty);
		1244	break;
		1245
		1246	case KW_object:
		1247	{
		1248	art->item = object::create ();
		1249	f.get (art->item->name);
		1250	f.next ();
		1251
		1252	if (!art->item->parse_kv (f))
		1253	LOG (llevError, "Init_Artifacts: Could not load object.\n");
		1254
		1255	al = find_artifactlist (art->item->type);
		1256
		1257	if (!al)
		1258	{
		1259	al = get_empty_artifactlist ();
		1260	al->type = art->item->type;
		1261	al->next = first_artifactlist;
		1262	first_artifactlist = al;
		1263	}
		1264
		1265	art->next = al->items;
		1266	al->items = art;
		1267	art = 0;
		1268	}
		1269	continue;
		1270
		1271	case KW_EOF:
		1272	goto done;
		1273
		1274	default:
		1275	if (!f.parse_error ("artifacts file"))
		1276	cleanup ("artifacts file required");
		1277	break;
		1278	}
		1279
		1280	f.next ();
1357	}	1281	}
1358	cp = strchr (cp, ' ') + 1;
1359	if (!strcmp (cp, "all"))
1360	continue;
1361		1282
1362	do	1283	done:
1363	{
1364	nrofallowedstr++;
1365	if ((next = strchr (cp, ',')) != NULL)
1366	*(next++) = '\0';
1367	tmp = new linked_char;
1368	tmp->name = cp;
1369	tmp->next = art->allowed;
1370	art->allowed = tmp;
1371	}
1372	while ((cp = next) != NULL);
1373	}
1374	else if (sscanf (cp, "chance %d", &value))
1375	art->chance = (uint16) value;
1376	else if (sscanf (cp, "difficulty %d", &value))
1377	art->difficulty = (uint8) value;
1378	else if (!strncmp (cp, "Object", 6))
1379	{
1380	art->item = (object *) calloc (1, sizeof (object));
1381	reset_object (art->item);
1382	if (!load_object (thawer, art->item, LO_LINEMODE, 0))
1383	LOG (llevError, "Init_Artifacts: Could not load object.\n");
1384	art->item->name = strchr (cp, ' ') + 1;
1385	al = find_artifactlist (art->item->type);
1386	if (al == NULL)
1387	{
1388	al = get_empty_artifactlist ();
1389	al->type = art->item->type;
1390	al->next = first_artifactlist;
1391	first_artifactlist = al;
1392	}
1393	art->next = al->items;
1394	al->items = art;
1395	art = NULL;
1396	}
1397	else
1398	LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1399	}
1400
1401	for (al = first_artifactlist; al != NULL; al = al->next)	1284	for (al = first_artifactlist; al; al = al->next)
1402	{	1285	{
		1286	al->total_chance = 0;
		1287
1403	for (art = al->items; art != NULL; art = art->next)	1288	for (art = al->items; art; art = art->next)
1404	{	1289	{
1405	if (!art->chance)	1290	if (!art->chance)
1406	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);	1291	LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1407	else	1292	else
1408	al->total_chance += art->chance;	1293	al->total_chance += art->chance;
1409	}	1294	}
1410	#if 0	1295	#if 0
1411	LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);	1296	LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1412	#endif	1297	#endif
1413	}	1298	}
1414
1415	LOG (llevDebug, "done.\n");
1416	}	1299	}
1417
1418		1300
1419	/*	1301	/*
1420	* Used in artifact generation. The bonuses of the first object	1302	* Used in artifact generation. The bonuses of the first object
1421	* is modified by the bonuses of the second object.	1303	* is modified by the bonuses of the second object.
1422	*/	1304	*/
1423
1424	void	1305	void
1425	add_abilities (object * op, object * change)	1306	add_abilities (object *op, object *change)
1426	{	1307	{
1427	int i, j, tmp;
1428
1429	if (change->face != blank_face)	1308	if (change->face != blank_face)
1430	{
1431	#ifdef TREASURE_VERBOSE
1432	LOG (llevDebug, "FACE: %d\n", change->face->number);
1433	#endif
1434	op->face = change->face;	1309	op->face = change->face;
1435	}
1436		1310
1437	for (i = 0; i < NUM_STATS; i++)	1311	for (int i = 0; i < NUM_STATS; i++)
1438	change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));	1312	change_attr_value (&(op->stats), i, change->stats.stat (i));
1439		1313
1440	op->attacktype |= change->attacktype;	1314	op->attacktype |= change->attacktype;
1441	op->path_attuned |= change->path_attuned;	1315	op->path_attuned |= change->path_attuned;
1442	op->path_repelled |= change->path_repelled;	1316	op->path_repelled |= change->path_repelled;
1443	op->path_denied |= change->path_denied;	1317	op->path_denied |= change->path_denied;
1444	op->move_type |= change->move_type;	1318	op->move_type |= change->move_type;
1445	op->stats.luck += change->stats.luck;	1319	op->stats.luck += change->stats.luck;
1446		1320
1447	if (QUERY_FLAG (change, FLAG_CURSED))	1321	static const struct copyflags : object::flags_t
1448	SET_FLAG (op, FLAG_CURSED);	1322	{
1449	if (QUERY_FLAG (change, FLAG_DAMNED))	1323	copyflags ()
1450	SET_FLAG (op, FLAG_DAMNED);	1324	{
1451	if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0)	1325	set (FLAG_CURSED);
		1326	set (FLAG_DAMNED);
		1327	set (FLAG_LIFESAVE);
		1328	set (FLAG_REFL_SPELL);
		1329	set (FLAG_STEALTH);
		1330	set (FLAG_XRAYS);
		1331	set (FLAG_BLIND);
		1332	set (FLAG_SEE_IN_DARK);
		1333	set (FLAG_REFL_MISSILE);
		1334	set (FLAG_MAKE_INVIS);
		1335	}
		1336	} copyflags;
		1337
		1338	// we might want to just copy, but or'ing is what the original code did
		1339	op->flag |= change->flag & copyflags;
		1340
		1341	if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1452	set_abs_magic (op, -op->magic);	1342	set_abs_magic (op, -op->magic);
1453		1343
1454	if (QUERY_FLAG (change, FLAG_LIFESAVE))	1344	if (change->flag [FLAG_STAND_STILL])
1455	SET_FLAG (op, FLAG_LIFESAVE);
1456	if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1457	SET_FLAG (op, FLAG_REFL_SPELL);
1458	if (QUERY_FLAG (change, FLAG_STEALTH))
1459	SET_FLAG (op, FLAG_STEALTH);
1460	if (QUERY_FLAG (change, FLAG_XRAYS))
1461	SET_FLAG (op, FLAG_XRAYS);
1462	if (QUERY_FLAG (change, FLAG_BLIND))
1463	SET_FLAG (op, FLAG_BLIND);
1464	if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1465	SET_FLAG (op, FLAG_SEE_IN_DARK);
1466	if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1467	SET_FLAG (op, FLAG_REFL_MISSILE);
1468	if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1469	SET_FLAG (op, FLAG_MAKE_INVIS);
1470
1471	if (QUERY_FLAG (change, FLAG_STAND_STILL))
1472	{	1345	{
1473	CLEAR_FLAG (op, FLAG_ANIMATE);	1346	op->clr_flag (FLAG_ANIMATE);
		1347
1474	/* so artifacts will join */	1348	/* so artifacts will join */
1475	if (!QUERY_FLAG (op, FLAG_ALIVE))	1349	if (!op->flag [FLAG_ALIVE])
1476	op->speed = 0.0;	1350	op->speed = 0.;
1477	update_ob_speed (op);	1351
		1352	op->set_speed (op->speed);
1478	}	1353	}
1479		1354
1480	if (change->nrof)	1355	if (change->nrof)
1481	op->nrof = RANDOM () % ((int) change->nrof) + 1;	1356	op->nrof = rndm (change->nrof) + 1;
1482		1357
1483	op->stats.exp += change->stats.exp; /* Speed modifier */	1358	op->stats.exp += change->stats.exp; /* Speed modifier */
1484	op->stats.wc += change->stats.wc;	1359	op->stats.wc += change->stats.wc;
1485	op->stats.ac += change->stats.ac;	1360	op->stats.ac += change->stats.ac;
1486		1361
1487	if (change->other_arch)	1362	if (change->other_arch)
1488	{	1363	{
1489	/* Basically, for horns & potions, the other_arch field is the spell	1364	/* Basically, for horns & potions, the other_arch field is the spell
1490	* to cast. So convert that to into a spell and put it into	1365	* to cast. So convert that to into a spell and put it into
1491	* this object.	1366	* this object.
1492	*/	1367	*/
1493	if (op->type == HORN || op->type == POTION)	1368	if (op->type == HORN || op->type == POTION)
1494	{	1369	{
1495	object *tmp_obj;
1496	/* Remove any spells this object currently has in it */	1370	/* Remove any spells this object currently has in it */
1497	while (op->inv)	1371	op->destroy_inv (false);
1498	{
1499	tmp_obj = op->inv;
1500	remove_ob (tmp_obj);
1501	free_object (tmp_obj);
1502	}
1503		1372
1504	tmp_obj = arch_to_object (change->other_arch);	1373	object *tmp = change->other_arch->instance ();
1505	insert_ob_in_ob (tmp_obj, op);	1374	insert_ob_in_ob (tmp, op);
1506	}	1375	}
		1376
1507	/* No harm setting this for potions/horns */	1377	/* No harm setting this for potions/horns */
1508	op->other_arch = change->other_arch;	1378	op->other_arch = change->other_arch;
1509	}	1379	}
1510		1380
1511	if (change->stats.hp < 0)	1381	if (change->stats.hp < 0)
…		…
1527	op->stats.maxsp = -change->stats.maxsp;	1397	op->stats.maxsp = -change->stats.maxsp;
1528	else	1398	else
1529	op->stats.maxsp += change->stats.maxsp;	1399	op->stats.maxsp += change->stats.maxsp;
1530		1400
1531	if (change->stats.food < 0)	1401	if (change->stats.food < 0)
1532	op->stats.food = -(change->stats.food);	1402	op->stats.food = -change->stats.food;
1533	else	1403	else
1534	op->stats.food += change->stats.food;	1404	op->stats.food += change->stats.food;
1535		1405
1536	if (change->level < 0)	1406	if (change->level < 0)
1537	op->level = -(change->level);	1407	op->level = -change->level;
1538	else	1408	else
1539	op->level += change->level;	1409	op->level += change->level;
1540		1410
1541	if (change->gen_sp_armour < 0)	1411	if (change->gen_sp_armour < 0)
1542	op->gen_sp_armour = -(change->gen_sp_armour);	1412	op->gen_sp_armour = -change->gen_sp_armour;
1543	else	1413	else
1544	op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;	1414	op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1545		1415
1546	op->item_power = change->item_power;	1416	op->item_power = change->item_power;
1547		1417
1548	for (i = 0; i < NROFATTACKS; i++)	1418	for (int i = 0; i < NROFATTACKS; i++)
1549	{
1550	if (change->resist[i])
1551	{
1552	op->resist[i] += change->resist[i];	1419	op->resist[i] += change->resist[i];
1553	}
1554	}
1555		1420
1556	if (change->stats.dam)	1421	if (change->stats.dam)
1557	{	1422	{
1558	if (change->stats.dam < 0)	1423	if (change->stats.dam < 0)
1559	op->stats.dam = (-change->stats.dam);	1424	op->stats.dam = -change->stats.dam;
1560	else if (op->stats.dam)	1425	else if (op->stats.dam)
1561	{	1426	{
1562	tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10);	1427	int tmp = op->stats.dam * change->stats.dam / 10;
		1428
1563	if (tmp == op->stats.dam)	1429	if (tmp == op->stats.dam)
1564	{	1430	{
1565	if (change->stats.dam < 10)	1431	if (change->stats.dam < 10)
1566	op->stats.dam--;	1432	op->stats.dam--;
		1433	else
		1434	op->stats.dam++;
		1435	}
1567	else	1436	else
1568	op->stats.dam++;
1569	}
1570	else
1571	op->stats.dam = tmp;	1437	op->stats.dam = tmp;
1572	}	1438	}
1573	}	1439	}
1574		1440
1575	if (change->weight)	1441	if (change->weight)
1576	{	1442	{
1577	if (change->weight < 0)	1443	if (change->weight < 0)
1578	op->weight = (-change->weight);	1444	op->weight = -change->weight;
1579	else	1445	else
1580	op->weight = (op->weight * (change->weight)) / 100;	1446	op->weight = op->weight * change->weight / 100;
1581	}	1447	}
1582		1448
1583	if (change->last_sp)	1449	if (change->last_sp)
1584	{	1450	{
1585	if (change->last_sp < 0)	1451	if (change->last_sp < 0)
1586	op->last_sp = (-change->last_sp);	1452	op->last_sp = -change->last_sp;
1587	else	1453	else
1588	op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100);	1454	op->last_sp = op->last_sp * (int)change->last_sp / 100;
1589	}	1455	}
1590		1456
1591	if (change->gen_sp_armour)	1457	if (change->gen_sp_armour)
1592	{	1458	{
1593	if (change->gen_sp_armour < 0)	1459	if (change->gen_sp_armour < 0)
1594	op->gen_sp_armour = (-change->gen_sp_armour);	1460	op->gen_sp_armour = -change->gen_sp_armour;
1595	else	1461	else
1596	op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);	1462	op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1597	}	1463	}
1598		1464
1599	op->value *= change->value;	1465	op->value *= change->value;
1600		1466
1601	if (change->material)	1467	if (change->materials)
		1468	op->materials = change->materials;
		1469
		1470	if (change->material != MATERIAL_NULL)
1602	op->material = change->material;	1471	op->material = change->material;
1603
1604	if (change->materialname)
1605	op->materialname = change->materialname;
1606		1472
1607	if (change->slaying)	1473	if (change->slaying)
1608	op->slaying = change->slaying;	1474	op->slaying = change->slaying;
1609		1475
1610	if (change->race)	1476	if (change->race)
…		…
1613	if (change->msg)	1479	if (change->msg)
1614	op->msg = change->msg;	1480	op->msg = change->msg;
1615	}	1481	}
1616		1482
1617	static int	1483	static int
1618	legal_artifact_combination (object * op, artifact * art)	1484	legal_artifact_combination (object *op, artifact *art)
1619	{	1485	{
1620	int neg, success = 0;	1486	int neg, success = 0;
1621	linked_char *tmp;	1487	linked_char *tmp;
1622	const char *name;	1488	const char *name;
1623		1489
1624	if (art->allowed == (linked_char *) NULL)	1490	if (!art->allowed)
1625	return 1; /* Ie, "all" */	1491	return 1; /* Ie, "all" */
		1492
1626	for (tmp = art->allowed; tmp; tmp = tmp->next)	1493	for (tmp = art->allowed; tmp; tmp = tmp->next)
1627	{	1494	{
1628	#ifdef TREASURE_VERBOSE	1495	#ifdef TREASURE_VERBOSE
1629	LOG (llevDebug, "legal_art: %s\n", tmp->name);	1496	LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1630	#endif	1497	#endif
1631	if (*tmp->name == '!')	1498	if (*tmp->name == '!')
1632	name = tmp->name + 1, neg = 1;	1499	name = tmp->name + 1, neg = 1;
1633	else	1500	else
1634	name = tmp->name, neg = 0;	1501	name = tmp->name, neg = 0;
1635		1502
1636	/* If we match name, then return the opposite of 'neg' */	1503	/* If we match name, then return the opposite of 'neg' */
1637	if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))	1504	if (!strcmp (name, op->arch->archname))
1638	return !neg;	1505	return !neg;
1639		1506
1640	/* Set success as true, since if the match was an inverse, it means	1507	/* Set success as true, since if the match was an inverse, it means
1641	* everything is allowed except what we match	1508	* everything is allowed except what we match
1642	*/	1509	*/
1643	else if (neg)	1510	else if (neg)
1644	success = 1;	1511	success = 1;
1645	}	1512	}
		1513
1646	return success;	1514	return success;
1647	}	1515	}
1648		1516
1649	/*	1517	/*
1650	* Fixes the given object, giving it the abilities and titles	1518	* Fixes the given object, giving it the abilities and titles
1651	* it should have due to the second artifact-template.	1519	* it should have due to the second artifact-template.
1652	*/	1520	*/
1653		1521
1654	void	1522	void
1655	give_artifact_abilities (object * op, object * artifct)	1523	give_artifact_abilities (object *op, object *artifct)
1656	{	1524	{
1657	char new_name[MAX_BUF];	1525	op->title = format ("of %s", &artifct->name);
1658		1526
1659	sprintf (new_name, "of %s", &artifct->name);
1660	op->title = new_name;
1661	add_abilities (op, artifct); /* Give out the bonuses */	1527	add_abilities (op, artifct); /* Give out the bonuses */
1662		1528
1663	#if 0 /* Bit verbose, but keep it here until next time I need it... */	1529	#if 0 /* Bit verbose, but keep it here until next time I need it... */
1664	{	1530	{
1665	char identified = QUERY_FLAG (op, FLAG_IDENTIFIED);	1531	char identified = op->flag [FLAG_IDENTIFIED];
1666	SET_FLAG (op, FLAG_IDENTIFIED);	1532
		1533	op->set_flag (FLAG_IDENTIFIED);
1667	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));	1534	LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1668	if (!identified)	1535	if (!identified)
1669	CLEAR_FLAG (op, FLAG_IDENTIFIED);	1536	op->clr_flag (FLAG_IDENTIFIED);
1670	}	1537	}
1671	#endif	1538	#endif
1672	return;	1539	return;
1673	}	1540	}
1674		1541
…		…
1682		1549
1683	/* Give 1 re-roll attempt per artifact */	1550	/* Give 1 re-roll attempt per artifact */
1684	#define ARTIFACT_TRIES 2	1551	#define ARTIFACT_TRIES 2
1685		1552
1686	void	1553	void
1687	generate_artifact (object * op, int difficulty)	1554	generate_artifact (object *op, int difficulty)
1688	{	1555	{
1689	artifactlist *al;
1690	artifact *art;	1556	artifact *art;
1691	int i;
1692		1557
1693	al = find_artifactlist (op->type);	1558	artifactlist *al = find_artifactlist (op->type);
1694		1559
1695	if (al == NULL)	1560	if (al == NULL)
1696	{	1561	{
1697	#if 0 /* This is too verbose, usually */	1562	#if 0 /* This is too verbose, usually */
1698	LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);	1563	LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1699	#endif	1564	#endif
1700	return;	1565	return;
1701	}	1566	}
1702		1567
1703	for (i = 0; i < ARTIFACT_TRIES; i++)	1568	for (int i = 0; i < ARTIFACT_TRIES; i++)
1704	{	1569	{
1705	int roll = RANDOM () % al->total_chance;	1570	int roll = rndm (al->total_chance);
1706		1571
1707	for (art = al->items; art != NULL; art = art->next)	1572	for (art = al->items; art; art = art->next)
1708	{	1573	{
1709	roll -= art->chance;	1574	roll -= art->chance;
1710	if (roll < 0)	1575	if (roll < 0)
1711	break;	1576	break;
1712	}	1577	}
1713		1578
1714	if (art == NULL || roll >= 0)	1579	if (art == NULL || roll >= 0)
1715	{	1580	{
1716	#if 1	1581	#if 1
1717	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1582	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1718	#endif	1583	#endif
1719	return;	1584	return;
1720	}	1585	}
1721	if (!strcmp (art->item->name, "NONE"))	1586
1722	return;	1587	if (art->item->name == shstr_NONE)
		1588	return;
		1589
1723	if (FABS (op->magic) < art->item->magic)	1590	if (fabs (op->magic) < art->item->magic)
1724	continue; /* Not magic enough to be this item */	1591	continue; /* Not magic enough to be this item */
1725		1592
1726	/* Map difficulty not high enough */	1593	/* Map difficulty not high enough */
1727	if (difficulty < art->difficulty)	1594	if (difficulty < art->difficulty)
1728	continue;	1595	continue;
1729		1596
1730	if (!legal_artifact_combination (op, art))	1597	if (!legal_artifact_combination (op, art))
1731	{	1598	{
1732	#ifdef TREASURE_VERBOSE	1599	#ifdef TREASURE_VERBOSE
1733	LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name);	1600	LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1734	#endif	1601	#endif
1735	continue;	1602	continue;
1736	}	1603	}
		1604
1737	give_artifact_abilities (op, art->item);	1605	give_artifact_abilities (op, art->item);
1738	return;	1606	return;
1739	}	1607	}
1740	}	1608	}
1741		1609
…		…
1743	* FOOD, except they inherit properties (name, food value, etc).	1611	* FOOD, except they inherit properties (name, food value, etc).
1744	* based on the original owner (or 'donor' if you like). -b.t.	1612	* based on the original owner (or 'donor' if you like). -b.t.
1745	*/	1613	*/
1746		1614
1747	void	1615	void
1748	fix_flesh_item (object * item, object * donor)	1616	fix_flesh_item (object *item, object *donor)
1749	{	1617	{
1750	char tmpbuf[MAX_BUF];
1751	int i;
1752
1753	if (item->type == FLESH && donor)	1618	if (item->type == FLESH && donor)
1754	{	1619	{
1755	/* change the name */	1620	/* change the name */
1756	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); item->name = tmpbuf;	1621	item->name = format ("%s's %s", &donor->name, &item->name);
1757	sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); item->name_pl = tmpbuf;	1622	item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1758		1623
1759	/* weight is FLESH weight/100 * donor */	1624	/* weight is FLESH weight/100 * donor */
1760	if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0)	1625	item->weight = max (1, item->weight * donor->weight / 100);
1761	item->weight = 1;
1762		1626
1763	/* value is multiplied by level of donor */	1627	/* value is multiplied by level of donor */
1764	item->value *= isqrt (donor->level * 2);	1628	item->value *= isqrt (donor->level * 2);
1765		1629
1766	/* food value */	1630	/* food value */
1767	item->stats.food += (donor->stats.hp / 100) + donor->stats.Con;	1631	item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1768		1632
1769	/* flesh items inherit some abilities of donor, but not	1633	/* flesh items inherit some abilities of donor, but not
1770	* full effect.	1634	* full effect.
1771	*/	1635	*/
1772	for (i = 0; i < NROFATTACKS; i++)	1636	for (int i = 0; i < NROFATTACKS; i++)
1773	item->resist[i] = donor->resist[i] / 2;	1637	item->resist[i] = donor->resist[i] / 2;
1774		1638
1775	/* item inherits donor's level (important for quezals) */	1639	/* item inherits donor's level (important for quezals) */
1776	item->level = donor->level;	1640	item->level = donor->level;
1777		1641
1778	/* if donor has some attacktypes, the flesh is poisonous */	1642	/* if donor has some attacktypes, the flesh is poisonous */
1779	if (donor->attacktype & AT_POISON)	1643	if (donor->attacktype & AT_POISON)
1780	item->type = POISON;	1644	item->type = POISON;
		1645
1781	if (donor->attacktype & AT_ACID)	1646	if (donor->attacktype & AT_ACID)
1782	item->stats.hp = -1 * item->stats.food;	1647	item->stats.hp = -item->stats.food;
1783	SET_FLAG (item, FLAG_NO_STEAL);
1784	}
1785	}
1786		1648
1787	/* special_potion() - so that old potion code is still done right. */	1649	item->set_flag (FLAG_NO_STEAL);
1788		1650	}
1789	int
1790	special_potion (object * op)
1791	{
1792
1793	int i;
1794
1795	if (op->attacktype)
1796	return 1;
1797
1798	if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1799	return 1;
1800
1801	for (i = 0; i < NROFATTACKS; i++)
1802	if (op->resist[i])
1803	return 1;
1804
1805	return 0;
1806	}	1651	}
1807		1652
1808	void	1653	static void
1809	free_treasurestruct (treasure * t)	1654	free_treasurestruct (treasure *t)
1810	{	1655	{
1811	if (t->next)
1812	free_treasurestruct (t->next);	1656	if (t->next) free_treasurestruct (t->next);
1813	if (t->next_yes)
1814	free_treasurestruct (t->next_yes);	1657	if (t->next_yes) free_treasurestruct (t->next_yes);
1815	if (t->next_no)
1816	free_treasurestruct (t->next_no);	1658	if (t->next_no) free_treasurestruct (t->next_no);
1817		1659
1818	delete t;	1660	delete t;
1819	}	1661	}
1820		1662
1821	void	1663	static void
1822	free_charlinks (linked_char * lc)	1664	free_charlinks (linked_char *lc)
1823	{	1665	{
1824	if (lc->next)	1666	if (lc->next)
1825	free_charlinks (lc->next);	1667	free_charlinks (lc->next);
1826		1668
1827	delete lc;	1669	delete lc;
1828	}	1670	}
1829		1671
1830	void	1672	static void
1831	free_artifact (artifact * at)	1673	free_artifact (artifact *at)
1832	{	1674	{
1833
1834	if (at->next)
1835	free_artifact (at->next);	1675	if (at->next) free_artifact (at->next);
1836	if (at->allowed)
1837	free_charlinks (at->allowed);	1676	if (at->allowed) free_charlinks (at->allowed);
1838		1677
1839	delete at->item;	1678	at->item->destroy ();
1840		1679
1841	delete at;
1842	}
1843
1844	void
1845	free_artifactlist (artifactlist * al)
1846	{
1847	artifactlist *nextal;
1848	for (al = first_artifactlist; al != NULL; al = nextal)
1849	{
1850	nextal = al->next;
1851	if (al->items)
1852	{
1853	free_artifact (al->items);
1854	}
1855	free (al);	1680	sfree (at);
1856	}
1857	}	1681	}
1858		1682
1859	void
1860	free_all_treasures (void)
1861	{
1862	treasurelist *tl, *next;
1863
1864
1865	for (tl = first_treasurelist; tl != NULL; tl = next)
1866	{
1867	next = tl->next;
1868	if (tl->items)
1869	free_treasurestruct (tl->items);
1870	delete tl;
1871	}
1872	free_artifactlist (first_artifactlist);
1873	}

Diff Legend

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