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.37 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.43 by root, Mon Apr 16 11:09:30 2007 UTC

… …
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>
42 40
41extern char *spell_mapping[];
42
43static treasurelist *first_treasurelist;
43 44
44static void change_treasure (treasure *t, object *op); /* overrule default values */ 45static void change_treasure (treasure *t, object *op); /* overrule default values */
45extern char *spell_mapping[]; 46
47typedef std::tr1::unordered_map<
48 const char *,
49 treasurelist *,
50 str_hash,
51 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >,
53 true
54> tl_map_t;
55
56static tl_map_t tl_map;
46 57
47/* 58/*
48 * Initialize global archtype pointers: 59 * Initialize global archtype pointers:
49 */ 60 */
50
51void 61void
52init_archetype_pointers () 62init_archetype_pointers ()
53{ 63{
54 int prev_warn = warn_archetypes; 64 int prev_warn = warn_archetypes;
55 65
56 warn_archetypes = 1; 66 warn_archetypes = 1;
67
57 if (ring_arch == NULL) 68 if (ring_arch == NULL)
58 ring_arch = archetype::find ("ring"); 69 ring_arch = archetype::find ("ring");
59 if (amulet_arch == NULL) 70 if (amulet_arch == NULL)
60 amulet_arch = archetype::find ("amulet"); 71 amulet_arch = archetype::find ("amulet");
61 if (staff_arch == NULL) 72 if (staff_arch == NULL)
62 staff_arch = archetype::find ("staff"); 73 staff_arch = archetype::find ("staff");
63 if (crown_arch == NULL) 74 if (crown_arch == NULL)
64 crown_arch = archetype::find ("crown"); 75 crown_arch = archetype::find ("crown");
76
65 warn_archetypes = prev_warn; 77 warn_archetypes = prev_warn;
66} 78}
67 79
68/* 80/*
69 * Allocate and return the pointer to an empty treasurelist structure. 81 * Searches for the given treasurelist in the globally linked list
82 * of treasurelists which has been built by load_treasures().
70 */ 83 */
71
72static treasurelist * 84treasurelist *
73get_empty_treasurelist (void) 85treasurelist::find (const char *name)
74{ 86{
87 if (!name)
88 return 0;
89
90 AUTODECL (i, tl_map.find (name));
91
92 if (i == tl_map.end ())
93 return 0;
94
95 return i->second;
96}
97
98/*
99 * Searches for the given treasurelist in the globally linked list
100 * of treasurelists which has been built by load_treasures().
101 */
102treasurelist *
103treasurelist::get (const char *name)
104{
105 treasurelist *tl = find (name);
106
107 if (!tl)
108 {
75 return new treasurelist; 109 tl = new treasurelist;
76}
77 110
78/* 111 tl->name = name;
79 * Allocate and return the pointer to an empty treasure structure. 112 tl->next = first_treasurelist;
80 */ 113 first_treasurelist = tl;
81//TODO: make this a constructor
82static treasure *
83get_empty_treasure (void)
84{
85 treasure *t = new treasure;
86 114
87 t->chance = 100; 115 tl_map.insert (std::make_pair (tl->name, tl));
116 }
88 117
89 return t; 118 return tl;
119}
120
121//TODO: class method
122void
123clear (treasurelist *tl)
124{
125 if (tl->items)
126 {
127 free_treasurestruct (tl->items);
128 tl->items = 0;
129 }
90} 130}
91 131
92/* 132/*
93 * Reads the lib/treasure file from disk, and parses the contents 133 * Reads the lib/treasure file from disk, and parses the contents
94 * into an internal treasure structure (very linked lists) 134 * into an internal treasure structure (very linked lists)
95 */ 135 */
96
97static treasure * 136static treasure *
98load_treasure (FILE * fp, int *line) 137load_treasure (object_thawer &f)
99{ 138{
100 char buf[MAX_BUF], *cp, variable[MAX_BUF];
101 treasure *t = get_empty_treasure (); 139 treasure *t = new treasure;
102 int value; 140 int value;
103 141
104 nroftreasures++; 142 nroftreasures++;
105 while (fgets (buf, MAX_BUF, fp) != NULL)
106 {
107 (*line)++;
108 143
109 if (*buf == '#') 144 for (;;)
110 continue; 145 {
111 if ((cp = strchr (buf, '\n')) != NULL) 146 coroapi::cede_every (10);
112 *cp = '\0';
113 cp = buf;
114 while (isspace (*cp)) /* Skip blanks */
115 cp++;
116 147
117 if (sscanf (cp, "arch %s", variable)) 148 f.next ();
118 { 149
119 if ((t->item = archetype::find (variable)) == NULL) 150 switch (f.kw)
120 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121 } 151 {
122 else if (sscanf (cp, "list %s", variable)) 152 case KW_arch:
123 t->name = variable; 153 if (!(t->item = archetype::find (f.get_str ())))
124 else if (sscanf (cp, "change_name %s", variable)) 154 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
125 t->change_arch.name = variable; 155 break;
126 else if (sscanf (cp, "change_title %s", variable)) 156
127 t->change_arch.title = variable; 157 case KW_list: f.get (t->name); break;
128 else if (sscanf (cp, "change_slaying %s", variable)) 158 case KW_change_name: f.get (t->change_arch.name); break;
129 t->change_arch.slaying = variable; 159 case KW_change_title: f.get (t->change_arch.title); break;
130 else if (sscanf (cp, "chance %d", &value)) 160 case KW_change_slaying: f.get (t->change_arch.slaying); break;
131 t->chance = (uint8) value; 161 case KW_chance: f.get (t->chance); break;
132 else if (sscanf (cp, "nrof %d", &value)) 162 case KW_nrof: f.get (t->nrof); break;
133 t->nrof = (uint16) value; 163 case KW_magic: f.get (t->magic); break;
134 else if (sscanf (cp, "magic %d", &value)) 164
135 t->magic = (uint8) value; 165 case KW_yes: t->next_yes = load_treasure (f); break;
136 else if (!strcmp (cp, "yes")) 166 case KW_no: t->next_no = load_treasure (f); break;
137 t->next_yes = load_treasure (fp, line); 167
138 else if (!strcmp (cp, "no")) 168 case KW_end:
139 t->next_no = load_treasure (fp, line);
140 else if (!strcmp (cp, "end"))
141 return t;
142 else if (!strcmp (cp, "more"))
143 {
144 t->next = load_treasure (fp, line);
145 return t; 169 return t;
170
171 case KW_more:
172 t->next = load_treasure (f);
173 return t;
174
175 default:
176 if (!f.parse_error ("treasure list"))
177 return t; // error
178
179 return t;
146 } 180 }
147 else
148 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
149 } 181 }
150 LOG (llevError, "treasure lacks 'end'.\n");
151 return t;
152} 182}
153 183
154#ifdef TREASURE_DEBUG 184#ifdef TREASURE_DEBUG
155
156/* recursived checks the linked list. Treasurelist is passed only 185/* recursived checks the linked list. Treasurelist is passed only
157 * so that the treasure name can be printed out 186 * so that the treasure name can be printed out
158 */ 187 */
159static void 188static void
160check_treasurelist (const treasure *t, const treasurelist * tl) 189check_treasurelist (const treasure *t, const treasurelist * tl)
161{ 190{
162 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) 191 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
163 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); 192 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
164 /* find_treasurelist will print out its own error message */ 193
165 if (t->name && *t->name)
166 find_treasurelist (t->name);
167 if (t->next) 194 if (t->next)
168 check_treasurelist (t->next, tl); 195 check_treasurelist (t->next, tl);
196
169 if (t->next_yes) 197 if (t->next_yes)
170 check_treasurelist (t->next_yes, tl); 198 check_treasurelist (t->next_yes, tl);
199
171 if (t->next_no) 200 if (t->next_no)
172 check_treasurelist (t->next_no, tl); 201 check_treasurelist (t->next_no, tl);
173} 202}
174#endif 203#endif
175 204
176/* 205/*
177 * Opens LIBDIR/treasure and reads all treasure-declarations from it. 206 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
178 * Each treasure is parsed with the help of load_treasure(). 207 * Each treasure is parsed with the help of load_treasure().
179 */ 208 */
180 209bool
181void 210load_treasure_file (const char *filename)
182load_treasures (void)
183{ 211{
184 FILE *fp;
185 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186 treasurelist *previous = NULL;
187 treasure *t; 212 treasure *t;
188 int comp, line = 0; 213 int comp, line = 0;
189 214
190 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 215 object_thawer f (filename);
191 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 216
217 if (!f)
192 { 218 {
193 LOG (llevError, "Can't open treasure file.\n"); 219 LOG (llevError, "Can't open treasure file.\n");
194 return; 220 return false;
195 }
196 while (fgets (buf, MAX_BUF, fp) != NULL)
197 { 221 }
198 line++;
199 if (*buf == '#')
200 continue;
201 222
202 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) 223 f.next ();
203 {
204 treasurelist *tl = get_empty_treasurelist ();
205 224
206 tl->name = name; 225 for (;;)
207 if (previous == NULL) 226 {
208 first_treasurelist = tl; 227 switch (f.kw)
209 else 228 {
210 previous->next = tl; 229 case KW_treasure:
211 previous = tl; 230 case KW_treasureone:
212 tl->items = load_treasure (fp, &line);
213
214 /* This is a one of the many items on the list should be generated.
215 * Add up the chance total, and check to make sure the yes & no
216 * fields of the treasures are not being used.
217 */
218 if (!strncmp (buf, "treasureone", 11))
219 { 231 {
220 for (t = tl->items; t != NULL; t = t->next) 232 bool one = f.kw == KW_treasureone;
233 treasurelist *tl = treasurelist::get (f.get_str ());
234
235 clear (tl);
236 tl->items = load_treasure (f);
237
238 if (!tl->items)
239 return false;
240
241 /* This is a one of the many items on the list should be generated.
242 * Add up the chance total, and check to make sure the yes & no
243 * fields of the treasures are not being used.
244 */
245 if (one)
221 { 246 {
247 for (t = tl->items; t; t = t->next)
248 {
222#ifdef TREASURE_DEBUG 249#ifdef TREASURE_DEBUG
223 if (t->next_yes || t->next_no) 250 if (t->next_yes || t->next_no)
224 { 251 {
225 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 252 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
226 LOG (llevError, " the next_yes or next_no field is set\n"); 253 LOG (llevError, " the next_yes or next_no field is set\n");
254 }
255#endif
256 tl->total_chance += t->chance;
227 } 257 }
228#endif
229 tl->total_chance += t->chance;
230 } 258 }
231 } 259 }
232 } 260 break;
233 else
234 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
235 }
236 close_and_delete (fp, comp);
237 261
262 case KW_EOF:
238#ifdef TREASURE_DEBUG 263#ifdef TREASURE_DEBUG
239 /* Perform some checks on how valid the treasure data actually is. 264 /* Perform some checks on how valid the treasure data actually is.
240 * verify that list transitions work (ie, the list that it is supposed 265 * verify that list transitions work (ie, the list that it is supposed
241 * to transition to exists). Also, verify that at least the name 266 * to transition to exists). Also, verify that at least the name
242 * or archetype is set for each treasure element. 267 * or archetype is set for each treasure element.
243 */ 268 */
244 for (previous = first_treasurelist; previous != NULL; previous = previous->next) 269 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
245 check_treasurelist (previous->items, previous); 270 check_treasurelist (tl->items, tl);
246#endif 271#endif
247}
248
249/*
250 * Searches for the given treasurelist in the globally linked list
251 * of treasurelists which has been built by load_treasures().
252 */
253
254treasurelist *
255find_treasurelist (const char *name)
256{
257 shstr_cmp name_ (name);
258
259 if (!name_)
260 return 0;
261
262 for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
263 if (name_ == tl->name)
264 return tl; 272 return true;
265 273
266 if (first_treasurelist) 274 default:
267 LOG (llevError, "Couldn't find treasurelist %s\n", name); 275 if (!f.parse_error ("treasure lists"))
276 return false;
268 277
269 return 0; 278 break;
270} 279 }
271 280
281 f.next ();
282 }
283}
272 284
273/* 285/*
274 * Generates the objects specified by the given treasure. 286 * Generates the objects specified by the given treasure.
275 * It goes recursively through the rest of the linked list. 287 * It goes recursively through the rest of the linked list.
276 * 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,
… …
326 338
327 if (t->change_arch.slaying) 339 if (t->change_arch.slaying)
328 op->slaying = t->change_arch.slaying; 340 op->slaying = t->change_arch.slaying;
329} 341}
330 342
331void 343static void
332create_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)
333{ 345{
334 object *tmp;
335
336 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 346 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
337 { 347 {
338 if (t->name) 348 if (t->name)
339 { 349 {
340 if (difficulty >= t->magic) 350 if (difficulty >= t->magic)
341 {
342 treasurelist *tl = find_treasurelist (t->name);
343 if (tl)
344 create_treasure (tl, op, flag, difficulty, tries); 351 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);
345 }
346 } 352 }
347 else 353 else
348 { 354 {
349 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 355 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350 { 356 {
351 tmp = arch_to_object (t->item); 357 object *tmp = arch_to_object (t->item);
358
352 if (t->nrof && tmp->nrof <= 1) 359 if (t->nrof && tmp->nrof <= 1)
353 tmp->nrof = rndm (t->nrof) + 1; 360 tmp->nrof = rndm (t->nrof) + 1;
354 361
355 fix_generated_item (tmp, op, difficulty, t->magic, flag); 362 fix_generated_item (tmp, op, difficulty, t->magic, flag);
356 change_treasure (t, tmp); 363 change_treasure (t, tmp);
357 put_treasure (tmp, op, flag); 364 put_treasure (tmp, op, flag);
358 } 365 }
359 } 366 }
360 367
361 if (t->next_yes != NULL) 368 if (t->next_yes)
362 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 369 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
363 } 370 }
364 else if (t->next_no != NULL) 371 else if (t->next_no)
365 create_all_treasures (t->next_no, op, flag, difficulty, tries); 372 create_all_treasures (t->next_no, op, flag, difficulty, tries);
366 373
367 if (t->next != NULL) 374 if (t->next)
368 create_all_treasures (t->next, op, flag, difficulty, tries); 375 create_all_treasures (t->next, op, flag, difficulty, tries);
369} 376}
370 377
371void 378static void
372create_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)
373{ 380{
374 int value = rndm (tl->total_chance); 381 int value = rndm (tl->total_chance);
375 treasure *t; 382 treasure *t;
376 383
… …
378 { 385 {
379 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");
380 return; 387 return;
381 } 388 }
382 389
383 for (t = tl->items; t != NULL; t = t->next) 390 for (t = tl->items; t; t = t->next)
384 { 391 {
385 value -= t->chance; 392 value -= t->chance;
386 393
387 if (value < 0) 394 if (value < 0)
388 break; 395 break;
389 } 396 }
390 397
391 if (!t || value >= 0) 398 if (!t || value >= 0)
392 {
393 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);
394 abort ();
395 return;
396 }
397 400
398 if (t->name) 401 if (t->name)
399 { 402 {
400 if (difficulty >= t->magic) 403 if (difficulty >= t->magic)
401 { 404 {
402 treasurelist *tl = find_treasurelist (t->name); 405 treasurelist *tl = treasurelist::find (t->name);
403 if (tl) 406 if (tl)
404 create_treasure (tl, op, flag, difficulty, tries); 407 create_treasure (tl, op, flag, difficulty, tries);
405 } 408 }
406 else if (t->nrof) 409 else if (t->nrof)
407 create_one_treasure (tl, op, flag, difficulty, tries); 410 create_one_treasure (tl, op, flag, difficulty, tries);
408
409 return;
410 } 411 }
411
412 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 412 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
413 { 413 {
414 object *tmp = arch_to_object (t->item); 414 if (object *tmp = arch_to_object (t->item))
415 415 {
416 if (!tmp)
417 return;
418
419 if (t->nrof && tmp->nrof <= 1) 416 if (t->nrof && tmp->nrof <= 1)
420 tmp->nrof = rndm (t->nrof) + 1; 417 tmp->nrof = rndm (t->nrof) + 1;
421 418
422 fix_generated_item (tmp, op, difficulty, t->magic, flag); 419 fix_generated_item (tmp, op, difficulty, t->magic, flag);
423 change_treasure (t, tmp); 420 change_treasure (t, tmp);
424 put_treasure (tmp, op, flag); 421 put_treasure (tmp, op, flag);
422 }
425 } 423 }
426} 424}
427 425
428/* This calls the appropriate treasure creation function. tries is passed 426/* This calls the appropriate treasure creation function. tries is passed
429 * to determine how many list transitions or attempts to create treasure 427 * to determine how many list transitions or attempts to create treasure
… …
433 * to do that. 431 * to do that.
434 */ 432 */
435void 433void
436create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 434create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
437{ 435{
436 // empty treasurelists are legal
437 if (!tl->items)
438 return;
439
438 if (tries++ > 100) 440 if (tries++ > 100)
439 { 441 {
440 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 442 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441 return; 443 return;
442 } 444 }
… …
480 * magical bonus "wanted". 482 * magical bonus "wanted".
481 */ 483 */
482 484
483static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 485static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
484 486
485/*chance of magic difficulty*/ 487// chance of magic difficulty
486
487/* +0 +1 +2 +3 +4 */ 488// +0 +1 +2 +3 +4
488 {95, 2, 2, 1, 0}, /*1 */ 489 {95, 2, 2, 1, 0}, // 1
489 {92, 5, 2, 1, 0}, /*2 */ 490 {92, 5, 2, 1, 0}, // 2
490 {85, 10, 4, 1, 0}, /*3 */ 491 {85, 10, 4, 1, 0}, // 3
491 {80, 14, 4, 2, 0}, /*4 */ 492 {80, 14, 4, 2, 0}, // 4
492 {75, 17, 5, 2, 1}, /*5 */ 493 {75, 17, 5, 2, 1}, // 5
493 {70, 18, 8, 3, 1}, /*6 */ 494 {70, 18, 8, 3, 1}, // 6
494 {65, 21, 10, 3, 1}, /*7 */ 495 {65, 21, 10, 3, 1}, // 7
495 {60, 22, 12, 4, 2}, /*8 */ 496 {60, 22, 12, 4, 2}, // 8
496 {55, 25, 14, 4, 2}, /*9 */ 497 {55, 25, 14, 4, 2}, // 9
497 {50, 27, 16, 5, 2}, /*10 */ 498 {50, 27, 16, 5, 2}, // 10
498 {45, 28, 18, 6, 3}, /*11 */ 499 {45, 28, 18, 6, 3}, // 11
499 {42, 28, 20, 7, 3}, /*12 */ 500 {42, 28, 20, 7, 3}, // 12
500 {40, 27, 21, 8, 4}, /*13 */ 501 {40, 27, 21, 8, 4}, // 13
501 {38, 25, 22, 10, 5}, /*14 */ 502 {38, 25, 22, 10, 5}, // 14
502 {36, 23, 23, 12, 6}, /*15 */ 503 {36, 23, 23, 12, 6}, // 15
503 {33, 21, 24, 14, 8}, /*16 */ 504 {33, 21, 24, 14, 8}, // 16
504 {31, 19, 25, 16, 9}, /*17 */ 505 {31, 19, 25, 16, 9}, // 17
505 {27, 15, 30, 18, 10}, /*18 */ 506 {27, 15, 30, 18, 10}, // 18
506 {20, 12, 30, 25, 13}, /*19 */ 507 {20, 12, 30, 25, 13}, // 19
507 {15, 10, 28, 30, 17}, /*20 */ 508 {15, 10, 28, 30, 17}, // 20
508 {13, 9, 27, 28, 23}, /*21 */ 509 {13, 9, 27, 28, 23}, // 21
509 {10, 8, 25, 28, 29}, /*22 */ 510 {10, 8, 25, 28, 29}, // 22
510 {8, 7, 23, 26, 36}, /*23 */ 511 { 8, 7, 23, 26, 36}, // 23
511 {6, 6, 20, 22, 46}, /*24 */ 512 { 6, 6, 20, 22, 46}, // 24
512 {4, 5, 17, 18, 56}, /*25 */ 513 { 4, 5, 17, 18, 56}, // 25
513 {2, 4, 12, 14, 68}, /*26 */ 514 { 2, 4, 12, 14, 68}, // 26
514 {0, 3, 7, 10, 80}, /*27 */ 515 { 0, 3, 7, 10, 80}, // 27
515 {0, 0, 3, 7, 90}, /*28 */ 516 { 0, 0, 3, 7, 90}, // 28
516 {0, 0, 0, 3, 97}, /*29 */ 517 { 0, 0, 0, 3, 97}, // 29
517 {0, 0, 0, 0, 100}, /*30 */ 518 { 0, 0, 0, 0, 100}, // 30
518 {0, 0, 0, 0, 100}, /*31 */ 519 { 0, 0, 0, 0, 100}, // 31
519}; 520};
520 521
521 522
522/* calculate the appropriate level for wands staves and scrolls. 523/* calculate the appropriate level for wands staves and scrolls.
523 * This code presumes that op has had its spell object created (in op->inv) 524 * This code presumes that op has had its spell object created (in op->inv)
… …
556 * elmex Thu Aug 10 18:45:44 CEST 2006: 557 * elmex Thu Aug 10 18:45:44 CEST 2006:
557 * Scaling difficulty by max_level, as difficulty is a level and not some 558 * Scaling difficulty by max_level, as difficulty is a level and not some
558 * weird integer between 1-31. 559 * weird integer between 1-31.
559 * 560 *
560 */ 561 */
561
562int 562int
563magic_from_difficulty (int difficulty) 563magic_from_difficulty (int difficulty)
564{ 564{
565 int percent = 0, magic = 0; 565 int percent = 0, magic = 0;
566 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 566 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
654 * 1) Since rings can have multiple bonuses, if the same bonus 654 * 1) Since rings can have multiple bonuses, if the same bonus
655 * is rolled again, increase it - the bonuses now stack with 655 * is rolled again, increase it - the bonuses now stack with
656 * other bonuses previously rolled and ones the item might natively have. 656 * other bonuses previously rolled and ones the item might natively have.
657 * 2) Add code to deal with new PR method. 657 * 2) Add code to deal with new PR method.
658 */ 658 */
659
660void 659void
661set_ring_bonus (object *op, int bonus) 660set_ring_bonus (object *op, int bonus)
662{ 661{
663 662
664 int r = rndm (bonus > 0 ? 25 : 11); 663 int r = rndm (bonus > 0 ? 25 : 11);
… …
831 * value. 830 * value.
832 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 831 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
833 * a working object - don't change magic, value, etc, but set it material 832 * a working object - don't change magic, value, etc, but set it material
834 * type as appropriate, for objects that need spell objects, set those, etc 833 * type as appropriate, for objects that need spell objects, set those, etc
835 */ 834 */
836
837void 835void
838fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 836fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
839{ 837{
840 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 838 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
841 839
… …
848 846
849 if (op->randomitems && op->type != SPELL) 847 if (op->randomitems && op->type != SPELL)
850 { 848 {
851 create_treasure (op->randomitems, op, flags, difficulty, 0); 849 create_treasure (op->randomitems, op, flags, difficulty, 0);
852 if (!op->inv) 850 if (!op->inv)
853 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name); 851 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
854 852
855 /* So the treasure doesn't get created again */ 853 /* So the treasure doesn't get created again */
856 op->randomitems = NULL; 854 op->randomitems = 0;
857 } 855 }
858 856
859 if (difficulty < 1) 857 if (difficulty < 1)
860 difficulty = 1; 858 difficulty = 1;
861 859
… …
1174 */ 1172 */
1175 1173
1176/* 1174/*
1177 * Allocate and return the pointer to an empty artifactlist structure. 1175 * Allocate and return the pointer to an empty artifactlist structure.
1178 */ 1176 */
1179
1180static artifactlist * 1177static artifactlist *
1181get_empty_artifactlist (void) 1178get_empty_artifactlist (void)
1182{ 1179{
1183 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1180 return salloc0 <artifactlist> ();
1184
1185 if (al == NULL)
1186 fatal (OUT_OF_MEMORY);
1187 al->next = NULL;
1188 al->items = NULL;
1189 al->total_chance = 0;
1190 return al;
1191} 1181}
1192 1182
1193/* 1183/*
1194 * Allocate and return the pointer to an empty artifact structure. 1184 * Allocate and return the pointer to an empty artifact structure.
1195 */ 1185 */
1196
1197static artifact * 1186static artifact *
1198get_empty_artifact (void) 1187get_empty_artifact (void)
1199{ 1188{
1200 artifact *a = (artifact *) malloc (sizeof (artifact)); 1189 return salloc0 <artifact> ();
1201
1202 if (a == NULL)
1203 fatal (OUT_OF_MEMORY);
1204 a->item = NULL;
1205 a->next = NULL;
1206 a->chance = 0;
1207 a->difficulty = 0;
1208 a->allowed = NULL;
1209 return a;
1210} 1190}
1211 1191
1212/* 1192/*
1213 * Searches the artifact lists and returns one that has the same type 1193 * Searches the artifact lists and returns one that has the same type
1214 * of objects on it. 1194 * of objects on it.
1215 */ 1195 */
1216
1217artifactlist * 1196artifactlist *
1218find_artifactlist (int type) 1197find_artifactlist (int type)
1219{ 1198{
1220 artifactlist *al;
1221
1222 for (al = first_artifactlist; al != NULL; al = al->next) 1199 for (artifactlist *al = first_artifactlist; al; al = al->next)
1223 if (al->type == type) 1200 if (al->type == type)
1224 return al; 1201 return al;
1202
1225 return NULL; 1203 return 0;
1226} 1204}
1227 1205
1228/* 1206/*
1229 * For debugging purposes. Dumps all tables. 1207 * For debugging purposes. Dumps all tables.
1230 */ 1208 */
1231
1232void 1209void
1233dump_artifacts (void) 1210dump_artifacts (void)
1234{ 1211{
1235 artifactlist *al; 1212 artifactlist *al;
1236 artifact *art; 1213 artifact *art;
… …
1243 for (art = al->items; art != NULL; art = art->next) 1220 for (art = al->items; art != NULL; art = art->next)
1244 { 1221 {
1245 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1222 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246 if (art->allowed != NULL) 1223 if (art->allowed != NULL)
1247 { 1224 {
1248 fprintf (logfile, "\tAllowed combinations:"); 1225 fprintf (logfile, "\tallowed combinations:");
1249 for (next = art->allowed; next != NULL; next = next->next) 1226 for (next = art->allowed; next != NULL; next = next->next)
1250 fprintf (logfile, "%s,", &next->name); 1227 fprintf (logfile, "%s,", &next->name);
1251 fprintf (logfile, "\n"); 1228 fprintf (logfile, "\n");
1252 } 1229 }
1253 } 1230 }
… …
1264 treasurelist *tl; 1241 treasurelist *tl;
1265 int i; 1242 int i;
1266 1243
1267 if (depth > 100) 1244 if (depth > 100)
1268 return; 1245 return;
1246
1269 while (t) 1247 while (t)
1270 { 1248 {
1271 if (t->name) 1249 if (t->name)
1272 { 1250 {
1273 for (i = 0; i < depth; i++) 1251 for (i = 0; i < depth; i++)
1274 fprintf (logfile, " "); 1252 fprintf (logfile, " ");
1253
1275 fprintf (logfile, "{ (list: %s)\n", &t->name); 1254 fprintf (logfile, "{ (list: %s)\n", &t->name);
1255
1276 tl = find_treasurelist (t->name); 1256 tl = treasurelist::find (t->name);
1277 if (tl) 1257 if (tl)
1278 dump_monster_treasure_rec (name, tl->items, depth + 2); 1258 dump_monster_treasure_rec (name, tl->items, depth + 2);
1259
1279 for (i = 0; i < depth; i++) 1260 for (i = 0; i < depth; i++)
1280 fprintf (logfile, " "); 1261 fprintf (logfile, " ");
1262
1281 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1263 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282 } 1264 }
1283 else 1265 else
1284 { 1266 {
1285 for (i = 0; i < depth; i++) 1267 for (i = 0; i < depth; i++)
1286 fprintf (logfile, " "); 1268 fprintf (logfile, " ");
1269
1287 if (t->item && t->item->clone.type == FLESH) 1270 if (t->item && t->item->clone.type == FLESH)
1288 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1271 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1289 else 1272 else
1290 fprintf (logfile, "%s\n", &t->item->clone.name); 1273 fprintf (logfile, "%s\n", &t->item->clone.name);
1291 } 1274 }
1292 1275
1293 if (t->next_yes) 1276 if (t->next_yes)
1294 { 1277 {
1295 for (i = 0; i < depth; i++) 1278 for (i = 0; i < depth; i++)
1296 fprintf (logfile, " "); 1279 fprintf (logfile, " ");
1280
1297 fprintf (logfile, " (if yes)\n"); 1281 fprintf (logfile, " (if yes)\n");
1298 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1282 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1299 } 1283 }
1300 1284
1301 if (t->next_no) 1285 if (t->next_no)
1302 { 1286 {
1303 for (i = 0; i < depth; i++) 1287 for (i = 0; i < depth; i++)
1304 fprintf (logfile, " "); 1288 fprintf (logfile, " ");
1289
1305 fprintf (logfile, " (if no)\n"); 1290 fprintf (logfile, " (if no)\n");
1306 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1291 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1307 } 1292 }
1308 1293
1309 t = t->next; 1294 t = t->next;
… …
1312 1297
1313/* 1298/*
1314 * For debugging purposes. Dumps all treasures for a given monster. 1299 * For debugging purposes. Dumps all treasures for a given monster.
1315 * Created originally by Raphael Quinet for debugging the alchemy code. 1300 * Created originally by Raphael Quinet for debugging the alchemy code.
1316 */ 1301 */
1317
1318void 1302void
1319dump_monster_treasure (const char *name) 1303dump_monster_treasure (const char *name)
1320{ 1304{
1321 archetype *at; 1305 archetype *at;
1322 int found; 1306 int found;
1323 1307
1324 found = 0; 1308 found = 0;
1325 fprintf (logfile, "\n"); 1309 fprintf (logfile, "\n");
1310
1326 for (at = first_archetype; at != NULL; at = at->next) 1311 for (at = first_archetype; at != NULL; at = at->next)
1327 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1312 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1328 { 1313 {
1329 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1314 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1330 if (at->clone.randomitems != NULL) 1315 if (at->clone.randomitems != NULL)
1331 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1316 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1332 else 1317 else
1333 fprintf (logfile, "(nothing)\n"); 1318 fprintf (logfile, "(nothing)\n");
1319
1334 fprintf (logfile, "\n"); 1320 fprintf (logfile, "\n");
1335 found++; 1321 found++;
1336 } 1322 }
1323
1337 if (found == 0) 1324 if (found == 0)
1338 fprintf (logfile, "No objects have the name %s!\n\n", name); 1325 fprintf (logfile, "No objects have the name %s!\n\n", name);
1339} 1326}
1340 1327
1341/* 1328/*
1342 * Builds up the lists of artifacts from the file in the libdir. 1329 * Builds up the lists of artifacts from the file in the libdir.
1343 */ 1330 */
1344
1345void 1331void
1346init_artifacts (void) 1332init_artifacts (void)
1347{ 1333{
1348 static int has_been_inited = 0; 1334 static int has_been_inited = 0;
1349 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1335 char filename[MAX_BUF];
1350 artifact *art = NULL; 1336 artifact *art = NULL;
1351 linked_char *tmp;
1352 int value;
1353 artifactlist *al; 1337 artifactlist *al;
1354 1338
1355 if (has_been_inited) 1339 if (has_been_inited)
1356 return; 1340 return;
1357 else 1341 else
1358 has_been_inited = 1; 1342 has_been_inited = 1;
1359 1343
1360 sprintf (filename, "%s/artifacts", settings.datadir); 1344 sprintf (filename, "%s/artifacts", settings.datadir);
1361 object_thawer thawer (filename); 1345 object_thawer f (filename);
1362 1346
1363 if (!thawer) 1347 if (!f)
1364 return; 1348 return;
1365 1349
1366 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1350 f.next ();
1367 {
1368 if (*buf == '#')
1369 continue;
1370 if ((cp = strchr (buf, '\n')) != NULL)
1371 *cp = '\0';
1372 cp = buf;
1373 while (*cp == ' ') /* Skip blanks */
1374 cp++;
1375 if (*cp == '\0')
1376 continue;
1377 1351
1378 if (!strncmp (cp, "Allowed", 7)) 1352 for (;;)
1353 {
1354 switch (f.kw)
1379 { 1355 {
1356 case KW_allowed:
1380 if (art == NULL) 1357 if (!art)
1358 {
1359 art = get_empty_artifact ();
1360 nrofartifacts++;
1361 }
1362
1381 { 1363 {
1382 art = get_empty_artifact (); 1364 if (!strcmp (f.get_str (), "all"))
1383 nrofartifacts++; 1365 break;
1366
1367 char *next, *cp = f.get_str ();
1368
1369 do
1370 {
1371 nrofallowedstr++;
1372
1373 if ((next = strchr (cp, ',')))
1374 *next++ = '\0';
1375
1376 linked_char *tmp = new linked_char;
1377
1378 tmp->name = cp;
1379 tmp->next = art->allowed;
1380 art->allowed = tmp;
1381 }
1382 while ((cp = next));
1384 } 1383 }
1385 cp = strchr (cp, ' ') + 1; 1384 break;
1386 if (!strcmp (cp, "all")) 1385
1386 case KW_chance:
1387 f.get (art->chance);
1388 break;
1389
1390 case KW_difficulty:
1391 f.get (art->difficulty);
1392 break;
1393
1394 case KW_object:
1395 {
1396 art->item = object::create ();
1397
1398 if (!art->item->parse_kv (f))
1399 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1400
1401 al = find_artifactlist (art->item->type);
1402
1403 if (!al)
1404 {
1405 al = get_empty_artifactlist ();
1406 al->type = art->item->type;
1407 al->next = first_artifactlist;
1408 first_artifactlist = al;
1409 }
1410
1411 art->next = al->items;
1412 al->items = art;
1413 art = 0;
1414 }
1387 continue; 1415 continue;
1388 1416
1389 do 1417 case KW_EOF:
1418 goto done;
1419
1420 default:
1421 if (!f.parse_error ("artifacts file"))
1422 cleanup ("artifacts file required");
1390 { 1423 break;
1391 nrofallowedstr++;
1392 if ((next = strchr (cp, ',')) != NULL)
1393 *(next++) = '\0';
1394 tmp = new linked_char;
1395
1396 tmp->name = cp;
1397 tmp->next = art->allowed;
1398 art->allowed = tmp;
1399 }
1400 while ((cp = next) != NULL);
1401 }
1402 else if (sscanf (cp, "chance %d", &value))
1403 art->chance = (uint16) value;
1404 else if (sscanf (cp, "difficulty %d", &value))
1405 art->difficulty = (uint8) value;
1406 else if (!strncmp (cp, "Object", 6) || !strncmp (cp, "object", 6))
1407 { 1424 }
1408 art->item = object::create ();
1409 1425
1410 if (!load_object (thawer, art->item, 0)) 1426 f.next ();
1411 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1412
1413 art->item->name = strchr (cp, ' ') + 1;
1414 al = find_artifactlist (art->item->type);
1415 if (al == NULL)
1416 {
1417 al = get_empty_artifactlist ();
1418 al->type = art->item->type;
1419 al->next = first_artifactlist;
1420 first_artifactlist = al;
1421 }
1422 art->next = al->items;
1423 al->items = art;
1424 art = NULL;
1425 }
1426 else
1427 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1428 } 1427 }
1429 1428
1429done:
1430 for (al = first_artifactlist; al != NULL; al = al->next) 1430 for (al = first_artifactlist; al; al = al->next)
1431 { 1431 {
1432 for (art = al->items; art != NULL; art = art->next) 1432 for (art = al->items; art; art = art->next)
1433 { 1433 {
1434 if (!art->chance) 1434 if (!art->chance)
1435 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1435 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1436 else 1436 else
1437 al->total_chance += art->chance; 1437 al->total_chance += art->chance;
… …
1456 int i, tmp; 1456 int i, tmp;
1457 1457
1458 if (change->face != blank_face) 1458 if (change->face != blank_face)
1459 { 1459 {
1460#ifdef TREASURE_VERBOSE 1460#ifdef TREASURE_VERBOSE
1461 LOG (llevDebug, "FACE: %d\n", change->face->number); 1461 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1462#endif 1462#endif
1463 op->face = change->face; 1463 op->face = change->face;
1464 } 1464 }
1465 1465
1466 for (i = 0; i < NUM_STATS; i++) 1466 for (i = 0; i < NUM_STATS; i++)
… …
1647 if (art->allowed == (linked_char *) NULL) 1647 if (art->allowed == (linked_char *) NULL)
1648 return 1; /* Ie, "all" */ 1648 return 1; /* Ie, "all" */
1649 for (tmp = art->allowed; tmp; tmp = tmp->next) 1649 for (tmp = art->allowed; tmp; tmp = tmp->next)
1650 { 1650 {
1651#ifdef TREASURE_VERBOSE 1651#ifdef TREASURE_VERBOSE
1652 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1652 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1653#endif 1653#endif
1654 if (*tmp->name == '!') 1654 if (*tmp->name == '!')
1655 name = tmp->name + 1, neg = 1; 1655 name = tmp->name + 1, neg = 1;
1656 else 1656 else
1657 name = tmp->name, neg = 0; 1657 name = tmp->name, neg = 0;
… …
1752 continue; 1752 continue;
1753 1753
1754 if (!legal_artifact_combination (op, art)) 1754 if (!legal_artifact_combination (op, art))
1755 { 1755 {
1756#ifdef TREASURE_VERBOSE 1756#ifdef TREASURE_VERBOSE
1757 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1757 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1758#endif 1758#endif
1759 continue; 1759 continue;
1760 } 1760 }
1761
1761 give_artifact_abilities (op, art->item); 1762 give_artifact_abilities (op, art->item);
1762 return; 1763 return;
1763 } 1764 }
1764} 1765}
1765 1766
… …
1829} 1830}
1830 1831
1831void 1832void
1832free_treasurestruct (treasure *t) 1833free_treasurestruct (treasure *t)
1833{ 1834{
1834 if (t->next)
1835 free_treasurestruct (t->next); 1835 if (t->next) free_treasurestruct (t->next);
1836 if (t->next_yes)
1837 free_treasurestruct (t->next_yes); 1836 if (t->next_yes) free_treasurestruct (t->next_yes);
1838 if (t->next_no)
1839 free_treasurestruct (t->next_no); 1837 if (t->next_no) free_treasurestruct (t->next_no);
1840 1838
1841 delete t; 1839 delete t;
1842} 1840}
1843 1841
1844void 1842void
… …
1849 1847
1850 delete lc; 1848 delete lc;
1851} 1849}
1852 1850
1853void 1851void
1854free_artifact (artifact * at) 1852free_artifact (artifact *at)
1855{ 1853{
1856 if (at->next)
1857 free_artifact (at->next); 1854 if (at->next) free_artifact (at->next);
1858
1859 if (at->allowed)
1860 free_charlinks (at->allowed); 1855 if (at->allowed) free_charlinks (at->allowed);
1861 1856
1862 at->item->destroy (1); 1857 at->item->destroy (1);
1863 1858
1864 delete at; 1859 sfree (at);
1865} 1860}
1866 1861
1867void 1862void
1868free_artifactlist (artifactlist * al) 1863free_artifactlist (artifactlist *al)
1869{ 1864{
1870 artifactlist *nextal; 1865 artifactlist *nextal;
1871 1866
1872 for (al = first_artifactlist; al; al = nextal) 1867 for (al = first_artifactlist; al; al = nextal)
1873 { 1868 {
1874 nextal = al->next; 1869 nextal = al->next;
1875 1870
1876 if (al->items) 1871 if (al->items)
1877 free_artifact (al->items); 1872 free_artifact (al->items);
1878 1873
1879 free (al); 1874 sfree (al);
1880 } 1875 }
1881} 1876}
1882 1877
1883void 1878void
1884free_all_treasures (void) 1879free_all_treasures (void)
1885{ 1880{
1886 treasurelist *tl, *next; 1881 treasurelist *tl, *next;
1887 1882
1888
1889 for (tl = first_treasurelist; tl != NULL; tl = next) 1883 for (tl = first_treasurelist; tl; tl = next)
1890 { 1884 {
1885 clear (tl);
1886
1891 next = tl->next; 1887 next = tl->next;
1892 if (tl->items)
1893 free_treasurestruct (tl->items);
1894 delete tl; 1888 delete tl;
1895 } 1889 }
1890
1896 free_artifactlist (first_artifactlist); 1891 free_artifactlist (first_artifactlist);
1897} 1892}

Diff Legend

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