ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/treasure.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines