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.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.41 by root, Mon Apr 16 06:23:40 2007 UTC

1
2/* 1/*
3 * static char *rcs_treasure_c =
4 * "$Id: treasure.C,v 1.16 2006/09/10 16:00:23 root Exp $";
5 */
6
7/*
8 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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 24
30#define ALLOWED_COMBINATION 25#define ALLOWED_COMBINATION
31 26
32/* TREASURE_DEBUG does some checking on the treasurelists after loading. 27/* TREASURE_DEBUG does some checking on the treasurelists after loading.
33 * It is useful for finding bugs in the treasures file. Since it only 28 * It is useful for finding bugs in the treasures file. Since it only
… …
43#include <global.h> 38#include <global.h>
44#include <treasure.h> 39#include <treasure.h>
45#include <funcpoint.h> 40#include <funcpoint.h>
46#include <loader.h> 41#include <loader.h>
47 42
43extern char *spell_mapping[];
44
45static treasurelist *first_treasurelist;
48 46
49static void change_treasure (treasure *t, object *op); /* overrule default values */ 47static void change_treasure (treasure *t, object *op); /* overrule default values */
50extern char *spell_mapping[]; 48
49typedef std::tr1::unordered_map<
50 const char *,
51 treasurelist *,
52 str_hash,
53 str_equal,
54 slice_allocator< std::pair<const char *const, treasurelist *> >,
55 true
56> tl_map_t;
57
58static tl_map_t tl_map;
51 59
52/* 60/*
53 * Initialize global archtype pointers: 61 * Initialize global archtype pointers:
54 */ 62 */
55
56void 63void
57init_archetype_pointers () 64init_archetype_pointers ()
58{ 65{
59 int prev_warn = warn_archetypes; 66 int prev_warn = warn_archetypes;
60 67
61 warn_archetypes = 1; 68 warn_archetypes = 1;
69
62 if (ring_arch == NULL) 70 if (ring_arch == NULL)
63 ring_arch = find_archetype ("ring"); 71 ring_arch = archetype::find ("ring");
64 if (amulet_arch == NULL) 72 if (amulet_arch == NULL)
65 amulet_arch = find_archetype ("amulet"); 73 amulet_arch = archetype::find ("amulet");
66 if (staff_arch == NULL) 74 if (staff_arch == NULL)
67 staff_arch = find_archetype ("staff"); 75 staff_arch = archetype::find ("staff");
68 if (crown_arch == NULL) 76 if (crown_arch == NULL)
69 crown_arch = find_archetype ("crown"); 77 crown_arch = archetype::find ("crown");
78
70 warn_archetypes = prev_warn; 79 warn_archetypes = prev_warn;
71} 80}
72 81
73/* 82/*
74 * Allocate and return the pointer to an empty treasurelist structure. 83 * Searches for the given treasurelist in the globally linked list
84 * of treasurelists which has been built by load_treasures().
75 */ 85 */
76
77static treasurelist * 86treasurelist *
78get_empty_treasurelist (void) 87treasurelist::find (const char *name)
79{ 88{
89 if (!name)
90 return 0;
91
92 AUTODECL (i, tl_map.find (name));
93
94 if (i == tl_map.end ())
95 return 0;
96
97 return i->second;
98}
99
100/*
101 * Searches for the given treasurelist in the globally linked list
102 * of treasurelists which has been built by load_treasures().
103 */
104treasurelist *
105treasurelist::get (const char *name)
106{
107 treasurelist *tl = find (name);
108
109 if (!tl)
110 {
80 return new treasurelist; 111 tl = new treasurelist;
81}
82 112
83/* 113 tl->name = name;
84 * Allocate and return the pointer to an empty treasure structure. 114 tl->next = first_treasurelist;
85 */ 115 first_treasurelist = tl;
86//TODO: make this a constructor
87static treasure *
88get_empty_treasure (void)
89{
90 treasure *t = new treasure;
91 116
92 t->chance = 100; 117 tl_map.insert (std::make_pair (tl->name, tl));
118 }
93 119
94 return t; 120 return tl;
121}
122
123//TODO: class method
124void
125clear (treasurelist *tl)
126{
127 if (tl->items)
128 {
129 free_treasurestruct (tl->items);
130 tl->items = 0;
131 }
95} 132}
96 133
97/* 134/*
98 * Reads the lib/treasure file from disk, and parses the contents 135 * Reads the lib/treasure file from disk, and parses the contents
99 * into an internal treasure structure (very linked lists) 136 * into an internal treasure structure (very linked lists)
… …
101 138
102static treasure * 139static treasure *
103load_treasure (FILE * fp, int *line) 140load_treasure (FILE * fp, int *line)
104{ 141{
105 char buf[MAX_BUF], *cp, variable[MAX_BUF]; 142 char buf[MAX_BUF], *cp, variable[MAX_BUF];
106 treasure *t = get_empty_treasure (); 143 treasure *t = new treasure;
107 int value; 144 int value;
108 145
109 nroftreasures++; 146 nroftreasures++;
110 while (fgets (buf, MAX_BUF, fp) != NULL) 147 while (fgets (buf, MAX_BUF, fp) != NULL)
111 { 148 {
… …
119 while (isspace (*cp)) /* Skip blanks */ 156 while (isspace (*cp)) /* Skip blanks */
120 cp++; 157 cp++;
121 158
122 if (sscanf (cp, "arch %s", variable)) 159 if (sscanf (cp, "arch %s", variable))
123 { 160 {
124 if ((t->item = find_archetype (variable)) == NULL) 161 if ((t->item = archetype::find (variable)) == NULL)
125 LOG (llevError, "Treasure lacks archetype: %s\n", variable); 162 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
126 } 163 }
127 else if (sscanf (cp, "list %s", variable)) 164 else if (sscanf (cp, "list %s", variable))
128 t->name = variable; 165 t->name = variable;
129 else if (sscanf (cp, "change_name %s", variable)) 166 else if (sscanf (cp, "change_name %s", variable))
… …
162 * so that the treasure name can be printed out 199 * so that the treasure name can be printed out
163 */ 200 */
164static void 201static void
165check_treasurelist (const treasure *t, const treasurelist * tl) 202check_treasurelist (const treasure *t, const treasurelist * tl)
166{ 203{
167 if (t->item == NULL && t->name == NULL)
168 LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name);
169 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) 204 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
170 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); 205 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
171 /* find_treasurelist will print out its own error message */ 206
172 if (t->name && *t->name)
173 (void) find_treasurelist (t->name);
174 if (t->next) 207 if (t->next)
175 check_treasurelist (t->next, tl); 208 check_treasurelist (t->next, tl);
209
176 if (t->next_yes) 210 if (t->next_yes)
177 check_treasurelist (t->next_yes, tl); 211 check_treasurelist (t->next_yes, tl);
212
178 if (t->next_no) 213 if (t->next_no)
179 check_treasurelist (t->next_no, tl); 214 check_treasurelist (t->next_no, tl);
180} 215}
181#endif 216#endif
182 217
… …
188void 223void
189load_treasures (void) 224load_treasures (void)
190{ 225{
191 FILE *fp; 226 FILE *fp;
192 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF]; 227 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
193 treasurelist *previous = NULL;
194 treasure *t; 228 treasure *t;
195 int comp, line = 0; 229 int comp, line = 0;
196 230
197 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 231 sprintf (filename, "%s/%s", settings.datadir, settings.treasures);
198 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 232 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
… …
201 return; 235 return;
202 } 236 }
203 while (fgets (buf, MAX_BUF, fp) != NULL) 237 while (fgets (buf, MAX_BUF, fp) != NULL)
204 { 238 {
205 line++; 239 line++;
206 if (*buf == '#') 240 if (*buf == '#' || *buf == '\n')
207 continue; 241 ; // ignore
208
209 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) 242 else if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
210 { 243 {
211 treasurelist *tl = get_empty_treasurelist (); 244 treasurelist *tl = treasurelist::get (name);
212 245
213 tl->name = name; 246 clear (tl);
214 if (previous == NULL)
215 first_treasurelist = tl;
216 else
217 previous->next = tl;
218 previous = tl;
219 tl->items = load_treasure (fp, &line); 247 tl->items = load_treasure (fp, &line);
220 248
221 /* This is a one of the many items on the list should be generated. 249 /* This is a one of the many items on the list should be generated.
222 * Add up the chance total, and check to make sure the yes & no 250 * Add up the chance total, and check to make sure the yes & no
223 * fields of the treasures are not being used. 251 * fields of the treasures are not being used.
224 */ 252 */
225 if (!strncmp (buf, "treasureone", 11)) 253 if (!strncmp (buf, "treasureone", 11))
226 { 254 {
227 for (t = tl->items; t != NULL; t = t->next) 255 for (t = tl->items; t; t = t->next)
228 { 256 {
229#ifdef TREASURE_DEBUG 257#ifdef TREASURE_DEBUG
230 if (t->next_yes || t->next_no) 258 if (t->next_yes || t->next_no)
231 { 259 {
232 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 260 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
… …
238 } 266 }
239 } 267 }
240 else 268 else
241 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line); 269 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
242 } 270 }
271
243 close_and_delete (fp, comp); 272 close_and_delete (fp, comp);
244 273
245#ifdef TREASURE_DEBUG 274#ifdef TREASURE_DEBUG
246 /* Perform some checks on how valid the treasure data actually is. 275 /* Perform some checks on how valid the treasure data actually is.
247 * verify that list transitions work (ie, the list that it is supposed 276 * verify that list transitions work (ie, the list that it is supposed
248 * to transition to exists). Also, verify that at least the name 277 * to transition to exists). Also, verify that at least the name
249 * or archetype is set for each treasure element. 278 * or archetype is set for each treasure element.
250 */ 279 */
251 for (previous = first_treasurelist; previous != NULL; previous = previous->next) 280 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
252 check_treasurelist (previous->items, previous); 281 check_treasurelist (tl->items, tl);
253#endif 282#endif
254} 283}
255
256/*
257 * Searches for the given treasurelist in the globally linked list
258 * of treasurelists which has been built by load_treasures().
259 */
260
261treasurelist *
262find_treasurelist (const char *name)
263{
264 /* Special cases - randomitems of NULL is to override default. If
265 * first_treasurelist is null, it means we are on the first pass of
266 * of loading archetypes, so for now, just return - second pass will
267 * init these values.
268 */
269 if (!name)
270 return 0;
271
272 if (const char *tmp = shstr::find (name))
273 for (treasurelist * tl = first_treasurelist; tl != 0; tl = tl->next)
274 if (tmp == tl->name)
275 return tl;
276
277 if (first_treasurelist)
278 LOG (llevError, "Couldn't find treasurelist %s\n", name);
279
280 return 0;
281}
282
283 284
284/* 285/*
285 * Generates the objects specified by the given treasure. 286 * Generates the objects specified by the given treasure.
286 * It goes recursively through the rest of the linked list. 287 * It goes recursively through the rest of the linked list.
287 * If there is a certain percental chance for a treasure to be generated, 288 * If there is a certain percental chance for a treasure to be generated,
… …
290 * being generated. 291 * being generated.
291 * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only 292 * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
292 * abilities. This is used by summon spells, thus no summoned monsters 293 * abilities. This is used by summon spells, thus no summoned monsters
293 * start with equipment, but only their abilities). 294 * start with equipment, but only their abilities).
294 */ 295 */
295
296
297static void 296static void
298put_treasure (object *op, object *creator, int flags) 297put_treasure (object *op, object *creator, int flags)
299{ 298{
300 object *tmp; 299 object *tmp;
301 300
… …
304 * this is the original object, or if this is an object that should be created 303 * this is the original object, or if this is an object that should be created
305 * by another object. 304 * by another object.
306 */ 305 */
307 if (flags & GT_ENVIRONMENT && op->type != SPELL) 306 if (flags & GT_ENVIRONMENT && op->type != SPELL)
308 { 307 {
309 op->x = creator->x;
310 op->y = creator->y;
311 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 308 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
312 insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 309 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
313 } 310 }
314 else 311 else
315 { 312 {
316 op = insert_ob_in_ob (op, creator); 313 op = creator->insert (op);
314
317 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 315 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
318 monster_check_apply (creator, op); 316 monster_check_apply (creator, op);
317
319 if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL) 318 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
320 esrv_send_item (tmp, op); 319 esrv_send_item (tmp, op);
321 } 320 }
322} 321}
323 322
324/* if there are change_xxx commands in the treasure, we include the changes 323/* if there are change_xxx commands in the treasure, we include the changes
… …
339 338
340 if (t->change_arch.slaying) 339 if (t->change_arch.slaying)
341 op->slaying = t->change_arch.slaying; 340 op->slaying = t->change_arch.slaying;
342} 341}
343 342
344void 343static void
345create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 344create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
346{ 345{
347 object *tmp;
348
349 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 346 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
350 { 347 {
351 if (t->name) 348 if (t->name)
352 { 349 {
353 if (strcmp (t->name, "NONE") && difficulty >= t->magic) 350 if (difficulty >= t->magic)
354 create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); 351 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);
355 } 352 }
356 else 353 else
357 { 354 {
358 if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)) 355 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
359 { 356 {
360 tmp = arch_to_object (t->item); 357 object *tmp = arch_to_object (t->item);
358
361 if (t->nrof && tmp->nrof <= 1) 359 if (t->nrof && tmp->nrof <= 1)
362 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 360 tmp->nrof = rndm (t->nrof) + 1;
361
363 fix_generated_item (tmp, op, difficulty, t->magic, flag); 362 fix_generated_item (tmp, op, difficulty, t->magic, flag);
364 change_treasure (t, tmp); 363 change_treasure (t, tmp);
365 put_treasure (tmp, op, flag); 364 put_treasure (tmp, op, flag);
366 } 365 }
367 } 366 }
368 367
369 if (t->next_yes != NULL) 368 if (t->next_yes)
370 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 369 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
371 } 370 }
372 else if (t->next_no != NULL) 371 else if (t->next_no)
373 create_all_treasures (t->next_no, op, flag, difficulty, tries); 372 create_all_treasures (t->next_no, op, flag, difficulty, tries);
374 373
375 if (t->next != NULL) 374 if (t->next)
376 create_all_treasures (t->next, op, flag, difficulty, tries); 375 create_all_treasures (t->next, op, flag, difficulty, tries);
377} 376}
378 377
379void 378static void
380create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 379create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
381{ 380{
382 int value = RANDOM () % tl->total_chance; 381 int value = rndm (tl->total_chance);
383 treasure *t; 382 treasure *t;
384 383
385 if (tries++ > 100) 384 if (tries++ > 100)
386 { 385 {
387 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 386 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
388 return; 387 return;
389 } 388 }
390 389
391 for (t = tl->items; t != NULL; t = t->next) 390 for (t = tl->items; t; t = t->next)
392 { 391 {
393 value -= t->chance; 392 value -= t->chance;
394 393
395 if (value < 0) 394 if (value < 0)
396 break; 395 break;
397 } 396 }
398 397
399 if (!t || value >= 0) 398 if (!t || value >= 0)
400 {
401 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 399 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
402 abort ();
403 return;
404 }
405 400
406 if (t->name) 401 if (t->name)
407 { 402 {
408 if (!strcmp (t->name, "NONE"))
409 return;
410
411 if (difficulty >= t->magic) 403 if (difficulty >= t->magic)
404 {
405 treasurelist *tl = treasurelist::find (t->name);
406 if (tl)
412 create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries); 407 create_treasure (tl, op, flag, difficulty, tries);
408 }
413 else if (t->nrof) 409 else if (t->nrof)
414 create_one_treasure (tl, op, flag, difficulty, tries); 410 create_one_treasure (tl, op, flag, difficulty, tries);
415
416 return;
417 } 411 }
418
419 if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) 412 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
420 { 413 {
421 object *tmp = arch_to_object (t->item); 414 if (object *tmp = arch_to_object (t->item))
422 415 {
423 if (!tmp)
424 return;
425
426 if (t->nrof && tmp->nrof <= 1) 416 if (t->nrof && tmp->nrof <= 1)
427 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 417 tmp->nrof = rndm (t->nrof) + 1;
428 418
429 fix_generated_item (tmp, op, difficulty, t->magic, flag); 419 fix_generated_item (tmp, op, difficulty, t->magic, flag);
430 change_treasure (t, tmp); 420 change_treasure (t, tmp);
431 put_treasure (tmp, op, flag); 421 put_treasure (tmp, op, flag);
422 }
432 } 423 }
433} 424}
434 425
435/* This calls the appropriate treasure creation function. tries is passed 426/* This calls the appropriate treasure creation function. tries is passed
436 * to determine how many list transitions or attempts to create treasure 427 * to determine how many list transitions or attempts to create treasure
… …
438 * list transitions, or so that excessively good treasure will not be 429 * list transitions, or so that excessively good treasure will not be
439 * created on weak maps, because it will exceed the number of allowed tries 430 * created on weak maps, because it will exceed the number of allowed tries
440 * to do that. 431 * to do that.
441 */ 432 */
442void 433void
443create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries) 434create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
444{ 435{
436 // empty treasurelists are legal
437 if (!tl->items)
438 return;
445 439
446 if (tries++ > 100) 440 if (tries++ > 100)
447 { 441 {
448 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 442 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
449 return; 443 return;
450 } 444 }
445
451 if (t->total_chance) 446 if (tl->total_chance)
452 create_one_treasure (t, op, flag, difficulty, tries); 447 create_one_treasure (tl, op, flag, difficulty, tries);
453 else 448 else
454 create_all_treasures (t->items, op, flag, difficulty, tries); 449 create_all_treasures (tl->items, op, flag, difficulty, tries);
455} 450}
456 451
457/* This is similar to the old generate treasure function. However, 452/* This is similar to the old generate treasure function. However,
458 * it instead takes a treasurelist. It is really just a wrapper around 453 * it instead takes a treasurelist. It is really just a wrapper around
459 * create_treasure. We create a dummy object that the treasure gets 454 * create_treasure. We create a dummy object that the treasure gets
460 * inserted into, and then return that treausre 455 * inserted into, and then return that treausre
461 */ 456 */
462object * 457object *
463generate_treasure (treasurelist * t, int difficulty) 458generate_treasure (treasurelist *tl, int difficulty)
464{ 459{
460 difficulty = clamp (difficulty, 1, settings.max_level);
461
465 object *ob = get_object (), *tmp; 462 object *ob = object::create (), *tmp;
466 463
467 create_treasure (t, ob, 0, difficulty, 0); 464 create_treasure (tl, ob, 0, difficulty, 0);
468 465
469 /* Don't want to free the object we are about to return */ 466 /* Don't want to free the object we are about to return */
470 tmp = ob->inv; 467 tmp = ob->inv;
471 if (tmp != NULL) 468 if (tmp != NULL)
472 remove_ob (tmp); 469 tmp->remove ();
470
473 if (ob->inv) 471 if (ob->inv)
474 {
475 LOG (llevError, "In generate treasure, created multiple objects.\n"); 472 LOG (llevError, "In generate treasure, created multiple objects.\n");
476 } 473
477 free_object (ob); 474 ob->destroy ();
478 return tmp; 475 return tmp;
479} 476}
480 477
481/* 478/*
482 * This is a new way of calculating the chance for an item to have 479 * This is a new way of calculating the chance for an item to have
… …
561 * elmex Thu Aug 10 18:45:44 CEST 2006: 558 * elmex Thu Aug 10 18:45:44 CEST 2006:
562 * Scaling difficulty by max_level, as difficulty is a level and not some 559 * Scaling difficulty by max_level, as difficulty is a level and not some
563 * weird integer between 1-31. 560 * weird integer between 1-31.
564 * 561 *
565 */ 562 */
566
567int 563int
568magic_from_difficulty (int difficulty) 564magic_from_difficulty (int difficulty)
569{ 565{
570 int percent = 0, magic = 0; 566 int percent = 0, magic = 0;
571 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 567 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
576 scaled_diff = 0; 572 scaled_diff = 0;
577 573
578 if (scaled_diff >= DIFFLEVELS) 574 if (scaled_diff >= DIFFLEVELS)
579 scaled_diff = DIFFLEVELS - 1; 575 scaled_diff = DIFFLEVELS - 1;
580 576
581 percent = RANDOM () % 100; 577 percent = rndm (100);
582 578
583 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 579 for (magic = 0; magic < (MAXMAGIC + 1); magic++)
584 { 580 {
585 percent -= difftomagic_list[scaled_diff][magic]; 581 percent -= difftomagic_list[scaled_diff][magic];
586 582
… …
592 { 588 {
593 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 589 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
594 magic = 0; 590 magic = 0;
595 } 591 }
596 592
597 magic = (RANDOM () % 3) ? magic : -magic; 593 magic = (rndm (3)) ? magic : -magic;
598 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ 594 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
599 595
600 return magic; 596 return magic;
601} 597}
602 598
… …
617 if (op->arch) 613 if (op->arch)
618 { 614 {
619 if (op->type == ARMOUR) 615 if (op->type == ARMOUR)
620 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 616 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
621 617
622 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 618 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
623 magic = (-magic); 619 magic = (-magic);
624 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 620 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
625 } 621 }
626 else 622 else
627 { 623 {
628 if (op->type == ARMOUR) 624 if (op->type == ARMOUR)
629 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 625 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
630 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 626 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
631 magic = (-magic); 627 magic = (-magic);
632 op->weight = (op->weight * (100 - magic * 10)) / 100; 628 op->weight = (op->weight * (100 - magic * 10)) / 100;
633 } 629 }
634} 630}
635 631
… …
659 * 1) Since rings can have multiple bonuses, if the same bonus 655 * 1) Since rings can have multiple bonuses, if the same bonus
660 * is rolled again, increase it - the bonuses now stack with 656 * is rolled again, increase it - the bonuses now stack with
661 * other bonuses previously rolled and ones the item might natively have. 657 * other bonuses previously rolled and ones the item might natively have.
662 * 2) Add code to deal with new PR method. 658 * 2) Add code to deal with new PR method.
663 */ 659 */
664
665void 660void
666set_ring_bonus (object *op, int bonus) 661set_ring_bonus (object *op, int bonus)
667{ 662{
668 663
669 int r = RANDOM () % (bonus > 0 ? 25 : 11); 664 int r = rndm (bonus > 0 ? 25 : 11);
670 665
671 if (op->type == AMULET) 666 if (op->type == AMULET)
672 { 667 {
673 if (!(RANDOM () % 21)) 668 if (!(rndm (21)))
674 r = 20 + RANDOM () % 2; 669 r = 20 + rndm (2);
675 else 670 else
676 { 671 {
677 if (RANDOM () & 2) 672 if (rndm (2))
678 r = 10; 673 r = 10;
679 else 674 else
680 r = 11 + RANDOM () % 9; 675 r = 11 + rndm (9);
681 } 676 }
682 } 677 }
683 678
684 switch (r) 679 switch (r)
685 { 680 {
… …
722 case 16: 717 case 16:
723 case 17: 718 case 17:
724 case 18: 719 case 18:
725 case 19: 720 case 19:
726 { 721 {
727 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 722 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
728 723
729 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 724 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
730 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 725 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
731 726
732 /* Cursed items need to have higher negative values to equal out with 727 /* Cursed items need to have higher negative values to equal out with
733 * positive values for how protections work out. Put another 728 * positive values for how protections work out. Put another
734 * little random element in since that they don't always end up with 729 * little random element in since that they don't always end up with
735 * even values. 730 * even values.
736 */ 731 */
737 if (bonus < 0) 732 if (bonus < 0)
738 val = 2 * -val - RANDOM () % b; 733 val = 2 * -val - rndm (b);
739 if (val > 35) 734 if (val > 35)
740 val = 35; /* Upper limit */ 735 val = 35; /* Upper limit */
741 b = 0; 736 b = 0;
737
742 while (op->resist[resist_table[resist]] != 0 && b < 4) 738 while (op->resist[resist_table[resist]] != 0 && b < 4)
743 {
744 resist = RANDOM () % num_resist_table; 739 resist = rndm (num_resist_table);
745 } 740
746 if (b == 4) 741 if (b == 4)
747 return; /* Not able to find a free resistance */ 742 return; /* Not able to find a free resistance */
743
748 op->resist[resist_table[resist]] = val; 744 op->resist[resist_table[resist]] = val;
749 /* We should probably do something more clever here to adjust value 745 /* We should probably do something more clever here to adjust value
750 * based on how good a resistance we gave. 746 * based on how good a resistance we gave.
751 */ 747 */
752 break; 748 break;
… …
780 case 22: 776 case 22:
781 op->stats.exp += bonus; /* Speed! */ 777 op->stats.exp += bonus; /* Speed! */
782 op->value = (op->value * 2) / 3; 778 op->value = (op->value * 2) / 3;
783 break; 779 break;
784 } 780 }
781
785 if (bonus > 0) 782 if (bonus > 0)
786 op->value *= 2 * bonus; 783 op->value *= 2 * bonus;
787 else 784 else
788 op->value = -(op->value * 2 * bonus) / 3; 785 op->value = -(op->value * 2 * bonus) / 3;
789} 786}
… …
794 * higher is the chance of returning a low number. 791 * higher is the chance of returning a low number.
795 * It is only used in fix_generated_treasure() to set bonuses on 792 * It is only used in fix_generated_treasure() to set bonuses on
796 * rings and amulets. 793 * rings and amulets.
797 * Another scheme is used to calculate the magic of weapons and armours. 794 * Another scheme is used to calculate the magic of weapons and armours.
798 */ 795 */
799
800int 796int
801get_magic (int diff) 797get_magic (int diff)
802{ 798{
803 int i; 799 int i;
804 800
805 if (diff < 3) 801 if (diff < 3)
806 diff = 3; 802 diff = 3;
803
807 for (i = 0; i < 4; i++) 804 for (i = 0; i < 4; i++)
808 if (RANDOM () % diff) 805 if (rndm (diff))
809 return i; 806 return i;
807
810 return 4; 808 return 4;
811} 809}
812 810
813#define DICE2 (get_magic(2)==2?2:1) 811#define DICE2 (get_magic(2)==2?2:1)
814#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 812#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
815 813
816/* 814/*
817 * fix_generated_item(): This is called after an item is generated, in 815 * fix_generated_item(): This is called after an item is generated, in
818 * order to set it up right. This produced magical bonuses, puts spells 816 * order to set it up right. This produced magical bonuses, puts spells
819 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 817 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
833 * value. 831 * value.
834 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 832 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
835 * a working object - don't change magic, value, etc, but set it material 833 * a working object - don't change magic, value, etc, but set it material
836 * type as appropriate, for objects that need spell objects, set those, etc 834 * type as appropriate, for objects that need spell objects, set those, etc
837 */ 835 */
838
839void 836void
840fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 837fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
841{ 838{
842 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 839 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
843 840
… …
859 } 856 }
860 857
861 if (difficulty < 1) 858 if (difficulty < 1)
862 difficulty = 1; 859 difficulty = 1;
863 860
861 if (INVOKE_OBJECT (ADD_BONUS, op,
862 ARG_OBJECT (creator != op ? creator : 0),
863 ARG_INT (difficulty), ARG_INT (max_magic),
864 ARG_INT (flags)))
865 return;
866
864 if (!(flags & GT_MINIMAL)) 867 if (!(flags & GT_MINIMAL))
865 { 868 {
866 if (op->arch == crown_arch) 869 if (op->arch == crown_arch)
867 { 870 {
868 set_magic (difficulty, op, max_magic, flags); 871 set_magic (difficulty, op, max_magic, flags);
… …
874 if (!op->magic && max_magic) 877 if (!op->magic && max_magic)
875 set_magic (difficulty, op, max_magic, flags); 878 set_magic (difficulty, op, max_magic, flags);
876 879
877 num_enchantments = calc_item_power (op, 1); 880 num_enchantments = calc_item_power (op, 1);
878 881
879 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 882 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
883 || op->type == HORN
884 || difficulty >= settings.max_level) /* high difficulties always generate an artifact,
880 * used for shop_floors or treasures */ 885 * used for shop_floors or treasures */
881 generate_artifact (op, difficulty); 886 generate_artifact (op, difficulty);
882 } 887 }
883 888
884 /* Object was made an artifact. Calculate its item_power rating. 889 /* Object was made an artifact. Calculate its item_power rating.
… …
942 case WEAPON: 947 case WEAPON:
943 case ARMOUR: 948 case ARMOUR:
944 case SHIELD: 949 case SHIELD:
945 case HELMET: 950 case HELMET:
946 case CLOAK: 951 case CLOAK:
947 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 952 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
948 set_ring_bonus (op, -DICE2); 953 set_ring_bonus (op, -DICE2);
949 break; 954 break;
950 955
951 case BRACERS: 956 case BRACERS:
952 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 957 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
953 { 958 {
954 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 959 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
955 if (!QUERY_FLAG (op, FLAG_CURSED)) 960 if (!QUERY_FLAG (op, FLAG_CURSED))
956 op->value *= 3; 961 op->value *= 3;
957 } 962 }
… …
983 */ 988 */
984 if (op->inv && op->randomitems) 989 if (op->inv && op->randomitems)
985 { 990 {
986 /* value multiplier is same as for scrolls */ 991 /* value multiplier is same as for scrolls */
987 op->value = (op->value * op->inv->value); 992 op->value = (op->value * op->inv->value);
988 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 993 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
989 } 994 }
990 else 995 else
991 { 996 {
992 op->name = "potion"; 997 op->name = "potion";
993 op->name_pl = "potions"; 998 op->name_pl = "potions";
994 } 999 }
995 1000
996 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 1001 if (!(flags & GT_ONLY_GOOD) && rndm (2))
997 SET_FLAG (op, FLAG_CURSED); 1002 SET_FLAG (op, FLAG_CURSED);
998 break; 1003 break;
999 } 1004 }
1000 1005
1001 case AMULET: 1006 case AMULET:
… …
1003 op->value *= 5; /* Since it's not just decoration */ 1008 op->value *= 5; /* Since it's not just decoration */
1004 1009
1005 case RING: 1010 case RING:
1006 if (op->arch == NULL) 1011 if (op->arch == NULL)
1007 { 1012 {
1008 remove_ob (op); 1013 op->destroy ();
1009 free_object (op);
1010 op = NULL; 1014 op = 0;
1011 break; 1015 break;
1012 } 1016 }
1013 1017
1014 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 1018 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1015 break; 1019 break;
1016 1020
1017 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 1021 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1018 SET_FLAG (op, FLAG_CURSED); 1022 SET_FLAG (op, FLAG_CURSED);
1019 1023
1020 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1024 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1021 1025
1022 if (op->type != RING) /* Amulets have only one ability */ 1026 if (op->type != RING) /* Amulets have only one ability */
1023 break; 1027 break;
1024 1028
1025 if (!(RANDOM () % 4)) 1029 if (!(rndm (4)))
1026 { 1030 {
1027 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1031 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1028 1032
1029 if (d > 0) 1033 if (d > 0)
1030 op->value *= 3; 1034 op->value *= 3;
1031 1035
1032 set_ring_bonus (op, d); 1036 set_ring_bonus (op, d);
1033 1037
1034 if (!(RANDOM () % 4)) 1038 if (!(rndm (4)))
1035 { 1039 {
1036 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1040 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1037 1041
1038 if (d > 0) 1042 if (d > 0)
1039 op->value *= 5; 1043 op->value *= 5;
1040 set_ring_bonus (op, d); 1044 set_ring_bonus (op, d);
1041 } 1045 }
1042 } 1046 }
1043 1047
1044 if (GET_ANIM_ID (op)) 1048 if (GET_ANIM_ID (op))
1045 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1049 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1046 1050
1047 break; 1051 break;
1048 1052
1049 case BOOK: 1053 case BOOK:
1050 /* Is it an empty book?, if yes lets make a special· 1054 /* Is it an empty book?, if yes lets make a special·
1051 * msg for it, and tailor its properties based on the· 1055 * msg for it, and tailor its properties based on the·
1052 * creator and/or map level we found it on. 1056 * creator and/or map level we found it on.
1053 */ 1057 */
1054 if (!op->msg && RANDOM () % 10) 1058 if (!op->msg && rndm (10))
1055 { 1059 {
1056 /* set the book level properly */ 1060 /* set the book level properly */
1057 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1061 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1058 { 1062 {
1059 if (op->map && op->map->difficulty) 1063 if (op->map && op->map->difficulty)
1060 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1064 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1061 else 1065 else
1062 op->level = RANDOM () % 20 + 1; 1066 op->level = rndm (20) + 1;
1063 } 1067 }
1064 else 1068 else
1065 op->level = RANDOM () % creator->level; 1069 op->level = rndm (creator->level);
1066 1070
1067 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1071 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1068 /* books w/ info are worth more! */ 1072 /* books w/ info are worth more! */
1069 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1073 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1070 /* creator related stuff */ 1074 /* creator related stuff */
… …
1169 */ 1173 */
1170 1174
1171/* 1175/*
1172 * Allocate and return the pointer to an empty artifactlist structure. 1176 * Allocate and return the pointer to an empty artifactlist structure.
1173 */ 1177 */
1174
1175static artifactlist * 1178static artifactlist *
1176get_empty_artifactlist (void) 1179get_empty_artifactlist (void)
1177{ 1180{
1178 artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist)); 1181 return salloc0 <artifactlist> ();
1179
1180 if (tl == NULL)
1181 fatal (OUT_OF_MEMORY);
1182 tl->next = NULL;
1183 tl->items = NULL;
1184 tl->total_chance = 0;
1185 return tl;
1186} 1182}
1187 1183
1188/* 1184/*
1189 * Allocate and return the pointer to an empty artifact structure. 1185 * Allocate and return the pointer to an empty artifact structure.
1190 */ 1186 */
1191
1192static artifact * 1187static artifact *
1193get_empty_artifact (void) 1188get_empty_artifact (void)
1194{ 1189{
1195 artifact *t = (artifact *) malloc (sizeof (artifact)); 1190 return salloc0 <artifact> ();
1196
1197 if (t == NULL)
1198 fatal (OUT_OF_MEMORY);
1199 t->item = NULL;
1200 t->next = NULL;
1201 t->chance = 0;
1202 t->difficulty = 0;
1203 t->allowed = NULL;
1204 return t;
1205} 1191}
1206 1192
1207/* 1193/*
1208 * Searches the artifact lists and returns one that has the same type 1194 * Searches the artifact lists and returns one that has the same type
1209 * of objects on it. 1195 * of objects on it.
1210 */ 1196 */
1211
1212artifactlist * 1197artifactlist *
1213find_artifactlist (int type) 1198find_artifactlist (int type)
1214{ 1199{
1215 artifactlist *al;
1216
1217 for (al = first_artifactlist; al != NULL; al = al->next) 1200 for (artifactlist *al = first_artifactlist; al; al = al->next)
1218 if (al->type == type) 1201 if (al->type == type)
1219 return al; 1202 return al;
1203
1220 return NULL; 1204 return 0;
1221} 1205}
1222 1206
1223/* 1207/*
1224 * For debugging purposes. Dumps all tables. 1208 * For debugging purposes. Dumps all tables.
1225 */ 1209 */
1226
1227void 1210void
1228dump_artifacts (void) 1211dump_artifacts (void)
1229{ 1212{
1230 artifactlist *al; 1213 artifactlist *al;
1231 artifact *art; 1214 artifact *art;
… …
1238 for (art = al->items; art != NULL; art = art->next) 1221 for (art = al->items; art != NULL; art = art->next)
1239 { 1222 {
1240 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1223 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1241 if (art->allowed != NULL) 1224 if (art->allowed != NULL)
1242 { 1225 {
1243 fprintf (logfile, "\tAllowed combinations:"); 1226 fprintf (logfile, "\tallowed combinations:");
1244 for (next = art->allowed; next != NULL; next = next->next) 1227 for (next = art->allowed; next != NULL; next = next->next)
1245 fprintf (logfile, "%s,", &next->name); 1228 fprintf (logfile, "%s,", &next->name);
1246 fprintf (logfile, "\n"); 1229 fprintf (logfile, "\n");
1247 } 1230 }
1248 } 1231 }
… …
1259 treasurelist *tl; 1242 treasurelist *tl;
1260 int i; 1243 int i;
1261 1244
1262 if (depth > 100) 1245 if (depth > 100)
1263 return; 1246 return;
1264 while (t != NULL) 1247
1248 while (t)
1265 { 1249 {
1266 if (t->name != NULL) 1250 if (t->name)
1267 { 1251 {
1268 for (i = 0; i < depth; i++) 1252 for (i = 0; i < depth; i++)
1269 fprintf (logfile, " "); 1253 fprintf (logfile, " ");
1254
1270 fprintf (logfile, "{ (list: %s)\n", &t->name); 1255 fprintf (logfile, "{ (list: %s)\n", &t->name);
1256
1271 tl = find_treasurelist (t->name); 1257 tl = treasurelist::find (t->name);
1258 if (tl)
1272 dump_monster_treasure_rec (name, tl->items, depth + 2); 1259 dump_monster_treasure_rec (name, tl->items, depth + 2);
1260
1273 for (i = 0; i < depth; i++) 1261 for (i = 0; i < depth; i++)
1274 fprintf (logfile, " "); 1262 fprintf (logfile, " ");
1263
1275 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1264 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1276 } 1265 }
1277 else 1266 else
1278 { 1267 {
1279 for (i = 0; i < depth; i++) 1268 for (i = 0; i < depth; i++)
1280 fprintf (logfile, " "); 1269 fprintf (logfile, " ");
1270
1281 if (t->item->clone.type == FLESH) 1271 if (t->item && t->item->clone.type == FLESH)
1282 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1272 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1283 else 1273 else
1284 fprintf (logfile, "%s\n", &t->item->clone.name); 1274 fprintf (logfile, "%s\n", &t->item->clone.name);
1285 } 1275 }
1276
1286 if (t->next_yes != NULL) 1277 if (t->next_yes)
1287 { 1278 {
1288 for (i = 0; i < depth; i++) 1279 for (i = 0; i < depth; i++)
1289 fprintf (logfile, " "); 1280 fprintf (logfile, " ");
1281
1290 fprintf (logfile, " (if yes)\n"); 1282 fprintf (logfile, " (if yes)\n");
1291 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1283 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1292 } 1284 }
1285
1293 if (t->next_no != NULL) 1286 if (t->next_no)
1294 { 1287 {
1295 for (i = 0; i < depth; i++) 1288 for (i = 0; i < depth; i++)
1296 fprintf (logfile, " "); 1289 fprintf (logfile, " ");
1290
1297 fprintf (logfile, " (if no)\n"); 1291 fprintf (logfile, " (if no)\n");
1298 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1292 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1299 } 1293 }
1294
1300 t = t->next; 1295 t = t->next;
1301 } 1296 }
1302} 1297}
1303 1298
1304/* 1299/*
1305 * For debugging purposes. Dumps all treasures for a given monster. 1300 * For debugging purposes. Dumps all treasures for a given monster.
1306 * Created originally by Raphael Quinet for debugging the alchemy code. 1301 * Created originally by Raphael Quinet for debugging the alchemy code.
1307 */ 1302 */
1308
1309void 1303void
1310dump_monster_treasure (const char *name) 1304dump_monster_treasure (const char *name)
1311{ 1305{
1312 archetype *at; 1306 archetype *at;
1313 int found; 1307 int found;
1314 1308
1315 found = 0; 1309 found = 0;
1316 fprintf (logfile, "\n"); 1310 fprintf (logfile, "\n");
1311
1317 for (at = first_archetype; at != NULL; at = at->next) 1312 for (at = first_archetype; at != NULL; at = at->next)
1318 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1313 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1319 { 1314 {
1320 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1315 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1321 if (at->clone.randomitems != NULL) 1316 if (at->clone.randomitems != NULL)
1322 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1317 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1323 else 1318 else
1324 fprintf (logfile, "(nothing)\n"); 1319 fprintf (logfile, "(nothing)\n");
1320
1325 fprintf (logfile, "\n"); 1321 fprintf (logfile, "\n");
1326 found++; 1322 found++;
1327 } 1323 }
1324
1328 if (found == 0) 1325 if (found == 0)
1329 fprintf (logfile, "No objects have the name %s!\n\n", name); 1326 fprintf (logfile, "No objects have the name %s!\n\n", name);
1330} 1327}
1331 1328
1332/* 1329/*
1333 * Builds up the lists of artifacts from the file in the libdir. 1330 * Builds up the lists of artifacts from the file in the libdir.
1334 */ 1331 */
1335
1336void 1332void
1337init_artifacts (void) 1333init_artifacts (void)
1338{ 1334{
1339 static int has_been_inited = 0; 1335 static int has_been_inited = 0;
1340 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1336 char filename[MAX_BUF];
1341 artifact *art = NULL; 1337 artifact *art = NULL;
1342 linked_char *tmp;
1343 int value;
1344 artifactlist *al; 1338 artifactlist *al;
1345 1339
1346 if (has_been_inited) 1340 if (has_been_inited)
1347 return; 1341 return;
1348 else 1342 else
1349 has_been_inited = 1; 1343 has_been_inited = 1;
1350 1344
1351 sprintf (filename, "%s/artifacts", settings.datadir); 1345 sprintf (filename, "%s/artifacts", settings.datadir);
1352 object_thawer thawer (filename); 1346 object_thawer f (filename);
1353 1347
1354 if (!thawer) 1348 if (!f)
1355 return; 1349 return;
1356 1350
1357 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1351 f.next ();
1358 {
1359 if (*buf == '#')
1360 continue;
1361 if ((cp = strchr (buf, '\n')) != NULL)
1362 *cp = '\0';
1363 cp = buf;
1364 while (*cp == ' ') /* Skip blanks */
1365 cp++;
1366 if (*cp == '\0')
1367 continue;
1368 1352
1369 if (!strncmp (cp, "Allowed", 7)) 1353 for (;;)
1354 {
1355 switch (f.kw)
1370 { 1356 {
1357 case KW_allowed:
1371 if (art == NULL) 1358 if (!art)
1359 {
1360 art = get_empty_artifact ();
1361 nrofartifacts++;
1362 }
1363
1372 { 1364 {
1373 art = get_empty_artifact (); 1365 if (!strcmp (f.get_str (), "all"))
1374 nrofartifacts++; 1366 break;
1367
1368 char *next, *cp = f.get_str ();
1369
1370 do
1371 {
1372 nrofallowedstr++;
1373
1374 if ((next = strchr (cp, ',')))
1375 *next++ = '\0';
1376
1377 linked_char *tmp = new linked_char;
1378
1379 tmp->name = cp;
1380 tmp->next = art->allowed;
1381 art->allowed = tmp;
1382 }
1383 while ((cp = next));
1375 } 1384 }
1376 cp = strchr (cp, ' ') + 1; 1385 break;
1377 if (!strcmp (cp, "all")) 1386
1387 case KW_chance:
1388 f.get (art->chance);
1389 break;
1390
1391 case KW_difficulty:
1392 f.get (art->difficulty);
1393 break;
1394
1395 case KW_object:
1396 {
1397 art->item = object::create ();
1398
1399 if (!art->item->parse_kv (f))
1400 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1401
1402 al = find_artifactlist (art->item->type);
1403
1404 if (!al)
1405 {
1406 al = get_empty_artifactlist ();
1407 al->type = art->item->type;
1408 al->next = first_artifactlist;
1409 first_artifactlist = al;
1410 }
1411
1412 art->next = al->items;
1413 al->items = art;
1414 art = 0;
1415 }
1378 continue; 1416 continue;
1379 1417
1380 do 1418 case KW_EOF:
1419 goto done;
1420
1421 default:
1422 if (!f.parse_error ("artifacts file"))
1423 cleanup ("artifacts file required");
1381 { 1424 break;
1382 nrofallowedstr++;
1383 if ((next = strchr (cp, ',')) != NULL)
1384 *(next++) = '\0';
1385 tmp = new linked_char;
1386
1387 tmp->name = cp;
1388 tmp->next = art->allowed;
1389 art->allowed = tmp;
1390 }
1391 while ((cp = next) != NULL);
1392 }
1393 else if (sscanf (cp, "chance %d", &value))
1394 art->chance = (uint16) value;
1395 else if (sscanf (cp, "difficulty %d", &value))
1396 art->difficulty = (uint8) value;
1397 else if (!strncmp (cp, "Object", 6))
1398 { 1425 }
1399 art->item = get_object ();
1400 1426
1401 if (!load_object (thawer, art->item, 0)) 1427 f.next ();
1402 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1403
1404 art->item->name = strchr (cp, ' ') + 1;
1405 al = find_artifactlist (art->item->type);
1406 if (al == NULL)
1407 {
1408 al = get_empty_artifactlist ();
1409 al->type = art->item->type;
1410 al->next = first_artifactlist;
1411 first_artifactlist = al;
1412 }
1413 art->next = al->items;
1414 al->items = art;
1415 art = NULL;
1416 }
1417 else
1418 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1419 } 1428 }
1420 1429
1430done:
1421 for (al = first_artifactlist; al != NULL; al = al->next) 1431 for (al = first_artifactlist; al; al = al->next)
1422 { 1432 {
1423 for (art = al->items; art != NULL; art = art->next) 1433 for (art = al->items; art; art = art->next)
1424 { 1434 {
1425 if (!art->chance) 1435 if (!art->chance)
1426 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1436 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1427 else 1437 else
1428 al->total_chance += art->chance; 1438 al->total_chance += art->chance;
… …
1493 CLEAR_FLAG (op, FLAG_ANIMATE); 1503 CLEAR_FLAG (op, FLAG_ANIMATE);
1494 /* so artifacts will join */ 1504 /* so artifacts will join */
1495 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1505 if (!QUERY_FLAG (op, FLAG_ALIVE))
1496 op->speed = 0.0; 1506 op->speed = 0.0;
1497 1507
1498 update_ob_speed (op); 1508 op->set_speed (op->speed);
1499 } 1509 }
1500 1510
1501 if (change->nrof) 1511 if (change->nrof)
1502 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1512 op->nrof = rndm (change->nrof) + 1;
1503 1513
1504 op->stats.exp += change->stats.exp; /* Speed modifier */ 1514 op->stats.exp += change->stats.exp; /* Speed modifier */
1505 op->stats.wc += change->stats.wc; 1515 op->stats.wc += change->stats.wc;
1506 op->stats.ac += change->stats.ac; 1516 op->stats.ac += change->stats.ac;
1507 1517
… …
1515 { 1525 {
1516 object *tmp_obj; 1526 object *tmp_obj;
1517 1527
1518 /* Remove any spells this object currently has in it */ 1528 /* Remove any spells this object currently has in it */
1519 while (op->inv) 1529 while (op->inv)
1520 { 1530 op->inv->destroy ();
1521 tmp_obj = op->inv;
1522 remove_ob (tmp_obj);
1523 free_object (tmp_obj);
1524 }
1525 1531
1526 tmp_obj = arch_to_object (change->other_arch); 1532 tmp_obj = arch_to_object (change->other_arch);
1527 insert_ob_in_ob (tmp_obj, op); 1533 insert_ob_in_ob (tmp_obj, op);
1528 } 1534 }
1529 /* No harm setting this for potions/horns */ 1535 /* No harm setting this for potions/horns */
… …
1566 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1572 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;
1567 1573
1568 op->item_power = change->item_power; 1574 op->item_power = change->item_power;
1569 1575
1570 for (i = 0; i < NROFATTACKS; i++) 1576 for (i = 0; i < NROFATTACKS; i++)
1571 {
1572 if (change->resist[i]) 1577 if (change->resist[i])
1573 {
1574 op->resist[i] += change->resist[i]; 1578 op->resist[i] += change->resist[i];
1575 }
1576 }
1577 1579
1578 if (change->stats.dam) 1580 if (change->stats.dam)
1579 { 1581 {
1580 if (change->stats.dam < 0) 1582 if (change->stats.dam < 0)
1581 op->stats.dam = (-change->stats.dam); 1583 op->stats.dam = (-change->stats.dam);
… …
1618 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1620 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1619 } 1621 }
1620 1622
1621 op->value *= change->value; 1623 op->value *= change->value;
1622 1624
1623 if (change->material) 1625 if (change->materials)
1624 op->material = change->material; 1626 op->materials = change->materials;
1625 1627
1626 if (change->materialname) 1628 if (change->materialname)
1627 op->materialname = change->materialname; 1629 op->materialname = change->materialname;
1628 1630
1629 if (change->slaying) 1631 if (change->slaying)
… …
1723 return; 1725 return;
1724 } 1726 }
1725 1727
1726 for (i = 0; i < ARTIFACT_TRIES; i++) 1728 for (i = 0; i < ARTIFACT_TRIES; i++)
1727 { 1729 {
1728 int roll = RANDOM () % al->total_chance; 1730 int roll = rndm (al->total_chance);
1729 1731
1730 for (art = al->items; art != NULL; art = art->next) 1732 for (art = al->items; art; art = art->next)
1731 { 1733 {
1732 roll -= art->chance; 1734 roll -= art->chance;
1733 if (roll < 0) 1735 if (roll < 0)
1734 break; 1736 break;
1735 } 1737 }
… …
1812/* special_potion() - so that old potion code is still done right. */ 1814/* special_potion() - so that old potion code is still done right. */
1813 1815
1814int 1816int
1815special_potion (object *op) 1817special_potion (object *op)
1816{ 1818{
1817
1818 int i;
1819
1820 if (op->attacktype) 1819 if (op->attacktype)
1821 return 1; 1820 return 1;
1822 1821
1823 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha) 1822 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1824 return 1; 1823 return 1;
1825 1824
1826 for (i = 0; i < NROFATTACKS; i++) 1825 for (int i = 0; i < NROFATTACKS; i++)
1827 if (op->resist[i]) 1826 if (op->resist[i])
1828 return 1; 1827 return 1;
1829 1828
1830 return 0; 1829 return 0;
1831} 1830}
1832 1831
1833void 1832void
1834free_treasurestruct (treasure *t) 1833free_treasurestruct (treasure *t)
1835{ 1834{
1836 if (t->next)
1837 free_treasurestruct (t->next); 1835 if (t->next) free_treasurestruct (t->next);
1838 if (t->next_yes)
1839 free_treasurestruct (t->next_yes); 1836 if (t->next_yes) free_treasurestruct (t->next_yes);
1840 if (t->next_no)
1841 free_treasurestruct (t->next_no); 1837 if (t->next_no) free_treasurestruct (t->next_no);
1842 1838
1843 delete t; 1839 delete t;
1844} 1840}
1845 1841
1846void 1842void
… …
1851 1847
1852 delete lc; 1848 delete lc;
1853} 1849}
1854 1850
1855void 1851void
1856free_artifact (artifact * at) 1852free_artifact (artifact *at)
1857{ 1853{
1858 if (at->next)
1859 free_artifact (at->next); 1854 if (at->next) free_artifact (at->next);
1860
1861 if (at->allowed)
1862 free_charlinks (at->allowed); 1855 if (at->allowed) free_charlinks (at->allowed);
1863 1856
1864 at->item->free (1); 1857 at->item->destroy (1);
1865 1858
1866 delete at; 1859 sfree (at);
1867} 1860}
1868 1861
1869void 1862void
1870free_artifactlist (artifactlist * al) 1863free_artifactlist (artifactlist *al)
1871{ 1864{
1872 artifactlist *nextal; 1865 artifactlist *nextal;
1873 1866
1874 for (al = first_artifactlist; al != NULL; al = nextal) 1867 for (al = first_artifactlist; al; al = nextal)
1875 { 1868 {
1876 nextal = al->next; 1869 nextal = al->next;
1877 1870
1878 if (al->items) 1871 if (al->items)
1879 free_artifact (al->items); 1872 free_artifact (al->items);
1880 1873
1881 free (al); 1874 sfree (al);
1882 } 1875 }
1883} 1876}
1884 1877
1885void 1878void
1886free_all_treasures (void) 1879free_all_treasures (void)
1887{ 1880{
1888 treasurelist *tl, *next; 1881 treasurelist *tl, *next;
1889 1882
1890
1891 for (tl = first_treasurelist; tl != NULL; tl = next) 1883 for (tl = first_treasurelist; tl; tl = next)
1892 { 1884 {
1885 clear (tl);
1886
1893 next = tl->next; 1887 next = tl->next;
1894 if (tl->items)
1895 free_treasurestruct (tl->items);
1896 delete tl; 1888 delete tl;
1897 } 1889 }
1890
1898 free_artifactlist (first_artifactlist); 1891 free_artifactlist (first_artifactlist);
1899} 1892}

Diff Legend

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