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.30 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.41 by root, Mon Apr 16 06:23:40 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#define ALLOWED_COMBINATION 25#define ALLOWED_COMBINATION
25 26
26/* TREASURE_DEBUG does some checking on the treasurelists after loading. 27/* TREASURE_DEBUG does some checking on the treasurelists after loading.
27 * 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
… …
37#include <global.h> 38#include <global.h>
38#include <treasure.h> 39#include <treasure.h>
39#include <funcpoint.h> 40#include <funcpoint.h>
40#include <loader.h> 41#include <loader.h>
41 42
43extern char *spell_mapping[];
44
45static treasurelist *first_treasurelist;
42 46
43static void change_treasure (treasure *t, object *op); /* overrule default values */ 47static void change_treasure (treasure *t, object *op); /* overrule default values */
44extern 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;
45 59
46/* 60/*
47 * Initialize global archtype pointers: 61 * Initialize global archtype pointers:
48 */ 62 */
49
50void 63void
51init_archetype_pointers () 64init_archetype_pointers ()
52{ 65{
53 int prev_warn = warn_archetypes; 66 int prev_warn = warn_archetypes;
54 67
55 warn_archetypes = 1; 68 warn_archetypes = 1;
69
56 if (ring_arch == NULL) 70 if (ring_arch == NULL)
57 ring_arch = archetype::find ("ring"); 71 ring_arch = archetype::find ("ring");
58 if (amulet_arch == NULL) 72 if (amulet_arch == NULL)
59 amulet_arch = archetype::find ("amulet"); 73 amulet_arch = archetype::find ("amulet");
60 if (staff_arch == NULL) 74 if (staff_arch == NULL)
61 staff_arch = archetype::find ("staff"); 75 staff_arch = archetype::find ("staff");
62 if (crown_arch == NULL) 76 if (crown_arch == NULL)
63 crown_arch = archetype::find ("crown"); 77 crown_arch = archetype::find ("crown");
78
64 warn_archetypes = prev_warn; 79 warn_archetypes = prev_warn;
65} 80}
66 81
67/* 82/*
68 * 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().
69 */ 85 */
70
71static treasurelist * 86treasurelist *
72get_empty_treasurelist (void) 87treasurelist::find (const char *name)
73{ 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 {
74 return new treasurelist; 111 tl = new treasurelist;
75}
76 112
77/* 113 tl->name = name;
78 * Allocate and return the pointer to an empty treasure structure. 114 tl->next = first_treasurelist;
79 */ 115 first_treasurelist = tl;
80//TODO: make this a constructor
81static treasure *
82get_empty_treasure (void)
83{
84 treasure *t = new treasure;
85 116
86 t->chance = 100; 117 tl_map.insert (std::make_pair (tl->name, tl));
118 }
87 119
88 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 }
89} 132}
90 133
91/* 134/*
92 * Reads the lib/treasure file from disk, and parses the contents 135 * Reads the lib/treasure file from disk, and parses the contents
93 * into an internal treasure structure (very linked lists) 136 * into an internal treasure structure (very linked lists)
… …
95 138
96static treasure * 139static treasure *
97load_treasure (FILE * fp, int *line) 140load_treasure (FILE * fp, int *line)
98{ 141{
99 char buf[MAX_BUF], *cp, variable[MAX_BUF]; 142 char buf[MAX_BUF], *cp, variable[MAX_BUF];
100 treasure *t = get_empty_treasure (); 143 treasure *t = new treasure;
101 int value; 144 int value;
102 145
103 nroftreasures++; 146 nroftreasures++;
104 while (fgets (buf, MAX_BUF, fp) != NULL) 147 while (fgets (buf, MAX_BUF, fp) != NULL)
105 { 148 {
… …
158static void 201static void
159check_treasurelist (const treasure *t, const treasurelist * tl) 202check_treasurelist (const treasure *t, const treasurelist * tl)
160{ 203{
161 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))
162 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);
163 /* find_treasurelist will print out its own error message */ 206
164 if (t->name && *t->name)
165 find_treasurelist (t->name);
166 if (t->next) 207 if (t->next)
167 check_treasurelist (t->next, tl); 208 check_treasurelist (t->next, tl);
209
168 if (t->next_yes) 210 if (t->next_yes)
169 check_treasurelist (t->next_yes, tl); 211 check_treasurelist (t->next_yes, tl);
212
170 if (t->next_no) 213 if (t->next_no)
171 check_treasurelist (t->next_no, tl); 214 check_treasurelist (t->next_no, tl);
172} 215}
173#endif 216#endif
174 217
… …
180void 223void
181load_treasures (void) 224load_treasures (void)
182{ 225{
183 FILE *fp; 226 FILE *fp;
184 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF]; 227 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
185 treasurelist *previous = NULL;
186 treasure *t; 228 treasure *t;
187 int comp, line = 0; 229 int comp, line = 0;
188 230
189 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 231 sprintf (filename, "%s/%s", settings.datadir, settings.treasures);
190 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 232 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
… …
193 return; 235 return;
194 } 236 }
195 while (fgets (buf, MAX_BUF, fp) != NULL) 237 while (fgets (buf, MAX_BUF, fp) != NULL)
196 { 238 {
197 line++; 239 line++;
198 if (*buf == '#') 240 if (*buf == '#' || *buf == '\n')
199 continue; 241 ; // ignore
200
201 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))
202 { 243 {
203 treasurelist *tl = get_empty_treasurelist (); 244 treasurelist *tl = treasurelist::get (name);
204 245
205 tl->name = name; 246 clear (tl);
206 if (previous == NULL)
207 first_treasurelist = tl;
208 else
209 previous->next = tl;
210 previous = tl;
211 tl->items = load_treasure (fp, &line); 247 tl->items = load_treasure (fp, &line);
212 248
213 /* 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.
214 * 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
215 * fields of the treasures are not being used. 251 * fields of the treasures are not being used.
216 */ 252 */
217 if (!strncmp (buf, "treasureone", 11)) 253 if (!strncmp (buf, "treasureone", 11))
218 { 254 {
219 for (t = tl->items; t != NULL; t = t->next) 255 for (t = tl->items; t; t = t->next)
220 { 256 {
221#ifdef TREASURE_DEBUG 257#ifdef TREASURE_DEBUG
222 if (t->next_yes || t->next_no) 258 if (t->next_yes || t->next_no)
223 { 259 {
224 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);
… …
230 } 266 }
231 } 267 }
232 else 268 else
233 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);
234 } 270 }
271
235 close_and_delete (fp, comp); 272 close_and_delete (fp, comp);
236 273
237#ifdef TREASURE_DEBUG 274#ifdef TREASURE_DEBUG
238 /* Perform some checks on how valid the treasure data actually is. 275 /* Perform some checks on how valid the treasure data actually is.
239 * 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
240 * to transition to exists). Also, verify that at least the name 277 * to transition to exists). Also, verify that at least the name
241 * or archetype is set for each treasure element. 278 * or archetype is set for each treasure element.
242 */ 279 */
243 for (previous = first_treasurelist; previous != NULL; previous = previous->next) 280 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
244 check_treasurelist (previous->items, previous); 281 check_treasurelist (tl->items, tl);
245#endif 282#endif
246} 283}
247
248/*
249 * Searches for the given treasurelist in the globally linked list
250 * of treasurelists which has been built by load_treasures().
251 */
252
253treasurelist *
254find_treasurelist (const char *name)
255{
256 shstr_cmp name_ (name);
257
258 if (!name_)
259 return 0;
260
261 for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
262 if (name_ == tl->name)
263 return tl;
264
265 if (first_treasurelist)
266 LOG (llevError, "Couldn't find treasurelist %s\n", name);
267
268 return 0;
269}
270
271 284
272/* 285/*
273 * Generates the objects specified by the given treasure. 286 * Generates the objects specified by the given treasure.
274 * It goes recursively through the rest of the linked list. 287 * It goes recursively through the rest of the linked list.
275 * 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,
… …
325 338
326 if (t->change_arch.slaying) 339 if (t->change_arch.slaying)
327 op->slaying = t->change_arch.slaying; 340 op->slaying = t->change_arch.slaying;
328} 341}
329 342
330void 343static void
331create_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)
332{ 345{
333 object *tmp;
334
335 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 346 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
336 { 347 {
337 if (t->name) 348 if (t->name)
338 { 349 {
339 if (difficulty >= t->magic) 350 if (difficulty >= t->magic)
340 {
341 treasurelist *tl = find_treasurelist (t->name);
342 if (tl)
343 create_treasure (tl, op, flag, difficulty, tries); 351 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);
344 }
345 } 352 }
346 else 353 else
347 { 354 {
348 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 355 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
349 { 356 {
350 tmp = arch_to_object (t->item); 357 object *tmp = arch_to_object (t->item);
358
351 if (t->nrof && tmp->nrof <= 1) 359 if (t->nrof && tmp->nrof <= 1)
352 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 360 tmp->nrof = rndm (t->nrof) + 1;
361
353 fix_generated_item (tmp, op, difficulty, t->magic, flag); 362 fix_generated_item (tmp, op, difficulty, t->magic, flag);
354 change_treasure (t, tmp); 363 change_treasure (t, tmp);
355 put_treasure (tmp, op, flag); 364 put_treasure (tmp, op, flag);
356 } 365 }
357 } 366 }
358 367
359 if (t->next_yes != NULL) 368 if (t->next_yes)
360 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 369 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
361 } 370 }
362 else if (t->next_no != NULL) 371 else if (t->next_no)
363 create_all_treasures (t->next_no, op, flag, difficulty, tries); 372 create_all_treasures (t->next_no, op, flag, difficulty, tries);
364 373
365 if (t->next != NULL) 374 if (t->next)
366 create_all_treasures (t->next, op, flag, difficulty, tries); 375 create_all_treasures (t->next, op, flag, difficulty, tries);
367} 376}
368 377
369void 378static void
370create_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)
371{ 380{
372 int value = RANDOM () % tl->total_chance; 381 int value = rndm (tl->total_chance);
373 treasure *t; 382 treasure *t;
374 383
375 if (tries++ > 100) 384 if (tries++ > 100)
376 { 385 {
377 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");
378 return; 387 return;
379 } 388 }
380 389
381 for (t = tl->items; t != NULL; t = t->next) 390 for (t = tl->items; t; t = t->next)
382 { 391 {
383 value -= t->chance; 392 value -= t->chance;
384 393
385 if (value < 0) 394 if (value < 0)
386 break; 395 break;
387 } 396 }
388 397
389 if (!t || value >= 0) 398 if (!t || value >= 0)
390 {
391 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);
392 abort ();
393 return;
394 }
395 400
396 if (t->name) 401 if (t->name)
397 { 402 {
398 if (difficulty >= t->magic) 403 if (difficulty >= t->magic)
399 { 404 {
400 treasurelist *tl = find_treasurelist (t->name); 405 treasurelist *tl = treasurelist::find (t->name);
401 if (tl) 406 if (tl)
402 create_treasure (tl, op, flag, difficulty, tries); 407 create_treasure (tl, op, flag, difficulty, tries);
403 } 408 }
404 else if (t->nrof) 409 else if (t->nrof)
405 create_one_treasure (tl, op, flag, difficulty, tries); 410 create_one_treasure (tl, op, flag, difficulty, tries);
406
407 return;
408 } 411 }
409
410 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 412 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
411 { 413 {
412 object *tmp = arch_to_object (t->item); 414 if (object *tmp = arch_to_object (t->item))
413 415 {
414 if (!tmp)
415 return;
416
417 if (t->nrof && tmp->nrof <= 1) 416 if (t->nrof && tmp->nrof <= 1)
418 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 417 tmp->nrof = rndm (t->nrof) + 1;
419 418
420 fix_generated_item (tmp, op, difficulty, t->magic, flag); 419 fix_generated_item (tmp, op, difficulty, t->magic, flag);
421 change_treasure (t, tmp); 420 change_treasure (t, tmp);
422 put_treasure (tmp, op, flag); 421 put_treasure (tmp, op, flag);
422 }
423 } 423 }
424} 424}
425 425
426/* This calls the appropriate treasure creation function. tries is passed 426/* This calls the appropriate treasure creation function. tries is passed
427 * to determine how many list transitions or attempts to create treasure 427 * to determine how many list transitions or attempts to create treasure
… …
431 * to do that. 431 * to do that.
432 */ 432 */
433void 433void
434create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 434create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
435{ 435{
436 // empty treasurelists are legal
437 if (!tl->items)
438 return;
436 439
437 if (tries++ > 100) 440 if (tries++ > 100)
438 { 441 {
439 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 442 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
440 return; 443 return;
441 } 444 }
445
442 if (tl->total_chance) 446 if (tl->total_chance)
443 create_one_treasure (tl, op, flag, difficulty, tries); 447 create_one_treasure (tl, op, flag, difficulty, tries);
444 else 448 else
445 create_all_treasures (tl->items, op, flag, difficulty, tries); 449 create_all_treasures (tl->items, op, flag, difficulty, tries);
446} 450}
… …
554 * elmex Thu Aug 10 18:45:44 CEST 2006: 558 * elmex Thu Aug 10 18:45:44 CEST 2006:
555 * 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
556 * weird integer between 1-31. 560 * weird integer between 1-31.
557 * 561 *
558 */ 562 */
559
560int 563int
561magic_from_difficulty (int difficulty) 564magic_from_difficulty (int difficulty)
562{ 565{
563 int percent = 0, magic = 0; 566 int percent = 0, magic = 0;
564 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 567 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
569 scaled_diff = 0; 572 scaled_diff = 0;
570 573
571 if (scaled_diff >= DIFFLEVELS) 574 if (scaled_diff >= DIFFLEVELS)
572 scaled_diff = DIFFLEVELS - 1; 575 scaled_diff = DIFFLEVELS - 1;
573 576
574 percent = RANDOM () % 100; 577 percent = rndm (100);
575 578
576 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 579 for (magic = 0; magic < (MAXMAGIC + 1); magic++)
577 { 580 {
578 percent -= difftomagic_list[scaled_diff][magic]; 581 percent -= difftomagic_list[scaled_diff][magic];
579 582
… …
585 { 588 {
586 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);
587 magic = 0; 590 magic = 0;
588 } 591 }
589 592
590 magic = (RANDOM () % 3) ? magic : -magic; 593 magic = (rndm (3)) ? magic : -magic;
591 /* 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); */
592 595
593 return magic; 596 return magic;
594} 597}
595 598
… …
610 if (op->arch) 613 if (op->arch)
611 { 614 {
612 if (op->type == ARMOUR) 615 if (op->type == ARMOUR)
613 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;
614 617
615 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 */
616 magic = (-magic); 619 magic = (-magic);
617 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 620 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
618 } 621 }
619 else 622 else
620 { 623 {
621 if (op->type == ARMOUR) 624 if (op->type == ARMOUR)
622 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 625 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
623 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 */
624 magic = (-magic); 627 magic = (-magic);
625 op->weight = (op->weight * (100 - magic * 10)) / 100; 628 op->weight = (op->weight * (100 - magic * 10)) / 100;
626 } 629 }
627} 630}
628 631
… …
652 * 1) Since rings can have multiple bonuses, if the same bonus 655 * 1) Since rings can have multiple bonuses, if the same bonus
653 * is rolled again, increase it - the bonuses now stack with 656 * is rolled again, increase it - the bonuses now stack with
654 * other bonuses previously rolled and ones the item might natively have. 657 * other bonuses previously rolled and ones the item might natively have.
655 * 2) Add code to deal with new PR method. 658 * 2) Add code to deal with new PR method.
656 */ 659 */
657
658void 660void
659set_ring_bonus (object *op, int bonus) 661set_ring_bonus (object *op, int bonus)
660{ 662{
661 663
662 int r = RANDOM () % (bonus > 0 ? 25 : 11); 664 int r = rndm (bonus > 0 ? 25 : 11);
663 665
664 if (op->type == AMULET) 666 if (op->type == AMULET)
665 { 667 {
666 if (!(RANDOM () % 21)) 668 if (!(rndm (21)))
667 r = 20 + RANDOM () % 2; 669 r = 20 + rndm (2);
668 else 670 else
669 { 671 {
670 if (RANDOM () & 2) 672 if (rndm (2))
671 r = 10; 673 r = 10;
672 else 674 else
673 r = 11 + RANDOM () % 9; 675 r = 11 + rndm (9);
674 } 676 }
675 } 677 }
676 678
677 switch (r) 679 switch (r)
678 { 680 {
… …
715 case 16: 717 case 16:
716 case 17: 718 case 17:
717 case 18: 719 case 18:
718 case 19: 720 case 19:
719 { 721 {
720 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 722 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
721 723
722 /* 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) */
723 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 725 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
724 726
725 /* 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
726 * positive values for how protections work out. Put another 728 * positive values for how protections work out. Put another
727 * 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
728 * even values. 730 * even values.
729 */ 731 */
730 if (bonus < 0) 732 if (bonus < 0)
731 val = 2 * -val - RANDOM () % b; 733 val = 2 * -val - rndm (b);
732 if (val > 35) 734 if (val > 35)
733 val = 35; /* Upper limit */ 735 val = 35; /* Upper limit */
734 b = 0; 736 b = 0;
737
735 while (op->resist[resist_table[resist]] != 0 && b < 4) 738 while (op->resist[resist_table[resist]] != 0 && b < 4)
736 {
737 resist = RANDOM () % num_resist_table; 739 resist = rndm (num_resist_table);
738 } 740
739 if (b == 4) 741 if (b == 4)
740 return; /* Not able to find a free resistance */ 742 return; /* Not able to find a free resistance */
743
741 op->resist[resist_table[resist]] = val; 744 op->resist[resist_table[resist]] = val;
742 /* We should probably do something more clever here to adjust value 745 /* We should probably do something more clever here to adjust value
743 * based on how good a resistance we gave. 746 * based on how good a resistance we gave.
744 */ 747 */
745 break; 748 break;
… …
773 case 22: 776 case 22:
774 op->stats.exp += bonus; /* Speed! */ 777 op->stats.exp += bonus; /* Speed! */
775 op->value = (op->value * 2) / 3; 778 op->value = (op->value * 2) / 3;
776 break; 779 break;
777 } 780 }
781
778 if (bonus > 0) 782 if (bonus > 0)
779 op->value *= 2 * bonus; 783 op->value *= 2 * bonus;
780 else 784 else
781 op->value = -(op->value * 2 * bonus) / 3; 785 op->value = -(op->value * 2 * bonus) / 3;
782} 786}
… …
787 * higher is the chance of returning a low number. 791 * higher is the chance of returning a low number.
788 * 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
789 * rings and amulets. 793 * rings and amulets.
790 * 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.
791 */ 795 */
792
793int 796int
794get_magic (int diff) 797get_magic (int diff)
795{ 798{
796 int i; 799 int i;
797 800
798 if (diff < 3) 801 if (diff < 3)
799 diff = 3; 802 diff = 3;
803
800 for (i = 0; i < 4; i++) 804 for (i = 0; i < 4; i++)
801 if (RANDOM () % diff) 805 if (rndm (diff))
802 return i; 806 return i;
807
803 return 4; 808 return 4;
804} 809}
805 810
806#define DICE2 (get_magic(2)==2?2:1) 811#define DICE2 (get_magic(2)==2?2:1)
807#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))
808 813
809/* 814/*
810 * 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
811 * 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
812 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 817 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
826 * value. 831 * value.
827 * 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
828 * 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
829 * 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
830 */ 835 */
831
832void 836void
833fix_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)
834{ 838{
835 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;
836 840
… …
873 if (!op->magic && max_magic) 877 if (!op->magic && max_magic)
874 set_magic (difficulty, op, max_magic, flags); 878 set_magic (difficulty, op, max_magic, flags);
875 879
876 num_enchantments = calc_item_power (op, 1); 880 num_enchantments = calc_item_power (op, 1);
877 881
878 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,
879 * used for shop_floors or treasures */ 885 * used for shop_floors or treasures */
880 generate_artifact (op, difficulty); 886 generate_artifact (op, difficulty);
881 } 887 }
882 888
883 /* Object was made an artifact. Calculate its item_power rating. 889 /* Object was made an artifact. Calculate its item_power rating.
… …
941 case WEAPON: 947 case WEAPON:
942 case ARMOUR: 948 case ARMOUR:
943 case SHIELD: 949 case SHIELD:
944 case HELMET: 950 case HELMET:
945 case CLOAK: 951 case CLOAK:
946 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 952 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
947 set_ring_bonus (op, -DICE2); 953 set_ring_bonus (op, -DICE2);
948 break; 954 break;
949 955
950 case BRACERS: 956 case BRACERS:
951 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 957 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
952 { 958 {
953 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 959 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
954 if (!QUERY_FLAG (op, FLAG_CURSED)) 960 if (!QUERY_FLAG (op, FLAG_CURSED))
955 op->value *= 3; 961 op->value *= 3;
956 } 962 }
… …
982 */ 988 */
983 if (op->inv && op->randomitems) 989 if (op->inv && op->randomitems)
984 { 990 {
985 /* value multiplier is same as for scrolls */ 991 /* value multiplier is same as for scrolls */
986 op->value = (op->value * op->inv->value); 992 op->value = (op->value * op->inv->value);
987 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 993 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
988 } 994 }
989 else 995 else
990 { 996 {
991 op->name = "potion"; 997 op->name = "potion";
992 op->name_pl = "potions"; 998 op->name_pl = "potions";
993 } 999 }
994 1000
995 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 1001 if (!(flags & GT_ONLY_GOOD) && rndm (2))
996 SET_FLAG (op, FLAG_CURSED); 1002 SET_FLAG (op, FLAG_CURSED);
997 break; 1003 break;
998 } 1004 }
999 1005
1000 case AMULET: 1006 case AMULET:
… …
1010 } 1016 }
1011 1017
1012 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! */
1013 break; 1019 break;
1014 1020
1015 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 1021 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1016 SET_FLAG (op, FLAG_CURSED); 1022 SET_FLAG (op, FLAG_CURSED);
1017 1023
1018 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1024 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1019 1025
1020 if (op->type != RING) /* Amulets have only one ability */ 1026 if (op->type != RING) /* Amulets have only one ability */
1021 break; 1027 break;
1022 1028
1023 if (!(RANDOM () % 4)) 1029 if (!(rndm (4)))
1024 { 1030 {
1025 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1031 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1026 1032
1027 if (d > 0) 1033 if (d > 0)
1028 op->value *= 3; 1034 op->value *= 3;
1029 1035
1030 set_ring_bonus (op, d); 1036 set_ring_bonus (op, d);
1031 1037
1032 if (!(RANDOM () % 4)) 1038 if (!(rndm (4)))
1033 { 1039 {
1034 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1040 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1035 1041
1036 if (d > 0) 1042 if (d > 0)
1037 op->value *= 5; 1043 op->value *= 5;
1038 set_ring_bonus (op, d); 1044 set_ring_bonus (op, d);
1039 } 1045 }
1040 } 1046 }
1041 1047
1042 if (GET_ANIM_ID (op)) 1048 if (GET_ANIM_ID (op))
1043 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1049 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1044 1050
1045 break; 1051 break;
1046 1052
1047 case BOOK: 1053 case BOOK:
1048 /* Is it an empty book?, if yes lets make a special· 1054 /* Is it an empty book?, if yes lets make a special·
1049 * msg for it, and tailor its properties based on the· 1055 * msg for it, and tailor its properties based on the·
1050 * creator and/or map level we found it on. 1056 * creator and/or map level we found it on.
1051 */ 1057 */
1052 if (!op->msg && RANDOM () % 10) 1058 if (!op->msg && rndm (10))
1053 { 1059 {
1054 /* set the book level properly */ 1060 /* set the book level properly */
1055 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1061 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1056 { 1062 {
1057 if (op->map && op->map->difficulty) 1063 if (op->map && op->map->difficulty)
1058 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1064 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1059 else 1065 else
1060 op->level = RANDOM () % 20 + 1; 1066 op->level = rndm (20) + 1;
1061 } 1067 }
1062 else 1068 else
1063 op->level = RANDOM () % creator->level; 1069 op->level = rndm (creator->level);
1064 1070
1065 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);
1066 /* books w/ info are worth more! */ 1072 /* books w/ info are worth more! */
1067 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));
1068 /* creator related stuff */ 1074 /* creator related stuff */
… …
1167 */ 1173 */
1168 1174
1169/* 1175/*
1170 * Allocate and return the pointer to an empty artifactlist structure. 1176 * Allocate and return the pointer to an empty artifactlist structure.
1171 */ 1177 */
1172
1173static artifactlist * 1178static artifactlist *
1174get_empty_artifactlist (void) 1179get_empty_artifactlist (void)
1175{ 1180{
1176 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1181 return salloc0 <artifactlist> ();
1177
1178 if (al == NULL)
1179 fatal (OUT_OF_MEMORY);
1180 al->next = NULL;
1181 al->items = NULL;
1182 al->total_chance = 0;
1183 return al;
1184} 1182}
1185 1183
1186/* 1184/*
1187 * Allocate and return the pointer to an empty artifact structure. 1185 * Allocate and return the pointer to an empty artifact structure.
1188 */ 1186 */
1189
1190static artifact * 1187static artifact *
1191get_empty_artifact (void) 1188get_empty_artifact (void)
1192{ 1189{
1193 artifact *a = (artifact *) malloc (sizeof (artifact)); 1190 return salloc0 <artifact> ();
1194
1195 if (a == NULL)
1196 fatal (OUT_OF_MEMORY);
1197 a->item = NULL;
1198 a->next = NULL;
1199 a->chance = 0;
1200 a->difficulty = 0;
1201 a->allowed = NULL;
1202 return a;
1203} 1191}
1204 1192
1205/* 1193/*
1206 * 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
1207 * of objects on it. 1195 * of objects on it.
1208 */ 1196 */
1209
1210artifactlist * 1197artifactlist *
1211find_artifactlist (int type) 1198find_artifactlist (int type)
1212{ 1199{
1213 artifactlist *al;
1214
1215 for (al = first_artifactlist; al != NULL; al = al->next) 1200 for (artifactlist *al = first_artifactlist; al; al = al->next)
1216 if (al->type == type) 1201 if (al->type == type)
1217 return al; 1202 return al;
1203
1218 return NULL; 1204 return 0;
1219} 1205}
1220 1206
1221/* 1207/*
1222 * For debugging purposes. Dumps all tables. 1208 * For debugging purposes. Dumps all tables.
1223 */ 1209 */
1224
1225void 1210void
1226dump_artifacts (void) 1211dump_artifacts (void)
1227{ 1212{
1228 artifactlist *al; 1213 artifactlist *al;
1229 artifact *art; 1214 artifact *art;
… …
1236 for (art = al->items; art != NULL; art = art->next) 1221 for (art = al->items; art != NULL; art = art->next)
1237 { 1222 {
1238 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);
1239 if (art->allowed != NULL) 1224 if (art->allowed != NULL)
1240 { 1225 {
1241 fprintf (logfile, "\tAllowed combinations:"); 1226 fprintf (logfile, "\tallowed combinations:");
1242 for (next = art->allowed; next != NULL; next = next->next) 1227 for (next = art->allowed; next != NULL; next = next->next)
1243 fprintf (logfile, "%s,", &next->name); 1228 fprintf (logfile, "%s,", &next->name);
1244 fprintf (logfile, "\n"); 1229 fprintf (logfile, "\n");
1245 } 1230 }
1246 } 1231 }
… …
1257 treasurelist *tl; 1242 treasurelist *tl;
1258 int i; 1243 int i;
1259 1244
1260 if (depth > 100) 1245 if (depth > 100)
1261 return; 1246 return;
1247
1262 while (t) 1248 while (t)
1263 { 1249 {
1264 if (t->name) 1250 if (t->name)
1265 { 1251 {
1266 for (i = 0; i < depth; i++) 1252 for (i = 0; i < depth; i++)
1267 fprintf (logfile, " "); 1253 fprintf (logfile, " ");
1254
1268 fprintf (logfile, "{ (list: %s)\n", &t->name); 1255 fprintf (logfile, "{ (list: %s)\n", &t->name);
1256
1269 tl = find_treasurelist (t->name); 1257 tl = treasurelist::find (t->name);
1270 if (tl) 1258 if (tl)
1271 dump_monster_treasure_rec (name, tl->items, depth + 2); 1259 dump_monster_treasure_rec (name, tl->items, depth + 2);
1260
1272 for (i = 0; i < depth; i++) 1261 for (i = 0; i < depth; i++)
1273 fprintf (logfile, " "); 1262 fprintf (logfile, " ");
1263
1274 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1264 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1275 } 1265 }
1276 else 1266 else
1277 { 1267 {
1278 for (i = 0; i < depth; i++) 1268 for (i = 0; i < depth; i++)
1279 fprintf (logfile, " "); 1269 fprintf (logfile, " ");
1270
1280 if (t->item && t->item->clone.type == FLESH) 1271 if (t->item && t->item->clone.type == FLESH)
1281 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1272 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1282 else 1273 else
1283 fprintf (logfile, "%s\n", &t->item->clone.name); 1274 fprintf (logfile, "%s\n", &t->item->clone.name);
1284 } 1275 }
1285 1276
1286 if (t->next_yes) 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 }
1293 1285
1294 if (t->next_no) 1286 if (t->next_no)
1295 { 1287 {
1296 for (i = 0; i < depth; i++) 1288 for (i = 0; i < depth; i++)
1297 fprintf (logfile, " "); 1289 fprintf (logfile, " ");
1290
1298 fprintf (logfile, " (if no)\n"); 1291 fprintf (logfile, " (if no)\n");
1299 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1292 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1300 } 1293 }
1301 1294
1302 t = t->next; 1295 t = t->next;
… …
1305 1298
1306/* 1299/*
1307 * For debugging purposes. Dumps all treasures for a given monster. 1300 * For debugging purposes. Dumps all treasures for a given monster.
1308 * Created originally by Raphael Quinet for debugging the alchemy code. 1301 * Created originally by Raphael Quinet for debugging the alchemy code.
1309 */ 1302 */
1310
1311void 1303void
1312dump_monster_treasure (const char *name) 1304dump_monster_treasure (const char *name)
1313{ 1305{
1314 archetype *at; 1306 archetype *at;
1315 int found; 1307 int found;
1316 1308
1317 found = 0; 1309 found = 0;
1318 fprintf (logfile, "\n"); 1310 fprintf (logfile, "\n");
1311
1319 for (at = first_archetype; at != NULL; at = at->next) 1312 for (at = first_archetype; at != NULL; at = at->next)
1320 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1313 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1321 { 1314 {
1322 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);
1323 if (at->clone.randomitems != NULL) 1316 if (at->clone.randomitems != NULL)
1324 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);
1325 else 1318 else
1326 fprintf (logfile, "(nothing)\n"); 1319 fprintf (logfile, "(nothing)\n");
1320
1327 fprintf (logfile, "\n"); 1321 fprintf (logfile, "\n");
1328 found++; 1322 found++;
1329 } 1323 }
1324
1330 if (found == 0) 1325 if (found == 0)
1331 fprintf (logfile, "No objects have the name %s!\n\n", name); 1326 fprintf (logfile, "No objects have the name %s!\n\n", name);
1332} 1327}
1333 1328
1334/* 1329/*
1335 * 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.
1336 */ 1331 */
1337
1338void 1332void
1339init_artifacts (void) 1333init_artifacts (void)
1340{ 1334{
1341 static int has_been_inited = 0; 1335 static int has_been_inited = 0;
1342 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1336 char filename[MAX_BUF];
1343 artifact *art = NULL; 1337 artifact *art = NULL;
1344 linked_char *tmp;
1345 int value;
1346 artifactlist *al; 1338 artifactlist *al;
1347 1339
1348 if (has_been_inited) 1340 if (has_been_inited)
1349 return; 1341 return;
1350 else 1342 else
1351 has_been_inited = 1; 1343 has_been_inited = 1;
1352 1344
1353 sprintf (filename, "%s/artifacts", settings.datadir); 1345 sprintf (filename, "%s/artifacts", settings.datadir);
1354 object_thawer thawer (filename); 1346 object_thawer f (filename);
1355 1347
1356 if (!thawer) 1348 if (!f)
1357 return; 1349 return;
1358 1350
1359 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1351 f.next ();
1360 {
1361 if (*buf == '#')
1362 continue;
1363 if ((cp = strchr (buf, '\n')) != NULL)
1364 *cp = '\0';
1365 cp = buf;
1366 while (*cp == ' ') /* Skip blanks */
1367 cp++;
1368 if (*cp == '\0')
1369 continue;
1370 1352
1371 if (!strncmp (cp, "Allowed", 7)) 1353 for (;;)
1354 {
1355 switch (f.kw)
1372 { 1356 {
1357 case KW_allowed:
1373 if (art == NULL) 1358 if (!art)
1359 {
1360 art = get_empty_artifact ();
1361 nrofartifacts++;
1362 }
1363
1374 { 1364 {
1375 art = get_empty_artifact (); 1365 if (!strcmp (f.get_str (), "all"))
1376 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));
1377 } 1384 }
1378 cp = strchr (cp, ' ') + 1; 1385 break;
1379 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 }
1380 continue; 1416 continue;
1381 1417
1382 do 1418 case KW_EOF:
1419 goto done;
1420
1421 default:
1422 if (!f.parse_error ("artifacts file"))
1423 cleanup ("artifacts file required");
1383 { 1424 break;
1384 nrofallowedstr++;
1385 if ((next = strchr (cp, ',')) != NULL)
1386 *(next++) = '\0';
1387 tmp = new linked_char;
1388
1389 tmp->name = cp;
1390 tmp->next = art->allowed;
1391 art->allowed = tmp;
1392 }
1393 while ((cp = next) != NULL);
1394 }
1395 else if (sscanf (cp, "chance %d", &value))
1396 art->chance = (uint16) value;
1397 else if (sscanf (cp, "difficulty %d", &value))
1398 art->difficulty = (uint8) value;
1399 else if (!strncmp (cp, "Object", 6))
1400 { 1425 }
1401 art->item = object::create ();
1402 1426
1403 if (!load_object (thawer, art->item, 0)) 1427 f.next ();
1404 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1405
1406 art->item->name = strchr (cp, ' ') + 1;
1407 al = find_artifactlist (art->item->type);
1408 if (al == NULL)
1409 {
1410 al = get_empty_artifactlist ();
1411 al->type = art->item->type;
1412 al->next = first_artifactlist;
1413 first_artifactlist = al;
1414 }
1415 art->next = al->items;
1416 al->items = art;
1417 art = NULL;
1418 }
1419 else
1420 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1421 } 1428 }
1422 1429
1430done:
1423 for (al = first_artifactlist; al != NULL; al = al->next) 1431 for (al = first_artifactlist; al; al = al->next)
1424 { 1432 {
1425 for (art = al->items; art != NULL; art = art->next) 1433 for (art = al->items; art; art = art->next)
1426 { 1434 {
1427 if (!art->chance) 1435 if (!art->chance)
1428 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);
1429 else 1437 else
1430 al->total_chance += art->chance; 1438 al->total_chance += art->chance;
… …
1499 1507
1500 op->set_speed (op->speed); 1508 op->set_speed (op->speed);
1501 } 1509 }
1502 1510
1503 if (change->nrof) 1511 if (change->nrof)
1504 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1512 op->nrof = rndm (change->nrof) + 1;
1505 1513
1506 op->stats.exp += change->stats.exp; /* Speed modifier */ 1514 op->stats.exp += change->stats.exp; /* Speed modifier */
1507 op->stats.wc += change->stats.wc; 1515 op->stats.wc += change->stats.wc;
1508 op->stats.ac += change->stats.ac; 1516 op->stats.ac += change->stats.ac;
1509 1517
… …
1612 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);
1613 } 1621 }
1614 1622
1615 op->value *= change->value; 1623 op->value *= change->value;
1616 1624
1617 if (change->material) 1625 if (change->materials)
1618 op->material = change->material; 1626 op->materials = change->materials;
1619 1627
1620 if (change->materialname) 1628 if (change->materialname)
1621 op->materialname = change->materialname; 1629 op->materialname = change->materialname;
1622 1630
1623 if (change->slaying) 1631 if (change->slaying)
… …
1717 return; 1725 return;
1718 } 1726 }
1719 1727
1720 for (i = 0; i < ARTIFACT_TRIES; i++) 1728 for (i = 0; i < ARTIFACT_TRIES; i++)
1721 { 1729 {
1722 int roll = RANDOM () % al->total_chance; 1730 int roll = rndm (al->total_chance);
1723 1731
1724 for (art = al->items; art != NULL; art = art->next) 1732 for (art = al->items; art; art = art->next)
1725 { 1733 {
1726 roll -= art->chance; 1734 roll -= art->chance;
1727 if (roll < 0) 1735 if (roll < 0)
1728 break; 1736 break;
1729 } 1737 }
… …
1822} 1830}
1823 1831
1824void 1832void
1825free_treasurestruct (treasure *t) 1833free_treasurestruct (treasure *t)
1826{ 1834{
1827 if (t->next)
1828 free_treasurestruct (t->next); 1835 if (t->next) free_treasurestruct (t->next);
1829 if (t->next_yes)
1830 free_treasurestruct (t->next_yes); 1836 if (t->next_yes) free_treasurestruct (t->next_yes);
1831 if (t->next_no)
1832 free_treasurestruct (t->next_no); 1837 if (t->next_no) free_treasurestruct (t->next_no);
1833 1838
1834 delete t; 1839 delete t;
1835} 1840}
1836 1841
1837void 1842void
… …
1842 1847
1843 delete lc; 1848 delete lc;
1844} 1849}
1845 1850
1846void 1851void
1847free_artifact (artifact * at) 1852free_artifact (artifact *at)
1848{ 1853{
1849 if (at->next)
1850 free_artifact (at->next); 1854 if (at->next) free_artifact (at->next);
1851
1852 if (at->allowed)
1853 free_charlinks (at->allowed); 1855 if (at->allowed) free_charlinks (at->allowed);
1854 1856
1855 at->item->destroy (1); 1857 at->item->destroy (1);
1856 1858
1857 delete at; 1859 sfree (at);
1858} 1860}
1859 1861
1860void 1862void
1861free_artifactlist (artifactlist * al) 1863free_artifactlist (artifactlist *al)
1862{ 1864{
1863 artifactlist *nextal; 1865 artifactlist *nextal;
1864 1866
1865 for (al = first_artifactlist; al; al = nextal) 1867 for (al = first_artifactlist; al; al = nextal)
1866 { 1868 {
1867 nextal = al->next; 1869 nextal = al->next;
1868 1870
1869 if (al->items) 1871 if (al->items)
1870 free_artifact (al->items); 1872 free_artifact (al->items);
1871 1873
1872 free (al); 1874 sfree (al);
1873 } 1875 }
1874} 1876}
1875 1877
1876void 1878void
1877free_all_treasures (void) 1879free_all_treasures (void)
1878{ 1880{
1879 treasurelist *tl, *next; 1881 treasurelist *tl, *next;
1880 1882
1881
1882 for (tl = first_treasurelist; tl != NULL; tl = next) 1883 for (tl = first_treasurelist; tl; tl = next)
1883 { 1884 {
1885 clear (tl);
1886
1884 next = tl->next; 1887 next = tl->next;
1885 if (tl->items)
1886 free_treasurestruct (tl->items);
1887 delete tl; 1888 delete tl;
1888 } 1889 }
1890
1889 free_artifactlist (first_artifactlist); 1891 free_artifactlist (first_artifactlist);
1890} 1892}

Diff Legend

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