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.13 by root, Tue Sep 5 17:58:11 2006 UTC vs.
Revision 1.55 by root, Sat Apr 21 22:05:52 2007 UTC

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

Diff Legend

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