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.28 by root, Tue Dec 26 08:54:59 2006 UTC vs.
Revision 1.44 by root, Mon Apr 16 15:36:22 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23
24#define ALLOWED_COMBINATION
25 24
26/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
27 * 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
28 * 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
29 * left on 28 * left on
30 */ 29 */
31#define TREASURE_DEBUG 30#define TREASURE_DEBUG
32 31
33/* TREASURE_VERBOSE enables copious output concerning artifact generation */ 32/* TREASURE_VERBOSE enables copious output concerning artifact generation */
34 33
35/* #define TREASURE_VERBOSE */ 34//#define TREASURE_VERBOSE
36 35
37#include <global.h> 36#include <global.h>
38#include <treasure.h> 37#include <treasure.h>
39#include <funcpoint.h> 38#include <funcpoint.h>
40#include <loader.h> 39#include <loader.h>
41 40
41extern char *spell_mapping[];
42
43static treasurelist *first_treasurelist;
42 44
43static void change_treasure (treasure *t, object *op); /* overrule default values */ 45static void change_treasure (treasure *t, object *op); /* overrule default values */
44extern 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;
45 57
46/* 58/*
47 * Initialize global archtype pointers: 59 * Initialize global archtype pointers:
48 */ 60 */
49
50void 61void
51init_archetype_pointers () 62init_archetype_pointers ()
52{ 63{
53 int prev_warn = warn_archetypes; 64 int prev_warn = warn_archetypes;
54 65
55 warn_archetypes = 1; 66 warn_archetypes = 1;
67
56 if (ring_arch == NULL) 68 if (ring_arch == NULL)
57 ring_arch = archetype::find ("ring"); 69 ring_arch = archetype::find ("ring");
58 if (amulet_arch == NULL) 70 if (amulet_arch == NULL)
59 amulet_arch = archetype::find ("amulet"); 71 amulet_arch = archetype::find ("amulet");
60 if (staff_arch == NULL) 72 if (staff_arch == NULL)
61 staff_arch = archetype::find ("staff"); 73 staff_arch = archetype::find ("staff");
62 if (crown_arch == NULL) 74 if (crown_arch == NULL)
63 crown_arch = archetype::find ("crown"); 75 crown_arch = archetype::find ("crown");
76
64 warn_archetypes = prev_warn; 77 warn_archetypes = prev_warn;
65} 78}
66 79
67/* 80/*
68 * Allocate and return the pointer to an empty treasurelist structure. 81 * Searches for the given treasurelist
69 */ 82 */
70
71static treasurelist * 83treasurelist *
72get_empty_treasurelist (void) 84treasurelist::find (const char *name)
73{ 85{
86 if (!name)
87 return 0;
88
89 AUTODECL (i, tl_map.find (name));
90
91 if (i == tl_map.end ())
92 return 0;
93
94 return i->second;
95}
96
97/*
98 * Searches for the given treasurelist in the globally linked list
99 * of treasurelists which has been built by load_treasures().
100 */
101treasurelist *
102treasurelist::get (const char *name)
103{
104 treasurelist *tl = find (name);
105
106 if (!tl)
107 {
74 return new treasurelist; 108 tl = new treasurelist;
75}
76 109
77/* 110 tl->name = name;
78 * Allocate and return the pointer to an empty treasure structure. 111 tl->next = first_treasurelist;
79 */ 112 first_treasurelist = tl;
80//TODO: make this a constructor
81static treasure *
82get_empty_treasure (void)
83{
84 treasure *t = new treasure;
85 113
86 t->chance = 100; 114 tl_map.insert (std::make_pair (tl->name, tl));
115 }
87 116
88 return t; 117 return tl;
118}
119
120//TODO: class method
121void
122clear (treasurelist *tl)
123{
124 if (tl->items)
125 {
126 free_treasurestruct (tl->items);
127 tl->items = 0;
128 }
129
130 tl->total_chance = 0;
89} 131}
90 132
91/* 133/*
92 * Reads the lib/treasure file from disk, and parses the contents 134 * Reads the lib/treasure file from disk, and parses the contents
93 * into an internal treasure structure (very linked lists) 135 * into an internal treasure structure (very linked lists)
94 */ 136 */
95
96static treasure * 137static treasure *
97load_treasure (FILE * fp, int *line) 138load_treasure (object_thawer &f)
98{ 139{
99 char buf[MAX_BUF], *cp, variable[MAX_BUF];
100 treasure *t = get_empty_treasure (); 140 treasure *t = new treasure;
101 int value; 141 int value;
102 142
103 nroftreasures++; 143 nroftreasures++;
104 while (fgets (buf, MAX_BUF, fp) != NULL)
105 {
106 (*line)++;
107 144
108 if (*buf == '#') 145 for (;;)
109 continue; 146 {
110 if ((cp = strchr (buf, '\n')) != NULL) 147 coroapi::cede_every (10);
111 *cp = '\0';
112 cp = buf;
113 while (isspace (*cp)) /* Skip blanks */
114 cp++;
115 148
116 if (sscanf (cp, "arch %s", variable)) 149 f.next ();
117 { 150
118 if ((t->item = archetype::find (variable)) == NULL) 151 switch (f.kw)
119 LOG (llevError, "Treasure lacks archetype: %s\n", variable);
120 } 152 {
121 else if (sscanf (cp, "list %s", variable)) 153 case KW_arch:
122 t->name = variable; 154 if (!(t->item = archetype::find (f.get_str ())))
123 else if (sscanf (cp, "change_name %s", variable)) 155 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
124 t->change_arch.name = variable; 156 break;
125 else if (sscanf (cp, "change_title %s", variable)) 157
126 t->change_arch.title = variable; 158 case KW_list: f.get (t->name); break;
127 else if (sscanf (cp, "change_slaying %s", variable)) 159 case KW_change_name: f.get (t->change_arch.name); break;
128 t->change_arch.slaying = variable; 160 case KW_change_title: f.get (t->change_arch.title); break;
129 else if (sscanf (cp, "chance %d", &value)) 161 case KW_change_slaying: f.get (t->change_arch.slaying); break;
130 t->chance = (uint8) value; 162 case KW_chance: f.get (t->chance); break;
131 else if (sscanf (cp, "nrof %d", &value)) 163 case KW_nrof: f.get (t->nrof); break;
132 t->nrof = (uint16) value; 164 case KW_magic: f.get (t->magic); break;
133 else if (sscanf (cp, "magic %d", &value)) 165
134 t->magic = (uint8) value; 166 case KW_yes: t->next_yes = load_treasure (f); break;
135 else if (!strcmp (cp, "yes")) 167 case KW_no: t->next_no = load_treasure (f); break;
136 t->next_yes = load_treasure (fp, line); 168
137 else if (!strcmp (cp, "no")) 169 case KW_end:
138 t->next_no = load_treasure (fp, line);
139 else if (!strcmp (cp, "end"))
140 return t;
141 else if (!strcmp (cp, "more"))
142 {
143 t->next = load_treasure (fp, line);
144 return t; 170 return t;
171
172 case KW_more:
173 t->next = load_treasure (f);
174 return t;
175
176 default:
177 if (!f.parse_error ("treasure list"))
178 return t; // error
179
180 return t;
145 } 181 }
146 else
147 LOG (llevError, "Unknown treasure-command: '%s', last entry %s, line %d\n", cp, &t->name, *line);
148 } 182 }
149 LOG (llevError, "treasure lacks 'end'.\n");
150 return t;
151} 183}
152 184
153#ifdef TREASURE_DEBUG 185#ifdef TREASURE_DEBUG
154
155/* recursived checks the linked list. Treasurelist is passed only 186/* recursived checks the linked list. Treasurelist is passed only
156 * so that the treasure name can be printed out 187 * so that the treasure name can be printed out
157 */ 188 */
158static void 189static void
159check_treasurelist (const treasure *t, const treasurelist * tl) 190check_treasurelist (const treasure *t, const treasurelist * tl)
160{ 191{
161 if (t->item == NULL && t->name == NULL)
162 LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name);
163 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no)) 192 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
164 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name); 193 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
165 /* find_treasurelist will print out its own error message */ 194
166 if (t->name && *t->name)
167 (void) find_treasurelist (t->name);
168 if (t->next) 195 if (t->next)
169 check_treasurelist (t->next, tl); 196 check_treasurelist (t->next, tl);
197
170 if (t->next_yes) 198 if (t->next_yes)
171 check_treasurelist (t->next_yes, tl); 199 check_treasurelist (t->next_yes, tl);
200
172 if (t->next_no) 201 if (t->next_no)
173 check_treasurelist (t->next_no, tl); 202 check_treasurelist (t->next_no, tl);
174} 203}
175#endif 204#endif
176 205
177/* 206/*
178 * Opens LIBDIR/treasure and reads all treasure-declarations from it. 207 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
179 * Each treasure is parsed with the help of load_treasure(). 208 * Each treasure is parsed with the help of load_treasure().
180 */ 209 */
181 210bool
182void 211load_treasure_file (const char *filename)
183load_treasures (void)
184{ 212{
185 FILE *fp;
186 char filename[MAX_BUF], buf[MAX_BUF], name[MAX_BUF];
187 treasurelist *previous = NULL;
188 treasure *t; 213 treasure *t;
189 int comp, line = 0; 214 int comp, line = 0;
190 215
191 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 216 object_thawer f (filename);
192 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) 217
218 if (!f)
193 { 219 {
194 LOG (llevError, "Can't open treasure file.\n"); 220 LOG (llevError, "Can't open treasure file.\n");
195 return; 221 return false;
196 }
197 while (fgets (buf, MAX_BUF, fp) != NULL)
198 { 222 }
199 line++;
200 if (*buf == '#')
201 continue;
202 223
203 if (sscanf (buf, "treasureone %s\n", name) || sscanf (buf, "treasure %s\n", name)) 224 f.next ();
204 {
205 treasurelist *tl = get_empty_treasurelist ();
206 225
207 tl->name = name; 226 for (;;)
208 if (previous == NULL) 227 {
209 first_treasurelist = tl; 228 switch (f.kw)
210 else 229 {
211 previous->next = tl; 230 case KW_treasure:
212 previous = tl; 231 case KW_treasureone:
213 tl->items = load_treasure (fp, &line);
214
215 /* This is a one of the many items on the list should be generated.
216 * Add up the chance total, and check to make sure the yes & no
217 * fields of the treasures are not being used.
218 */
219 if (!strncmp (buf, "treasureone", 11))
220 { 232 {
221 for (t = tl->items; t != NULL; t = t->next) 233 bool one = f.kw == KW_treasureone;
234 treasurelist *tl = treasurelist::get (f.get_str ());
235
236 clear (tl);
237 tl->items = load_treasure (f);
238
239 if (!tl->items)
240 return false;
241
242 /* This is a one of the many items on the list should be generated.
243 * Add up the chance total, and check to make sure the yes & no
244 * fields of the treasures are not being used.
245 */
246 if (one)
222 { 247 {
248 for (t = tl->items; t; t = t->next)
249 {
223#ifdef TREASURE_DEBUG 250#ifdef TREASURE_DEBUG
224 if (t->next_yes || t->next_no) 251 if (t->next_yes || t->next_no)
225 { 252 {
226 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 253 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
227 LOG (llevError, " the next_yes or next_no field is set\n"); 254 LOG (llevError, " the next_yes or next_no field is set\n");
255 }
256#endif
257 tl->total_chance += t->chance;
228 } 258 }
229#endif
230 tl->total_chance += t->chance;
231 } 259 }
232 } 260 }
233 } 261 break;
234 else
235 LOG (llevError, "Treasure-list %s didn't understand: %s, line %d\n", filename, buf, line);
236 }
237 close_and_delete (fp, comp);
238 262
263 case KW_EOF:
239#ifdef TREASURE_DEBUG 264#ifdef TREASURE_DEBUG
240 /* Perform some checks on how valid the treasure data actually is. 265 /* Perform some checks on how valid the treasure data actually is.
241 * verify that list transitions work (ie, the list that it is supposed 266 * verify that list transitions work (ie, the list that it is supposed
242 * to transition to exists). Also, verify that at least the name 267 * to transition to exists). Also, verify that at least the name
243 * or archetype is set for each treasure element. 268 * or archetype is set for each treasure element.
244 */ 269 */
245 for (previous = first_treasurelist; previous != NULL; previous = previous->next) 270 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
246 check_treasurelist (previous->items, previous); 271 check_treasurelist (tl->items, tl);
247#endif 272#endif
248}
249
250/*
251 * Searches for the given treasurelist in the globally linked list
252 * of treasurelists which has been built by load_treasures().
253 */
254
255treasurelist *
256find_treasurelist (const char *name)
257{
258 shstr_cmp name_ (name);
259
260 if (!name_)
261 return 0;
262
263 for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
264 if (name_ == tl->name)
265 return tl; 273 return true;
266 274
267 if (first_treasurelist) 275 default:
268 LOG (llevError, "Couldn't find treasurelist %s\n", name); 276 if (!f.parse_error ("treasure lists"))
277 return false;
269 278
270 return 0; 279 break;
271} 280 }
272 281
282 f.next ();
283 }
284}
273 285
274/* 286/*
275 * Generates the objects specified by the given treasure. 287 * Generates the objects specified by the given treasure.
276 * It goes recursively through the rest of the linked list. 288 * It goes recursively through the rest of the linked list.
277 * If there is a certain percental chance for a treasure to be generated, 289 * If there is a certain percental chance for a treasure to be generated,
… …
292 * this is the original object, or if this is an object that should be created 304 * this is the original object, or if this is an object that should be created
293 * by another object. 305 * by another object.
294 */ 306 */
295 if (flags & GT_ENVIRONMENT && op->type != SPELL) 307 if (flags & GT_ENVIRONMENT && op->type != SPELL)
296 { 308 {
297 op->x = creator->x;
298 op->y = creator->y;
299 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 309 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
300 insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 310 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
301 } 311 }
302 else 312 else
303 { 313 {
304 op = insert_ob_in_ob (op, creator); 314 op = creator->insert (op);
305 315
306 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 316 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
307 monster_check_apply (creator, op); 317 monster_check_apply (creator, op);
308 318
309 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 319 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
… …
329 339
330 if (t->change_arch.slaying) 340 if (t->change_arch.slaying)
331 op->slaying = t->change_arch.slaying; 341 op->slaying = t->change_arch.slaying;
332} 342}
333 343
334void 344static void
335create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries) 345create_all_treasures (treasure *t, object *op, int flag, int difficulty, int tries)
336{ 346{
337 object *tmp;
338
339 if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance) 347 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
340 { 348 {
341 if (t->name) 349 if (t->name)
342 { 350 {
343 if (strcmp (t->name, "NONE") && difficulty >= t->magic) 351 if (difficulty >= t->magic)
352 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries);
353 }
354 else
355 {
356 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
344 { 357 {
345 treasurelist *tl = find_treasurelist (t->name);
346 if (tl)
347 create_treasure (tl, op, flag, difficulty, tries);
348 }
349 }
350 else
351 {
352 if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))
353 {
354 tmp = arch_to_object (t->item); 358 object *tmp = arch_to_object (t->item);
359
355 if (t->nrof && tmp->nrof <= 1) 360 if (t->nrof && tmp->nrof <= 1)
356 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 361 tmp->nrof = rndm (t->nrof) + 1;
362
357 fix_generated_item (tmp, op, difficulty, t->magic, flag); 363 fix_generated_item (tmp, op, difficulty, t->magic, flag);
358 change_treasure (t, tmp); 364 change_treasure (t, tmp);
359 put_treasure (tmp, op, flag); 365 put_treasure (tmp, op, flag);
360 } 366 }
361 } 367 }
362 368
363 if (t->next_yes != NULL) 369 if (t->next_yes)
364 create_all_treasures (t->next_yes, op, flag, difficulty, tries); 370 create_all_treasures (t->next_yes, op, flag, difficulty, tries);
365 } 371 }
366 else if (t->next_no != NULL) 372 else if (t->next_no)
367 create_all_treasures (t->next_no, op, flag, difficulty, tries); 373 create_all_treasures (t->next_no, op, flag, difficulty, tries);
368 374
369 if (t->next != NULL) 375 if (t->next)
370 create_all_treasures (t->next, op, flag, difficulty, tries); 376 create_all_treasures (t->next, op, flag, difficulty, tries);
371} 377}
372 378
373void 379static void
374create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 380create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
375{ 381{
376 int value = RANDOM () % tl->total_chance; 382 int value = rndm (tl->total_chance);
377 treasure *t; 383 treasure *t;
378 384
379 if (tries++ > 100) 385 if (tries++ > 100)
380 { 386 {
381 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 387 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
382 return; 388 return;
383 } 389 }
384 390
385 for (t = tl->items; t != NULL; t = t->next) 391 for (t = tl->items; t; t = t->next)
386 { 392 {
387 value -= t->chance; 393 value -= t->chance;
388 394
389 if (value < 0) 395 if (value < 0)
390 break; 396 break;
391 } 397 }
392 398
393 if (!t || value >= 0) 399 if (!t || value >= 0)
394 {
395 LOG (llevError, "create_one_treasure: got null object or not able to find treasure\n"); 400 cleanup ("create_one_treasure: got null object or not able to find treasure\n", 1);
396 abort ();
397 return;
398 }
399 401
400 if (t->name) 402 if (t->name)
401 { 403 {
402 if (!strcmp (t->name, "NONE"))
403 return;
404
405 if (difficulty >= t->magic) 404 if (difficulty >= t->magic)
406 { 405 {
407 treasurelist *tl = find_treasurelist (t->name); 406 treasurelist *tl = treasurelist::find (t->name);
408 if (tl) 407 if (tl)
409 create_treasure (tl, op, flag, difficulty, tries); 408 create_treasure (tl, op, flag, difficulty, tries);
410 } 409 }
411 else if (t->nrof) 410 else if (t->nrof)
412 create_one_treasure (tl, op, flag, difficulty, tries); 411 create_one_treasure (tl, op, flag, difficulty, tries);
413
414 return;
415 } 412 }
416
417 if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE) 413 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
418 { 414 {
419 object *tmp = arch_to_object (t->item); 415 if (object *tmp = arch_to_object (t->item))
420 416 {
421 if (!tmp)
422 return;
423
424 if (t->nrof && tmp->nrof <= 1) 417 if (t->nrof && tmp->nrof <= 1)
425 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 418 tmp->nrof = rndm (t->nrof) + 1;
426 419
427 fix_generated_item (tmp, op, difficulty, t->magic, flag); 420 fix_generated_item (tmp, op, difficulty, t->magic, flag);
428 change_treasure (t, tmp); 421 change_treasure (t, tmp);
429 put_treasure (tmp, op, flag); 422 put_treasure (tmp, op, flag);
423 }
430 } 424 }
431} 425}
432 426
433/* This calls the appropriate treasure creation function. tries is passed 427/* This calls the appropriate treasure creation function. tries is passed
434 * to determine how many list transitions or attempts to create treasure 428 * to determine how many list transitions or attempts to create treasure
… …
436 * list transitions, or so that excessively good treasure will not be 430 * list transitions, or so that excessively good treasure will not be
437 * created on weak maps, because it will exceed the number of allowed tries 431 * created on weak maps, because it will exceed the number of allowed tries
438 * to do that. 432 * to do that.
439 */ 433 */
440void 434void
441create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries) 435create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
442{ 436{
437 // empty treasurelists are legal
438 if (!tl->items)
439 return;
443 440
444 if (tries++ > 100) 441 if (tries++ > 100)
445 { 442 {
446 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 443 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
447 return; 444 return;
448 } 445 }
446
449 if (t->total_chance) 447 if (tl->total_chance)
450 create_one_treasure (t, op, flag, difficulty, tries); 448 create_one_treasure (tl, op, flag, difficulty, tries);
451 else 449 else
452 create_all_treasures (t->items, op, flag, difficulty, tries); 450 create_all_treasures (tl->items, op, flag, difficulty, tries);
453} 451}
454 452
455/* This is similar to the old generate treasure function. However, 453/* This is similar to the old generate treasure function. However,
456 * it instead takes a treasurelist. It is really just a wrapper around 454 * it instead takes a treasurelist. It is really just a wrapper around
457 * create_treasure. We create a dummy object that the treasure gets 455 * create_treasure. We create a dummy object that the treasure gets
458 * inserted into, and then return that treausre 456 * inserted into, and then return that treausre
459 */ 457 */
460object * 458object *
461generate_treasure (treasurelist *t, int difficulty) 459generate_treasure (treasurelist *tl, int difficulty)
462{ 460{
463 difficulty = clamp (difficulty, 1, settings.max_level); 461 difficulty = clamp (difficulty, 1, settings.max_level);
464 462
465 object *ob = object::create (), *tmp; 463 object *ob = object::create (), *tmp;
466 464
467 create_treasure (t, ob, 0, difficulty, 0); 465 create_treasure (tl, ob, 0, difficulty, 0);
468 466
469 /* Don't want to free the object we are about to return */ 467 /* Don't want to free the object we are about to return */
470 tmp = ob->inv; 468 tmp = ob->inv;
471 if (tmp != NULL) 469 if (tmp != NULL)
472 tmp->remove (); 470 tmp->remove ();
… …
485 * magical bonus "wanted". 483 * magical bonus "wanted".
486 */ 484 */
487 485
488static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 486static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
489 487
490/*chance of magic difficulty*/ 488// chance of magic difficulty
491
492/* +0 +1 +2 +3 +4 */ 489// +0 +1 +2 +3 +4
493 {95, 2, 2, 1, 0}, /*1 */ 490 {95, 2, 2, 1, 0}, // 1
494 {92, 5, 2, 1, 0}, /*2 */ 491 {92, 5, 2, 1, 0}, // 2
495 {85, 10, 4, 1, 0}, /*3 */ 492 {85, 10, 4, 1, 0}, // 3
496 {80, 14, 4, 2, 0}, /*4 */ 493 {80, 14, 4, 2, 0}, // 4
497 {75, 17, 5, 2, 1}, /*5 */ 494 {75, 17, 5, 2, 1}, // 5
498 {70, 18, 8, 3, 1}, /*6 */ 495 {70, 18, 8, 3, 1}, // 6
499 {65, 21, 10, 3, 1}, /*7 */ 496 {65, 21, 10, 3, 1}, // 7
500 {60, 22, 12, 4, 2}, /*8 */ 497 {60, 22, 12, 4, 2}, // 8
501 {55, 25, 14, 4, 2}, /*9 */ 498 {55, 25, 14, 4, 2}, // 9
502 {50, 27, 16, 5, 2}, /*10 */ 499 {50, 27, 16, 5, 2}, // 10
503 {45, 28, 18, 6, 3}, /*11 */ 500 {45, 28, 18, 6, 3}, // 11
504 {42, 28, 20, 7, 3}, /*12 */ 501 {42, 28, 20, 7, 3}, // 12
505 {40, 27, 21, 8, 4}, /*13 */ 502 {40, 27, 21, 8, 4}, // 13
506 {38, 25, 22, 10, 5}, /*14 */ 503 {38, 25, 22, 10, 5}, // 14
507 {36, 23, 23, 12, 6}, /*15 */ 504 {36, 23, 23, 12, 6}, // 15
508 {33, 21, 24, 14, 8}, /*16 */ 505 {33, 21, 24, 14, 8}, // 16
509 {31, 19, 25, 16, 9}, /*17 */ 506 {31, 19, 25, 16, 9}, // 17
510 {27, 15, 30, 18, 10}, /*18 */ 507 {27, 15, 30, 18, 10}, // 18
511 {20, 12, 30, 25, 13}, /*19 */ 508 {20, 12, 30, 25, 13}, // 19
512 {15, 10, 28, 30, 17}, /*20 */ 509 {15, 10, 28, 30, 17}, // 20
513 {13, 9, 27, 28, 23}, /*21 */ 510 {13, 9, 27, 28, 23}, // 21
514 {10, 8, 25, 28, 29}, /*22 */ 511 {10, 8, 25, 28, 29}, // 22
515 {8, 7, 23, 26, 36}, /*23 */ 512 { 8, 7, 23, 26, 36}, // 23
516 {6, 6, 20, 22, 46}, /*24 */ 513 { 6, 6, 20, 22, 46}, // 24
517 {4, 5, 17, 18, 56}, /*25 */ 514 { 4, 5, 17, 18, 56}, // 25
518 {2, 4, 12, 14, 68}, /*26 */ 515 { 2, 4, 12, 14, 68}, // 26
519 {0, 3, 7, 10, 80}, /*27 */ 516 { 0, 3, 7, 10, 80}, // 27
520 {0, 0, 3, 7, 90}, /*28 */ 517 { 0, 0, 3, 7, 90}, // 28
521 {0, 0, 0, 3, 97}, /*29 */ 518 { 0, 0, 0, 3, 97}, // 29
522 {0, 0, 0, 0, 100}, /*30 */ 519 { 0, 0, 0, 0, 100}, // 30
523 {0, 0, 0, 0, 100}, /*31 */ 520 { 0, 0, 0, 0, 100}, // 31
524}; 521};
525 522
526 523
527/* calculate the appropriate level for wands staves and scrolls. 524/* calculate the appropriate level for wands staves and scrolls.
528 * This code presumes that op has had its spell object created (in op->inv) 525 * This code presumes that op has had its spell object created (in op->inv)
… …
561 * elmex Thu Aug 10 18:45:44 CEST 2006: 558 * elmex Thu Aug 10 18:45:44 CEST 2006:
562 * Scaling difficulty by max_level, as difficulty is a level and not some 559 * Scaling difficulty by max_level, as difficulty is a level and not some
563 * weird integer between 1-31. 560 * weird integer between 1-31.
564 * 561 *
565 */ 562 */
566
567int 563int
568magic_from_difficulty (int difficulty) 564magic_from_difficulty (int difficulty)
569{ 565{
570 int percent = 0, magic = 0; 566 int percent = 0, magic = 0;
571 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 567 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
… …
576 scaled_diff = 0; 572 scaled_diff = 0;
577 573
578 if (scaled_diff >= DIFFLEVELS) 574 if (scaled_diff >= DIFFLEVELS)
579 scaled_diff = DIFFLEVELS - 1; 575 scaled_diff = DIFFLEVELS - 1;
580 576
581 percent = RANDOM () % 100; 577 percent = rndm (100);
582 578
583 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 579 for (magic = 0; magic < (MAXMAGIC + 1); magic++)
584 { 580 {
585 percent -= difftomagic_list[scaled_diff][magic]; 581 percent -= difftomagic_list[scaled_diff][magic];
586 582
… …
592 { 588 {
593 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 589 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
594 magic = 0; 590 magic = 0;
595 } 591 }
596 592
597 magic = (RANDOM () % 3) ? magic : -magic; 593 magic = (rndm (3)) ? magic : -magic;
598 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */ 594 /* LOG(llevDebug, "Chose magic %d for difficulty (scaled %d) %d\n", magic, scaled_diff, difficulty); */
599 595
600 return magic; 596 return magic;
601} 597}
602 598
… …
617 if (op->arch) 613 if (op->arch)
618 { 614 {
619 if (op->type == ARMOUR) 615 if (op->type == ARMOUR)
620 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 616 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
621 617
622 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 618 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
623 magic = (-magic); 619 magic = (-magic);
624 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 620 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
625 } 621 }
626 else 622 else
627 { 623 {
628 if (op->type == ARMOUR) 624 if (op->type == ARMOUR)
629 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 625 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
630 if (magic < 0 && !(RANDOM () % 3)) /* You can't just check the weight always */ 626 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
631 magic = (-magic); 627 magic = (-magic);
632 op->weight = (op->weight * (100 - magic * 10)) / 100; 628 op->weight = (op->weight * (100 - magic * 10)) / 100;
633 } 629 }
634} 630}
635 631
… …
659 * 1) Since rings can have multiple bonuses, if the same bonus 655 * 1) Since rings can have multiple bonuses, if the same bonus
660 * is rolled again, increase it - the bonuses now stack with 656 * is rolled again, increase it - the bonuses now stack with
661 * other bonuses previously rolled and ones the item might natively have. 657 * other bonuses previously rolled and ones the item might natively have.
662 * 2) Add code to deal with new PR method. 658 * 2) Add code to deal with new PR method.
663 */ 659 */
664
665void 660void
666set_ring_bonus (object *op, int bonus) 661set_ring_bonus (object *op, int bonus)
667{ 662{
668 663
669 int r = RANDOM () % (bonus > 0 ? 25 : 11); 664 int r = rndm (bonus > 0 ? 25 : 11);
670 665
671 if (op->type == AMULET) 666 if (op->type == AMULET)
672 { 667 {
673 if (!(RANDOM () % 21)) 668 if (!(rndm (21)))
674 r = 20 + RANDOM () % 2; 669 r = 20 + rndm (2);
675 else 670 else
676 { 671 {
677 if (RANDOM () & 2) 672 if (rndm (2))
678 r = 10; 673 r = 10;
679 else 674 else
680 r = 11 + RANDOM () % 9; 675 r = 11 + rndm (9);
681 } 676 }
682 } 677 }
683 678
684 switch (r) 679 switch (r)
685 { 680 {
… …
722 case 16: 717 case 16:
723 case 17: 718 case 17:
724 case 18: 719 case 18:
725 case 19: 720 case 19:
726 { 721 {
727 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 722 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
728 723
729 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 724 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
730 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 725 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
731 726
732 /* Cursed items need to have higher negative values to equal out with 727 /* Cursed items need to have higher negative values to equal out with
733 * positive values for how protections work out. Put another 728 * positive values for how protections work out. Put another
734 * little random element in since that they don't always end up with 729 * little random element in since that they don't always end up with
735 * even values. 730 * even values.
736 */ 731 */
737 if (bonus < 0) 732 if (bonus < 0)
738 val = 2 * -val - RANDOM () % b; 733 val = 2 * -val - rndm (b);
739 if (val > 35) 734 if (val > 35)
740 val = 35; /* Upper limit */ 735 val = 35; /* Upper limit */
741 b = 0; 736 b = 0;
737
742 while (op->resist[resist_table[resist]] != 0 && b < 4) 738 while (op->resist[resist_table[resist]] != 0 && b < 4)
743 {
744 resist = RANDOM () % num_resist_table; 739 resist = rndm (num_resist_table);
745 } 740
746 if (b == 4) 741 if (b == 4)
747 return; /* Not able to find a free resistance */ 742 return; /* Not able to find a free resistance */
743
748 op->resist[resist_table[resist]] = val; 744 op->resist[resist_table[resist]] = val;
749 /* We should probably do something more clever here to adjust value 745 /* We should probably do something more clever here to adjust value
750 * based on how good a resistance we gave. 746 * based on how good a resistance we gave.
751 */ 747 */
752 break; 748 break;
… …
780 case 22: 776 case 22:
781 op->stats.exp += bonus; /* Speed! */ 777 op->stats.exp += bonus; /* Speed! */
782 op->value = (op->value * 2) / 3; 778 op->value = (op->value * 2) / 3;
783 break; 779 break;
784 } 780 }
781
785 if (bonus > 0) 782 if (bonus > 0)
786 op->value *= 2 * bonus; 783 op->value *= 2 * bonus;
787 else 784 else
788 op->value = -(op->value * 2 * bonus) / 3; 785 op->value = -(op->value * 2 * bonus) / 3;
789} 786}
… …
794 * higher is the chance of returning a low number. 791 * higher is the chance of returning a low number.
795 * It is only used in fix_generated_treasure() to set bonuses on 792 * It is only used in fix_generated_treasure() to set bonuses on
796 * rings and amulets. 793 * rings and amulets.
797 * Another scheme is used to calculate the magic of weapons and armours. 794 * Another scheme is used to calculate the magic of weapons and armours.
798 */ 795 */
799
800int 796int
801get_magic (int diff) 797get_magic (int diff)
802{ 798{
803 int i; 799 int i;
804 800
805 if (diff < 3) 801 if (diff < 3)
806 diff = 3; 802 diff = 3;
803
807 for (i = 0; i < 4; i++) 804 for (i = 0; i < 4; i++)
808 if (RANDOM () % diff) 805 if (rndm (diff))
809 return i; 806 return i;
807
810 return 4; 808 return 4;
811} 809}
812 810
813#define DICE2 (get_magic(2)==2?2:1) 811#define DICE2 (get_magic(2)==2?2:1)
814#define DICESPELL (RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 812#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
815 813
816/* 814/*
817 * fix_generated_item(): This is called after an item is generated, in 815 * fix_generated_item(): This is called after an item is generated, in
818 * order to set it up right. This produced magical bonuses, puts spells 816 * order to set it up right. This produced magical bonuses, puts spells
819 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 817 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
833 * value. 831 * value.
834 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 832 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
835 * a working object - don't change magic, value, etc, but set it material 833 * a working object - don't change magic, value, etc, but set it material
836 * type as appropriate, for objects that need spell objects, set those, etc 834 * type as appropriate, for objects that need spell objects, set those, etc
837 */ 835 */
838
839void 836void
840fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 837fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
841{ 838{
842 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 839 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
843 840
… …
850 847
851 if (op->randomitems && op->type != SPELL) 848 if (op->randomitems && op->type != SPELL)
852 { 849 {
853 create_treasure (op->randomitems, op, flags, difficulty, 0); 850 create_treasure (op->randomitems, op, flags, difficulty, 0);
854 if (!op->inv) 851 if (!op->inv)
855 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", &op->name); 852 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
856 853
857 /* So the treasure doesn't get created again */ 854 /* So the treasure doesn't get created again */
858 op->randomitems = NULL; 855 op->randomitems = 0;
859 } 856 }
860 857
861 if (difficulty < 1) 858 if (difficulty < 1)
862 difficulty = 1; 859 difficulty = 1;
863 860
… …
880 if (!op->magic && max_magic) 877 if (!op->magic && max_magic)
881 set_magic (difficulty, op, max_magic, flags); 878 set_magic (difficulty, op, max_magic, flags);
882 879
883 num_enchantments = calc_item_power (op, 1); 880 num_enchantments = calc_item_power (op, 1);
884 881
885 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 882 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
883 || op->type == HORN
884 || difficulty >= settings.max_level) /* high difficulties always generate an artifact,
886 * used for shop_floors or treasures */ 885 * used for shop_floors or treasures */
887 generate_artifact (op, difficulty); 886 generate_artifact (op, difficulty);
888 } 887 }
889 888
890 /* Object was made an artifact. Calculate its item_power rating. 889 /* Object was made an artifact. Calculate its item_power rating.
… …
948 case WEAPON: 947 case WEAPON:
949 case ARMOUR: 948 case ARMOUR:
950 case SHIELD: 949 case SHIELD:
951 case HELMET: 950 case HELMET:
952 case CLOAK: 951 case CLOAK:
953 if (QUERY_FLAG (op, FLAG_CURSED) && !(RANDOM () % 4)) 952 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
954 set_ring_bonus (op, -DICE2); 953 set_ring_bonus (op, -DICE2);
955 break; 954 break;
956 955
957 case BRACERS: 956 case BRACERS:
958 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 957 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
959 { 958 {
960 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 959 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
961 if (!QUERY_FLAG (op, FLAG_CURSED)) 960 if (!QUERY_FLAG (op, FLAG_CURSED))
962 op->value *= 3; 961 op->value *= 3;
963 } 962 }
… …
989 */ 988 */
990 if (op->inv && op->randomitems) 989 if (op->inv && op->randomitems)
991 { 990 {
992 /* value multiplier is same as for scrolls */ 991 /* value multiplier is same as for scrolls */
993 op->value = (op->value * op->inv->value); 992 op->value = (op->value * op->inv->value);
994 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 993 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
995 } 994 }
996 else 995 else
997 { 996 {
998 op->name = "potion"; 997 op->name = "potion";
999 op->name_pl = "potions"; 998 op->name_pl = "potions";
1000 } 999 }
1001 1000
1002 if (!(flags & GT_ONLY_GOOD) && RANDOM () % 2) 1001 if (!(flags & GT_ONLY_GOOD) && rndm (2))
1003 SET_FLAG (op, FLAG_CURSED); 1002 SET_FLAG (op, FLAG_CURSED);
1004 break; 1003 break;
1005 } 1004 }
1006 1005
1007 case AMULET: 1006 case AMULET:
… …
1017 } 1016 }
1018 1017
1019 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 1018 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */
1020 break; 1019 break;
1021 1020
1022 if (!(flags & GT_ONLY_GOOD) && !(RANDOM () % 3)) 1021 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
1023 SET_FLAG (op, FLAG_CURSED); 1022 SET_FLAG (op, FLAG_CURSED);
1024 1023
1025 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1024 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
1026 1025
1027 if (op->type != RING) /* Amulets have only one ability */ 1026 if (op->type != RING) /* Amulets have only one ability */
1028 break; 1027 break;
1029 1028
1030 if (!(RANDOM () % 4)) 1029 if (!(rndm (4)))
1031 { 1030 {
1032 int d = (RANDOM () % 2 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1031 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1033 1032
1034 if (d > 0) 1033 if (d > 0)
1035 op->value *= 3; 1034 op->value *= 3;
1036 1035
1037 set_ring_bonus (op, d); 1036 set_ring_bonus (op, d);
1038 1037
1039 if (!(RANDOM () % 4)) 1038 if (!(rndm (4)))
1040 { 1039 {
1041 int d = (RANDOM () % 3 || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1040 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2;
1042 1041
1043 if (d > 0) 1042 if (d > 0)
1044 op->value *= 5; 1043 op->value *= 5;
1045 set_ring_bonus (op, d); 1044 set_ring_bonus (op, d);
1046 } 1045 }
1047 } 1046 }
1048 1047
1049 if (GET_ANIM_ID (op)) 1048 if (GET_ANIM_ID (op))
1050 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1049 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1051 1050
1052 break; 1051 break;
1053 1052
1054 case BOOK: 1053 case BOOK:
1055 /* Is it an empty book?, if yes lets make a special· 1054 /* Is it an empty book?, if yes lets make a special·
1056 * msg for it, and tailor its properties based on the· 1055 * msg for it, and tailor its properties based on the·
1057 * creator and/or map level we found it on. 1056 * creator and/or map level we found it on.
1058 */ 1057 */
1059 if (!op->msg && RANDOM () % 10) 1058 if (!op->msg && rndm (10))
1060 { 1059 {
1061 /* set the book level properly */ 1060 /* set the book level properly */
1062 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1061 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1063 { 1062 {
1064 if (op->map && op->map->difficulty) 1063 if (op->map && op->map->difficulty)
1065 op->level = RANDOM () % (op->map->difficulty) + RANDOM () % 10 + 1; 1064 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1066 else 1065 else
1067 op->level = RANDOM () % 20 + 1; 1066 op->level = rndm (20) + 1;
1068 } 1067 }
1069 else 1068 else
1070 op->level = RANDOM () % creator->level; 1069 op->level = rndm (creator->level);
1071 1070
1072 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1071 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1073 /* books w/ info are worth more! */ 1072 /* books w/ info are worth more! */
1074 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1073 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1075 /* creator related stuff */ 1074 /* creator related stuff */
… …
1174 */ 1173 */
1175 1174
1176/* 1175/*
1177 * Allocate and return the pointer to an empty artifactlist structure. 1176 * Allocate and return the pointer to an empty artifactlist structure.
1178 */ 1177 */
1179
1180static artifactlist * 1178static artifactlist *
1181get_empty_artifactlist (void) 1179get_empty_artifactlist (void)
1182{ 1180{
1183 artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist)); 1181 return salloc0 <artifactlist> ();
1184
1185 if (tl == NULL)
1186 fatal (OUT_OF_MEMORY);
1187 tl->next = NULL;
1188 tl->items = NULL;
1189 tl->total_chance = 0;
1190 return tl;
1191} 1182}
1192 1183
1193/* 1184/*
1194 * Allocate and return the pointer to an empty artifact structure. 1185 * Allocate and return the pointer to an empty artifact structure.
1195 */ 1186 */
1196
1197static artifact * 1187static artifact *
1198get_empty_artifact (void) 1188get_empty_artifact (void)
1199{ 1189{
1200 artifact *t = (artifact *) malloc (sizeof (artifact)); 1190 return salloc0 <artifact> ();
1201
1202 if (t == NULL)
1203 fatal (OUT_OF_MEMORY);
1204 t->item = NULL;
1205 t->next = NULL;
1206 t->chance = 0;
1207 t->difficulty = 0;
1208 t->allowed = NULL;
1209 return t;
1210} 1191}
1211 1192
1212/* 1193/*
1213 * Searches the artifact lists and returns one that has the same type 1194 * Searches the artifact lists and returns one that has the same type
1214 * of objects on it. 1195 * of objects on it.
1215 */ 1196 */
1216
1217artifactlist * 1197artifactlist *
1218find_artifactlist (int type) 1198find_artifactlist (int type)
1219{ 1199{
1220 artifactlist *al;
1221
1222 for (al = first_artifactlist; al != NULL; al = al->next) 1200 for (artifactlist *al = first_artifactlist; al; al = al->next)
1223 if (al->type == type) 1201 if (al->type == type)
1224 return al; 1202 return al;
1203
1225 return NULL; 1204 return 0;
1226} 1205}
1227 1206
1228/* 1207/*
1229 * For debugging purposes. Dumps all tables. 1208 * For debugging purposes. Dumps all tables.
1230 */ 1209 */
1231
1232void 1210void
1233dump_artifacts (void) 1211dump_artifacts (void)
1234{ 1212{
1235 artifactlist *al; 1213 artifactlist *al;
1236 artifact *art; 1214 artifact *art;
… …
1243 for (art = al->items; art != NULL; art = art->next) 1221 for (art = al->items; art != NULL; art = art->next)
1244 { 1222 {
1245 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1223 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1246 if (art->allowed != NULL) 1224 if (art->allowed != NULL)
1247 { 1225 {
1248 fprintf (logfile, "\tAllowed combinations:"); 1226 fprintf (logfile, "\tallowed combinations:");
1249 for (next = art->allowed; next != NULL; next = next->next) 1227 for (next = art->allowed; next != NULL; next = next->next)
1250 fprintf (logfile, "%s,", &next->name); 1228 fprintf (logfile, "%s,", &next->name);
1251 fprintf (logfile, "\n"); 1229 fprintf (logfile, "\n");
1252 } 1230 }
1253 } 1231 }
… …
1264 treasurelist *tl; 1242 treasurelist *tl;
1265 int i; 1243 int i;
1266 1244
1267 if (depth > 100) 1245 if (depth > 100)
1268 return; 1246 return;
1269 while (t != NULL) 1247
1248 while (t)
1270 { 1249 {
1271 if (t->name != NULL) 1250 if (t->name)
1272 { 1251 {
1273 for (i = 0; i < depth; i++) 1252 for (i = 0; i < depth; i++)
1274 fprintf (logfile, " "); 1253 fprintf (logfile, " ");
1254
1275 fprintf (logfile, "{ (list: %s)\n", &t->name); 1255 fprintf (logfile, "{ (list: %s)\n", &t->name);
1256
1276 tl = find_treasurelist (t->name); 1257 tl = treasurelist::find (t->name);
1277 if (tl) 1258 if (tl)
1278 dump_monster_treasure_rec (name, tl->items, depth + 2); 1259 dump_monster_treasure_rec (name, tl->items, depth + 2);
1260
1279 for (i = 0; i < depth; i++) 1261 for (i = 0; i < depth; i++)
1280 fprintf (logfile, " "); 1262 fprintf (logfile, " ");
1263
1281 fprintf (logfile, "} (end of list: %s)\n", &t->name); 1264 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1282 } 1265 }
1283 else 1266 else
1284 { 1267 {
1285 for (i = 0; i < depth; i++) 1268 for (i = 0; i < depth; i++)
1286 fprintf (logfile, " "); 1269 fprintf (logfile, " ");
1270
1287 if (t->item->clone.type == FLESH) 1271 if (t->item && t->item->clone.type == FLESH)
1288 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1272 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1289 else 1273 else
1290 fprintf (logfile, "%s\n", &t->item->clone.name); 1274 fprintf (logfile, "%s\n", &t->item->clone.name);
1291 } 1275 }
1276
1292 if (t->next_yes != NULL) 1277 if (t->next_yes)
1293 { 1278 {
1294 for (i = 0; i < depth; i++) 1279 for (i = 0; i < depth; i++)
1295 fprintf (logfile, " "); 1280 fprintf (logfile, " ");
1281
1296 fprintf (logfile, " (if yes)\n"); 1282 fprintf (logfile, " (if yes)\n");
1297 dump_monster_treasure_rec (name, t->next_yes, depth + 1); 1283 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1298 } 1284 }
1285
1299 if (t->next_no != NULL) 1286 if (t->next_no)
1300 { 1287 {
1301 for (i = 0; i < depth; i++) 1288 for (i = 0; i < depth; i++)
1302 fprintf (logfile, " "); 1289 fprintf (logfile, " ");
1290
1303 fprintf (logfile, " (if no)\n"); 1291 fprintf (logfile, " (if no)\n");
1304 dump_monster_treasure_rec (name, t->next_no, depth + 1); 1292 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1305 } 1293 }
1294
1306 t = t->next; 1295 t = t->next;
1307 } 1296 }
1308} 1297}
1309 1298
1310/* 1299/*
1311 * For debugging purposes. Dumps all treasures for a given monster. 1300 * For debugging purposes. Dumps all treasures for a given monster.
1312 * Created originally by Raphael Quinet for debugging the alchemy code. 1301 * Created originally by Raphael Quinet for debugging the alchemy code.
1313 */ 1302 */
1314
1315void 1303void
1316dump_monster_treasure (const char *name) 1304dump_monster_treasure (const char *name)
1317{ 1305{
1318 archetype *at; 1306 archetype *at;
1319 int found; 1307 int found;
1320 1308
1321 found = 0; 1309 found = 0;
1322 fprintf (logfile, "\n"); 1310 fprintf (logfile, "\n");
1311
1323 for (at = first_archetype; at != NULL; at = at->next) 1312 for (at = first_archetype; at != NULL; at = at->next)
1324 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1313 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1325 { 1314 {
1326 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1315 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1327 if (at->clone.randomitems != NULL) 1316 if (at->clone.randomitems != NULL)
1328 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1317 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1329 else 1318 else
1330 fprintf (logfile, "(nothing)\n"); 1319 fprintf (logfile, "(nothing)\n");
1320
1331 fprintf (logfile, "\n"); 1321 fprintf (logfile, "\n");
1332 found++; 1322 found++;
1333 } 1323 }
1324
1334 if (found == 0) 1325 if (found == 0)
1335 fprintf (logfile, "No objects have the name %s!\n\n", name); 1326 fprintf (logfile, "No objects have the name %s!\n\n", name);
1336} 1327}
1337 1328
1338/* 1329/*
1339 * Builds up the lists of artifacts from the file in the libdir. 1330 * Builds up the lists of artifacts from the file in the libdir.
1340 */ 1331 */
1341
1342void 1332void
1343init_artifacts (void) 1333init_artifacts (void)
1344{ 1334{
1345 static int has_been_inited = 0; 1335 static int has_been_inited = 0;
1346 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1336 char filename[MAX_BUF];
1347 artifact *art = NULL; 1337 artifact *art = NULL;
1348 linked_char *tmp;
1349 int value;
1350 artifactlist *al; 1338 artifactlist *al;
1351 1339
1352 if (has_been_inited) 1340 if (has_been_inited)
1353 return; 1341 return;
1354 else 1342 else
1355 has_been_inited = 1; 1343 has_been_inited = 1;
1356 1344
1357 sprintf (filename, "%s/artifacts", settings.datadir); 1345 sprintf (filename, "%s/artifacts", settings.datadir);
1358 object_thawer thawer (filename); 1346 object_thawer f (filename);
1359 1347
1360 if (!thawer) 1348 if (!f)
1361 return; 1349 return;
1362 1350
1363 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1351 f.next ();
1364 {
1365 if (*buf == '#')
1366 continue;
1367 if ((cp = strchr (buf, '\n')) != NULL)
1368 *cp = '\0';
1369 cp = buf;
1370 while (*cp == ' ') /* Skip blanks */
1371 cp++;
1372 if (*cp == '\0')
1373 continue;
1374 1352
1375 if (!strncmp (cp, "Allowed", 7)) 1353 for (;;)
1354 {
1355 switch (f.kw)
1376 { 1356 {
1357 case KW_allowed:
1377 if (art == NULL) 1358 if (!art)
1359 {
1360 art = get_empty_artifact ();
1361 nrofartifacts++;
1362 }
1363
1378 { 1364 {
1379 art = get_empty_artifact (); 1365 if (!strcmp (f.get_str (), "all"))
1380 nrofartifacts++; 1366 break;
1367
1368 char *next, *cp = f.get_str ();
1369
1370 do
1371 {
1372 nrofallowedstr++;
1373
1374 if ((next = strchr (cp, ',')))
1375 *next++ = '\0';
1376
1377 linked_char *tmp = new linked_char;
1378
1379 tmp->name = cp;
1380 tmp->next = art->allowed;
1381 art->allowed = tmp;
1382 }
1383 while ((cp = next));
1381 } 1384 }
1382 cp = strchr (cp, ' ') + 1; 1385 break;
1383 if (!strcmp (cp, "all")) 1386
1387 case KW_chance:
1388 f.get (art->chance);
1389 break;
1390
1391 case KW_difficulty:
1392 f.get (art->difficulty);
1393 break;
1394
1395 case KW_object:
1396 {
1397 art->item = object::create ();
1398
1399 if (!art->item->parse_kv (f))
1400 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1401
1402 al = find_artifactlist (art->item->type);
1403
1404 if (!al)
1405 {
1406 al = get_empty_artifactlist ();
1407 al->type = art->item->type;
1408 al->next = first_artifactlist;
1409 first_artifactlist = al;
1410 }
1411
1412 art->next = al->items;
1413 al->items = art;
1414 art = 0;
1415 }
1384 continue; 1416 continue;
1385 1417
1386 do 1418 case KW_EOF:
1419 goto done;
1420
1421 default:
1422 if (!f.parse_error ("artifacts file"))
1423 cleanup ("artifacts file required");
1387 { 1424 break;
1388 nrofallowedstr++;
1389 if ((next = strchr (cp, ',')) != NULL)
1390 *(next++) = '\0';
1391 tmp = new linked_char;
1392
1393 tmp->name = cp;
1394 tmp->next = art->allowed;
1395 art->allowed = tmp;
1396 }
1397 while ((cp = next) != NULL);
1398 }
1399 else if (sscanf (cp, "chance %d", &value))
1400 art->chance = (uint16) value;
1401 else if (sscanf (cp, "difficulty %d", &value))
1402 art->difficulty = (uint8) value;
1403 else if (!strncmp (cp, "Object", 6))
1404 { 1425 }
1405 art->item = object::create ();
1406 1426
1407 if (!load_object (thawer, art->item, 0)) 1427 f.next ();
1408 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1409
1410 art->item->name = strchr (cp, ' ') + 1;
1411 al = find_artifactlist (art->item->type);
1412 if (al == NULL)
1413 {
1414 al = get_empty_artifactlist ();
1415 al->type = art->item->type;
1416 al->next = first_artifactlist;
1417 first_artifactlist = al;
1418 }
1419 art->next = al->items;
1420 al->items = art;
1421 art = NULL;
1422 }
1423 else
1424 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1425 } 1428 }
1426 1429
1430done:
1427 for (al = first_artifactlist; al != NULL; al = al->next) 1431 for (al = first_artifactlist; al; al = al->next)
1428 { 1432 {
1429 for (art = al->items; art != NULL; art = art->next) 1433 for (art = al->items; art; art = art->next)
1430 { 1434 {
1431 if (!art->chance) 1435 if (!art->chance)
1432 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1436 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1433 else 1437 else
1434 al->total_chance += art->chance; 1438 al->total_chance += art->chance;
… …
1453 int i, tmp; 1457 int i, tmp;
1454 1458
1455 if (change->face != blank_face) 1459 if (change->face != blank_face)
1456 { 1460 {
1457#ifdef TREASURE_VERBOSE 1461#ifdef TREASURE_VERBOSE
1458 LOG (llevDebug, "FACE: %d\n", change->face->number); 1462 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1459#endif 1463#endif
1460 op->face = change->face; 1464 op->face = change->face;
1461 } 1465 }
1462 1466
1463 for (i = 0; i < NUM_STATS; i++) 1467 for (i = 0; i < NUM_STATS; i++)
… …
1503 1507
1504 op->set_speed (op->speed); 1508 op->set_speed (op->speed);
1505 } 1509 }
1506 1510
1507 if (change->nrof) 1511 if (change->nrof)
1508 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1512 op->nrof = rndm (change->nrof) + 1;
1509 1513
1510 op->stats.exp += change->stats.exp; /* Speed modifier */ 1514 op->stats.exp += change->stats.exp; /* Speed modifier */
1511 op->stats.wc += change->stats.wc; 1515 op->stats.wc += change->stats.wc;
1512 op->stats.ac += change->stats.ac; 1516 op->stats.ac += change->stats.ac;
1513 1517
… …
1616 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1620 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1617 } 1621 }
1618 1622
1619 op->value *= change->value; 1623 op->value *= change->value;
1620 1624
1621 if (change->material) 1625 if (change->materials)
1622 op->material = change->material; 1626 op->materials = change->materials;
1623 1627
1624 if (change->materialname) 1628 if (change->materialname)
1625 op->materialname = change->materialname; 1629 op->materialname = change->materialname;
1626 1630
1627 if (change->slaying) 1631 if (change->slaying)
… …
1644 if (art->allowed == (linked_char *) NULL) 1648 if (art->allowed == (linked_char *) NULL)
1645 return 1; /* Ie, "all" */ 1649 return 1; /* Ie, "all" */
1646 for (tmp = art->allowed; tmp; tmp = tmp->next) 1650 for (tmp = art->allowed; tmp; tmp = tmp->next)
1647 { 1651 {
1648#ifdef TREASURE_VERBOSE 1652#ifdef TREASURE_VERBOSE
1649 LOG (llevDebug, "legal_art: %s\n", tmp->name); 1653 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1650#endif 1654#endif
1651 if (*tmp->name == '!') 1655 if (*tmp->name == '!')
1652 name = tmp->name + 1, neg = 1; 1656 name = tmp->name + 1, neg = 1;
1653 else 1657 else
1654 name = tmp->name, neg = 0; 1658 name = tmp->name, neg = 0;
… …
1721 return; 1725 return;
1722 } 1726 }
1723 1727
1724 for (i = 0; i < ARTIFACT_TRIES; i++) 1728 for (i = 0; i < ARTIFACT_TRIES; i++)
1725 { 1729 {
1726 int roll = RANDOM () % al->total_chance; 1730 int roll = rndm (al->total_chance);
1727 1731
1728 for (art = al->items; art != NULL; art = art->next) 1732 for (art = al->items; art; art = art->next)
1729 { 1733 {
1730 roll -= art->chance; 1734 roll -= art->chance;
1731 if (roll < 0) 1735 if (roll < 0)
1732 break; 1736 break;
1733 } 1737 }
… …
1749 continue; 1753 continue;
1750 1754
1751 if (!legal_artifact_combination (op, art)) 1755 if (!legal_artifact_combination (op, art))
1752 { 1756 {
1753#ifdef TREASURE_VERBOSE 1757#ifdef TREASURE_VERBOSE
1754 LOG (llevDebug, "%s of %s was not a legal combination.\n", op->name, art->item->name); 1758 LOG (llevDebug, "%s of %s was not a legal combination.\n", &op->name, &art->item->name);
1755#endif 1759#endif
1756 continue; 1760 continue;
1757 } 1761 }
1762
1758 give_artifact_abilities (op, art->item); 1763 give_artifact_abilities (op, art->item);
1759 return; 1764 return;
1760 } 1765 }
1761} 1766}
1762 1767
… …
1810/* special_potion() - so that old potion code is still done right. */ 1815/* special_potion() - so that old potion code is still done right. */
1811 1816
1812int 1817int
1813special_potion (object *op) 1818special_potion (object *op)
1814{ 1819{
1815
1816 int i;
1817
1818 if (op->attacktype) 1820 if (op->attacktype)
1819 return 1; 1821 return 1;
1820 1822
1821 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha) 1823 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1822 return 1; 1824 return 1;
1823 1825
1824 for (i = 0; i < NROFATTACKS; i++) 1826 for (int i = 0; i < NROFATTACKS; i++)
1825 if (op->resist[i]) 1827 if (op->resist[i])
1826 return 1; 1828 return 1;
1827 1829
1828 return 0; 1830 return 0;
1829} 1831}
1830 1832
1831void 1833void
1832free_treasurestruct (treasure *t) 1834free_treasurestruct (treasure *t)
1833{ 1835{
1834 if (t->next)
1835 free_treasurestruct (t->next); 1836 if (t->next) free_treasurestruct (t->next);
1836 if (t->next_yes)
1837 free_treasurestruct (t->next_yes); 1837 if (t->next_yes) free_treasurestruct (t->next_yes);
1838 if (t->next_no)
1839 free_treasurestruct (t->next_no); 1838 if (t->next_no) free_treasurestruct (t->next_no);
1840 1839
1841 delete t; 1840 delete t;
1842} 1841}
1843 1842
1844void 1843void
… …
1849 1848
1850 delete lc; 1849 delete lc;
1851} 1850}
1852 1851
1853void 1852void
1854free_artifact (artifact * at) 1853free_artifact (artifact *at)
1855{ 1854{
1856 if (at->next)
1857 free_artifact (at->next); 1855 if (at->next) free_artifact (at->next);
1858
1859 if (at->allowed)
1860 free_charlinks (at->allowed); 1856 if (at->allowed) free_charlinks (at->allowed);
1861 1857
1862 at->item->destroy (1); 1858 at->item->destroy (1);
1863 1859
1864 delete at; 1860 sfree (at);
1865} 1861}
1866 1862
1867void 1863void
1868free_artifactlist (artifactlist * al) 1864free_artifactlist (artifactlist *al)
1869{ 1865{
1870 artifactlist *nextal; 1866 artifactlist *nextal;
1871 1867
1872 for (al = first_artifactlist; al; al = nextal) 1868 for (al = first_artifactlist; al; al = nextal)
1873 { 1869 {
1874 nextal = al->next; 1870 nextal = al->next;
1875 1871
1876 if (al->items) 1872 if (al->items)
1877 free_artifact (al->items); 1873 free_artifact (al->items);
1878 1874
1879 free (al); 1875 sfree (al);
1880 } 1876 }
1881} 1877}
1882 1878
1883void 1879void
1884free_all_treasures (void) 1880free_all_treasures (void)
1885{ 1881{
1886 treasurelist *tl, *next; 1882 treasurelist *tl, *next;
1887 1883
1888
1889 for (tl = first_treasurelist; tl != NULL; tl = next) 1884 for (tl = first_treasurelist; tl; tl = next)
1890 { 1885 {
1886 clear (tl);
1887
1891 next = tl->next; 1888 next = tl->next;
1892 if (tl->items)
1893 free_treasurestruct (tl->items);
1894 delete tl; 1889 delete tl;
1895 } 1890 }
1891
1896 free_artifactlist (first_artifactlist); 1892 free_artifactlist (first_artifactlist);
1897} 1893}

Diff Legend

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