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.41 by root, Mon Apr 16 06:23:40 2007 UTC vs.
Revision 1.58 by root, Sat Apr 28 17:51:57 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25#define ALLOWED_COMBINATION
26
27/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
28 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
29 * slows the startup some (and not actual game play), it is by default 27 * slows the startup some (and not actual game play), it is by default
30 * left on 28 * left on
31 */ 29 */
32#define TREASURE_DEBUG 30#define TREASURE_DEBUG
33 31
34/* TREASURE_VERBOSE enables copious output concerning artifact generation */ 32/* TREASURE_VERBOSE enables copious output concerning artifact generation */
35 33
36/* #define TREASURE_VERBOSE */ 34//#define TREASURE_VERBOSE
37 35
38#include <global.h> 36#include <global.h>
39#include <treasure.h> 37#include <treasure.h>
40#include <funcpoint.h> 38#include <funcpoint.h>
41#include <loader.h> 39#include <loader.h>
… …
56> tl_map_t; 54> tl_map_t;
57 55
58static tl_map_t tl_map; 56static tl_map_t tl_map;
59 57
60/* 58/*
61 * Initialize global archtype pointers: 59 * Searches for the given treasurelist
62 */
63void
64init_archetype_pointers ()
65{
66 int prev_warn = warn_archetypes;
67
68 warn_archetypes = 1;
69
70 if (ring_arch == NULL)
71 ring_arch = archetype::find ("ring");
72 if (amulet_arch == NULL)
73 amulet_arch = archetype::find ("amulet");
74 if (staff_arch == NULL)
75 staff_arch = archetype::find ("staff");
76 if (crown_arch == NULL)
77 crown_arch = archetype::find ("crown");
78
79 warn_archetypes = prev_warn;
80}
81
82/*
83 * Searches for the given treasurelist in the globally linked list
84 * of treasurelists which has been built by load_treasures().
85 */ 60 */
86treasurelist * 61treasurelist *
87treasurelist::find (const char *name) 62treasurelist::find (const char *name)
88{ 63{
89 if (!name) 64 if (!name)
90 return 0; 65 return 0;
91 66
92 AUTODECL (i, tl_map.find (name)); 67 auto (i, tl_map.find (name));
93 68
94 if (i == tl_map.end ()) 69 if (i == tl_map.end ())
95 return 0; 70 return 0;
96 71
97 return i->second; 72 return i->second;
… …
127 if (tl->items) 102 if (tl->items)
128 { 103 {
129 free_treasurestruct (tl->items); 104 free_treasurestruct (tl->items);
130 tl->items = 0; 105 tl->items = 0;
131 } 106 }
107
108 tl->total_chance = 0;
132} 109}
110
111#ifdef TREASURE_DEBUG
112/* recursived checks the linked list. Treasurelist is passed only
113 * so that the treasure name can be printed out
114 */
115static void
116check_treasurelist (const treasure *t, const treasurelist * tl)
117{
118 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
119 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
120
121 if (t->next)
122 check_treasurelist (t->next, tl);
123
124 if (t->next_yes)
125 check_treasurelist (t->next_yes, tl);
126
127 if (t->next_no)
128 check_treasurelist (t->next_no, tl);
129}
130#endif
133 131
134/* 132/*
135 * Reads the lib/treasure file from disk, and parses the contents 133 * Reads the lib/treasure file from disk, and parses the contents
136 * into an internal treasure structure (very linked lists) 134 * into an internal treasure structure (very linked lists)
137 */ 135 */
138
139static treasure * 136static treasure *
140load_treasure (FILE * fp, int *line) 137read_treasure (object_thawer &f)
141{ 138{
142 char buf[MAX_BUF], *cp, variable[MAX_BUF];
143 treasure *t = new treasure; 139 treasure *t = new treasure;
144 int value;
145 140
146 nroftreasures++; 141 f.next ();
147 while (fgets (buf, MAX_BUF, fp) != NULL)
148 {
149 (*line)++;
150 142
151 if (*buf == '#') 143 for (;;)
152 continue; 144 {
153 if ((cp = strchr (buf, '\n')) != NULL) 145 coroapi::cede_to_tick_every (10);
154 *cp = '\0';
155 cp = buf;
156 while (isspace (*cp)) /* Skip blanks */
157 cp++;
158 146
159 if (sscanf (cp, "arch %s", variable)) 147 switch (f.kw)
160 {
161 if ((t->item = archetype::find (variable)) == NULL)
162 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
163 } 148 {
164 else if (sscanf (cp, "list %s", variable)) 149 case KW_arch:
165 t->name = variable; 150 t->item = archetype::get (f.get_str ());
166 else if (sscanf (cp, "change_name %s", variable)) 151 break;
167 t->change_arch.name = variable; 152
168 else if (sscanf (cp, "change_title %s", variable)) 153 case KW_list: f.get (t->name); break;
169 t->change_arch.title = variable; 154 case KW_change_name: f.get (t->change_arch.name); break;
170 else if (sscanf (cp, "change_slaying %s", variable)) 155 case KW_change_title: f.get (t->change_arch.title); break;
171 t->change_arch.slaying = variable; 156 case KW_change_slaying: f.get (t->change_arch.slaying); break;
172 else if (sscanf (cp, "chance %d", &value)) 157 case KW_chance: f.get (t->chance); break;
173 t->chance = (uint8) value; 158 case KW_nrof: f.get (t->nrof); break;
174 else if (sscanf (cp, "nrof %d", &value)) 159 case KW_magic: f.get (t->magic); break;
175 t->nrof = (uint16) value; 160
176 else if (sscanf (cp, "magic %d", &value)) 161 case KW_yes: t->next_yes = read_treasure (f); continue;
177 t->magic = (uint8) value; 162 case KW_no: t->next_no = read_treasure (f); continue;
178 else if (!strcmp (cp, "yes")) 163
179 t->next_yes = load_treasure (fp, line); 164 case KW_end:
180 else if (!strcmp (cp, "no")) 165 f.next ();
181 t->next_no = load_treasure (fp, line);
182 else if (!strcmp (cp, "end"))
183 return t;
184 else if (!strcmp (cp, "more"))
185 {
186 t->next = load_treasure (fp, line);
187 return t; 166 return t;
188 }
189 else
190 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
191 }
192 LOG (llevError, "treasure lacks 'end'.\n");
193 return t;
194}
195 167
196#ifdef TREASURE_DEBUG 168 case KW_more:
169 t->next = read_treasure (f);
170 return t;
197 171
198/* recursived checks the linked list. Treasurelist is passed only 172 default:
199 * so that the treasure name can be printed out 173 if (!f.parse_error ("treasurelist", t->name))
200 */ 174 return 0;
201static void
202check_treasurelist (const treasure *t, const treasurelist * tl)
203{
204 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
205 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
206 175
207 if (t->next) 176 return t;
208 check_treasurelist (t->next, tl); 177 }
209 178
210 if (t->next_yes) 179 f.next ();
211 check_treasurelist (t->next_yes, tl); 180 }
212
213 if (t->next_no)
214 check_treasurelist (t->next_no, tl);
215} 181}
216#endif
217 182
218/* 183/*
219 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
220 * Each treasure is parsed with the help of load_treasure(). 184 * Each treasure is parsed with the help of load_treasure().
221 */ 185 */
222 186treasurelist *
223void 187treasurelist::read (object_thawer &f)
224load_treasures (void)
225{ 188{
226 FILE *fp; 189 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
227 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
228 treasure *t;
229 int comp, line = 0;
230 190
231 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 191 bool one = f.kw == KW_treasureone;
232 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 192 treasurelist *tl = treasurelist::get (f.get_str ());
233 { 193 clear (tl);
234 LOG (llevError, "Can't open treasure file.\n"); 194 tl->items = read_treasure (f);
195 if (!tl->items)
235 return; 196 return 0;
236 }
237 while (fgets (buf, MAX_BUF, fp) != NULL)
238 {
239 line++;
240 if (*buf == '#' || *buf == '\n')
241 ; // ignore
242 else if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
243 {
244 treasurelist *tl = treasurelist::get (name);
245 197
246 clear (tl);
247 tl->items = load_treasure (fp, &line);
248
249 /* This is a one of the many items on the list should be generated. 198 /* This is a one of the many items on the list should be generated.
250 * Add up the chance total, and check to make sure the yes & no 199 * Add up the chance total, and check to make sure the yes & no
251 * fields of the treasures are not being used. 200 * fields of the treasures are not being used.
252 */ 201 */
253 if (!strncmp (buf, "treasureone", 11)) 202 if (one)
203 {
204 for (treasure *t = tl->items; t; t = t->next)
205 {
206 if (t->next_yes || t->next_no)
254 { 207 {
255 for (t = tl->items; t; t = t->next)
256 {
257#ifdef TREASURE_DEBUG
258 if (t->next_yes || t->next_no)
259 {
260 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 208 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
261 LOG (llevError, " the next_yes or next_no field is set\n"); 209 LOG (llevError, " the next_yes or next_no field is set\n");
262 }
263#endif
264 tl->total_chance += t->chance;
265 }
266 } 210 }
267 }
268 else
269 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
270 }
271 211
272 close_and_delete (fp, comp); 212 tl->total_chance += t->chance;
213 }
214 }
273 215
274#ifdef TREASURE_DEBUG 216 return tl;
275 /* Perform some checks on how valid the treasure data actually is.
276 * verify that list transitions work (ie, the list that it is supposed
277 * to transition to exists). Also, verify that at least the name
278 * or archetype is set for each treasure element.
279 */
280 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
281 check_treasurelist (tl->items, tl);
282#endif
283} 217}
284 218
285/* 219/*
286 * Generates the objects specified by the given treasure. 220 * Generates the objects specified by the given treasure.
287 * It goes recursively through the rest of the linked list. 221 * It goes recursively through the rest of the linked list.
… …
294 * start with equipment, but only their abilities). 228 * start with equipment, but only their abilities).
295 */ 229 */
296static void 230static void
297put_treasure (object *op, object *creator, int flags) 231put_treasure (object *op, object *creator, int flags)
298{ 232{
299 object *tmp; 233 if (flags & GT_ENVIRONMENT)
300 234 {
301 /* Bit of a hack - spells should never be put onto the map. The entire 235 /* Bit of a hack - spells should never be put onto the map. The entire
302 * treasure stuff is a problem - there is no clear idea of knowing 236 * treasure stuff is a problem - there is no clear idea of knowing
303 * this is the original object, or if this is an object that should be created 237 * this is the original object, or if this is an object that should be created
304 * by another object. 238 * by another object.
305 */ 239 */
306 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 //TODO: flag such as objects... as such (no drop, anybody?)
307 { 241 if (op->type == SPELL)
242 {
243 op->destroy ();
244 return;
245 }
246
247 op->expand_tail ();
248
249 if (ob_blocked (op, creator->map, creator->x, creator->y))
250 op->destroy ();
251 else
252 {
308 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 253 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
309 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 254 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
255 }
310 } 256 }
311 else 257 else
312 { 258 {
313 op = creator->insert (op); 259 op = creator->insert (op);
314 260
315 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 261 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
316 monster_check_apply (creator, op); 262 monster_check_apply (creator, op);
317 263
318 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 264 if (flags & GT_UPDATE_INV)
265 if (object *tmp = creator->in_player ())
319 esrv_send_item (tmp, op); 266 esrv_send_item (tmp, op);
320 } 267 }
321} 268}
322 269
323/* if there are change_xxx commands in the treasure, we include the changes 270/* if there are change_xxx commands in the treasure, we include the changes
324 * in the generated object 271 * in the generated object
… …
346 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 293 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
347 { 294 {
348 if (t->name) 295 if (t->name)
349 { 296 {
350 if (difficulty >= t->magic) 297 if (difficulty >= t->magic)
298 if (treasurelist *tl = treasurelist::find (t->name))
351 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries); 299 create_treasure (tl, op, flag, difficulty, tries);
300 else
301 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
352 } 302 }
353 else 303 else
354 { 304 {
355 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 305 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
356 { 306 {
… …
419 fix_generated_item (tmp, op, difficulty, t->magic, flag); 369 fix_generated_item (tmp, op, difficulty, t->magic, flag);
420 change_treasure (t, tmp); 370 change_treasure (t, tmp);
421 put_treasure (tmp, op, flag); 371 put_treasure (tmp, op, flag);
422 } 372 }
423 } 373 }
374}
375
376void
377object::create_treasure (treasurelist *tl, int flags)
378{
379 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
424} 380}
425 381
426/* This calls the appropriate treasure creation function. tries is passed 382/* This calls the appropriate treasure creation function. tries is passed
427 * to determine how many list transitions or attempts to create treasure 383 * to determine how many list transitions or attempts to create treasure
428 * have been made. It is really in place to prevent infinite loops with 384 * have been made. It is really in place to prevent infinite loops with
… …
441 { 397 {
442 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
443 return; 399 return;
444 } 400 }
445 401
402 if (op->flag [FLAG_TREASURE_ENV])
403 flag |= GT_ENVIRONMENT;
404
446 if (tl->total_chance) 405 if (tl->total_chance)
447 create_one_treasure (tl, op, flag, difficulty, tries); 406 create_one_treasure (tl, op, flag, difficulty, tries);
448 else 407 else
449 create_all_treasures (tl->items, op, flag, difficulty, tries); 408 create_all_treasures (tl->items, op, flag, difficulty, tries);
450} 409}
… …
457object * 416object *
458generate_treasure (treasurelist *tl, int difficulty) 417generate_treasure (treasurelist *tl, int difficulty)
459{ 418{
460 difficulty = clamp (difficulty, 1, settings.max_level); 419 difficulty = clamp (difficulty, 1, settings.max_level);
461 420
462 object *ob = object::create (), *tmp; 421 object *ob = object::create ();
463 422
464 create_treasure (tl, ob, 0, difficulty, 0); 423 create_treasure (tl, ob, 0, difficulty, 0);
465 424
466 /* Don't want to free the object we are about to return */ 425 /* Don't want to free the object we are about to return */
467 tmp = ob->inv; 426 object *tmp = ob->inv;
468 if (tmp != NULL) 427 if (tmp)
469 tmp->remove (); 428 tmp->remove ();
470 429
471 if (ob->inv) 430 if (ob->inv)
472 LOG (llevError, "In generate treasure, created multiple objects.\n"); 431 LOG (llevError, "In generate treasure, created multiple objects.\n");
473 432
… …
481 * The array has two arguments, the difficulty of the level, and the 440 * The array has two arguments, the difficulty of the level, and the
482 * magical bonus "wanted". 441 * magical bonus "wanted".
483 */ 442 */
484 443
485static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 444static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
486
487/*chance of magic difficulty*/ 445// chance of magic difficulty
488
489/* +0 +1 +2 +3 +4 */ 446// +0 +1 +2 +3 +4
490 {95, 2, 2, 1, 0}, /*1 */ 447 {95, 2, 2, 1, 0}, // 1
491 {92, 5, 2, 1, 0}, /*2 */ 448 {92, 5, 2, 1, 0}, // 2
492 {85, 10, 4, 1, 0}, /*3 */ 449 {85, 10, 4, 1, 0}, // 3
493 {80, 14, 4, 2, 0}, /*4 */ 450 {80, 14, 4, 2, 0}, // 4
494 {75, 17, 5, 2, 1}, /*5 */ 451 {75, 17, 5, 2, 1}, // 5
495 {70, 18, 8, 3, 1}, /*6 */ 452 {70, 18, 8, 3, 1}, // 6
496 {65, 21, 10, 3, 1}, /*7 */ 453 {65, 21, 10, 3, 1}, // 7
497 {60, 22, 12, 4, 2}, /*8 */ 454 {60, 22, 12, 4, 2}, // 8
498 {55, 25, 14, 4, 2}, /*9 */ 455 {55, 25, 14, 4, 2}, // 9
499 {50, 27, 16, 5, 2}, /*10 */ 456 {50, 27, 16, 5, 2}, // 10
500 {45, 28, 18, 6, 3}, /*11 */ 457 {45, 28, 18, 6, 3}, // 11
501 {42, 28, 20, 7, 3}, /*12 */ 458 {42, 28, 20, 7, 3}, // 12
502 {40, 27, 21, 8, 4}, /*13 */ 459 {40, 27, 21, 8, 4}, // 13
503 {38, 25, 22, 10, 5}, /*14 */ 460 {38, 25, 22, 10, 5}, // 14
504 {36, 23, 23, 12, 6}, /*15 */ 461 {36, 23, 23, 12, 6}, // 15
505 {33, 21, 24, 14, 8}, /*16 */ 462 {33, 21, 24, 14, 8}, // 16
506 {31, 19, 25, 16, 9}, /*17 */ 463 {31, 19, 25, 16, 9}, // 17
507 {27, 15, 30, 18, 10}, /*18 */ 464 {27, 15, 30, 18, 10}, // 18
508 {20, 12, 30, 25, 13}, /*19 */ 465 {20, 12, 30, 25, 13}, // 19
509 {15, 10, 28, 30, 17}, /*20 */ 466 {15, 10, 28, 30, 17}, // 20
510 {13, 9, 27, 28, 23}, /*21 */ 467 {13, 9, 27, 28, 23}, // 21
511 {10, 8, 25, 28, 29}, /*22 */ 468 {10, 8, 25, 28, 29}, // 22
512 {8, 7, 23, 26, 36}, /*23 */ 469 { 8, 7, 23, 26, 36}, // 23
513 {6, 6, 20, 22, 46}, /*24 */ 470 { 6, 6, 20, 22, 46}, // 24
514 {4, 5, 17, 18, 56}, /*25 */ 471 { 4, 5, 17, 18, 56}, // 25
515 {2, 4, 12, 14, 68}, /*26 */ 472 { 2, 4, 12, 14, 68}, // 26
516 {0, 3, 7, 10, 80}, /*27 */ 473 { 0, 3, 7, 10, 80}, // 27
517 {0, 0, 3, 7, 90}, /*28 */ 474 { 0, 0, 3, 7, 90}, // 28
518 {0, 0, 0, 3, 97}, /*29 */ 475 { 0, 0, 0, 3, 97}, // 29
519 {0, 0, 0, 0, 100}, /*30 */ 476 { 0, 0, 0, 0, 100}, // 30
520 {0, 0, 0, 0, 100}, /*31 */ 477 { 0, 0, 0, 0, 100}, // 31
521}; 478};
522
523 479
524/* calculate the appropriate level for wands staves and scrolls. 480/* calculate the appropriate level for wands staves and scrolls.
525 * This code presumes that op has had its spell object created (in op->inv) 481 * This code presumes that op has had its spell object created (in op->inv)
526 * 482 *
527 * elmex Wed Aug 9 17:44:59 CEST 2006: 483 * elmex Wed Aug 9 17:44:59 CEST 2006:
528 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 484 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
529 */ 485 */
530
531int 486int
532level_for_item (const object *op, int difficulty) 487level_for_item (const object *op, int difficulty)
533{ 488{
534 int olevel = 0; 489 int olevel = 0;
535 490
… …
845 save_item_power = op->item_power; 800 save_item_power = op->item_power;
846 op->item_power = 0; 801 op->item_power = 0;
847 802
848 if (op->randomitems && op->type != SPELL) 803 if (op->randomitems && op->type != SPELL)
849 { 804 {
850 create_treasure (op->randomitems, op, flags, difficulty, 0); 805 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
851 if (!op->inv)
852 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
853
854 /* So the treasure doesn't get created again */ 806 /* So the treasure doesn't get created again */
855 op->randomitems = NULL; 807 op->randomitems = 0;
856 } 808 }
857 809
858 if (difficulty < 1) 810 if (difficulty < 1)
859 difficulty = 1; 811 difficulty = 1;
860 812
… …
1354 { 1306 {
1355 switch (f.kw) 1307 switch (f.kw)
1356 { 1308 {
1357 case KW_allowed: 1309 case KW_allowed:
1358 if (!art) 1310 if (!art)
1359 {
1360 art = get_empty_artifact (); 1311 art = get_empty_artifact ();
1361 nrofartifacts++;
1362 }
1363 1312
1364 { 1313 {
1365 if (!strcmp (f.get_str (), "all")) 1314 if (!strcmp (f.get_str (), "all"))
1366 break; 1315 break;
1367 1316
1368 char *next, *cp = f.get_str (); 1317 char *next, *cp = f.get_str ();
1369 1318
1370 do 1319 do
1371 { 1320 {
1372 nrofallowedstr++;
1373
1374 if ((next = strchr (cp, ','))) 1321 if ((next = strchr (cp, ',')))
1375 *next++ = '\0'; 1322 *next++ = '\0';
1376 1323
1377 linked_char *tmp = new linked_char; 1324 linked_char *tmp = new linked_char;
1378 1325
… …
1393 break; 1340 break;
1394 1341
1395 case KW_object: 1342 case KW_object:
1396 { 1343 {
1397 art->item = object::create (); 1344 art->item = object::create ();
1345 f.get (art->item->name);
1346 f.next ();
1398 1347
1399 if (!art->item->parse_kv (f)) 1348 if (!art->item->parse_kv (f))
1400 LOG (llevError, "Init_Artifacts: Could not load object.\n"); 1349 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1401 1350
1402 al = find_artifactlist (art->item->type); 1351 al = find_artifactlist (art->item->type);
… …
1428 } 1377 }
1429 1378
1430done: 1379done:
1431 for (al = first_artifactlist; al; al = al->next) 1380 for (al = first_artifactlist; al; al = al->next)
1432 { 1381 {
1382 al->total_chance = 0;
1383
1433 for (art = al->items; art; art = art->next) 1384 for (art = al->items; art; art = art->next)
1434 { 1385 {
1435 if (!art->chance) 1386 if (!art->chance)
1436 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1387 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1437 else 1388 else
… …
1443 } 1394 }
1444 1395
1445 LOG (llevDebug, "done.\n"); 1396 LOG (llevDebug, "done.\n");
1446} 1397}
1447 1398
1448
1449/* 1399/*
1450 * Used in artifact generation. The bonuses of the first object 1400 * Used in artifact generation. The bonuses of the first object
1451 * is modified by the bonuses of the second object. 1401 * is modified by the bonuses of the second object.
1452 */ 1402 */
1453
1454void 1403void
1455add_abilities (object *op, object *change) 1404add_abilities (object *op, object *change)
1456{ 1405{
1457 int i, tmp; 1406 int i, tmp;
1458 1407
1459 if (change->face != blank_face) 1408 if (change->face != blank_face)
1460 { 1409 {
1461#ifdef TREASURE_VERBOSE 1410#ifdef TREASURE_VERBOSE
1462 LOG (llevDebug, "FACE: %d\n", change->face->number); 1411 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1463#endif 1412#endif
1464 op->face = change->face; 1413 op->face = change->face;
1465 } 1414 }
1466 1415
1467 for (i = 0; i < NUM_STATS; i++) 1416 for (i = 0; i < NUM_STATS; i++)
… …
1637 if (change->msg) 1586 if (change->msg)
1638 op->msg = change->msg; 1587 op->msg = change->msg;
1639} 1588}
1640 1589
1641static int 1590static int
1642legal_artifact_combination (object *op, artifact * art) 1591legal_artifact_combination (object *op, artifact *art)
1643{ 1592{
1644 int neg, success = 0; 1593 int neg, success = 0;
1645 linked_char *tmp; 1594 linked_char *tmp;
1646 const char *name; 1595 const char *name;
1647 1596
1648 if (art->allowed == (linked_char *) NULL) 1597 if (!art->allowed)
1649 return 1; /* Ie, "all" */ 1598 return 1; /* Ie, "all" */
1599
1650 for (tmp = art->allowed; tmp; tmp = tmp->next) 1600 for (tmp = art->allowed; tmp; tmp = tmp->next)
1651 { 1601 {
1652#ifdef TREASURE_VERBOSE 1602#ifdef TREASURE_VERBOSE
1653 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1603 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1654#endif 1604#endif
1655 if (*tmp->name == '!') 1605 if (*tmp->name == '!')
1656 name = tmp->name + 1, neg = 1; 1606 name = tmp->name + 1, neg = 1;
1657 else 1607 else
1658 name = tmp->name, neg = 0; 1608 name = tmp->name, neg = 0;
… …
1665 * everything is allowed except what we match 1615 * everything is allowed except what we match
1666 */ 1616 */
1667 else if (neg) 1617 else if (neg)
1668 success = 1; 1618 success = 1;
1669 } 1619 }
1620
1670 return success; 1621 return success;
1671} 1622}
1672 1623
1673/* 1624/*
1674 * Fixes the given object, giving it the abilities and titles 1625 * Fixes the given object, giving it the abilities and titles
… …
1753 continue; 1704 continue;
1754 1705
1755 if (!legal_artifact_combination (op, art)) 1706 if (!legal_artifact_combination (op, art))
1756 { 1707 {
1757#ifdef TREASURE_VERBOSE 1708#ifdef TREASURE_VERBOSE
1758 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1709 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1759#endif 1710#endif
1760 continue; 1711 continue;
1761 } 1712 }
1713
1762 give_artifact_abilities (op, art->item); 1714 give_artifact_abilities (op, art->item);
1763 return; 1715 return;
1764 } 1716 }
1765} 1717}
1766 1718
… …
1810 SET_FLAG (item, FLAG_NO_STEAL); 1762 SET_FLAG (item, FLAG_NO_STEAL);
1811 } 1763 }
1812} 1764}
1813 1765
1814/* special_potion() - so that old potion code is still done right. */ 1766/* special_potion() - so that old potion code is still done right. */
1815
1816int 1767int
1817special_potion (object *op) 1768special_potion (object *op)
1818{ 1769{
1819 if (op->attacktype) 1770 if (op->attacktype)
1820 return 1; 1771 return 1;

Diff Legend

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