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.34 by root, Sat Jan 20 22:09:51 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>
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 46
47/* 47typedef std::tr1::unordered_map<
48 * Initialize global archtype pointers: 48 const char *,
49 */ 49 treasurelist *,
50 str_hash,
51 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >,
53 true
54> tl_map_t;
50 55
56static tl_map_t tl_map;
57
58/*
59 * Searches for the given treasurelist
60 */
61treasurelist *
62treasurelist::find (const char *name)
63{
64 if (!name)
65 return 0;
66
67 auto (i, tl_map.find (name));
68
69 if (i == tl_map.end ())
70 return 0;
71
72 return i->second;
73}
74
75/*
76 * Searches for the given treasurelist in the globally linked list
77 * of treasurelists which has been built by load_treasures().
78 */
79treasurelist *
80treasurelist::get (const char *name)
81{
82 treasurelist *tl = find (name);
83
84 if (!tl)
85 {
86 tl = new treasurelist;
87
88 tl->name = name;
89 tl->next = first_treasurelist;
90 first_treasurelist = tl;
91
92 tl_map.insert (std::make_pair (tl->name, tl));
93 }
94
95 return tl;
96}
97
98//TODO: class method
51void 99void
52init_archetype_pointers () 100clear (treasurelist *tl)
53{ 101{
54 int prev_warn = warn_archetypes; 102 if (tl->items)
103 {
104 free_treasurestruct (tl->items);
105 tl->items = 0;
106 }
55 107
56 warn_archetypes = 1;
57 if (ring_arch == NULL)
58 ring_arch = archetype::find ("ring");
59 if (amulet_arch == NULL)
60 amulet_arch = archetype::find ("amulet");
61 if (staff_arch == NULL)
62 staff_arch = archetype::find ("staff");
63 if (crown_arch == NULL)
64 crown_arch = archetype::find ("crown");
65 warn_archetypes = prev_warn;
66}
67
68/*
69 * Allocate and return the pointer to an empty treasurelist structure.
70 */
71
72static treasurelist *
73get_empty_treasurelist (void)
74{
75 return new treasurelist;
76}
77
78/*
79 * Allocate and return the pointer to an empty treasure structure.
80 */
81//TODO: make this a constructor
82static treasure *
83get_empty_treasure (void)
84{
85 treasure *t = new treasure;
86
87 t->chance = 100; 108 tl->total_chance = 0;
88
89 return t;
90} 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
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) 137read_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;
103 140
104 nroftreasures++; 141 f.next ();
105 while (fgets (buf, MAX_BUF, fp) != NULL)
106 {
107 (*line)++;
108 142
109 if (*buf == '#') 143 for (;;)
110 continue; 144 {
111 if ((cp = strchr (buf, '\n')) != NULL) 145 coroapi::cede_to_tick_every (10);
112 *cp = '\0';
113 cp = buf;
114 while (isspace (*cp)) /* Skip blanks */
115 cp++;
116 146
117 if (sscanf (cp, "arch %s", variable)) 147 switch (f.kw)
118 {
119 if ((t->item = archetype::find (variable)) == NULL)
120 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
121 } 148 {
122 else if (sscanf (cp, "list %s", variable)) 149 case KW_arch:
123 t->name = variable; 150 t->item = archetype::get (f.get_str ());
124 else if (sscanf (cp, "change_name %s", variable)) 151 break;
125 t->change_arch.name = variable; 152
126 else if (sscanf (cp, "change_title %s", variable)) 153 case KW_list: f.get (t->name); break;
127 t->change_arch.title = variable; 154 case KW_change_name: f.get (t->change_arch.name); break;
128 else if (sscanf (cp, "change_slaying %s", variable)) 155 case KW_change_title: f.get (t->change_arch.title); break;
129 t->change_arch.slaying = variable; 156 case KW_change_slaying: f.get (t->change_arch.slaying); break;
130 else if (sscanf (cp, "chance %d", &value)) 157 case KW_chance: f.get (t->chance); break;
131 t->chance = (uint8) value; 158 case KW_nrof: f.get (t->nrof); break;
132 else if (sscanf (cp, "nrof %d", &value)) 159 case KW_magic: f.get (t->magic); break;
133 t->nrof = (uint16) value; 160
134 else if (sscanf (cp, "magic %d", &value)) 161 case KW_yes: t->next_yes = read_treasure (f); continue;
135 t->magic = (uint8) value; 162 case KW_no: t->next_no = read_treasure (f); continue;
136 else if (!strcmp (cp, "yes")) 163
137 t->next_yes = load_treasure (fp, line); 164 case KW_end:
138 else if (!strcmp (cp, "no")) 165 f.next ();
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; 166 return t;
146 }
147 else
148 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
149 }
150 LOG (llevError, "treasure lacks 'end'.\n");
151 return t;
152}
153 167
154#ifdef TREASURE_DEBUG 168 case KW_more:
169 t->next = read_treasure (f);
170 return t;
155 171
156/* recursived checks the linked list. Treasurelist is passed only 172 default:
157 * so that the treasure name can be printed out 173 if (!f.parse_error ("treasurelist", t->name))
158 */ 174 return 0;
159static void
160check_treasurelist (const treasure *t, const treasurelist * tl)
161{
162 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);
164 /* find_treasurelist will print out its own error message */
165 if (t->name && *t->name)
166 find_treasurelist (t->name);
167 if (t->next)
168 check_treasurelist (t->next, tl);
169 if (t->next_yes)
170 check_treasurelist (t->next_yes, tl);
171 if (t->next_no)
172 check_treasurelist (t->next_no, tl);
173}
174#endif
175 175
176 return t;
177 }
178
179 f.next ();
180 }
181}
182
176/* 183/*
177 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
178 * Each treasure is parsed with the help of load_treasure(). 184 * Each treasure is parsed with the help of load_treasure().
179 */ 185 */
180 186treasurelist *
181void 187treasurelist::read (object_thawer &f)
182load_treasures (void)
183{ 188{
184 FILE *fp; 189 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
185 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
186 treasurelist *previous = NULL;
187 treasure *t;
188 int comp, line = 0;
189 190
190 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 191 bool one = f.kw == KW_treasureone;
191 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 192 treasurelist *tl = treasurelist::get (f.get_str ());
192 { 193 clear (tl);
193 LOG (llevError, "Can't open treasure file.\n"); 194 tl->items = read_treasure (f);
195 if (!tl->items)
194 return; 196 return 0;
195 }
196 while (fgets (buf, MAX_BUF, fp) != NULL)
197 {
198 line++;
199 if (*buf == '#')
200 continue;
201 197
202 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name))
203 {
204 treasurelist *tl = get_empty_treasurelist ();
205
206 tl->name = name;
207 if (previous == NULL)
208 first_treasurelist = tl;
209 else
210 previous->next = tl;
211 previous = tl;
212 tl->items = load_treasure (fp, &line);
213
214 /* 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.
215 * 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
216 * fields of the treasures are not being used. 200 * fields of the treasures are not being used.
217 */ 201 */
218 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)
219 { 207 {
220 for (t = tl->items; t != NULL; t = t->next)
221 {
222#ifdef TREASURE_DEBUG
223 if (t->next_yes || t->next_no)
224 {
225 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);
226 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");
227 }
228#endif
229 tl->total_chance += t->chance;
230 }
231 } 210 }
232 }
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 211
238#ifdef TREASURE_DEBUG 212 tl->total_chance += t->chance;
239 /* Perform some checks on how valid the treasure data actually is. 213 }
240 * verify that list transitions work (ie, the list that it is supposed 214 }
241 * to transition to exists). Also, verify that at least the name
242 * or archetype is set for each treasure element.
243 */
244 for (previous = first_treasurelist; previous != NULL; previous = previous->next)
245 check_treasurelist (previous->items, previous);
246#endif
247}
248 215
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;
265
266 if (first_treasurelist)
267 LOG (llevError, "Couldn't find treasurelist %s\n", name);
268
269 return 0; 216 return tl;
270} 217}
271
272 218
273/* 219/*
274 * Generates the objects specified by the given treasure. 220 * Generates the objects specified by the given treasure.
275 * It goes recursively through the rest of the linked list. 221 * It goes recursively through the rest of the linked list.
276 * If there is a certain percental chance for a treasure to be generated, 222 * If there is a certain percental chance for a treasure to be generated,
… …
282 * start with equipment, but only their abilities). 228 * start with equipment, but only their abilities).
283 */ 229 */
284static void 230static void
285put_treasure (object *op, object *creator, int flags) 231put_treasure (object *op, object *creator, int flags)
286{ 232{
287 object *tmp; 233 if (flags & GT_ENVIRONMENT)
288 234 {
289 /* 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
290 * 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
291 * 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
292 * by another object. 238 * by another object.
293 */ 239 */
294 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 //TODO: flag such as objects... as such (no drop, anybody?)
295 { 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 {
296 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 253 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
297 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 }
298 } 256 }
299 else 257 else
300 { 258 {
301 op = creator->insert (op); 259 op = creator->insert (op);
302 260
303 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 261 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
304 monster_check_apply (creator, op); 262 monster_check_apply (creator, op);
305 263
306 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 264 if (flags & GT_UPDATE_INV)
265 if (object *tmp = creator->in_player ())
307 esrv_send_item (tmp, op); 266 esrv_send_item (tmp, op);
308 } 267 }
309} 268}
310 269
311/* 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
312 * in the generated object 271 * in the generated object
… …
326 285
327 if (t->change_arch.slaying) 286 if (t->change_arch.slaying)
328 op->slaying = t->change_arch.slaying; 287 op->slaying = t->change_arch.slaying;
329} 288}
330 289
331void 290static void
332create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 291create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
333{ 292{
334 object *tmp;
335
336 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 293 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
337 { 294 {
338 if (t->name) 295 if (t->name)
339 { 296 {
340 if (difficulty >= t->magic) 297 if (difficulty >= t->magic)
341 {
342 treasurelist *tl = find_treasurelist (t->name); 298 if (treasurelist *tl = treasurelist::find (t->name))
343 if (tl)
344 create_treasure (tl, op, flag, difficulty, tries); 299 create_treasure (tl, op, flag, difficulty, tries);
345 } 300 else
301 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
346 } 302 }
347 else 303 else
348 { 304 {
349 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 305 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350 { 306 {
351 tmp = arch_to_object (t->item); 307 object *tmp = arch_to_object (t->item);
308
352 if (t->nrof && tmp->nrof <= 1) 309 if (t->nrof && tmp->nrof <= 1)
353 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 310 tmp->nrof = rndm (t->nrof) + 1;
311
354 fix_generated_item (tmp, op, difficulty, t->magic, flag); 312 fix_generated_item (tmp, op, difficulty, t->magic, flag);
355 change_treasure (t, tmp); 313 change_treasure (t, tmp);
356 put_treasure (tmp, op, flag); 314 put_treasure (tmp, op, flag);
357 } 315 }
358 } 316 }
359 317
360 if (t->next_yes != NULL) 318 if (t->next_yes)
361 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 319 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
362 } 320 }
363 else if (t->next_no != NULL) 321 else if (t->next_no)
364 create_all_treasures (t->next_no, op, flag, difficulty, tries); 322 create_all_treasures (t->next_no, op, flag, difficulty, tries);
365 323
366 if (t->next != NULL) 324 if (t->next)
367 create_all_treasures (t->next, op, flag, difficulty, tries); 325 create_all_treasures (t->next, op, flag, difficulty, tries);
368} 326}
369 327
370void 328static void
371create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 329create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
372{ 330{
373 int value = RANDOM () % tl->total_chance; 331 int value = rndm (tl->total_chance);
374 treasure *t; 332 treasure *t;
375 333
376 if (tries++ > 100) 334 if (tries++ > 100)
377 { 335 {
378 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 336 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
379 return; 337 return;
380 } 338 }
381 339
382 for (t = tl->items; t != NULL; t = t->next) 340 for (t = tl->items; t; t = t->next)
383 { 341 {
384 value -= t->chance; 342 value -= t->chance;
385 343
386 if (value < 0) 344 if (value < 0)
387 break; 345 break;
388 } 346 }
389 347
390 if (!t || value >= 0) 348 if (!t || value >= 0)
391 {
392 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 349 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
393 abort ();
394 return;
395 }
396 350
397 if (t->name) 351 if (t->name)
398 { 352 {
399 if (difficulty >= t->magic) 353 if (difficulty >= t->magic)
400 { 354 {
401 treasurelist *tl = find_treasurelist (t->name); 355 treasurelist *tl = treasurelist::find (t->name);
402 if (tl) 356 if (tl)
403 create_treasure (tl, op, flag, difficulty, tries); 357 create_treasure (tl, op, flag, difficulty, tries);
404 } 358 }
405 else if (t->nrof) 359 else if (t->nrof)
406 create_one_treasure (tl, op, flag, difficulty, tries); 360 create_one_treasure (tl, op, flag, difficulty, tries);
407
408 return;
409 } 361 }
410
411 if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 362 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
412 { 363 {
413 object *tmp = arch_to_object (t->item); 364 if (object *tmp = arch_to_object (t->item))
414 365 {
415 if (!tmp)
416 return;
417
418 if (t->nrof && tmp->nrof <= 1) 366 if (t->nrof && tmp->nrof <= 1)
419 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 367 tmp->nrof = rndm (t->nrof) + 1;
420 368
421 fix_generated_item (tmp, op, difficulty, t->magic, flag); 369 fix_generated_item (tmp, op, difficulty, t->magic, flag);
422 change_treasure (t, tmp); 370 change_treasure (t, tmp);
423 put_treasure (tmp, op, flag); 371 put_treasure (tmp, op, flag);
372 }
424 } 373 }
374}
375
376void
377object::create_treasure (treasurelist *tl, int flags)
378{
379 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
425} 380}
426 381
427/* This calls the appropriate treasure creation function. tries is passed 382/* This calls the appropriate treasure creation function. tries is passed
428 * to determine how many list transitions or attempts to create treasure 383 * to determine how many list transitions or attempts to create treasure
429 * 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
… …
432 * to do that. 387 * to do that.
433 */ 388 */
434void 389void
435create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 390create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
436{ 391{
392 // empty treasurelists are legal
393 if (!tl->items)
394 return;
437 395
438 if (tries++ > 100) 396 if (tries++ > 100)
439 { 397 {
440 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441 return; 399 return;
442 } 400 }
401
402 if (op->flag [FLAG_TREASURE_ENV])
403 flag |= GT_ENVIRONMENT;
404
443 if (tl->total_chance) 405 if (tl->total_chance)
444 create_one_treasure (tl, op, flag, difficulty, tries); 406 create_one_treasure (tl, op, flag, difficulty, tries);
445 else 407 else
446 create_all_treasures (tl->items, op, flag, difficulty, tries); 408 create_all_treasures (tl->items, op, flag, difficulty, tries);
447} 409}
… …
454object * 416object *
455generate_treasure (treasurelist *tl, int difficulty) 417generate_treasure (treasurelist *tl, int difficulty)
456{ 418{
457 difficulty = clamp (difficulty, 1, settings.max_level); 419 difficulty = clamp (difficulty, 1, settings.max_level);
458 420
459 object *ob = object::create (), *tmp; 421 object *ob = object::create ();
460 422
461 create_treasure (tl, ob, 0, difficulty, 0); 423 create_treasure (tl, ob, 0, difficulty, 0);
462 424
463 /* 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 */
464 tmp = ob->inv; 426 object *tmp = ob->inv;
465 if (tmp != NULL) 427 if (tmp)
466 tmp->remove (); 428 tmp->remove ();
467 429
468 if (ob->inv) 430 if (ob->inv)
469 LOG (llevError, "In generate treasure, created multiple objects.\n"); 431 LOG (llevError, "In generate treasure, created multiple objects.\n");
470 432
… …
478 * 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
479 * magical bonus "wanted". 441 * magical bonus "wanted".
480 */ 442 */
481 443
482static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 444static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
483
484/*chance of magic difficulty*/ 445// chance of magic difficulty
485
486/* +0 +1 +2 +3 +4 */ 446// +0 +1 +2 +3 +4
487 {95, 2, 2, 1, 0}, /*1 */ 447 {95, 2, 2, 1, 0}, // 1
488 {92, 5, 2, 1, 0}, /*2 */ 448 {92, 5, 2, 1, 0}, // 2
489 {85, 10, 4, 1, 0}, /*3 */ 449 {85, 10, 4, 1, 0}, // 3
490 {80, 14, 4, 2, 0}, /*4 */ 450 {80, 14, 4, 2, 0}, // 4
491 {75, 17, 5, 2, 1}, /*5 */ 451 {75, 17, 5, 2, 1}, // 5
492 {70, 18, 8, 3, 1}, /*6 */ 452 {70, 18, 8, 3, 1}, // 6
493 {65, 21, 10, 3, 1}, /*7 */ 453 {65, 21, 10, 3, 1}, // 7
494 {60, 22, 12, 4, 2}, /*8 */ 454 {60, 22, 12, 4, 2}, // 8
495 {55, 25, 14, 4, 2}, /*9 */ 455 {55, 25, 14, 4, 2}, // 9
496 {50, 27, 16, 5, 2}, /*10 */ 456 {50, 27, 16, 5, 2}, // 10
497 {45, 28, 18, 6, 3}, /*11 */ 457 {45, 28, 18, 6, 3}, // 11
498 {42, 28, 20, 7, 3}, /*12 */ 458 {42, 28, 20, 7, 3}, // 12
499 {40, 27, 21, 8, 4}, /*13 */ 459 {40, 27, 21, 8, 4}, // 13
500 {38, 25, 22, 10, 5}, /*14 */ 460 {38, 25, 22, 10, 5}, // 14
501 {36, 23, 23, 12, 6}, /*15 */ 461 {36, 23, 23, 12, 6}, // 15
502 {33, 21, 24, 14, 8}, /*16 */ 462 {33, 21, 24, 14, 8}, // 16
503 {31, 19, 25, 16, 9}, /*17 */ 463 {31, 19, 25, 16, 9}, // 17
504 {27, 15, 30, 18, 10}, /*18 */ 464 {27, 15, 30, 18, 10}, // 18
505 {20, 12, 30, 25, 13}, /*19 */ 465 {20, 12, 30, 25, 13}, // 19
506 {15, 10, 28, 30, 17}, /*20 */ 466 {15, 10, 28, 30, 17}, // 20
507 {13, 9, 27, 28, 23}, /*21 */ 467 {13, 9, 27, 28, 23}, // 21
508 {10, 8, 25, 28, 29}, /*22 */ 468 {10, 8, 25, 28, 29}, // 22
509 {8, 7, 23, 26, 36}, /*23 */ 469 { 8, 7, 23, 26, 36}, // 23
510 {6, 6, 20, 22, 46}, /*24 */ 470 { 6, 6, 20, 22, 46}, // 24
511 {4, 5, 17, 18, 56}, /*25 */ 471 { 4, 5, 17, 18, 56}, // 25
512 {2, 4, 12, 14, 68}, /*26 */ 472 { 2, 4, 12, 14, 68}, // 26
513 {0, 3, 7, 10, 80}, /*27 */ 473 { 0, 3, 7, 10, 80}, // 27
514 {0, 0, 3, 7, 90}, /*28 */ 474 { 0, 0, 3, 7, 90}, // 28
515 {0, 0, 0, 3, 97}, /*29 */ 475 { 0, 0, 0, 3, 97}, // 29
516 {0, 0, 0, 0, 100}, /*30 */ 476 { 0, 0, 0, 0, 100}, // 30
517 {0, 0, 0, 0, 100}, /*31 */ 477 { 0, 0, 0, 0, 100}, // 31
518}; 478};
519
520 479
521/* calculate the appropriate level for wands staves and scrolls. 480/* calculate the appropriate level for wands staves and scrolls.
522 * 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)
523 * 482 *
524 * elmex Wed Aug 9 17:44:59 CEST 2006: 483 * elmex Wed Aug 9 17:44:59 CEST 2006:
525 * 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.
526 */ 485 */
527
528int 486int
529level_for_item (const object *op, int difficulty) 487level_for_item (const object *op, int difficulty)
530{ 488{
531 int olevel = 0; 489 int olevel = 0;
532 490
… …
555 * elmex Thu Aug 10 18:45:44 CEST 2006: 513 * elmex Thu Aug 10 18:45:44 CEST 2006:
556 * Scaling difficulty by max_level, as difficulty is a level and not some 514 * Scaling difficulty by max_level, as difficulty is a level and not some
557 * weird integer between 1-31. 515 * weird integer between 1-31.
558 * 516 *
559 */ 517 */
560
561int 518int
562magic_from_difficulty (int difficulty) 519magic_from_difficulty (int difficulty)
563{ 520{
564 int percent = 0, magic = 0; 521 int percent = 0, magic = 0;
565 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 522 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
653 * 1) Since rings can have multiple bonuses, if the same bonus 610 * 1) Since rings can have multiple bonuses, if the same bonus
654 * is rolled again, increase it - the bonuses now stack with 611 * is rolled again, increase it - the bonuses now stack with
655 * other bonuses previously rolled and ones the item might natively have. 612 * other bonuses previously rolled and ones the item might natively have.
656 * 2) Add code to deal with new PR method. 613 * 2) Add code to deal with new PR method.
657 */ 614 */
658
659void 615void
660set_ring_bonus (object *op, int bonus) 616set_ring_bonus (object *op, int bonus)
661{ 617{
662 618
663 int r = RANDOM () % (bonus > 0 ? 25 : 11); 619 int r = rndm (bonus > 0 ? 25 : 11);
664 620
665 if (op->type == AMULET) 621 if (op->type == AMULET)
666 { 622 {
667 if (!(rndm (21))) 623 if (!(rndm (21)))
668 r = 20 + rndm (2); 624 r = 20 + rndm (2);
669 else 625 else
670 { 626 {
671 if (RANDOM () & 2) 627 if (rndm (2))
672 r = 10; 628 r = 10;
673 else 629 else
674 r = 11 + rndm (9); 630 r = 11 + rndm (9);
675 } 631 }
676 } 632 }
… …
727 * positive values for how protections work out. Put another 683 * positive values for how protections work out. Put another
728 * little random element in since that they don't always end up with 684 * little random element in since that they don't always end up with
729 * even values. 685 * even values.
730 */ 686 */
731 if (bonus < 0) 687 if (bonus < 0)
732 val = 2 * -val - RANDOM () % b; 688 val = 2 * -val - rndm (b);
733 if (val > 35) 689 if (val > 35)
734 val = 35; /* Upper limit */ 690 val = 35; /* Upper limit */
735 b = 0; 691 b = 0;
736 692
737 while (op->resist[resist_table[resist]] != 0 && b < 4) 693 while (op->resist[resist_table[resist]] != 0 && b < 4)
… …
790 * higher is the chance of returning a low number. 746 * higher is the chance of returning a low number.
791 * It is only used in fix_generated_treasure() to set bonuses on 747 * It is only used in fix_generated_treasure() to set bonuses on
792 * rings and amulets. 748 * rings and amulets.
793 * Another scheme is used to calculate the magic of weapons and armours. 749 * Another scheme is used to calculate the magic of weapons and armours.
794 */ 750 */
795
796int 751int
797get_magic (int diff) 752get_magic (int diff)
798{ 753{
799 int i; 754 int i;
800 755
801 if (diff < 3) 756 if (diff < 3)
802 diff = 3; 757 diff = 3;
758
803 for (i = 0; i < 4; i++) 759 for (i = 0; i < 4; i++)
804 if (RANDOM () % diff) 760 if (rndm (diff))
805 return i; 761 return i;
762
806 return 4; 763 return 4;
807} 764}
808 765
809#define DICE2 (get_magic(2)==2?2:1) 766#define DICE2 (get_magic(2)==2?2:1)
810#define DICESPELL (rndm (3)+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 767#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
811 768
812/* 769/*
813 * fix_generated_item(): This is called after an item is generated, in 770 * fix_generated_item(): This is called after an item is generated, in
814 * order to set it up right. This produced magical bonuses, puts spells 771 * order to set it up right. This produced magical bonuses, puts spells
815 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 772 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
829 * value. 786 * value.
830 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 787 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
831 * a working object - don't change magic, value, etc, but set it material 788 * a working object - don't change magic, value, etc, but set it material
832 * type as appropriate, for objects that need spell objects, set those, etc 789 * type as appropriate, for objects that need spell objects, set those, etc
833 */ 790 */
834
835void 791void
836fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 792fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
837{ 793{
838 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 794 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
839 795
… …
844 save_item_power = op->item_power; 800 save_item_power = op->item_power;
845 op->item_power = 0; 801 op->item_power = 0;
846 802
847 if (op->randomitems && op->type != SPELL) 803 if (op->randomitems && op->type != SPELL)
848 { 804 {
849 create_treasure (op->randomitems, op, flags, difficulty, 0); 805 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
850 if (!op->inv)
851 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name);
852
853 /* So the treasure doesn't get created again */ 806 /* So the treasure doesn't get created again */
854 op->randomitems = NULL; 807 op->randomitems = 0;
855 } 808 }
856 809
857 if (difficulty < 1) 810 if (difficulty < 1)
858 difficulty = 1; 811 difficulty = 1;
859 812
… …
876 if (!op->magic && max_magic) 829 if (!op->magic && max_magic)
877 set_magic (difficulty, op, max_magic, flags); 830 set_magic (difficulty, op, max_magic, flags);
878 831
879 num_enchantments = calc_item_power (op, 1); 832 num_enchantments = calc_item_power (op, 1);
880 833
881 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 834 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
835 || op->type == HORN
836 || difficulty >= settings.max_level) /* high difficulties always generate an artifact,
882 * used for shop_floors or treasures */ 837 * used for shop_floors or treasures */
883 generate_artifact (op, difficulty); 838 generate_artifact (op, difficulty);
884 } 839 }
885 840
886 /* Object was made an artifact. Calculate its item_power rating. 841 /* Object was made an artifact. Calculate its item_power rating.
… …
949 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 904 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
950 set_ring_bonus (op, -DICE2); 905 set_ring_bonus (op, -DICE2);
951 break; 906 break;
952 907
953 case BRACERS: 908 case BRACERS:
954 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 909 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
955 { 910 {
956 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 911 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
957 if (!QUERY_FLAG (op, FLAG_CURSED)) 912 if (!QUERY_FLAG (op, FLAG_CURSED))
958 op->value *= 3; 913 op->value *= 3;
959 } 914 }
… …
985 */ 940 */
986 if (op->inv && op->randomitems) 941 if (op->inv && op->randomitems)
987 { 942 {
988 /* value multiplier is same as for scrolls */ 943 /* value multiplier is same as for scrolls */
989 op->value = (op->value * op->inv->value); 944 op->value = (op->value * op->inv->value);
990 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 945 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
991 } 946 }
992 else 947 else
993 { 948 {
994 op->name = "potion"; 949 op->name = "potion";
995 op->name_pl = "potions"; 950 op->name_pl = "potions";
… …
1041 set_ring_bonus (op, d); 996 set_ring_bonus (op, d);
1042 } 997 }
1043 } 998 }
1044 999
1045 if (GET_ANIM_ID (op)) 1000 if (GET_ANIM_ID (op))
1046 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1001 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1047 1002
1048 break; 1003 break;
1049 1004
1050 case BOOK: 1005 case BOOK:
1051 /* Is it an empty book?, if yes lets make a special· 1006 /* Is it an empty book?, if yes lets make a special·
… …
1056 { 1011 {
1057 /* set the book level properly */ 1012 /* set the book level properly */
1058 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1013 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1059 { 1014 {
1060 if (op->map && op->map->difficulty) 1015 if (op->map && op->map->difficulty)
1061 op->level = RANDOM () % (op->map->difficulty) + rndm (10) + 1; 1016 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1062 else 1017 else
1063 op->level = rndm (20) + 1; 1018 op->level = rndm (20) + 1;
1064 } 1019 }
1065 else 1020 else
1066 op->level = RANDOM () % creator->level; 1021 op->level = rndm (creator->level);
1067 1022
1068 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1023 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1069 /* books w/ info are worth more! */ 1024 /* books w/ info are worth more! */
1070 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1025 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1071 /* creator related stuff */ 1026 /* creator related stuff */
… …
1170 */ 1125 */
1171 1126
1172/* 1127/*
1173 * Allocate and return the pointer to an empty artifactlist structure. 1128 * Allocate and return the pointer to an empty artifactlist structure.
1174 */ 1129 */
1175
1176static artifactlist * 1130static artifactlist *
1177get_empty_artifactlist (void) 1131get_empty_artifactlist (void)
1178{ 1132{
1179 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1133 return salloc0 <artifactlist> ();
1180
1181 if (al == NULL)
1182 fatal (OUT_OF_MEMORY);
1183 al->next = NULL;
1184 al->items = NULL;
1185 al->total_chance = 0;
1186 return al;
1187} 1134}
1188 1135
1189/* 1136/*
1190 * Allocate and return the pointer to an empty artifact structure. 1137 * Allocate and return the pointer to an empty artifact structure.
1191 */ 1138 */
1192
1193static artifact * 1139static artifact *
1194get_empty_artifact (void) 1140get_empty_artifact (void)
1195{ 1141{
1196 artifact *a = (artifact *) malloc (sizeof (artifact)); 1142 return salloc0 <artifact> ();
1197
1198 if (a == NULL)
1199 fatal (OUT_OF_MEMORY);
1200 a->item = NULL;
1201 a->next = NULL;
1202 a->chance = 0;
1203 a->difficulty = 0;
1204 a->allowed = NULL;
1205 return a;
1206} 1143}
1207 1144
1208/* 1145/*
1209 * Searches the artifact lists and returns one that has the same type 1146 * Searches the artifact lists and returns one that has the same type
1210 * of objects on it. 1147 * of objects on it.
1211 */ 1148 */
1212
1213artifactlist * 1149artifactlist *
1214find_artifactlist (int type) 1150find_artifactlist (int type)
1215{ 1151{
1216 artifactlist *al;
1217
1218 for (al = first_artifactlist; al != NULL; al = al->next) 1152 for (artifactlist *al = first_artifactlist; al; al = al->next)
1219 if (al->type == type) 1153 if (al->type == type)
1220 return al; 1154 return al;
1155
1221 return NULL; 1156 return 0;
1222} 1157}
1223 1158
1224/* 1159/*
1225 * For debugging purposes. Dumps all tables. 1160 * For debugging purposes. Dumps all tables.
1226 */ 1161 */
1227
1228void 1162void
1229dump_artifacts (void) 1163dump_artifacts (void)
1230{ 1164{
1231 artifactlist *al; 1165 artifactlist *al;
1232 artifact *art; 1166 artifact *art;
… …
1239 for (art = al->items; art != NULL; art = art->next) 1173 for (art = al->items; art != NULL; art = art->next)
1240 { 1174 {
1241 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1175 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1242 if (art->allowed != NULL) 1176 if (art->allowed != NULL)
1243 { 1177 {
1244 fprintf (logfile, "\tAllowed combinations:"); 1178 fprintf (logfile, "\tallowed combinations:");
1245 for (next = art->allowed; next != NULL; next = next->next) 1179 for (next = art->allowed; next != NULL; next = next->next)
1246 fprintf (logfile, "%s,", &next->name); 1180 fprintf (logfile, "%s,", &next->name);
1247 fprintf (logfile, "\n"); 1181 fprintf (logfile, "\n");
1248 } 1182 }
1249 } 1183 }
… …
1260 treasurelist *tl; 1194 treasurelist *tl;
1261 int i; 1195 int i;
1262 1196
1263 if (depth > 100) 1197 if (depth > 100)
1264 return; 1198 return;
1199
1265 while (t) 1200 while (t)
1266 { 1201 {
1267 if (t->name) 1202 if (t->name)
1268 { 1203 {
1269 for (i = 0; i < depth; i++) 1204 for (i = 0; i < depth; i++)
1270 fprintf (logfile, " "); 1205 fprintf (logfile, " ");
1206
1271 fprintf (logfile, "{ (list: %s)\n", &t->name); 1207 fprintf (logfile, "{ (list: %s)\n", &t->name);
1208
1272 tl = find_treasurelist (t->name); 1209 tl = treasurelist::find (t->name);
1273 if (tl) 1210 if (tl)
1274 dump_monster_treasure_rec (name, tl->items, depth + 2); 1211 dump_monster_treasure_rec (name, tl->items, depth + 2);
1212
1275 for (i = 0; i < depth; i++) 1213 for (i = 0; i < depth; i++)
1276 fprintf (logfile, " "); 1214 fprintf (logfile, " ");
1215
1277 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1216 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1278 } 1217 }
1279 else 1218 else
1280 { 1219 {
1281 for (i = 0; i < depth; i++) 1220 for (i = 0; i < depth; i++)
1282 fprintf (logfile, " "); 1221 fprintf (logfile, " ");
1222
1283 if (t->item && t->item->clone.type == FLESH) 1223 if (t->item && t->item->clone.type == FLESH)
1284 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1224 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1285 else 1225 else
1286 fprintf (logfile, "%s\n", &t->item->clone.name); 1226 fprintf (logfile, "%s\n", &t->item->clone.name);
1287 } 1227 }
1288 1228
1289 if (t->next_yes) 1229 if (t->next_yes)
1290 { 1230 {
1291 for (i = 0; i < depth; i++) 1231 for (i = 0; i < depth; i++)
1292 fprintf (logfile, " "); 1232 fprintf (logfile, " ");
1233
1293 fprintf (logfile, " (if yes)\n"); 1234 fprintf (logfile, " (if yes)\n");
1294 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1235 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1295 } 1236 }
1296 1237
1297 if (t->next_no) 1238 if (t->next_no)
1298 { 1239 {
1299 for (i = 0; i < depth; i++) 1240 for (i = 0; i < depth; i++)
1300 fprintf (logfile, " "); 1241 fprintf (logfile, " ");
1242
1301 fprintf (logfile, " (if no)\n"); 1243 fprintf (logfile, " (if no)\n");
1302 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1244 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1303 } 1245 }
1304 1246
1305 t = t->next; 1247 t = t->next;
… …
1308 1250
1309/* 1251/*
1310 * For debugging purposes. Dumps all treasures for a given monster. 1252 * For debugging purposes. Dumps all treasures for a given monster.
1311 * Created originally by Raphael Quinet for debugging the alchemy code. 1253 * Created originally by Raphael Quinet for debugging the alchemy code.
1312 */ 1254 */
1313
1314void 1255void
1315dump_monster_treasure (const char *name) 1256dump_monster_treasure (const char *name)
1316{ 1257{
1317 archetype *at; 1258 archetype *at;
1318 int found; 1259 int found;
1319 1260
1320 found = 0; 1261 found = 0;
1321 fprintf (logfile, "\n"); 1262 fprintf (logfile, "\n");
1263
1322 for (at = first_archetype; at != NULL; at = at->next) 1264 for (at = first_archetype; at != NULL; at = at->next)
1323 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1265 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1324 { 1266 {
1325 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1267 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1326 if (at->clone.randomitems != NULL) 1268 if (at->clone.randomitems != NULL)
1327 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1269 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1328 else 1270 else
1329 fprintf (logfile, "(nothing)\n"); 1271 fprintf (logfile, "(nothing)\n");
1272
1330 fprintf (logfile, "\n"); 1273 fprintf (logfile, "\n");
1331 found++; 1274 found++;
1332 } 1275 }
1276
1333 if (found == 0) 1277 if (found == 0)
1334 fprintf (logfile, "No objects have the name %s!\n\n", name); 1278 fprintf (logfile, "No objects have the name %s!\n\n", name);
1335} 1279}
1336 1280
1337/* 1281/*
1338 * Builds up the lists of artifacts from the file in the libdir. 1282 * Builds up the lists of artifacts from the file in the libdir.
1339 */ 1283 */
1340
1341void 1284void
1342init_artifacts (void) 1285init_artifacts (void)
1343{ 1286{
1344 static int has_been_inited = 0; 1287 static int has_been_inited = 0;
1345 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1288 char filename[MAX_BUF];
1346 artifact *art = NULL; 1289 artifact *art = NULL;
1347 linked_char *tmp;
1348 int value;
1349 artifactlist *al; 1290 artifactlist *al;
1350 1291
1351 if (has_been_inited) 1292 if (has_been_inited)
1352 return; 1293 return;
1353 else 1294 else
1354 has_been_inited = 1; 1295 has_been_inited = 1;
1355 1296
1356 sprintf (filename, "%s/artifacts", settings.datadir); 1297 sprintf (filename, "%s/artifacts", settings.datadir);
1357 object_thawer thawer (filename); 1298 object_thawer f (filename);
1358 1299
1359 if (!thawer) 1300 if (!f)
1360 return; 1301 return;
1361 1302
1362 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1303 f.next ();
1363 {
1364 if (*buf == '#')
1365 continue;
1366 if ((cp = strchr (buf, '\n')) != NULL)
1367 *cp = '\0';
1368 cp = buf;
1369 while (*cp == ' ') /* Skip blanks */
1370 cp++;
1371 if (*cp == '\0')
1372 continue;
1373 1304
1374 if (!strncmp (cp, "Allowed", 7)) 1305 for (;;)
1306 {
1307 switch (f.kw)
1375 { 1308 {
1309 case KW_allowed:
1376 if (art == NULL) 1310 if (!art)
1311 art = get_empty_artifact ();
1312
1377 { 1313 {
1378 art = get_empty_artifact (); 1314 if (!strcmp (f.get_str (), "all"))
1379 nrofartifacts++; 1315 break;
1316
1317 char *next, *cp = f.get_str ();
1318
1319 do
1320 {
1321 if ((next = strchr (cp, ',')))
1322 *next++ = '\0';
1323
1324 linked_char *tmp = new linked_char;
1325
1326 tmp->name = cp;
1327 tmp->next = art->allowed;
1328 art->allowed = tmp;
1329 }
1330 while ((cp = next));
1380 } 1331 }
1381 cp = strchr (cp, ' ') + 1; 1332 break;
1382 if (!strcmp (cp, "all")) 1333
1334 case KW_chance:
1335 f.get (art->chance);
1336 break;
1337
1338 case KW_difficulty:
1339 f.get (art->difficulty);
1340 break;
1341
1342 case KW_object:
1343 {
1344 art->item = object::create ();
1345 f.get (art->item->name);
1346 f.next ();
1347
1348 if (!art->item->parse_kv (f))
1349 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1350
1351 al = find_artifactlist (art->item->type);
1352
1353 if (!al)
1354 {
1355 al = get_empty_artifactlist ();
1356 al->type = art->item->type;
1357 al->next = first_artifactlist;
1358 first_artifactlist = al;
1359 }
1360
1361 art->next = al->items;
1362 al->items = art;
1363 art = 0;
1364 }
1383 continue; 1365 continue;
1384 1366
1385 do 1367 case KW_EOF:
1368 goto done;
1369
1370 default:
1371 if (!f.parse_error ("artifacts file"))
1372 cleanup ("artifacts file required");
1386 { 1373 break;
1387 nrofallowedstr++;
1388 if ((next = strchr (cp, ',')) != NULL)
1389 *(next++) = '\0';
1390 tmp = new linked_char;
1391
1392 tmp->name = cp;
1393 tmp->next = art->allowed;
1394 art->allowed = tmp;
1395 }
1396 while ((cp = next) != NULL);
1397 }
1398 else if (sscanf (cp, "chance %d", &value))
1399 art->chance = (uint16) value;
1400 else if (sscanf (cp, "difficulty %d", &value))
1401 art->difficulty = (uint8) value;
1402 else if (!strncmp (cp, "Object", 6))
1403 { 1374 }
1404 art->item = object::create ();
1405 1375
1406 if (!load_object (thawer, art->item, 0)) 1376 f.next ();
1407 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1408
1409 art->item->name = strchr (cp, ' ') + 1;
1410 al = find_artifactlist (art->item->type);
1411 if (al == NULL)
1412 {
1413 al = get_empty_artifactlist ();
1414 al->type = art->item->type;
1415 al->next = first_artifactlist;
1416 first_artifactlist = al;
1417 }
1418 art->next = al->items;
1419 al->items = art;
1420 art = NULL;
1421 }
1422 else
1423 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1424 } 1377 }
1425 1378
1379done:
1426 for (al = first_artifactlist; al != NULL; al = al->next) 1380 for (al = first_artifactlist; al; al = al->next)
1427 { 1381 {
1382 al->total_chance = 0;
1383
1428 for (art = al->items; art != NULL; art = art->next) 1384 for (art = al->items; art; art = art->next)
1429 { 1385 {
1430 if (!art->chance) 1386 if (!art->chance)
1431 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);
1432 else 1388 else
1433 al->total_chance += art->chance; 1389 al->total_chance += art->chance;
… …
1438 } 1394 }
1439 1395
1440 LOG (llevDebug, "done.\n"); 1396 LOG (llevDebug, "done.\n");
1441} 1397}
1442 1398
1443
1444/* 1399/*
1445 * Used in artifact generation. The bonuses of the first object 1400 * Used in artifact generation. The bonuses of the first object
1446 * is modified by the bonuses of the second object. 1401 * is modified by the bonuses of the second object.
1447 */ 1402 */
1448
1449void 1403void
1450add_abilities (object *op, object *change) 1404add_abilities (object *op, object *change)
1451{ 1405{
1452 int i, tmp; 1406 int i, tmp;
1453 1407
1454 if (change->face != blank_face) 1408 if (change->face != blank_face)
1455 { 1409 {
1456#ifdef TREASURE_VERBOSE 1410#ifdef TREASURE_VERBOSE
1457 LOG (llevDebug, "FACE: %d\n", change->face->number); 1411 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1458#endif 1412#endif
1459 op->face = change->face; 1413 op->face = change->face;
1460 } 1414 }
1461 1415
1462 for (i = 0; i < NUM_STATS; i++) 1416 for (i = 0; i < NUM_STATS; i++)
… …
1502 1456
1503 op->set_speed (op->speed); 1457 op->set_speed (op->speed);
1504 } 1458 }
1505 1459
1506 if (change->nrof) 1460 if (change->nrof)
1507 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1461 op->nrof = rndm (change->nrof) + 1;
1508 1462
1509 op->stats.exp += change->stats.exp; /* Speed modifier */ 1463 op->stats.exp += change->stats.exp; /* Speed modifier */
1510 op->stats.wc += change->stats.wc; 1464 op->stats.wc += change->stats.wc;
1511 op->stats.ac += change->stats.ac; 1465 op->stats.ac += change->stats.ac;
1512 1466
… …
1615 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1569 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1616 } 1570 }
1617 1571
1618 op->value *= change->value; 1572 op->value *= change->value;
1619 1573
1620 if (change->material) 1574 if (change->materials)
1621 op->material = change->material; 1575 op->materials = change->materials;
1622 1576
1623 if (change->materialname) 1577 if (change->materialname)
1624 op->materialname = change->materialname; 1578 op->materialname = change->materialname;
1625 1579
1626 if (change->slaying) 1580 if (change->slaying)
… …
1632 if (change->msg) 1586 if (change->msg)
1633 op->msg = change->msg; 1587 op->msg = change->msg;
1634} 1588}
1635 1589
1636static int 1590static int
1637legal_artifact_combination (object *op, artifact * art) 1591legal_artifact_combination (object *op, artifact *art)
1638{ 1592{
1639 int neg, success = 0; 1593 int neg, success = 0;
1640 linked_char *tmp; 1594 linked_char *tmp;
1641 const char *name; 1595 const char *name;
1642 1596
1643 if (art->allowed == (linked_char *) NULL) 1597 if (!art->allowed)
1644 return 1; /* Ie, "all" */ 1598 return 1; /* Ie, "all" */
1599
1645 for (tmp = art->allowed; tmp; tmp = tmp->next) 1600 for (tmp = art->allowed; tmp; tmp = tmp->next)
1646 { 1601 {
1647#ifdef TREASURE_VERBOSE 1602#ifdef TREASURE_VERBOSE
1648 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1603 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1649#endif 1604#endif
1650 if (*tmp->name == '!') 1605 if (*tmp->name == '!')
1651 name = tmp->name + 1, neg = 1; 1606 name = tmp->name + 1, neg = 1;
1652 else 1607 else
1653 name = tmp->name, neg = 0; 1608 name = tmp->name, neg = 0;
… …
1660 * everything is allowed except what we match 1615 * everything is allowed except what we match
1661 */ 1616 */
1662 else if (neg) 1617 else if (neg)
1663 success = 1; 1618 success = 1;
1664 } 1619 }
1620
1665 return success; 1621 return success;
1666} 1622}
1667 1623
1668/* 1624/*
1669 * Fixes the given object, giving it the abilities and titles 1625 * Fixes the given object, giving it the abilities and titles
… …
1720 return; 1676 return;
1721 } 1677 }
1722 1678
1723 for (i = 0; i < ARTIFACT_TRIES; i++) 1679 for (i = 0; i < ARTIFACT_TRIES; i++)
1724 { 1680 {
1725 int roll = RANDOM () % al->total_chance; 1681 int roll = rndm (al->total_chance);
1726 1682
1727 for (art = al->items; art != NULL; art = art->next) 1683 for (art = al->items; art; art = art->next)
1728 { 1684 {
1729 roll -= art->chance; 1685 roll -= art->chance;
1730 if (roll < 0) 1686 if (roll < 0)
1731 break; 1687 break;
1732 } 1688 }
… …
1748 continue; 1704 continue;
1749 1705
1750 if (!legal_artifact_combination (op, art)) 1706 if (!legal_artifact_combination (op, art))
1751 { 1707 {
1752#ifdef TREASURE_VERBOSE 1708#ifdef TREASURE_VERBOSE
1753 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);
1754#endif 1710#endif
1755 continue; 1711 continue;
1756 } 1712 }
1713
1757 give_artifact_abilities (op, art->item); 1714 give_artifact_abilities (op, art->item);
1758 return; 1715 return;
1759 } 1716 }
1760} 1717}
1761 1718
… …
1805 SET_FLAG (item, FLAG_NO_STEAL); 1762 SET_FLAG (item, FLAG_NO_STEAL);
1806 } 1763 }
1807} 1764}
1808 1765
1809/* special_potion() - so that old potion code is still done right. */ 1766/* special_potion() - so that old potion code is still done right. */
1810
1811int 1767int
1812special_potion (object *op) 1768special_potion (object *op)
1813{ 1769{
1814 if (op->attacktype) 1770 if (op->attacktype)
1815 return 1; 1771 return 1;
… …
1825} 1781}
1826 1782
1827void 1783void
1828free_treasurestruct (treasure *t) 1784free_treasurestruct (treasure *t)
1829{ 1785{
1830 if (t->next)
1831 free_treasurestruct (t->next); 1786 if (t->next) free_treasurestruct (t->next);
1832 if (t->next_yes)
1833 free_treasurestruct (t->next_yes); 1787 if (t->next_yes) free_treasurestruct (t->next_yes);
1834 if (t->next_no)
1835 free_treasurestruct (t->next_no); 1788 if (t->next_no) free_treasurestruct (t->next_no);
1836 1789
1837 delete t; 1790 delete t;
1838} 1791}
1839 1792
1840void 1793void
… …
1845 1798
1846 delete lc; 1799 delete lc;
1847} 1800}
1848 1801
1849void 1802void
1850free_artifact (artifact * at) 1803free_artifact (artifact *at)
1851{ 1804{
1852 if (at->next)
1853 free_artifact (at->next); 1805 if (at->next) free_artifact (at->next);
1854
1855 if (at->allowed)
1856 free_charlinks (at->allowed); 1806 if (at->allowed) free_charlinks (at->allowed);
1857 1807
1858 at->item->destroy (1); 1808 at->item->destroy (1);
1859 1809
1860 delete at; 1810 sfree (at);
1861} 1811}
1862 1812
1863void 1813void
1864free_artifactlist (artifactlist * al) 1814free_artifactlist (artifactlist *al)
1865{ 1815{
1866 artifactlist *nextal; 1816 artifactlist *nextal;
1867 1817
1868 for (al = first_artifactlist; al; al = nextal) 1818 for (al = first_artifactlist; al; al = nextal)
1869 { 1819 {
1870 nextal = al->next; 1820 nextal = al->next;
1871 1821
1872 if (al->items) 1822 if (al->items)
1873 free_artifact (al->items); 1823 free_artifact (al->items);
1874 1824
1875 free (al); 1825 sfree (al);
1876 } 1826 }
1877} 1827}
1878 1828
1879void 1829void
1880free_all_treasures (void) 1830free_all_treasures (void)
1881{ 1831{
1882 treasurelist *tl, *next; 1832 treasurelist *tl, *next;
1883 1833
1884
1885 for (tl = first_treasurelist; tl != NULL; tl = next) 1834 for (tl = first_treasurelist; tl; tl = next)
1886 { 1835 {
1836 clear (tl);
1837
1887 next = tl->next; 1838 next = tl->next;
1888 if (tl->items)
1889 free_treasurestruct (tl->items);
1890 delete tl; 1839 delete tl;
1891 } 1840 }
1841
1892 free_artifactlist (first_artifactlist); 1842 free_artifactlist (first_artifactlist);
1893} 1843}

Diff Legend

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